Removed 'log' plugin from repo. Now found at https://github.com/e107inc/log

e107_handlers/admin_ui.php

@@ -7518,11 +7518,11 @@ class e_admin_form_ui extends e_form
 							".implode("\n", $filter_preserve_var). '
 							' .$this->admin_button('etrigger_filter', 'etrigger_filter', 'filter e-hide-if-js', ADMIN_FILTER_ICON, array('id' => false, 'title' =>LAN_FILTER)). '
 							
-							' .$this->renderPagination()."
+							' .$this->renderPagination()."	
-							<span class='indicator' style='display: none;'>
-								<img src='".e_IMAGE_ABS."generic/loading_16.gif' class='icon action S16' alt='".LAN_LOADING."' />
-							</span>
 							".$gridToggle."
+							<span class='indicator' style='display: none;'>
+								<i class='fa fa-spin fa-spinner fa-fw'></i>
+							</span>
 						</div>
 						<div id='admin-ui-list-db-language' class='span4 col-md-4 text-right' >";
 

e107_handlers/plugin_class.php

@@ -84,7 +84,7 @@ class e_plugin
 		"_blank","admin_menu","banner","blogcalendar_menu",
 		"chatbox_menu",	"clock_menu","comment_menu",
 		"contact", "download", "featurebox", "forum","gallery",
-		"gsitemap", "hero", "import", "linkwords", "list_new", "log", "login_menu",
+		"gsitemap", "hero", "import", "linkwords", "list_new",  "login_menu",
 		 "newforumposts_main", "news", "newsfeed",
 		"newsletter","online", "page", "pm","poll",
 		"rss_menu","search_menu","siteinfo", "social", "tagcloud", "tinymce4",

e107_plugins/banner/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <e107Plugin name="Banners" lan="LAN_PLUGIN_BANNER_NAME" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
-	<author name="e107 Inc." url="http://e107.org" email="jalist@e107.org" />
+	<author name="e107 Inc." url="http://e107.org"  />
 	<summary>Add advertising banners to your e107 website</summary>
 	<description lan="LAN_PLUGIN_BANNER_DESCRIPTION">Add advertising banners to your e107 website</description>
 	<keywords>

e107_plugins/chatbox_menu/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <e107Plugin name="Chatbox" lan="LAN_PLUGIN_CHATBOX_MENU_NAME" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
-	<author name="e107 Inc." url="http://e107.org" email="jalist@e107.org" />
+	<author name="e107 Inc." url="https://e107.org"  />
 	<description lan="LAN_PLUGIN_CHATBOX_MENU_DESCRIPTION">Chatbox Menu</description>
 	<category>content</category>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>

e107_plugins/log/consolidate.php

