From 24939cec5401e479369cdb27aabf6d60073bc341 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 6 Oct 2015 11:01:23 -0700
Subject: [PATCH 01/11] Plugin: Logstats -  prevent broken array scenario.
 Allow e_footer.php to echo to browser when required.

---
 e107_core/templates/footer_default.php | 13 ++++++-----
 e107_plugins/log/consolidate.php       | 32 +++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/e107_core/templates/footer_default.php b/e107_core/templates/footer_default.php
index ebd41f43f..b061d1f85 100644
--- a/e107_core/templates/footer_default.php
+++ b/e107_core/templates/footer_default.php
@@ -277,11 +277,11 @@ if (isset($footer_js) && is_array($footer_js))
 	}
 }
 
-// Load e_footer.php files. 
-if (is_array($pref['e_footer_list']))
+// Load e_footer.php files.
+if (!empty($pref['e_footer_list']) && is_array($pref['e_footer_list']))
 {
-	ob_start();
-	
+	//ob_start(); // sometimes raw HTML needs to be added at the bottom of every page. eg. <noscript> etc. so allow 'echo' in e_footer files. (but not e_header)
+
 	foreach($pref['e_footer_list'] as $val)
 	{		
 		$fname = e_PLUGIN.$val."/e_footer.php"; // Do not place inside a function - BC $pref required. . 
@@ -290,11 +290,12 @@ if (is_array($pref['e_footer_list']))
 		{
 			
 			$ret = ($e107_debug || isset($_E107['debug'])) ? include_once($fname) : @include_once($fname);
+
 		}	
 	}
 
-	$e_footer_ouput = ob_get_contents(); // Don't use. 
-	ob_end_clean();
+//	$e_footer_ouput = ob_get_contents(); // Don't use.
+//	ob_end_clean();
 	unset($ret);
 }
 
diff --git a/e107_plugins/log/consolidate.php b/e107_plugins/log/consolidate.php
index 858a549b5..e41833be6 100644
--- a/e107_plugins/log/consolidate.php
+++ b/e107_plugins/log/consolidate.php
@@ -203,6 +203,9 @@ class logConsolidate
 
 			$pageName = $err_code.$pageName;			// Add the error code at the beginning, so its treated uniquely
 
+			// filter out any non-utf8 characters which could halt processing.
+			$pageName = urldecode($pageName);
+			$pageName = iconv('UTF-8', 'ASCII//IGNORE', $pageName);
 
 			return $pageName;
 		}
@@ -220,12 +223,14 @@ class logConsolidate
 
 			if(!is_readable($path))
 			{
+				echo "File Not Found: ".$path;
 				return false;
 			}
 
 			$handle = fopen($path, "r");
 
 			$pageTotal = array();
