iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

2005-10-30 volcom

Browse Source 
* bug 190 fixed: issue in stats.tpl display
	* bug fixed: labels of monthly, daily graph fixed


git-svn-id: http://piwigo.org/svn/trunk@918 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
volcom
2005-10-30 20:35:39 +00:00
parent 4caa3f6c84
commit 7b9d91a8e6
7 changed files with 137 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
admin/images/daily_stats.img.php Normal file
View File

@@ -0,0 +1,121 @@
<?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_daily_graph_title'];
$imageHeight = 256;
$imageWidth = 512;
$sql = '
SELECT DISTINCT COUNT(*)
, HOUR(DATE_FORMAT(date, \'%H:%i:%s\'))
FROM '.HISTORY_TABLE.'
WHERE YEAR(date) = '.$_GET['year'].'
AND MONTH(date) = '.$_GET['month'].'
AND DAYOFMONTH(date) = '.$_GET['day'].'
GROUP BY DATE_FORMAT(date, \'%H\') 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);
$hours = array();
for ($i = 0; $i <= 23; $i++)
{
$hours[$i] = 0;
}
while ($r = mysql_fetch_row($result))
{
$hours[$r[1]]= $r[0];
}
$o=0;
while (list ($key,$value) = each($hours ))
{
$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);
?>

2
admin/images/monthly_stats.img.php
View File

@@ -33,7 +33,7 @@ include_once( 'phpBarGraph.php' );
//------------------------------------------------ variable definition
$outputFormat = "png";
$legend = $lang['stats_global_graph_title'];
$legend = $lang['stats_monthly_graph_title'];
$imageHeight = 256;
$imageWidth = 512;
$sql = '

2
admin/stats.php
View File

@@ -38,7 +38,7 @@ $where_clause = "1";
if (isset($_GET['day']) && isset($_GET['month']) && isset($_GET['year']) )
{
$url_img .= 'dayly_stats.img.php?year='.$_GET['year'].'&month='.$_GET['month'].'&day='.$_GET['day'];
$url_img .= 'daily_stats.img.php?year='.$_GET['year'].'&month='.$_GET['month'].'&day='.$_GET['day'];
$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']." )";

5
doc/ChangeLog
View File

@@ -1,3 +1,8 @@
2005-10-30 volcom
* bug 190 fixed: issue in stats.tpl display
* bug fixed: labels of monthly, daily graph fixed
2005-10-26 chrisaga
* bug 177 fixed: for Safari (was fixed for Konqueror only)

2
language/en_UK.iso-8859-1/admin.lang.php
View File

@@ -262,7 +262,7 @@ $lang['selection'] = 'selection';
$lang['set to'] = 'set to';
$lang['singly represented'] = 'singly represented';
$lang['stats_global_graph_title'] = 'Pages seen by month';
$lang['stats_dayly_graph_title'] = 'Pages seen by hour';
$lang['stats_daily_graph_title'] = 'Pages seen by hour';
$lang['stats_monthly_graph_title'] = 'Pages seen by day';
$lang['stats_month_title'] = 'Monthly statistics';
$lang['stats_day_title'] = 'Daily statistics';

2
language/fr_FR.iso-8859-1/admin.lang.php
View File

@@ -261,7 +261,7 @@ $lang['set to'] = 'changer en';
$lang['singly represented'] = 'représentant fixe';
$lang['stats_global_graph_title'] = 'Pages vues par mois';
$lang['stats_monthly_graph_title'] = 'Pages vues par jour';
$lang['stats_dayly_graph_title'] = 'Pages vues par heure';
$lang['stats_daily_graph_title'] = 'Pages vues par heure';
$lang['stats_month_title'] = 'Statistiques mensuelles';
$lang['stats_day_title'] = 'Statistiques journalières';
$lang['stats_pages_seen'] = 'Pages vues';

15
template/yoga/admin/stats.tpl
View File

@@ -20,17 +20,18 @@
<td>{statrow.IMAGES}</td>
</tr>
<!-- END statrow -->
</table>
<h3>{L_DATE_TITLE}</h3>
<table class="table2" width="98%">
<tr class="throw">
<th>{L_STAT_HOUR}</th>
<th>{L_STAT_LOGIN}</th>
<th>{L_STAT_LOGIN}</th>
<th>{L_STAT_ADDR}</th>
<th>{L_STAT_CATEGORY}</th>
<th>{L_STAT_FILE}</th>
<th>{L_STAT_PICTURE}</th>
</tr>
<h3>{L_DATE_TITLE}</h3>
<!-- BEGIN detail -->
<tr class="{detail.T_CLASS}">
<td nowrap>{detail.HOUR}</td>
@@ -41,13 +42,11 @@
<td>{detail.PICTURE}</td>
</tr>
<!-- END detail -->
</table>
<br />
<!-- BEGIN navigation -->
<div class="admin">
<div class="admin">
{navigation.NAV_BAR}
</div>
<!-- END navigation -->
<br />
</table>
<!-- END navigation -->