@@ -1,857 +0,0 @@
-<?php
-/*
- * e107 website system
- *
- * Copyright (C) 2008-2015 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
-
- */
-
-/* first thing to do is check if the log file is out of date ... */
-
-
-
-if (!defined('e107_INIT')){ exit; } 
-
-
-
-// Begin v2.x cleanup.
-class logConsolidate
-{
-
-		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 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 */
-			{
-				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
-			}
-
-			if(file_exists($this->pathtologs.$this->pfileprev))
-			{
-				require($this->pathtologs.$this->pfileprev);		// Yesterday's page accesses - $pageInfo array
-			}
-
-			if(file_exists($this->pathtologs.$this->ifileprev))
-			{
-				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);
-			$quote = chr(34);
-
-			$data = chr(60)."?php\n". chr(47)."* e107 website system: Log file: ".date("z:Y", time())." *". chr(47)."\n\n".
-				$varStart."refererData = ".$quote.$quote.";\n".
-				$varStart."ipAddresses = ".$quote.$quote.";\n".
-				$varStart."hosts = ".$quote.$quote.";\n".
-				$varStart."siteTotal = ".$quote."0".$quote.";\n".
-				$varStart."siteUnique = ".$quote."0".$quote.";\n".
-				$varStart."screenInfo = array();\n".
-				$varStart."browserInfo = array();\n".
-				$varStart."osInfo = array();\n".
-				$varStart."pageInfo = array(\n";
-
-			$data .= "\n);\n\n?".  chr(62);
-
-			if(!touch($this->pathtologs.$this->pfile))
-			{
-				return false;
-			}
-
-			if(!touch($this->pathtologs.$this->ifile))
-			{
-				return false;
-			}
-
-			if(!is_writable($this->pathtologs.$this->pfile))
-			{
-				$old = umask(0);
-				chmod($this->pathtologs.$this->pfile, 0777);
-				umask($old);
-				//	return false;
-			}
-
-			if(!is_writable($this->pathtologs.$this->ifile))
-			{
-				$old = umask(0);
-				chmod($this->pathtologs.$this->ifile, 0777);
-				umask($old);
-				//	return false;
-			}
-
-			if ($handle = fopen($this->pathtologs.$this->pfile, 'w'))
-			{
-				fwrite($handle, $data);
-			}
-
-			fclose($handle);
-
-
-			$data = "<?php";
-			$data .= "
-/* e107 website system: Log info file: ".date("z:Y", time())." */
-
-";
-			$data .= '$domainInfo'." = array();\n\n";
-			$data .= '$screenInfo'." = array();\n\n";
-			$data .= '$browserInfo'." = array();\n\n";
-			$data .= '$osInfo'." = array();\n\n";
-			$data .= '$refInfo'." = array();\n\n";
-			$data .= '$searchInfo'." = array();\n\n";
-			$data .= '$visitInfo'." = array();\n\n";
-			$data .= "?>";
-
-			if ($handle = fopen($this->pathtologs.$this->ifile, 'w'))
-			{
-				fwrite($handle, $data);
-			}
-			fclose($handle);
-
-			return true;
-		}
-
-
-
-
-		/**
-		* 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
-		* Otherwise return a string of relevant information
-	    * @param $pathtologs
-		* @return bool|string
-		*/
-		function check_for_old_files($pathtologs)
-		{
-		//	$no_files = TRUE;
-			if ($dir_handle = opendir($pathtologs))
-			{
-				while (false !== ($file = readdir($dir_handle)))
-				{
-					// Do match on #^logp_(\d{1,3})\.php$#i
-					if (preg_match('#^logp_(\d{1,3}\.\d{4})\.php$#i',$file,$match) == 1)
-					{  // got a matching file
-						$yesterday = $match[1];						// Day of year - zero is 1st Jan
-						$pfileprev = "logp_".$yesterday.".php";		// Yesterday's log file
-						$ifileprev = "logi_".$yesterday.".php";
-						list($day,$year) = explode('.',$yesterday);
-						$tstamp = mktime(0,0,0,1,1,$year) + ($day*86400);
-						$date2 = date("Y-m-j", $tstamp);		// Yesterday's date for the database summary
-						$temp = array($pfileprev,$ifileprev,$date2,$tstamp);
-						return implode('|',$temp);
-					}
-				}
-			}
-			return false;
-		}
-
-
-
-
-
-		// for future use.
-		private function collate($pfile)
-		{
-			if(is_readable(e_LOG.$pfile))
-			{
-				require(e_LOG.$pfile); // contains $pageInfo;
-			}
-			else
-			{
-				return false;
-			}
-
-			return null;
-		}
-
-
-
-
-		/**
-		 * @param $url
-		 * @param bool $logQry
-		 * @param string $err_code
-		 * @return bool|mixed|string
-		 */
-		function getPageKey($url,$logQry=false,$err_code='', $lan=null)
-		{
-			$pageDisallow = "cache|file|eself|admin";
-			$tagRemove = "(\\\)|(\s)|(\')|(\")|(eself)|(&nbsp;)|(\.php)|(\.html)";
-
-		//	preg_match("#/(.*?)(\?|$)(.*)#si", $url, $match);
-		//	$match[1] = isset($match[1]) ? $match[1] : '';
-		//	$pageName = substr($match[1], (strrpos($match[1], "/")+1));
-
-			if(deftrue('e_DOMAIN'))
-			{
-				list($discard,$pageName) = explode(e_DOMAIN.'/',$url); // everything after the domain.
-			}
-			else // eg. local setup.
-			{
-				$pageName = str_replace(SITEURL,'',$url);
-			}
-
-			$pageName = urldecode($pageName);
-
-			$pageName = preg_replace("/".$tagRemove."/si", "", $pageName);
-
-			if($logQry == false)
-			{
-				$tmp = explode("?",$pageName);
-				$pageName = $tmp[0];
-			}
-
-			if(empty($pageName))
-			{
-				$pageName = "index";
-			}
-
-			if(preg_match("/".$pageDisallow."/i", $pageName))
-			{
-				return false;
-			}
-
-		//	if ($logQry)
-		//	{
-		//		$pageName .= '+'.$match[3];			// All queries match
-		//	}
-
-			$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 = iconv('UTF-8', 'ASCII//IGNORE', $pageName);
-
-			$pageName = trim($pageName,' /');
-
-
-			if(!empty($lan))
-			{
-				$pageName .= "|".$lan;
-			}
-
-			return $pageName;
-		}
-
-
-		/**
-		 * 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))
-			{
-				$mes->addError( "File Not Found: ".$path);
-				return false;
-			}
-
-			$handle = fopen($path, "r");
-
-			$pageTotal = array();
-			$line = 0;
-
-
-			if ($handle)
-			{
-				while (($buffer = fgets($handle, 4096)) !== false)
-				{
-					if($vars = $this->splitRawBackupLine($buffer))
-					{
-
-						if(strpos($vars['eself'],'file://') === 0)
-						{
-							continue;
-						}
-
-						$lan = varset($vars['lan'],null);
-						$key = $this->getPageKey($vars['eself'],false,'',$lan);
-
-						if(empty($key))
-						{
-							continue;
-						}
-
-						if(!isset($pageTotal[$key]))
-						{
-							$pageTotal[$key] = array('url'=>'', 'ttl'=>0, 'unq'=>0, 'lan'=>'');
-						}
-
-						$pageTotal[$key]['url'] = $vars['eself'];
-						$pageTotal[$key]['ttl'] += 1;
-
-					//	echo "\n<br />line: ".$line."   ------- ".$key;
-
-						if(isset($vars['unique']))
-						{
-							if($vars['unique'] == 1)
-							{
-								$pageTotal[$key]['unq'] += 1;
-							}
-						}
-						else
-						{
-							$pageTotal[$key]['unq'] += 1;
-						}
-
-						$lan = varset($vars['lan'],'');
-						$pageTotal[$key]['lan'] = $lan;
-					}
-
-					$line++;
-				}
-
-				if (!feof($handle))
-				{
-					$mes->addError( "Error: unexpected fgets() fail.");
-				}
-
-				fclose($handle);
-
-
-				if(e_DEBUG)
-				{
-					$mes->addDebug("<h3>".$file."</h3>");
-					$mes->addDebug(print_a($pageTotal,true));
-				}
-			}
-
-			if($savetoDB === false)
-			{
-				$mes->addInfo( "Saving mode is off");
-				return true;
-			}
-
-
-			if(!empty($pageTotal))
-			{
-				list($date,$name) = explode("_", $file, 2);
-
-				unset($name);
-
-				$unix = strtotime($date);
-
-				$datestamp = date("Y-m-j", $unix);
-
-				if(!empty($datestamp))
-				{
-					$sql = e107::getDb();
-
-					if($sql->select('logstats','log_id',"log_id='".$datestamp."' ") && !$sql->select('logstats','log_id',"log_id='bak-".$datestamp."' "))
-					{
-						$sql->update('logstats', "log_id='bak-".$datestamp."' WHERE log_id='".$datestamp."' ");
-					}
-
-					if($this->collatePageInfo($pageTotal, $datestamp))
-					{
-						$message = e107::getParser()->lanVars(ADSTAT_LAN_90, array('x'=>$datestamp));
-				        $mes->addSuccess($message);
-					}
-					else
-					{
-						$message = e107::getParser()->lanVars(ADSTAT_LAN_91, array('x'=>$datestamp));
-				        $mes->addError($message);
-					}
-				}
-
-			}
-
-			return true;
-		}
-
-
-
-
-		private function splitRawBackupLine($line)
-		{
-			list($datestamp,$bla,$data) = explode("\t",$line, 3);
-
-			if(!empty($data))
-			{
-				parse_str($data,$vars);
-				return $vars;
-			}
-
-			unset($datestamp, $bla); // remove editor warnings.
-
-			return false;
-		}
-
-		/**
-		 * Fix corrupted page data.
-		 * Re-calculate all page totals from all existing database information and save to DB as 'pageTotal'. .
-		 */
-		function collatePageTotalDB()
-		{
-			$sql = e107::getDb();
-
-			$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();
-
-			foreach($data as $values)
-			{
-				$tmp = explode(chr(1),$values['log_data']);
-				unset($tmp[0],$tmp[1]);
-				$thisTotal = array();
-
-				foreach($tmp as $val)
-				{
-					if(!empty($val))
-					{
-						list($url,$ttl,$unq,$lan) = explode("|",$val);
-						$lan = vartrue($lan,e_LAN);
-						$key = $this->getPageKey($url,'','', $lan);
-
-						$thisTotal[$key]['url'] = $url;
-						$thisTotal[$key]['lan'] = $lan;
-						$thisTotal[$key]['ttlv'] += $ttl;
-						$thisTotal[$key]['unqv'] += $unq;
-
-						$pageTotal[$key]['url'] = $url;
-						$pageTotal[$key]['lan'] = $lan;
-						$pageTotal[$key]['ttlv'] += $ttl;
-						$pageTotal[$key]['unqv'] += $unq;
-					}
-
-				}
-
-			//	echo "<h3>".$values['log_id']."</h3>";
-			//	print_a($thisTotal);
-
-			}
-
-			if(empty($pageTotal))
-			{
-				return false;
-			}
-
-			$id = $sql->retrieve('logstats','log_uniqueid', "log_id='pageTotal'");
-
-			$insertData = array(
-				'log_uniqueid' => intval($id),
-				'log_id'=> 'pageTotal',
-				'log_data'=> serialize($pageTotal)
-			);
-
-			//	echo "<h2>Total</h2>";
-			//  print_a($pageTotal);
-
-			return $sql->replace('logstats', $insertData);
-
-		}
-
-
-		/**
-		 * collate page total information using today's data and totals stored in DB.
-		 * @param $pageInfo - from today's file.
-		 * @return bool
-		 */
-		function collatePageTotal($pageInfo=array())
-		{
-			$sql = e107::getDb();
-
-			if($sql->select("logstats", "*", "log_id='pageTotal' "))
-			{
-				$tmp = $sql->fetch();
-				$pageTotal = unserialize($tmp['log_data']);
-				$uniqueID = $tmp['log_uniqueid'];
-				unset($tmp);
-
-			}
-			else
-			{
-				$pageTotal = array();
-				$uniqueID = 0;
-			}
-
-		//	echo "<h3>DB Totals</h3>";
-		//	print_a($pageTotal);
-
-		//	echo "<h3>From File</h3>";
-		//	print_a($pageInfo);
-
-			foreach($pageInfo as $key => $info)
-			{
-				$pageTotal[$key]['url'] = $info['url'];
-				$pageTotal[$key]['ttlv'] += $info['ttl'];
-				$pageTotal[$key]['unqv'] += $info['unq'];
-			}
-
-		//	echo "<h3>Consilidated</h3>";
-		//	print_a($pageTotal);
-
-			if(empty($pageTotal))
-			{
-				return false;
-			}
-
-			$insertData = array(
-				'log_uniqueid'  => intval($uniqueID),
-				'log_id'        => 'pageTotal',
-				'log_data'      => serialize($pageTotal)
-			);
-
-			return $sql->replace('logstats', $insertData);
-
-		}
-
-
-		/**
-		 * Collate individual page information into an array and save to database.
-		 * @param array $pageInfo
-		 * @param string $date  - the value saved to log_id ie. Y-m-j  , 2015-02-1, 2015-02-30
-		 * @return bool
-		 */
-		function collatePageInfo($pageInfo, $date)
-		{
-
-			$sql = e107::getDb();
-			$tp = e107::getParser();
-
-			$data = "";
-			$dailytotal = 0;
-			$uniquetotal = 0;
-
-			foreach($pageInfo as $key => $value)
-			{
-				$data .= $value['url']."|".$value['ttl']."|".$value['unq'].'|'.varset($value['lan'],e_LAN).chr(1);
-				$dailytotal += $value['ttl'];
-				$uniquetotal += $value['unq'];
-			}
-
-			$data = $dailytotal.chr(1).$uniquetotal.chr(1) . $data;
-			return $sql->insert("logstats", "0, '$date', '".$tp -> toDB($data, true)."'");
-		}
-
-
-		/**
-		 * Reset (empty) yesterday's log files.
-		 * @return bool
-		 */
-		function resetLogFiles()
-		{
-
-			if(empty($this->pfileprev) || empty($this->ifileprev))
-			{
-				return false;
-			}
-
-			/* ok, we're finished with the log file now, we can empty it ... */
-			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($this->pathtologs.$this->pfileprev, 'w'))
-				{
-					fwrite($handle, $data);
-				}
-
-				fclose($handle);
-			}
-
-
-			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($this->pathtologs.$this->ifileprev, 'w'))
-				{
-					fwrite($handle, $data);
-				}
-
-				fclose($handle);
-			}
-
-
-			return true;
-		}
-}
-
-
-
-
-
-
-
-
-