+			$line = 0;
 
 			if ($handle)
 			{
@@ -233,15 +238,28 @@ class logConsolidate
 				{
 					if($vars = $this->splitRawBackupLine($buffer))
 					{
+
+						if(substr($vars['eself'],0,7) == 'file://')
+						{
+							continue;
+						}
+
 						$key = $this->getPageKey($vars['eself']);
 
+						if(empty($key))
+						{
+							continue;
+						}
+
+						if(!isset($pageTotal[$key]))
+						{
+							$pageTotal[$key] = array('url'=>'', 'ttl'=>0, 'unq'=>0);
+						}
+
 						$pageTotal[$key]['url'] = $vars['eself'];
 						$pageTotal[$key]['ttl'] += 1;
 
-						if(!isset($pageTotal[$key]['unq']))
-						{
-							$pageTotal[$key]['unq'] = 0;
-						}
+					//	echo "\n<br />line: ".$line."   ------- ".$key;
 
 						if(isset($vars['unique']))
 						{
@@ -255,6 +273,8 @@ class logConsolidate
 							$pageTotal[$key]['unq'] += 1;
 						}
 					}
+
+					$line++;
 				}
 
 				if (!feof($handle))
@@ -289,7 +309,7 @@ class logConsolidate
 
 					if($sql->select('logstats','log_id',"log_id='".$datestamp."' "))
 					{
-						$sql->update('logstats', "log_id='".$datestamp."-bak' WHERE log_id='".$datestamp."' ");
+						$sql->update('logstats', "log_id='bak-".$datestamp."' WHERE log_id='".$datestamp."' ");
 					}
 
 					if($this->collatePageInfo($pageTotal, $datestamp))
@@ -329,7 +349,7 @@ class logConsolidate
 		{
 			$sql = e107::getDb();
 
-			$qry = "SELECT * FROM `#logstats` WHERE `log_id` REGEXP '^[0-9]' AND `log_data` LIKE '%http%'";
+			$qry = "SELECT * FROM `#logstats` WHERE `log_id` REGEXP '^[0-9]' AND LENGTH(log_id) > 7 AND `log_data` LIKE '%http%'";
 			$data = $sql->retrieve($qry,true);
 
 			$pageTotal = array();

From 6ec85f5c0fda5f6a7222385729be59c507ac6b27 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 11 Oct 2015 17:35:12 -0700
Subject: [PATCH 02/11] Cleaned up stats logging class. Added options in admin
 area to rebuild monthly and all-time stats from raw Log files. Admin language
 file definitions were renamed to match v2.x standards. (was missing "LAN").
 Frontend language-file correction pending.

---
 e107_plugins/log/admin_config.php            | 1613 +++++++++++-------
 e107_plugins/log/consolidate.php             |  589 ++++---
 e107_plugins/log/e_meta.php                  |    3 +
 e107_plugins/log/languages/English_admin.php |  101 ++
 4 files changed, 1464 insertions(+), 842 deletions(-)
 create mode 100644 e107_plugins/log/languages/English_admin.php

diff --git a/e107_plugins/log/admin_config.php b/e107_plugins/log/admin_config.php
index 3b77ca33f..3103cb83b 100644
--- a/e107_plugins/log/admin_config.php
+++ b/e107_plugins/log/admin_config.php
@@ -14,7 +14,1025 @@ require_once('../../class2.php');
 
 if (!getperms('P') || !e107::isInstalled('log')) 
 {
-	header('Location: '.e_BASE.'index.php');
+	header('Location: '.e_HTTP.'index.php');
+	exit;
+}
+
+define('LogFlagFile', 'LogFlag.php');
+
+include_lan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'.php');
+include_lan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'_admin.php');
+
+if(!is_writable(e_LOG))
+{
+	//$message = "<b>".ADSTAT_LAN_38."</b>"; 
+	e107::getMessage()->addError(ADSTAT_LAN_28);
+}
+
+e107::css('inline', 'td.last.options { padding-right:20px } ');
+
+	// Needed on Windoze platforms - not an ideal solution!
+	if (!function_exists('nl_langinfo'))
+	{
+		define('MON_1',86400);
+		define('MON_2',2764800);
+		define('MON_3',5443200);
+		define('MON_4',8035200);
+		define('MON_5',10800000);
+		define('MON_6',13392000);
+		define('MON_7',15811200);
+		define('MON_8',19008000);
+		define('MON_9',21168000);
+		define('MON_10',23760000);
+		define('MON_11',26352000);
+		define('MON_12',28944000);
+
+		function nl_langinfo($mon)
+		{
+			return date('F',$mon);
+		}
+	}
+
+
+
+
+	class log_adminArea extends e_admin_dispatcher
+	{
+
+		protected $modes = array(
+
+			'main'	=> array(
+				'controller' 	=> 'logstats_ui',
+				'path' 			=> null,
+				'ui' 			=> 'logstats_form_ui',
+				'uipath' 		=> null
+			),
+
+
+		);
+
+
+		protected $adminMenu = array(
+
+			'main/prefs'		=> array('caption'=> LAN_SETTINGS, 'perm' => 'P'),
+			'main/list'			=> array('caption'=> ADSTAT_LAN_48, 'perm' => 'P'),
+			'main/export'		=> array('caption'=> ADSTAT_LAN_36, 'perm' => 'P'),
+			'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'),
+		);
+
+
+
+
+
+		protected $adminMenuAliases = array(
+			'main/edit'	=> 'main/list'
+		);
+
+		protected $menuTitle = 'Statistic Logging';
+	}
+
+
+	// List of the non-page-based info which is gathered - historically only 'all-time' stats, now we support monthly as well
+	$stats_list = array('statBrowser'=>ADSTAT_LAN_6,'statOs'=>ADSTAT_LAN_7,'statScreen'=>ADSTAT_LAN_8,'statDomain'=>ADSTAT_LAN_9,'statReferer'=>ADSTAT_LAN_10,'statQuery'=>ADSTAT_LAN_11);
+
+	$separator_list = array(1 => ADSTAT_LAN_57, 2 => ADSTAT_LAN_58);
+	$separator_char = array(1 => ',', 2 => '|');
+	$quote_list = array(1 => ADSTAT_LAN_50, 2 => ADSTAT_LAN_55, 3 => ADSTAT_LAN_56);
+	$quote_char = array(1 => '', 2 => "'", 3 => '"');
+
+
+	//---------------------------------------------
+	//		Export data file
+	//---------------------------------------------
+	$export_filter = '';		// can be 'LIKE', 'REGEX', or simple equality
+	$export_type = $tp->toDB(varset($_POST['export_type'],'page'));				// Page data or one of the other bits of info
+	$export_date = intval(varset($_POST['export_date'],1));
+	$export2_date = intval(varset($_POST['export2_date'],3));
+	$export_year = intval(varset($_POST['export_year'],date('Y')));
+	$export_month = intval(varset($_POST['export_month'],date('m')));
+	$export_day = intval(varset($_POST['export_day'],date('j')));
+	$export_char = varset($_POST['export_char'], 1);
+	$export_quote = varset($_POST['export_quote'], 1);
+	$export_stripurl = varset($_POST['export_stripurl'], 0);
+
+
+
+
+
+
+
+
+	class logstats_ui extends e_admin_ui
+	{
+
+		protected $pluginTitle		= 'Statistic Logging';
+		protected $pluginName		= 'log';
+		//	protected $eventName		= 'log-logstats'; // remove comment to enable event triggers in admin.
+		protected $table			= 'logstats';
+		protected $pid				= 'log_uniqueid';
+		protected $perPage			= 10;
+		protected $batchDelete		= true;
+		//	protected $batchCopy		= true;
+		//	protected $sortField		= 'somefield_order';
+		//	protected $orderStep		= 10;
+		//	protected $tabs				= array('Tabl 1','Tab 2'); // Use 'tab'=>0  OR 'tab'=>1 in the $fields below to enable.
+		protected $listQry              = "SELECT * FROM `#logstats` WHERE `log_id` = 'pageTotal' OR (`log_id` REGEXP '^[0-9]' AND LENGTH(log_id) > 7 AND LENGTH(log_id) < 11) ";
+
+		//	protected $listQry      	= "SELECT * FROM `#tableName` WHERE field != '' "; // Example Custom Query. LEFT JOINS allowed. Should be without any Order or Limit.
+
+		protected $listOrder		= 'CASE log_id WHEN "pageTotal" THEN 9999 ELSE DATE(log_id) END DESC  ';
+
+
+		protected $fields 		= array (  'checkboxes' =>   array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect',  ),
+		                                    'log_uniqueid' =>   array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
+		                                    'log_id' =>   array ( 'title' => LAN_DATE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
+		                                    'log_data' =>   array ( 'title' => ADSTAT_L21, 'type' => 'method', 'data' => 'str', 'width' => '20%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'right', 'thclass' => 'right',  ),
+		                                    'log_data2' =>   array ( 'title' => ADSTAT_L22, 'type' => 'method', 'data' => false, 'width' => '20%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'right', 'thclass' => 'right',  ),
+
+		                                    'options' =>   array ( 'title' => LAN_OPTIONS, 'type' => 'method', 'data' => null, 'width' => '15%', 'thclass' => 'right last', 'class' => 'right last', 'forced' => '1',  ),
+		);
+
+		protected $fieldpref = array();
+
+
+		//	protected $preftabs        = array('General', 'Other' );
+		protected $prefs = array(
+		);
+
+
+		public function init()
+		{
+			if(!empty($_POST['rebuild']))
+			{
+				require_once(e_PLUGIN.'log/consolidate.php');
+				$lgc = new logConsolidate();
+				$file = $_POST['rebuild']."_SiteStats.log";
+				$lgc->processRawBackupLog($file, true);
+			}
+
+			if(!empty($_POST['rebuildTotal']))
+			{
+				require_once(e_PLUGIN.'log/consolidate.php');
+				$lgc = new logConsolidate();
+
+				if($lgc->collatePageTotalDB())
+				{
+					e107::getMessage()->addSuccess(LAN_UPDATED);
+				}
+				else
+				{
+					e107::getMessage()->addError(LAN_UPDATED_FAILED);
+				}
+
+			}
+
+			// Set drop-down values (if any).
+			if (isset($_POST['updatesettings']))
+			{
+				$this->prefsPageSubmit();
+			}
+
+			if(isset($_POST['remSelP']))
+			{
+				$this->rempagePageSubmit();	 // Do the deletions - then redisplay the list of pages
+			}
+
+
+			if(isset($_POST['wipeSubmit']))
+			{
+				$this->wipe(); 
+			}
+		}
+
+
+		/**
+		 * Wipe accumulated stats
+		 */
+		private function wipe()
+		{
+			$sql = e107::getDb();
+			
+			$logStr = '';
+			foreach($_POST['wipe'] as $key => $wipe)
+			{
+				switch($key)
+				{
+					case "statWipePage":
+						$sql->update("logstats", "log_data='' WHERE log_id='pageTotal' ");
+						$sql->update("logstats", "log_data='' WHERE log_id='statTotal' ");
+						$sql->update("logstats", "log_data='' WHERE log_id='statUnique' ");
+						break;
+
+					case "statWipeBrowser":
+						$sql->update("logstats", "log_data='' WHERE log_id='statBrowser' ");
+						break;
+
+					case "statWipeOs":
+						$sql->update("logstats", "log_data='' WHERE log_id='statOs' ");
+						break;
+
+					case "statWipeScreen":
+						$sql->update("logstats", "log_data='' WHERE log_id='statScreen' ");
+						break;
+
+					case "statWipeDomain":
+						$sql->update("logstats", "log_data='' WHERE log_id='statDomain' ");
+						break;
+
+					case "statWipeRefer":
+						$sql->update("logstats", "log_data='' WHERE log_id='statReferer' ");
+						break;
+
+					case "statWipeQuery":
+						$sql->update("logstats", "log_data='' WHERE log_id='statQuery' ");
+						break;
+
+				}
+
+				$logStr .= '[!br!]'.$key;
+			}
+				
+			e107::getLog()->add('STAT_01',ADSTAT_LAN_81.$logStr,'');
+
+			e107::getMessage()->addSuccess(LAN_UPDATED);
+
+		}
+
+		private function get_for_delete($keep_year,$keep_month = 1, $filter='*')
+		{
+
+			$sql = e107::getDb();
+
+			global $stats_list;
+			$ret = array();
+			// Its tedious, but the filter criteria are sufficiently tricky that its probably best to read all records and decide what can go
+			if ($sql->select('logstats','log_id'))
+			{
+				while ($row = $sql->fetch())
+				{
+					$can_go = FALSE;
+					$check = FALSE;
+					$data_type = 'unknown';
+					$date_info = $row['log_id'];
+					if (($temp = strpos($date_info,':')) !== FALSE)
+					{  // its monthly browser stats and similar
+//	    echo "Checking {$date_info}, posn = {$temp} ";
+						$data_type = substr($date_info,0,$temp);
+						$date_info = substr($date_info,$temp+1);
+						$check = TRUE;
+//		echo "Date string: {$date_info}, data type: {$data_type}<br />";
+						if (isset($stats_list[$data_type])) $data_type = $stats_list[$data_type];
+					}
+					list($poss_year,$poss_month,$poss_day) = explode('-',$date_info.'--',3);
+					if (!$check)
+					{
+						if (is_numeric($poss_year))
+						{
+							$check = TRUE;
+							if ($poss_day > 0) $data_type = 'daily'; else $data_type = 'monthly';
+						}
+					}
+					if ($check)
+					{
+						if ($keep_year == $poss_year)
+						{
+							if (($poss_month > 0) && ($poss_month < $keep_month)) $can_go = TRUE;
+						}
+						elseif ($keep_year > $poss_year) $can_go = TRUE;
+					}
+					if ($can_go)
+					{
+						$ret[$row['log_id']] = $row['log_id']." - ".$data_type;
+					}
+				}
+			}
+
+			return $ret;
+
+		}
+
+		private function data_type_select($name,$value)
+		{
+			global $stats_list;
+
+			$ret = "<select name='{$name}' class='tbox'  onchange=\"settypebox(this.value);\">\n
+			<option value='page' ".($value == 'page' ? " selected='selected'" : "").">".ADSTAT_LAN_52."</option>\n";
+
+			foreach ($stats_list as $k=>$v)
+			{
+				$ret .= "<option value='{$k}' ".($value == $k ? " selected='selected'" : "").">{$v}</option>\n";
+			}
+			$ret .= "</select>\n";
+			return $ret;
+		}
+
+
+
+		private function gen_select($prompt,$name,$value)
+		{
+			$ret = "<div class='control-group clearfix' >
+	        <span class='pull-left'>".$prompt."</span><span class='pull-right'><select name='{$name}' class='tbox'>\n
+			<option value='0' ".($value == 0 ? " selected='selected'" : "").">".ADSTAT_LAN_50."</option>\n
+			<option value='1' ".($value == 1 ? " selected='selected'" : "").">".ADSTAT_LAN_49."</option>\n
+			<option value='2' ".($value == 2 ? " selected='selected'" : "").">".ADSTAT_LAN_48."</option>\n
+			</select></span></div>";
+			return $ret;
+		}
+
+
+		function datasetsPage()
+		{
+			return $this->export('datasets');
+		}
+
+		function exportPage()
+		{
+			return $this->export('export');
+		}
+
+		private function export($action)
+		{
+			global $export_type, $export_date, $export2_date, $export_day, $export_month, $export_year, $separator_list,
+			       $export_char, $quote_list, $export_quote, $export_filter;
+
+			$frm = e107::getForm();
+			$sql = e107::getDb();
+
+			$text = "<div style='text-align:center'>";
+
+			if ($action == 'export')
+			{
+				$text .= "<form method='post' action='".e_PLUGIN."log/stats_csv.php?export'>";
+			}
+			else
+			{
+				$text .= "<form method='post' action='".e_SELF."?".e_QUERY."'>";
+			}
+
+			$text .= "<table class='table adminform'>
+			<colgroup>
+			  <col style='width:50%' />
+			  <col style='width:50%' />
+			</colgroup>
+			";
+
+			if ($action == 'export')
+			{
+				$text .= "<tr><td colspan = '2'>".ADSTAT_LAN_67."</td></tr>";
+			}
+			else
+			{
+				$text .= "<tr><td colspan = '2'>".ADSTAT_LAN_68."</td></tr>";
+			}
+
+			// Type of output data - page data, browser stats....
+			$text .= "<tr><td>".ADSTAT_LAN_51."</td><td>\n".$this->data_type_select('export_type',$export_type).'</td></tr>';
+				// Period selection type for page data
+			$text .= "<tr><td>".ADSTAT_LAN_41."</td><td>\n
+			<select class='tbox' name='export_date' id='export_date' onchange=\"setdatebox(this.value);\" ".($export_type=='page' ? "" : "style='display:none'" ).">\n
+			<option value='1' ".($export_date==1 ? " selected='selected'" : '') . ">".ADSTAT_LAN_42."</option>\n
+			<option value='2' ".($export_date==2 ? " selected='selected'" : '') . ">".ADSTAT_LAN_43."</option>\n
+			<option value='3' ".($export_date==3 ? " selected='selected'" : '') . ">".ADSTAT_LAN_44."</option>\n
+			<option value='4' ".($export_date==4 ? " selected='selected'" : '') . ">".ADSTAT_LAN_45."</option>\n
+			<option value='5' ".($export_date==5 ? " selected='selected'" : '') . ">".ADSTAT_LAN_62."</option>\n
+			</select>";
+
+			// Period selection type for non-page data
+			$text .= "
+				<select class='tbox' name='export2_date' id='export2_date' onchange=\"setdatebox(this.value);\"  ".($export_type=='page' ? "style='display:none'" : "").">\n
+				<option value='3'".($export2_date==3 ? " selected='selected'" : "").">".ADSTAT_LAN_44."</option>\n
+				<option value='4'".($export2_date==4 ? " selected='selected'" : "").">".ADSTAT_LAN_45."</option>\n
+				</select>";
+
+			$text .= "</td></tr>";
+
+
+
+			$text .= "<tr><td>".ADSTAT_LAN_46."</td><td>\n";
+
+
+					// Now put the various dropdowns - their visibility is controlled by the export_type dropdown
+
+					$text .= "<select class='tbox' name='export_day' id='export_day'>\n";
+					for ($i = 1; $i < 32; $i++)
+					{
+						$selected = $export_day == $i ? " selected='selected'" : "";
+						$text .= "<option value='{$i}' {$selected} >{$i}</option>\n";
+					};
+					$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
+
+
+					$text .= "<select class='tbox' name='export_month' id='export_month'>\n";
+					for ($i = 1; $i < 13; $i++)
+					{
+						$selected = $export_month == $i ? " selected='selected'" : "";
+						$text .= "<option value='{$i}' {$selected}>".nl_langinfo(constant('MON_'.$i))."</option>\n";
+					};
+					$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
+
+					$this_year = date("Y");
+					$text .= "<select class='tbox' name='export_year' id='export_year'>\n";
+					for ($i = $this_year; $i > $this_year - 6; $i--)
+					{
+						$selected = $export_year == $i ? " selected='selected'" : "";
+						$text .= "<option value='{$i}' {$selected}>{$i}</option>\n";
+					};
+					$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
+
+					$text .= "<span id='export_cumulative' style='display: none'>".ADSTAT_LAN_53."</span>\n";
+
+					$text .= "</td></tr>";
+
+
+					if ($action == 'export')
+					{
+						// Separators, quotes
+						$text .= "<tr><td>".ADSTAT_LAN_59."</td><td>\n
+					<select class='tbox' name='export_char'>";
+
+						foreach ($separator_list as $k=>$v)
+						{
+							$selected = $export_char == $k ? " selected='selected'" : "";
+							$text .= "<option value='{$k}' {$selected}>{$v}</option>\n";
+						}
+						$text .= "</select>\n&nbsp;&nbsp;&nbsp;&nbsp;<select class='tbox' name='export_quote'>\n";
+						foreach ($quote_list as $k=>$v)
+						{
+							$selected = $export_quote == $k ? " selected='selected'" : "";
+							$text .= "<option value='{$k}'".$selected.">{$v}</option>\n";
+						}
+						$text .= "</select>\n</td></tr>";
+
+						$text .= "<tr>
+			<td>".ADSTAT_LAN_60."</td>
+			<td>".$frm->checkbox('export_stripurl', 1)."<span class='field-help'>".ADSTAT_LAN_61."</span></td>
+			</tr>";
+					}
+
+
+					if ($export_filter)
+					{
+						if (getperms('0')) $text .= "<tr><td>".ADSTAT_LAN_65."</td><td>".$export_filter."</td></tr>";
+						$sql ->select("logstats", "log_id", "{$export_filter} ");
+						$text .= "<tr><td>".ADSTAT_LAN_64."</td><td>";
+						while($row = $sql ->fetch())
+						{
+							$text .= $row['log_id']."<br />";
+						}
+						$text .= "</td></tr>";
+					}
+
+					$text .= "
+			</table>
+				<div class='buttons-bar center'>
+			".$frm->admin_button('create_export', ($action == 'export' ? LAN_CREATE : ADSTAT_LAN_66), 'update')."
+			</div>
+			</form>
+			</div>";
+
+			// Set up the date display boxes
+			$text .= "<script type=\"text/javascript\"> settypebox('{$export_type}');</script>";
+
+			return $text;
+			//$ns->tablerender(ADSTAT_LAN_40, $text);
+		}
+
+
+
+		private function rempagePageSubmit()
+		{
+
+			$ipAddresses = null;
+			$siteTotal = null;
+			$siteUnique = null;
+
+			$sql = e107::getDb();
+
+			$pageInfo = array();
+
+			$sql->select("logstats", "*", "log_id='pageTotal' ");
+			$row = $sql ->fetch();
+			$pageTotal = unserialize($row['log_data']);
+			$logfile = e_LOG."logp_".date("z.Y", time()).".php";
+
+			if(is_readable($logfile))
+			{
+				require($logfile);
+			}
+
+			foreach($_POST['remcb'] as $page)
+			{
+				unset($pageInfo[$page]);
+				unset($pageTotal[$page]);
+			}
+
+			$pagetotal = serialize($pageTotal);
+
+			if(!$sql->update("logstats", "log_data='{$pagetotal}' WHERE log_id='pageTotal' "))
+			{
+				$sql->insert("logstats", "0, 'pageTotal', '{$pagetotal}' ");
+			}
+
+			e107::getLog()->add('STAT_03',ADSTAT_LAN_80."[!br!]".implode("[!br!]",$_POST['remcb']),'');
+
+			$varStart = chr(36);
+			$quote = chr(34);
+
+			$data = chr(60)."?php\n". chr(47)."* e107 website system: Log file: ".date("z:Y", time())." *". chr(47)."\n\n".
+				$varStart."ipAddresses = ".$quote.$ipAddresses.$quote.";\n".
+				$varStart."siteTotal = ".$quote.$siteTotal.$quote.";\n".
+				$varStart."siteUnique = ".$quote.$siteUnique.$quote.";\n";
+
+			$loop = FALSE;
+			$data .= $varStart."pageInfo = array(\n";
+			foreach($pageInfo as $info)
+			{
+				$page = preg_replace("/(\?.*)|(\_.*)|(\.php)|(\s)|(\')|(\")|(eself)|(&nbsp;)/", "", basename ($info['url']));
+				$page = str_replace("\\", "", $page);
+				$info['url'] = preg_replace("/(\s)|(\')|(\")|(eself)|(&nbsp;)/", "", $info['url']);
+				$info['url'] = str_replace("\\", "", $info['url']);
+				$page = trim($page);
+				if($page && !strstr($page, "cache") && !strstr($page, "file:"))
+				{
+					if($loop){ $data .= ",\n"; }
+					$data .= $quote.$page.$quote." => array('url' => '".$info['url']."', 'ttl' => ".$info['ttl'].", 'unq' => ".$info['unq'].")";
+					$loop = 1;
+				}
+			}
+
+			$data .= "\n);\n\n?".  chr(62);
+
+			if ($handle = fopen($logfile, 'w'))
+			{
+				fwrite($handle, $data);
+			}
+			fclose($handle);
+		}
+
+
+
+		function rempagePage()
+		{
+			$sql = e107::getDb();
+			$ns = e107::getRender();
+			$frm = e107::getForm();
+			$pageInfo = array();
+
+			$logfile = e_LOG."logp_".date("z.Y", time()).".php";
+		//	$logfile = e_PLUGIN."log/logs/logp_".date("z.Y", time()).".php";
+			if(is_readable($logfile))
+			{
+				require($logfile);
+			}
+
+			$sql ->select("logstats", "*", "log_id='pageTotal' ");
+			$row = $sql ->fetch();
+			$pageTotal = unserialize($row['log_data']);
+
+			foreach($pageInfo as $url => $tmpcon) 
+			{
+				$pageTotal[$url]['url'] = $tmpcon['url'];
+				$pageTotal[$url]['ttlv'] += $tmpcon['ttl'];
+				$pageTotal[$url]['unqv'] += $tmpcon['unq'];
+			}
+
+
+
+			$text = "
+			<form method='post' action='".e_REQUEST_URL."'>
+			<table class='table adminlist'>
+
+			<tr>
+			<td style='width:30%' class='forumheader'>".ADSTAT_LAN_29."</td>
+			<td style='width:50%' class='forumheader'>URL</td>
+			<td style='width:30%; text-align: center;'>".ADSTAT_LAN_30." ...</td>
+			</tr>
+			";
+
+			foreach($pageTotal as $key => $page)
+			{
+						$text .= "
+				<tr>
+				<td style='width:30%'>{$key}</td>
+				<td style='width:50%'>".$page['url']."</td>
+				<td style='width:30%; text-align: center;'><input type='checkbox' name='remcb[]' value='{$key}' /></td>
+				</tr>
+				";
+			}
+
+			$text .= "
+			</table>
+			<div class='buttons-bar center'>
+			".$frm->admin_button('remSelP', ADSTAT_LAN_31, 'delete')."
+			</form>
+
+			";
+
+			return $text;
+
+		//	$ns -> tablerender(ADSTAT_LAN_32, $text);
+		}
+
+
+
+		function historyPage()
+		{
+			$mes = e107::getMessage();
+			$frm = e107::getForm();
+			$sql = e107::getDb();
+
+			$mes->addWarning(ADSTAT_LAN_76);
+			$text = "
+
+			<form method='post' action='".e_SELF."?history'>
+			<table class='table adminlist'>
+			<colgroup>
+			  <col style='width:50%' />
+			  <col style='width:50%' />
+			</colgroup>";
+			
+			$keep_month = varset($_POST['delete_month'],0);
+			$keep_year = varset($_POST['delete_year'],0);
+			
+			if (isset($_POST['delete_history']))
+			{
+						$text .= "<tr><td>".ADSTAT_LAN_72."</td><td>".nl_langinfo(constant('MON_'.$keep_month))." ".$keep_year."</td></tr>
+				<tr><td colspan='2'  style='text-align:center' class='forumheader'>
+				<input type='hidden' name='delete_month' value='{$keep_month}' />
+				<input type='hidden' name='delete_year' value='{$keep_year}' />
+				".$frm->admin_button('actually_delete', LAN_CONFDELETE, 'delete')."<br />".ADSTAT_LAN_74."
+				</td></tr>";
+						$text .= "<tr><td>".ADSTAT_LAN_75."</td><td>".implode("<br />",$this->get_for_delete($keep_year,$keep_month))."</td></tr>";
+			}
+			else
+			{
+				if (isset($_POST['actually_delete']))
+				{
+							$delete_list = $this->get_for_delete($keep_year,$keep_month);
+							$logStr = '';
+							//	    $text .= "<tr><td colspan='2'>Data notionally deleted {$keep_month}-{$keep_year}</td></tr>";
+							$text .= "<tr><td>".ADSTAT_LAN_77."</td><td>";
+							
+							foreach ($delete_list as $k => $v)
+							{
+								$sql->delete('logstats',"log_id='{$k}'");
+								$text .= $v."<br />";
+								$logStr .= "[!br!]{$k} => ".$v;
+							}
+							
+							$text .= "</td></tr>";
+							e107::getLog()->add('STAT_04',ADSTAT_LAN_83.$logStr,'');
+				}
+						
+				$text .= "<tr><td>".ADSTAT_LAN_70."</td>";
+				$text .= "<td><select class='tbox' name='delete_month'>\n";
+				$match_month = date("n");
+				
+				for ($i = 1; $i < 13; $i++)
+				{
+					$selected = $match_month == $i ? " selected='selected'" : "";
+					$text .= "<option value='{$i}'".$selected.">".nl_langinfo(constant('MON_'.$i))."</option>\n";
+				}
+				
+				$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
+				$this_year = date("Y");
+						
+				$text .= "<select class='tbox' name='delete_year' id='export_year'>\n";
+				
+				for ($i = $this_year; $i > $this_year - 6; $i--)
+				{
+					$selected = ($this_year - 2) == $i ? " selected='selected'" : "";
+					$text .= "<option value='{$i}'{$selected}>{$i}</option>\n";
+				}
+				
+				$text .= "</select>\n</td></tr>";
+			}
+
+			$text .= "</table>
+
+			<div class='buttons-bar center'>
+			".$frm->admin_button('delete_history',LAN_DELETE,'delete')."
+			</div>
+
+			</form>";
+
+			return $text;
+		//	$ns->tablerender(ADSTAT_LAN_69, $mes->render().$text);
+		}
+
+
+
+		private function prefsPageSubmit()
+		{
+
+				$statList = array(		// Type = 0 for direct text, 1 for integer
+					'statActivate' 		=> 0,
+					'statCountAdmin' 	=> 0,
+					'statUserclass' 	=> 0,
+					'statBrowser'		=> 1,
+					'statOs'			=> 1,
+					'statScreen' 		=> 1,
+					'statDomain' 		=> 1,
+					'statRefer' 		=> 1,
+					'statQuery' 		=> 1,
+					'statRecent' 		=> 1,
+					'statDisplayNumber' => 0,
+					'statPrevMonth'		=> 1
+				);
+				$logStr = '';
+
+				$pref = array();
+
+				foreach ($statList as $k => $type)
+				{
+					switch ($type)
+					{
+						case 0 : $pref[$k] = $_POST[$k]; break;
+						case 1 : $pref[$k] = intval($_POST[$k]); break;
+					}
+					$logStr .= "[!br!]{$k} => ".$pref[$k];
+				}
+
+				e107::getConfig()->setPref($pref)->save(false,true,true);
+
+				file_put_contents(e_LOG.LogFlagFile, "<?php\n\$logEnable={$pref['statActivate']};\n?>\n");		// Logging task uses to see if logging enabled
+				e107::getLog()->add('STAT_02',ADSTAT_LAN_82.$logStr,'');
+
+
+		}
+
+
+		public function prefsPage()
+		{
+
+			global $pref;
+
+			$frm = e107::getForm();
+
+			$text = "
+			<form method='post' action='".e_SELF."'>
+			<table class='table adminform'>
+			<colgroup>
+				<col style='width:40%' />
+				<col style='width:60%' />
+			</colgroup>
+
+			<tr>
+				<td>".ADSTAT_LAN_4."</td>
+				<td>".$frm->radio_switch('statActivate', $pref['statActivate'])."</td>
+			</tr>
+			<tr>
+				<td>".ADSTAT_LAN_18."</td>
+				<td>".r_userclass("statUserclass", $pref['statUserclass'],'off','public, member, admin, classes')."</td>
+			</tr>
+			<tr>
+				<td>".ADSTAT_LAN_20."</td>
+				<td>".$frm->radio_switch('statCountAdmin', $pref['statCountAdmin'])."</td>
+			</tr>
+			<tr>
+				<td>".ADSTAT_LAN_21."</td>
+				<td><input class='tbox' type='text' name='statDisplayNumber' size='8' value='".$pref['statDisplayNumber']."' maxlength='3' /></td>
+			</tr>
+			<tr>
+				<td>".ADSTAT_LAN_5."</td>
+				<td>
+				".$this->gen_select(ADSTAT_LAN_6, 'statBrowser',$pref['statBrowser'])
+				.$this->gen_select(ADSTAT_LAN_7, 'statOs',$pref['statOs'])
+				.$this->gen_select(ADSTAT_LAN_8, 'statScreen',$pref['statScreen'])
+				.$this->gen_select(ADSTAT_LAN_9, 'statDomain',$pref['statDomain'])
+				.$this->gen_select(ADSTAT_LAN_10, 'statRefer',$pref['statRefer'])
+				.$this->gen_select(ADSTAT_LAN_11, 'statQuery',$pref['statQuery'])
+				."<div class='clearfix' style='padding-bottom: 4px'><span class='pull-left'>".ADSTAT_LAN_19."</span><span class='pull-right'>
+				 ".$frm->radio_switch('statRecent', $pref['statRecent'])."</span></div>
+				</td>
+			</tr>
+
+			<tr>
+			<td>".ADSTAT_LAN_78."</td>
+				<td>".$frm->checkbox('statPrevMonth', 1, varset($pref['statPrevMonth'],0))."<span class='field-help'>".ADSTAT_LAN_79."</span></td>
+			</tr>
+			<tr>
+				<td>".ADSTAT_LAN_12."</td>
+				<td>
+					".$frm->checkbox('wipe[statWipePage]', 1, false, array('label'=> ADSTAT_LAN_14 ))."
+					".$frm->checkbox('wipe[statWipeBrowser]', 1, false, array('label'=>ADSTAT_LAN_6))."
+					".$frm->checkbox('wipe[statWipeOs]', 1, false, array('label'=> ADSTAT_LAN_7 ))."
+					".$frm->checkbox('wipe[statWipeScreen]', 1, false, array('label'=> ADSTAT_LAN_8 ))."
+					".$frm->checkbox('wipe[statWipeDomain]', 1, false, array('label'=> ADSTAT_LAN_9 ))."
+					".$frm->checkbox('wipe[statWipeRefer]', 1, false, array('label'=> ADSTAT_LAN_10 ))."
+					".$frm->checkbox('wipe[statWipeQuery]', 1, false, array('label'=> ADSTAT_LAN_11 ))."
+					<br />
+					".$frm->admin_button('wipeSubmit', LAN_RESET, 'delete')."<span class='field-help'>".ADSTAT_LAN_13."</span>
+				</td>
+			</tr>
+			<tr>
+				<td>".ADSTAT_LAN_26."</td>
+				<td>".$frm->admin_button('openRemPageD', ADSTAT_LAN_28, 'other')."<span class='field-help'>".ADSTAT_LAN_27."</span>	</td>
+			</tr>
+			</table>
+			<div class='buttons-bar center'>
+				".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
+			</div>
+			</form>";
+
+			return $text;
+		//	$ns->tablerender(ADSTAT_LAN_16, $text);
+		}
+
+
+
+
+		/*
+			// optional - a custom page.
+			public function customPage()
+			{
+				$text = 'Hello World!';
+				return $text;
+
+			}
+		*/
+
+	}
+
+
+
+	class logstats_form_ui extends e_admin_form_ui
+	{
+
+		function log_id($curVal,$mode)
+		{
+			switch($mode)
+			{
+				case 'read': // List Page
+
+					if($curVal == 'pageTotal')
+					{
+						return ADSTAT_LAN_45; // All Time.
+					}
+
+					return $curVal;
+					break;
+
+				case 'write': // Edit Page
+					return '';
+					break;
+
+				case 'filter':
+				case 'batch':
+					return  array();
+					break;
+			}
+
+		}
+
+
+		function parseLogData($type)
+		{
+			$row = $this->getController()->getListModel()->getData();
+			$curVal = $row['log_data'];
+
+			if($row['log_id'] == 'pageTotal')
+			{
+				$tmp = unserialize($curVal);
+
+				$ttl = 0;
+				$unq = 0;
+
+				foreach($tmp as $k=>$v)
+				{
+					$ttl += $v['ttlv'];
+					$unq += $v['unqv'];
+				}
+
+				if($type == 'total')
+				{
+					return number_format($ttl);
+				}
+				elseif($type == 'unique')
+				{
+					return  number_format($unq);
+				}
+
+				return "<div class='col-md-2'>".ADSTAT_L21.": ".number_format($ttl)."</div><div class='col-md-2'>".ADSTAT_L22.": ".number_format($unq)."</div><div class='col-md-2'>Total Pages: ".number_format(count($tmp))."</div>";
+
+
+				//	return print_a($tmp,true);
+			}
+
+			if(!empty($curVal))
+			{
+				$tmp = explode(chr(1), $curVal, 3);
+
+				if($type == 'total')
+				{
+					return number_format($tmp[0]);
+				}
+				elseif($type == 'unique')
+				{
+					return  number_format($tmp[1]);
+				}
+
+				// return "<div class='col-md-1'>".ADSTAT_L21.": ".number_format($tmp[0])."</div><div class='col-md-2'>".ADSTAT_L22.": ".number_format($tmp[1])."</div>";
+			}
+
+		}
+
+		// Total Hits
+		function log_data($curVal,$mode)
+		{
+
+			switch($mode)
+			{
+				case 'read': // List Page
+
+					return $this->parseLogData('total');
+					break;
+
+				case 'write': // Edit Page
+					// return $this->text('log_data',$curVal, 255, 'size=large');
+					break;
+
+				case 'filter':
+				case 'batch':
+					return  array();
+					break;
+			}
+
+			return null;
+		}
+
+
+		// unique hits
+		function log_data2($curVal,$mode)
+		{
+
+			switch($mode)
+			{
+				case 'read': // List Page
+
+					return $this->parseLogData('unique');
+					break;
+
+				case 'write': // Edit Page
+					// return $this->text('log_data',$curVal, 255, 'size=large');
+					break;
+
+				case 'filter':
+				case 'batch':
+					return  array();
+					break;
+			}
+
+			return null;
+		}
+
+
+
+		function options($curVal,$mode)
+		{
+			$row = $this->getController()->getListModel()->getData();
+			$date = $row['log_id'];
+
+			if($date == 'pageTotal')
+			{
+				return $this->button('rebuildTotal', 1, 'delete', 'Rebuild');
+			}
+
+
+			$unix = strtotime($date);
+
+			if(empty($unix))
+			{
+				return null;
+			}
+
+			$datestamp = date("Y-m-d", $unix);
+
+			$file = e_LOG."log/".$datestamp."_SiteStats.log";
+
+			if(is_readable($file))
+			{
+				return $this->button('rebuild', $datestamp, 'delete', 'Rebuild');
+			}
+			else
+			{
+				return null;
+			}
+
+		}
+
+	}
+
+if(e_DEBUG)
+{
+	new log_adminArea();
+
+	require_once(e_ADMIN."auth.php");
+	e107::getAdminUI()->runPage();
+
+	require_once(e_ADMIN."footer.php");
 	exit;
 }
 
@@ -25,9 +1043,8 @@ require_once(e_HANDLER.'userclass_class.php');
 $frm = e107::getForm();
 $mes = e107::getMessage();
 
-define('LogFlagFile', 'LogFlag.php');
 
-include_lan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'_admin_log.php');
+
 
 if (e_QUERY) 
 {
@@ -37,28 +1054,7 @@ $action = varset($sl_qs[0],'config');
 $params = varset($sl_qs[1],'');
 
 
-// List of the non-page-based info which is gathered - historically only 'all-time' stats, now we support monthly as well
-$stats_list = array('statBrowser'=>ADSTAT_L6,'statOs'=>ADSTAT_L7,'statScreen'=>ADSTAT_L8,'statDomain'=>ADSTAT_L9,'statReferer'=>ADSTAT_L10,'statQuery'=>ADSTAT_L11);
 
-$separator_list = array(1 => ADSTAT_L57, 2 => ADSTAT_L58);
-$separator_char = array(1 => ',', 2 => '|');
-$quote_list = array(1 => ADSTAT_L50, 2 => ADSTAT_L55, 3 => ADSTAT_L56);
-$quote_char = array(1 => '', 2 => "'", 3 => '"');
-
-
-//---------------------------------------------
-//		Export data file
-//---------------------------------------------
-$export_filter = '';		// can be 'LIKE', 'REGEX', or simple equality
-$export_type = $tp->toDB(varset($_POST['export_type'],'page'));				// Page data or one of the other bits of info
-$export_date = intval(varset($_POST['export_date'],1));
-$export2_date = intval(varset($_POST['export2_date'],3));
-$export_year = intval(varset($_POST['export_year'],date('Y')));
-$export_month = intval(varset($_POST['export_month'],date('m')));
-$export_day = intval(varset($_POST['export_day'],date('j')));
-$export_char = varset($_POST['export_char'], 1);
-$export_quote = varset($_POST['export_quote'], 1);
-$export_stripurl = varset($_POST['export_stripurl'], 0);
 
 if (isset($_POST['create_export']) && (($action == 'export') || ($action == 'datasets')))
 {
@@ -116,36 +1112,16 @@ if (isset($_POST['create_export']) && (($action == 'export') || ($action == 'dat
 		}
 		else
 		{
-			$message = ADSTAT_L54;
+			$message = ADSTAT_LAN_54;
 		}
 	}
 	if (($date_error != 'ignore') && (($first_date == 0) || ($last_date == 0) || $date_error))
 	{
-		$message = ADSTAT_L47;
+		$message = ADSTAT_LAN_47;
 	}
 }
 
 
-// Needed on Windoze platforms - not an ideal solution!
-if (!function_exists('nl_langinfo'))
-{
-  define('MON_1',86400);
-  define('MON_2',2764800);
-  define('MON_3',5443200);
-  define('MON_4',8035200);
-  define('MON_5',10800000);
-  define('MON_6',13392000);
-  define('MON_7',15811200);
-  define('MON_8',19008000);
-  define('MON_9',21168000);
-  define('MON_10',23760000);
-  define('MON_11',26352000);
-  define('MON_12',28944000);
-  function nl_langinfo($mon)
-  {
-    return date('F',$mon);
-  }
-}
 
 //---------------------------------------------
 //		Remove page entries
@@ -155,196 +1131,30 @@ if(isset($_POST['openRemPageD']))
   $action = 'rempage';
 }
 
-if(isset($_POST['remSelP']))
-{
-  $action = 'rempage';
-  rempagego();				// Do the deletions - then redisplay the list of pages
-}
 
 
-//---------------------------------------------
-//		Wipe accumulated stats
-//---------------------------------------------
-if(IsSet($_POST['wipeSubmit']))
-{
-	$logStr = '';
-	foreach($_POST['wipe'] as $key => $wipe)
-	{
-		switch($key)
-		{
-			case "statWipePage":
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='pageTotal' ");
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='statTotal' ");
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='statUnique' ");
-			break;
-			case "statWipeBrowser":
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='statBrowser' ");
-			break;
-			case "statWipeOs":
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='statOs' ");
-			break;
-			case "statWipeScreen":
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='statScreen' ");
-			break;
-			case "statWipeDomain":
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='statDomain' ");
-			break;
-			case "statWipeRefer":
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='statReferer' ");
-			break;
-			case "statWipeQuery":
-				$sql -> db_Update("logstats", "log_data='' WHERE log_id='statQuery' ");
-			break;
-		}
-		$logStr .= '[!br!]'.$key;
-	}
-	e107::getLog()->add('STAT_01',ADSTAT_L81.$logStr,'');
-
-	//$message = ADSTAT_L25; // TODO:$emessage
-	$mes->addSuccess(LAN_UPDATED);
-}
 
 
-if(!is_writable(e_LOG)) 
-{
-	//$message = "<b>".ADSTAT_L38."</b>"; 
-	$mes->addError(ADSTAT_L28);
-}
 
-if (isset($_POST['updatesettings'])) 
-{
-	$statList = array(		// Type = 0 for direct text, 1 for integer
-		'statActivate' 		=> 0,
-		'statCountAdmin' 	=> 0,
-		'statUserclass' 	=> 0,
-		'statBrowser'		=> 1,
-		'statOs'			=> 1,
-		'statScreen' 		=> 1,
-		'statDomain' 		=> 1,
-		'statRefer' 		=> 1,
-		'statQuery' 		=> 1,
-		'statRecent' 		=> 1,
-		'statDisplayNumber' => 0,
-		'statPrevMonth'		=> 1
-	);
-	$logStr = '';
-	foreach ($statList as $k => $type)
-	{
-		switch ($type)
-		{
-		  case 0 : $pref[$k] = $_POST[$k]; break;
-		  case 1 : $pref[$k] = intval($_POST[$k]); break;
-		}
-		$logStr .= "[!br!]{$k} => ".$pref[$k];
-	}
-	save_prefs();
-	file_put_contents(e_LOG.LogFlagFile, "<?php\n\$logEnable={$pref['statActivate']};\n?>\n");		// Logging task uses to see if logging enabled
-	e107::getLog()->add('STAT_02',ADSTAT_L82.$logStr,'');
-}
+
+
+
 
 echo  $mes->render() ;
 
-function gen_select($prompt,$name,$value)
-{
-  $ret = "<div class='control-group clearfix' >
-  		<span class='pull-left'>".$prompt."</span><span class='pull-right'><select name='{$name}' class='tbox'>\n
-		<option value='0' ".($value == 0 ? " selected='selected'" : "").">".ADSTAT_L50."</option>\n
-		<option value='1' ".($value == 1 ? " selected='selected'" : "").">".ADSTAT_L49."</option>\n
-		<option value='2' ".($value == 2 ? " selected='selected'" : "").">".ADSTAT_L48."</option>\n
-		</select></span></div>";
-  return $ret;
-}
 
 
-function data_type_select($name,$value)
-{
-  global $stats_list;
-  $ret = "<select name='{$name}' class='tbox'  onchange=\"settypebox(this.value);\">\n
-		<option value='page' ".($value == 'page' ? " selected='selected'" : "").">".ADSTAT_L52."</option>\n";
-  foreach ($stats_list as $k=>$v)
-  {
-	$ret .= "<option value='{$k}' ".($value == $k ? " selected='selected'" : "").">{$v}</option>\n";
-  }
-  $ret .= "</select>\n";
-  return $ret;
-}
+
 
 
 switch ($action)
 {
   case 'config' :
-	$text = "
-	<form method='post' action='".e_SELF."'>
-	<table class='table adminform'>
-	<colgroup>
-		<col style='width:40%' />
-		<col style='width:60%' />
-	</colgroup>
 
-	<tr>
-		<td>".ADSTAT_L4."</td>
-		<td>".$frm->radio_switch('statActivate', $pref['statActivate'])."</td>
-	</tr>
-	<tr>
-		<td>".ADSTAT_L18."</td>
-		<td>".r_userclass("statUserclass", $pref['statUserclass'],'off','public, member, admin, classes')."</td>
-	</tr>
-	<tr>
-		<td>".ADSTAT_L20."</td>
-		<td>".$frm->radio_switch('statCountAdmin', $pref['statCountAdmin'])."</td>
-	</tr>
-	<tr>
-		<td>".ADSTAT_L21."</td>
-		<td><input class='tbox' type='text' name='statDisplayNumber' size='8' value='".$pref['statDisplayNumber']."' maxlength='3' /></td>
-	</tr>
-	<tr>
-		<td>".ADSTAT_L5."</td>
-		<td>
-		".gen_select(ADSTAT_L6, 'statBrowser',$pref['statBrowser'])
-		 .gen_select(ADSTAT_L7, 'statOs',$pref['statOs'])
-		 .gen_select(ADSTAT_L8, 'statScreen',$pref['statScreen'])
-		 .gen_select(ADSTAT_L9, 'statDomain',$pref['statDomain'])
-		 .gen_select(ADSTAT_L10, 'statRefer',$pref['statRefer'])
-		 .gen_select(ADSTAT_L11, 'statQuery',$pref['statQuery'])
-		 ."<div class='clearfix' style='padding-bottom: 4px'><span class='pull-left'>".ADSTAT_L19."</span><span class='pull-right'>
-		 ".$frm->radio_switch('statRecent', $pref['statRecent'])."</span></div>
-		</td>
-	</tr>
-
-	<tr>
-	<td>".ADSTAT_L78."</td>
-		<td>".$frm->checkbox('statPrevMonth', 1, varset($pref['statPrevMonth'],0))."<span class='field-help'>".ADSTAT_L79."</span></td>
-	</tr>
-	<tr>
-		<td>".ADSTAT_L12."</td>
-		<td>
-			".$frm->checkbox('wipe[statWipePage]', 1, false, array('label'=> ADSTAT_L14 ))."
-			".$frm->checkbox('wipe[statWipeBrowser]', 1, false, array('label'=>ADSTAT_L6))."
-			".$frm->checkbox('wipe[statWipeOs]', 1, false, array('label'=> ADSTAT_L7 ))."
-			".$frm->checkbox('wipe[statWipeScreen]', 1, false, array('label'=> ADSTAT_L8 ))."
-			".$frm->checkbox('wipe[statWipeDomain]', 1, false, array('label'=> ADSTAT_L9 ))."
-			".$frm->checkbox('wipe[statWipeRefer]', 1, false, array('label'=> ADSTAT_L10 ))."
-			".$frm->checkbox('wipe[statWipeQuery]', 1, false, array('label'=> ADSTAT_L11 ))."
-			<br />
-			".$frm->admin_button('wipeSubmit', LAN_RESET, 'delete')."<span class='field-help'>".ADSTAT_L13."</span>
-		</td>
-	</tr>
-	<tr>
-		<td>".ADSTAT_L26."</td>
-		<td>".$frm->admin_button('openRemPageD', ADSTAT_L28, 'other')."<span class='field-help'>".ADSTAT_L27."</span>	</td>
-	</tr>
-	</table>
-	<div class='buttons-bar center'>
-		".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
-	</div>
-	</form>";
-
-
-	$ns->tablerender(ADSTAT_L16, $text);
 	break;  // case config
 	
   case 'rempage' :			// Remove pages
-	rempage();
+//	rempage();
     break;
 	
 	
@@ -353,212 +1163,14 @@ switch ($action)
 	//===========================================================
 	//				EXPORT DATA
 	//===========================================================
-	$text = "<div style='text-align:center'>";
-	if ($action == 'export')
-	{
-	  $text .= "<form method='post' action='".e_PLUGIN."log/stats_csv.php?export'>";
-	}
-	else
-	{
-	  $text .= "<form method='post' action='".e_SELF."?datasets'>";
-	}
-	$text .= "<table class='table adminform'>
-	<colgroup>
-	  <col style='width:50%' />
-	  <col style='width:50%' />
-	</colgroup>
-	";
 
-	if ($action == 'export')
-	{
-	  $text .= "<tr><td colspan = '2'>".ADSTAT_L67."</td></tr>";
-	}
-	else
-	{
-	  $text .= "<tr><td colspan = '2'>".ADSTAT_L68."</td></tr>";
-	}
-
-	// Type of output data - page data, browser stats....
-	$text .= "<tr><td>".ADSTAT_L51."</td><td>\n".data_type_select('export_type',$export_type).'</td></tr>';
-
-	// Period selection type for page data
-	$text .= "<tr><td>".ADSTAT_L41."</td><td>\n
-	<select class='tbox' name='export_date' id='export_date' onchange=\"setdatebox(this.value);\" ".($export_type=='page' ? "" : "style='display:none'" ).">\n
-	<option value='1'".($export_date==1 ? " selected='selected'" : "").">".ADSTAT_L42."</option>\n
-	<option value='2'".($export_date==2 ? " selected='selected'" : "").">".ADSTAT_L43."</option>\n
-	<option value='3'".($export_date==3 ? " selected='selected'" : "").">".ADSTAT_L44."</option>\n
-	<option value='4'".($export_date==4 ? " selected='selected'" : "").">".ADSTAT_L45."</option>\n
-	<option value='5'".($export_date==5 ? " selected='selected'" : "").">".ADSTAT_L62."</option>\n
-	</select>";
-	
-	// Period selection type for non-page data
-	$text .= "
-	<select class='tbox' name='export2_date' id='export2_date' onchange=\"setdatebox(this.value);\"  ".($export_type=='page' ? "style='display:none'" : "").">\n
-	<option value='3'".($export2_date==3 ? " selected='selected'" : "").">".ADSTAT_L44."</option>\n
-	<option value='4'".($export2_date==4 ? " selected='selected'" : "").">".ADSTAT_L45."</option>\n
-	</select>";
-
-	$text .= "</td></tr>";
-
-
-
-	$text .= "<tr><td>".ADSTAT_L46."</td><td>\n";
-	
-	
-	// Now put the various dropdowns - their visibility is controlled by the export_type dropdown
-
-	$text .= "<select class='tbox' name='export_day' id='export_day'>\n";
-	for ($i = 1; $i < 32; $i++) 
-	{ 
-	  $selected = $export_day == $i ? " selected='selected'" : "";
-	  $text .= "<option value='{$i}'{$selected}>{$i}</option>\n"; 
-	};
-	$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
-
-
-	$text .= "<select class='tbox' name='export_month' id='export_month'>\n";
-	for ($i = 1; $i < 13; $i++) 
-	{ 
-	  $selected = $export_month == $i ? " selected='selected'" : "";
-	  $text .= "<option value='{$i}'{$selected}>".nl_langinfo(constant('MON_'.$i))."</option>\n"; 
-	};
-	$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
-		
-	$this_year = date("Y");
-	$text .= "<select class='tbox' name='export_year' id='export_year'>\n";
-	for ($i = $this_year; $i > $this_year - 6; $i--) 
-	{ 
-	  $selected = $export_year == $i ? " selected='selected'" : "";
-	  $text .= "<option value='{$i}'{$selected}>{$i}</option>\n"; 
-	};
-	$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
-
-	$text .= "<span id='export_cumulative' style='display: none'>".ADSTAT_L53."</span>\n";
-
-	$text .= "</td></tr>";
-
-
-	if ($action == 'export')
-	{
-	// Separators, quotes
-	$text .= "<tr><td>".ADSTAT_L59."</td><td>\n
-			<select class='tbox' name='export_char'>";
-	foreach ($separator_list as $k=>$v)
-	{
-	  $selected = $export_char == $k ? " selected='selected'" : "";
-	  $text .= "<option value='{$k}'{$selected}>{$v}</option>\n";
-	}
-	$text .= "</select>\n&nbsp;&nbsp;&nbsp;&nbsp;<select class='tbox' name='export_quote'>\n";
-	foreach ($quote_list as $k=>$v)
-	{
-	  $selected = $export_quote == $k ? " selected='selected'" : "";
-	  $text .= "<option value='{$k}'{$selected}>{$v}</option>\n";
-	}
-	$text .= "</select>\n</td></tr>";
-
-	$text .= "<tr>
-	<td>".ADSTAT_L60."</td>
-	<td>".$frm->checkbox('export_stripurl', 1)."<span class='field-help'>".ADSTAT_L61."</span></td>
-	</tr>";
-	}
-
-
-	if ($export_filter)
-	{
-	  if (getperms('0')) $text .= "<tr><td>".ADSTAT_L65."</td><td>".$export_filter."</td></tr>";
-	  $sql -> db_Select("logstats", "log_id", "{$export_filter} ");
-	  $text .= "<tr><td>".ADSTAT_L64."</td><td>";
-	  while($row = $sql -> db_Fetch())
-	  {
-		$text .= $row['log_id']."<br />";
-	  }
-	  $text .= "</td></tr>";
-	}
-
-	$text .= "
-	</table>
-		<div class='buttons-bar center'>
-	".$frm->admin_button('create_export', ($action == 'export' ? LAN_CREATE : ADSTAT_L66), 'update')."
-	</div>
-	</form>
-	</div>";
-
-	// Set up the date display boxes
-	$text .= "<script type=\"text/javascript\"> settypebox('{$export_type}');</script>";
-
-	$ns->tablerender(ADSTAT_L40, $text);
     break;	// case 'export'
 	
   case 'history' :
 	//===========================================================
 	//				DELETE HISTORY
 	//===========================================================
-	$mes->addWarning(ADSTAT_L76);
-	$text = "
 
-	<form method='post' action='".e_SELF."?history'>
-	<table class='table adminlist'>
-	<colgroup>
-	  <col style='width:50%' />
-	  <col style='width:50%' />
-	</colgroup>";
-	$keep_month = varset($_POST['delete_month'],0);
-	$keep_year = varset($_POST['delete_year'],0);
-    if (isset($_POST['delete_history']))
-	{
-	  $text .= "<tr><td>".ADSTAT_L72."</td><td>".nl_langinfo(constant('MON_'.$keep_month))." ".$keep_year."</td></tr>
-		<tr><td colspan='2'  style='text-align:center' class='forumheader'>
-		<input type='hidden' name='delete_month' value='{$keep_month}' />
-		<input type='hidden' name='delete_year' value='{$keep_year}' />
-		".$frm->admin_button('actually_delete', LAN_CONFDELETE, 'delete')."<br />".ADSTAT_L74."
-	</td></tr>";
-	  $text .= "<tr><td>".ADSTAT_L75."</td><td>".implode("<br />",get_for_delete($keep_year,$keep_month))."</td></tr>";
-	}
-	else
-	{
-	  if (isset($_POST['actually_delete']))
-	  {
-		    $delete_list = get_for_delete($keep_year,$keep_month);
-			$logStr = '';
-	//	    $text .= "<tr><td colspan='2'>Data notionally deleted {$keep_month}-{$keep_year}</td></tr>";
-			$text .= "<tr><td>".ADSTAT_L77."</td><td>";
-			foreach ($delete_list as $k => $v)
-			{
-			  $sql->db_Delete('logstats',"log_id='{$k}'");
-			  $text .= $v."<br />";
-			  $logStr .= "[!br!]{$k} => ".$v;
-			}
-			$text .= "</td></tr>";
-			e107::getLog()->add('STAT_04',ADSTAT_L83.$logStr,'');
-		  }
-		$text .= "<tr><td>".ADSTAT_L70."</td>";
-		$text .= "<td><select class='tbox' name='delete_month'>\n";
-		$match_month = date("n");
-		for ($i = 1; $i < 13; $i++) 
-		{ 
-		  $selected = $match_month == $i ? " selected='selected'" : "";
-		  $text .= "<option value='{$i}'{$selected}>".nl_langinfo(constant('MON_'.$i))."</option>\n"; 
-		};
-		$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
-			
-		$this_year = date("Y");
-		$text .= "<select class='tbox' name='delete_year' id='export_year'>\n";
-		for ($i = $this_year; $i > $this_year - 6; $i--) 
-		{ 
-		  $selected = ($this_year - 2) == $i ? " selected='selected'" : "";
-		  $text .= "<option value='{$i}'{$selected}>{$i}</option>\n"; 
-		};
-		$text .= "</select>\n</td></tr>";
-	}
-
-	$text .= "</table>
-	
-	<div class='buttons-bar center'>
-	".$frm->admin_button('delete_history',LAN_DELETE,'delete')."
-	</div>
-	
-	</form>";
-	$ns->tablerender(ADSTAT_L69, $mes->render().$text);
     break;	// case 'history'
 
 }
@@ -642,178 +1254,21 @@ function headerjs()
   return $script_js;
 }
 
-function get_for_delete($keep_year,$keep_month = 1, $filter='*')
-{
-  global $sql, $stats_list;
-  $ret = array();
-  // Its tedious, but the filter criteria are sufficiently tricky that its probably best to read all records and decide what can go
-  if ($sql->db_Select('logstats','log_id'))
-  {
-    while ($row = $sql->db_Fetch())
-	{
-	  $can_go = FALSE;
-	  $check = FALSE;
-	  $data_type = 'unknown';
-	  $date_info = $row['log_id'];
-	  if (($temp = strpos($date_info,':')) !== FALSE) 
-	  {  // its monthly browser stats and similar
-//	    echo "Checking {$date_info}, posn = {$temp} ";
-		$data_type = substr($date_info,0,$temp);
-	    $date_info = substr($date_info,$temp+1);
-		$check = TRUE;
-//		echo "Date string: {$date_info}, data type: {$data_type}<br />";
-		if (isset($stats_list[$data_type])) $data_type = $stats_list[$data_type];
-	  }
-	  list($poss_year,$poss_month,$poss_day) = explode('-',$date_info.'--',3);
-	  if (!$check)
-	  {
-	    if (is_numeric($poss_year))
-		{
-		  $check = TRUE;
-		  if ($poss_day > 0) $data_type = 'daily'; else $data_type = 'monthly';
-		}
-	  }
-	  if ($check)
-	  {
-	    if ($keep_year == $poss_year)
-		{
-		  if (($poss_month > 0) && ($poss_month < $keep_month)) $can_go = TRUE;
-		}
-		elseif ($keep_year > $poss_year) $can_go = TRUE;
-	  }
-	  if ($can_go)
-	  {
-	    $ret[$row['log_id']] = $row['log_id']." - ".$data_type;
-	  }
-	}
-  }
-  return $ret;
-}
+
 
 //---------------------------------------------
 //		Remove page entries - prompt/list
 //---------------------------------------------
 function rempage()
 {
-	$sql = e107::getDb();
-	$ns = e107::getRender();
-	$frm = e107::getForm();
 
-	$logfile = e_LOG."logp_".date("z.Y", time()).".php";
-//	$logfile = e_PLUGIN."log/logs/logp_".date("z.Y", time()).".php";
-	if(is_readable($logfile))
-	{
-		require($logfile);
-	}
-
-	$sql -> db_Select("logstats", "*", "log_id='pageTotal' ");
-	$row = $sql -> db_Fetch();
-	$pageTotal = unserialize($row['log_data']);
-
-	foreach($pageInfo as $url => $tmpcon) {
-		$pageTotal[$url]['url'] = $tmpcon['url'];
-		$pageTotal[$url]['ttlv'] += $tmpcon['ttl'];
-		$pageTotal[$url]['unqv'] += $tmpcon['unq'];
-	}
-
-	$text = "
-	<form method='post' action='".e_SELF."'>
-	<table class='table adminlist'>
-
-	<tr>
-	<td style='width:30%' class='forumheader'>".ADSTAT_L29."</td>
-	<td style='width:50%' class='forumheader'>URL</td>
-	<td style='width:30%; text-align: center;'>".ADSTAT_L30." ...</td>
-	</tr>
-	";
-
-	foreach($pageTotal as $key => $page)
-	{
-		$text .= "
-		<tr>
-		<td style='width:30%'>{$key}</td>
-		<td style='width:50%'>".$page['url']."</td>
-		<td style='width:30%; text-align: center;'><input type='checkbox' name='remcb[]' value='{$key}' /></td>
-		</tr>
-		";
-	}
-
-	$text .= "
-	</table>
-	<div class='buttons-bar center'>
-	".$frm->admin_button('remSelP', ADSTAT_L31, 'delete')."
-	</form>
-
-	";
-
-	$ns -> tablerender(ADSTAT_L32, $text);
 }
 
 
 //---------------------------------------------
 //		Remove page entries - action
 //---------------------------------------------
-function rempagego()
-{
-	global $sql, $admin_log;
 
-	$sql -> db_Select("logstats", "*", "log_id='pageTotal' ");
-	$row = $sql -> db_Fetch();
-	$pageTotal = unserialize($row['log_data']);
-	$logfile = e_LOG."logp_".date("z.Y", time()).".php";
-	
-//	$logfile = e_PLUGIN."log/logs/logp_".date("z.Y", time()).".php";
-	if(is_readable($logfile))
-	{
-		require($logfile);
-	}
-
-	foreach($_POST['remcb'] as $page)
-	{
-		unset($pageInfo[$page]);
-		unset($pageTotal[$page]);
-	}
-
-	$pagetotal = serialize($pageTotal);
-	if(!$sql -> db_Update("logstats", "log_data='{$pagetotal}' WHERE log_id='pageTotal' "))
-	{
-		$sql -> db_Insert("logstats", "0, 'pageTotal', '{$pagetotal}' ");
-	}
-	e107::getLog()->add('STAT_03',ADSTAT_L80."[!br!]".implode("[!br!]",$_POST['remcb']),'');
-
-	$varStart = chr(36);
-	$quote = chr(34);
-
-	$data = chr(60)."?php\n". chr(47)."* e107 website system: Log file: ".date("z:Y", time())." *". chr(47)."\n\n".
-	$varStart."ipAddresses = ".$quote.$ipAddresses.$quote.";\n".
-	$varStart."siteTotal = ".$quote.$siteTotal.$quote.";\n".
-	$varStart."siteUnique = ".$quote.$siteUnique.$quote.";\n";
-
-	$loop = FALSE;
-	$data .= $varStart."pageInfo = array(\n";
-	foreach($pageInfo as $info)
-	{
-		$page = preg_replace("/(\?.*)|(\_.*)|(\.php)|(\s)|(\')|(\")|(eself)|(&nbsp;)/", "", basename ($info['url']));
-		$page = str_replace("\\", "", $page);
-		$info['url'] = preg_replace("/(\s)|(\')|(\")|(eself)|(&nbsp;)/", "", $info['url']);
-		$info['url'] = str_replace("\\", "", $info['url']);
-		$page = trim($page);
-		if($page && !strstr($page, "cache") && !strstr($page, "file:"))
-		{
-			if($loop){ $data .= ",\n"; }
-			$data .= $quote.$page.$quote." => array('url' => '".$info['url']."', 'ttl' => ".$info['ttl'].", 'unq' => ".$info['unq'].")";
-			$loop = 1;
-		}
-	}
-
-	$data .= "\n);\n\n?".  chr(62);
-
-	if ($handle = fopen($logfile, 'w')) 
-	{
-	  fwrite($handle, $data);
-	}
-	fclose($handle);
-}
 
 
 
@@ -826,22 +1281,22 @@ function admin_config_adminmenu()
   }
   if (!isset($action) || ($action == "")) $action = "config";
 
-  $var['config']['text'] = ADSTAT_L35;
+  $var['config']['text'] = ADSTAT_LAN_35;
   $var['config']['link'] = 'admin_config.php';
 
-  $var['export']['text'] = ADSTAT_L36;
+  $var['export']['text'] = ADSTAT_LAN_36;
   $var['export']['link'] ='admin_config.php?export';
 
-//  $var['datasets']['text'] = ADSTAT_L63;
+//  $var['datasets']['text'] = ADSTAT_LAN_63;
 //  $var['datasets']['link'] ='admin_config.php?datasets';
 
-  $var['rempage']['text'] = ADSTAT_L26;
+  $var['rempage']['text'] = ADSTAT_LAN_26;
   $var['rempage']['link'] ='admin_config.php?rempage';
 
-  $var['history']['text'] = ADSTAT_L69;
+  $var['history']['text'] = ADSTAT_LAN_69;
   $var['history']['link'] ='admin_config.php?history';
 
-  show_admin_menu(ADSTAT_L39, $action, $var);
+  show_admin_menu(ADSTAT_LAN_39, $action, $var);
 }
 
 
