- L�g�re modification pour permettre une installation m�me si le fichier mysql.inc.php n'existe pas.

- Introduction des statistiques mensuelles.
- Modification des labels anglais lors de l'installation


git-svn-id: http://piwigo.org/svn/trunk@766 68402e56-0260-453c-a942-63ccdbb3a9ee

6 files changed, 177 insertions, 31 deletions

diff --git a/admin/images/monthly_stats.img.php b/admin/images/monthly_stats.img.php
new file mode 100644
index 000000000..9d4d9143d
--- /dev/null
+++ b/admin/images/monthly_stats.img.php
@@ -0,0 +1,112 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+//----------------------------------------------------------- include
+define('PHPWG_ROOT_PATH','../../');
+define('IN_ADMIN', true);
+include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
+include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
+include_once( 'phpBarGraph.php' );
+
+//------------------------------------------------ variable definition
+$outputFormat = "png";
+$legend = $lang['stats_global_graph_title'];
+$imageHeight = 256;
+$imageWidth = 512;
+$sql = "SELECT DISTINCT COUNT(*), DAY(date) 
+  FROM ".HISTORY_TABLE." 
+  WHERE (YEAR(date) = ".$_GET['year']." AND MONTH(date) = ".$_GET['month']." ) 
+  GROUP BY DATE_FORMAT(date,'%Y-%m-%d') DESC;";
+
+//------------------------------------------------ Image definition
+$image = ImageCreate($imageWidth, $imageHeight);
+//$image = ImageCreateTrueColor($imageWidth, $imageHeight);
+// Fill it with your favorite background color..
+$backgroundColor = ImageColorAllocate($image, 184, 184, 184);
+ImageFill($image, 0, 0, $backgroundColor);
+$white = ImageColorAllocate($image, 0, 0, 0);
+
+// Interlace the image..
+Imageinterlace($image, 1);
+
+// Create a new BarGraph..
+$myBarGraph = new PhpBarGraph;
+$myBarGraph->SetX(10);              // Set the starting x position
+$myBarGraph->SetY(10);              // Set the starting y position
+$myBarGraph->SetWidth($imageWidth-20);    // Set how wide the bargraph will be
+$myBarGraph->SetHeight($imageHeight-20);  // Set how tall the bargraph will be
+$myBarGraph->SetNumOfValueTicks(3); // Set this to zero if you don't want to show any. These are the vertical bars to help see the values.
+
+
+// You can try uncommenting these lines below for different looks.
+
+// $myBarGraph->SetShowLabels(false);  // The default is true. Setting this to false will cause phpBarGraph to not print the labels of each bar.
+$myBarGraph->SetShowValues(false);  // The default is true. Setting this to false will cause phpBarGraph to not print the values of each bar.
+// $myBarGraph->SetBarBorder(false);   // The default is true. Setting this to false will cause phpBarGraph to not print the border of each bar.
+// $myBarGraph->SetShowFade(false);    // The default is true. Setting this to false will cause phpBarGraph to not print each bar as a gradient.
+// $myBarGraph->SetShowOuterBox(false);   // The default is true. Setting this to false will cause phpBarGraph to not print the outside box.
+$myBarGraph->SetBarSpacing(5);     // The default is 10. This changes the space inbetween each bar.
+
+
+// Add Values to the bargraph..
+$result = pwg_query($sql)
+or die(mysql_errno().": ".mysql_error()."<BR>".$sql);
+
+$days =array_fill(1,31,0);
+while ($r = mysql_fetch_row($result))
+{ 
+  $days [$r[1]]= $r[0];
+}
+$o=0;
+while (list ($key,$value) = each($days ))
+{
+  $myBarGraph->AddValue($key, $value);
+}
+
+//$myBarGraph->SetDebug(true);
+// Set the colors of the bargraph..
+$myBarGraph->SetStartBarColor("6666ff");  // This is the color on the top of every bar.
+$myBarGraph->SetEndBarColor("2222aa");    // This is the color on the bottom of every bar. This is not used when SetShowFade() is set to false.
+$myBarGraph->SetLineColor("000000");      // This is the color all the lines and text are printed out with.
+
+// Print the BarGraph to the image..
+$myBarGraph->DrawBarGraph($image);
+Imagestring($image, 2, 2, $imageHeight-14, $legend, $white);
+   
+//------------------------------------------------ Image output
+if ($outputFormat == "png")
+{
+  header("Content-type: image/png");
+  ImagePNG($image);
+}
+else if ($outputFormat == "jpg")
+{
+  header("Content-type: image/jpeg");
+  Imagejpeg($image);
+}
+// Destroy the image.
+Imagedestroy($image);
+?> 
\ No newline at end of file
diff --git a/admin/stats.php b/admin/stats.php
index cb7219802..0fa4d4245 100644
--- a/admin/stats.php
+++ b/admin/stats.php
@@ -30,12 +30,28 @@ if( !defined("PHPWG_ROOT_PATH") )
 }
 include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
 