e107_plugins/log/e_help.php

@@ -1,45 +0,0 @@
-<?php
-/*
- * e107 website system
- *
- * Copyright (C) 2008-2010 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- *	Stats logging plugin - admin help text
- *
- * $URL$
- * $Id$
- */
-
-
-/**
- *	e107 Stats logging plugin
- *
- *	@package	e107_plugins
- *	@subpackage	log
- *	@version 	$Id$;
- */
-
-if (!defined('e107_INIT')) { exit; }
-
-e107::includeLan(e_PLUGIN.'log/languages/'.e_LANGUAGE."_log_help.php");
-
-if (e_QUERY) list($action,$junk) = explode('.',e_QUERY); else $action = 'list';
-
-switch ($action)
-{
-	case 'export' :
-		$text = LAN_STAT_HELP_04;
-		break;
-	case 'rempage' :
-		$text = LAN_STAT_HELP_03;
-		break;
-	case 'history' :
-		$text = LAN_STAT_HELP_02;
-		break;
-	default :
-		$text = LAN_STAT_HELP_05;
-}
-$ns -> tablerender(LAN_STAT_HELP_01, $text);
-unset($text);

e107_plugins/log/e_meta.php

@@ -1,105 +0,0 @@
-<?php
-/*
-* e107 website system
-*
-* Copyright 2001-2015 e107 Inc (e107.org)
-* Released under the terms and conditions of the
-* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
-*
-* Site access logging
-*
-
-*
-*/
-if (!defined('e107_INIT')) { exit; }
-
-
-if (vartrue($pref['statActivate']))
-{
-	
-	if(!$pref['statCountAdmin'] && ADMIN) // don't count admin visits
-	{
-		return;
-	}
-	
-	// Page to log here
-	
-	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
-			$err_flag = "&err_direct=".ERR_PAGE_ACTIVE;
-			if (is_numeric(e_QUERY)) $err_flag .= '/'.substr(e_QUERY,0,10);		// This should pick up the error code - and limit numeric length to upset the malicious
-			$err_flag .= "&err_referer=".$_SERVER['HTTP_REFERER'];
-		}
-				
-	}
-
-	if(USER_AREA)
-	{
-		$logJS = "
-
-		$(function() {
-
-			function rstr2b64(input)
-			{
-				var b64pad  = \"=\"; /* base-64 pad character. \"=\" for strict RFC compliance   */
-				var tab = \"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/\";
-				var output = \"\";
-				var len = input.length;
-				for(var i = 0; i < len; i += 3)
-				{
-					var triplet = (input.charCodeAt(i) << 16)
-			                | (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
-			                | (i + 2 < len ? input.charCodeAt(i+2)      : 0);
-					for(var j = 0; j < 4; j++)
-					{
-						if(i * 8 + j * 6 > input.length * 8) output += b64pad;
-						else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
-					}
-				}
-				return output;
-			}
-
-
-
-
-
-			var ref			=\"\"+escape(top.document.referrer);
-			var eeself       = escape(window.location.href);
-
-			var colord 		= window.screen.colorDepth;
-			var res 		= window.screen.width + \"x\" + window.screen.height;
-			var logString 	= 'referer=' + ref + '&colour=' + colord + '&eself=' + eeself + '&res=' + res + '".$err_flag."';
-			logString 		= rstr2b64(logString);
-
-			var url = '".SITEURLBASE.e_PLUGIN_ABS."log/log.php';
-			var dataText = 'lv='+logString;
-
-			$.ajax({
-				type: 'get',
-				url: url,
-				data: {'lv' :logString},
-				success: function(e) {
-					if(e)
-					{
-				//		alert(e);
-					}
-				}
-			});
-		});
-		";
-
-
-
-
-		e107::js('footer-inline', $logJS, 'jquery');
-	}
-}
-
-