diff --git a/e107_plugins/log/consolidate.php b/e107_plugins/log/consolidate.php
index e41833be6..993ab9968 100644
--- a/e107_plugins/log/consolidate.php
+++ b/e107_plugins/log/consolidate.php
@@ -14,35 +14,291 @@
 
 if (!defined('e107_INIT')){ exit; } 
 
-$pathtologs 	= e_LOG;
-$date 			= date("z.Y", time());
-$yesterday 		= date("z.Y",(time() - 86400));		// This makes sure year wraps round OK
-$date2 			= date("Y-m-j", (time() -86400));		// Yesterday's date for the database summary	
-$date3 			= date("Y-m", (time() -86400));			// Current month's date for monthly summary (we're working with yesterday's data)
 
-$pfileprev 		= "logp_".$yesterday.".php";		// Yesterday's log file
-$pfile 			= "logp_".$date.".php";				// Today's log file
-$ifileprev 		= "logi_".$yesterday.".php";
-$ifile 			= "logi_".$date.".php";
 
 // Begin v2.x cleanup.
 class logConsolidate
 {
 
-		function ___construct()
-		{
+		protected $pathtologs;
+		protected $date;
+		protected $yesterday;
+		protected $date2;
+		protected $date3;
 
+		protected $pfileprev;
+		protected $pfile;
+		protected $ifileprev;
+		protected $ifile;
+
+
+		function __construct()
+		{
+			$this->pathtologs 	    = e_LOG;
+			$this->date 			= date("z.Y", time());
+			$this->yesterday 		= date("z.Y",(time() - 86400));		// This makes sure year wraps round OK
+			$this->date2 			= date("Y-m-j", (time() -86400));	// Yesterday's date for the database summary
+			$this->date3 			= date("Y-m", (time() -86400));		// Current month's date for monthly summary (we're working with yesterday's data)
+
+			$this->pfileprev 		= "logp_".$this->yesterday.".php";	// Yesterday's log file
+			$this->pfile 			= "logp_".$this->date.".php";		// Today's log file
+			$this->ifileprev 		= "logi_".$this->yesterday.".php";
+			$this->ifile 			= "logi_".$this->date.".php";
 		}
 
-		function createLog($pathtologs, $statTotal='', $statUnique='')
-		{
-			global $pfile, $ifile;
 
-			if(!is_writable($pathtologs))
+		function run()
+		{
+
+			$sql = e107::getDb();
+			$pref = e107::pref('core');
+
+			$pageInfo       = array();
+			$domainInfo     = array();
+			$screenInfo     = array();
+			$browserInfo    = array();
+			$osInfo         = array();
+			$refInfo        = array();
+			$searchInfo     = array();
+
+			$monthlyInfo    = array();
+			$mon_statBrowser = array();
+			$mon_statOs     = array();
+			$mon_statScreen = array();
+			$mon_statDomain = array();
+			$mon_statQuery  = array();
+			$statBrowser    = array();
+			$statOs         = array();
+			$statScreen     = array();
+			$statDomain     = array();
+			$statQuery      = array();
+			$statReferer    = array();
+
+			$statTotal      = 0;
+			$statUnique     = 0;
+			$siteTotal      = 0;
+			$siteUnique     = 0;
+
+			$MonthlyExistsFlag  = false;
+
+			if(file_exists($this->pathtologs.$this->pfile))  /* log file is up to date, no consolidation required */
 			{
-				echo "Log directory is not writable - please CHMOD ".e_LOG." to 777";
-				echo '<br />Path to logs: '.$pathtologs;
-				return FALSE;
+				return false;
+			}
+			else if(!file_exists($this->pathtologs.$this->pfileprev))  // See if any older log files
+			{
+				if (($retvalue = $this->check_for_old_files($this->pathtologs)) === false) /* no logfile found at all - create - this will only ever happen once ... */
+				{
+					$this->createLog();
+					return false;
+				}
+
+				list($this->pfileprev,$this->ifileprev,$this->date2,$tstamp) = explode('|',$retvalue);  // ... if we've got files
+			}
+
+			unset($tstamp);
+
+			// List of the non-page-based info which is gathered - historically only 'all-time' stats, now we support monthly as well
+			$stats_list = array('statBrowser','statOs','statScreen','statDomain','statReferer','statQuery');
+
+			$qry = "`log_id` IN ('statTotal','statUnique'";
+			foreach ($stats_list as $s)
+			{
+				$qry .= ",'{$s}'";									// Always read the all-time stats
+				if ($pref[$s] == 2) $qry .= ",'{$s}:{$this->date3}'";		// Look for monthlys as well as cumulative
+			}
+			$qry .= ")";
+
+			/* log file is out of date - consolidation required */
+
+			/* get existing stats ... */
+			//if($sql->select("logstats", "*", "log_id='statBrowser' OR log_id='statOs' OR log_id='statScreen' OR log_id='statDomain' OR log_id='statTotal' OR log_id='statUnique' OR log_id='statReferer' OR log_id='statQuery'"))
+			if($sql->select("logstats", "*", $qry))
+			{	// That's read in all the stats we need to modify
+				while($row = $sql->fetch())
+				{
+					if($row['log_id'] == "statUnique")
+					{
+						$statUnique = $row['log_data'];
+					}
+					elseif ($row['log_id'] == "statTotal")
+					{
+						$statTotal = $row['log_data'];
+					}
+					elseif (($pos = strpos($row['log_id'],':')) === false)
+					{  // Its all-time stats
+						$$row['log_id'] = unserialize($row['log_data']);	// $row['log_id'] is the stats type - save in a variable
+					}
+					else
+					{  // Its monthly stats
+						$row['log_id'] = 'mon_'.substr($row['log_id'],0,$pos);	// Create a generic variable for each monthly stats
+						$$row['log_id'] = unserialize($row['log_data']);	// $row['log_id'] is the stats type - save in a variable
+					}
+				}
+			}
+			else
+			{
+				// this must be the first time a consolidation has happened - this will only ever happen once ...
+				$sql->insert("logstats", "0, 'statBrowser', ''");
+				$sql->insert("logstats", "0, 'statOs', ''");
+				$sql->insert("logstats", "0, 'statScreen', ''");
+				$sql->insert("logstats", "0, 'statDomain', ''");
+				$sql->insert("logstats", "0, 'statReferer', ''");
+				$sql->insert("logstats", "0, 'statQuery', ''");
+				$sql->insert("logstats", "0, 'statTotal', '0'");
+				$sql->insert("logstats", "0, 'statUnique', '0'");
+
+				$statBrowser 	=array();
+				$statOs 		=array();
+				$statScreen 	=array();
+				$statDomain 	=array();
+				$statReferer 	=array();
+				$statQuery 		=array();
+			}
+
+
+			foreach ($stats_list as $s)
+			{
+				$varname = 'mon_'.$s;
+				if (!isset($$varname)) $$varname = array();		// Create monthly arrays if they don't exist
+			}
+
+			require($this->pathtologs.$this->pfileprev);		// Yesterday's page accesses - $pageInfo array
+			require($this->pathtologs.$this->ifileprev);		// Yesterdays browser accesses etc
+
+			foreach($browserInfo as $name => $amount)
+			{
+				$statBrowser[$name] += $amount;
+				$mon_statBrowser[$name] += $amount;
+			}
+
+			foreach($osInfo as $name => $amount)
+			{
+				$statOs[$name] += $amount;
+				$mon_statOs[$name] += $amount;
+			}
+
+			foreach($screenInfo as $name => $amount)
+			{
+				$statScreen[$name] += $amount;
+				$mon_statScreen[$name] += $amount;
+			}
+
+
+			foreach($domainInfo as $name => $amount)
+			{
+				if(!is_numeric($name))
+				{
+					$statDomain[$name] += $amount;
+					$mon_statDomain[$name] += $amount;
+				}
+			}
+
+			foreach($refInfo as $name => $info)
+			{
+				$statReferer[$name]['url'] = $info['url'];
+				$statReferer[$name]['ttl'] += $info['ttl'];
+				$mon_statReferer[$name]['url'] = $info['url'];
+				$mon_statReferer[$name]['ttl'] += $info['ttl'];
+			}
+
+
+			foreach($searchInfo as $name => $amount)
+			{
+				$statQuery[$name] += $amount;
+				$mon_statQuery[$name] += $amount;
+			}
+
+			$browser 	= serialize($statBrowser);
+			$os 		= serialize($statOs);
+			$screen 	= serialize($statScreen);
+			$domain 	= serialize($statDomain);
+			$refer 		= serialize($statReferer);
+			$squery 	= serialize($statQuery);
+
+			$statTotal += $siteTotal;
+			$statUnique += $siteUnique;
+
+			// Save cumulative results - always keep track of these, even if the $pref doesn't display them
+			$sql->update("logstats", "log_data='{$browser}' WHERE log_id='statBrowser'");
+			$sql->update("logstats", "log_data='{$os}' WHERE log_id='statOs'");
+			$sql->update("logstats", "log_data='{$screen}' WHERE log_id='statScreen'");
+			$sql->update("logstats", "log_data='{$domain}' WHERE log_id='statDomain'");
+			$sql->update("logstats", "log_data='{$refer}' WHERE log_id='statReferer'");
+			$sql->update("logstats", "log_data='{$squery}' WHERE log_id='statQuery'");
+			$sql->update("logstats", "log_data='".intval($statTotal)."' WHERE log_id='statTotal'");
+			$sql->update("logstats", "log_data='".intval($statUnique)."' WHERE log_id='statUnique'");
+
+
+			// Now save the relevant monthly results - only where enabled
+			foreach ($stats_list as $s)
+			{
+				if (isset($pref[$s]) && ($pref[$s] > 1))
+				{ // Value 2 requires saving of monthly stats
+					$srcvar = 'mon_'.$s;
+					$destvar = 'smon_'.$s;
+					$$destvar = serialize($$srcvar);
+
+					if (!$sql->update("logstats", "log_data='".$$destvar."' WHERE log_id='".$s.":".$this->date3."'"))
+					{
+						$sql->insert("logstats", "0, '".$s.":".$this->date3."', '".$$destvar."'");
+					}
+				}
+			}
+
+
+			/* get page access monthly info from db */
+			if($sql->select("logstats", "*", "log_id='{$this->date3}' "))
+			{
+				$tmp = $sql->fetch();
+				$monthlyInfo = unserialize($tmp['log_data']);
+				unset($tmp);
+				$MonthlyExistsFlag = TRUE;
+			}
+
+			foreach($pageInfo as $key => $info)
+			{
+				$monthlyInfo['TOTAL']['ttlv'] += $info['ttl'];
+				$monthlyInfo['TOTAL']['unqv'] += $info['unq'];
+				$monthlyInfo[$key]['ttlv'] += $info['ttl'];
+				$monthlyInfo[$key]['unqv'] += $info['unq'];
+			}
+
+			$monthlyinfo = serialize($monthlyInfo);
+
+			if($MonthlyExistsFlag)
+			{
+				$sql->update("logstats", "log_data='{$monthlyinfo}' WHERE log_id='{$this->date3}'");
+			}
+			else
+			{
+				$sql->insert("logstats", "0, '{$this->date3}', '{$monthlyinfo}'");
+			}
+
+
+			$this->collatePageTotal($pageInfo);
+			$this->collatePageInfo($pageInfo, $this->date2);
+			$this->resetLogFiles();
+
+			/* and finally, we need to create new logfiles for today ... */
+			$this->createLog();
+
+			return true;
+		}
+
+
+
+
+		function createLog()
+		{
+
+			if(!is_writable($this->pathtologs))
+			{
+				echo "<div class='alert alert-error'>Log directory is not writable - please CHMOD ".e_LOG." to 777";
+				echo '<br />Path to logs: '.$this->pathtologs;
+				echo "</div>";
+
+				return false;
 			}
 
 			$varStart = chr(36);
@@ -61,37 +317,42 @@ class logConsolidate
 
 			$data .= "\n);\n\n?".  chr(62);
 
-			if(!touch($pathtologs.$pfile)) {
-				return FALSE;
+			if(!touch($this->pathtologs.$this->pfile))
+			{
+				return false;
 			}
 
-			if(!touch($pathtologs.$ifile)) {
-				return FALSE;
+			if(!touch($this->pathtologs.$this->ifile))
+			{
+				return false;
 			}
 
-			if(!is_writable($pathtologs.$pfile)) {
+			if(!is_writable($this->pathtologs.$this->pfile))
+			{
 				$old = umask(0);
-				chmod($pathtologs.$pfile, 0777);
+				chmod($this->pathtologs.$this->pfile, 0777);
 				umask($old);
-				//	return FALSE;
+				//	return false;
 			}
 
-			if(!is_writable($pathtologs.$ifile)) {
+			if(!is_writable($this->pathtologs.$this->ifile))
+			{
 				$old = umask(0);
-				chmod($pathtologs.$ifile, 0777);
+				chmod($this->pathtologs.$this->ifile, 0777);
 				umask($old);
-				//	return FALSE;
+				//	return false;
 			}
 
-			if ($handle = fopen($pathtologs.$pfile, 'w'))
+			if ($handle = fopen($this->pathtologs.$this->pfile, 'w'))
 			{
 				fwrite($handle, $data);
 			}
+
 			fclose($handle);
 
 
-			$data = "<?php
-
+			$data = "<?php";
+			$data .= "
 /* e107 website system: Log info file: ".date("z:Y", time())." */
 
 ";
@@ -104,12 +365,13 @@ class logConsolidate
 			$data .= '$visitInfo'." = array();\n\n";
 			$data .= "?>";
 
-			if ($handle = fopen($pathtologs.$ifile, 'w'))
+			if ($handle = fopen($this->pathtologs.$this->ifile, 'w'))
 			{
 				fwrite($handle, $data);
 			}
 			fclose($handle);
-			return;
+
+			return true;
 		}
 
 
@@ -117,14 +379,14 @@ class logConsolidate
 
 		/**
 		* Called if both today's and yesterday's log files missing, to see
-		* if there are any older files we could process. Return FALSE if nothing
+		* if there are any older files we could process. Return false if nothing
 		* Otherwise return a string of relevant information
 	    * @param $pathtologs
 		* @return bool|string
 		*/
 		function check_for_old_files($pathtologs)
 		{
-			$no_files = TRUE;
+		//	$no_files = TRUE;
 			if ($dir_handle = opendir($pathtologs))
 			{
 				while (false !== ($file = readdir($dir_handle)))
@@ -143,7 +405,7 @@ class logConsolidate
 					}
 				}
 			}
-			return FALSE;
+			return false;
 		}
 
 
@@ -178,7 +440,7 @@ class logConsolidate
 		{
 			$pageDisallow = "cache|file|eself|admin";
 			$tagRemove = "(\\\)|(\s)|(\')|(\")|(eself)|(&nbsp;)|(\.php)|(\.html)";
-			$tagRemove2 = "(\\\)|(\s)|(\')|(\")|(eself)|(&nbsp;)";
+		//	$tagRemove2 = "(\\\)|(\s)|(\')|(\")|(eself)|(&nbsp;)";
 
 			preg_match("#/(.*?)(\?|$)(.*)#si", $url, $match);
 			$match[1] = isset($match[1]) ? $match[1] : '';
@@ -215,15 +477,19 @@ class logConsolidate
 		 * Process Raw Backup Log File. e. e_LOG."log/2015-09-24_SiteStats.log
 		 * This method can be used in the case of a database corruption to restore stats to the database.
 		 * @param string $file
+		 * @param bool $savetoDB
+		 * @return bool
 		 * @example processRawBackupLog('2015-09-24_SiteStats.log', false);
 		 */
 		function processRawBackupLog($file, $savetoDB=false)
 		{
 			$path = e_LOG."log/".$file;
 
+			$mes = e107::getMessage();
+
 			if(!is_readable($path))
 			{
-				echo "File Not Found: ".$path;
+				$mes->addError( "File Not Found: ".$path);
 				return false;
 			}
 
@@ -279,18 +545,22 @@ class logConsolidate
 
 				if (!feof($handle))
 				{
-					echo "Error: unexpected fgets() fail\n";
+					$mes->addError( "Error: unexpected fgets() fail.");
 				}
 
 				fclose($handle);
 
-				echo "<h3>".$file."</h3>";
-				print_a($pageTotal);
+
+				if(e_DEBUG)
+				{
+					$mes->addDebug("<h3>".$file."</h3>");
+					$mes->addDebug(print_a($pageTotal,true));
+				}
 			}
 
 			if($savetoDB === false)
 			{
-				echo "Saving mode is off";
+				$mes->addInfo( "Saving mode is off");
 				return true;
 			}
 
@@ -299,6 +569,8 @@ class logConsolidate
 			{
 				list($date,$name) = explode("_", $file, 2);
 
+				unset($name);
+
 				$unix = strtotime($date);
 
 				$datestamp = date("Y-m-j", $unix);
@@ -314,15 +586,17 @@ class logConsolidate
 
 					if($this->collatePageInfo($pageTotal, $datestamp))
 					{
-						echo "<br />Data saved to database with id: ".$datestamp;
+						$mes->addSuccess( "Data saved to database with id: ".$datestamp);
 					}
 					else
 					{
-						echo "<br />Couldn't save data to database with id: ".$datestamp;
+						$mes->addError( "Couldn't save data to database with id: ".$datestamp);
 					}
 				}
 
 			}
+
+			return true;
 		}
 
 
@@ -338,6 +612,8 @@ class logConsolidate
 				return $vars;
 			}
 
+			unset($datestamp, $bla); // remove editor warnings.
+
 			return false;
 		}
 
@@ -494,19 +770,17 @@ class logConsolidate
 		function resetLogFiles()
 		{
 
-			global $pathtologs, $pfileprev, $ifileprev;
-
-			if(empty($pfileprev) || empty($ifileprev))
+			if(empty($this->pfileprev) || empty($this->ifileprev))
 			{
 				return false;
 			}
 
 			/* ok, we're finished with the log file now, we can empty it ... */
-			if(!unlink($pathtologs.$pfileprev))
+			if(!unlink($this->pathtologs.$this->pfileprev))
 			{
 				$data = chr(60)."?php\n". chr(47)."* e107 website system: Log file: ".date("z:Y", time())." *". chr(47)."\n\n\n\n".chr(47)."* THE INFORMATION IN THIS LOG FILE HAS BEEN CONSOLIDATED INTO THE DATABASE - YOU CAN SAFELY DELETE IT. *". chr(47)."\n\n\n?".  chr(62);
 
-				if($handle = fopen($pathtologs.$pfileprev, 'w'))
+				if($handle = fopen($this->pathtologs.$this->pfileprev, 'w'))
 				{
 					fwrite($handle, $data);
 				}
@@ -515,11 +789,11 @@ class logConsolidate
 			}
 
 
-			if(!unlink($pathtologs.$ifileprev))
+			if(!unlink($this->pathtologs.$this->ifileprev))
 			{
 				$data = chr(60)."?php\n". chr(47)."* e107 website system: Log file: ".date("z:Y", time())." *". chr(47)."\n\n\n\n".chr(47)."* THE INFORMATION IN THIS LOG INFO FILE HAS BEEN CONSOLIDATED INTO THE DATABASE - YOU CAN SAFELY DELETE IT. *". chr(47)."\n\n\n?".  chr(62);
 
-				if($handle = fopen($pathtologs.$ifileprev, 'w'))
+				if($handle = fopen($this->pathtologs.$this->ifileprev, 'w'))
 				{
 					fwrite($handle, $data);
 				}
@@ -528,225 +802,14 @@ class logConsolidate
 			}
 
 
-
+			return true;
 		}
 }
 
 
-$lgc = new logConsolidate();
 
 
 
-if(file_exists($pathtologs.$pfile))  /* log file is up to date, no consolidation required */
-{
-	return;
-}
-else if(!file_exists($pathtologs.$pfileprev))  // See if any older log files
-{  
-  if (($retvalue = $lgc->check_for_old_files($pathtologs)) === FALSE) /* no logfile found at all - create - this will only ever happen once ... */
-  { 	
-	$lgc->createLog($pathtologs);
-	return FALSE;
-  }
- 
-  list($pfileprev,$ifileprev,$date2,$tstamp) = explode('|',$retvalue);  // ... if we've got files
-}
-
-
-
-// List of the non-page-based info which is gathered - historically only 'all-time' stats, now we support monthly as well
-$stats_list = array('statBrowser','statOs','statScreen','statDomain','statReferer','statQuery');
-
-$qry = "`log_id` IN ('statTotal','statUnique'";
-foreach ($stats_list as $s)
-{
-  $qry .= ",'{$s}'";									// Always read the all-time stats
-  if ($pref[$s] == 2) $qry .= ",'{$s}:{$date3}'";		// Look for monthlys as well as cumulative
-}
-$qry .= ")";
-
-/* log file is out of date - consolidation required */
-
-/* get existing stats ... */
-//if($sql->select("logstats", "*", "log_id='statBrowser' OR log_id='statOs' OR log_id='statScreen' OR log_id='statDomain' OR log_id='statTotal' OR log_id='statUnique' OR log_id='statReferer' OR log_id='statQuery'")) 
-if($sql->select("logstats", "*", $qry)) 
-{	// That's read in all the stats we need to modify
-	while($row = $sql->fetch())
-	{
-		if($row['log_id'] == "statUnique")
-		{
-		  $statUnique = $row['log_data'];
-		}
-		elseif ($row['log_id'] == "statTotal") 
-		{
-		  $statTotal = $row['log_data'];
-		}
-		elseif (($pos = strpos($row['log_id'],':')) === FALSE)
-		{  // Its all-time stats
-		  $$row['log_id'] = unserialize($row['log_data']);	// $row['log_id'] is the stats type - save in a variable
-		}
-		else
-		{  // Its monthly stats
-		  $row['log_id'] = 'mon_'.substr($row['log_id'],0,$pos);	// Create a generic variable for each monthly stats
-		  $$row['log_id'] = unserialize($row['log_data']);	// $row['log_id'] is the stats type - save in a variable
-		}
-	}
-}
-else
-{
-	// this must be the first time a consolidation has happened - this will only ever happen once ... 
-	$sql->insert("logstats", "0, 'statBrowser', ''");
-	$sql->insert("logstats", "0, 'statOs', ''");
-	$sql->insert("logstats", "0, 'statScreen', ''");
-	$sql->insert("logstats", "0, 'statDomain', ''");
-	$sql->insert("logstats", "0, 'statReferer', ''");
-	$sql->insert("logstats", "0, 'statQuery', ''");
-	$sql->insert("logstats", "0, 'statTotal', '0'");
-	$sql->insert("logstats", "0, 'statUnique', '0'");
-	
-	$statBrowser 	=array();
-	$statOs 		=array();
-	$statScreen 	=array();
-	$statDomain 	=array();
-	$statReferer 	=array();
-	$statQuery 		=array();
-}
-
-
-foreach ($stats_list as $s)
-{
-  $varname = 'mon_'.$s;
-  if (!isset($$varname)) $$varname = array();		// Create monthly arrays if they don't exist
-}
-
-
-require_once($pathtologs.$pfileprev);		// Yesterday's page accesses - $pageInfo array
-require_once($pathtologs.$ifileprev);		// Yesterdays browser accesses etc
-
-foreach($browserInfo as $name => $amount) 
-{
-	$statBrowser[$name] += $amount;
-	$mon_statBrowser[$name] += $amount;
-}
-
-foreach($osInfo as $name => $amount) 
-{
-	$statOs[$name] += $amount;
-	$mon_statOs[$name] += $amount;
-}
-
-foreach($screenInfo as $name => $amount) 
-{
-	$statScreen[$name] += $amount;
-	$mon_statScreen[$name] += $amount;
-}
-
-
-foreach($domainInfo as $name => $amount) 
-{
-	if(!is_numeric($name)) 
-	{
-		$statDomain[$name] += $amount;
-		$mon_statDomain[$name] += $amount;
-	}
-}
-
-foreach($refInfo as $name => $info) 
-{
-	$statReferer[$name]['url'] = $info['url'];
-	$statReferer[$name]['ttl'] += $info['ttl'];
-	$mon_statReferer[$name]['url'] = $info['url'];
-	$mon_statReferer[$name]['ttl'] += $info['ttl'];
-}
-
-
-foreach($searchInfo as $name => $amount) 
-{
-	$statQuery[$name] += $amount;
-	$mon_statQuery[$name] += $amount;
-}
-
-$browser 	= serialize($statBrowser);
-$os 		= serialize($statOs);
-$screen 	= serialize($statScreen);
-$domain 	= serialize($statDomain);
-$refer 		= serialize($statReferer);
-$squery 	= serialize($statQuery);
-
-$statTotal += $siteTotal;
-$statUnique += $siteUnique;
-
-// Save cumulative results - always keep track of these, even if the $pref doesn't display them
-$sql->update("logstats", "log_data='{$browser}' WHERE log_id='statBrowser'");
-$sql->update("logstats", "log_data='{$os}' WHERE log_id='statOs'");
-$sql->update("logstats", "log_data='{$screen}' WHERE log_id='statScreen'");
-$sql->update("logstats", "log_data='{$domain}' WHERE log_id='statDomain'");
-$sql->update("logstats", "log_data='{$refer}' WHERE log_id='statReferer'");
-$sql->update("logstats", "log_data='{$squery}' WHERE log_id='statQuery'");
-$sql->update("logstats", "log_data='".intval($statTotal)."' WHERE log_id='statTotal'");
-$sql->update("logstats", "log_data='".intval($statUnique)."' WHERE log_id='statUnique'");
-
-
-// Now save the relevant monthly results - only where enabled
-foreach ($stats_list as $s)
-{
-  if (isset($pref[$s]) && ($pref[$s] > 1))
-  { // Value 2 requires saving of monthly stats
-	$srcvar = 'mon_'.$s;
-    $destvar = 'smon_'.$s;
-	$$destvar = serialize($$srcvar);
-	
-	if (!$sql->update("logstats", "log_data='".$$destvar."' WHERE log_id='".$s.":".$date3."'"))
-	{
-	  $sql->insert("logstats", "0, '".$s.":".$date3."', '".$$destvar."'");
-	}
-  }
-}
-
-
-
-/* get page access monthly info from db */
-if($sql->select("logstats", "*", "log_id='{$date3}' ")) 
-{
-	$tmp = $sql->fetch();
-	$monthlyInfo = unserialize($tmp['log_data']);
-	unset($tmp);
-	$MonthlyExistsFlag = TRUE;
-}
-
-foreach($pageInfo as $key => $info)
-{
-	$monthlyInfo['TOTAL']['ttlv'] += $info['ttl'];
-	$monthlyInfo['TOTAL']['unqv'] += $info['unq'];
-	$monthlyInfo[$key]['ttlv'] += $info['ttl'];
-	$monthlyInfo[$key]['unqv'] += $info['unq'];
-}
-
-$monthlyinfo = serialize($monthlyInfo);
-
-if($MonthlyExistsFlag) 
-{
-	$sql->update("logstats", "log_data='{$monthlyinfo}' WHERE log_id='{$date3}'");
-} 
-else 
-{
-	$sql->insert("logstats", "0, '{$date3}', '{$monthlyinfo}'");
-}
-
-
-
-
-
-
-$lgc->collatePageTotal($pageInfo);
-
-$lgc->collatePageInfo($pageInfo, $date2);
-
-$lgc->resetLogFiles();
-
-
-/* and finally, we need to create new logfiles for today ... */
-$lgc->createLog($pathtologs,$statTotal,$statUnique);
 
 
 
diff --git a/e107_plugins/log/e_meta.php b/e107_plugins/log/e_meta.php
index cceb6a8be..342531621 100644
--- a/e107_plugins/log/e_meta.php
+++ b/e107_plugins/log/e_meta.php
@@ -27,6 +27,9 @@ if (vartrue($pref['statActivate']))
 	if(USER_AREA)
 	{
 		require_once(e_PLUGIN.'log/consolidate.php');
+		$lgc = new logConsolidate();
+		$lgc->run();
+
 		$err_flag = '';
 		if (defined('ERR_PAGE_ACTIVE'))
 		{	// We've got an error - set a flag to log it
diff --git a/e107_plugins/log/languages/English_admin.php b/e107_plugins/log/languages/English_admin.php
new file mode 100644
index 000000000..ff7395720
--- /dev/null
+++ b/e107_plugins/log/languages/English_admin.php
@@ -0,0 +1,101 @@
+<?php
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2013 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ */
+
+//define("ADSTAT_ON", "On");
+//define("ADSTAT_OFF", "Off");
+define("ADSTAT_LAN_1", "This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.");
+define("ADSTAT_LAN_2", "The statistics logger has been successfully installed. To activate, please go to the config screen and click Activate.<br /><b>You must set the permissions of the e107_plugins/log/logs folder to 777 (chmod 777)</b>");
+define("ADSTAT_LAN_3", "Statistic Logging");
+define("ADSTAT_LAN_4", "Activate statistic logging");
+define("ADSTAT_LAN_5", "Statistic types");
+define("ADSTAT_LAN_6", "Browsers");
+define("ADSTAT_LAN_7", "Operating Systems");
+define("ADSTAT_LAN_8", "Screen resolutions / depths");
+define("ADSTAT_LAN_9", "Countries/domains visited from");
+define("ADSTAT_LAN_10", "Referrers");
+define("ADSTAT_LAN_11", "Search queries");
+define("ADSTAT_LAN_12", "Reset stats");
+define("ADSTAT_LAN_13", "This will erase the all-time stats - careful! Deletes stats to the end of yesterday. There is a separate menu option to delete selected historical data"); // TODO: Condense this help field (minimize)
+define("ADSTAT_LAN_14", "Page counts");
+//define("ADSTAT_LAN_15", "Update Statistic Settings");
+define("ADSTAT_LAN_16", "Site Statistic Settings");
+//define("ADSTAT_LAN_17", "Statistic settings updated");
+define("ADSTAT_LAN_18", "Allow access to main statistics page to ...");
+define("ADSTAT_LAN_19", "Recent visitors");
+define("ADSTAT_LAN_20", "Count admin visits");
+define("ADSTAT_LAN_21", "Maximum records to display on stats page");
+define("ADSTAT_LAN_22", "Run update routine");
+define("ADSTAT_LAN_23", "logs from a previous version of e107 have been detected, update them here");
+define("ADSTAT_LAN_24", "Go to update script");
+//define("ADSTAT_LAN_25", "Selected stats reset");
+define("ADSTAT_LAN_26", "Remove page entries");
+define("ADSTAT_LAN_27", "If your stats have incorrect pages, you can remove them here");
+define("ADSTAT_LAN_28", "Open page");
+define("ADSTAT_LAN_29", "Page Name");
+define("ADSTAT_LAN_30", "Check to remove");
+define("ADSTAT_LAN_31", "Remove selected pages");
+define("ADSTAT_LAN_32", "Page Tidy");
+// define("ADSTAT_LAN_33", "Configure Statistics Logging"); see English_global.php
+// define("ADSTAT_LAN_34", "Site Stats");
+define ('ADSTAT_LAN_35', 'Options');
+define ('ADSTAT_LAN_36', 'Data Export');
+//define ('ADSTAT_LAN_37', 'Create export file');
+define ('ADSTAT_LAN_38', "You must set the e107_plugins/log/logs folder to be writable");
+define ('ADSTAT_LAN_39', 'Stats Logging Functions');
+define ('ADSTAT_LAN_40', 'Export log data');
+define ('ADSTAT_LAN_41', 'Date selection');
+define ('ADSTAT_LAN_42', 'Single Day');
+define ('ADSTAT_LAN_43', 'Daily for a month');
+define ('ADSTAT_LAN_44', 'Monthly for a year');
+define ('ADSTAT_LAN_45', 'All-time');
+define ('ADSTAT_LAN_46', 'Date:');
+define ('ADSTAT_LAN_47', 'Invalid date chosen');
+define ('ADSTAT_LAN_48', 'Monthly and All-time');
+define ('ADSTAT_LAN_49', 'All-time Only');
+define ('ADSTAT_LAN_50', 'None');
+define ('ADSTAT_LAN_51', 'Output Data');
+define ('ADSTAT_LAN_52', 'Page Data');
+define ('ADSTAT_LAN_53', 'No selection possible');
+define ('ADSTAT_LAN_54', 'Invalid type selection');
+define ('ADSTAT_LAN_55', 'Single quote');
+define ('ADSTAT_LAN_56', 'Double quote');
+define ('ADSTAT_LAN_57', 'Comma');
+define ('ADSTAT_LAN_58', 'Pipe (|)');
+define ('ADSTAT_LAN_59', 'CSV separator, quotes');
+define ('ADSTAT_LAN_60', 'Strip site address from URLs');
+define ('ADSTAT_LAN_61', '(if checked, just gives page reference)');
+define ('ADSTAT_LAN_62', 'All-time (detailed)');
+define ('ADSTAT_LAN_63', 'Available Datasets');
+define ('ADSTAT_LAN_64', 'Database records found:');
+define ('ADSTAT_LAN_65', 'DB filter string:');
+define ('ADSTAT_LAN_66', 'Show Datasets');
+define ('ADSTAT_LAN_67', 'Generate a CSV (Comma Separated Variable) file of historical statistics which meets the specified criteria');
+define ('ADSTAT_LAN_68', 'Show the statistics database entries which actually exist and meet the selection criteria');
+define ('ADSTAT_LAN_69', 'Delete historical data');
+define ('ADSTAT_LAN_70', 'Delete data older than:');
+define ('ADSTAT_LAN_71', 'Delete Data');
+define ('ADSTAT_LAN_72', 'Confirm deletion of data older than first day of:');
+//define ('ADSTAT_LAN_73', 'Confirm');
+define ('ADSTAT_LAN_74', '(List of data entries which will be deleted below)');
+define ('ADSTAT_LAN_75', 'Records for deletion');
+define ('ADSTAT_LAN_76', 'Caution! Once deleted, the data cannot be recovered. Backup or export your database first');
+define ('ADSTAT_LAN_77', 'Records deleted:');
+define ('ADSTAT_LAN_78', 'Show previous month as well as current month for non-page access stats');
+define ('ADSTAT_LAN_79', 'Only used if monthly stats collected');
+define ('ADSTAT_LAN_80', 'The following pages were deleted:');
+define ('ADSTAT_LAN_81', 'Statistics cleared:');
+define ('ADSTAT_LAN_82', 'Following values now set:');
+define ('ADSTAT_LAN_83', 'Following log ID entries removed:');
+define ('ADSTAT_LAN_84', '');
+define ('ADSTAT_LAN_85', '');
+
+
+
+?>
\ No newline at end of file

From 790d4085872f6be627a64b4bec24e753d29c239d Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 16 Oct 2015 14:23:23 -0700
Subject: [PATCH 03/11] Fixes #1205  - plugin folder wipe issue.

---
 e107_admin/plugin.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 65eb3a7e3..d770e06d6 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -788,12 +788,13 @@ class pluginManager{
 				e107::getLog()->add('PLUGMAN_03', $logInfo, E_LOG_INFORMATIVE, '');
 			}
 
-			if($_POST['delete_files'])
+			if(!empty($_POST['delete_files'])  && ($plug['plugin_installflag'] == true))
 			{
-				include_once(e_HANDLER.'file_class.php');
-				$fi = new e_file;
-				$result = $fi->rmtree(e_PLUGIN.$eplug_folder);
-				$text .= ($result ? '<br />'.EPL_ADLAN_86.e_PLUGIN.$eplug_folder : '<br />'.EPL_ADLAN_87.'<br />'.EPL_ADLAN_31.' <b>'.e_PLUGIN.$eplug_folder.'</b> '.EPL_ADLAN_32);
+				if(!empty($eplug_folder))
+				{
+					$result = e107::getFile()->rmtree(e_PLUGIN.$eplug_folder);
+					$text .= ($result ? '<br />'.EPL_ADLAN_86.e_PLUGIN.$eplug_folder : '<br />'.EPL_ADLAN_87.'<br />'.EPL_ADLAN_31.' <b>'.e_PLUGIN.$eplug_folder.'</b> '.EPL_ADLAN_32);
+				}
 			}
 			else
 			{

From 103dbb2be316d005bc0da54d8a92fce771615a2b Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 16 Oct 2015 15:09:59 -0700
Subject: [PATCH 04/11] Issue #6 - LAN for "Related" area.

---
 e107_handlers/form_handler.php     | 2 +-
 e107_languages/English/English.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 18c92c4bd..aae46ff7e 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2918,7 +2918,7 @@ class e_form
 		
 		if(count($list))
 		{
-			return "<div class='e-related clearfix'><hr><h4>Related</h4><ul class='e-related'>".implode("\n",$list)."</ul></div>"; //XXX Tablerender?
+			return "<div class='e-related clearfix'><hr><h4>".defset('LAN_RELATED', 'Related')."</h4><ul class='e-related'>".implode("\n",$list)."</ul></div>"; //XXX Tablerender?
 		}
 		
 	}		
diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php
index 87e41242a..e2899e872 100644
--- a/e107_languages/English/English.php
+++ b/e107_languages/English/English.php
@@ -113,6 +113,7 @@ define("LAN_USER", "User");
 define("LAN_EMAIL","Email address");
 define("LAN_WROTE", "wrote"); // as in John wrote.."  ";
 define("LAN_RE_ORDER", "Re-order");
+define("LAN_RELATED", "Related");
 
 define("LAN_ENTER_USRNAME_EMAIL", "Please enter your username or email"); // admin php hover field admin name
 define("LAN_PWD_REQUIRED", "Password is required"); // admin php hover field admin password

From 694fc01b37955aef51b8a6250584223169f84e00 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 18 Oct 2015 09:05:58 -0700
Subject: [PATCH 05/11] Fixes #1206 - Fixes missing icons in menu manager.

---
 e107_admin/menus.php              | 2 +-
 e107_handlers/message_handler.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 2654c9814..2c626b29c 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -1249,7 +1249,7 @@ if(e_IFRAME) //<-- Check config and delete buttons if modifying
 
 //e107::js('core','bootstrap/js/bootstrap.min.js');
 //e107::css('core','bootstrap/css/bootstrap.min.css');
-	e107::css('url','{e_THEME}/bootstrap/admin_style.css');
+	e107::css('url','{e_THEME}/bootstrap3/admin_style.css');
 
 }
 
diff --git a/e107_handlers/message_handler.php b/e107_handlers/message_handler.php
index 2c6bbe726..b2d2180c0 100644
--- a/e107_handlers/message_handler.php
+++ b/e107_handlers/message_handler.php
@@ -990,8 +990,8 @@ function show_emessage($mode, $message, $line = 0, $file = "") {
 		<head>
 		<meta charset="utf-8" />
 		<title>Error</title>
-		<link rel="stylesheet" media="all" type="text/css" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" />
-		<link rel="stylesheet" media="all" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" />
+		<link rel="stylesheet" media="all" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
+		<link rel="stylesheet" media="all" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" />
 		<link rel="stylesheet" media="all" type="text/css" href="/e107_web/css/e107.css" />
 		</head>
 		<body >

From 13ef309bda1ddea46eb759b8c94adfb60a39083f Mon Sep 17 00:00:00 2001
From: Miroslav Yovchev <m.yovchev@corllete.com>
Date: Mon, 19 Oct 2015 23:55:46 +0300
Subject: [PATCH 06/11] Private property called as a public one
 (alt_login::__construct)

---
 e107_plugins/alt_auth/ldap_auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_plugins/alt_auth/ldap_auth.php b/e107_plugins/alt_auth/ldap_auth.php
index 8105d54ef..b42b9de42 100755
--- a/e107_plugins/alt_auth/ldap_auth.php
+++ b/e107_plugins/alt_auth/ldap_auth.php
@@ -36,7 +36,7 @@ class auth_login extends alt_auth_base
 	public	$Available = FALSE;		// Flag indicates whether DB connection available
 	private	$filter;		// Filter for eDirectory search
 	private	$copyAttribs; 	// Any attributes which are to be copied on successful login
-	private	$copyMethods;	// Methods which are to be used to copy attributes
+	public	$copyMethods;	// Methods which are to be used to copy attributes
 
 
 

From c0a62c16c70d5ca1a3a4a9d65f071f3708c78486 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 23 Oct 2015 11:48:24 -0700
Subject: [PATCH 07/11] Fix for lengthy "news_extended" content. Admin-UI:
 $fields 'type' of false will hide the field, but still save it if posted.

---
 e107_core/sql/core_sql.php     | 2 +-
 e107_handlers/form_handler.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_core/sql/core_sql.php b/e107_core/sql/core_sql.php
index dd1b8cddc..84dff041c 100644
--- a/e107_core/sql/core_sql.php
+++ b/e107_core/sql/core_sql.php
@@ -303,7 +303,7 @@ CREATE TABLE news (
   news_title varchar(255) NOT NULL default '',
   news_sef varchar(200) NOT NULL default '',
   news_body longtext NOT NULL,
-  news_extended text NOT NULL,
+  news_extended longtext NOT NULL,
   news_meta_keywords  varchar(255) NOT NULL default '',
   news_meta_description text NOT NULL,
   news_datestamp int(10) unsigned NOT NULL default '0',
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index aae46ff7e..f5104504d 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -4762,7 +4762,7 @@ class e_form
 				$key = $att['field'];
 			}
 			
-			if($key == 'checkboxes' || $key == 'options' || ($att['type'] === null))
+			if($key == 'checkboxes' || $key == 'options' || ($att['type'] === null) || ($att['type'] === false))
 			{
 				continue;	
 			}

From efa345e8f2645778d196fadd5c175ec6256d0dbd Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <github@tijnkuyper.nl>
Date: Sat, 24 Oct 2015 14:04:29 +0200
Subject: [PATCH 08/11] Fixes #1130 - Hardcoded 'none' to LAN_NONE (#6)

---
 e107_plugins/list_new/section/list_news.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_plugins/list_new/section/list_news.php b/e107_plugins/list_new/section/list_news.php
index e7c25e452..1b9985e8e 100644
--- a/e107_plugins/list_new/section/list_news.php
+++ b/e107_plugins/list_new/section/list_news.php
@@ -45,7 +45,7 @@ class list_news
 		$bullet = $this->parent->getBullet($this->parent->settings['icon']);
 
 		$list_caption = $this->parent->settings['caption'];
-		$list_display = (vartrue($this->parent->settings['open']) ? '' : 'none');
+		$list_display = (vartrue($this->parent->settings['open']) ? '' : LAN_NONE);
 
 		$qry = "
 		SELECT n.*, c.category_id AS news_category_id, c.category_name AS news_category_name, u.user_id AS news_author_id, u.user_name AS news_author_name

From 4baccf9a809cbf84fbc05745ac968fd228befa46 Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <github@tijnkuyper.nl>
Date: Sat, 24 Oct 2015 14:56:15 +0200
Subject: [PATCH 09/11] Fixes #930 - backticks in listQry of gallery plugin
 admin

---
 e107_plugins/gallery/admin_gallery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_plugins/gallery/admin_gallery.php b/e107_plugins/gallery/admin_gallery.php
index fcfcd9d4d..634c8a9fd 100644
--- a/e107_plugins/gallery/admin_gallery.php
+++ b/e107_plugins/gallery/admin_gallery.php
@@ -105,7 +105,7 @@ class gallery_cat_admin_ui extends e_admin_ui
 		protected $perPage 		= 10; //no limit
 		protected $listOrder = 'media_cat_order';
 
-	 	protected $listQry = "SELECT * FROM #core_media_cat WHERE media_cat_owner = 'gallery' "; // without any Order or Limit. 
+	 	protected $listQry = "SELECT * FROM `#core_media_cat` WHERE media_cat_owner = 'gallery' "; // without any Order or Limit. 
 	 	
 	//		protected $listQry = "SELECT * FROM #core_media  "; // without any Order or Limit. 
 	//	protected $editQry = "SELECT * FROM #faq_info WHERE faq_info_id = {ID}";

From 06cb429f6f9f684b8b01d4c516f7295c25868a21 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sat, 24 Oct 2015 09:59:30 -0700
Subject: [PATCH 10/11] Fix for invalid element IDs.

---
 e107_handlers/admin_ui.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 23133b7dd..d960de441 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -6434,7 +6434,8 @@ class e_admin_form_ui extends e_form
 	public function getElementId()
 	{
 		$controller = $this->getController();
-		return str_replace('_', '-', ($controller->getPluginName() == 'core' ? 'core-'.$controller->getTableName() : 'plugin-'.$controller->getPluginName()));
+		$name = str_replace('_', '-', ($controller->getPluginName() == 'core' ? 'core-'.$controller->getTableName() : 'plugin-'.$controller->getPluginName()));
+		return e107::getForm()->name2id($name); // prevent invalid ids.
 	}
 
 	/**

From 9d40ee53c93f75e6e22edba7b08bc305cd48b046 Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <github@tijnkuyper.nl>
Date: Sat, 24 Oct 2015 19:41:23 +0200
Subject: [PATCH 11/11] Flood ban email: show IP in IPv4 format if possible

---
 e107_handlers/notify_class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_handlers/notify_class.php b/e107_handlers/notify_class.php
index e2720a8c9..5b1db75a5 100644
--- a/e107_handlers/notify_class.php
+++ b/e107_handlers/notify_class.php
@@ -331,7 +331,7 @@ class notify
 
 	function notify_flood($data)
 	{
-		$this->send('flood', NT_LAN_FL_1, NT_LAN_FL_2.': '.e107::getIPHandler()->ipDecode($data));
+		$this->send('flood', NT_LAN_FL_1, NT_LAN_FL_2.': '.e107::getIPHandler()->ipDecode($data, TRUE));
 	}
 
 	function notify_subnews($data)