-$url_img_global_report = PHPWG_ROOT_PATH.'admin/images/global_stats.img.php';
+$url_img = PHPWG_ROOT_PATH.'admin/images/'; 
+$nls_value_title = $lang['w_month'];
+$group_clause = "DATE_FORMAT(date,'%Y-%m') DESC";
+$where_clause = "1";
+
+if (isset($_GET['month']) && isset($_GET['year']) )
+{
+  $url_img .= 'monthly_stats.img.php?year='.$_GET['year'].'&month='.$_GET['month'];
+  $nls_value_title = $lang['w_day'];
+  $group_clause = "DATE_FORMAT(date,'%Y-%m-%d') ASC";
+  $where_clause = "(YEAR(date) = ".$_GET['year']." AND MONTH(date) = ".$_GET['month']." )";
+}
+else 
+{
+  $url_img .= 'global_stats.img.php';
+}
+
 //----------------------------------------------------- template initialization
 $template->set_filenames( array('stats'=>'admin/stats.tpl') );
 
 $template->assign_vars(array(
-  'L_MONTH'=>$lang['w_month'],
+  'L_VALUE'=>$nls_value_title,
   'L_PAGES_SEEN'=>$lang['stats_pages_seen'],
   'L_VISITORS'=>$lang['visitors'],
   'L_PICTURES'=>$lang['pictures'],
@@ -43,32 +59,50 @@ $template->assign_vars(array(
   'L_STAT_MONTH_TITLE'=>$lang['stats_month_title'],
   'L_STAT_MONTHLY_ALT'=>$lang['stats_global_graph_title'],
   
-  'IMG_MONTHLY_REPORT'=>add_session_id($url_img_global_report)
+  'IMG_REPORT'=>add_session_id($url_img)
   ));
 
 //---------------------------------------------------------------- log  history
 $query = '
 SELECT DISTINCT COUNT(*) as p,
+       DATE(date) as d,
        MONTH(date) as m,
        YEAR(date) as y
   FROM '.HISTORY_TABLE.' 
-  GROUP BY DATE_FORMAT(date,\'%Y-%m\') DESC
-;';
+  WHERE '.$where_clause.'
+  GROUP BY '.$group_clause.';';
+
 $result = pwg_query( $query );
 $i=0;
 while ( $row = mysql_fetch_array( $result ) )
 {
-  $current_month = $row['y']."-";
-  if ($row['m'] <10) {$current_month.='0';}
-  $current_month .= $row['m'];
+  $where_clause="";
+  $value = '';
+  if (isset($_GET['month']) && isset($_GET['year']) )
+  {
+    $where_clause = "DATE_FORMAT(date,'%Y-%m-%d') = '".$row['d']."'";
+    $value = substr($row['d'],8,2);
+  }
+  else
+  {
+    $current_month = $row['y']."-";
+    if ($row['m'] <10) {$current_month.='0';}
+    $current_month .= $row['m'];
+    $where_clause = "DATE_FORMAT(date,'%Y-%m') = '".$current_month."'";
+    $value = "<a href='".PHPWG_ROOT_PATH."admin.php?page=stats";
+    $value.= "&amp;year=".$row['y']."&amp;month=".$row['m']."'>";
+    $value.= $lang['month'][$row['m']].' '.$row['y'];
+    $value.= "</a>";
+  }
+  
   // Number of pictures seen
   $query = '
 SELECT COUNT(*) as p,
-       FILE as f
-  FROM '.HISTORY_TABLE.' 
-  WHERE DATE_FORMAT(date,\'%Y-%m\') = \''.$current_month.'\'
+    FILE as f
+    FROM '.HISTORY_TABLE.' 
+    WHERE '.$where_clause.'
     AND FILE = \'picture\'
-  GROUP BY FILE
+    GROUP BY FILE
 ;';
   $pictures = mysql_fetch_array(pwg_query( $query ));
   
@@ -76,7 +110,7 @@ SELECT COUNT(*) as p,
   $query = '
 SELECT COUNT(*) as p, login
   FROM '.HISTORY_TABLE.' 
-  WHERE DATE_FORMAT(date,\'%Y-%m\') = \''.$current_month.'\'
+  WHERE '.$where_clause.'
   GROUP BY login, IP
 ;';
   $user_results = pwg_query( $query );
@@ -92,8 +126,8 @@ SELECT COUNT(*) as p, login
   $nb_visitors +=count(array_unique($auth_users));
   $class = ($i % 2)? 'row1':'row2'; $i++;
   
-  $template->assign_block_vars('month',array(
-    'MONTH'=>$lang['month'][$row['m']].' '.$row['y'],
+  $template->assign_block_vars('statrow',array(
+      'VALUE'=>$value,
 	'PAGES'=>$row['p'],
 	'VISITORS'=>$nb_visitors,
 	'IMAGES'=>$pictures['p'],
diff --git a/include/common.inc.php b/include/common.inc.php
index 68c4e6434..1672f42ba 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -113,7 +113,7 @@ $user = array();
 $lang = array();
 
 
-include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
+@include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
 if (!defined('PHPWG_INSTALLED'))
 {
   header('Location: install.php');
diff --git a/include/constants.php b/include/constants.php
index 75764f1a5..4f207dac6 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -26,7 +26,7 @@
 // +-----------------------------------------------------------------------+
 
 // Default settings
-define('PHPWG_VERSION', '%PWGVERSION%');
+define('PHPWG_VERSION', 'BSF');
 define('PHPWG_URL', 'http://www.phpwebgallery.net');
 define('PHPWG_FORUM_URL', 'http://forum.phpwebgallery.net');
 
diff --git a/language/en_UK.iso-8859-1/install.lang.php b/language/en_UK.iso-8859-1/install.lang.php
index beb438ec2..f4f3f9d51 100644
--- a/language/en_UK.iso-8859-1/install.lang.php
+++ b/language/en_UK.iso-8859-1/install.lang.php
@@ -27,7 +27,7 @@
 
 $lang['install_message'] = 'Message';
 $lang['Initial_config'] = 'Basic configuration';
-$lang['Default_lang'] = 'Default galerie language';
+$lang['Default_lang'] = 'Default gallery language';
 $lang['step1_title'] = 'Database configuration';
 $lang['step2_title'] = 'Admin configuration';
 $lang['Start_Install'] = 'Start Install';
@@ -36,7 +36,7 @@ $lang['mail_webmaster'] = 'Webmaster mail adress';
 $lang['mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail';
 $lang['reg_err_mail_address'] = 'e-mail address refused, it must be like name@server.com';
 
-$lang['install_webmaster'] = 'webmaster login';
+$lang['install_webmaster'] = 'Webmaster login';
 $lang['install_webmaster_info'] = 'It will be shown to the visitors. It is necessary for website administration';
 
 $lang['step1_confirmation'] = 'Parameters are correct';
@@ -48,7 +48,7 @@ $lang['step1_err_copy'] = 'Copy the text between hyphens and paste it into the f
 
 $lang['step1_host'] = 'MySQL host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
-$lang['step1_user'] = 'user';
+$lang['step1_user'] = 'User';
 $lang['step1_user_info'] = 'user login given by your host provider';
 $lang['step1_pass'] = 'Password';
 $lang['step1_pass_info'] = 'user password given by your host provider';
@@ -60,9 +60,9 @@ $lang['step2_err_login1'] = 'enter a login for webmaster';
 $lang['step2_err_login3'] = 'webmaster login can\'t contain characters \' or "';
 $lang['step2_err_pass'] = 'please enter your password again';
 $lang['install_end_title'] = 'Installation finished';
-$lang['step2_pwd'] = 'webmaster password';
+$lang['step2_pwd'] = 'Webmaster password';
 $lang['step2_pwd_info'] = 'Keep it confidential, it enables you to access administration panel';
-$lang['step2_pwd_conf'] = 'confirm password';
+$lang['step2_pwd_conf'] = 'Password [confirm]';
 $lang['step2_pwd_conf_info'] = 'verification';
 $lang['install_help'] = 'Need help ? Ask your question on <a href="http://forum.phpwebgallery.net">PhpWebGallery message board</a>.';
 $lang['install_end_message'] = 'The configuration of PhpWebGallery is finished, here is the next step<br /><br />
diff --git a/template/default/admin/stats.tpl b/template/default/admin/stats.tpl
index 23e92f13f..b0e8ea924 100644
--- a/template/default/admin/stats.tpl
+++ b/template/default/admin/stats.tpl
@@ -1,20 +1,20 @@
 <div class="admin">{L_STAT_TITLE}</div>
-<img class="image" src="{IMG_MONTHLY_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />
+<img class="image" src="{IMG_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />
 <div class="admin">{L_STAT_MONTH_TITLE}</div>
 <table class="table2" width="60%">
 <tr class="throw">
-    <th>{L_MONTH}</th>
+    <th>{L_VALUE}</th>
 	<th>{L_PAGES_SEEN}</th>
     <th>{L_VISITORS}</th>
     <th>{L_PICTURES}</th>
 </tr>
-<!-- BEGIN month -->
-  <tr class="{month.T_CLASS}">
-    <td>{month.MONTH}</td>
-    <td>{month.PAGES}</td>
-    <td>{month.VISITORS}</td>
-	<td>{month.IMAGES}</td>
+<!-- BEGIN statrow -->
+  <tr class="{statrow.T_CLASS}">
+    <td>{statrow.VALUE}</td>
+    <td>{statrow.PAGES}</td>
+    <td>{statrow.VISITORS}</td>
+	<td>{statrow.IMAGES}</td>
   </tr>
-<!-- END month -->
+<!-- END statrow -->
 </table>
 <br />