e107_plugins/log/e_shortcode.php

@@ -1,106 +0,0 @@
-<?php
-/*
-* Copyright (c) e107 Inc 2015 e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-*
-* Log Stats shortcode batch class - shortcodes available site-wide. ie. equivalent to multiple .sc files.
-*/
-
-if (!defined('e107_INIT')) { exit; }
-
-class log_shortcodes extends e_shortcode
-{
-
-	private $dbPageInfo;
-	private $lgc;
-
-	function __construct()
-	{
-
-		require_once(e_PLUGIN."log/consolidate.php");
-		$this->lgc = new logConsolidate;
-
-		$sql = e107::getDB();
-		$logfile = e_LOG.'logp_'.date('z.Y', time()).'.php'; /* get today's logfile ... */
-
-		$pageInfo = array();
-
-		if(is_readable($logfile)) // populate $pageInfo
-		{
-			require($logfile);
-		}
-
-		$logfile = e_LOG.'logi_'.date('z.Y', time()).'.php'; //	$logfile = e_PLUGIN.'log/logs/logi_'.date('z.Y', time()).'.php';
-
-		if(is_readable($logfile))
-		{
-			require($logfile);
-		//	e107::getMessage()->addDebug("Loading Log File: ".$logfile);
-		}
-
-
-		if($sql->select('logstats', 'log_data', "log_id='pageTotal'")) /* get main stat info from database */
-		{
-			$row = $sql->fetch();
-			$this->dbPageInfo = unserialize($row['log_data']);
-	//		e107::getMessage()->addDebug("Loading Logstats from DB: ".print_a($this->dbPageInfo,true));
-		}
-		else
-		{
-			$this->dbPageInfo = array();
-		}
-
-		/* temp consolidate today's info (if it exists)... */
-		if(is_array($pageInfo))
-		{
-			foreach($pageInfo as $key => $info)
-			{
-				$key = preg_replace("/\?.*/", "", $key);
-				if(array_key_exists($key, $this -> dbPageInfo))
-				{
-					$this -> dbPageInfo[$key]['ttlv'] += $info['ttl'];
-					$this -> dbPageInfo[$key]['unqv'] += $info['unq'];
-				}
-				else
-				{
-					$this -> dbPageInfo[$key]['url'] = $info['url'];
-					$this -> dbPageInfo[$key]['ttlv'] = $info['ttl'];
-					$this -> dbPageInfo[$key]['unqv'] = $info['unq'];
-				}
-			}
-		}
-
-
-	}
-
-
-	private function getKey($self)
-	{
-		return $this->lgc->getPageKey($self, false, '', e_LAN);
-		//$base = basename($self);
-	//	list($url,$qry) = explode(".",$base, 2);
-	//	return $url;
-	}
-
-
-	function sc_log_pagecounter($parm=null)
-	{
-
-		//print_a($this->dbPageInfo);
-
-		$url = str_replace("www.", "", e_REQUEST_URL);
-		$id = $this->getKey(e_REQUEST_URL);
-	//	print_a("Checking for: ".$id);
-
-	//	print_a($this->dbPageInfo);
-
-		if(isset($this->dbPageInfo[$id]['url']) && ($this->dbPageInfo[$id]['url'] == e_REQUEST_URL || $this->dbPageInfo[$id]['url'] == $url))
-		{
-			return ($parm == 'unique') ? number_format($this->dbPageInfo[$id]['unqv']) : number_format($this->dbPageInfo[$id]['ttlv']);
-		}
-
-	}
-
-}
-
-
-

