From aa157c353684c646b9852e4bcea4f6c8d62755a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Fri, 24 Feb 2017 09:31:24 +0100 Subject: [PATCH 1/8] Update e107_plugins/log --- e107_plugins/log/admin_config.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/e107_plugins/log/admin_config.php b/e107_plugins/log/admin_config.php index 3a5e845be..81b6b5633 100644 --- a/e107_plugins/log/admin_config.php +++ b/e107_plugins/log/admin_config.php @@ -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 { From 7ee87b5ef49976df4597b654dc6ca444f1ce900f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Fri, 24 Feb 2017 09:32:46 +0100 Subject: [PATCH 2/8] Update English.php --- e107_plugins/log/languages/English.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/log/languages/English.php b/e107_plugins/log/languages/English.php index 00744aeb8..4e815cc03 100644 --- a/e107_plugins/log/languages/English.php +++ b/e107_plugins/log/languages/English.php @@ -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", ""); -?> \ No newline at end of file +?> From a6f121b63b9bab66bb12c229cc6cf1f5d32d5dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Fri, 24 Feb 2017 09:36:09 +0100 Subject: [PATCH 3/8] Update English_admin.php --- e107_plugins/log/languages/English_admin.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/e107_plugins/log/languages/English_admin.php b/e107_plugins/log/languages/English_admin.php index b30f44af4..209034657 100644 --- a/e107_plugins/log/languages/English_admin.php +++ b/e107_plugins/log/languages/English_admin.php @@ -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:'); +define ('ADSTAT_LAN_91', 'Couldn\'t save data to database with id:'); - -?> \ No newline at end of file +?> From 7905d46b07a5bfa3545912b588aaa4ef42c0794c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Fri, 24 Feb 2017 09:37:08 +0100 Subject: [PATCH 4/8] Update stats.php --- e107_plugins/log/stats.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/log/stats.php b/e107_plugins/log/stats.php index c46fea0a3..815a32d5d 100644 --- a/e107_plugins/log/stats.php +++ b/e107_plugins/log/stats.php @@ -1662,7 +1662,7 @@ class siteStats - + \n"; foreach($recentArray as $key => $info) @@ -2044,4 +2044,4 @@ class siteStats -?> \ No newline at end of file +?> From 1382640393322385be7cdf49e83568333d7362d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Fri, 24 Feb 2017 09:43:00 +0100 Subject: [PATCH 5/8] Update consolidate.php --- e107_plugins/log/consolidate.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_plugins/log/consolidate.php b/e107_plugins/log/consolidate.php index 73b2f3c04..b86e84d23 100644 --- a/e107_plugins/log/consolidate.php +++ b/e107_plugins/log/consolidate.php @@ -614,11 +614,11 @@ class logConsolidate if($this->collatePageInfo($pageTotal, $datestamp)) { - $mes->addSuccess( "Data saved to database with id: ".$datestamp); + $mes->addSuccess( ADSTAT_LAN_90.$datestamp); } else { - $mes->addError( "Couldn't save data to database with id: ".$datestamp); + $mes->addError( ADSTAT_LAN_91.$datestamp); } } @@ -844,4 +844,4 @@ class logConsolidate -?> \ No newline at end of file +?> From b9cfbfae9e3eb40c33af439675a5b53c9b7006c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 15 Apr 2017 20:46:30 +0200 Subject: [PATCH 6/8] Update English_admin.php --- e107_plugins/log/languages/English_admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/log/languages/English_admin.php b/e107_plugins/log/languages/English_admin.php index 209034657..bbef0c6ba 100644 --- a/e107_plugins/log/languages/English_admin.php +++ b/e107_plugins/log/languages/English_admin.php @@ -99,7 +99,7 @@ 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:'); -define ('ADSTAT_LAN_91', 'Couldn\'t save data to database with id:'); +define("ADSTAT_LAN_90", "Data saved to database with id: [x]"); +define("ADSTAT_LAN_91", "Couldn't save data to database with id: [x]"); ?> From 3044bb58010597c079ba2255b55b2e5cc88b9a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 15 Apr 2017 20:47:12 +0200 Subject: [PATCH 7/8] Update English_admin.php --- e107_plugins/log/languages/English_admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/log/languages/English_admin.php b/e107_plugins/log/languages/English_admin.php index bbef0c6ba..51e888f55 100644 --- a/e107_plugins/log/languages/English_admin.php +++ b/e107_plugins/log/languages/English_admin.php @@ -99,7 +99,7 @@ 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]"); +define ('ADSTAT_LAN_90', "Data saved to database with id: [x]"); +define ('ADSTAT_LAN_91', "Couldn't save data to database with id: [x]"); ?> From 5d8ac073c1193e9d4d7e484a8fd3839a896c0f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sat, 15 Apr 2017 20:48:58 +0200 Subject: [PATCH 8/8] Update consolidate.php --- e107_plugins/log/consolidate.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/e107_plugins/log/consolidate.php b/e107_plugins/log/consolidate.php index b86e84d23..11e3c8aac 100644 --- a/e107_plugins/log/consolidate.php +++ b/e107_plugins/log/consolidate.php @@ -614,11 +614,13 @@ class logConsolidate if($this->collatePageInfo($pageTotal, $datestamp)) { - $mes->addSuccess( ADSTAT_LAN_90.$datestamp); + $message = e107::getParser()->lanVars(ADSTAT_LAN_90, array('x'=>$datestamp)); + $mes->addSuccess($message); } else { - $mes->addError( ADSTAT_LAN_91.$datestamp); + $message = e107::getParser()->lanVars(ADSTAT_LAN_91, array('x'=>$datestamp)); + $mes->addError($message); } }
".ADSTAT_L18."Information".ADSTAT_L53."