mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2456 from yesszus/patch-4

Browse Source 
Update e107_plugins/log
This commit is contained in:
Cameron
2017-04-21 17:28:50 -07:00
committed by GitHub
parent d45c248e97 5d8ac073c1
commit 904be2b0cd
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_plugins/log/admin_config.php
View File

@@ -148,7 +148,7 @@ e107::css('inline', 'td.last.options { padding-right:20px } ');
'main/datasets' => array('caption'=> ADSTAT_LAN_63, 'perm' => 'P'),
'main/rempage' => array('caption'=> ADSTAT_LAN_26, 'perm' => 'P'),
'main/history' => array('caption'=> ADSTAT_LAN_69, 'perm' => 'P'),
'main/rebuild' => array('caption'=>'Rebuild Statistic Summaries', 'perm'=> 'P'),
'main/rebuild' => array('caption'=> ADSTAT_LAN_87, 'perm'=> 'P'),
);
@@ -159,7 +159,7 @@ e107::css('inline', 'td.last.options { padding-right:20px } ');
'main/edit' => 'main/list'
);
protected $menuTitle = 'Statistic Logging';
protected $menuTitle = ADSTAT_L3;
}
@@ -196,7 +196,7 @@ e107::css('inline', 'td.last.options { padding-right:20px } ');
class logstats_ui extends e_admin_ui
{
protected $pluginTitle = 'Statistic Logging';
protected $pluginTitle = ADSTAT_L3;
protected $pluginName = 'log';
// protected $eventName = 'log-logstats'; // remove comment to enable event triggers in admin.
protected $table = 'logstats';
@@ -741,7 +741,7 @@ e107::css('inline', 'td.last.options { padding-right:20px } ');
if(!empty($_SESSION['stats_log_files_total']))
{
$text .= $frm->progressBar('rebuild-progress',0,array("btn-label"=>"Rebuild Stats", 'url'=>e_REQUEST_URI));
$text .= $frm->progressBar('rebuild-progress',0,array("btn-label"=> ADSTAT_LAN_88, 'url'=>e_REQUEST_URI));
}
$text .= $frm->close();
@@ -1112,7 +1112,7 @@ e107::css('inline', 'td.last.options { padding-right:20px } ');
if($date == 'pageTotal')
{
return $this->button('rebuildTotal', 1, 'delete', 'Rebuild');
return $this->button('rebuildTotal', 1, 'delete', ADSTAT_LAN_89);
}
@@ -1129,7 +1129,7 @@ e107::css('inline', 'td.last.options { padding-right:20px } ');
if(is_readable($file))
{
return $this->button('rebuild', $datestamp, 'delete', 'Rebuild');
return $this->button('rebuild', $datestamp, 'delete', ADSTAT_LAN_89);
}
else
{

8
e107_plugins/log/consolidate.php
View File

@@ -614,11 +614,13 @@ class logConsolidate
if($this->collatePageInfo($pageTotal, $datestamp))
{
$mes->addSuccess( "Data saved to database with id: ".$datestamp);
$message = e107::getParser()->lanVars(ADSTAT_LAN_90, array('x'=>$datestamp));
$mes->addSuccess($message);
}
else
{
$mes->addError( "Couldn't save data to database with id: ".$datestamp);
$message = e107::getParser()->lanVars(ADSTAT_LAN_91, array('x'=>$datestamp));
$mes->addError($message);
}
}
@@ -844,4 +846,4 @@ class logConsolidate
?>
?>

4
e107_plugins/log/languages/English.php
View File

@@ -69,7 +69,7 @@ define("ADSTAT_L49", "sort alphabetically");
define("ADSTAT_L50", "All-time stats");
define("ADSTAT_L51", "Current month stats");
define("ADSTAT_L52", "Previous month stats");
define("ADSTAT_L53", "");
define("ADSTAT_L53", "Information");
define("ADSTAT_L54", "");
define("ADSTAT_L55", "");
define("ADSTAT_L56", "");
@@ -78,4 +78,4 @@ define("ADSTAT_L58", "");
define("ADSTAT_L59", "");
define("ADSTAT_L60", "");
?>
?>

8
e107_plugins/log/languages/English_admin.php
View File

@@ -96,6 +96,10 @@ define ('ADSTAT_LAN_83', 'Following log ID entries removed:');
define ('ADSTAT_LAN_84', 'This proceedure will overwrite the log statistic summaries in your database. (raw log files are left unchanged) Once replaced, the data cannot be recovered. Please backup or export your database first');
define ('ADSTAT_LAN_85', '[x] log files have been found. Click the button below to process these files.');
define ('ADSTAT_LAN_86', 'Total Hits');
define ('ADSTAT_LAN_87', 'Rebuild Statistic Summaries');
define ('ADSTAT_LAN_88', 'Rebuild Stats');
define ('ADSTAT_LAN_89', 'Rebuild');
define ('ADSTAT_LAN_90', "Data saved to database with id: [x]");
define ('ADSTAT_LAN_91', "Couldn't save data to database with id: [x]");
?>
?>

4
e107_plugins/log/stats.php
View File

@@ -1662,7 +1662,7 @@ class siteStats
<table class='table table-striped fborder' style='width: 100%;'>
<tr>
<th class='fcaption' style='width: 30%;'>".ADSTAT_L18."</th>
<th class='fcaption' style='width: 70%;'>Information</th>
<th class='fcaption' style='width: 70%;'>".ADSTAT_L53."</th>
</tr>\n";
foreach($recentArray as $key => $info)
@@ -2044,4 +2044,4 @@ class siteStats
?>
?>