e107_plugins/log/e_url.php

@@ -1,49 +0,0 @@
-<?php
-/*
- * e107 Bootstrap CMS
- *
- * Copyright (C) 2008-2015 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- * 
- * IMPORTANT: Make sure the redirect script uses the following code to load class2.php: 
- * 
- * 	if (!defined('e107_INIT'))
- * 	{
- * 		require_once(__DIR__.'/../../class2.php');
- * 	}
- * 
- */
- 
-if (!defined('e107_INIT')) { exit; }
-
-// v2.x Standard  - Simple mod-rewrite module. 
-
-class log_url // plugin-folder + '_url'
-{
-	function config() 
-	{
-		$config = array();
-	
-		$config['index'] = array(
-			'alias'         => 'stats',
-			'regex'			=> '^{alias}/?$', 						// matched against url, and if true, redirected to 'redirect' below.
-			'sef'			=> '{alias}', 							// used by e107::url(); to create a url from the db table.
-			'redirect'		=> '{e_PLUGIN}log/stats.php?1', 		// file-path of what to load when the regex returns true.
-			
-		);
-
-		$config['others'] = array(
-			'alias'         => 'stats',
-			'regex'			=> '^{alias}/\?(.*)$', 	 					// matched against url, and if true, redirected to 'redirect' below.
-			'sef'			=> '{alias}', 							// used by e107::url(); to create a url from the db table.
-			'redirect'		=> '{e_PLUGIN}log/stats.php?$1', 		// file-path of what to load when the regex returns true.
-
-		);
-
-		return $config;
-	}
-	
-
-	
-}

