Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -2,9 +2,9 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Forum Statistics
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2013-04-19 19:48:56 -0400 (Fri, 19 Apr 2013) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
@@ -13,7 +13,7 @@
|
||||
* @package IP.Board
|
||||
* @subpackage Forums
|
||||
* @link http://www.invisionpower.com
|
||||
* @version $Rev: 10914 $
|
||||
* @version $Rev: 12191 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -306,7 +306,7 @@ class admin_forums_statistics_stats extends ipsCommand
|
||||
$graph->options['height'] = 480;
|
||||
$graph->options['style3D'] = 0;
|
||||
$graph->options['charttype'] = 'Line';
|
||||
$graph->options['font'] = IPS_PUBLIC_PATH . 'style_captcha/captcha_fonts/Sathu.ttf';
|
||||
$graph->options['font'] = IPS_PUBLIC_PATH . 'style_captcha/captcha_fonts/DejaVuSans.ttf';
|
||||
|
||||
/* Build Graph */
|
||||
$graph->addLabels( $labels );
|
||||
@@ -518,20 +518,26 @@ class admin_forums_statistics_stats extends ipsCommand
|
||||
{
|
||||
case 'daily':
|
||||
$sql_date = "%j %Y";
|
||||
$php_date = "F jS - Y";
|
||||
$php_date = "%B %e - %Y";
|
||||
break;
|
||||
|
||||
case 'monthly':
|
||||
$sql_date = "%m %Y";
|
||||
$php_date = "F Y";
|
||||
$php_date = "%B %Y";
|
||||
break;
|
||||
|
||||
default:
|
||||
// weekly
|
||||
$sql_date = "%U %Y";
|
||||
$php_date = "W [F Y]";
|
||||
$php_date = "%U [%B %Y]";
|
||||
break;
|
||||
}
|
||||
|
||||
/* @link http://php.net/strftime */
|
||||
if ( strtoupper( substr( PHP_OS, 0, 3 ) ) == 'WIN' )
|
||||
{
|
||||
$php_date = preg_replace( '#(?<!%)((?:%%)*)%e#', '\1%#d', $php_date );
|
||||
}
|
||||
|
||||
/* Table Title */
|
||||
$title = $this->lang->words[ 'timescale_' . $this->request['timescale'] ] ." {$table} ({$human_from_date['mday']} {$this->month_names[$human_from_date['mon']]} {$human_from_date['year']} {$this->lang->words['stats_to']} {$human_to_date['mday']} {$this->month_names[$human_to_date['mon']]} {$human_to_date['year']})";
|
||||
@@ -598,11 +604,11 @@ class admin_forums_statistics_stats extends ipsCommand
|
||||
/* Format Date */
|
||||
if( $this->request['timescale'] == 'weekly' )
|
||||
{
|
||||
$data['_name'] = $this->lang->words['stats_weekno'] . date( $php_date, $data['result_maxdate'] );
|
||||
$data['_name'] = $this->lang->words['stats_weekno'] . strftime( $php_date, $data['result_maxdate'] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$data['_name'] = date( $php_date, $data['result_maxdate'] );
|
||||
$data['_name'] = strftime( $php_date, $data['result_maxdate'] );
|
||||
}
|
||||
|
||||
$rows[] = $data;
|
||||
@@ -730,7 +736,7 @@ class admin_forums_statistics_stats extends ipsCommand
|
||||
|
||||
/* Loop through the results */
|
||||
$running_total = 0;
|
||||
$max_result = 0;
|
||||
$max_result = 1;
|
||||
$results = array();
|
||||
$running_total = 0;
|
||||
|
||||
@@ -754,7 +760,7 @@ class admin_forums_statistics_stats extends ipsCommand
|
||||
|
||||
/* Build the output rows */
|
||||
$rows = array();
|
||||
|
||||
|
||||
foreach( $results as $data )
|
||||
{
|
||||
$running_total += $row['result_count'];
|
||||
|
||||
Reference in new issue
Block a user