e107_plugins/log/languages/English.php

@@ -1,84 +0,0 @@
-<?php
-/*
- * e107 website system
- *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- *
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/log/languages/English.php,v $
- * $Revision$
- * $Date$
- * $Author$
- */
-
-if(!defined('PAGE_NAME')) // TODO FIX ME - use English_global.php
-{
-	define("PAGE_NAME", "Statistics");
-}
-
-define("ADSTAT_L1", "This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.");
-define("ADSTAT_L2", "The statistics logger has been successfully installed. To convert your existing stats to the new system, please <a href='".e_PLUGIN."log/update_routine.php'>click here to run update routine</a>.");
-define("ADSTAT_L3", "Statistic Logging");
-define("ADSTAT_L4", "You do not have permission to view this page.");
-define("ADSTAT_L5", "The features on this page have been disabled.");
-define("ADSTAT_L6", "Site Statistics");
-define("ADSTAT_L7", "Statistics for this type are not being gathered.");
-define("ADSTAT_L8", "Today's Stats");
-define("ADSTAT_L9", "All-time Stats");
-define("ADSTAT_L10", "Daily Stats");
-define("ADSTAT_L11", "Monthly Stats");
-define("ADSTAT_L12", "Browser Stats");
-define("ADSTAT_L13", "Operating System Stats");
-define("ADSTAT_L14", "Domain Stats");
-define("ADSTAT_L15", "Screen Resolution / Color Depth Stats");
-define("ADSTAT_L16", "Referral Stats");
-define("ADSTAT_L17", "Search String Stats");
-define("ADSTAT_L18", "Recent Visitors");
-define("ADSTAT_L19", "Page");
-define("ADSTAT_L20", "Visits Today");
-define("ADSTAT_L21", "Total");
-define("ADSTAT_L22", "Unique");
-define("ADSTAT_L23", "Total Visits");
-define("ADSTAT_L24", "Total Unique Visits");
-define("ADSTAT_L25", "No statistics available.");
-define("ADSTAT_L26", "Browser");
-define("ADSTAT_L27", "Operating System");
-define("ADSTAT_L28", "Countries / Domains");
-define("ADSTAT_L29", "Screen Resolution");
-define("ADSTAT_L30", "Site Referrals");
-define("ADSTAT_L31", "Search Engine Query Strings");
-define("ADSTAT_L32", "Referred from");
-define("ADSTAT_L33", "Visits in last");
-define("ADSTAT_L34", "Visits"); 	// Used for page display
-define("ADSTAT_L35", "Unique visits in last");
-define("ADSTAT_L36", "days by page");
-define("ADSTAT_L37", "Visits by month");
-define("ADSTAT_L38", "Unique visits by month");
-define("ADSTAT_L39", "remove this entry");
-define("ADSTAT_L40", "days");
-//define("ADSTAT_L41", "Error"); // FIXME GENERIC
-define("ADSTAT_L42", "No monthly stats yet.");
-
-define("ADSTAT_L43", "Today's page errors");
-define("ADSTAT_L44", "All-time page errors");
-define("ADSTAT_L45", "Stats deleted for: ");
-define("ADSTAT_L46", "Note: any stats for today will not be deleted");
-define("ADSTAT_L47", "No stats found for: ");
-define("ADSTAT_L48", "sort by total");
-define("ADSTAT_L49", "sort alphabetically");
-define("ADSTAT_L50", "All-time stats");
-define("ADSTAT_L51", "Current month stats");
-define("ADSTAT_L52", "Previous month stats");
-define("ADSTAT_L53", "Information");
-// define("ADSTAT_L54", "");
-// define("ADSTAT_L55", "");
-// define("ADSTAT_L56", "");
-// define("ADSTAT_L57", "");
-// define("ADSTAT_L58", "");
-// define("ADSTAT_L59", "");
-// define("ADSTAT_L60", "");
-
-

e107_plugins/log/languages/English_admin.php

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

e107_plugins/log/languages/English_admin_log.php

@@ -1,100 +0,0 @@
-<?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_L1", "This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.");
-define("ADSTAT_L2", "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_L3", "Statistic Logging");
-define("ADSTAT_L4", "Activate statistic logging");
-define("ADSTAT_L5", "Statistic types");
-define("ADSTAT_L6", "Browsers");
-define("ADSTAT_L7", "Operating Systems");
-define("ADSTAT_L8", "Screen resolutions / depths");
-define("ADSTAT_L9", "Countries/domains visited from");
-define("ADSTAT_L10", "Referrers");
-define("ADSTAT_L11", "Search queries");
-define("ADSTAT_L12", "Reset stats");
-define("ADSTAT_L13", "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_L14", "Page counts");
-//define("ADSTAT_L15", "Update Statistic Settings");
-define("ADSTAT_L16", "Site Statistic Settings");
-//define("ADSTAT_L17", "Statistic settings updated");
-define("ADSTAT_L18", "Allow access to main statistics page to ...");
-define("ADSTAT_L19", "Recent visitors");
-define("ADSTAT_L20", "Count admin visits");
-define("ADSTAT_L21", "Maximum records to display on stats page");
-define("ADSTAT_L22", "Run update routine");
-define("ADSTAT_L23", "logs from a previous version of e107 have been detected, update them here");
-define("ADSTAT_L24", "Go to update script");
-//define("ADSTAT_L25", "Selected stats reset");
-define("ADSTAT_L26", "Remove page entries");
-define("ADSTAT_L27", "If your stats have incorrect pages, you can remove them here");
-define("ADSTAT_L28", "Open page");
-define("ADSTAT_L29", "Page Name");
-define("ADSTAT_L30", "Check to remove");
-define("ADSTAT_L31", "Remove selected pages");
-define("ADSTAT_L32", "Page Tidy");
-// define("ADSTAT_L33", "Configure Statistics Logging"); see English_global.php
-// define("ADSTAT_L34", "Site Stats");
-define ('ADSTAT_L35', 'Options');
-define ('ADSTAT_L36', 'Data Export');
-//define ('ADSTAT_L37', 'Create export file');
-define ('ADSTAT_L38', "You must set the e107_plugins/log/logs folder to be writable");
-define ('ADSTAT_L39', 'Stats Logging Functions');
-define ('ADSTAT_L40', 'Export log data');
-define ('ADSTAT_L41', 'Date selection');
-define ('ADSTAT_L42', 'Single Day');
-define ('ADSTAT_L43', 'Daily for a month');
-define ('ADSTAT_L44', 'Monthly for a year');
-define ('ADSTAT_L45', 'All-time');
-define ('ADSTAT_L46', 'Date:');
-define ('ADSTAT_L47', 'Invalid date chosen');
-define ('ADSTAT_L48', 'Monthly and All-time');
-define ('ADSTAT_L49', 'All-time Only');
-define ('ADSTAT_L50', 'None');
-define ('ADSTAT_L51', 'Output Data');
-define ('ADSTAT_L52', 'Page Data');
-define ('ADSTAT_L53', 'No selection possible');
-define ('ADSTAT_L54', 'Invalid type selection');
-define ('ADSTAT_L55', 'Single quote');
-define ('ADSTAT_L56', 'Double quote');
-define ('ADSTAT_L57', 'Comma');
-define ('ADSTAT_L58', 'Pipe (|)');
-define ('ADSTAT_L59', 'CSV separator, quotes');
-define ('ADSTAT_L60', 'Strip site address from URLs');
-define ('ADSTAT_L61', '(if checked, just gives page reference)');
-define ('ADSTAT_L62', 'All-time (detailed)');
-define ('ADSTAT_L63', 'Available Datasets');
-define ('ADSTAT_L64', 'Database records found:');
-define ('ADSTAT_L65', 'DB filter string:');
-define ('ADSTAT_L66', 'Show Datasets');
-define ('ADSTAT_L67', 'Generate a CSV (Comma Separated Variable) file of historical statistics which meets the specified criteria');
-define ('ADSTAT_L68', 'Show the statistics database entries which actually exist and meet the selection criteria');
-define ('ADSTAT_L69', 'Delete historical data');
-define ('ADSTAT_L70', 'Delete data older than:');
-define ('ADSTAT_L71', 'Delete Data');
-define ('ADSTAT_L72', 'Confirm deletion of data older than first day of:');
-//define ('ADSTAT_L73', 'Confirm');
-define ('ADSTAT_L74', '(List of data entries which will be deleted below)');
-define ('ADSTAT_L75', 'Records for deletion');
-define ('ADSTAT_L76', 'Caution! Once deleted, the data cannot be recovered. Backup or export your database first');
-define ('ADSTAT_L77', 'Records deleted:');
-define ('ADSTAT_L78', 'Show previous month as well as current month for non-page access stats');
-define ('ADSTAT_L79', 'Only used if monthly stats collected');
-define ('ADSTAT_L80', 'The following pages were deleted:');
-define ('ADSTAT_L81', 'Statistics cleared:');
-define ('ADSTAT_L82', 'Following values now set:');
-define ('ADSTAT_L83', 'Following log ID entries removed:');
-define ('ADSTAT_L84', '');
-define ('ADSTAT_L85', '');
-
-
-

e107_plugins/log/languages/English_global.php

@@ -1,9 +0,0 @@
-<?php
-// e107 Global Log File for the Log Plugin. 
-// All Defined Must include the folder of the plugin. LAN_PLUGIN_{FOLDER}
-
-define("LAN_PLUGIN_LOG_NAME",			"Site Stats");
-define("LAN_PLUGIN_LOG_DESCRIPTION", 	"This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.");
-define("LAN_PLUGIN_LOG_CONFIGURE",		"Configure Statistics Logging"); 
-define("LAN_PLUGIN_LOG_LINK", 			"Visits");
-