diff -x .svn -aruN 0.7.23.src/article.php 0.7.24.src/article.php
--- 0.7.23.src/article.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/article.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,18 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/article.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/article.php $
+|     $Revision: 11678 $
+|	  $Id: article.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Id: article.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 // This file is now deprecated and remains in core for backward compatibility reasons.
diff -x .svn -aruN 0.7.23.src/banner.php 0.7.24.src/banner.php
--- 0.7.23.src/banner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/banner.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/banner.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/banner.php $
+|     $Revision: 11678 $
+|     $Id: banner.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
diff -x .svn -aruN 0.7.23.src/class2.php 0.7.24.src/class2.php
--- 0.7.23.src/class2.php	2010-08-20 04:20:24.000000000 -0500
+++ 0.7.24.src/class2.php	2010-09-15 17:12:25.000000000 -0500
@@ -3,16 +3,15 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|	  Steve Dunstan 2001-2002 (jalist@e107.org)
-|
-|	  Copyright (C) 2008-2010 e107 Inc. (e107.org)
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/class2.php,v $
-|     $Revision: 11668 $
-|     $Date: 2010-08-20 04:20:48 -0500 (Fri, 20 Aug 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/class2.php $
+|     $Revision: 11786 $
+|     $Id: class2.php 11786 2010-09-15 22:12:49Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -87,7 +86,7 @@
 }
 // If url contains a .php in it, PHP_SELF is set wrong (imho), affecting all paths.  We need to 'fix' it if it does.
 $_SERVER['PHP_SELF'] = (($pos = strpos($_SERVER['PHP_SELF'], ".php")) !== false ? substr($_SERVER['PHP_SELF'], 0, $pos+4) : $_SERVER['PHP_SELF']);
-
+unset($pos);
 //
 // D: Setup PHP error handling
 //    (Now we can see PHP errors) -- but note that DEBUG is not yet enabled!
@@ -108,6 +107,7 @@
 e107_ini_set('session.use_trans_sid',    0);
 
 
+
 if(isset($retrieve_prefs) && is_array($retrieve_prefs)) {
 	foreach ($retrieve_prefs as $key => $pref_name) {
 		 $retrieve_prefs[$key] = preg_replace("/\W/", '', $pref_name);
@@ -119,23 +119,35 @@
 define("MAGIC_QUOTES_GPC", (ini_get('magic_quotes_gpc') ? TRUE : FALSE));
 
 // Define the domain name and subdomain name.
-if(is_numeric(str_replace(".","",$_SERVER['HTTP_HOST']))){
-	$srvtmp = "";  // Host is an IP address.
-}else{
-	$srvtmp = explode(".",str_replace("www.","",$_SERVER['HTTP_HOST']));
-}
-
-define("e_SUBDOMAIN", (count($srvtmp)>2 && $srvtmp[2] ? $srvtmp[0] : FALSE)); // needs to be available to e107_config.
-
-if(e_SUBDOMAIN)
+if(is_numeric(str_replace(".","",$_SERVER['HTTP_HOST'])))
 {
-   	unset($srvtmp[0]);
+	$domain = FALSE;
+	$subdomain = FALSE;
+}
+else
+{	
+	if(preg_match("/\.?([a-z0-9-]+)(\.(com|net|org|co|me|ltd|plc|gov)\.[a-z]{2})$/i",$_SERVER['HTTP_HOST'],$m)) //eg. mysite.co.uk
+	{
+        $domain = $m[1].$m[2];
+    }
+	elseif(preg_match("/\.?([a-z0-9-]+)(\.[a-z]{2,})$/i",$_SERVER['HTTP_HOST'],$m))//  eg. .com/net/org/ws/biz/info
+	{       
+        $domain = $m[1].$m[2];		
+    }
+	else
+	{
+		$domain = FALSE; //invalid domain
+	}
+	
+	$replace = array(".".$domain,"www.","www");
+	$subdomain = str_replace($replace,'',$_SERVER['HTTP_HOST']);
 }
 
-define("e_DOMAIN",(count($srvtmp) > 1 ? (implode(".",$srvtmp)) : FALSE)); // if it's an IP it must be set to FALSE.
-
-unset($srvtmp);
+define("e_DOMAIN",$domain);
+define("e_SUBDOMAIN",($subdomain) ? $subdomain : FALSE);
+unset($domain,$subdomain,$replace,$m);
 
+// ---------------------------
 
 //  Ensure thet '.' is the first part of the include path
 $inc_path = explode(PATH_SEPARATOR, ini_get('include_path'));
@@ -151,12 +163,18 @@
 //
 @include_once(realpath(dirname(__FILE__).'/e107_config.php'));
 
+// set debug mode in e107_config.php when admin access is unavailable
+if(defset('e_DEBUG')==TRUE) 
+{
+	$error_handler->debug = true;
+	error_reporting(E_ALL);	
+}
+
 if(isset($CLASS2_INCLUDE) && ($CLASS2_INCLUDE!=''))
 { 
 	 require_once(realpath(dirname(__FILE__).'/'.$CLASS2_INCLUDE)); 
 }
 
-
 if(!isset($ADMIN_DIRECTORY))
 {
   // e107_config.php is either empty, not valid or doesn't exist so redirect to installer..
@@ -179,48 +197,24 @@
 		}
 	}
 }
+unset($inArray);
 
-// Experimental Code Below.
-// e-Token START
-
-session_start();
-session_regenerate_id(true); // true don't work on php4 - so time to move on people!	
-
-
+// Session start. 
 
-$token_name = 'e107_token_'.md5($_SERVER['HTTP_HOST'].e_HTTP);
-if(isset($_POST['e-token']) && ($_POST['e-token'] != $_SESSION[$token_name]) && $_POST['ajax_used']!=1)
-{
-	// echo "<br />Session token=".$_SESSION[$token_name];
-	// prevent dead loop, save server resources
-	// echo "<pre>".print_r($_POST,TRUE)."</pre>";
-	die('Access denied');
-}	
-	
-define('e_TOKEN', uniqid(md5(rand()),true));
-$_SESSION[$token_name] = e_TOKEN;
-// e-Token END
+/**
+ * G: Retrieve Query data from URI
+ * (Until this point, we have no idea what the user wants to do)
+ */
 
-//
-// G: Retrieve Query data from URI
-//    (Until this point, we have no idea what the user wants to do)
-//
 if (preg_match("#\[(.*?)](.*)#", $_SERVER['QUERY_STRING'], $matches)) {
 	define("e_MENU", $matches[1]);
 	$e_QUERY = $matches[2];
-
-	if(strlen(e_MENU) == 2) // language code ie. [fr]
-	{
-        require_once(e_HANDLER."language_class.php");
-		$slng = new language;
-		define("e_LANCODE",TRUE);
-		$_GET['elan'] = $slng->convert(e_MENU);
-	}
-
-}else {
+	unset($matches);
+}
+else
+{
 	define("e_MENU", "");
 	$e_QUERY = $_SERVER['QUERY_STRING'];
-  	define("e_LANCODE", "");
 }
 
 //
@@ -257,14 +251,15 @@
 define("e_UC_NOBODY", 255);
 define("ADMINDIR", $ADMIN_DIRECTORY);
 
-//
-// H: Initialize debug handling
-// (NO E107 DEBUG CONSTANTS OR CODE ARE AVAILABLE BEFORE THIS POINT)
-// All debug objects and constants are defined in the debug handler
-// i.e. from here on you can use E107_DEBUG_LEVEL or any
-// E107_DBG_* constant for debug testing.
-//
-	require_once(e_HANDLER.'debug_handler.php');
+/**
+ * H: Initialize debug handling
+ * (NO E107 DEBUG CONSTANTS OR CODE ARE AVAILABLE BEFORE THIS POINT)
+ * All debug objects and constants are defined in the debug handler
+ * i.e. from here on you can use E107_DEBUG_LEVEL or any
+ * E107_DBG_* constant for debug testing.
+ */
+
+require_once(e_HANDLER.'debug_handler.php');
 
 if(E107_DEBUG_LEVEL && isset($db_debug) && is_object($db_debug)) {
 	$db_debug->Mark_Time('Start: Init ErrHandler');
@@ -402,57 +397,107 @@
 //
 define("SITEURLBASE", ($pref['ssl_enabled'] == '1' ? "https://" : "http://").$_SERVER['HTTP_HOST']);
 define("SITEURL", SITEURLBASE.e_HTTP);
+define("e_SELF", ($pref['ssl_enabled'] == '1' ? "https://".$_SERVER['HTTP_HOST'] : "http://".$_SERVER['HTTP_HOST']) . ($_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_FILENAME']));
+$page = substr(strrchr($_SERVER['PHP_SELF'], "/"), 1);
+define("e_PAGE", $page);
+	  
+/**
+ * Detect if we are in the Admin Area. 
+ * The following files are assumed to be admin areas:
+ * 1. Any file in the admin directory (check for non-plugin added to avoid mismatches)
+ * 2. any plugin file starting with 'admin_'
+ * 3. any plugin file in a folder called admin/
+ * 4. any file that specifies $eplug_admin = TRUE before class2.php is included.
+ */
+$inAdminDir = FALSE;
+$isPluginDir = strpos(e_SELF,'/'.$PLUGINS_DIRECTORY) !== FALSE;		// True if we're in a plugin
+$e107Path = str_replace($e107->base_path, "", e_SELF);				// Knock off the initial bits
+if	(
+		 (!$isPluginDir && strpos($e107Path, $ADMIN_DIRECTORY) === 0 ) 								// Core admin directory
+	  || ($isPluginDir && (strpos(e_PAGE,"admin_") === 0 || strpos($e107Path, "admin/") !== FALSE)) // Plugin admin file or directory
+	  || (varsettrue($eplug_admin))																	// Admin forced
+	)
+{
+	$inAdminDir = TRUE;
+}
 
-// let the subdomain determine the language (when enabled).
+// -----------------------------------------
 
 // Ensure $pref['sitelanguage'] is set if upgrading from 0.6
 $pref['sitelanguage'] = (isset($pref['sitelanguage']) ? $pref['sitelanguage'] : 'English');
 
-if(varset($pref['multilanguage_subdomain']) && ($pref['user_tracking'] == "session") && e_DOMAIN && MULTILANG_SUBDOMAIN !== FALSE)
-{
-		$mtmp = explode("\n", $pref['multilanguage_subdomain']);
-        foreach($mtmp as $val)
-		{
-        	if(e_DOMAIN == trim($val))
-			{
-            	$domain_active = TRUE;
-			}
-		}
-
-		if($domain_active || ($pref['multilanguage_subdomain'] == "1"))
-		{
-			e107_ini_set("session.cookie_domain", ".".e_DOMAIN);
-			require_once(e_HANDLER."language_class.php");
-			$slng = new language;
-	        if(!e_SUBDOMAIN)
-			{
-	        	$GLOBALS['elan'] = $pref['sitelanguage'];
-			}
-			elseif($eln = $slng->convert(e_SUBDOMAIN))
-			{
-	          	$GLOBALS['elan'] = $eln;
-			}
-		}
-}
-
-
 // if a cookie name pref isn't set, make one :)
 if (!$pref['cookie_name']) {
 	$pref['cookie_name'] = "e107cookie";
 }
 
+$sql->db_Mark_Time('Start: Init Language and detect changes');
+require_once(e_HANDLER."language_class.php");
+$lng = new language;
+$lng->detect(); // Must be before session_start(). Requires $pref, e_DOMAIN, e_MENU;
+
+// e-Token START
+$sql->db_Mark_Time('Start: e-Token creation');
+
+/**
+ * Set Cache Headers
+ * Must be set before session_start()
+ */
+if($inAdminDir || defined('e_NOCACHE'))
+{
+	 session_cache_limiter('nocache'); // don't cache the html. (Should fix back-button issues)
+}
+else
+{
+	header("Expires: Sat, 01 Jan 2000 00:00:00 GMT");
+	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+	header("Cache-Control: post-check=0, pre-check=0",false);
+	session_cache_limiter("must-revalidate");	
+}
+
+// Start session after $prefs are available.
+session_start(); // Needs to be started after language detection (session.cookie_domain) to avoid multi-language 'access-denied' issues. 
+header("Cache-Control: must-revalidate");	
+// TODO - maybe add IP as well?
+define('e_TOKEN_NAME', 'e107_token_'.md5($_SERVER['HTTP_HOST'].e_HTTP));
+
+if(isset($_SESSION) && isset($_POST['e-token']) && ($_POST['e-token'] != $_SESSION[e_TOKEN_NAME]) && $_POST['ajax_used']!=1)
+{
+	// do not redirect, prevent dead loop, save server resources
+	die('Access denied');
+}	
+
+// Create new token only if not exists or session id is regenerated (footer.php)
+if(!isset($_SESSION[e_TOKEN_NAME]) || (isset($_SESSION['regenerate_'.e_TOKEN_NAME]) && !defsettrue('e_TOKEN_FREEZE')))
+{
+	// we should not break ajax calls this way
+	$_SESSION[e_TOKEN_NAME] = uniqid(md5(rand()), true);
+	// this will be reset in the end of the script (footer) if needed
+	unset($_SESSION['regenerate_'.e_TOKEN_NAME]);
+}
+
+// use it now
+define('e_TOKEN', $_SESSION[e_TOKEN_NAME]);
+
+// Debug
+//header('X-etoken-name: '.e_TOKEN_NAME);
+//header('X-etoken-value: '.e_TOKEN);
+//header('X-etoken-freeze: '.(defsettrue('e_TOKEN_FREEZE') ? 1 : 0));
+
+// e-Token END
 // start a session if session based login is enabled
+
 // if ($pref['user_tracking'] == "session")
 //{
 //	session_start(); // start the session, even if it won't be used for login-tracking. 
 //}
 
-define("e_SELF", ($pref['ssl_enabled'] == '1' ? "https://".$_SERVER['HTTP_HOST'] : "http://".$_SERVER['HTTP_HOST']) . ($_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_FILENAME']));
 
 // if the option to force users to use a particular url for the site is enabled, redirect users there as needed
 // Now matches RFC 2616 (sec 3.2): case insensitive, https/:443 and http/:80 are equivalent.
 // And, this is robust against hack attacks. Malignant users can put **anything** in HTTP_HOST!
-if($pref['redirectsiteurl'] && $pref['siteurl']) {
+if($pref['redirectsiteurl'] && $pref['siteurl'])
+{
 
 	if(isset($pref['multilanguage_subdomain']) && $pref['multilanguage_subdomain'])
 	{
@@ -498,132 +543,25 @@
 	}
 }
 
-$page = substr(strrchr($_SERVER['PHP_SELF'], "/"), 1);
-define("e_PAGE", $page);
-
-// sort out the users language selection
-if (isset($_POST['setlanguage']) || isset($_GET['elan']) || isset($GLOBALS['elan']))
-{
-	// query support, for language selection splash pages. etc
-	if($_GET['elan'])
-	{
-		$_POST['sitelanguage'] = str_replace(array(".", "/", "%"), "", $_GET['elan']);
-	}
-	if($GLOBALS['elan'] && !isset($_POST['sitelanguage']))
-	{
-		$_POST['sitelanguage'] = $GLOBALS['elan'];
-	}
-
-	$sql->mySQLlanguage = $_POST['sitelanguage'];
-	$sql2->mySQLlanguage = $_POST['sitelanguage'];
+/**
+ * Set the User's Language
+ */
+$sql->db_Mark_Time('Start: Set User Language');
 
-	if ($pref['user_tracking'] == "session")
-	{
-		$_SESSION['e107language_'.$pref['cookie_name']] = $_POST['sitelanguage'];
-	}
-	else
-	{
-		setcookie('e107language_'.$pref['cookie_name'], $_POST['sitelanguage'], time() + 86400, "/");
-		$_COOKIE['e107language_'.$pref['cookie_name']] = $_POST['sitelanguage'];
-		if (strpos(e_SELF, ADMINDIR) === FALSE)
-		{
-			$locat = ((!$_GET['elan'] && e_QUERY) || (e_QUERY && e_LANCODE)) ? e_SELF."?".e_QUERY : e_SELF;
-			header("Location:".$locat);
-			exit();
-		}
-	}
-}
+$lng->set(); // set e_LANGUAGE, USERLAN, Language Session / Cookies etc. requires $pref; 
 
-// Multi-language options.
+header('Content-Language: '.e_LAN);
 
-// Get language list for rights checking.
-if( ! $tmplan = getcachedvars('language-list'))
+if(varset($pref['multilanguage']) && (e_LANGUAGE != $pref['sitelanguage']))
 {
-	$handle = opendir(e_LANGUAGEDIR);
-	while ($file = readdir($handle))
-	{
-		// add only if e_LANGUAGEDIR.e_LANGUAGE/e_LANGUAGE
-		if ($file != '.' && $file != '..' && is_readable(e_LANGUAGEDIR.$file.'/'.$file.'.php'))
-		{
-			$lanlist[] = $file;
-		}
-	}
-	closedir($handle);
-	$tmplan = implode(',', $lanlist);
-	cachevars('language-list', $tmplan);
+	$sql->mySQLlanguage  = e_LANGUAGE;
+	$sql2->mySQLlanguage = e_LANGUAGE;
 }
-// Save language flat list
-define('e_LANLIST', $tmplan);
-
-// Set $language fallback to $pref['sitelanguage'] for the time being
-$language = $pref['sitelanguage'];
-
-// Get user language choice
-/// Force no multilingual sites to keep there preset languages? if (varset($pref['multilanguage']))
-{
-	if ($pref['user_tracking'] == 'session')
-	{
-		$user_language = (array_key_exists('e107language_'.$pref['cookie_name'], $_SESSION) ? $_SESSION['e107language_'.$pref['cookie_name']] : '');
-	}
-	else
-	{
-		$user_language= (isset($_COOKIE['e107language_'.$pref['cookie_name']])) ? $_COOKIE['e107language_'.$pref['cookie_name']] : '';
-	}
-	// Strip $user_language
-	//TODO allow [a-z][A-Z][0-9]_
-	$user_language = preg_replace('#\W#', '', $user_language);
-
-	// Is user language choice available?
-	if( ! in_array($user_language, $lanlist))
-	{
-		// Reset session
-		if(isset($_SESSION))
-		{
-			unset($_SESSION['e107language_'.$pref['cookie_name']]);
-		}
-		// Reset cookie
-		if(isset($_COOKIE['e107language_'.$pref['cookie_name']]))
-		{
-			unset($_COOKIE['e107language_'.$pref['cookie_name']]);
-		}
-		$user_language = '';
-	}
-	else
-	{
-		$language = $user_language;
-	}
-
-	// Ensure db got the proper language - default is empty
-	if (varset($pref['multilanguage']))
-	{
-		$sql->mySQLlanguage  = $user_language;
-		$sql2->mySQLlanguage = $user_language;
-	}
-}
-// We should have the language by now
-define('e_LANGUAGE', $language);
-
-// Keep USERLAN for backward compatibility
-define('USERLAN', e_LANGUAGE);
 
 //TODO do it only once and with the proper function
 include_lan(e_LANGUAGEDIR.e_LANGUAGE."/".e_LANGUAGE.".php");
 include_lan(e_LANGUAGEDIR.e_LANGUAGE."/".e_LANGUAGE."_custom.php");
 
-if($pref['sitelanguage'] != e_LANGUAGE && varset($pref['multilanguage']) && !$pref['multilanguage_subdomain'])
-{
-	list($clc) = explode("_",CORE_LC);
-	define("e_LAN", strtolower($clc));
-	define("e_LANQRY", "[".e_LAN."]");
-	unset($clc);
-}
-else
-{
-    define("e_LAN", FALSE);
-	define("e_LANQRY", FALSE);
-}
-$sql->db_Mark_Time('(Start: Pref/multilang done)');
-
 //
 // N: misc setups: online user tracking, cache
 //
@@ -911,31 +849,12 @@
 
 $sql->db_Mark_Time('(Start: Find/Load Theme)');
 
-
-// Work out which theme to use
-//----------------------------
-// The following files are assumed to use admin theme:
-//	  1. Any file in the admin directory (check for non-plugin added to avoid mismatches)
-// 	  2. any plugin file starting with 'admin_'
-// 	  3. any plugin file in a folder called admin/
-// 	  4. any file that specifies $eplug_admin = TRUE;
-//
-// e_SELF has the full HTML path
-$inAdminDir = FALSE;
-$isPluginDir = strpos(e_SELF,'/'.$PLUGINS_DIRECTORY) !== FALSE;		// True if we're in a plugin
-$e107Path = str_replace($e107->base_path, "", e_SELF);				// Knock off the initial bits
-if	(
-		 (!$isPluginDir && strpos($e107Path, $ADMIN_DIRECTORY) === 0 ) 								// Core admin directory
-	  || ($isPluginDir && (strpos(e_PAGE,"admin_") === 0 || strpos($e107Path, "admin/") !== FALSE)) // Plugin admin file or directory
-	  || (varsettrue($eplug_admin))																	// Admin forced
-	)
+// Load admin Language File. 
+if($inAdminDir == TRUE)
 {
-	$inAdminDir = TRUE;
-	// Load admin phrases ASAP
-	include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php');
+	include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php');	
 }
 
-
 if(!defined("THEME"))
 {
 	if ($inAdminDir && varsettrue($pref['admintheme'])&& (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE))
@@ -1110,7 +1029,7 @@
 		$_admin = $peer['user_admin'] === 1;
 		$peer = false;
 	} else {
-		$_adminperms = ADMINPERMS;
+		$_adminperms = defined('ADMINPERMS') ? ADMINPERMS : '';
 		$_user = USER;
 		$_admin = ADMIN;
 	}
@@ -1306,7 +1225,7 @@
 
 	  // Now save the updated values
 	  // traverse the pref array, with toDB on everything
-	  $_pref = $tp -> toDB($pref, true, true);
+	  $_pref = $tp -> toDB($pref, true, true, 'pReFs');
 	  // Create the data to be stored
 	  $sql->db_Select_gen("REPLACE INTO `#core` (e107_name,e107_value) values ('SitePrefs', '".$eArrayStorage->WriteArray($_pref)."') ");
 	  ecache::clear('SitePrefs');
@@ -1631,7 +1550,12 @@
 	$e_online->online($pref['track_online'], $pref['flood_protect']);
 }
 
-function cookie($name, $value, $expire=0, $path = "/", $domain = "", $secure = 0) {
+function cookie($name, $value, $expire=0, $path = e_HTTP, $domain = "", $secure = 0)
+{
+	if(defined('MULTILANG_SUBDOMAIN') && MULTILANG_SUBDOMAIN === TRUE)
+	{
+		$domain = e_DOMAIN;
+	}
 	setcookie($name, $value, $expire, $path, $domain, $secure);
 }
 
diff -x .svn -aruN 0.7.23.src/comment.php 0.7.24.src/comment.php
--- 0.7.23.src/comment.php	2010-04-25 15:17:27.000000000 -0500
+++ 0.7.24.src/comment.php	2010-08-27 01:53:24.000000000 -0500
@@ -3,16 +3,15 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/comment.php,v $
-|     $Revision: 11499 $
-|     $Date: 2010-04-25 15:17:51 -0500 (Sun, 25 Apr 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/comment.php $
+|     $Revision: 11708 $
+|     $Id: comment.php 11708 2010-08-27 06:53:48Z e107steved $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -32,7 +31,7 @@
 $temp_query = explode(".", e_QUERY);
 $action = $temp_query[0];			// Usually says 'comment' - may say 'reply'
 $table = $temp_query[1];			// Table containing item associated with comment(s)
-$id  = intval(varset($temp_query[2], ""));	// ID of item associated with comments (e.g. news ID)
+$id  = intval(varset($temp_query[2], 0));	// ID of item associated with comments (e.g. news ID)
 											// For reply with nested comments, its the ID of the comment
 $nid = intval(varset($temp_query[3], ""));	// Action - e.g. 'edit'. Or news ID for reply with nested comments
 $xid = intval(varset($temp_query[4], ""));	// ID of target comment
@@ -49,21 +48,29 @@
 	  exit;
 	}
 
-	if($table == "poll") 
-	{
-	  if (!$sql->db_Select("polls", "poll_title", "`poll_id` = '{$id}' AND `poll_comment` = 1")) 
-	  {
-		header("location: ".e_BASE."index.php");
-		exit;
-	  }
-	} 
-	elseif($table == "news") 
+	switch ($table)
 	{
-	  if (!$sql->db_Select("news", "news_allow_comments", "`news_id` = '{$id}' AND `news_allow_comments` = 0")) 
-	  {
-		header("location: ".e_BASE."index.php");
-		exit;
-	  }
+		case 'poll' :
+			if (!$sql->db_Select("polls", "poll_title", "`poll_id` = '{$id}' AND `poll_comment` = 1")) 
+			{
+				header("location: ".e_BASE."index.php");
+				exit;
+			}
+			break;
+		case 'news' :
+			if (!$sql->db_Select("news", "news_allow_comments", "`news_id` = '{$id}' AND `news_allow_comments` = 0")) 
+			{
+				header("location: ".e_BASE."index.php");
+				exit;
+			}
+			break;
+		case 'user' :
+			if (!$sql->db_Select('user', 'user_name', '`user_id` ='.$id)) 
+			{
+				header("location: ".e_BASE."index.php");
+				exit;
+			}
+			break;
 	}
 
 	$pid = intval(varset($_POST['pid'], 0));				// ID of the specific comment being edited (nested comments - replies)
@@ -86,8 +93,8 @@
 
 	if($editpid) 
 	{
-	  $redirectFlag = $id;
-/*		$redir = preg_replace("#\.edit.*#si", "", e_QUERY);
+		$redirectFlag = $id;
+		/*		$redir = preg_replace("#\.edit.*#si", "", e_QUERY);
 		header("Location: ".e_SELF."?{$redir}");
 		exit;  */
 	}
@@ -123,39 +130,40 @@
 if ($redirectFlag)
 {	// Need to go back to original page
 
-// Check plugin e_comment.php files
-  $plugin_redir = false;
-  $e_comment = $cobj->get_e_comment();
-  if ($table == $e_comment[$table]['eplug_comment_ids'])
-  {
-	$plugin_redir = TRUE;
-	$reply_location = str_replace("{NID}", $redirectFlag, $e_comment[$table]['reply_location']);
-  }
-
-  if ($plugin_redir)
-  {
-	echo "<script type='text/javascript'>document.location.href='{$reply_location}'</script>\n";
-	exit;
-  } 
-  else
-  {
+	// Check for core tables first
 	switch ($table)
 	{
-	  case "news" :
-	  case "poll" :
-		echo "<script type='text/javascript'>document.location.href='".e_HTTP."comment.php?comment.{$table}.{$redirectFlag}'</script>\n";
-		exit;
-		break;
-	  case "download" :
-		echo "<script type='text/javascript'>document.location.href='".e_HTTP."download.php?view.{$redirectFlag}'</script>\n";
-		exit;
-		break;
-	  case "page" :
-		echo "<script type='text/javascript'>document.location.href='".e_HTTP."page.php?{$redirectFlag}'</script>\n";
-		exit;
-		break;
+		case "news" :
+		case "poll" :
+			echo "<script type='text/javascript'>document.location.href='".e_HTTP."comment.php?comment.{$table}.{$redirectFlag}'</script>\n";
+			exit;
+		case "download" :
+			echo "<script type='text/javascript'>document.location.href='".e_HTTP."download.php?view.{$redirectFlag}'</script>\n";
+			exit;
+		case "page" :
+			echo "<script type='text/javascript'>document.location.href='".e_HTTP."page.php?{$redirectFlag}'</script>\n";
+			exit;
+		case 'user' :
+			echo "<script type='text/javascript'>document.location.href='".e_HTTP."user.php?id.{$redirectFlag}'</script>\n";
+			exit;
+	}
+
+	// Check plugin e_comment.php files
+	$plugin_redir = false;
+	$e_comment = $cobj->get_e_comment();
+	if ($table == $e_comment[$table]['eplug_comment_ids'])
+	{
+		$plugin_redir = TRUE;
+		$reply_location = str_replace('{NID}', $redirectFlag, $e_comment[$table]['reply_location']);
 	}
-  }
+
+	if ($plugin_redir)
+	{
+		echo "<script type='text/javascript'>document.location.href='{$reply_location}'</script>\n";
+		exit;
+	} 
+	
+	// No redirect found if we get here.
 }
 
 $comment_ob_start = FALSE;
@@ -170,54 +178,68 @@
 	$query = "`comment_id` = '{$id}' LIMIT 0,1";
 	if ($sql->db_Select("comments", "comment_subject", "`comment_id` = '{$id}'")) 
 	{
-		list($comments['comment_subject']) = $sql->db_Fetch();
+		$comments = $sql->db_Fetch();
 		$subject = $comments['comment_subject'];
 		$subject_header = $tp->toHTML($comments['comment_subject']);
 	}
 	
 	if ($subject == "") 
 	{
-	  switch ($table)
-	  {
-		case "news" :
-		  if (!$sql->db_Select("news", "news_title", "news_id='{$nid}' ")) 
-		  {
-			header("location: ".e_BASE."index.php");
-			exit;
-		  } 
-		  else 
-		  {
-			list($news['news_title']) = $sql->db_Fetch();
-			$subject = $news['news_title'];
-			$title = COMLAN_100;
-		  }
-		case "poll" :
-		  if (!$sql->db_Select("polls", "poll_title", "poll_id='{$nid}' ")) 
-		  {
-			header("location:".e_BASE."index.php");
-			exit;
-		  } 
-		  else 
-		  {
-			list($poll['poll_title']) = $sql->db_Fetch();
-			$subject = $poll['poll_title'];
-			$title = COMLAN_101;
-		  }
-		  break;
-		case 'download' :
-		  if ($sql->db_Select('download','download_name',"download_id={$nid} "))
-		  {
-			$row = $sql->db_Fetch();
-			$subject = $row['download_name'];
-			$title = COMLAN_106;
-		  }
-		  else
-		  {
-			header("location:".e_BASE."index.php");
-			exit;
-		  }
-		  break;
-	  }
+		switch ($table)
+		{
+			case "news" :
+				if (!$sql->db_Select("news", "news_title", "news_id='{$nid}' ")) 
+				{
+					header("location: ".e_BASE."index.php");
+					exit;
+				} 
+				else 
+				{
+					$news = $sql->db_Fetch();
+					$subject = $news['news_title'];
+					$title = COMLAN_100;
+				}
+				break;
+			case "poll" :
+			  if (!$sql->db_Select("polls", "poll_title", "poll_id='{$nid}' ")) 
+			  {
+				header("location:".e_BASE."index.php");
+				exit;
+			  } 
+			  else 
+			  {
+					$poll = $sql->db_Fetch();
+				$subject = $poll['poll_title'];
+				$title = COMLAN_101;
+			  }
+			  break;
+			case 'download' :
+			  if ($sql->db_Select('download','download_name',"download_id={$nid} "))
+			  {
+				$row = $sql->db_Fetch();
+				$subject = $row['download_name'];
+				$title = COMLAN_106;
+			  }
+			  else
+			  {
+				header("location:".e_BASE."index.php");
+				exit;
+			  }
+			  break;
+			case 'user' :
+				if ($sql->db_Select('user','user_name',"user_id={$nid} "))
+				{
+					$row = $sql->db_Fetch();
+					$subject = $row['user_name'];
+					$title = COMLAN_12;
+				}
+				else
+				{
+					header("location:".e_BASE."index.php");
+					exit;
+				}
+				break;
+		}
 	}
 	define('e_PAGETITLE', $title." / ".COMLAN_99." / ".COMLAN_102.$subject."");
 	require_once(HEADERF);
@@ -301,20 +323,35 @@
 		  }
 		  break;
 		case 'download' :
-		  if ($sql->db_Select('download','download_name',"download_id={$id} "))
-		  {
-			$row = $sql->db_Fetch();
-			$subject = $row['download_name'];
-			$title = COMLAN_106;
-			$field = $id;
-			require_once(HEADERF);
-		  }
-		  else
-		  {
-			header("location:".e_BASE."index.php");
-			exit;
-		  }
-		  break;
+			if ($sql->db_Select('download','download_name',"download_id={$id} "))
+			{
+				$row = $sql->db_Fetch();
+				$subject = $row['download_name'];
+				//$title = COMLAN_106;
+				$field = $id;
+				require_once(HEADERF);
+			}
+			else
+			{
+				header("location:".e_BASE."index.php");
+				exit;
+			}
+			break;
+		case 'user' :
+			if ($sql->db_Select('user','user_name',"user_id={$id} "))
+			{
+				$row = $sql->db_Fetch();
+				$subject = $row['user_name'];
+				//$title = 'Edit comment about user';
+				$field = $id;
+				require_once(HEADERF);
+			}
+			else
+			{
+				header("location:".e_BASE."index.php");
+				exit;
+			}
+			break;
 		default :		// Hope its a plugin table
 			$e_comment = $cobj->get_e_comment();
 			if ($table == $e_comment[$table]['eplug_comment_ids'])
diff -x .svn -aruN 0.7.23.src/contact.php 0.7.24.src/contact.php
--- 0.7.23.src/contact.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/contact.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/contact.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/contact.php $
+|     $Revision: 11678 $
+|     $Id: contact.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/content.php 0.7.24.src/content.php
--- 0.7.23.src/content.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/content.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/content.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/content.php $
+|     $Revision: 11678 $
+|     $Id: content.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/download.php 0.7.24.src/download.php
--- 0.7.23.src/download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/download.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/download.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/download.php $
+|     $Revision: 11678 $
+|     $Id: download.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_admin/ad_links.php 0.7.24.src/e107_admin/ad_links.php
--- 0.7.23.src/e107_admin/ad_links.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/ad_links.php	2010-09-02 02:15:05.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/ad_links.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/ad_links.php $
+|     $Revision: 11732 $
+|     $Id: ad_links.php 11732 2010-09-02 07:15:29Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -376,6 +376,7 @@
 	'language' => E_32_LANGUAGE,
 	'links' => E_32_LINKS,
 	'mail' => E_32_MAIL,
+	'maintain' => E_32_MAINTAIN,
 	'menus' => E_32_MENUS,
 	'meta' => E_32_META,
 	'newsfeed' => E_32_NEWSFEED,
diff -x .svn -aruN 0.7.23.src/e107_admin/adminb.php 0.7.24.src/e107_admin/adminb.php
--- 0.7.23.src/e107_admin/adminb.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/adminb.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/adminb.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/adminb.php $
+|     $Revision: 11678 $
+|     $Id: adminb.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/admin_classis.php 0.7.24.src/e107_admin/admin_classis.php
--- 0.7.23.src/e107_admin/admin_classis.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/admin_classis.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/admin_classis.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/admin_classis.php $
+|     $Revision: 11678 $
+|     $Id: admin_classis.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/admin_combo.php 0.7.24.src/e107_admin/admin_combo.php
--- 0.7.23.src/e107_admin/admin_combo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/admin_combo.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/admin_combo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/admin_combo.php $
+|     $Revision: 11678 $
+|     $Id: admin_combo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/admin_etalkers.php 0.7.24.src/e107_admin/admin_etalkers.php
--- 0.7.23.src/e107_admin/admin_etalkers.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/admin_etalkers.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/admin_etalkers.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/admin_etalkers.php $
+|     $Revision: 11678 $
+|     $Id: admin_etalkers.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/administrator.php 0.7.24.src/e107_admin/administrator.php
--- 0.7.23.src/e107_admin/administrator.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/administrator.php	2010-08-23 13:12:06.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/administrator.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/administrator.php $
+|     $Revision: 11695 $
+|     $Id: administrator.php 11695 2010-08-23 18:12:30Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -33,6 +33,8 @@
 $e_sub_cat = 'admin';
 require_once('auth.php');
 
+$action = '';
+
 if (e_QUERY)
 {
 	$tmp = explode(".", e_QUERY);
@@ -68,7 +70,7 @@
 	unset($ad_name, $a_perms);
 }
 
-if ($_POST['edit_admin'] || $action == "edit")
+if (isset($_POST['edit_admin']) || $action == "edit")
 {
 	$edid = array_keys($_POST['edit_admin']);
     $theid = ($edid[0]) ? $edid[0] : $sub_action;
@@ -105,9 +107,12 @@
 	admin_update($sql -> db_Update("user", "user_admin=0, user_perms='' WHERE user_id= ".$delid[0]), 'update', ADMSLAN_61, LAN_DELETED_FAILED);
 }
 
-if($_POST['edit_admin'] || $action == "edit"){
+if(isset($_POST['edit_admin']) || $action == "edit")
+{
 	edit_administrator($row);
-}else{
+}
+else
+{
    show_admins();
 }
 
@@ -120,6 +125,7 @@
 	<form action='".e_SELF."' method='post' id='del_administrator'>
 	<div>
 	<input type='hidden' name='del_administrator_confirm' id='del_administrator_confirm' value='1' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />
 	<table class='fborder' style='width:99%'>
 	<tr>
 	<td style='width:5%' class='fcaption'>ID</td>
@@ -151,7 +157,6 @@
 
 		</tr>";
 	}
-
 	$text .= "</table></div>\n</form></div>\n</div>";
 
 	$ns->tablerender(ADMSLAN_13, $text);
diff -x .svn -aruN 0.7.23.src/e107_admin/admin_log.php 0.7.24.src/e107_admin/admin_log.php
--- 0.7.23.src/e107_admin/admin_log.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/admin_log.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/admin_log.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/admin_log.php $
+|     $Revision: 11678 $
+|     $Id: admin_log.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/admin.php 0.7.24.src/e107_admin/admin.php
--- 0.7.23.src/e107_admin/admin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/admin.php	2010-09-09 16:36:11.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/admin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/admin.php $
+|     $Revision: 11772 $
+|     $Id: admin.php 11772 2010-09-09 21:36:35Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
@@ -108,6 +108,7 @@
 // More visible update check
 echo $tp->parseTemplate('{ADMIN_UPDATE}', true);
 
+
 // update users using old layout names to their new names
 $update_prefs = FALSE;
 if (!$pref['adminstyle'] || $pref['adminstyle'] == 'default') {
@@ -153,11 +154,13 @@
 // auto db update
 if ('0' == ADMINPERMS) 
 {
-  $dont_check_update = TRUE;		// This reduces frequency of checks
-  require_once(e_ADMIN.'update_routines.php');
-  update_check();
+	$sql->db_Mark_Time("Start: Db Update Check");
+	$dont_check_update = TRUE;		// This reduces frequency of checks
+	require_once(e_ADMIN.'update_routines.php');
+	update_check();
 }
 // end auto db update
+$sql->db_Mark_Time("Start: Render Admin Panel");
 
 if (e_QUERY == 'purge' && getperms('0')) {
 	$admin_log->purge_log_events(false);
@@ -274,7 +277,7 @@
 		return FALSE;
 	}
 }
-
+$sql->db_Mark_Time("Start: Render Admin Footer");
 require_once("footer.php");
 
 ?>
diff -x .svn -aruN 0.7.23.src/e107_admin/article.php 0.7.24.src/e107_admin/article.php
--- 0.7.23.src/e107_admin/article.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/article.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/article.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/article.php $
+|     $Revision: 11678 $
+|     $Id: article.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/auth.php 0.7.24.src/e107_admin/auth.php
--- 0.7.23.src/e107_admin/auth.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/auth.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/auth.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/auth.php $
+|     $Revision: 11678 $
+|     $Id: auth.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 // Experimental e-token
diff -x .svn -aruN 0.7.23.src/e107_admin/banlist.php 0.7.24.src/e107_admin/banlist.php
--- 0.7.23.src/e107_admin/banlist.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/banlist.php	2010-09-17 16:58:03.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* User ban management
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/banlist.php $
-* $Id: banlist.php 11643 2010-07-31 14:58:45Z secretr $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/banlist.php $
+|     $Revision: 11797 $
+|     $Id: banlist.php 11797 2010-09-17 21:58:27Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 // Experimental e-token
@@ -78,8 +81,6 @@
 
 $text .= "<div style='text-align:center'>
 	<form method='post' action='".e_SELF."'>
-	<input type='hidden' name='e-token' value='".e_TOKEN."' />
-
 	<table style='".ADMIN_WIDTH."' class='fborder'>
 
 	<tr>
diff -x .svn -aruN 0.7.23.src/e107_admin/banner.php 0.7.24.src/e107_admin/banner.php
--- 0.7.23.src/e107_admin/banner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/banner.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/banner.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/banner.php $
+|     $Revision: 11678 $
+|     $Id: banner.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/cache.php 0.7.24.src/e107_admin/cache.php
--- 0.7.23.src/e107_admin/cache.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/cache.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/cache.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/cache.php $
+|     $Revision: 11678 $
+|     $Id: cache.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/cascade.php 0.7.24.src/e107_admin/cascade.php
--- 0.7.23.src/e107_admin/cascade.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/cascade.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/cascade.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/cascade.php $
+|     $Revision: 11678 $
+|     $Id: cascade.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/categories.php 0.7.24.src/e107_admin/categories.php
--- 0.7.23.src/e107_admin/categories.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/categories.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/categories.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/categories.php $
+|     $Revision: 11678 $
+|     $Id: categories.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/check_user.php 0.7.24.src/e107_admin/check_user.php
--- 0.7.23.src/e107_admin/check_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/check_user.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/check_user.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/check_user.php $
+|     $Revision: 11678 $
+|     $Id: check_user.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/classis.php 0.7.24.src/e107_admin/classis.php
--- 0.7.23.src/e107_admin/classis.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/classis.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/classis.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/classis.php $
+|     $Revision: 11678 $
+|     $Id: classis.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/combo.php 0.7.24.src/e107_admin/combo.php
--- 0.7.23.src/e107_admin/combo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/combo.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/combo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/combo.php $
+|     $Revision: 11678 $
+|     $Id: combo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/comment.php 0.7.24.src/e107_admin/comment.php
--- 0.7.23.src/e107_admin/comment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/comment.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/comment.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/comment.php $
+|     $Revision: 11678 $
+|     $Id: comment.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/compact.php 0.7.24.src/e107_admin/compact.php
--- 0.7.23.src/e107_admin/compact.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/compact.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/compact.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/compact.php $
+|     $Revision: 11678 $
+|     $Id: compact.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/content.php 0.7.24.src/e107_admin/content.php
--- 0.7.23.src/e107_admin/content.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/content.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/content.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/content.php $
+|     $Revision: 11678 $
+|     $Id: content.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/core_image.php 0.7.24.src/e107_admin/core_image.php
--- 0.7.23.src/e107_admin/core_image.php	2010-08-20 15:08:46.000000000 -0500
+++ 0.7.24.src/e107_admin/core_image.php	2010-09-22 16:21:44.000000000 -0500
@@ -10,7 +10,7 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/core_image.php $
-|     $Id: core_image.php 11673 2010-08-20 20:09:10Z e107coders $
+|     $Id: core_image.php 11812 2010-09-22 21:22:08Z e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -21,12 +21,12 @@
   array (
     'includes' => 
     array (
-      'beginner.php' => '88df2b0272c6d0c83ae519e36e3f25ea',
-      'cascade.php' => '46c0b6234d0f16ce875617ffab8b5557',
-      'categories.php' => 'abd5add905a8b79a0c6bbd01924faf2c',
-      'classis.php' => '9352bea38ac71179891ff81ac3f0464e',
-      'combo.php' => '955eb82d086c91c83b9b6d00f2dfa174',
-      'compact.php' => '86623fd88a33d245c0577425dd58527b',
+      'beginner.php' => 'e96e6113f5356ee8265581192f8696c9',
+      'cascade.php' => '11fdf4a2cf2504e65658a7ab88c99661',
+      'categories.php' => 'ed7f908ba73c11a89885f9d0889a15bd',
+      'classis.php' => '2ec4b462d9e4084b6daf9b8a97cd8df4',
+      'combo.php' => '95635e14431e3e5f296287f3fd43980b',
+      'compact.php' => 'a4e4ecadb806e262523f9b202a686f7b',
     ),
     'sql' => 
     array (
@@ -34,77 +34,77 @@
       array (
         'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       ),
-      'core_pg.php' => '64465da7021492116ebe06fad9c746a6',
-      'core_sql.php' => '8e2dad26552815fcf314fbf024e0a75a',
-      'extended_country.php' => '5b0f523f2e2435ce2ce14c7857ba3a5e',
-    ),
-    'ad_links.php' => '8c7a4bb8e2565c5fc5d16f19e7618eb4',
-    'admin.php' => 'dc91cc56c2aaf8cdc880cb63c56cb80c',
-    'admin_classis.php' => '8a2680d9f23796eaa107a55dcd3274b7',
-    'admin_combo.php' => 'a4836fb72471e71e324213f14a0e4214',
-    'admin_etalkers.php' => 'bc12f934b6a8bb0553bb6bf914911210',
-    'admin_log.php' => 'f7f3b156001615e98ff8fe0afa5ef022',
-    'adminb.php' => 'dbbdc5fdf307e0edd1a7aff389828530',
-    'administrator.php' => '07854ed7e0fe98bb7bd9e120d3415e5a',
-    'article.php' => '027014c99f63daac0b7a5246b41dc70e',
-    'auth.php' => '5bd3af49330161fa11cd56d4fc903de1',
-    'banlist.php' => '80c02e499cfe122738dfa81e9872906d',
-    'banner.php' => '02e9c4f6791b337c7b2dff8a2241b31a',
-    'cache.php' => 'b8f0d1e95c41461577483af73cd89156',
-    'cascade.php' => '37060f36853285a42dee2b980c4a6a7e',
-    'categories.php' => '4b3f478acd12ef205e7c00c7f60d5dd2',
-    'check_user.php' => '4c8fe7190883f9b7645372b9c127e808',
-    'classis.php' => '6c7ea82d2c3e2439785db9e702fc5c62',
-    'combo.php' => '6b802b5d73ea400177f907938fac5d86',
-    'comment.php' => '7d617fddfe8f3c4d0ca79c6527cf48d1',
-    'compact.php' => '179de1dc5d985d560bcc3d5de6a85300',
-    'content.php' => 'a1fb890ddd99f92a5222670d1177a359',
-    'core_image.php' => '27ac4d3c55f9f03797c6229c204c342e',
-    'cpage.php' => 'fbe423ddc2dc68e57888a40646d76991',
-    'credits.php' => '043f6ab4bce5f9724271afef74ffe169',
-    'db.php' => 'c342e5340e2faede931904a062616dea',
-    'db_verify.php' => 'cfa80bfced85ada4b66a216d7f58de39',
-    'docs.php' => '1bbf183f71c651a45156875edc7a3d0f',
-    'download.php' => '0c2d4389b8f6748d18f14e213b10a70a',
-    'e107_update.php' => '8d2eca2e196ed30d18dfa054bd736afc',
-    'emoticon.php' => '98d1e18e69dee9f4b0f0e16d9b998e5c',
-    'fileinspector.php' => '8d1fc65cc5c899333d61764e42cd1aa0',
-    'filemanager.php' => 'a8f77c7e16a50339e040a8d2822bfd5c',
+      'core_pg.php' => '48084454a6eaf05faca4b4afcc435c0b',
+      'core_sql.php' => 'c7d2cf0d936c5ba9e75f5621140044da',
+      'extended_country.php' => 'fa47c74f9b7d57fe5ea24787d972f8b8',
+    ),
+    'ad_links.php' => 'e6e818f7dded90dcb20f57ea7ebd17b8',
+    'admin.php' => '79b0a68d6c6b38271d8875c72c536014',
+    'admin_classis.php' => '1ad9a3d24d76efdc2e5320caeb2b6e12',
+    'admin_combo.php' => '72ed3c4ca9c6e348af758323cface540',
+    'admin_etalkers.php' => '4606fdf97453273e37f0fd973e64c1d6',
+    'admin_log.php' => 'eb4a084f1cca7d868cefcc5d2a53edfe',
+    'adminb.php' => '34fba5666d40d75b4a433cfb670ab33b',
+    'administrator.php' => 'ca893ed78fcfa45d3305d29ece36c100',
+    'article.php' => '718991e8d07f3af22917c6babcb16d18',
+    'auth.php' => '677c9b2f80a2b85b0895b212db602a7b',
+    'banlist.php' => 'aca33bf3e75b23310458df1051dfcf88',
+    'banner.php' => '216713ad90861a0894595b79703f2dbb',
+    'cache.php' => 'c835e2706424650a9dec0c67663e8b21',
+    'cascade.php' => '426121b4aead34a87af264c23d76cf76',
+    'categories.php' => '4332e8d5772bf47eb564d4860f0cfefd',
+    'check_user.php' => '5c42285679cc50afc719dca306db7674',
+    'classis.php' => '0e53214c16a9b7fe96d7ad379c3ff96b',
+    'combo.php' => 'af8dbabf951de7b448556e2a58b136c1',
+    'comment.php' => '64e8eb798697c404ca7d9551680606e6',
+    'compact.php' => 'ec130bd289f9c97fa3aa2174b717cedc',
+    'content.php' => '393ac3283845587d8c9fde0cc60afb3e',
+    'core_image.php' => 'd81e9c541f148f1f0ca699c22ebfbf2a',
+    'cpage.php' => '5b082a899902280f04eba7bef2b9fb84',
+    'credits.php' => 'ca0a6d2aaf7bfc1ea3a46d04e12ec23a',
+    'db.php' => '74139e11c3664555bdf7cf8080ab26bf',
+    'db_verify.php' => 'e40fba3af6bf5dee8154dfcbabe67045',
+    'docs.php' => 'e2a1bcb11e4d89f27bc51d68f68e9ddb',
+    'download.php' => '694e08c3d8137fed8610603542017f76',
+    'e107_update.php' => 'f732438744e472390a1b439465d7f0e8',
+    'emoticon.php' => 'e460aa583debaaa672f685cb87648efe',
+    'fileinspector.php' => '71450f515e8134573897e6b2fbf3d065',
+    'filemanager.php' => 'a2a9c088f88c0543613ad88bee9e8621',
     'filetypes_.php' => 'f951037335e993337792606cc1475cec',
-    'fla.php' => '8774c3f95a412acc5b56c8f6b9d11ee8',
-    'footer.php' => 'e98f6e16a27169bdcfbd891fcda08e29',
-    'frontpage.php' => '24def00bc5862feed1e52f80975c02de',
-    'header.php' => '0187e0b85aa6b4310148d77cd7886c0b',
-    'image.php' => 'bdc0ba72e341c49811c54d68b074e6ea',
-    'index.php' => 'caa5a381bf421e95d2d569df15342038',
-    'lancheck.php' => 'fe1622893231925591cd9df983c4ddaf',
-    'language.php' => 'd887dc599a61c328c510d858d5b0d846',
-    'links.php' => '7d160aa9914babc86e8309d6217a5157',
-    'mailout.php' => 'd05c45943c5dd7552696bc80d062b7d6',
-    'menus.php' => 'e3e3fed2e075e34a0a9d948b0f041a08',
-    'message.php' => '7006a91c927ea2e16902d09d54918544',
-    'meta.php' => 'a8105dd9774c70ee7669168514c85ce4',
-    'modcomment.php' => '0e10f1c1c8081c9a307b1d19c7f63afb',
-    'newspost.php' => 'f1b1d28e863ffca6f9875d8b901b452a',
-    'notify.php' => '75bb6247c8a663fdb93a2e760a3e359f',
-    'phpinfo.php' => '98c293aee457d140cbf9fc645c9f00ca',
-    'plugin.php' => '592f9a7e1acfbc63de2110c8682fb6db',
-    'prefs.php' => '1f67e0f4b6e474a1c460dc7c7c969d50',
-    'review.php' => '707df455e14deb87c8231f44c7096b36',
-    'search.php' => '92954b6e87bbd50b4b85b330ac3e76fb',
-    'theme.php' => '713bd04d6d35236405e3816a74225aa9',
-    'ugflag.php' => '138fcc31d82e3d4e29f96508248fba0c',
-    'update_routines.php' => 'a34da0002dbd51a5509f88df2f32b5c2',
-    'updateadmin.php' => '0a7488c0befca623afc61cb648ca4eb0',
-    'upload.php' => '57a08173a56ad503702c70f335ca7f9c',
-    'userclass.php' => 'cd77537df4ea11a5e35bf9fd76eaf767',
-    'userclass2.php' => '32a2ea908bc497be00764141d188563a',
-    'userinfo.php' => '10fd61c5e3e0737d086dcd9a4b7d4846',
-    'users.php' => 'cd434002fd67aa762c7de3b80419155c',
-    'users_extended.php' => 'a3eb72398de8166270edca26e41e86d9',
-    'users_extended_predefined.php' => '47a324344c8febe60f9ffead1b5246fb',
-    'ver.php' => '7e174e8ebef94841df65cb6fa134b6a5',
-    'wmessage.php' => '868688888b6969bc45bfd035b2045b37',
+    'fla.php' => '1aefd4e013f1d4d38dde69f5e801d8a4',
+    'footer.php' => '8672ad69eadf94d079c5ff5470afa6a2',
+    'frontpage.php' => '878bc7ca908b88c7441a242c2baf3ae2',
+    'header.php' => 'f231642623e2e446924b04b5a801964e',
+    'image.php' => '7cdd8e6b6589e93bd18979752da4d3bd',
+    'index.php' => '26700800ddf746629a55e2747b9e8e0f',
+    'lancheck.php' => '078dd73a761257ace5db71d9f1bf9f46',
+    'language.php' => '01a9174ea0c85fae6ec48232c831e99f',
+    'links.php' => '0bcf8139abef130a3a1757431499f61a',
+    'mailout.php' => '3922ee2695c6ce849c99a14670ed53b4',
+    'menus.php' => '0873f17e7aa314d3ae6eff79ef745a74',
+    'message.php' => '5f69b7440db09e5bee30288241bdad35',
+    'meta.php' => '0371c24cac6be53833b0e9feea1f5d1f',
+    'modcomment.php' => 'dbf112846aea17d36c03d66206bc5a15',
+    'newspost.php' => '242943f0430b5b4adfbf022095e44806',
+    'notify.php' => '07e00910ee8ac60951a0b83b9fcb2fd7',
+    'phpinfo.php' => 'd3c66ce0cab07f5cee3785aea83715eb',
+    'plugin.php' => 'b273b824d822b2061a91583fd4fabf29',
+    'prefs.php' => 'b1fd027d3fe828786f0b462decc981c5',
+    'review.php' => 'b7ec4170f13068a622d1ec2582c21a6f',
+    'search.php' => 'e00c2c48924ad495fd30c4038cac528b',
+    'theme.php' => 'a3f8219bacbc8028a7ffd21c798f4f8b',
+    'ugflag.php' => '6bceb5eef44d91cf2929b92fd1854432',
+    'update_routines.php' => '7daebcc3e444cd7b56772dc65cb475ce',
+    'updateadmin.php' => '3f0c55903abcffc20e8ae612c9adb3fd',
+    'upload.php' => 'eb45f5e64818c2a33c32db5e737a3bcb',
+    'userclass.php' => 'c40e5632d0bbab50c65ac2579af5bdb5',
+    'userclass2.php' => '269f823b152807bf1398b253bbd736c8',
+    'userinfo.php' => '86461ecfae44ebdbaa1f710acc63cf13',
+    'users.php' => '1970e65dfca7db868304091da6ad8260',
+    'users_extended.php' => '6ad395eafa94e6e91eb65594f75c07b3',
+    'users_extended_predefined.php' => 'a7f1f96f56cbb0b1f4a0b71126318597',
+    'ver.php' => 'f1c83078dbf998d02cdb7a1aa6516d95',
+    'wmessage.php' => 'daa79a46b4bb9ba70dd816f4a61df0db',
   ),
   $coredir['docs'] => 
   array (
@@ -146,6 +146,7 @@
     'bbcode' => 
     array (
       'b.bb' => '467bfb5e80f460fcebcdc2e6a3a8d38b',
+      'bb_youtube.php' => '43da1cd1f7df6d70d5aa3cedc85bac51',
       'blockquote.bb' => '2cfbbd3ab3fe2872d1a9873223d21522',
       'br.bb' => 'cb8d211703f0459735baa8dfbebb4bb4',
       'center.bb' => '5a1957946e3d8898a0b3d86650771809',
@@ -161,7 +162,7 @@
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'justify.bb' => '016500f910beb0f820dd58c4915f2489',
       'left.bb' => '990ddba32b14bea648745cc373035bde',
-      'link.bb' => 'a7ab8c37bdd72248c476c0a8c38dcad0',
+      'link.bb' => 'b8189cfeece6331b0ead2665e41204eb',
       'list.bb' => 'b8a3e5c98d6ebc1f1ca1a122bd7ced0e',
       'php.bb' => 'a118b04688efa7c626f9bb35acb16423',
       'quote.bb' => '12bfbba32661e309a33972e388b0e912',
@@ -174,7 +175,6 @@
       'time.bb' => 'dda6c9f9d1245b82921e85f4c9950532',
       'u.bb' => '7f8703e65a5f24bd9d2edd5fc0dfef48',
       'url.bb' => 'e155b50c04ccfc87608a4b13486b9c46',
-      'youtube.bb' => '317858b7bba01feee6bb1de930b696b4',
     ),
     'cache' => 
     array (
@@ -206,9 +206,9 @@
       'import_mapper.php' => '78a98bfedbe66b043e8562bcd6449125',
       'import_readme.txt' => 'a76f8a52208d648e1c9e3afe71929755',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'mambo.php' => 'e2b535b1af09e9836d018d4b8052af79',
-      'phpbb2.php' => '90941e90656ef053a7e0d2bbfbbde6e9',
-      'phpnuke.php' => '6c5c83e4dea621d263f35027178e7f21',
+      'mambo.php' => 'b79d85a984fd5c61a8a38593049e8e41',
+      'phpbb2.php' => 'c8a4a1e92f50dc9cdf1e554265ad5e57',
+      'phpnuke.php' => '80cafed86a221c9f35a5e5972499eb6e',
     ),
     'misc' => 
     array (
@@ -225,47 +225,47 @@
     ),
     'resetcore' => 
     array (
-      'fixyoutube.php' => '99cbd4dd3cf8070e4b33e370b34f4d7f',
+      'fixyoutube.php' => '8478c913f7481291810a8615e7837b79',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'resetcore.php' => 'dd8e23f51472cb8b9a8ce08f99586885',
+      'resetcore.php' => '997cdcf4ec2e61556b89664bb346a345',
       'style.css' => 'e294495db6f91c4514c4f40d7b09fcd5',
     ),
     'shortcode' => 
     array (
       'batch' => 
       array (
-        'bbcode_shortcodes.php' => '916eae765997774837ac4cc108892b32',
-        'comment_shortcodes.php' => '18f87a7f2639c3f35e62f46c298989df',
-        'contact_shortcodes.php' => '9526d6857950bfbe6911fbfe73516ba4',
-        'download_shortcodes.php' => '84b57e0e99cb7146ef22c0d716d975e0',
+        'bbcode_shortcodes.php' => '140adff9b52e4515b4e134b66eb144cc',
+        'comment_shortcodes.php' => 'f31a6553dd61db387730fe1cf7e39530',
+        'contact_shortcodes.php' => 'e4a9d766c2d8230a8c194edc73a0ee67',
+        'download_shortcodes.php' => 'ddc28b227ed55098bc2a085585bc73af',
         'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-        'news_archives.php' => 'b7513e4539e166bd371833f77b2c2434',
-        'news_shortcodes.php' => '8f0517e5c427ac8412cf4e34a33ac2e7',
-        'signup_shortcodes.php' => 'bb29285e136dba9668c6a228571b3155',
-        'sitedown_shortcodes.php' => '43174bac69d04449e92046b337f0155a',
-        'user_shortcodes.php' => '9a3504346d0a5c2067be9804d68b1b8a',
-        'usersettings_shortcodes.php' => 'dc787d39d92df14b1ac5553d17ee14ba',
+        'news_archives.php' => '17478354b5a68bfcac46e46484b7e4ce',
+        'news_shortcodes.php' => '08a89107dd0a49e014da316363a9a164',
+        'signup_shortcodes.php' => '85c54e5e3c3f7d90312b0f91fc2a9dab',
+        'sitedown_shortcodes.php' => '2e795ea320860124c884606926e37219',
+        'user_shortcodes.php' => '6982214d71b081add81d61629d6ff8f7',
+        'usersettings_shortcodes.php' => 'c89a0e5127175befca158cb3b16ef0a2',
       ),
-      'admin_alt_nav.sc' => '89693e0f8bded49fc0e75801e0d7086d',
+      'admin_alt_nav.sc' => '17f82050dadf0bcc51f36e9bcfab58d9',
       'admin_credits.sc' => '1b7e691941c78f4a1d2cca5c7a81e839',
       'admin_docs.sc' => 'b010b7ac7618fa669c8777754a8337c6',
       'admin_help.sc' => '32247c5afa0c6afcd7f58ef51c5f105f',
       'admin_icon.sc' => '4843c11cc5e5e14db4d5cacd537569c2',
-      'admin_lang.sc' => '7faff862c78eccb5e519d3ee339feca2',
-      'admin_latest.sc' => 'fb06a6035e4d79e2174fac1bbd86280c',
+      'admin_lang.sc' => 'dcc988d7b2fa49c3053610f11daf19ec',
+      'admin_latest.sc' => 'b016f49367d62c5237fa9461517bf963',
       'admin_log.sc' => '9ed4a14759eb20032fb3e953b3374ce3',
       'admin_logged.sc' => 'dec16fb0a9f5485db6ca1b4955753c2e',
       'admin_logo.sc' => 'a97a3ad7bd7a505373ca5b794310a7ff',
-      'admin_menu.sc' => '33785fcda56c60c219a4cc30f6018f5b',
+      'admin_menu.sc' => '70587ca7d1d1c79573deffc27bdb0884',
       'admin_msg.sc' => '1906530f20e337964878fd144b1047c5',
       'admin_nav.sc' => 'c22be64cb31ee333f0510f6dd8778363',
-      'admin_plugins.sc' => '67b6ef3a70b37eb92ae585f20334b9ca',
+      'admin_plugins.sc' => 'd2a629cdf1bda821867e4177bd4999e1',
       'admin_preset.sc' => '57769dcbc4c658c8b14fbc0b19b94a28',
       'admin_pword.sc' => '242c091ee9825a4cf76674a7a0fb3b06',
       'admin_sel_lan.sc' => 'f84e6de20d1e6def2675c77f90b0d710',
-      'admin_siteinfo.sc' => '28e2f558747ecd09ee787b6f46eea3bf',
-      'admin_status.sc' => 'c201d54a31f083bce30477b62018da12',
-      'admin_update.sc' => '1143e4c91ec016bac7efaf7e8089a67f',
+      'admin_siteinfo.sc' => 'c0de6b2a460e232bfd112a57f1ba4703',
+      'admin_status.sc' => '3f44636d054f74e4d3c5b61844f015ea',
+      'admin_update.sc' => '7ce1c1df06592fabb2cf6fcc29a96b70',
       'admin_userlan.sc' => 'd1ced8f4235d221877e47efcaaecc835',
       'banner.sc' => '9f40612195bb3a863615b06f059b9ab1',
       'breadcrumb.sc' => '0591ee7dc26ded7ac9a359dea4b8fdf6',
@@ -280,7 +280,7 @@
       'extended_value.sc' => '1b720e5d3155c6d4a1464fc1e9cac5f1',
       'imageselector.sc' => '558b028f8a4978f7845224387a141fd6',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'languagelinks.sc' => 'b52ab4e95c240a101e781a5bd8a42837',
+      'languagelinks.sc' => '86777cfae68e873ef74d41c3ffd8a767',
       'linkstyle.sc' => '5ed64d972bc892a798f80179878f1266',
       'logo.sc' => '7989dac8bea9ec4c0da489fb942ae507',
       'menu.sc' => 'a59149f7071b59afdb17a9be17d0c901',
@@ -300,7 +300,7 @@
       'sitedescription.sc' => 'c617f50a35752e7cb8de2d15f7e6b614',
       'sitedisclaimer.sc' => '6a9e25a899608fd05a56e90a3f4bfd38',
       'sitelinks.sc' => '754259e3bdab4efc147d92b50efdf262',
-      'sitelinks_alt.sc' => '699ad1453a9251da281c49b9f8503adb',
+      'sitelinks_alt.sc' => '5701cc59ee7bf1aa413f3b3dfe83378b',
       'sitename.sc' => 'a62bd1e1600931a2585f16b611fd0c6b',
       'sitetag.sc' => '338e16589e67c9fe45613e3c6dbb9b0d',
       'stylesheet.sc' => 'fff86593b238e374763dab535f6f40a3',
@@ -308,21 +308,21 @@
       'uploadfile.sc' => 'f25209c2ea67bf30c50c18548c245be2',
       'user_avatar.sc' => '1501550f2414900d47edee2621b2e624',
       'user_extended.sc' => 'cea27d6ef17122c2368703c67b3cb363',
-      'wmessage.sc' => '898c3b8537dcad72e5c94bdcf3313631',
+      'wmessage.sc' => '7e6ca101862dab61e56e748431bfb561',
     ),
-    'def_e107_prefs.php' => '2e1b554ccf648590ae4f91ee1b2cdbc6',
+    'def_e107_prefs.php' => '3fcc3a9820e3e45a07a1dacbdcf926eb',
     'e107.css' => 'e5cfa4047831f19def7df032ef8bc830',
-    'e107.js' => 'f6c99e77afbae971f0ac959f72516674',
+    'e107.js' => '5062e4aa13b548e5c2f04e2652183678',
     'e_ajax.js' => 'b583773e72852158e27af8a9bba7c97f',
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
     'nav_menu.css' => '58ca165986f7428fb05e8b7b82c2ee13',
     'nav_menu.js' => 'f6345dfb29d05884a5017ff17ed36387',
     'nav_menu_alt.js' => 'cbfeb53bb0dfc7136f097c00265731ff',
     'popup.js' => 'd09d2c542ac320a8b9690a36aebdb0c4',
-    'resetcore.php' => 'b1ef727dcdcc59a823e60763235f6424',
+    'resetcore.php' => '7b84e386c94ec3917d61882fcc197ff7',
     'sleight_img.gif' => '7616b49c48ca0cd6cbd15e9f747c8886',
-    'sleight_js.php' => '6e60ac8f412ca4d42d143e14724e83f8',
-    'thumb.php' => 'c83152eda9c271bc76903208bad3491a',
+    'sleight_js.php' => 'ff8a781186a4c37b0104111b25f00b6b',
+    'thumb.php' => '8157312818272ea549198fdc6b958e65',
   ),
   $coredir['handlers'] => 
   array (
@@ -354,26 +354,26 @@
       'class.pop3.php' => '4ee33629dec2b6c217792d2d75f83b51',
       'class.smtp.php' => '3703c67c81f61a223cd6bc1c10687dbf',
       'e107.htaccess' => '507de3fb6f951cafa6b1a346d232604f',
-      'mailout_process.php' => '500f2efb1b41ea88eafee7be20007582',
+      'mailout_process.php' => 'd0f1255f8676dfd70b97e3282add3b11',
     ),
     'search' => 
     array (
-      'advanced_comment.php' => 'f3a6831886f18fcefa946920ebaaa36a',
-      'advanced_download.php' => '9832a5ebc7f239ff324add9467744b89',
-      'advanced_news.php' => '60725703a4a62aaad96635ce1dfde452',
-      'advanced_pages.php' => 'd41d71b01ead6063312202ee406d125f',
-      'advanced_user.php' => '3a4ad254b93eb5b262cee03d9e595a43',
-      'comments_download.php' => '0aff5e9fce9b0e1b190422280fb27c2c',
-      'comments_news.php' => 'a96790bdd767519bc413c33400db0ac9',
-      'comments_page.php' => 'd978b19b689ec3e48fa481f3dd2787b9',
-      'comments_user.php' => '9853615971adce7454b3090913ac2334',
+      'advanced_comment.php' => '64dbacce9c3b772c73e1d92b65818b9a',
+      'advanced_download.php' => 'a696b4befee4660a9ab5425e00368fc4',
+      'advanced_news.php' => 'bf4c217eedd3bee42dca08e0c0a47ef6',
+      'advanced_pages.php' => '20d75545dc10e3a8b1afa5ccb207bdd2',
+      'advanced_user.php' => 'ab4729e1fa4140b306b921e820ed05fc',
+      'comments_download.php' => '51e1b7423729aa276e14634d829af570',
+      'comments_news.php' => '580e8b4000350b5e9eacb7f4aa2e5133',
+      'comments_page.php' => 'c10ff4af9496d4b720870f0eacfb3c61',
+      'comments_user.php' => '57f24de90595a121cb1fc5521377b67b',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'search_comment.php' => '74d7e7da6eb955f9ae0e82b70e7b469c',
-      'search_download.php' => '6b8f9ca5c0bfd263871abc0a4b40b212',
-      'search_event.php' => '13f54974e31421a8379d0a76d388e83d',
-      'search_news.php' => '2fe6ba12cf3bcf9e70578b9800bbf2f6',
-      'search_pages.php' => 'c00c99fb0b35d32d37ab5c66dff47ec4',
-      'search_user.php' => '28a7ca15687b44e918c922cf41627600',
+      'search_comment.php' => '6457489a70dbd18f588207be4b54a776',
+      'search_download.php' => 'ebbb535b55429f1c62565e2a4d723365',
+      'search_event.php' => '8353c3b642c468d04ab51c5ae70f4e8e',
+      'search_news.php' => '50bc334b8b405e4c726602671ee8275a',
+      'search_pages.php' => '751e382494e2f5871334a5ac728f18a1',
+      'search_user.php' => '166a357207b5c02d4a9a9866dbaca6ef',
     ),
     'tiny_mce' => 
     array (
@@ -413,7 +413,7 @@
             'en.js' => '4e72c7cd68a7fb3a6b8f1e1cd6eeac8a',
           ),
           'editor_plugin.js' => 'f7e74630e641e122b5b71503ea58fc8c',
-          'emoticons.php' => '0e6acc8a0005b36417bd2714ce1a6c11',
+          'emoticons.php' => '092e4135dbcbe2a9261d26d3d261653b',
           'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
         ),
         'ibrowser' => 
@@ -432,7 +432,7 @@
           ),
           'config.php' => '4e178e32efb96453c26523ded26f6ee7',
           'editor_plugin.js' => 'da29c9b99d2509ac620533ea4e1fee14',
-          'ibrowser.php' => '83164c55d16c435dee833c9054d1595c',
+          'ibrowser.php' => '8b921158cef045e9ee4682371849ddfd',
         ),
         'iespell' => 
         array (
@@ -725,81 +725,81 @@
         'validate.js' => '49cf8ea372e8cce1b89c04f0a9e228a2',
       ),
       'blank.htm' => '72406c871a9be7972922686221a885a2',
-      'filelist.php' => '63d5fa62565bc100d3345de82ab36985',
+      'filelist.php' => 'da02decd86335cc0d179df0cd3886bdd',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'tiny_mce.js' => '9f93010a684382a5ff180c275f0ee985',
       'tiny_mce_gzip.js' => 'ea730144f7836073b9dcc0bd09c3ab5d',
       'tiny_mce_gzip.php' => 'def6c78847a3a181cfed52b93d8d5f06',
       'tiny_mce_popup.js' => '8ccd8e1ecd2700cb83ee770337b3b542',
       'tiny_mce_src.js' => '3e0019162c45c999336c2fa811e4f522',
-      'wysiwyg.php' => '74fe95471b10c7400f4db3aa41bcc7d8',
+      'wysiwyg.php' => 'a9b679b4e34a9976c412d61d9aca6b7d',
     ),
     'admin_handler.php' => '2d593943e40bf02d5d46cf6b6af6b7e7',
-    'admin_log_class.php' => 'b430a6f38e22907d6f72de1ed18c95e9',
-    'arraystorage_class.php' => '8866a6ff44d8a9afb79861612295a2d1',
-    'avatar_handler.php' => '8f420817a3e5739ee525557de93b33fa',
-    'bbcode_handler.php' => 'f0545142c5b1c88b48cbed194cfe33e3',
-    'cache_handler.php' => '8994a35e99a8fa74ba908fe6efce1298',
-    'comment_class.php' => '8534a917042e114986fd6bcdfde19f6b',
-    'date_handler.php' => 'd200e8d375415ca2c4c36a7b4d9c8c09',
-    'db_debug_class.php' => '0bfd7a4052b70f8b8fe42c0dd225c130',
-    'debug_handler.php' => '95963012e62badfb16674fb24a97c30a',
-    'e107_Compat_handler.php' => '0d169451909944d884a90b277752e5a0',
-    'e107_class.php' => 'ebfdd506d2298a3c3be92ded40b3d225',
-    'e_parse_class.php' => 'b239990330bacacc03cc294bc96c73f6',
-    'emailprint_class.php' => 'b0aaee7955ed3e93efa119f69989be28',
-    'emote.php' => 'ae27879689dc0d41b58a8dafe8518865',
-    'emote_filter.php' => '998222547146eca3515387da1bcbc3d4',
-    'encrypt_handler.php' => 'f6ae6ac52d86043f85c9265438f6eed5',
-    'event_class.php' => '2ed8bbe7620a34d8bca0b0305e09c3d1',
-    'file_class.php' => '2a84c4206af3c125c3b9a2abcc7f46e3',
-    'form_handler.php' => '8d3e8f5b500e1352b9e9131f8a1c4846',
+    'admin_log_class.php' => '9034da754aeeb72e53c35be0ead6341b',
+    'arraystorage_class.php' => '6993bf8a62b1b6139abd00dc8b6af3ea',
+    'avatar_handler.php' => 'd62b4eec902a6f0100c5fe5817d99357',
+    'bbcode_handler.php' => '6fe04fed7c16db8771b2e5ab1dfd920e',
+    'cache_handler.php' => '000f6cdd45fac48adb59fdf7fce8af03',
+    'comment_class.php' => 'd2876885adf9c6327b45fa4a4039c4f4',
+    'date_handler.php' => 'e2edc265b7b99e277de5a3785a26e3a4',
+    'db_debug_class.php' => 'c5cb881fec744974a35803de7efbf533',
+    'debug_handler.php' => '8eda3a044b71ab7cd9550a14a216e08b',
+    'e107_Compat_handler.php' => 'b927ac5a004fec8506e7d51b4e79a00f',
+    'e107_class.php' => '2183865a9909046ab949b2c1cb7b41ca',
+    'e_parse_class.php' => '6237b42534b837fb282e71dad1c550d0',
+    'emailprint_class.php' => 'fdc1d1304afadfc022463a51cba67850',
+    'emote.php' => '857db28d115c7d77587ee70b738d70ff',
+    'emote_filter.php' => '32f03814a155ab2d48517384c4f23efa',
+    'encrypt_handler.php' => '71f05d8bee660dbfd299d8cf4feea2f8',
+    'event_class.php' => '9f64cdc6ebd03ccb1b65293e2d9ee978',
+    'file_class.php' => '9c60d3e3499f38912e26c71d95aa54f7',
+    'form_handler.php' => '4906a6c2c2fe2d7a00df746d5313e8cc',
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-    'language_class.php' => 'a85e23250a7fd9f866849cb46a4ac979',
-    'level_handler.php' => '1747cea1f25e09dfb456d26a951b1e66',
-    'login.php' => 'f385142f60fcd5a03bae599afa142479',
+    'language_class.php' => 'dc2b8410bf1e36ed7c0d2e2ae0f32780',
+    'level_handler.php' => '51a6554eb18f8296fea49ad222a7b0e5',
+    'login.php' => '8039ef7a6544ae55c1e9f58433c7c65b',
     'magpie_rss.php' => 'a04efb623cda4635cf46d9fe7c327d44',
-    'mail.php' => '704bb8225be0e86ce723bd19a9b01e6d',
-    'mail_validation_class.php' => '6b27b22b839b06058bbf7da4be345f3f',
-    'message_handler.php' => '7346d49fdf97fdeb2e3edf531e3e8bd6',
-    'mysql_class.php' => '6ecbf6bf2bd54a54c7a6a8a57b50fceb',
-    'news_class.php' => '03b176867dc946a015c1e4180ce1fc98',
-    'notify_class.php' => '984e7928c7e7844191ee401069ad72f2',
-    'np_class.php' => '39923bdcf4f1cede200e9584d196c4b9',
-    'override_class.php' => '5fae0f931304de3c66a178f692c5975f',
-    'parser_functions.php' => 'f942200decf4ff1d4f926608f4233073',
-    'parser_handler.php' => '1a3feefd6bd74d4f3ac43ddce7c0273c',
+    'mail.php' => 'e36efef6ad8d8195763f438b43385a68',
+    'mail_validation_class.php' => '044d1da8377818835c55833aeae32d12',
+    'message_handler.php' => '8a02bc87ac579485d1c944d96bea5325',
+    'mysql_class.php' => '082469dececf5d56f7be912b1db35f05',
+    'news_class.php' => '4823c2a7a079b39bb5cfedb04a0b1da4',
+    'notify_class.php' => '68b8dd12b3f2f1eaff692d3d65ad22b4',
+    'np_class.php' => '20b3571a82960caaa4ce83c5e7c72e37',
+    'override_class.php' => '8c3cb1c429d3473909fec59fe9fd877b',
+    'parser_functions.php' => '8f94e2d568edaaf56dc5c21e87b8fa73',
+    'parser_handler.php' => '687f8ddcb1e959bd1551796900ab6543',
     'pclerror.lib.php' => '7b1498a7efb4524dd899c954526c3ca2',
     'pcltar.lib.php' => 'b9313066aad3049bb0041099137a648e',
     'pcltrace.lib.php' => 'eb165fe908cc30c85975b7d35614990b',
     'pclzip.lib.php' => '7c5bc3eb535a051df497e2be6311a075',
-    'php_compatibility_handler.php' => '04e73e8835f5fd14a5febd20028c27d9',
-    'plugin_class.php' => 'c1123a3af3332b735eb39e694bb90927',
+    'php_compatibility_handler.php' => 'ecf9d5fe532b21465d6d8f6b119a85ef',
+    'plugin_class.php' => '453ea0efe227064fe8d28db3aa7e1fd4',
     'pop3_class.php' => 'c2c157306f6c670ca8f085a041ea2b3a',
-    'popup_handler.php' => '756df1acf22724a412e48231e1bd8df1',
-    'pref_class.php' => 'f7f4192c125f0ec7544fee16ee4f9344',
-    'preset_class.php' => '3dbdfb9c099c1e39f44b3db29f7944e4',
-    'profanity_filter.php' => '25565df788534aaabd791d74e27e3293',
-    'rate_class.php' => '6bce790f9614b4c3eab4fbc58495962c',
-    'ren_help.php' => 'd859622d9f3e162780afa4bcf1b8db99',
-    'resize_handler.php' => '2df285d8a07050cc468b4473bc8638e7',
-    'search_class.php' => '07d947a41186557067122b5cbe19a57d',
-    'secure_img_handler.php' => 'd0c59e225f08b36fc5cfc303d4a87f9c',
-    'secure_img_render.php' => 'a70e27c64e803fb4a1136f8435434198',
-    'session_handler.php' => 'e0eee3bc0c78692fcca50facccbb8b01',
-    'shortcode_handler.php' => '3b0f191911be5bf1d2ebe3bc327d3a79',
-    'sitelinks_class.php' => '865daad292451b0848e02baa4cd96e3d',
+    'popup_handler.php' => '2b1fce18c47ee2645594ebf9a1a89170',
+    'pref_class.php' => 'd054715028bcff3608e735ba1793f739',
+    'preset_class.php' => 'e1ba0054fafb162bba13960acf66aaf6',
+    'profanity_filter.php' => '0337741876d3f8046db4aa8a4663ff0c',
+    'rate_class.php' => '5ab1d2b83bff6a28489d50534d69c460',
+    'ren_help.php' => '581be213fe256b4f611dfd348b90c781',
+    'resize_handler.php' => 'ae885747b6f474b67b4a930c38e2e1e7',
+    'search_class.php' => '584d45a8308a89c2a46e445a8d7e66e4',
+    'secure_img_handler.php' => 'cb5fa5bc549034d808887e62dc4bfcbd',
+    'secure_img_render.php' => 'd99724f791f92c408ad20d4f0e6a32a6',
+    'session_handler.php' => '6609d7029789a7e977c601fc7d80b11b',
+    'shortcode_handler.php' => 'ca69b5c2084f3183d1e6e0abf7f63e7e',
+    'sitelinks_class.php' => 'bc4735caccd43eef146f0866fb175386',
     'smtp.php' => 'e3802cca9a715e79e93569750c0459fc',
-    'theme_handler.php' => '3931e27a09b1b042b4f95a6d0b3569f1',
-    'traffic_class.php' => '415803e57c5a0f81c23b5dca31fdd5df',
-    'traffic_class_display.php' => 'a774e7a48b5791757340f576e329c703',
-    'upload_handler.php' => '72eb4cf2723cc258fd1052b375b17972',
-    'user_extended_class.php' => '6a4d74cc4981a95013296516a7e04a34',
-    'user_func.php' => '93f85f3785368df3a9e5b088df0225ed',
-    'user_select_class.php' => 'bc5938c78ff21af167891756163d7d2b',
-    'userclass_class.php' => '8bc13d5d8c09552481da98cd6c14f8df',
-    'usersession_class.php' => 'cbeb6a70263a6dd673feeca58bae4fc2',
-    'xml_class.php' => 'bd438a452df6feca0a081e8e7cb92b45',
+    'theme_handler.php' => '008360ee83ad9b0b9a39c6285d09045e',
+    'traffic_class.php' => 'eef68f1158a5059ee6e0c87367ac9f97',
+    'traffic_class_display.php' => 'c31381644d311d086744dbec0a69ba29',
+    'upload_handler.php' => 'f64d44e059aeaf76e0876175b9f57c7d',
+    'user_extended_class.php' => 'fc0b890fa298a4595b65c7f31339c5b5',
+    'user_func.php' => '6885908b955e072bb78fef95e0a40f87',
+    'user_select_class.php' => '6e55690ca9c33aa3c21c7f1985e881f4',
+    'userclass_class.php' => '117e778284aad0e8f4b344ca0d4189dd',
+    'usersession_class.php' => '582e2228f8e563a930f11199f27b019d',
+    'xml_class.php' => '6b5d44c500020607985ec73449c8cdea',
   ),
   $coredir['images'] => 
   array (
@@ -824,18 +824,18 @@
       'blocked.png' => 'd2b20874ccf7079dbb71b6c94e117d21',
       'cache_16.png' => 'f9aefee07fadf8f40e3883bac2973470',
       'cache_32.png' => '76ddb6584a9096bab54567a082357f8d',
-      'cat_content_16.png' => 'af826022cad1ad5c5d2703d0a440aaf8',
-      'cat_content_32.png' => '80f9caf4f37acd5bdcdd4afb7ceeb6e9',
+      'cat_content_16.png' => 'fddbbb0727066d9779d99a688b2fdad8',
+      'cat_content_32.png' => '62024d282740cd3cc636a5fd068400f0',
       'cat_files_16.png' => '936037636275ca4c41a08fb962c79b86',
       'cat_files_32.png' => 'e6d063e74e730d05d688626c6d375b89',
-      'cat_plugins_16.png' => 'a6bac798e6dad7b2e40487e3dedf51ad',
-      'cat_plugins_32.png' => '74b17e491961633f65a2510e92ebde18',
-      'cat_settings_16.png' => 'd981addefa729f697bf0b0dbf70293ea',
-      'cat_settings_32.png' => '707034db3893c074c959a226ac6f6732',
-      'cat_tools_16.png' => 'd1405a8ef3d0320c3ce7c8e870bd50b0',
-      'cat_tools_32.png' => 'ffeca06ab80ddeb1453b397ac30816c1',
-      'cat_users_16.png' => '32441383ed5d50d6fa9188b98d957dde',
-      'cat_users_32.png' => 'a331baef28f6e923bad1a26ba5d17e4f',
+      'cat_plugins_16.png' => 'bd0d61ad1b099b68c9cf14db74154078',
+      'cat_plugins_32.png' => '945b0c5966d4c9048231601ac495e2ba',
+      'cat_settings_16.png' => 'e720d091f271890f0385c90a8f675022',
+      'cat_settings_32.png' => 'df3aabbcd411c72033aa934e2a820c6c',
+      'cat_tools_16.png' => '73310170d50a4cd64b96ab71cef93cba',
+      'cat_tools_32.png' => 'c87ef2797ed86b2f8522b6207840e941',
+      'cat_users_16.png' => '8aaf60a3c993002d87cb64a3b919caf7',
+      'cat_users_32.png' => 'fcb8449127c2e201430a17369a6a4938',
       'chatbox_16.png' => '6524280b8f44bde11dd5ca5581432c14',
       'chatbox_32.png' => '2e6ae5a5be12ec8d09b5083e959347b9',
       'comments_16.png' => '721b2c81aa4fa1c43fe4211fb35c2ce0',
@@ -850,8 +850,8 @@
       'database_32.png' => '83bb87a7cbaf1d57cdded1fc7078f2ec',
       'delete_16.png' => '3efc7450de9b20183c7196e3fd9a0b8b',
       'delete_32.png' => '5c479d67b5dc9f8fcc567d4201619b5a',
-      'docs_16.png' => '70c3594a0a096d55e2af638a4bd7105e',
-      'docs_32.png' => '2903138ad0be7ee641704dceca59089b',
+      'docs_16.png' => 'b2fe3cfcbe243aebcb7c933a6937596d',
+      'docs_32.png' => '64826c8abedaf0c7ba6fe0045e26cf91',
       'down.png' => '434814c2c747f4062c6306fbfbec0622',
       'downloads_16.png' => '98cbf2ae49e39048e7ca60cc56898477',
       'downloads_32.png' => '1c745a271507abccff12574123b14f0d',
@@ -875,16 +875,16 @@
       'installed.png' => '31969aa03c0d7315e6b7d6b6b82e9e8c',
       'language_16.png' => '15f89da876e53572a12521378b92dc0f',
       'language_32.png' => '361c4a919639d165831e65a3a2c4fef1',
-      'leave_16.png' => '536b996002b22632e757a82256e09417',
-      'leave_32.png' => '171a1609e849b1836046e84cbd590bad',
+      'leave_16.png' => 'd26a29216a0fc49934c694e1486860e1',
+      'leave_32.png' => '8115ad480338ad040c01fc998351ab63',
       'links_16.png' => 'd3da622046d044d11ee0f4418eafc426',
       'links_32.png' => '41df266db1ae2cb292804acb1993e383',
-      'logout_16.png' => '1344f00789bc5007f0219ee412bc59cc',
-      'logout_32.png' => 'a97a480f681f58ef845d441fb3cb5eba',
+      'logout_16.png' => 'b26b2490a527f78ea910b8701ee4c624',
+      'logout_32.png' => 'd5e81d86ce8157707b710d8bbed985c3',
       'mail_16.png' => '0ef7b53ee7a39baaba506f330f7ae161',
       'mail_32.png' => 'eb62361ca3d16865045a224fd8c74cf3',
-      'main_16.png' => '7df71fa173411541ec291f858ac33c40',
-      'main_32.png' => '1573eaa39de50801aa3e612ad99cd44c',
+      'main_16.png' => '9c093453ab35df77c79ea73018668b8f',
+      'main_32.png' => 'a15bf563618cea88705f845eddda8644',
       'maintain_16.png' => '8914863c97d297e7952034ee35b9580d',
       'maintain_32.png' => '18c74535a7ecea3f53e05ff4ceb47c49',
       'menus_16.png' => '45889621dc7577c1b5ec6627d1260ecd',
@@ -1051,6 +1051,7 @@
         'fontsize.png' => '89110496b363b669e3e8dffb630b9279',
         'image.png' => '1db77a12868512a36f836b986e6bb648',
         'italic.png' => 'a3e561a3c5d01819a3137562fd982958',
+        'justify.png' => 'f2a90f41fd514c0b8ca31fef72983626',
         'left.png' => 'bc27363615e096a000103c21984cd79f',
         'link.png' => '3adc8c31d1470a6cce76416fe0b6f3d7',
         'list.png' => '6bb4e650cad9857c47bb1433fd771052',
@@ -1254,7 +1255,7 @@
     'logo_template_large.png' => 'cce83a8f84255d2bab00522b73a4e6d4',
     'pcmag.png' => 'abe521ccc3a89a43ff641ab3daf1f37d',
     'splash.jpg' => '7f749391cb6d31dcf9c9145f3d30df4d',
-    'thumb.php' => 'cdbdab9476fc7fe1813886d6349193d1',
+    'thumb.php' => '7ea9b612f755c6f9b20a745a13e309fd',
   ),
   $coredir['languages'] => 
   array (
@@ -1264,121 +1265,121 @@
       array (
         'help' => 
         array (
-          'administrator.php' => '98c5eab53ddde73ef895de5ec1225501',
-          'banlist.php' => 'd395039d6268615022cb032a3fabdbf3',
-          'cache.php' => 'dfda970a7f00f75dcfac75edbebda857',
-          'cpage.php' => 'a33ab7780816f5059a71574eb3d59856',
-          'db.php' => '02b3b39fcc07d5cd058e7c4cefdf0931',
-          'download.php' => '1262b15f5f6c47b7055c852c21d8452c',
-          'emoticon.php' => '5a0ed3321c70022fc1c43c21ca12d34a',
-          'fileinspector.php' => '6102af380073d4b610e089155d95d519',
-          'filemanager.php' => 'e721a9fd765b2a259a28f3acc17149b7',
-          'frontpage.php' => '7bdf568bdb2b7ba53d2e4d73b1a28356',
-          'image.php' => '604323362374392c1a8a911674941d92',
+          'administrator.php' => 'fe1cf0376cdb4fc3c6d63f89d59af9ef',
+          'banlist.php' => '4e086c05ef897964a2625fbf58c3c8b4',
+          'cache.php' => 'e39c676c25b85a53965357a81b3875d0',
+          'cpage.php' => '4e28f25d204f1fdc72f4a9dd20dc31ce',
+          'db.php' => 'eef37b09ed2c21fdfeb96a4f2e588879',
+          'download.php' => '60b363fdc6b9b17148c7f2c744dd00a2',
+          'emoticon.php' => '61824db751de09f20fe9cb887a89ca83',
+          'fileinspector.php' => '86a5044a9a9f6815cb5a2e2f3b59990b',
+          'filemanager.php' => 'aaff4f5a22db796d3dfff72a741461c1',
+          'frontpage.php' => 'f06872f30a12107574393229c88534b3',
+          'image.php' => 'a6bdffefeb68b6e8f8bc73db9621f988',
           'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-          'language.php' => 'be9783c4d6f127a27e4716c4304946a6',
-          'links.php' => '5e181d5d7b853d739dc2b9309ed766c9',
-          'mailout.php' => 'a9652b014eee0cd7d0f5a6cb3b05aaad',
-          'menus.php' => 'd6d17565e908772dc34c08157c7049a5',
-          'meta.php' => '863a7e5318264938ce2a6ca4894ebade',
-          'news_category.php' => 'ac8c992c97cf9b32502f8272d15b671a',
-          'newspost.php' => 'be0411d3e9dea19188ba4435f01de64d',
-          'notify.php' => 'fa7c8426f0e8ddac0326f08c6d94a459',
-          'phpinfo.php' => 'e1a9d646732e5b0dc9fbd717d7cba8d9',
-          'prefs.php' => 'd0fb8e0d045c578550abd13a9ae3e86b',
-          'search.php' => '8a16e623ba237320affdd85cc5216912',
-          'theme.php' => 'e856763ee0e4ebb31461b41e5d491b8a',
-          'ugflag.php' => 'c703b8f7ab8aadb5ae9608a057d58529',
-          'updateadmin.php' => 'a254e9645ee0d0f98fe4a76107d926d2',
-          'upload.php' => '2a6638132956579f46e2b9d09998d7df',
-          'userclass2.php' => '36d79aaed57fa4628b0bcb7da0169df5',
-          'users.php' => 'a3f0f5dcd661a47d3647e0347409d3f1',
-          'users_extended.php' => 'cc4af2ab27b441c57fcab257feb0846d',
-          'wmessage.php' => '2167ef4b336636239a92031971d20793',
-        ),
-        'lan_admin.php' => 'c07a7d7aac5c5479a6d9c0481a9bc252',
-        'lan_admin_log.php' => 'b5f56d635f797ccc5b783454b56a58d9',
-        'lan_administrator.php' => '6cc14950bf875de843124ebb276d93d6',
-        'lan_banlist.php' => 'd8323350146a5b3e6a1461ddca94ae86',
-        'lan_banner.php' => 'cdc4a93a7f4a9a459c422f9980cf04a0',
-        'lan_cache.php' => 'd605496b868f0c022d8c6cdcc08a3ddd',
-        'lan_check_user.php' => '2669cb62d94b5a127bb24a3996ef2306',
-        'lan_cpage.php' => 'd969d7e16246f680f89ce4a0127428da',
-        'lan_credits.php' => '8b5aeb17a260f79a36e11d9d51a1f6c3',
-        'lan_db.php' => 'f37a02a174c8ca30413b19c10c8e2367',
-        'lan_db_verify.php' => 'ee93fd6a96edac2ef722840ef3ccf113',
+          'language.php' => '8bfe45bbeb9f59099f0cebd2a26f1cfe',
+          'links.php' => '2b11d953aafb8c4adc6c78023b8820f9',
+          'mailout.php' => 'c55eeaa62f7083e7b7b75fbf4b48c0d8',
+          'menus.php' => '1fd6d4a9d8b70b092ca497523a708b06',
+          'meta.php' => 'cbb2a5f2a3815400e45547987aaac4c4',
+          'news_category.php' => '0e596a7a810e516dd05a0177df130ffa',
+          'newspost.php' => '151107b136a0a3bd79c7907eeb28097e',
+          'notify.php' => 'b0e97f267cbf802b41d75382fcaf7430',
+          'phpinfo.php' => '250748ec3cef4c47a9663efff4af7343',
+          'prefs.php' => '25ced4c4c9738cfb31fc7c67de615f9b',
+          'search.php' => '875bbab0e22f4b0a34de14976a7e1b19',
+          'theme.php' => 'dd093d1b59c9e9492288b3522e780fda',
+          'ugflag.php' => '2fb3e743d58e90905d0bc7634d79b044',
+          'updateadmin.php' => 'b39203bf649359c663a5d56c04355547',
+          'upload.php' => 'b7fe8e94dd516cbfa8a5ae218116901a',
+          'userclass2.php' => '3a4d7f5b1ecdea7b8f08a96e81b55e72',
+          'users.php' => '18bc53f6792c3fbdc9e3ab7a414a9066',
+          'users_extended.php' => 'af8d62ff77304e40c10ac365ecb8a8a9',
+          'wmessage.php' => '06be89e920e35429e90adc5f54445053',
+        ),
+        'lan_admin.php' => '667d58f988183a8d8a148d69e12511d5',
+        'lan_admin_log.php' => 'da9d4f6af4ab0dafce14408b88e5a7ae',
+        'lan_administrator.php' => '3eaf0d0b14adca57a4606b73c7a7be24',
+        'lan_banlist.php' => '260b7e19f84798e1ca6371a71db1d294',
+        'lan_banner.php' => 'f64903cbc17497df42f471f327c382d8',
+        'lan_cache.php' => 'e4e9c1785e92595921252e2cf6a099e7',
+        'lan_check_user.php' => 'b09d1a34a5623f2533bf060fe85359ed',
+        'lan_cpage.php' => 'cf782edd1b07b9429623853ffbd4356c',
+        'lan_credits.php' => '7b004b945a1a480cd8b72ac0df2a474f',
+        'lan_db.php' => '2dd4d09c54c7e466732ff15b59b6c1cf',
+        'lan_db_verify.php' => 'a7a5f80f124cb104a6e60166f2589877',
         'lan_docs.php' => '9df02b4a6fafef4e9be2962bfeaed509',
-        'lan_download.php' => 'fc6be1c345af4ca4cce68ac49275fff0',
-        'lan_e107_update.php' => 'be31227dd5dfa476468d7e376dcd398c',
-        'lan_emoticon.php' => '4647bc41be423c05c378eedb1cf65698',
-        'lan_fileinspector.php' => 'd0b71e15de6c0df3c03ac8d1ea8981b4',
-        'lan_filemanager.php' => '29c13bbc5a507d404a03fa980fcd4bd4',
-        'lan_fla.php' => 'ad37cb25dea9cc0f436fbcf4e60b48c9',
-        'lan_footer.php' => '2dc64445c094a0693c42c3e9e664a80d',
-        'lan_frontpage.php' => '1c806e56a726f4d766be7c6d1a45a73f',
-        'lan_header.php' => '87c52bb5592691082f866f20ff101265',
-        'lan_image.php' => '51bbfdbbb132d25e14f509323dfc0170',
-        'lan_lancheck.php' => '9e37b718906badbf00a2b6fa8c877d5b',
-        'lan_language.php' => '19a5aa19683d16721fdbf9ea2f649ed5',
-        'lan_links.php' => '5448c10657f3b5a7a78a1b5652c87d7b',
-        'lan_mailout.php' => '3eda47c34ae8115f39caf3b44dae373f',
-        'lan_menus.php' => 'c6e4c334e74d70a5e661201087cb4e4b',
-        'lan_message.php' => '3cfda7721ec6fe238b54155c32d9d3d4',
-        'lan_meta.php' => '880b2561f5e82703ce16342a249d55e1',
-        'lan_modcomment.php' => '0864e1e6f078d096cc618a9bd1c82146',
-        'lan_newspost.php' => '2251620b132b0a2c48ed47094935d2c4',
-        'lan_notify.php' => 'a11bda3e2b1291ffb1f6aa96ebfc51dc',
-        'lan_plugin.php' => '6d6d165b635a4a7ad065d70b84e479e7',
+        'lan_download.php' => '53b2f1f75ea8797518c8e54ccf3acbbd',
+        'lan_e107_update.php' => '06e75a49b55733d7e5ffa6a968113af3',
+        'lan_emoticon.php' => 'c3a9e4cd7c0cab4f2cdbb4f24620b538',
+        'lan_fileinspector.php' => 'aa6ec8442d1205564ecfca27becc63fa',
+        'lan_filemanager.php' => 'a32d1274437c68f7038ba006af0862bb',
+        'lan_fla.php' => '841218087aecbf68c9629ff0cefa490a',
+        'lan_footer.php' => '5a8da94b888ea3c452166664c182c461',
+        'lan_frontpage.php' => 'e3a2e085730ab8e74d4dc62446bf54ff',
+        'lan_header.php' => 'fe9b76d39a11a579566670879b12bf63',
+        'lan_image.php' => 'a1928159cec5539caf1d32c1b8fbac23',
+        'lan_lancheck.php' => '9eea32afd605d6d03b28e064da067b61',
+        'lan_language.php' => '3c9d4f20079c9720ae7a19dca05f69de',
+        'lan_links.php' => 'c8f88fbfbbd6e3e9d0d18d7955b7ffac',
+        'lan_mailout.php' => '28e2d186c18e910852d4485900d4d51d',
+        'lan_menus.php' => '907505caa943ce9469b882e82fef72f2',
+        'lan_message.php' => '9b5dc4ec9230bc114644188187272371',
+        'lan_meta.php' => 'fb0068f9717c59b8973508d405121344',
+        'lan_modcomment.php' => 'd96f55439d8cd9779766d3c4393dc6c5',
+        'lan_newspost.php' => 'edffe6d60264679c26cbef87a86baff4',
+        'lan_notify.php' => '6f7a252b6ac7e78a2325f5cddca153e0',
+        'lan_plugin.php' => 'f3dffb02c7f8ae898b1b6e423e0d95ee',
         'lan_prefs.php' => '3c6c33f6a06ea4fbed06e77cb0d836fb',
-        'lan_search.php' => 'ba45f93e2a560037a85aa58f5ed0b418',
-        'lan_theme.php' => '62ad19c5bde555bd2d32b4b9bb4e85c2',
-        'lan_ugflag.php' => '32ec732fb0f633abd812541a6fe90a39',
-        'lan_updateadmin.php' => 'cc24526ff2ca3bf5554f537fecd744fd',
-        'lan_upload.php' => '54db35fdc95f7711954b1eed64e91d84',
-        'lan_userclass.php' => 'a4df7786c6a92268aa1d75d6ba42b097',
-        'lan_userclass2.php' => 'ffdc005df8ac23c93dd23db57c8bece2',
-        'lan_userinfo.php' => 'fd468ed293ccd66fee96831a60674549',
-        'lan_users.php' => '5fc1b140d3317bc6cc79aea03b4fcad3',
-        'lan_users_extended.php' => '811c73b1a8c07618217ee95102d18d42',
-        'lan_wmessage.php' => '648cb6fcc13c693d30c69f629c3b7ab2',
-      ),
-      'English.php' => 'dfc6679f315fdf088c3ccf4c8e0cf2be',
-      'lan_banner.php' => '5baf9e1940e95196089ce11db9cc392a',
-      'lan_comment.php' => '10ac49969bfcdbfe45dc78931903c803',
-      'lan_contact.php' => 'd03d5d85c6e5364f5289c682e93b9e41',
-      'lan_date.php' => 'f20750ce4c583545033a7ebd492d6c89',
-      'lan_download.php' => '7c3504eb2dbc22e961fde564be2ede29',
-      'lan_email.php' => 'db151c7f0653e4896499d0e41ca2c5e8',
-      'lan_error.php' => '0b43cb0bb8edbb35754f3ca5b5b8ad94',
-      'lan_fpw.php' => 'f13fadfc5ee08c04e35abe55a0677f0e',
-      'lan_installer.php' => '60b4f025eedfeea0389fba574b1de28b',
-      'lan_login.php' => '4af72ebaa422a803f3a22197a30bb2af',
-      'lan_mail_handler.php' => '55a1a50cb274dee86401b542d1bfd324',
-      'lan_membersonly.php' => '8b4c4ac49d3c9354421423ea2555031b',
-      'lan_news.php' => '1aeeb2f3d3d4b0061bd9eee6369a0715',
-      'lan_notify.php' => 'ade05fe3b4a15410c889c3f1e9844783',
-      'lan_np.php' => 'f239fa15a10f3f2bbc1286bfdf06cb85',
-      'lan_online.php' => '155932534f418d429a82e0b8c1d6029c',
-      'lan_page.php' => '66225dd3b5439723545672622a379dea',
-      'lan_parser_functions.php' => 'ccf88978c055f73c46275aaefb4cd6c8',
-      'lan_prefs.php' => '0279e9e74dce3201b90908dbd9e07918',
-      'lan_print.php' => 'd3f75c23f68527109935784a3fc47afa',
-      'lan_rate.php' => '1c37b8653cb9e3769a6b19fb05bc8136',
-      'lan_ren_help.php' => 'a254bb867126efa19ef9df25d20c7f76',
-      'lan_search.php' => '7057bc9b9dc18f567cf7e81325e3eed4',
-      'lan_signup.php' => '1bdf5471ff11c8278bcc07081b1e0037',
-      'lan_sitedown.php' => 'bc9ccc71c1b9a2bb5e4e44562a618c9c',
-      'lan_sitelinks.php' => '2cd623fd78c878b774e40253a1135319',
-      'lan_submitnews.php' => 'a228541b5df3cb66b6da57f62d3ba008',
-      'lan_top.php' => 'fdc63a421120e4734d37b1ce56a13246',
-      'lan_upload.php' => 'f40c8b2a519d48b31dfbb1774afae2ca',
-      'lan_upload_handler.php' => '8707aeb4596f56a9703b3c7f664c4797',
-      'lan_user.php' => '322865e29146fd8a1af50dd710c84d62',
-      'lan_user_extended.php' => '2580910914f72c1ecfbd72312fb4f56e',
-      'lan_user_select.php' => 'f9a5bb1c9fd4b0c9dbf7eb56ca472eff',
-      'lan_userclass.php' => '08fe881fe48c8e2e706af18e828eab01',
-      'lan_userposts.php' => 'cc9c254df4f00a0ab4d9b34fd0ac8384',
-      'lan_usersettings.php' => '9bd618d7731177012c39734df3334940',
+        'lan_search.php' => 'aefebce7e8e000cf23cdfa7ef97e9a4c',
+        'lan_theme.php' => '23db85c43ac49cde3fc728e5277d808d',
+        'lan_ugflag.php' => 'a7ee88dde31b32f021ff98419bee0fc2',
+        'lan_updateadmin.php' => '64f87bc7886028efd69cffed750510db',
+        'lan_upload.php' => 'b5d2d8c5eb9ca5367b2bd0a9021fb5d0',
+        'lan_userclass.php' => '6c1291c06699d573c5a3d8bb9e84ac4d',
+        'lan_userclass2.php' => 'bea7b61cf91cb9cc3f35da1e5b2c75a9',
+        'lan_userinfo.php' => 'eca9060238e2fabd6bf427f61ed48c6c',
+        'lan_users.php' => '5e59f35f0c2c3361d56fd9d692d7a5aa',
+        'lan_users_extended.php' => 'e4595bdf2f139be5c4e50bd87714d6e9',
+        'lan_wmessage.php' => '2977457ef1a96253bd352b2618fc6886',
+      ),
+      'English.php' => '000e2b68e79b11c182fa2728f45f4078',
+      'lan_banner.php' => '1e1df1d874720d81a306dded0f4bb533',
+      'lan_comment.php' => '683a6bf1de72f9e40c5c94f08bb8d915',
+      'lan_contact.php' => 'e6b05827065cfc1f4f88f8d474b2f4e4',
+      'lan_date.php' => 'cb650a1f0bc9be44631de0211aceaf70',
+      'lan_download.php' => '2ab49af9ddd9c08ae72d417ae38b1b57',
+      'lan_email.php' => 'e73a709f16284cd9b2e94230ea19f30e',
+      'lan_error.php' => 'f7b189e16fe30da69bfbdbf55c5c65c9',
+      'lan_fpw.php' => '0325398c51a1f1f62672f3debb214c36',
+      'lan_installer.php' => '600b229f8295ab22d95494d1658cdd49',
+      'lan_login.php' => '4da79429580b285e2adbc5a5a5bc3ee0',
+      'lan_mail_handler.php' => 'c66941db3d7dfc1dafd7ccfc63e8fc87',
+      'lan_membersonly.php' => '426b6ed91b539457aa862daa8c5c0f4e',
+      'lan_news.php' => 'ab5a0af1071796d8e59aa7443183d31d',
+      'lan_notify.php' => '31d041c6ab85cd43129b0d89a44291af',
+      'lan_np.php' => '4cd32385b62a034f190957aab5b75809',
+      'lan_online.php' => 'b6d815ef9e09bbea55b4c62be6dbb180',
+      'lan_page.php' => '44578401a528e5aafa265f1909d05127',
+      'lan_parser_functions.php' => '408d146f0395a33d4e462b337c9bd0dc',
+      'lan_prefs.php' => 'd6a8a126bee4ba4f50ec3fd020b53288',
+      'lan_print.php' => '4906f43f3a9955ddd1abd0868f7b7854',
+      'lan_rate.php' => 'd577ab20dfb0808349e88bd700c9f1be',
+      'lan_ren_help.php' => '451b7b3280cd773378c0d970e6f0d18d',
+      'lan_search.php' => '40965d93b14de91581baab8aabbff435',
+      'lan_signup.php' => '9803007ffb955b3932947563ee230c3d',
+      'lan_sitedown.php' => 'e6d66b456800b64f0ea5b0b2b593dd2f',
+      'lan_sitelinks.php' => '4121c0f45c6f010c3bb8a395ad7333a9',
+      'lan_submitnews.php' => 'e7c789529e202c28b56aa3a06ad73fa5',
+      'lan_top.php' => '3ab232b59c17f1b6d0451b528ec8f368',
+      'lan_upload.php' => '7591d771f3c2ac11d47089f09ff1f1c4',
+      'lan_upload_handler.php' => '8fa46f021a4e88a23273609b0755f1d9',
+      'lan_user.php' => 'e3f57415291d1bb80137dc2fe3e21393',
+      'lan_user_extended.php' => 'bb63b4ee830081f93c5c1be9895dbc06',
+      'lan_user_select.php' => 'cd5e96d51d480caf4db510d5fa524233',
+      'lan_userclass.php' => '0f52a39b5ca88ee357edaf2d111f568f',
+      'lan_userposts.php' => 'c1b849be22e0e930e52131c16f20bc83',
+      'lan_usersettings.php' => 'b920d4c22f69563c281735b85bcfcf62',
     ),
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
   ),
@@ -1386,7 +1387,7 @@
   array (
     'admin_menu' => 
     array (
-      'admin_menu.php' => '75cf1f65b92398af33b5ba646605620d',
+      'admin_menu.php' => 'be5dc991f146b3079f048d024503dcd0',
     ),
     'alt_auth' => 
     array (
@@ -1404,41 +1405,41 @@
         ),
       ),
       'alt_auth_adminmenu.php' => '3dddfee80a662a804a06d833ad9d2670',
-      'alt_auth_conf.php' => '5f7c726f433380e1176750973dad9263',
-      'alt_auth_login_class.php' => '26567337e2a843675fc18df3e91fd1a2',
+      'alt_auth_conf.php' => 'f0bfd0afc82ff459fb0dfca96697c64d',
+      'alt_auth_login_class.php' => '83cbf3d789a254fd761aa02073de0e74',
       'alt_auth_readme.txt' => '75b056df0169fa9a03bb31633d7fcbdb',
-      'alt_login_class.php' => '87e6e5dcd62619232d2c97378f5f8054',
-      'ldap_auth.php' => '9fd09bac8f10078d7ccc564fc63ea8fb',
-      'ldap_conf.php' => 'bd3603b781855af9b3e6a05fb8bbffee',
-      'otherdb_auth.php' => '2a2b982f0a83f4c61eef731de6e91dc7',
-      'otherdb_conf.php' => 'eeb2f8f50cef75a4c6f417fb87c8f4db',
-      'plugin.php' => '5cb486b214d8d709224d3d0351b86bd0',
+      'alt_login_class.php' => '1e0ceb9ed0a525f4e01fbe628f4fba37',
+      'ldap_auth.php' => '5f008145891dcd7e42f1231f6381a73f',
+      'ldap_conf.php' => 'f5d3c58e8e292ad1d6b515886e46330a',
+      'otherdb_auth.php' => 'b5f874d3cf8faa136b5b5216fb981647',
+      'otherdb_conf.php' => 'dec34880c2f4fdeb20ab578ccbaa7bae',
+      'plugin.php' => '0881fea148038bb4fa6aa6e65984a073',
     ),
     'alt_news' => 
     array (
-      'alt_news.php' => 'b05a110643e5ed3d247644b23838a123',
+      'alt_news.php' => 'f30cbfe9d7b518b556f4db0542567833',
     ),
     'banner_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '3cfb6eae241e5e4a0df54412d3919041',
+        'English.php' => 'f0ffc457c104e5db4b9e0e9bd1005a52',
       ),
-      'banner_menu.php' => '3cd7a9dfc877a06dc2c4c96d5e2bd2ad',
-      'config.php' => '22ab17dbfbea5ec6ff89013c83c02144',
+      'banner_menu.php' => '6f6ba1ce4169208839b32703c4e105fd',
+      'config.php' => '2af61dd72ef3fb17b165eed6c604bc65',
     ),
     'blogcalendar_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => 'bc4d844c9b0b8bb553913eb462542620',
+        'English.php' => '0961198dae1f414bacbb40feb6b751af',
       ),
-      'archive.php' => '818cbf4d8a2f3a5ee129fe173abdc457',
-      'blogcalendar_menu.php' => 'dbc22280f5f152ff10526300670318ef',
-      'calendar.php' => 'bb83275e6138ac8906ad59f8e41994bc',
-      'config.php' => 'c80bf0b94080e80c8d965979b5fcb4f6',
-      'functions.php' => 'cb306a8d9df94d8224e2330dc720f4ec',
-      'styles.php' => '61d6e222a1897d9c513c3e18a50e162d',
+      'archive.php' => '1b2f8aa510e3e589fc36891a9589f5e8',
+      'blogcalendar_menu.php' => '53f9500d41a742c9196814e83462ccc7',
+      'calendar.php' => 'af97064cfe6841da536b5233baa616ef',
+      'config.php' => '54296584044c95e21f9f6d95c7879b39',
+      'functions.php' => '0441913d9f0759335ece338b918ee094',
+      'styles.php' => '62ecc355feafc5310ad97a7df58c264b',
     ),
     'calendar_menu' => 
     array (
@@ -1477,7 +1478,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => '9e91a9954a17ee273d15f3626c2f4611',
+        'English.php' => '1822cda3cfb2ab03223cd9c5cb7a3d04',
         'English_search.php' => 'fc1f68851e4c41b94e1bf1fcf9c25e10',
       ),
       'log' => 
@@ -1486,25 +1487,25 @@
       ),
       'search' => 
       array (
-        'search_parser.php' => 'b8c8b7082d8e65c8ed66f0f7f983ff18',
+        'search_parser.php' => 'b3df07f489ba4425967baec9696dd4e6',
       ),
-      'admin_config.php' => '706d36fa117acfa1170285875cf208de',
-      'calendar.php' => '8d017d76ecc9d6753a30dd36f6a1ecec',
+      'admin_config.php' => 'e1b294952369db59f5ff277c320258bb',
+      'calendar.php' => '163440a1b1382c160343120c1b66a443',
       'calendar_menu.php' => '898974d7e3c17bbb6f410fd7a9f81c36',
-      'calendar_shortcodes.php' => '1dfe4e14627976961fde7b2839c959d5',
+      'calendar_shortcodes.php' => 'e550ad169523b4092b1564931cf3c1dc',
       'calendar_sql.php' => '39899457df794d8b56c58d3b1c8db88e',
-      'calendar_template.php' => '71e4dba7fa93563842d10adb983de798',
+      'calendar_template.php' => 'd2ee2bc496017ec083e191ba05846521',
       'e_list.php' => '645f43cf7f01952906dbb83b8cb13cc0',
-      'e_notify.php' => '142cea7487ea058e68b69123f6f6c8a3',
+      'e_notify.php' => 'c2ee50281865bce1a764ee34eb2475d1',
       'e_rss.php' => '077b415bf70aaae7b8de3d55a5912632',
       'e_search.php' => '2c9d89dbe14cf0240c681dc99aec0df5',
-      'ecal_class.php' => 'c25935803b5373764f999a3f9672f342',
-      'event.php' => 'd52f8d620b28534d2333339e4875f178',
+      'ecal_class.php' => '1b5c7f75be14a51894250ff35c459682',
+      'event.php' => '9e7ac615ce4b86b39364f5a1dbab8357',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'next_event_menu.php' => '7660ff0632b9ef09b237227eedf5a4e1',
-      'plugin.php' => '88853f80c039b94fc3dbcb31a8a05d0e',
-      'subs_menu.php' => '7926c01cc667e824caacb5b4a79d4992',
-      'subscribe.php' => '2bdfe66e8ba33a5614f27e8b56a3f8a1',
+      'next_event_menu.php' => 'fc2d7d490814d906f5f636729cf5d2c2',
+      'plugin.php' => 'aa7d7043edbdc031bebf799bf26620c1',
+      'subs_menu.php' => 'ba5b881e8344dd4986a3b0df8169beab',
+      'subscribe.php' => 'b2d2811791d4967f6121ea44ecf3c4b7',
     ),
     'chatbox_menu' => 
     array (
@@ -1518,27 +1519,27 @@
       array (
         'English' => 
         array (
-          'English.php' => '67263bc883f310faccd32a94328cdeb5',
-          'English_config.php' => '31af57ee674b21e44059147d66c033f9',
-          'lan_chatbox_search.php' => '2fecec1185fac98372dfaed71d600fb8',
+          'English.php' => 'a46369c2cfa02d503e1308c7a591b6cd',
+          'English_config.php' => '8e52ef414df44ef15b788c021cfe4a72',
+          'lan_chatbox_search.php' => '40d9d45c93d791c8408324fcc6656f28',
         ),
       ),
       'search' => 
       array (
-        'search_advanced.php' => '0caff453252573c5fe168b6040de5b5c',
-        'search_parser.php' => '0b7de64b52b4569c66980161e3ec48b6',
+        'search_advanced.php' => '9a61182b7cfa55f03877f318f168063e',
+        'search_parser.php' => 'b13719aa6145bdefa5b7af2d11c8b885',
       ),
-      'admin_chatbox.php' => 'e57e123c71ea85a952304db2c60ec615',
-      'chat.php' => 'c938bca54ed2bad30c4b6bfa40642db6',
+      'admin_chatbox.php' => 'a4b459c321bd8bfbf16262354cce4d7b',
+      'chat.php' => '3f5ea8df6f86f557778adb38170bb989',
       'chat_template.php' => '14c2ebf62352cf10f2b0b83e100ae856',
-      'chatbox_menu.php' => '1fe4e8f35c31008ae6644b4f57f9190a',
+      'chatbox_menu.php' => 'b7aa50bf2742c18799afd3e85dea4d56',
       'chatbox_sql.php' => 'aeb0d501ff23212e304f7f9a83d6926d',
       'e_list.php' => '11fde3fe8b58bec52bc6220053498509',
-      'e_notify.php' => '624752de4224a60d5d3dcf8687623d40',
+      'e_notify.php' => '0a2933c585217bdbe973704be60775a6',
       'e_rss.php' => 'e48224955d484055c9c662f430d529ae',
       'e_search.php' => 'd1438d8ba352df93c5fcdcf67805c229',
       'e_status.php' => 'ec7b5b0100e4be7210ea7e786096eeee',
-      'plugin.php' => 'cb4ffef2c60529dec3b354377db16f4d',
+      'plugin.php' => '58f992ae75af09acefdf3298049b850b',
     ),
     'clock_menu' => 
     array (
@@ -1546,24 +1547,24 @@
       array (
         'admin' => 
         array (
-          'English.php' => 'e6592858c7fd2ad31868945376fe28af',
+          'English.php' => 'ec18e5ffa0e001ed7f19a8fa449a1d0b',
         ),
-        'English.php' => 'e0257ba82ec6301edd2faf678b5f374d',
+        'English.php' => '35c0f1f40f6863bea2cdff628b49ec4a',
       ),
       'clock.js' => '98871f097e7b77f981df163421edb721',
-      'clock_menu.php' => 'ecedcfdd8919a613812e12288970bb1a',
-      'config.php' => 'c047a546a6463c12bdec033c346cb236',
+      'clock_menu.php' => '833e619455af1ab81898ee216f96bdae',
+      'config.php' => '1e7acf130ffd49fa280793d32657cf44',
     ),
     'comment_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '10c5f9fd588de9eaa9bf96b42b11b535',
+        'English.php' => 'a088715827c30866c1045a21e8fa11de',
       ),
-      'comment_menu.php' => 'ac370b8cf01654097c19664edfde486e',
-      'comment_menu_shortcodes.php' => 'c33e15bc1b11543bed23602781a61eda',
-      'comment_menu_template.php' => '7649e064fb2d6f1e0d07914ccf5e876e',
-      'config.php' => 'ae3e3885471a313c82443bf85b833bd4',
+      'comment_menu.php' => 'ac40504d725a9e6b3e8075740f8c95c7',
+      'comment_menu_shortcodes.php' => '3d8a22b642db2b5501eb5824f6361d5f',
+      'comment_menu_template.php' => 'c8e7ba335d2b9ee75bcc4ff2b0d26367',
+      'config.php' => 'c694ebf11f7c42e7022f5decbb11129d',
     ),
     'compliance_menu' => 
     array (
@@ -1574,7 +1575,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'b3bc465e99b1b8cb0563c6782e216f73',
+        'English.php' => '460b2da0f156df4535bdda4ef685f4b6',
       ),
       'compliance_menu.php' => 'a7b456e895ef89cd819835238b1482e6',
     ),
@@ -1582,11 +1583,11 @@
     array (
       'handlers' => 
       array (
-        'content_class.php' => '6f68002afc246b2bef981a0ff819b80c',
-        'content_convert_class.php' => '3145b418246ae1e7deff08501ba64e42',
-        'content_db_class.php' => '6ade245428c991c3ba4fcb732f1ff1ab',
+        'content_class.php' => '19c7c014733cddcf656088210bd879a8',
+        'content_convert_class.php' => '7835e9c8569bd60d332bc9da629f251c',
+        'content_db_class.php' => '36e1239b945ea5f23868f66560d88ae7',
         'content_defines.php' => '17705ead3b96dabdd746a32c8f29935f',
-        'content_form_class.php' => 'd9e689eb34ddd86fbe953742858bf2dd',
+        'content_form_class.php' => '01bb29c84ee4e88f242873c925bfc059',
         'content_preset.php' => 'f3061b1451c85ffa473bf5520d41b49a',
       ),
       'images' => 
@@ -1665,11 +1666,11 @@
       array (
         'English' => 
         array (
-          'lan_content.php' => 'af32c7fa54a4efb822e0136066cf7b7d',
-          'lan_content_admin.php' => 'e1f6dcd8d7fb01b50c4157ed5251038d',
-          'lan_content_frontpage.php' => '6d72081b6494b29b62b2b56cde90136f',
-          'lan_content_help.php' => '1b1f055e3f211ffb2b5c14ec958dd76c',
-          'lan_content_search.php' => '1f0b40a1b8fce5f4260ac3ca8a19515d',
+          'lan_content.php' => '6e29ddcf6e96475c59ab7d6890e2223b',
+          'lan_content_admin.php' => '0e6e10e20efb72ddc2085fdc0670ce48',
+          'lan_content_frontpage.php' => 'e91885f3a0e6c0da97722ef97fec5748',
+          'lan_content_help.php' => '64b3d9f41e8603a454e973963d40f0d7',
+          'lan_content_search.php' => '8ad7d3840efe6d0ede8200344b97704a',
         ),
       ),
       'menus' => 
@@ -1678,61 +1679,61 @@
       ),
       'search' => 
       array (
-        'search_advanced.php' => '02d65164d0b68d66abc4a20caf7a7abd',
+        'search_advanced.php' => 'e79247899f54d3377baca09dd08f6215',
         'search_comments.php' => '34b14edbe1d2e8fbac541dc03262b21d',
-        'search_parser.php' => '2094b0bd299b6f4dcd96c635816e4533',
+        'search_parser.php' => '7bcbaf5841e0e93f7b9a7e9a452de5bc',
       ),
       'templates' => 
       array (
         'default' => 
         array (
-          'content_archive_template.php' => '905e4e91b35f3a7cf6114fefc7a69d37',
-          'content_author_template.php' => '5ed351f14e4296b12084b25dddee02c9',
-          'content_cat_template.php' => 'e3cd4e80fe00f1720565c04087420ca0',
-          'content_content_template.php' => '4c889d90bdcc1279c2660fcd3224695e',
-          'content_content_template_bigtext.php' => '10afa5c9a34abb0d9f7ecd9d55a7d98b',
-          'content_content_template_blackonwhite.php' => '5fe0b7af877805a431fd369fafc7f851',
-          'content_content_template_whiteonblack.php' => '67b3550d6952d1d853c8010bf57d9384',
-          'content_np_template.php' => '54925a40cd7fd9d683727cef1e3592ce',
-          'content_recent_template.php' => '9781fe38e36a04b23c8653d8a32e0071',
-          'content_score_template.php' => 'caa26470e156086ec66ed8457c624542',
-          'content_search_template.php' => '2fc8e31021d6f55ac09672817cb5048e',
-          'content_searchresult_template.php' => '2da08eab3df2ea8095b03a34fb5987d2',
-          'content_top_template.php' => '2c3be5453bac04898dfb7695d9ecc5b0',
-        ),
-        'content_manager_template.php' => '2b88a3b6b4a17953640df596f24c1dc4',
-        'content_submit_type_template.php' => '2ba40ff55b077b301c5fa7dc30f0b0ce',
-        'content_type_template.php' => 'de7fb1f03caa3e67aeade15d8288d6b1',
+          'content_archive_template.php' => '136dca9d354d8ab44c3112ca5bdfa96d',
+          'content_author_template.php' => 'd6785fa4f6039d747d7a62476c9b7e95',
+          'content_cat_template.php' => '8de3a8507f2a8035929d220762b8831e',
+          'content_content_template.php' => '7c838ccaa54957abd16918992efcc410',
+          'content_content_template_bigtext.php' => '5f21e83a3a7f230bbbe4a16618bf68a4',
+          'content_content_template_blackonwhite.php' => 'd64d8eba3a852350d919d2570816a29d',
+          'content_content_template_whiteonblack.php' => '0480bc8fef0ff370b4bd44f66ee3d075',
+          'content_np_template.php' => '24b11880e13c419b22e8bc0c5fdc277c',
+          'content_recent_template.php' => '9fd05e1a2ef81af9c55b0c3ebf0180c3',
+          'content_score_template.php' => 'aa8cad61184c584c8ccb020a824b1bab',
+          'content_search_template.php' => 'dd2c78e6362d0a67bc6b2854183aabe6',
+          'content_searchresult_template.php' => '8b642d318d4a599f2a3438b44d3f4316',
+          'content_top_template.php' => 'fc8deb45181b3f02186096879d3a9f0b',
+        ),
+        'content_manager_template.php' => '95637aa667cff1205046aad46da66714',
+        'content_submit_type_template.php' => '58eb0863e060770ef4c59d28f51b8ccb',
+        'content_type_template.php' => '5018177cc8fde34aeba62a2b04887322',
       ),
-      'admin_content_config.php' => 'ae171a1f8593a2e203be944ddb4da5b5',
+      'admin_content_config.php' => '974dbd9eb0f960606718ef84624899b9',
       'content.js' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'content.php' => '3ae0933908dfb4707cb6b24277051c5f',
-      'content_manager.php' => '4b53853924c944bcdd7589007e05c98b',
+      'content.php' => '7c04b74b491528d0ee979b1d6c0f4696',
+      'content_manager.php' => '8b4566cf318e663436cea4893dedf995',
       'content_shortcodes.php' => '6fe643a18d7f1b8a877eed93f82bb165',
-      'content_sql.php' => '10382c00ac7f15537416dab4f2cd97b8',
-      'content_submit.php' => '5616f71f5526458068bb735b4a632f9a',
-      'content_update.php' => '6fa9b1be8b74b6272cbf32ea2bc79a98',
-      'content_update_check.php' => 'c26a5eeba721a94d8cbb4343624f5fa6',
+      'content_sql.php' => '51447fa07fd2deb63586a2aae081a842',
+      'content_submit.php' => '57fa063db6a52dcbc28d6afacd301eef',
+      'content_update.php' => '0de1b8f4e2e547422dbc97ff9d958b0d',
+      'content_update_check.php' => 'b26a684630318dd56aa2ddeae77786e3',
       'e_comment.php' => 'd1f4f87a428c69c499818721d0f48331',
       'e_emailprint.php' => 'aa8753897ec82ed8fda64d5ce2492eae',
       'e_frontpage.php' => 'fe4139040c268b13517b9a78fa35f190',
       'e_help.php' => '4320e5f811fd90d98d2339b11575d57c',
       'e_latest.php' => 'dad7101dbd2063723e94300723e67c2e',
       'e_list.php' => '179fdb2049690d93d67b50629c92e5e3',
-      'e_meta.php' => 'ccca6b1ff1a112d8b5b6150b682da042',
-      'e_notify.php' => '211f854dc01476e3d0094f69f96f24dc',
+      'e_meta.php' => 'd6cd1f915a8f3b7cb8e51d8a55494459',
+      'e_notify.php' => '56f5e191f1e39a30a0a3bc28f3e8d612',
       'e_rss.php' => '76954b881d598f26ecaebb4422f87696',
       'e_search.php' => '4018912931e0edd7377caaa4b8c1071b',
       'e_status.php' => 'cf12158206b16c94292788fb9771c478',
-      'plugin.php' => '56bdd9e6d08541f0a9c79d512888503e',
+      'plugin.php' => '6cb25aa05aafd3fac9e8f97eaa08108b',
     ),
     'counter_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '36a348b34b6d710e54f82dd2570e76aa',
+        'English.php' => 'ebc5eeec7713a826fc702d2a73f133b9',
       ),
-      'counter_menu.php' => '35adc3b5e2e0a48804144604425f68db',
+      'counter_menu.php' => 'e807abee3607abea50814ca9678545a5',
     ),
     'featurebox' => 
     array (
@@ -1743,17 +1744,17 @@
       ),
       'languages' => 
       array (
-        'English.php' => '38592bcb471eb1e3b4bb2d8cce51c13e',
+        'English.php' => 'd47dbe065743a481a495c341929d8997',
       ),
       'templates' => 
       array (
-        'centered.php' => 'fabbbb8672d8a60ffb0449ba6b676b78',
-        'default.php' => '4d0d6232cbfe6b0bd0873037edb4b94e',
+        'centered.php' => '6594f376fb097c2d375055ad0477504a',
+        'default.php' => '6fba602f32ebb0366840f45bac178b75',
       ),
-      'admin_config.php' => '8c00da8b4dee72f84005ad026354e070',
+      'admin_config.php' => '98c7e14afe71526f246128f66c01a21d',
       'e_rss.php' => 'e3b277cca6f5262dcee948434aacfc5e',
-      'featurebox.php' => '7f13cd908f9e06fdb1b8f97d0050914a',
-      'plugin.php' => '284a352d580af16a065c2ae1b2702fb2',
+      'featurebox.php' => 'd2bae775a6f99daa1237d86d7c6651e5',
+      'plugin.php' => '73ce45b596e721d672168519d6656780',
     ),
     'forum' => 
     array (
@@ -1874,62 +1875,64 @@
       array (
         'English' => 
         array (
-          'lan_forum.php' => '5da64878a009b6f4fa7d9d3e42d2a37d',
-          'lan_forum_admin.php' => '6b8e5344e25100ffc1fc1f58ca55d029',
-          'lan_forum_conf.php' => 'c0e6cda44e6c120d5d95e0b32580cb28',
-          'lan_forum_frontpage.php' => 'bba490727bb1655d60aebeace60441a4',
-          'lan_forum_post.php' => 'b42a4b490c326b07d7e8c9c155139d28',
-          'lan_forum_search.php' => 'e7c3c59af02b109e5055c6ef1777c33a',
-          'lan_forum_stats.php' => '266d99d3434649b20cd3c2569a1bd904',
-          'lan_forum_uploads.php' => '0b73585982e9f318384ac3a7f2519ef8',
-          'lan_forum_viewforum.php' => '6b54e0332819c3485694470f23fea25e',
-          'lan_forum_viewtopic.php' => 'dbdbe3f91e10313c29d0679a869c7d62',
-          'lan_newforumposts_menu.php' => '2235e823f70adba02422625f952025b1',
+          'lan_forum.php' => '49a0d82c1ae146419d52ad4d08786bb2',
+          'lan_forum_admin.php' => 'cfbfe03ae3eb1d955fb6d32ad6a93c9b',
+          'lan_forum_conf.php' => '0e5d0da729ab0ad41f90ce8dfc23fae1',
+          'lan_forum_frontpage.php' => '80f99c88f4e92429d8ca40c439fd68d3',
+          'lan_forum_notify.php' => 'd5ba57c5a1a59e72e726d0d04c8c5fce',
+          'lan_forum_post.php' => 'ce9072f1ec06a3e3e83004094c591c29',
+          'lan_forum_search.php' => 'af40bc5cfd37b6f1893f4c0b75049ccd',
+          'lan_forum_stats.php' => '1089e0981d20871b0a29f14467880050',
+          'lan_forum_uploads.php' => '7a88cab670af18c28ef412c5ffc3a053',
+          'lan_forum_viewforum.php' => '7c501bb272d56c82647389e2b0fb1421',
+          'lan_forum_viewtopic.php' => '7288cabf2063f0d8761526fc84cb4336',
+          'lan_newforumposts_menu.php' => 'a86369eef75fa326ddfbc3f613340c7d',
         ),
       ),
       'search' => 
       array (
-        'search_advanced.php' => '016e5d3f8e32b12206195dbbb21235a2',
-        'search_parser.php' => '16a073a273efbc5405689a79d1bd744e',
+        'search_advanced.php' => '0b437043e83e93d7aed0b278d2fa7ca2',
+        'search_parser.php' => '10a3660a5452018f7390280b52791d80',
       ),
       'templates' => 
       array (
-        'forum_icons_template.php' => '55838672874094d43cf53cbdece4a087',
-        'forum_post_template.php' => '1e0b7cbe6ebf71fc03b33e445dd83f02',
-        'forum_posted_template.php' => 'd0790156815c4f32a794becbe68da4cc',
-        'forum_preview_template.php' => '7e314d99fa6ba431aeb59c81c729a852',
-        'forum_template.php' => 'de9e6e03f3e29c51b64fd07c23b310d6',
-        'forum_viewforum_template.php' => '8e246edd63ef534cb2f57a85064f95ef',
-        'forum_viewtopic_template.php' => 'f4398c320ac0f1daf77cf512c98ff967',
+        'forum_icons_template.php' => '76fd8f9e80e1aafe30103769bf2aa790',
+        'forum_post_template.php' => 'c6fa34c208775682b1e5e798720af5fa',
+        'forum_posted_template.php' => '4001266ced2672e6b4c6a1b20b0c43c4',
+        'forum_preview_template.php' => '946914f959e8a7bfd2f59debe0efa686',
+        'forum_template.php' => 'c44904bb6f134d510c9c41b34c832f90',
+        'forum_viewforum_template.php' => '275b8e0b7d657c0eba59afdb2f7343b0',
+        'forum_viewtopic_template.php' => 'fee1235c37efb4ba3130b52e27895fd9',
       ),
       'e_emailprint.php' => '8a41fe10faf7c2293a65bd66e598dd82',
       'e_frontpage.php' => '47fc49f7f27140d518eb73932b6023c6',
       'e_latest.php' => 'ba485c38b9ab90c0f572a2397b49c9f5',
-      'e_linkgen.php' => '0ded8666191d738eb75674e928dd2981',
+      'e_linkgen.php' => 'ef62f12a9f61803c7f58ea7f3045d236',
       'e_list.php' => '8c318e2f3a838ca643e1434a199a11f7',
+      'e_notify.php' => '2dd2a34be7570aade6d1e7f18a3b8b88',
       'e_rss.php' => 'cf96fbd5d8ae9f83f6ca2b98ac069970',
       'e_search.php' => 'f0c6eabebb2359afd8bc4557bbc3dd02',
       'e_status.php' => 'e707e64a960612d443e16906faaf0e22',
-      'forum.php' => 'd5b95a8beda5d0a0dcd600011c820587',
-      'forum_admin.php' => '9b3e7dd3eb15b4faa7288d460b1a2141',
+      'forum.php' => 'd927a84a7fd8835e7eb4fc03a4f31272',
+      'forum_admin.php' => '479d473f1f0c5edf4305d4f2b0bffa9a',
       'forum_class.php' => 'bbd3791f40a8092244579fedfe51c536',
-      'forum_conf.php' => '3747a02ff672b24b1ab2df3ec03535d8',
-      'forum_mod.php' => 'faf0c5a5487a5453b54f4a6119912664',
-      'forum_post.php' => '988dd1f5449c61fccc2b8f37cb1c1300',
+      'forum_conf.php' => 'ce062ed4be8151a64d7beaec2b237dd9',
+      'forum_mod.php' => 'd32054b1725ca2c28e5995917093b37b',
+      'forum_post.php' => '10003e81be4d6b260529ed6d507eb1dc',
       'forum_post_shortcodes.php' => '58d0390a6fa95d713603a203025eb3f2',
       'forum_shortcodes.php' => 'dce37f018fa3be3a2bb67c740fe4725f',
       'forum_sql.php' => '3355b8219c200d8d669ce08e59053465',
-      'forum_stats.php' => 'b8564b5b8047396ad8e8fdcfa798d462',
+      'forum_stats.php' => '703dbb90653630a2edce005bee3923a3',
       'forum_test.php' => 'ed668e3268952cb268b3f4aca0d2e37a',
-      'forum_update.php' => 'b64e8b2c005a181a7d134ee1af3ade0f',
-      'forum_update_check.php' => 'a0394809be62cc8ad4eb134c6b56c64e',
-      'forum_uploads.php' => '32887550cc63fec358fd1f240a0d7348',
-      'forum_viewforum.php' => '60746d3480dd68c6db502d1b6dceaa99',
-      'forum_viewtopic.php' => '95ebd70d8cf7048e4b1cb4d1701a4b6a',
-      'index.php' => '626697cb221bf1c9dda6b4458dfb3bfa',
-      'newforumposts_menu.php' => 'fbcf1903458b227ffb81d1533141d8ec',
-      'newforumposts_menu_config.php' => 'cc32a64919f31f1cf0df1aab2e93c1a7',
-      'plugin.php' => 'c3f4d90208e691522ce7e5d68fddcd06',
+      'forum_update.php' => 'de3c213e1522e6b28a93a75d8e1f8f93',
+      'forum_update_check.php' => '7993cc7314f4927f61b4e2b21f073dff',
+      'forum_uploads.php' => '56b8c599d14702bee8fcff7b218e4d47',
+      'forum_viewforum.php' => '9125cf13da0cb36a6c3d9c761332ddf8',
+      'forum_viewtopic.php' => 'c3b48f0c45341a1e4e660e55a1b7db4c',
+      'index.php' => 'c7fcd091b1a82fd885b7d193595c7ad8',
+      'newforumposts_menu.php' => 'fd8930876dab1da6d96f889c3526e6b9',
+      'newforumposts_menu_config.php' => 'ffd1b077ee3529706ce587892e112bdb',
+      'plugin.php' => '4845eda9ce5780cf269f6ce346fb8fc2',
     ),
     'gsitemap' => 
     array (
@@ -1940,11 +1943,11 @@
       ),
       'languages' => 
       array (
-        'gsitemap_English.php' => 'c2b50474d37b986868286b1dcfaab6ad',
+        'gsitemap_English.php' => '3ef04f9ce48cf9bd6ea602525ee98465',
       ),
-      'admin_config.php' => 'c398f2b54168449b8a413ea3f5cde037',
+      'admin_config.php' => '8e979ca0655c04bdf9d90564330a9022',
       'gsitemap_sql.php' => '81a34608c8cdd19c51fece5a25109159',
-      'plugin.php' => '127a675a6900de930e4ecf1ec5a376b4',
+      'plugin.php' => '4f808c30e31f7be66d597ef1e23f3b3b',
     ),
     'integrity_check' => 
     array (
@@ -1956,18 +1959,18 @@
       ),
       'languages' => 
       array (
-        'English.php' => '536c73b18ce84d44740b259a66c8f425',
+        'English.php' => '187d5a4253f893cbc48597a47ac3597e',
       ),
       'admin_integrity_check.php' => '99eeeea29f99c039499dfcecb9ed722d',
-      'plugin.php' => 'b32f26e2fc819c93a60a0c53692888fa',
+      'plugin.php' => '4e3857435a3388dc70614080e5b687e9',
     ),
     'lastseen' => 
     array (
       'languages' => 
       array (
-        'English.php' => '1424d68ea20604aac6e7724588a2a7f9',
+        'English.php' => '29a7656443409d88c0289ed19fd01382',
       ),
-      'lastseen_menu.php' => '0107eb28fe31ccc1ffd67790315f5b6c',
+      'lastseen_menu.php' => '8763425c3d32c1a1ee58508a87581cf6',
     ),
     'links_page' => 
     array (
@@ -1984,7 +1987,8 @@
       ),
       'languages' => 
       array (
-        'English.php' => '2342fd45ea8ce5b5779d347191b00230',
+        'English.php' => 'f2b2b76938fc723b5316cf7fb6bc2b86',
+        'English_help.php' => 'b7cf104c7a9f0d950dc1b5e6b68905b7',
       ),
       'link_images' => 
       array (
@@ -1992,28 +1996,28 @@
       ),
       'search' => 
       array (
-        'search_advanced.php' => 'a1e384c4a85e03aa2b9231be9b02be53',
+        'search_advanced.php' => 'f316eff3e25a6e42dacfd7b4f603737e',
         'search_comments.php' => 'f887861124deb8c3b087359cb9f3210c',
-        'search_parser.php' => 'd8e6262f5c31512181d23aea2eb88cc4',
+        'search_parser.php' => '20039d017a7341b7902a80a44dd0df7f',
       ),
-      'admin_linkspage_config.php' => '6774c1e600c6bfd8da1d78ac6da81771',
+      'admin_linkspage_config.php' => 'edd9432952c2ca5fd4e225d518b7339f',
       'e_comment.php' => '13b0aa38e21d08a535276a7526cedde2',
-      'e_frontpage.php' => 'e1aeb87c94051f759f7c31cd45931b21',
-      'e_help.php' => 'fb1b8218954ee9a4fcf22738af7f385c',
+      'e_frontpage.php' => 'afdc379a04c4918247d26559dfc4d4e2',
+      'e_help.php' => '8358d0abfac6d1ed475bfca52a259b06',
       'e_latest.php' => '68bacd178e137861748385080b253ee4',
       'e_list.php' => 'fa78ae50d1600648929de3d2bfbf2a97',
-      'e_notify.php' => 'f5abec86b9d63ff5b61a3454a4f308a8',
+      'e_notify.php' => 'afad60b58cdcf06ef74fbd94503a1b95',
       'e_rss.php' => 'd213cc9cc0d5eeed3442b861e565961e',
       'e_search.php' => '7a7416dde4bc42481cf92431f4832b65',
       'e_status.php' => 'e1b28e610e6f89277440430a2f8747d8',
-      'link_class.php' => '3a31ae30067dde8c26b56b0268e78461',
-      'link_defines.php' => '9afb087dd7941f64fbedacda37fab3f9',
+      'link_class.php' => 'ca56a4af2cabb5092f8591da60f0a309',
+      'link_defines.php' => 'c74dab30a2b3f330a05e4ac95a6c068a',
       'link_menu.php' => '2bf6afd0218a170b8d27b6a48c6b1320',
       'link_shortcodes.php' => '0f5e9fd5e457177a51096a5952c3a15a',
-      'links.php' => '9ad1c71f17dcb7a240f9d761b2209371',
-      'links_page_sql.php' => '3632bf42fcc776e6064f0e53a0a6b2fe',
-      'links_template.php' => 'cfcb83d469276b8ffe555ece022c9a3f',
-      'plugin.php' => 'b0fea17c110d9a72259367ddcd57e402',
+      'links.php' => 'fa8e533d0b48f82edb3854dfcf3ddd8f',
+      'links_page_sql.php' => 'cf7dc235d5246d755b1f231223cce3cd',
+      'links_template.php' => '0db68fac6783d782ec188fc7ad5a486e',
+      'plugin.php' => 'ed58cc7b12ecdcf56c69c9ac3e17de11',
     ),
     'linkwords' => 
     array (
@@ -2024,12 +2028,12 @@
       ),
       'languages' => 
       array (
-        'English.php' => '728080e146e83cb64eff5e9117ecd4a4',
+        'English.php' => 'cdd4262dfe21daa49d2829f67c59a0de',
       ),
-      'admin_config.php' => 'a2fa31e08c4f5a034d1c2a53840f2c52',
-      'linkwords.php' => '28f395016a8200ee71758e4c3b20b492',
+      'admin_config.php' => 'fb96cbde42a8d6ae8e7d41f84f5cea1c',
+      'linkwords.php' => 'f17376241f88a9d978b9f9122bf21f15',
       'linkwords_sql.php' => '33f4d40e8da9aa758c512d4847f6d5d7',
-      'plugin.php' => '034eac275429e80cd89c148779064295',
+      'plugin.php' => 'cd0082ce754a27901e04314db82f604d',
     ),
     'list_new' => 
     array (
@@ -2054,7 +2058,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => '651c7f54bd159c7185c5b9ff34320f63',
+        'English.php' => '08886bea3fbd180f0dea0c830e19d442',
       ),
       'section' => 
       array (
@@ -2063,11 +2067,11 @@
         'list_members.php' => 'f2cec9a4125081502c309f794f72dc1b',
         'list_news.php' => '7faa1d6728ff1e692aa834ac4027c4e0',
       ),
-      'admin_list_config.php' => '39a46c2daf2e9c0b1ed1542729187fba',
-      'list.php' => 'ead10cac732c1ba7166f0d341b543c68',
-      'list_class.php' => 'fcb6d9ea7ee9afe4b6031d58fc934ddd',
-      'list_new_menu.php' => '4bde376179da946aa3c00df1771ad17b',
-      'list_recent_menu.php' => '67ffdab4915be1024d260d9dafa35a80',
+      'admin_list_config.php' => '02d59542009fc531bd2cd803f02eac32',
+      'list.php' => 'd944b381d79ba194ed8f3e816c07dfb7',
+      'list_class.php' => '3dec1cdf02add19090a80d379ef68a6b',
+      'list_new_menu.php' => 'a971c834704a390b275237f691b03a65',
+      'list_recent_menu.php' => '521f3ac6b51d9feb88b97a6b03fa48f3',
       'list_shortcodes.php' => '1c4972d09e83f1945c6652126bba6248',
       'list_template.php' => 'ca73750411b19f1b8df71c5111fe1789',
       'plugin.php' => 'b1e1a641faa99690f826efb8e29ead63',
@@ -2163,35 +2167,35 @@
       array (
         'admin' => 
         array (
-          'English.php' => '90a94f547a209544e93e8504fdaeb375',
+          'English.php' => '554794ee0ce8a50a53dda14b05db5ffe',
         ),
-        'English.php' => '446f070229e7bfc3996988f2a6da012b',
+        'English.php' => '3d94fa3cc0585a517e6b7a27fe7c838e',
       ),
       'logs' => 
       array (
         'null.txt' => 'd41d8cd98f00b204e9800998ecf8427e',
       ),
-      'admin_config.php' => '02b664d8fef5e4d5171342297230c8d1',
-      'consolidate.php' => '079ed9d7d0c07624874353ae9d3d46ea',
+      'admin_config.php' => 'e7167d07a71e6754378124ca0ed4621c',
+      'consolidate.php' => '4ad263421a3173059c6e3b37e2131890',
       'e_meta.php' => 'c7c1bff20fb308d2461bf3bf9ac89d45',
-      'log.php' => 'dd45c934539c05fed49dfe5260ce886b',
+      'log.php' => 'b9ef4aeb2e3d4e9e2de0bc9cdf4c6581',
       'log_sql.php' => '6593acd37950a8e486b0fc1490cf1750',
-      'log_update.php' => '4434f0dcd7d37eef8aab1785bd459ad1',
-      'log_update_check.php' => 'a6bfb2aef82e5ec9573e47c7ac3fdaa8',
-      'loginfo.php' => '9c447b38fed455e4f0cd34ed69cec99e',
-      'plugin.php' => '91dfebd8d4203844fab64de919c200c8',
-      'stats.php' => '6d747b1ed110636ed0027313089da276',
+      'log_update.php' => '96ffd24abbaadb7086b49d19feeb3763',
+      'log_update_check.php' => '98648cff5205b2b3791648d955e979fc',
+      'loginfo.php' => '5d0933ca88d9ffedd804ba5f17c130d1',
+      'plugin.php' => '8383bfb720a079fe053b657de38492a8',
+      'stats.php' => '5d002151b5264e5e428071476cd3c360',
     ),
     'login_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => 'd2f3038ae7a6a5e8b1ab85f459a9faf9',
+        'English.php' => '05744e195917786eca87aa6974754776',
       ),
-      'config.php' => 'ea9869a523a0292a24ce91fac78cae21',
-      'login_menu.php' => '24bc3d5d9c67a614ac5ca5429ce18587',
-      'login_menu_shortcodes.php' => '83a1e0f6dd029a27f7cb2c79f2de96a8',
-      'login_menu_template.php' => '337f633163e7126d1a7f7c2459426817',
+      'config.php' => '73b9b2256e5e2b6cd1086b659bf46991',
+      'login_menu.php' => 'e6fecb0ad4389d44d3b49f6a26f1321d',
+      'login_menu_shortcodes.php' => 'cb02d921c79e066f9cfd986e5100260a',
+      'login_menu_template.php' => 'a284e126919afb2e92b22cdb8c2770b2',
     ),
     'newforumposts_main' => 
     array (
@@ -2205,10 +2209,10 @@
       array (
         'English.php' => 'ac28ac7fc2d32603b1eedd76d56be335',
       ),
-      'admin_config.php' => '0e5420c75952e31e6faf495a5587a4f5',
+      'admin_config.php' => '443dff595b79b2037a58658302bf6bf1',
       'newforumposts.sc' => '29784d1f53f650fa7327e367878217d3',
-      'newforumposts_main.php' => '01f2ab11c8dadfd0653091a1e121a9d0',
-      'plugin.php' => 'ea6783007150117f00557894607d8c5d',
+      'newforumposts_main.php' => '3ca22c338c43190e630f8026a44dc1a1',
+      'plugin.php' => 'd3822b3a28c79a4209a4851882e1dbeb',
     ),
     'newsfeed' => 
     array (
@@ -2219,21 +2223,21 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'ee913331e533ec8670b6544976ef3bda',
-        'English_frontpage.php' => '085811065b3d597a1c7490b59e769c1f',
+        'English.php' => '0e12fa8763d9cc77dd1cce632a1e5a98',
+        'English_frontpage.php' => 'eeb85c2e6da97d940c080838436c6732',
       ),
       'templates' => 
       array (
-        'newsfeed_menu_template.php' => '948dc46a9eb665e64b8914c72eaaa80f',
-        'newsfeed_template.php' => '749de29d39a35b10336bee0587446465',
+        'newsfeed_menu_template.php' => '6614764424c4d822ac155dfc5cec492f',
+        'newsfeed_template.php' => '42bc8c4d66f1ccc75872e751c6d5d581',
       ),
-      'admin_config.php' => 'a4559dff29fb4f86f70bf5ac6981454e',
+      'admin_config.php' => 'eecd350cffde4af23cc1a7366b5e949c',
       'e_frontpage.php' => 'e382f0f562128593eb6f92ec404fa6e3',
-      'e_help.php' => '6b07bab0d52deb0150c0ce9d6ce59704',
-      'newsfeed.php' => 'd24848551d0118f03af1e4ed7e4c65ed',
-      'newsfeed_functions.php' => '8020ed3a14e872ed3ce80c4dc92547e1',
-      'newsfeed_menu.php' => 'ea2eaee7ce4d09722be4307c539da0b1',
-      'plugin.php' => '2e99cbb5d6d4459cc1775bc8c5949b75',
+      'e_help.php' => '3127973c339216ff9f080cc5edc51474',
+      'newsfeed.php' => '5a04876cd3461477a2f2c861b9e7fb68',
+      'newsfeed_functions.php' => 'd6a9fd24a98a50c69516921c001d2a53',
+      'newsfeed_menu.php' => 'f2ca9780e96d8a86da73e4ca35fa66eb',
+      'plugin.php' => '33f8f85e8481de7e4c0f4758cb48e3ac',
     ),
     'newsletter' => 
     array (
@@ -2244,11 +2248,11 @@
       ),
       'languages' => 
       array (
-        'English.php' => '03cde0b639484d82fdba6f053ae4d0e4',
+        'English.php' => '88e3e4424f19560794407bcee6fa3e5b',
       ),
-      'admin_config.php' => 'a1e9c64157013528e2dabf154513d24b',
-      'newsletter_menu.php' => 'd42546312900cfc9645023fab188cf26',
-      'plugin.php' => 'a8073dc96226157e3c4a8f545b90d796',
+      'admin_config.php' => '428d4dc89338733129a2fce35ea9bdf3',
+      'newsletter_menu.php' => 'f00e460efd1269ce59d751add07fc9c7',
+      'plugin.php' => '0959f4b60efb06f027bd782232bedf11',
     ),
     'online_extended_menu' => 
     array (
@@ -2258,26 +2262,26 @@
       ),
       'languages' => 
       array (
-        'English.php' => '7c99860dda78f24642aa8adddc3d3ca3',
+        'English.php' => 'c36800efbb062cba2b899cf4650406d6',
       ),
-      'online_extended_menu.php' => 'f678d197dd3a86087de8f19a600de143',
+      'online_extended_menu.php' => '8a496cbb1369c1a24ec2d6fa10cc995a',
     ),
     'online_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '0e8b188aa808e46641fcb13f854493b4',
+        'English.php' => '3ab7296ed5f82ef4232490bc8aa9274c',
       ),
-      'online_menu.php' => '2276b23c808fcac2951ea43464a06c05',
+      'online_menu.php' => '174a226201f6d3cd864a7316b31c5164',
     ),
     'other_news_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '99ba90f9b6d8528852ce6373345ae73e',
+        'English.php' => '23eefb4d00cc6e4832103d76617244ae',
       ),
-      'other_news2_menu.php' => '101618a5206882eb0bb61d2da2c3589c',
-      'other_news_menu.php' => 'd6a781186309232be8521d8f472af246',
+      'other_news2_menu.php' => '9125f6f1481f07379e57ec8b232bd807',
+      'other_news_menu.php' => 'e2a104a2a9050b2d86508900d6e7a142',
     ),
     'pdf' => 
     array (
@@ -2326,13 +2330,13 @@
       ),
       'languages' => 
       array (
-        'English.php' => '2e3c70490e6fd5550bf1e90ff3ea2ca8',
+        'English.php' => 'c74373c9f5282591ecb0278fe6b75be5',
       ),
-      'admin_pdf_config.php' => 'bd0608c7e5525cd823737026830a082b',
-      'e107pdf.php' => '45fa36526b9af5ae3d0986052be5d596',
+      'admin_pdf_config.php' => 'd2d40ad601eb21392dd53db414d0c7ea',
+      'e107pdf.php' => 'f8263fa492abcff351474262488e3e2a',
       'fpdf.css' => '35c07d5049ac6e55b8ab473c6dc38bf0',
       'fpdf.php' => 'da7385d29345f1c12fe85b6cacf5e905',
-      'pdf.php' => '9d20d60ec0dd77512cc8314062a4b7c0',
+      'pdf.php' => '913314caf7dce67dc08c0001879dc203',
       'pdf.sc' => 'c6d60562a17736112f283861a44cd186',
       'plugin.php' => '6796823038ad4e146e9365ebbb8bc59a',
       'ufpdf.php' => 'ba87afe3cb2f777f921ea8a3a0457abd',
@@ -2367,19 +2371,19 @@
         'English.php' => '8d2a4b55dbf033d50c674566a6ec9886',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'plugin.php' => '0626369bcd1c2f139a273cfd8091db3b',
+      'plugin.php' => 'bd0afd6c64e848f160f36c45d455f46f',
       'pm.php' => '78e6fcfb4199245e645ae1d366e8657a',
-      'pm_class.php' => '963207f668f0ec1305596449a62fb721',
-      'pm_conf.php' => '374450b0faaa0e6d22131902cc647231',
+      'pm_class.php' => 'b5495386de49cfb85db679865e03e8d9',
+      'pm_conf.php' => 'd6361a48ae2f9b3f30c38db472af1667',
       'pm_default.php' => 'b7981b895e3afc6bc95a2198f0c40423',
-      'pm_func.php' => '8c193823f9d6f1bca40fad4a3b224cfe',
+      'pm_func.php' => '4bb013a88ec8427ff15a4465709ac74f',
       'pm_notes.txt' => 'df26332907da1f35c4731d8893aea23e',
-      'pm_shortcodes.php' => '44a6f3dbfb3029618c0d7d810569f8fe',
+      'pm_shortcodes.php' => '3fb3da1be9ef990f0fffc10745c124d7',
       'pm_sql.php' => '4608486c1027c6485dc32674fd536dc5',
-      'pm_template.php' => '07067647573d3c9f64554dce365f4969',
-      'pm_update.php' => 'bbcb20baf18d3e4dbe49dffba7e0298b',
-      'pm_update_check.php' => '7c6830b5cf3036869eebe7efe9702cc1',
-      'private_msg_menu.php' => 'e475270e0203d17afce3bf7794a7fdb9',
+      'pm_template.php' => '049aa90af2a2b9d67aff528c13dc19cc',
+      'pm_update.php' => '6917b98de87c50b06daa362a2b58a9f1',
+      'pm_update_check.php' => 'b2f23237307926d599ecf314f59c10bc',
+      'private_msg_menu.php' => '6f8432a627f0e4541fc99cda65b76922',
       'sendpm.sc' => '67d107ca6fc1d9016d81abc9d8943a7f',
     ),
     'poll' => 
@@ -2394,7 +2398,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => '520b6ef59166c9fbfe65bfbca0494dce',
+        'English.php' => '4c8582626506c7ec39320f9142536c66',
       ),
       'search' => 
       array (
@@ -2402,23 +2406,23 @@
       ),
       'templates' => 
       array (
-        'poll_template.php' => 'fc4c7579dd1a6f611a39a6926cb4ef68',
+        'poll_template.php' => '4f3402e0f6fbce9905130d58fdfb6381',
       ),
-      'admin_config.php' => 'ad311916296314b514e123de8a138f63',
-      'oldpolls.php' => '8416ed6f8078c556136a7938f1bd45fc',
-      'plugin.php' => 'b5f2ddba3adb53d83c98db6974e5167b',
-      'poll.php' => 'c8836003cdcbad6a3d7d46cb2a322254',
-      'poll_class.php' => '62e55593211c88ea1d0421044e96bbae',
-      'poll_menu.php' => '324aebd1d67394afa4c11b4e93d071d1',
+      'admin_config.php' => 'c9cc387b19cb5564389aeac876fb629c',
+      'oldpolls.php' => 'fe6a2ec02800ba66c32cb75989d2d673',
+      'plugin.php' => '7bc8615d433848974c9b2f696b68ab55',
+      'poll.php' => 'f4aca5b645b46b0e1ec69bfa05efd406',
+      'poll_class.php' => '51f2a20a5b5d1af4240d5756547600c5',
+      'poll_menu.php' => 'b1c5f9f2665b8c0fd7379fa8e50ca0fd',
       'poll_sql.php' => 'ffe53748dbd1504f7c4204027814064a',
     ),
     'powered_by_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '6d9e3cd8deabf18858c6eebef2e0567c',
+        'English.php' => 'c30f93fc0fa6b31b8c582385d0334fd3',
       ),
-      'powered_by_menu.php' => '3cf132f46778e64c43e69c0946575a63',
+      'powered_by_menu.php' => 'b4e6c427098756e7b67586c9ec85d895',
     ),
     'rss_menu' => 
     array (
@@ -2433,13 +2437,13 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'b07e2d30f464eb5917b80f3d0f2e4eaf',
+        'English.php' => '7b08065b4fbdf50f5a4029261da3745c',
       ),
-      'admin_prefs.php' => '89b59410aaa7f6a13765f8b47ac0cd61',
-      'e_meta.php' => '9958e50a7621a6e06378cb7e75b8ef95',
-      'plugin.php' => 'e8db775d071944b9eb4acae73010312d',
-      'rss.php' => '717b14a78b0344055e8bca2d77fb737a',
-      'rss_menu.php' => 'cd872bf219f785dedfcf3248db787843',
+      'admin_prefs.php' => '582724f64ea297983075a72cbe1e1082',
+      'e_meta.php' => '9ce294ce774363509e738a203fc62c77',
+      'plugin.php' => '53548c74c6fdb33f580afa957d3aa71a',
+      'rss.php' => '35f6da3ea626e57732b8abca9cf9103a',
+      'rss_menu.php' => '3353de9a34750d02abb48c449290bcf1',
       'rss_shortcodes.php' => '349873d68c904be89422f464f2be5d4c',
       'rss_sql.php' => 'efee18037cab9fbf35cdf81f97efc2a3',
       'rss_template.php' => '023614657d162b0f155fbe50e6e3dce2',
@@ -2453,17 +2457,17 @@
       ),
       'languages' => 
       array (
-        'English.php' => '78a63f15be267f33ee1aa2f128f5260d',
+        'English.php' => '470381c153d7db50eda2aa19624937fd',
       ),
-      'search_menu.php' => '815d46b5374c1fa887b198933baa25e2',
+      'search_menu.php' => '988a51f370e421af866baaeee6dd4c6e',
     ),
     'sitebutton_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '60ceaffa1749967932303f6944510a3f',
+        'English.php' => '8e39c2c3315d7013f92b034d82e295c9',
       ),
-      'sitebutton_menu.php' => '8cba92fe2e7b967425d5e3f8570229fb',
+      'sitebutton_menu.php' => '22d0b38d2361c7180f4ee4ac98dadb8b',
     ),
     'trackback' => 
     array (
@@ -2474,31 +2478,31 @@
       ),
       'languages' => 
       array (
-        'English.php' => '9fe9fd8941a2097fd134a92052d22d92',
+        'English.php' => 'faa2ba88588a8142bc39a7312c942981',
       ),
-      'admin_config.php' => '36623c2b1b66bfe3ccf39038700b161a',
-      'e_meta.php' => '21f26d325a88f4c97c96fea82c490b07',
-      'modtrackback.php' => 'e9fa7f6307c0698c92ec0a07ac60af2a',
-      'plugin.php' => 'e6d478bbab19cbb9c64b3391cf0d3337',
-      'trackback.php' => 'b2c846790faa6773e2f0d482793c9865',
-      'trackbackClass.php' => 'd96190b63b5caea8eb8dbac46b45d7f3',
+      'admin_config.php' => '089c10ff6fd21d4e26ed4a5621677001',
+      'e_meta.php' => '6ed50a8d0f26319e064e9cded604f5fa',
+      'modtrackback.php' => '0d65e174ffa687c8381a6c98314be491',
+      'plugin.php' => '1eadec3e108b9bd2affa6d9988e6d4a1',
+      'trackback.php' => '0803ed6318485616312f2a86a139d127',
+      'trackbackClass.php' => 'cab7058e11dee6dca3b1492e270b7f36',
     ),
     'tree_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => 'fe85311f5c5392a839627028d2b3343c',
+        'English.php' => 'dfec891322965a34ef5124a129e18d88',
       ),
-      'config.php' => 'e38d0924af50d7a3ac077ce0d464a81b',
-      'tree_menu.php' => '88570c8c3f551a24f735b6df2d3c0005',
+      'config.php' => 'e82d3bf28f3762cb42163b1670015e51',
+      'tree_menu.php' => 'cec264ed4e6f99e4cf17255c0c0f68be',
     ),
     'userlanguage_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '3d40344c8d1e0ec9561e899ebc2eaa86',
+        'English.php' => '39a4848ad961205704a3c65dec08ce71',
       ),
-      'userlanguage_menu.php' => '276b12cf07295ff561eff140a9cd1c8e',
+      'userlanguage_menu.php' => '9541ada25c7b9fba76d8e2532b71e389',
     ),
     'usertheme_menu' => 
     array (
@@ -2506,8 +2510,8 @@
       array (
         'English.php' => 'cee12f306f38b237a4ee461a1346db5c',
       ),
-      'config.php' => '30d23b57b0e1b8ac554cb856dfad5ac5',
-      'usertheme_menu.php' => '4d9a9b7611e0befe823d76ac619fb9fa',
+      'config.php' => '62ab2ca796fbd49eb22448cc9460727e',
+      'usertheme_menu.php' => 'edbe34c4b5ed789906bab1093ac1644d',
     ),
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
   ),
@@ -2525,12 +2529,12 @@
       ),
       'languages' => 
       array (
-        'English.php' => '5832e8f1af33c041192d4e7b16f32310',
+        'English.php' => 'b7d4e2abac3562d22451ef58d26b0b15',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'b841409838526ba769866861bf236100',
       'style.css' => 'ea3af6647ce3d7ed62c5a973b8a2a7bb',
-      'theme.php' => '5b62e87b20cab7e114d898bc37b87754',
+      'theme.php' => 'fed17d061c7503186496f2b8ec49e418',
     ),
     'e107v4a' => 
     array (
@@ -2571,14 +2575,14 @@
       ),
       'languages' => 
       array (
-        'English.php' => '545de02af07227435bcfd7bda8b9498d',
+        'English.php' => '9d0dca267df91efe635bf23daa686a12',
       ),
-      'forum_template.php' => '9a49bbf6817aafd0a689f31dd26fd399',
+      'forum_template.php' => '8c42aed60c54b9aa7e10d30604b25e30',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'newsfeed_template.php' => '6f642de44c7eaf97e102e673d32bcec0',
+      'newsfeed_template.php' => '6390559bbd388edc1c9ba0cc2225d6ce',
       'preview.jpg' => '1f1e5815a674ceb1eaa562caa0e23607',
       'style.css' => '18850902efe5f0feb78f6b1841639ffc',
-      'theme.php' => '4e28f2c410d3dae76afcc228f8916376',
+      'theme.php' => '7c7313d8388f8ca6f44d5187d0d2ad2c',
     ),
     'human_condition' => 
     array (
@@ -2595,13 +2599,13 @@
       ),
       'languages' => 
       array (
-        'English.php' => '4545016a80656b1c93e76753747e6e5a',
+        'English.php' => 'a557c5a0d7b8f80a7b83509c7705b159',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'newforumpost.php' => 'b1dbb3fb97c454788686e895c68e28a2',
+      'newforumpost.php' => 'fff56128a7d3952e34c0fdde74d18510',
       'preview.jpg' => '37766edab6519ba0d82d89d0fad9b9df',
       'style.css' => '77b477d84c413fa5f3412fb28137b533',
-      'theme.php' => '733db07aa3716bfce15a34139d05f2e9',
+      'theme.php' => '7d7adb37416929219d510e694ec670a9',
     ),
     'interfectus' => 
     array (
@@ -2640,12 +2644,12 @@
       ),
       'languages' => 
       array (
-        'English.php' => '3b508ac6d1be739ce0ec81cd2887c6d1',
+        'English.php' => 'f50d3f68259fa66cb63c9732fdf05dcc',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'a4b48f473468c22cb5f03054eda08794',
       'style.css' => 'bb2e6303ad7fed8a1119fd08b7bd11e8',
-      'theme.php' => '0c3a2df9a79ddd2cd17344cdefe25e20',
+      'theme.php' => 'e816b2bd2c9bfb23f4de078f4b397842',
     ),
     'jayya' => 
     array (
@@ -2670,7 +2674,7 @@
         'fcap2.png' => '0a733fe6e51713f13276eec753da2d9c',
         'fcap2orig.png' => '5f6f45697bc185d51f2c06d904642aad',
         'finfobar.png' => '71585c0c2d3340ece8cf769a135286b9',
-        'forum_icons_template.php' => 'a6c731248e7be08738d38ab0a5739ada',
+        'forum_icons_template.php' => '6a22e2486aede5768e40d732dad60807',
         'main_admin.png' => '4033115a6d4c622f16e23c7d82bc1bd9',
         'moderator.png' => 'd3100a24d0bf141c8d3e5445d24b712a',
         'new.png' => 'f80e5840a07b08c9502af386b9c6c928',
@@ -2723,16 +2727,16 @@
       ),
       'languages' => 
       array (
-        'English.php' => '087a029b75bb6a6e29665e4a17bd9e1c',
+        'English.php' => '258ebc1d1646d31492f8a24d2def8d90',
       ),
-      'admin_template.php' => '6d9c2bbfbf39da112329ab08dc1631d0',
+      'admin_template.php' => 'd0bf5aeabe1313d9e367ad5bc4121974',
       'canvas.css' => 'acdfee6441e3dc292657ca469b669df4',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'nav_menu.css' => 'ac9d2df99166eb5ce87c16bb146bc413',
       'pepper.css' => 'bcd1ac74e7cacb3ace1396355f238cc8',
       'preview.jpg' => '1d775846dbe1b7ea66065fc0eac72eaa',
       'style.css' => 'c406d47937f253e08d655b1d1008a6c2',
-      'theme.php' => '6b2b3d0a32b30572f33ab10dd3774437',
+      'theme.php' => '9036abda28e9496ebe1d02e9e653014b',
     ),
     'khatru' => 
     array (
@@ -2765,18 +2769,18 @@
       ),
       'languages' => 
       array (
-        'English.php' => '9011895953df939ad6f9fd0a70809451',
+        'English.php' => 'db44bba8a0a55580c2e72cbaf4fd7b9c',
       ),
-      'download_template.php' => '244adc165c1e298cd9b8dca3245fd847',
-      'forum_post_template.php' => '634c66f6fc3b1af0c5a01b4c2fbed361',
-      'forum_posted_template.php' => 'f3a2f3c4a627ea019b74c5fe058714ec',
-      'forum_preview_template.php' => 'fe984c3cb6b23ebc1a1df21ac209017f',
-      'forum_template.php' => '5e04ce44cf23fe94d1a3c77806e1a1fd',
-      'forum_viewforum_template.php' => '5058fbc64100c136156b19db8a586012',
-      'forum_viewtopic_template.php' => 'b6f18f795e0bec99d4b190d322f54459',
+      'download_template.php' => '199f1f9e6316a7768efaf6a5558863d7',
+      'forum_post_template.php' => '5271e8c597fc8c8523b6645d150c5895',
+      'forum_posted_template.php' => '17529ecd1d082520005e27e9384bbd23',
+      'forum_preview_template.php' => 'db6fe116010d45d43cdbe494877d5072',
+      'forum_template.php' => 'bb89886af10148f0561738698f568c8e',
+      'forum_viewforum_template.php' => '93ca84f982e046c79ef0fc7d9fd8d98b',
+      'forum_viewtopic_template.php' => 'f794665a241ebbb2fc25aacd3c1b8d5d',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'newforumpost.php' => 'bd44d5240db6fb7af02138dd2499a8ef',
-      'news_template.php' => '0f5b689c4ad3d212934707f44b959b11',
+      'news_template.php' => '8ff2236ab7990c45d7072f5ff626ad5f',
       'poll_template.php' => 'c01388206c3cf373ff04e01c38485d99',
       'preview.png' => 'b164565b63d086a6a5a28fd76097487c',
       'style.css' => 'be699284eb74ccbd6543eac6f60754ea',
@@ -2799,13 +2803,13 @@
       ),
       'languages' => 
       array (
-        'English.php' => '72992e9bdc0c2e146f61efec7431f3a0',
+        'English.php' => 'c9479632d3c4ff955c5abc4b081fb839',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'cb94c52db72d1ba8bd4d1e08ee41cbfb',
       'style.css' => '0f93072e98199ac87d3d2957cda402b9',
       'theme.js' => '092a48b0a95fcb44c48236c40948eb13',
-      'theme.php' => '2a3b3f659d90a51b89c2f3f352152bb2',
+      'theme.php' => '2f1bf0da3db5ebc4c14524a5cefca7c1',
       'ul.sc' => 'd06064877926df43530b0039a4a30069',
     ),
     'lamb' => 
@@ -2837,24 +2841,24 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'be646b1270738dc17229ef9183b69a09',
+        'English.php' => '49644102d92924f176c4e75cb0e3f0f1',
       ),
       'alt_style.css' => '35aa4c44b4194a12623da7c9a107d21b',
-      'alt_theme.php' => '09fc4de57c31e85eac390e643d401ed7',
+      'alt_theme.php' => '6c22be916063a56c701babb80ba5ef2f',
       'chat_template.php' => '8a57696d7ecb512823073c64768c8ed7',
-      'download_template.php' => '019b548b729be011159a775840196b99',
-      'forum_post_template.php' => 'deb25beec8d355475871b6741cf2e76b',
-      'forum_posted_template.php' => 'fb2cbc84508bd02dfc05a4b376bf29f5',
-      'forum_preview_template.php' => '7e66e1f26920f23c90bcf7c343e7a498',
-      'forum_template.php' => 'd8d88424edef4491e3433d3d41ba6d10',
-      'forum_viewforum_template.php' => '35e17087c6c9da2a78bbba1bbfae24dd',
-      'forum_viewtopic_template.php' => 'f81577ce0789ec38b513288dbe2733cb',
+      'download_template.php' => '356f83ad5ffb76ccffc535649158a0bb',
+      'forum_post_template.php' => '2955a4ac9b08b1f5537e2fd98505bf49',
+      'forum_posted_template.php' => '7b24eba353b0d7c041e6f6ffa82ef06d',
+      'forum_preview_template.php' => '4d1f1626738a6fd23f1295a199d7546d',
+      'forum_template.php' => '05c89f2ab6d4fc9c377f2d86ca50a0a8',
+      'forum_viewforum_template.php' => '04a5bff1ab1a729e891b14c2cbf1b1f5',
+      'forum_viewtopic_template.php' => '1b012b8a446151325a9eb0b788c7af94',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'newforumpost.php' => '7ec9f0bb87045e10862dc2b7dcc9757d',
-      'news_template.php' => '0f5b689c4ad3d212934707f44b959b11',
+      'news_template.php' => '8ff2236ab7990c45d7072f5ff626ad5f',
       'preview.jpg' => '184658c1d2222cd0137cc445fcc785ea',
       'style.css' => '475d1badb0a770d6da07c350ffd6dcb7',
-      'theme.php' => 'bdfef691a9c3d97394131369c3bd8ae6',
+      'theme.php' => '6b1e4a96960c069f61fd99fdf30d585f',
     ),
     'leaf' => 
     array (
@@ -2900,7 +2904,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'e1a84f5f4b70580bce505271e2c9f131',
+        'English.php' => '40ff3fb4a0d36d75a9e5d69bb6c339b7',
       ),
       'bluehigh.ttf' => 'd3003ad3a5de2a785fbb898c89cf40ff',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
@@ -2908,7 +2912,7 @@
       'preview.png' => '804c22db1f71223d10e6f7b8b85f69a9',
       'style.css' => 'a54048b5029e3711fdbe23ef3abb9f05',
       'theme.js' => '16285b5ba2631979457e5e2ec1cf10af',
-      'theme.php' => '1271879896bafec899191ac6be749458',
+      'theme.php' => '766b636316bd4449b460b27f22debe83',
       'ul.sc' => '40e66ba9fbd2f99d59b9f7f9ba55256c',
     ),
     'newsroom' => 
@@ -2922,7 +2926,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => '22f0a43f440d729ef7e94cc9d62c4606',
+        'English.php' => 'fd73d3b473cac982f54db01a5490d2dc',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'de22b398f66e271fdd908ac31f25e7e4',
@@ -2960,16 +2964,16 @@
       ),
       'languages' => 
       array (
-        'English.php' => '0135bd5e47ae5966c561574b085dfd55',
+        'English.php' => '5505951a8c6de4835306532dd75b7866',
       ),
       'admin_style.css' => '7850d3c2db60fb1e649a6eb6201cfc11',
-      'admin_template.php' => 'dff76ef36c5df24346370d1b7bbb860b',
+      'admin_template.php' => '5a7f90207d1650b775d59227bb567c72',
       'cube.sc' => 'f85e6d1f10ab3372ec7ebdb0548651ad',
       'full_width.css' => 'f806f549c1200131c4c043db72408da7',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => '30da9e1ef04e5f1fef38ae3d23e0f3c4',
       'style.css' => 'aa2df8aa8519c802f10e3eddfd95aed3',
-      'theme.php' => 'd0cf88370fc6303fcb95148cbbdd530e',
+      'theme.php' => '74023cc785aaba4efe4bc00689333678',
     ),
     'sebes' => 
     array (
@@ -2991,36 +2995,36 @@
       ),
       'languages' => 
       array (
-        'English.php' => '0136dbae1d09ee1a237f8fbdd74fcf58',
+        'English.php' => 'f71b696247a91f0e90c6c0f7d101c274',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'a9e7139c84a52e4b164c460a6428b317',
       'style.css' => '2520113be12170cc926299ac4ece598d',
-      'theme.php' => 'ad94b996cd9672fb3a65fcba6ebff121',
+      'theme.php' => '8a7af10971108f8178c8028c319d77f8',
     ),
     'templates' => 
     array (
-      'admin_template.php' => '522b4fb698a871e2303864ba1c19c368',
+      'admin_template.php' => '605423b5a95430eef0e309d29c2d22ec',
       'banner_template.php' => 'df1a7cc8e987130f21f604123484b109',
-      'bbcode_template.php' => '34453d7f41db389f60185cf430e551f0',
-      'comment_template.php' => '936bce85c42cc142807925206ea73684',
+      'bbcode_template.php' => 'c050275c3bd261857d5c492da11b7edf',
+      'comment_template.php' => 'd4623fdca9b82801ad9ace0347f527fe',
       'contact_template.php' => '130fbecbfd4a8a89e3515feb658263f9',
-      'download_template.php' => '27511cc1449179a7d9deef068446708b',
-      'email_template.php' => '185e817fa9c605d54aafe8e9ec35a050',
-      'footer_default.php' => 'f6d75a218887aebdb7d0d9406a2a2eeb',
+      'download_template.php' => '1da4f99e2dfef2734271ebaaa7dfbe95',
+      'email_template.php' => '41869d37035cb352d450090e0e0237d0',
+      'footer_default.php' => 'f9b10d772f16113328719fa74f89a380',
       'fpw_template.php' => 'd3cb36082e7c0450f48f6f844f1ba2f0',
-      'header_default.php' => '50f2ad44941bde876c90425d026c0489',
+      'header_default.php' => '8004f2010869d9a132f9696c0b11f229',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'login_template.php' => '17768e7adc245a95975467f7194aa4b8',
-      'membersonly_template.php' => 'b3e2ad471b7586d23e91643d5122d451',
+      'membersonly_template.php' => '4302b449b4cdfa7f4779134679dccc61',
       'online_template.php' => 'd30fad967e63d6bcfdbdabcd13faec0b',
       'search_template.php' => '100782de2e0ac37b7286bc2a1f65a2c2',
-      'signup_template.php' => 'db90c33b84a1efc46439c00232b9f7cd',
-      'sitedown_template.php' => 'f603877d1a98f55dbdedeb97651da8b8',
+      'signup_template.php' => 'b9d75024f729a7158ca3a1946f3afa36',
+      'sitedown_template.php' => 'ec76cbe48296ce511afc4e4d9dd05728',
       'trackback_template.php' => 'fd54d8c26c75f9d380e8ec90860b0107',
-      'user_template.php' => 'ad49c6c90c0966249ebf206143adb915',
-      'userposts_template.php' => '9996da40bf6e41fc1671a02a0dc66a4e',
-      'usersettings_template.php' => '4bbd391b74060b850b5b7251984fdb3d',
+      'user_template.php' => '678075f8a8c4a0e5720a0e8050ebca8d',
+      'userposts_template.php' => '9f79c479f467aab1971f67b403f423ba',
+      'usersettings_template.php' => 'ccfc36f695b7afe6477abf9b8ce2b653',
     ),
     'vekna_blue' => 
     array (
@@ -3042,54 +3046,53 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'ca1650b3a3f81abc721cdff2b0d5ff16',
+        'English.php' => 'e56dfd6fdc95330fd6cdf699a80ccdde',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'nav_menu.css' => '74b91306b957f69bc390ed612df76ac9',
       'preview.jpg' => 'fbb8bde5f9eb4f8efc39f85234959823',
       'style.css' => '02e8aa814f130ab566515c10ea564b53',
-      'theme.php' => '2b4b8cff395cc03ce0474c60569ab45d',
+      'theme.php' => '0c48f16ac016bdade69cd7cc7480ff14',
     ),
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
   ),
-  'article.php' => 'b5fece2c0a57d4c2218d891ef5b5b278',
-  'banner.php' => '07f1de93043c325f0b2a869a1aafdbf6',
-  'class2.php' => 'db4acfb885a2b6cf5de85bbceaf3af35',
-  'comment.php' => '96cc8a58d3c5ce889ceb8c659b7fbb4e',
-  'contact.php' => '8c29b1abd560b4665666aa4a0cf53be4',
-  'content.php' => '538364e5bc367d0f4bcecfe7f1d831a2',
-  'download.php' => 'bc605e23ee7dfe3f46eabb567ce13297',
-  'e107.htaccess' => 'c5e1ad68b41f947be285926c0f81d914',
+  'article.php' => '99ff41edab6c0488b360b34db5264b11',
+  'banner.php' => '1103034d2d9220f93aa7511952c9c79a',
+  'class2.php' => '85e216b6d39181fca7e611b83a0b5b3f',
+  'comment.php' => 'b87376d301bea9b876302199c31e64da',
+  'contact.php' => '1b6b5e12fe61812235511527e30c0233',
+  'content.php' => 'f7c62efce19e34901f7d3366cd3855ce',
+  'download.php' => 'a517d26069e47e82bbdc20b29e14f431',
+  'e107.htaccess' => '49bf72c8e632a176fb926adee458e359',
   'e107.robots.txt' => '3f7b0f4a9348e494b4cbc1ff8ce84831',
-  'e107_config.php' => 'd41d8cd98f00b204e9800998ecf8427e',
-  'email.php' => '009db056265f595a6cf7b8e7da5832c2',
-  'error.php' => '8ece95a121d277cb9960dbce1a4d9357',
+  'email.php' => '981933d4f454b3fb8f0b0935124d9656',
+  'error.php' => 'fe3e610ee485874fc633c3d11ac51f4b',
   'favicon.ico' => '5fceb78b9124ddae4027396d7cfcd328',
   'forum.php' => '3c10184d52685d7c9a6906a967b7e3d8',
   'forum_viewforum.php' => '4b9fcc3a820ed2f93b4dc707c3ebe3b4',
   'forum_viewtopic.php' => '5fea10d40850fd6f72cfbec7a328e120',
-  'fpw.php' => '84f00171dd2cf34be4959700b387b2d8',
-  'gsitemap.php' => 'c5f2f456652be4ffca539a8f9a4ac024',
-  'index.php' => '66deb9caa6412342a269b19114c0abf3',
+  'fpw.php' => 'f10add7cb8970f00beb7f76a5f4a7dc2',
+  'gsitemap.php' => '418c9afee5e3fab04839f5a8cecfbcbc',
+  'index.php' => 'e6cb2faf6f50270396a271913b78ed55',
   'links.php' => 'bed206fc2abe8f1307ef4db3b7fee63e',
-  'login.php' => 'fd67c423214501042be541757e4e3597',
-  'membersonly.php' => '5167230b1e2079f343bf3e308a918dd0',
-  'news.php' => 'db8cfd404c2e8e7410e46ab2136c1f75',
-  'online.php' => 'f6a3d5b3036eb122e58fb36e038c0121',
-  'page.php' => 'c45caf67e2851d0146c8498aca54cd60',
-  'print.php' => '9c495107456dd8477ba5f50ec230d53b',
-  'rate.php' => '36342f07f40c34eeb096c1b0cb2c756c',
-  'request.php' => '0627007f3dbbd125412232f2668107e8',
-  'search.php' => 'f50fc75073e9a36b28a1359a47365ad7',
-  'signup.php' => 'f43e15fd2099ce4c2f2134ebebe2eb5e',
-  'sitedown.php' => 'bb28f233cc6f4dd3f47f2ed5dc21e348',
-  'subcontent.php' => '2f23437c02d7f93e872ee3cf821de17e',
-  'submitnews.php' => 'c961edefc5247125d698ce6203b1a6d2',
-  'top.php' => 'dfeda599989a27e365a62485069e7a21',
-  'upload.php' => '97a4b914274ea27ca7ef133fe8db82b7',
-  'user.php' => 'a9303ed5ca97284f830dfaaca0538081',
-  'userposts.php' => '8681dd5313bffd2e969c48a9b87c753d',
-  'usersettings.php' => 'a4756951d007e0ce6aefbae255c7143d',
+  'login.php' => '499052a375e55c3b8ffa837dce63f660',
+  'membersonly.php' => 'f0a4427c20008fb14f819a89ecc7ab25',
+  'news.php' => 'a9293a4f9305da18a22e8be839de81b0',
+  'online.php' => 'dedde4aafef396cbc2f145fb3f6ba020',
+  'page.php' => '07f60c2d767999581fe52b3acea260e4',
+  'print.php' => 'ff80b3a7061f43d2d17a87339c20abcd',
+  'rate.php' => '6a28db191f8bb1ebca3b060d867647eb',
+  'request.php' => '9370500f0b4572630997ffff319dece6',
+  'search.php' => '0b7b88a857d3aa55970f57f423bbeae3',
+  'signup.php' => 'b75228557e632967ab1858404305d400',
+  'sitedown.php' => 'abdca2b0abb281008d3529f5e1b6ae3f',
+  'subcontent.php' => '13134ebbb9c45234963500e05d9e692f',
+  'submitnews.php' => '26cdb029ceb7ce79bbd952fdde168543',
+  'top.php' => 'f810a42faf161f41a3691560ef5f4686',
+  'upload.php' => 'badeb3149719c8cff9e0a64f823fa873',
+  'user.php' => '53b6cc32a2d529bf413df24d531b9854',
+  'userposts.php' => '9f2d0dc13036ab8daa71ff8d07962d90',
+  'usersettings.php' => 'a6e29cec4c1cd11bdebdcd6da5e8052e',
 );
 
 $deprecated_image = array (
diff -x .svn -aruN 0.7.23.src/e107_admin/cpage.php 0.7.24.src/e107_admin/cpage.php
--- 0.7.23.src/e107_admin/cpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/cpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/cpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/cpage.php $
+|     $Revision: 11678 $
+|     $Id: cpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/credits.php 0.7.24.src/e107_admin/credits.php
--- 0.7.23.src/e107_admin/credits.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/credits.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/credits.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/credits.php $
+|     $Revision: 11678 $
+|     $Id: credits.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/db.php 0.7.24.src/e107_admin/db.php
--- 0.7.23.src/e107_admin/db.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/db.php	2010-08-28 12:01:06.000000000 -0500
@@ -4,26 +4,32 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/db.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/db.php $
+|     $Revision: 11714 $
+|     $Id: db.php 11714 2010-08-28 17:01:30Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
 // Experimental e-token
-if((isset($_POST['sqltext']) || isset($_POST['delpref_checked'])) && !isset($_POST['e-token']))
+if(isset($_POST['delpref_checked']) && !isset($_POST['e-token']))
 {
 	// set e-token so it can be processed by class2
 	$_POST['e-token'] = '';
 }
 
+// No e-token for simple redirect. 
+if(isset($_POST['verify_sql']) || isset($_POST['db_update']) || isset($_POST['check_user']))
+{
+	unset($_POST['e-token']);
+}	
+
 require_once("../class2.php");
 if (!getperms('0')) 
 {
@@ -243,7 +249,7 @@
 			$previous = $row['plugin_path'];
 		}
 //		$text .= "<tr><td colspan='4' class='forumheader3'>".DBLAN_30."</td></tr>";
-        $text .= "</table></div></form>";
+        $text .= "</table></div><input type='hidden' name='e-token' value='".e_TOKEN."' /></form>";
         $ns -> tablerender(ADLAN_CL_7, $text);
 
 }
diff -x .svn -aruN 0.7.23.src/e107_admin/db_verify.php 0.7.24.src/e107_admin/db_verify.php
--- 0.7.23.src/e107_admin/db_verify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/db_verify.php	2010-08-23 12:14:15.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/db_verify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/db_verify.php $
+|     $Revision: 11691 $
+|     $Id: db_verify.php 11691 2010-08-23 17:14:39Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -127,6 +127,8 @@
   }
 }
 
+
+
 function check_tables($what) 
 {
 	global $tablines;
@@ -164,18 +166,26 @@
 				$fieldnum++;
 				$ffound = 0;
 				list($fname, $fparams) = explode(" ", $x, 2);
-				if ($fname == "KEY") 
+				switch ($fname)
 				{
-					list($key, $keyname, $keyparms) = explode(" ", $x, 3);
-					$fname = $key." ".$keyname;
-					$fparams = $keyparms;
-				}
-				elseif ($fname == 'PRIMARY')
-		  		{	// Nothing to do ATM
-		  		}
-				else
-				{		// Must be a field name
-					$fname = str_replace('`','',$fname);		// Just remove back ticks if present
+					case 'KEY' :
+						list($key, $keyname, $keyparms) = explode(" ", $x, 3);
+						$fname = $key." ".$keyname;
+						$fparams = $keyparms;
+						break;
+					case 'PRIMARY' :
+						// Nothing to do ATM
+						break;
+					case 'UNIQUE' :
+						list($keyword, $key, $keyname, $keyparms) = explode(" ", $x, 4);
+						$fname = 'UNIQUE '.$key.' '.$keyname;
+						$fparams = $keyparms;
+						break;
+						echo 'Unique field entry: '.$x.'<br />';
+						break;
+					default :
+						// Must be a field name
+						$fname = str_replace('`','',$fname);		// Just remove back ticks if present
 				}
 				$fields[$fname] = 1;
 				$fparams = ltrim(rtrim($fparams));
@@ -206,6 +216,16 @@
 					$xl = str_replace('  ',' ',$xl);				// Remove double spaces
 					list($xfname, $xfparams) = explode(" ", $xl, 2);	// Field name and the rest
 
+					if ($xfname == 'UNIQUE') 
+					{
+						list($keyword, $key, $keyname, $keyparms) = explode(" ", $xl, 4);
+						if ($key != 'KEY')
+						{
+							echo 'Invalid parameters to line beginning \'UNIQUE\': '.$xl.'<br />';
+						}
+						$xfname = 'UNIQUE '.$key.' '.$keyname;
+						$xfparams = $keyparms;
+					}
 					if ($xfname == "KEY") 
 					{
 						list($key, $keyname, $keyparms) = explode(" ", $xl, 3);
@@ -220,7 +240,7 @@
 					$xfparams = preg_replace("/,$/", "", $xfparams);
 					$fparams = preg_replace("/,$/", "", $fparams);
 					if ($xfname == $fname) 
-					{  // Field names match - or it could be the word 'KEY' and its name which matches
+					{  // Field names match - or it could be the word 'KEY' or 'UNIQUE KEY' and its name which matches
 						$ffound = 1;
 						//	echo "Field: ".$xfname."   Actuals: ".$xfparams."   Expected: ".$fparams."<br />";
 						$xfsplit = explode(' ',$xfparams);
@@ -321,18 +341,26 @@
 
 global $table_list;
 
-// -------------------- Table Fixing ------------------------------
 
-if(isset($_POST['do_fix'])){
-	$text = "<div><table class='fborder' style='".ADMIN_WIDTH."'>";
-	foreach( $_POST['fix_active'] as $key=>$val){
 
-		if (MAGIC_QUOTES_GPC == TRUE) {
+
+/**
+ *		Fix tables as selected
+ */
+if(isset($_POST['do_fix']))
+{
+	$text = "<div><table class='fborder' style='".ADMIN_WIDTH."'>";
+	foreach( $_POST['fix_active'] as $key=>$val)
+	{
+		if (MAGIC_QUOTES_GPC == TRUE) 
+		{
 			$table = stripslashes($_POST['fix_table'][$key][0]);
 			$newval = stripslashes($_POST['fix_newval'][$key][0]);
 			$mode = stripslashes($_POST['fix_mode'][$key][0]);
 			$after = stripslashes($_POST['fix_after'][$key][0]);
-		} else {
+		} 
+		else 
+		{
 			$table = $_POST['fix_table'][$key][0];
 			$newval = $_POST['fix_newval'][$key][0];
 			$mode = $_POST['fix_mode'][$key][0];
@@ -342,23 +370,33 @@
 
 		$field= $key;
 
-		if($mode == "alter"){
+		if($mode == "alter")
+		{
 			$query = "ALTER TABLE `".MPREFIX.$table."` CHANGE `$field` `$field` $newval";
 		}
 
-		if($mode == "insert"){
+		if($mode == "insert")
+		{
 			$query = "ALTER TABLE `".MPREFIX.$table."` ADD `$field` $newval AFTER $after";
 		}
 
-		if($mode == "drop"){
+		if($mode == "drop")
+		{
 			$query = "ALTER TABLE `".MPREFIX.$table."` DROP `$field` ";
 		}
 
-		if($mode == "index"){
+		if($mode == "index")
+		{
 			$query = "ALTER TABLE `".MPREFIX.$table."` ADD INDEX `$field` (`$newval`)";
 		}
 
-		if($mode == "indexdrop"){
+		if($mode == "indexunique")
+		{
+			$query = "ALTER TABLE `".MPREFIX.$table."` ADD UNIQUE INDEX `$field` (`$newval`)";
+		}
+
+		if($mode == "indexdrop")
+		{
 			$query = "ALTER TABLE `".MPREFIX.$table."` DROP INDEX `$field`";
 		}
 
@@ -392,7 +430,8 @@
 
 
 // ---------------------- Main Form and Submit. ------------------------
-if (!$_POST['db_verify'] && !$_POST['do_fix']) {
+if (!$_POST['db_verify'] && !$_POST['do_fix']) 
+{
 	$text = "
 		<form method='post' action='".e_SELF."'>
 		<table border=0 align='center'>
@@ -404,9 +443,13 @@
 		<br /><input class='button' name='db_verify' type='submit' value='".DBLAN_15."' />
 		</td></tr></table></form>";
 	$ns->tablerender(DBLAN_16, $text);
-} else {
-	foreach(array_keys($_POST) as $k) {
-		if (preg_match("/table_(.*)/", $k, $match)) {
+} 
+else 
+{
+	foreach(array_keys($_POST) as $k) 
+	{
+		if (preg_match("/table_(.*)/", $k, $match)) 
+		{
 			$xx = $match[1];
 			$str = "<br />
 				<div style='text-align:center'>
@@ -421,17 +464,27 @@
 
 
 
-// --------------------------------------------------------------
-function fix_form($table,$field, $newvalue, $mode, $after ='')
+/**
+ *	Generate the display code and hidden values needed for the fix
+ */
+function fix_form($table, $field, $newvalue, $mode, $after ='')
 {
+	//echo "fix_form: {$mode} => {$table}, {$field}, {$newvalue}, {$after}<br />";
 	if($mode == "create")
 	{
 		$newvalue = implode("\n",$newvalue);
 		$field = $table;		// Value for $field may be rubbish!
 	}
+	elseif (substr($field, 0, 7) == 'UNIQUE ')
+	{
+		$field = trim(str_replace("UNIQUE KEY ","",$field));
+		$mode = ($mode == "drop") ? "indexdrop" : "indexunique";
+		$search = array("(",")");
+		$newvalue = str_replace($search,'',$newvalue);
+	}
 	elseif(stristr($field, "KEY ") !== FALSE)
 	{
-		$field = chop(str_replace("KEY ","",$field));
+		$field = trim(str_replace("KEY ","",$field));
 		$mode = ($mode == "drop") ? "indexdrop" : "index";
 		$search = array("(",")");
 		$newvalue = str_replace($search,"",$newvalue);
diff -x .svn -aruN 0.7.23.src/e107_admin/docs.php 0.7.24.src/e107_admin/docs.php
--- 0.7.23.src/e107_admin/docs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/docs.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/docs.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/docs.php $
+|     $Revision: 11678 $
+|     $Id: docs.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/download.php 0.7.24.src/e107_admin/download.php
--- 0.7.23.src/e107_admin/download.php	2010-08-14 18:30:25.000000000 -0500
+++ 0.7.24.src/e107_admin/download.php	2010-09-21 07:53:58.000000000 -0500
@@ -4,15 +4,15 @@
 |     e107 website system
 |
 |     Copyright (c) e107 Inc. 2008-2010
-|     http://e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/download.php,v $
-|     $Revision: 11657 $
-|     $Date: 2010-08-14 18:30:49 -0500 (Sat, 14 Aug 2010) $
-|     $Author: e107coders $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/download.php $
+|     $Revision: 11807 $
+|     $Id: download.php 11807 2010-09-21 12:54:22Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -51,14 +51,8 @@
 
 $download = new download;
 require_once("auth.php");
-$pst->save_preset();  // unique name(s) for the presets - comma separated.
+$pst->save_preset('download_datestamp'); // save and render result using unique name. Don't save item datestamp
 
- /*
-One form example (no arrays needed)
-$pst->form = "myform"; // form id of the form that will have it's values saved.
-$pst->page = "download.php?create"; // display preset options on which page.
-$pst->save_preset("admin_downloads");  // unique name for the preset
-*/
 
 $rs = new form;
 $action = '';
@@ -70,7 +64,7 @@
 	$tmp = explode('.', e_QUERY);
 	$action = $tmp[0];
 	$sub_action = varset($tmp[1],'');
-	$id = varset($tmp[2],'');
+	$id = intval(varset($tmp[2],''));
 	$from = varset($tmp[3], 0);
 	unset($tmp);
 }
@@ -82,7 +76,7 @@
 	unset($_POST['searchquery']);
 }
 
-$from = varset($from, 0);
+$from = intval(varset($from, 0));
 $amount = 50;
 
 
@@ -204,6 +198,7 @@
 	}
 	foreach(array_keys($_POST['count_num']) as $id)
 	{
+		$id = intval($id);
 		if(!$_POST['count_num'][$id] && !$_POST['count_days'][$id] && !$_POST['bw_num'][$id] && !$_POST['bw_days'][$id])
 		{
 			//All entries empty - Remove record
@@ -240,7 +235,7 @@
 if ($action == "dlm")
 {
 	$action = "create";
-	$id = $sub_action;
+	$id = intval($sub_action);
 	$sub_action = "dlm";
 }
 
@@ -354,7 +349,7 @@
 		<tr><td class='forumheader3'>
 		".LAN_ORDER."
 		</td>
-		<td class='forumheader3' text-align:left'>
+		<td class='forumheader3' style='text-align:left'>
 		<select name='download_sort' class='tbox'>". ($pref['download_sort'] == "ASC" ? "<option value='ASC' selected='selected'>".DOWLAN_62."</option>" : "<option value='ASC'>".DOWLAN_62."</option>"). ($pref['download_sort'] == "DESC" ? "<option value='DESC' selected='selected'>".DOWLAN_63."</option>" : "<option value='DESC'>".DOWLAN_63."</option>")."
 		</select>
 		</td>
@@ -663,7 +658,7 @@
 
 		$text .= "<div style='cursor:pointer' onclick=\"expandit('sdisp')\">".LAN_DISPLAYOPT."</div>";
 		$text .= "<div id='sdisp' style='padding-top:4px;display:none;text-align:center;margin-left:auto;margin-right:auto'>
-		<table class='forumheader3' style='width:95%'><tr>";
+		<table class='forumheader3' style='width:95%'>";
 
 /*
 		$fields = mysql_list_fields($mySQLdefaultdb, MPREFIX."download");
@@ -676,18 +671,31 @@
 
         $m = 0;
 		$replacechar = array("download_","_");
-	foreach($fname as $fcol)
-	{
-        $checked = (in_array($fcol,$search_display)) ? "checked='checked'" : "";
+		
+		foreach($fname as $fcol)
+		{
+			if($m == 0)
+			{
+				$text .= "<tr>\n";	
+			}
+			
+	        $checked = (in_array($fcol,$search_display)) ? "checked='checked'" : "";
+			
 			$text .= "<td style='text-align:left; padding:0px'>";
 			$text .= "<input type='checkbox' name='searchdisp[]' value='".$fcol."' $checked />".str_replace($replacechar," ",$fcol) . "</td>\n";
 			$m++;
-	  if($m == 5)
-	  {
-				$text .= "</tr><tr>";
+				
+		  	if($m == 5)
+		  	{
+				$text .= "</tr>";
 				$m = 0;
-			 }
-        }
+			}
+		}
+		
+		if($m != 0)
+		{
+			$text .= "</tr>";
+		}
 
 		$text .= "</table></div>
 		</form>\n
@@ -779,6 +787,7 @@
 		$download_status[2] = DOWLAN_124;
 		$preset = $pst->read_preset("admin_downloads");  // read preset values into array
 		extract($preset);
+		$download_datestamp = time();					// This isn't preset
 
 		if (!$sql->db_Select("download_category"))
 		{
@@ -904,6 +913,7 @@
       <option value='MB'>".CORE_LAN_MB."</option>
       <option value='GB'>".CORE_LAN_GB."</option>
       <option value='TB'>".CORE_LAN_TB."</option>
+	  </select>
       </div>
 
 			</td>
@@ -917,7 +927,7 @@
 		// See if any mirrors to display
 		if(!$sql -> db_Select("download_mirror"))
 		{	// No mirrors defined here
-			$text .= DOWLAN_144."</tr>";
+			$text .= DOWLAN_144."</td></tr>";
 		}
 		else
 		{
@@ -1050,7 +1060,8 @@
 		<td style='width:20%' class='forumheader3'>".LAN_DATESTAMP.":</td>
 		<td style='width:80%' class='forumheader3'>
 		";
-        if(!$download_datestamp){
+        if(!$download_datestamp)
+		{
         	$download_datestamp = time();
 	   	}
 		$cal_options['showsTime'] = false;
@@ -1151,7 +1162,7 @@
 				<td style='width:30%' class='forumheader3'>".DOWLAN_103.":<br /></td>
 				<td style='width:70%' class='forumheader3'>
 				<input type='checkbox' name='remove_upload' value='1' />
-				<input type='hidden' name='remove_id' value='$id' />
+				<input type='hidden' name='remove_id' value='{$id}' />
 				</td>
 			</tr>
             ";
@@ -1162,9 +1173,12 @@
 			<td colspan='2' style='text-align:center' class='forumheader'>";
 
 
-		if ($id && $sub_action == "edit") {
+		if ($id && $sub_action == "edit") 
+		{
 			$text .= "<input class='button' type='submit' name='submit_download' value='".DOWLAN_24."' /> ";
-		} else {
+		} 
+		else 
+		{
 			$text .= "<input class='button' type='submit' name='submit_download' value='".DOWLAN_25."' />";
 		}
 
diff -x .svn -aruN 0.7.23.src/e107_admin/e107_update.php 0.7.24.src/e107_admin/e107_update.php
--- 0.7.23.src/e107_admin/e107_update.php	2010-07-13 17:04:05.000000000 -0500
+++ 0.7.24.src/e107_admin/e107_update.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/e107_update.php,v $
-|     $Revision: 11598 $
-|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/e107_update.php $
+|     $Revision: 11678 $
+|     $Id: e107_update.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/emoticon.php 0.7.24.src/e107_admin/emoticon.php
--- 0.7.23.src/e107_admin/emoticon.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/emoticon.php	2010-09-17 16:58:03.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/emoticon.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/emoticon.php $
+|     $Revision: 11797 $
+|     $Id: emoticon.php 11797 2010-09-17 21:58:27Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -149,6 +149,7 @@
 		<td class='forumheader' style='width: 50%;'>".EMOLAN_3."</td>
 		<td class='forumheader' style='width: 10%; text-align: center;'>".EMOLAN_8."</td>
 		<td class='forumheader' style='width: 20%;'>".EMOLAN_9."</td>
+		</tr>
 		";
 
 		$reject = array('^\.$','^\.\.$','^\/$','^CVS$','thumbs\.db','.*\._$', 'emoteconf*', '\.bak$');
diff -x .svn -aruN 0.7.23.src/e107_admin/fileinspector.php 0.7.24.src/e107_admin/fileinspector.php
--- 0.7.23.src/e107_admin/fileinspector.php	2010-07-23 18:16:05.000000000 -0500
+++ 0.7.24.src/e107_admin/fileinspector.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 +----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (c)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/fileinspector.php,v $
-|     $Revision: 11617 $
-|     $Date: 2010-07-23 18:16:29 -0500 (Fri, 23 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/fileinspector.php $
+|     $Revision: 11678 $
+|     $Id: fileinspector.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -693,16 +693,15 @@
 		$data .= "+ ----------------------------------------------------------------------------+\n";
 		$data .= "|     e107 website system\n";
 		$data .= "|\n";
-		$data .= "|     �Steve Dunstan 2001-2002\n";
-		$data .= "|     http://e107.org\n";
-		$data .= "|     jalist@e107.org\n";
+		$data .= "|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)\n";
+		$data .= "|     Copyright (C) 2008-2010 e107 Inc (e107.org)\n";
 		$data .= "|\n";
 		$data .= "|     Released under the terms and conditions of the\n";
 		$data .= "|     GNU General Public License (http://gnu.org).\n";
 		$data .= "|\n";
 		$data .= "|     \$Source: /cvs_backup/e107_0.7/e107_admin/fileinspector.php,v $\n";
-		$data .= "|     \$Revision: 11617 $\n";
-		$data .= "|     \$Date: 2010-07-23 18:16:29 -0500 (Fri, 23 Jul 2010) $\n";
+		$data .= "|     \$Revision: 11678 $\n";
+		$data .= "|     \$Id: fileinspector.php 11678 2010-08-22 00:43:45Z e107coders $\n";
 		$data .= "|     \$Author: e107coders $\n";
 		$data .= "+----------------------------------------------------------------------------+\n";
 		$data .= "*/\n\n";
diff -x .svn -aruN 0.7.23.src/e107_admin/filemanager.php 0.7.24.src/e107_admin/filemanager.php
--- 0.7.23.src/e107_admin/filemanager.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/filemanager.php	2010-09-16 15:01:45.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/filemanager.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/filemanager.php $
+|     $Revision: 11790 $
+|     $Id: filemanager.php 11790 2010-09-16 20:02:09Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -25,7 +25,8 @@
 }
 
 require_once("../class2.php");
-if (!getperms("6")) {
+if (!getperms("6")) 
+{
 	header("location:".e_BASE."index.php");
 	exit;
 }
@@ -35,6 +36,7 @@
 $pubfolder = (str_replace("../","",e_QUERY) == str_replace("../","",e_FILE."public/")) ? TRUE : FALSE;
 
 $imagedir = e_IMAGE."filemanager/";
+$message = '';
 
 	$dir_options[0] = FMLAN_47;
 	$dir_options[1] = FMLAN_35;
@@ -83,13 +85,16 @@
 	$newfile = str_replace($path,"",$delfile);
 
 	// Move file to whatever folder.
-		if (isset($_POST['movetodls'])){
-
+		if (isset($_POST['movetodls']))
+		{
 			$newpath = $_POST['movepath'];
 
-			if (rename(e_BASE.$delfile,$newpath.$newfile)){
+			if (rename(e_BASE.$delfile,$newpath.$newfile))
+			{
 				$message .= FMLAN_38." ".$newpath.$newfile."<br />";
-			} else {
+			} 
+			else 
+			{
 				$message .= FMLAN_39." ".$newpath.$newfile."<br />";
 				$message .= (!is_writable($newpath)) ? $newpath.LAN_NOTWRITABLE : "";
 			}
@@ -100,21 +105,51 @@
 
 
 
-if (isset($_POST['upload'])) {
-	if (!$_POST['ac'] == md5(ADMINPWCHANGE)) {
+if (isset($_POST['upload'])) 
+{
+	if (!$_POST['ac'] == md5(ADMINPWCHANGE)) 
+	{
 		exit;
 	}
 	$pref['upload_storagetype'] = "1";
-	require_once(e_HANDLER."upload_handler.php");
+	require_once(e_HANDLER.'upload_handler.php');
 	$files = $_FILES['file_userfile'];
-	foreach($files['name'] as $key => $name) {
-		if ($files['size'][$key]) {
-			$uploaded = file_upload(e_BASE.$_POST['upload_dir'][$key]);
+	$spacer = '';
+	foreach($files['name'] as $key => $name) 
+	{
+		if ($name)
+		{
+			if ($files['error'][$key])
+			{
+				$message .= $spacer.FMLAN_10.' '.$files['error'][$key].': '.$name;
+			}
+			elseif ($files['size'][$key]) 
+			{
+				$uploaded = file_upload(e_BASE.$_POST['upload_dir'][$key]);
+				if (($uploaded === FALSE) || !is_array($uploaded))
+				{
+					$message .= $spacer.FMLAN_51.$name;
+					$spacer = '<br />';
+				}
+				else
+				{
+					foreach ($uploaded as $k => $inf)
+					{
+						if ($inf['error'] != 0)
+						{	// Most likely errors trapped earlier.
+							$message .= $spacer.FMLAN_10.' '.$inf['error'].' ('.$inf['message'].'): '.$inf['rawname'];
+						}
+						$spacer = '<br />';
+					}
+				}
+			}
 		}
 	}
 }
 
-if (isset($message)) {
+
+if ($message)
+{
 	$ns->tablerender("", "<div style=\"text-align:center\"><b>".$message."</b></div>");
 }
 
@@ -213,7 +248,7 @@
 
 $text = "<form enctype=\"multipart/form-data\" action=\"".e_SELF.(e_QUERY ? "?".e_QUERY : "")."\" method=\"post\">
 	<div style=\"text-align:center\">
-	<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"1000000\" />
+	<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"2000000\" />
 	<table class='fborder' style=\"".ADMIN_WIDTH."\">";
 
 $text .= "<tr>
diff -x .svn -aruN 0.7.23.src/e107_admin/fla.php 0.7.24.src/e107_admin/fla.php
--- 0.7.23.src/e107_admin/fla.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/fla.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/fla.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/fla.php $
+|     $Revision: 11678 $
+|     $Id: fla.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/footer.php 0.7.24.src/e107_admin/footer.php
--- 0.7.23.src/e107_admin/footer.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/footer.php	2010-09-06 15:58:51.000000000 -0500
@@ -3,22 +3,52 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/footer.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/footer.php $
+|     $Revision: 11753 $
+|     $Id: footer.php 11753 2010-09-06 20:59:15Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
 $In_e107_Footer = TRUE;	// For registered shutdown function
 
+// simple SESSION Fixation
+	if(!session_id()) // someone closed the session?
+	{
+		session_start(); // restart
+	}
+
+// give 3rd party code a way to prevent token/session re-generation
+if(!defsettrue('e_TOKEN_FREEZE'))
+{
+	// regenerate SID
+	$oldSID = session_id(); // old SID
+	$oldSData = $_SESSION; // old session data
+	session_regenerate_id(false); // true don't work on php4 - so time to move on people!	
+	$newSID = session_id(); // new SID
+	
+	// Clean
+	session_id($oldSID); // switch to the old session
+	session_destroy(); // destroy it
+	
+	// set new ID, reopen the session, set saved data
+	session_id($newSID);
+	session_start();
+	$_SESSION = $oldSData;
+	$_SESSION['regenerate_'.e_TOKEN_NAME] = time(); // class2 have to re-create token on the next request
+	unset($oldSID, $newSID, $oldSData);
+}
+// write session data
+session_write_close();
+// SESSION End
+
 global $eTraffic, $error_handler, $db_time, $sql, $mySQLserver, $mySQLuser, $mySQLpassword, $mySQLdefaultdb, $ADMIN_FOOTER, $e107, $pref;
 
 //
@@ -228,23 +258,53 @@
 $page = ob_get_clean();
 
 $etag = md5($page);
-header("Cache-Control: must-revalidate");
-header("ETag: {$etag}");
+
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
+{
+	$IF_NONE_MATCH = str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH']);
+	
+	$data = "IF_NON_MATCH = ".$IF_NONE_MATCH;
+	$data .= "\nEtag = ".$etag;
+	file_put_contents(e_ADMIN."etag_log.txt",$data);
+
+	
+	if($IF_NONE_MATCH == $etag || ($IF_NONE_MATCH == ($etag."-gzip")))
+	{
+		header('HTTP/1.1 304 Not Modified');
+		exit();	
+	}
+}
+
 
 $pref['compression_level'] = 6;
-if(strstr(varset($_SERVER["HTTP_ACCEPT_ENCODING"],""), "gzip")) {
+if(strstr(varset($_SERVER["HTTP_ACCEPT_ENCODING"],""), "gzip"))
+{
 	$browser_support = true;
 }
-if(ini_get("zlib.output_compression") == false && function_exists("gzencode")) {
+if(ini_get("zlib.output_compression") == false && function_exists("gzencode"))
+{
 	$server_support = true;
 }
-if(varset($pref['compress_output'],false) && $server_support == true && $browser_support == true) {
+if(varset($pref['compress_output'],false) && $server_support == true && $browser_support == true)
+{
 	$level = intval($pref['compression_level']);
+	header("ETag: \"{$etag}-gzip\"");
 	$page = gzencode($page, $level);
 	header("Content-Encoding: gzip", true);
 	header("Content-Length: ".strlen($page), true);
 	echo $page;
-} else {
+}
+else 
+{
+	if($browser_support==TRUE) 
+	{
+		header("ETag: \"{$etag}-gzip\"");	
+	}
+	else
+	{
+		header("ETag: \"{$etag}\"");	
+	}
+	
 	header("Content-Length: ".strlen($page), true);
 	echo $page;
 }
diff -x .svn -aruN 0.7.23.src/e107_admin/frontpage.php 0.7.24.src/e107_admin/frontpage.php
--- 0.7.23.src/e107_admin/frontpage.php	2010-07-31 03:45:05.000000000 -0500
+++ 0.7.24.src/e107_admin/frontpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/frontpage.php,v $
-|     $Revision: 11641 $
-|     $Date: 2010-07-31 03:45:29 -0500 (Sat, 31 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/frontpage.php $
+|     $Revision: 11678 $
+|     $Id: frontpage.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_admin/header.php 0.7.24.src/e107_admin/header.php
--- 0.7.23.src/e107_admin/header.php	2010-07-23 17:09:52.000000000 -0500
+++ 0.7.24.src/e107_admin/header.php	2010-09-07 12:02:03.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /e107_admin/header.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        �Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|   $Source: /cvs_backup/e107_0.7/e107_admin/header.php,v $
-|   $Revision: 11615 $
-|   $Date: 2010-07-23 17:10:16 -0500 (Fri, 23 Jul 2010) $
-|   $Author: e107coders $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/header.php $
+|     $Revision: 11760 $
+|     $Id: header.php 11760 2010-09-07 17:02:27Z e107steved $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -366,18 +364,26 @@
 			$text = $BUTTONS_START;
 		}
 
-		foreach (array_keys($e107_vars) as $act) {
-			if (!isset($e107_vars[$act]['perm']) || !$e107_vars[$act]['perm'] || getperms($e107_vars[$act]['perm'])) {
-				if ($active_page == $act || (str_replace("?", "", e_PAGE.e_QUERY) == str_replace("?", "", $act))) {
+		foreach (array_keys($e107_vars) as $act) 
+		{
+			if (!isset($e107_vars[$act]['perm']) || !$e107_vars[$act]['perm'] || getperms($e107_vars[$act]['perm'])) 
+			{
+				if ($active_page == $act || (str_replace("?", "", e_PAGE.e_QUERY) == str_replace("?", "", $act))) 
+				{
 					$BUTTON_TEMPLATE = $sub_link ? $SUB_BUTTON_OVER : $BUTTON_OVER;
-				} else {
+				} 
+				else 
+				{
 					$BUTTON_TEMPLATE = $sub_link ? $SUB_BUTTON : $BUTTON;
 				}
 				$replace[0] = str_replace(" ", "&nbsp;", $e107_vars[$act]['text']);
-				$replace[1] = $e107_vars[$act]['link'];
-				if (!empty($e107_vars[$act]['include'])) {
+				$replace[1] = varset($e107_vars[$act]['link'], '');
+				if (!empty($e107_vars[$act]['include'])) 
+				{
 					$replace[2] = $e107_vars[$act]['include'];
-				} else {
+				} 
+				else 
+				{
 					$replace[2] = $js ? "onclick=\"showhideit('".$act."');\"" : "onclick=\"document.location='".$e107_vars[$act]['link']."'; disabled=true;\"";
 				}
 				$replace[3] = $title;
diff -x .svn -aruN 0.7.23.src/e107_admin/image.php 0.7.24.src/e107_admin/image.php
--- 0.7.23.src/e107_admin/image.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/image.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/image.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/image.php $
+|     $Revision: 11678 $
+|     $Id: image.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/includes/beginner.php 0.7.24.src/e107_admin/includes/beginner.php
--- 0.7.23.src/e107_admin/includes/beginner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/includes/beginner.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/includes/beginner.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/includes/beginner.php $
+|     $Revision: 11678 $
+|     $Id: beginner.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/includes/cascade.php 0.7.24.src/e107_admin/includes/cascade.php
--- 0.7.23.src/e107_admin/includes/cascade.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/includes/cascade.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/includes/cascade.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/includes/cascade.php $
+|     $Revision: 11678 $
+|     $Id: cascade.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/includes/categories.php 0.7.24.src/e107_admin/includes/categories.php
--- 0.7.23.src/e107_admin/includes/categories.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/includes/categories.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/includes/categories.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/includes/categories.php $
+|     $Revision: 11678 $
+|     $Id: categories.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/includes/classis.php 0.7.24.src/e107_admin/includes/classis.php
--- 0.7.23.src/e107_admin/includes/classis.php	2010-07-16 16:28:42.000000000 -0500
+++ 0.7.24.src/e107_admin/includes/classis.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/includes/classis.php,v $
-|     $Revision: 11599 $
-|     $Date: 2010-07-16 16:29:06 -0500 (Fri, 16 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/includes/classis.php $
+|     $Revision: 11678 $
+|     $Id: classis.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/includes/combo.php 0.7.24.src/e107_admin/includes/combo.php
--- 0.7.23.src/e107_admin/includes/combo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/includes/combo.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/includes/combo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/includes/combo.php $
+|     $Revision: 11678 $
+|     $Id: combo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/includes/compact.php 0.7.24.src/e107_admin/includes/compact.php
--- 0.7.23.src/e107_admin/includes/compact.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/includes/compact.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/includes/compact.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/includes/compact.php $
+|     $Revision: 11678 $
+|     $Id: compact.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/index.php 0.7.24.src/e107_admin/index.php
--- 0.7.23.src/e107_admin/index.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/index.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/index.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/index.php $
+|     $Revision: 11678 $
+|     $Id: index.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/lancheck.php 0.7.24.src/e107_admin/lancheck.php
--- 0.7.23.src/e107_admin/lancheck.php	2010-07-22 21:53:03.000000000 -0500
+++ 0.7.24.src/e107_admin/lancheck.php	2010-09-22 16:02:33.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/lancheck.php,v $
-|     $Revision: 11613 $
-|     $Date: 2010-07-22 21:53:27 -0500 (Thu, 22 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/lancheck.php $
+|     $Revision: 11810 $
+|     $Id: lancheck.php 11810 2010-09-22 21:02:57Z e107coders $
 |     $Author: e107coders $
 |	  With code from Izydor and Lolo.
 +----------------------------------------------------------------------------+
@@ -69,9 +69,9 @@
 		$diz .= "|        Released under the terms and conditions of the\n";
 		$diz .= "|        GNU General Public License (http://gnu.org).\n";
 		$diz .= "|\n";
-		$diz .= "|        ".chr(36)."Source: $writeit ".chr(36)."\n";
+		$diz .= "|        ".chr(36)."URL: $writeit ".chr(36)."\n";
 		$diz .= "|        ".chr(36)."Revision: 1.0 ".chr(36)."\n";
-		$diz .= "|        ".chr(36)."Date: ".date("Y/m/d H:i:s")." ".chr(36)."\n";
+		$diz .= "|        ".chr(36)."Id: ".date("Y/m/d H:i:s")." ".chr(36)."\n";
 		$diz .= "|        ".chr(36)."Author: ".USERNAME." ".chr(36)."\n";
 		$diz .= "+---------------------------------------------------------------+\n";
 		$diz .= "*".chr(47)."\n\n";
@@ -189,8 +189,16 @@
 
 if(isset($_POST['language_sel']) && isset($_POST['language'])){
 
-	$ns -> tablerender(LAN_CHECK_3.": ".$_POST['language'],check_core_lanfiles($_POST['language']));
-	$ns -> tablerender(LAN_CHECK_3.": ".$_POST['language']."/admin",check_core_lanfiles($_POST['language'],"admin/"));
+	$_SESSION['lancheck_'.$_POST['language']] = array();
+	$_SESSION['lancheck_'.$_POST['language']]['file']	= 0;
+	$_SESSION['lancheck_'.$_POST['language']]['def']	= 0;
+	$_SESSION['lancheck_'.$_POST['language']]['bom']	= 0;
+	$_SESSION['lancheck_'.$_POST['language']]['utf']	= 0;
+	$_SESSION['lancheck_'.$_POST['language']]['total']	= 0;
+
+
+	$core_text = check_core_lanfiles($_POST['language']);
+	$core_admin = check_core_lanfiles($_POST['language'],"admin/");
 
 	$plug_text = "<table class='fborder' style='".ADMIN_WIDTH."'>
 	<tr>
@@ -207,11 +215,11 @@
 		}
 	}
 	$plug_text .= "</table>";
-	$ns -> tablerender(ADLAN_CL_7,$plug_text);
+
 
 	$theme_text = "<table class='fborder' style='".ADMIN_WIDTH."'>
 	<tr>
-	<td class='fcaption'>Theme</td>
+	<td class='fcaption'>".LAN_CHECK_22."</td>
 	<td class='fcaption'>".LAN_CHECK_16."</td>
 	<td class='fcaption'>".$_POST['language']."</td>
 	<td class='fcaption'>".LAN_OPTIONS."</td></tr>";
@@ -224,7 +232,40 @@
 	}
 	$theme_text .= "</table>";
 
-	$ns -> tablerender("Themes",$theme_text);
+	$message .= "<div style='".ADMIN_WIDTH.";text-align:center;padding:20px'>
+	<form name='lancheck' method='post' action='".e_ADMIN."language.php?tools'>";
+	
+	$icon = ($_SESSION['lancheck_'.$_POST['language']]['total']>0) ? ADMIN_FALSE_ICON : ADMIN_TRUE_ICON;	
+	
+	
+	$errors_diz = (defsettrue('LAN_CHECK_23')) ? LAN_CHECK_23 : "Errors Found";
+	
+	$message .= "<div>".$icon." ".$errors_diz.": ".$_SESSION['lancheck_'.$_POST['language']]['total']."</div>";	
+
+	$just_go_diz = (defsettrue('LAN_CHECK_20')) ? LAN_CHECK_20 : "Generate Language Pack";
+	$lang_sel_diz = (defsettrue('LAN_CHECK_21')) ? LAN_CHECK_21 : "Verify Again";
+	
+	$message .= "<span>
+	<br /><br />
+	<input type='hidden' name='language' value='".$_POST['language']."' />
+    <input type='submit' name='just_go' value=\"".$just_go_diz."\" class='button' />
+	</span>
+    </form>
+	<form name='refresh' method='post' action='".e_SELF."'>
+	<span>
+	<input type='hidden' name='language' value='".$_POST['language']."' />
+    <input type='submit' name='language_sel' value=\"".$lang_sel_diz."\" class='button' />
+	</span>
+    </form>
+	</div>";
+		
+	$ns -> tablerender(LAN_CHECK_24.": ".$_POST['language'],$message);
+
+	$ns -> tablerender(LAN_CHECK_3.": ".$_POST['language'], $core_text);
+	$ns -> tablerender(LAN_CHECK_3.": ".$_POST['language']."/admin", $core_admin);
+	$ns -> tablerender(ADLAN_CL_7, $plug_text);
+	$ns -> tablerender(LAN_CHECK_25, $theme_text);
+	
 	require_once(e_ADMIN."footer.php");
 	exit;
 }
@@ -235,16 +276,21 @@
 
 	$English = get_comp_lan_phrases(e_LANGUAGEDIR."English/".$subdir,$checklan);
 	$check = get_comp_lan_phrases(e_LANGUAGEDIR.$checklan."/".$subdir,$checklan);
+	
+	//print_a($check);
+	//return;
+	
 
 	$text .= "<table class='fborder' style='".ADMIN_WIDTH."'>
 	<tr>
 	<td class='fcaption'>".LAN_CHECK_16."</td>
-	<td class='fcaption'>".$_POST['language']." File</td>
+	<td class='fcaption'>".$_POST['language']." ".LAN_CHECK_26."</td>
 	<td class='fcaption'>".LAN_OPTIONS."</td></tr>";
 
 	$keys = array_keys($English);
 
 	sort($keys);
+	$er = "";
 
 	foreach($keys as $k)
 	{
@@ -261,25 +307,31 @@
 				$utf_error = "";
 
 				$bomkey = str_replace(".php","",$k_check);
-				$bom_error = ($check['bom'][$bomkey]) ? "<i>".LAN_CHECK_15."</i><br />" : ""; // illegal chars
+			//	$bom_error = ($check['bom'][$bomkey]) ? "<i>".LAN_CHECK_15."</i><br />" : ""; // illegal chars
+
+				if($check['bom'][$bomkey])
+				{
+					$bom_error = "<i>".LAN_CHECK_15."</i><br />";
+					checkLog('bom',1);;	
+				}
+				else
+				{
+					$bom_error = "";	
+				}
 
 				foreach($subkeys as $sk)
 				{
 					if($utf_error == "" && !is_utf8($check[$k][$sk]))
 					{
 						$utf_error = "<i>".LAN_CHECK_19."</i><br />";
+						checkLog('utf',1);
 					}
 
 					if($sk == "LC_ALL"){
 						$check[$k][$sk] = str_replace(chr(34).chr(34),"",$check[$k][$sk]);
 					}
-
-					if((!array_key_exists($sk,$check[$k]) && $English[$k][$sk] != "") || (trim($check[$k][$sk]) == "" && $English[$k][$sk] != ""))
-					{
-
-						$er .= ($er) ? "<br />" : "";
-						$er .= $sk." ".LAN_CHECK_5;
-					}
+				
+					$er .= check_lan_errors($English[$k],$check[$k],$sk);
 				}
 
 				$style = ($er) ? "forumheader2" : "forumheader3";
@@ -290,6 +342,7 @@
 			}
 			else
 			{
+				checkLog('file',1);
 				$text .= "<tr>
 				<td class='forumheader3' style='width:45%'>{$lnk}</td>
 				<td class='forumheader' style='width:50%'>".LAN_CHECK_4."</td>"; // file missing.
@@ -306,6 +359,68 @@
 	return $text;
 }
 
+function check_lan_errors($english,$translation,$def)
+{
+	$eng_line = $english[$def];
+	$trans_line = $translation[$def];
+	
+	// return $eng_line."<br />".$trans_line."<br /><br />";
+		
+	$error = array();
+	
+	if((!array_key_exists($def,$translation) && $eng_line != "") || (trim($trans_line) == "" && $eng_line != ""))
+	{
+		checkLog('def',1);
+		return $def.": ".LAN_CHECK_5."<br />";
+	}
+	
+	if((strpos($eng_line,"[link=")!==FALSE && strpos($trans_line,"[link=")===FALSE) || (strpos($eng_line,"[b]")!==FALSE && strpos($trans_line,"[b]")===FALSE))
+	{
+		$error[] = $def. ": Missing bbcodes";
+	}
+	elseif((strpos($eng_line,"[")!==FALSE && strpos($trans_line,"[")===FALSE) || (strpos($eng_line,"]")!==FALSE && strpos($trans_line, "]")===FALSE))
+	{
+		$error[] = $def. ": Missing [ and/or ] character(s)";
+	}
+	
+	if((strpos($eng_line,"--LINK--")!==FALSE && strpos($trans_line,"--LINK--")==FALSE))
+	{
+		$error[] = $def. ": Missing --LINK--";
+	}
+	
+	if((strpos($eng_line,"e107.org")!==FALSE && strpos($trans_line,"e107.org")==FALSE))
+	{
+		$error[] = $def. ": Missing e107.org URL";
+	}
+	
+	if((strpos($eng_line,"e107coders.org")!==FALSE && strpos($trans_line,"e107coders.org")==FALSE))
+	{
+		$error[] = $def. ": Missing e107coders.org URL";
+	}
+	
+	if(strip_tags($eng_line) != $eng_line)
+	{
+		$stripped = strip_tags($trans_line);
+				
+		if(($stripped == $trans_line))
+		{					
+			// echo "<br /><br />".$def. "<br />".$stripped."<br />".$trans_line;
+			$error[] = $def. ": Missing HTML tags" ; 		
+		}
+	}
+	
+	checkLog('def',count($error));
+
+	return ($error) ? implode("<br />",$error)."<br />" : "";
+	
+}
+
+
+function checkLog($type='error',$count)
+{
+	$_SESSION['lancheck_'.$_POST['language']][$type] += $count;
+	$_SESSION['lancheck_'.$_POST['language']]['total'] += $count;
+}
 
 function get_lan_file_phrases($dir1,$dir2,$file1,$file2){
 
@@ -418,7 +533,7 @@
 	$comp_dir = $folder[$mode];
 
 	$baselang = get_comp_lan_phrases($comp_dir."/languages/","English",1);
-	$check = get_comp_lan_phrases($comp_dir."/languages/",$target_lan,1);
+	$check = get_comp_lan_phrases($comp_dir."/languages/",$target_lan,1);	
 
 	$text = "";
 	$keys = array_keys($baselang);
@@ -446,20 +561,33 @@
 			$utf_error = "";
 
 			$bomkey = str_replace(".php","",$k_check);
-			$bom_error = ($check['bom'][$bomkey]) ? "<i>".LAN_CHECK_15."</i><br />" : ""; // illegal chars
-
+			if($check['bom'][$bomkey])
+			{
+				$bom_error = "<i>".LAN_CHECK_15."</i><br />";
+				checkLog('bom',1); 
+			}
+			else
+			{
+				$bom_error = "";	
+			}
+		// 	$bom_error = ($check['bom'][$bomkey]) ? "<i>".LAN_CHECK_15."</i><br />" : ""; // illegal chars
+		
 			foreach($subkeys as $sk)
 			{
 				if($utf_error == "" && !is_utf8($check[$k_check][$sk]))
 				{
 					$utf_error = "<i>".LAN_CHECK_19."</i><br />";
+					checkLog('utf',1);
 				}
-
+				
+				/*
 				if(!array_key_exists($sk,$check[$k_check]) || (trim($check[$k_check][$sk]) == "" && $baselang[$k][$sk] != ""))
 				{
 					$er .= ($er) ? "<br />" : "";
 					$er .= $sk." ".LAN_CHECK_5;
 				}
+				*/
+				$er .= check_lan_errors($baselang[$k],$check[$k_check],$sk);
 			}
 
 			$style = ($er) ? "forumheader2" : "forumheader3";
@@ -470,6 +598,7 @@
 		}
 		else
 		{
+			checkLog('file',1);
 			$text .= "<tr>
 			<td class='forumheader3' style='width:20%'>".$comp_name."</td>
 			<td class='forumheader3' style='width:25%'>".str_replace("English/","",$lnk)."</td>
@@ -585,85 +714,62 @@
 
 }
 
-function fill_phrases_array($data,$type) {
+function fill_phrases_array($data,$type)
+{
 
-	$retloc = array();
+	$inComment = FALSE;
 
-	foreach($data as $line){
-		
-		$line = str_replace('define (',"define(",$line);
+	$retloc = array();
+	
+	foreach($data as $line)
+	{
+		$line = trim($line);
 		
-		//echo "line--> ".$line."<br />";
-		if (strpos($line,"define(") !== FALSE && strpos($line,");") === FALSE)
+		if(strpos($line,"/*")!==FALSE && strpos($line,"*/")!==FALSE ) // ie. /* and */ on the same line. 
 		{
-			$indef=1;
-			$bigline="";
-			// echo "big1 -->".$line."<br />";
+			preg_match('#\/\*(.+?)\*\/#s', $line, $match);
+			$srch = "/*".$match[1]."*/";
+			$line = trim(str_replace($srch,'',$line));
 		}
-		if ($indef)
+				
+		if(strpos($line,"/*")!==FALSE ) // grab any text prior to /*
 		{
-			$bigline.=str_replace("\n","",$line);
-			// echo "big2 -->".$line."<br />";
+			$inComment = TRUE;
+			$line = trim(strstr($line,"/*",TRUE));
 		}
-		if (strpos($line,"define(") === FALSE && strpos($line,");") !== FALSE)
+		
+		if(strpos($line,"*/")!==FALSE ) // grab any text after */
 		{
-			$indef=0;
-			$we_have_bigline=1;
-			// echo "big3 -->".$line."<br />";
+			$inComment = FALSE;
+			$line =  trim(substr(strstr($line,"*/"),2));	
 		}
-
+				
+		if (strlen($line) == 0 || substr($line,0,2) == "//" || $inComment==TRUE )
+		{
+			continue;	
+		} 
+						
 		if(strpos($line,"setlocale(") !== FALSE)
 		{
-			$indef=1;
-			$we_have_bigline=0;
+			$pos = substr(strstr($line,","),1);
+			$rep = array(");","\n",'""');
+			$val = str_replace($rep,"",$pos);
+			$retloc[$type]['LC_ALL']= $val;
+			continue;
 		}
-
-		if ((strpos($line,"define(") !== FALSE && strpos($line,");") !== FALSE && substr(ltrim($line),0,2) != "//") || $we_have_bigline || strpos($line,"setlocale(") !== FALSE)
+			
+		// Steve's magic. 			
+		if(preg_match('~^DEFINE\s*\(\s*(\'|\")(.+?)(?:\\1)\s*\,\s*(\'|\")(.+?)(?:\\3\)\s*;)~i', $line, $matches))
 		{
-
-			if ($we_have_bigline)
+			if(!isset($retloc[$type][$matches[2]]))
 			{
-				$we_have_bigline=0;
-				$line=$bigline;
-				// echo "big -->".$line."<br />";
-			}
-			$ndef = "";
-			//echo "_ndefline -->".$line."<br />";
-			if (strpos($line,"defined(") !== FALSE )
-			{
-				$ndef = "ndef++";
-				$line = substr($line,strpos($line,"define("));
-			}
-
-			if(strpos($line,"setlocale(") !== FALSE)
-			{
-				$pos = substr(strstr($line,","),1);
-				$rep = array(");","\n",'""');
-				$val = str_replace($rep,"",$pos);
-				$retloc[$type]['LC_ALL']= $val;
-//				$retloc['orig']['LC_ALL']= "'en'";
-			}
-			else
-			{
-
-				//echo "ndefline: ".$line."<br />";
-				if(preg_match("#\"(.*?)\".*?\"(.*)\"#",$line,$matches) ||
-				preg_match("#\'(.*?)\'.*?\"(.*)\"#",$line,$matches) ||
-				preg_match("#\"(.*?)\".*?\'(.*)\'#",$line,$matches) ||
-				preg_match("#\'(.*?)\'.*?\'(.*)\'#",$line,$matches) ||
-				preg_match("#\((.*?)\,.*?\"(.*)\"#",$line,$matches) ||
-				preg_match("#\((.*?)\,.*?\'(.*)\'#",$line,$matches))
-				{
-					//echo "get_lan -->".$matches[1]." :: ".$ndef.$matches[2]."<br />";
-					if(!isset($retloc[$type][$matches[1]]))
-					{
-						$retloc[$type][$matches[1]]= $ndef.$matches[2];
-					}
-				}
-			}
-		}
+				$retloc[$type][$matches[2]]= $ndef.$matches[4];
+				// echo "get_lan -->".$matches[2]." :: ".$ndef.$matches[4]."<br />";
+			}	
+		}	
+	
 	}
-
+	
 	return $retloc;
 }
 
diff -x .svn -aruN 0.7.23.src/e107_admin/language.php 0.7.24.src/e107_admin/language.php
--- 0.7.23.src/e107_admin/language.php	2010-08-14 18:30:25.000000000 -0500
+++ 0.7.24.src/e107_admin/language.php	2010-09-22 16:02:33.000000000 -0500
@@ -4,14 +4,14 @@
 |     e107 website system
 |
 |     Copyright (c) e107 Inc. 2008-2010
-|     http://e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/language.php,v $
-|     $Revision: 11657 $
-|     $Date: 2010-08-14 18:30:49 -0500 (Sat, 14 Aug 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/language.php $
+|     $Revision: 11810 $
+|     $Id: language.php 11810 2010-09-22 21:02:57Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -27,13 +27,19 @@
 require_once("auth.php");
 require_once(e_HANDLER."form_handler.php");
 require_once(e_HANDLER."file_class.php");
+require_once(e_HANDLER."language_class.php");
+$ln = new language;
 $fl = new e_file;
 $rs = new form;
 
 $tabs = table_list(); // array("news","content","links");
-$lanlist = explode(",",e_LANLIST);
+
+$lanlist = getLanlist();
 $message = "";
 
+
+
+
 if (e_QUERY) {
     $tmp = explode('.', e_QUERY);
     $action = $tmp[0];
@@ -135,6 +141,8 @@
  */
 function share($newfile)
 {
+	global $pref;
+	
 	if(!$newfile)
 	{
 		return;
@@ -146,32 +154,48 @@
 	$email_message = "<br />Site: <a href='".SITEURL."'>".SITENAME."</a>
 	<br />User: ".USERNAME."\n
 	<br />Email: ".USEREMAIL."\n
+	<br />Language: ".$_POST['language']."\n
 	<br />IP:".USERIP."
-	<br />...would like to contribute the following language pack for e107. (see attached):
-	";
+	<br />...would like to contribute the following language pack for e107. (see attached)<br />:
+		
+	
+	<br />Missing Files: ".$_SESSION['lancheck_'.$_POST['language']]['file']."
+	<br />Bom Errors : ".$_SESSION['lancheck_'.$_POST['language']]['bom']."
+	<br />UTF Errors : ".$_SESSION['lancheck_'.$_POST['language']]['utf']."
+	<br />Definition Errors : ".$_SESSION['lancheck_'.$_POST['language']]['def']."
+	<br />Total Errors: ".$_SESSION['lancheck_'.$_POST['language']]['total'];
+	
+	
 	
 	require_once(e_HANDLER."mail.php");
 	
-	$send_to = "languagepacks@e107inc.org"; 
+	$send_to = (!$_POST['contribute_pack']) ? "languagepacks@e107inc.org" : "certifiedpack@e107inc.org"; 
 	$to_name = "e107 Inc.";
 	$Cc = "";
 	$Bcc = "";
 	$returnpath='';
 	$returnreceipt='';
 	$inline ="";
-	$subject = basename($newfile);
+		
+	$subject = (!$_POST['contribute_pack']) ? "[0.7 LanguagePack] " : "[0.7 Certified LanguagePack] ";		
+	$subject .= basename($newfile);
 	
-	if(!sendemail($send_to, $subject, $email_message, $to_name, "", "", $newfile, $Cc, $Bcc, $returnpath, $returnreceipt,$inline))
+	if(!@sendemail($send_to, $subject, $email_message, $to_name, '', '', $newfile, $Cc, $Bcc, $returnpath, $returnreceipt,$inline))
 	{
 		$text = "<div style='padding:40px'>";
-		$text .= defined('LANG_LAN_EML') ?  "<b>".LANG_LAN_EML."</b>" : "<b>Please email your language pack to:</b>";
-		$text .= " <a href='mailto:".$send_to."'>".$send_to."</a>";
+		$text .= defined('LANG_LAN_EML') ?  "<b>".LANG_LAN_EML."</b>" : "<b>There was a problem sending the language-pack. Please email your verified language pack to:</b>";
+		$text .= " <a href='mailto:".$send_to."?subject=".$subject."'>".$send_to."</a>";
 		$text .= "</div>";
 		
-		return $text;
-	} 
+		return $text;	
+	}
+	elseif($_POST['contribute_pack'])
+	{
+		return "<div style='padding:40px'>Pack Sent to e107 Inc. A confirmation email will be sent to ".$pref['siteadminemail']." once it is received.<br />Please also make sure that email coming from ".$send_to." is not blocked by your spam filter.</div>";
+	}
+
 	
-	return "";
+
 }
 
 unset($text);
@@ -466,22 +490,22 @@
     include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_lancheck.php");
 
     $text .= "
-    <form name='lancheck' method='post' action='".e_ADMIN."lancheck.php'>
+    <form id='lancheck' method='post' action='".e_ADMIN."lancheck.php'>
     <table class='fborder' style='".ADMIN_WIDTH."'>
     <tr>
-    <td class='fcaption' style='width:40%'>".LAN_CHECK_1."</td>
-    <td class='forumheader3' style='text-align:center'>
+    <td class='fcaption' style='width:30%'>".LAN_CHECK_1."</td>
+    <td class='forumheader3'>
     <select name='language' class='tbox'>
     <option value=''>".LAN_SELECT."</option>";
 
-    $languages = explode(",",e_LANLIST);
-    sort($languages);
+    $languages = getLanList();
 
     foreach($languages as $lang)
     {
         if($lang != "English")
         {
-            $text .= "<option value='{$lang}' >{$lang}</option>\n";
+        	
+            $text .= "<option value='{$lang}'>{$lang}</option>\n";
         }
     }
 
@@ -492,28 +516,36 @@
     </table></form>";
 	
 	  $text .= "
-    <form name='lancheck' method='post' action='".e_SELF."?tools'>
+    <form id='tools' method='post' action='".e_SELF."?tools'>
     <table class='fborder' style='".ADMIN_WIDTH."'>
     <tr>
-    <td class='fcaption' style='width:40%'>".LANG_LAN_23."</td>
-    <td class='forumheader3' style='text-align:center'>
+    <td class='fcaption' style='width:30%'>".LANG_LAN_23."</td>
+    <td class='forumheader3' >
     <select name='language' class='tbox'>
     <option value=''>".LAN_SELECT."</option>";
 
-    $languages = explode(",",e_LANLIST);
-    sort($languages);
+  
 
     foreach($languages as $lang)
     {
         if($lang != "English")
         {
-            $text .= "<option value='{$lang}' >{$lang}</option>\n";
+        	$sel = ($_POST['language']==$lang) ? "selected='selected'" : "";
+            $text .= "<option value='{$lang}' {$sel}>{$lang}</option>\n";
         }
     }
 
     $text .= "
     </select>
-    <input type='submit' name='ziplang' value=\"".LANG_LAN_24."\" class='button' />
+    <input type='submit' name='ziplang' value=\"".LANG_LAN_24."\" class='button' />";
+	
+	$srch = array("[","]");
+	$repl = array("<a rel='external' href='http://e107.org/news.php?extend.876.1'>","</a>");
+	$diz = (defsettrue("LANG_LAN_28")) ? LANG_LAN_28 : "Check this box if you're an [e107 certified translator].";
+	
+	$text .= " <input type='checkbox' name='contribute_pack' value='1' />".str_replace($srch,$repl,$diz);
+	
+	$text .= "
     </td></tr>
     </table></form>";
 	
@@ -522,12 +554,55 @@
     $ns->tablerender(LANG_LAN_21, $text);
 }
 
-
+function find_locale($language)
+{
+	if(!is_readable(e_LANGUAGEDIR.$language."/".$language.".php"))
+	{
+		return FALSE;		
+	}
+		
+	$code = file_get_contents(e_LANGUAGEDIR.$language."/".$language.".php");
+	$tmp = explode("\n",$code);
+	
+	$srch = array("define","'",'"',"(",")",";","CORE_LC2","CORE_LC",",");
+		
+	foreach($tmp as $line)
+	{
+		if(strpos($line,"CORE_LC") !== FALSE && (strpos($line,"CORE_LC2") === FALSE))
+		{
+			$lc = trim(str_replace($srch,"",$line));
+		}
+		elseif(strpos($line,"CORE_LC2") !== FALSE)
+		{
+			$lc2 = trim(str_replace($srch,"",$line));
+		}		
+			
+	}
+	
+	if(!isset($lc) || !isset($lc2) || $lc=="" || $lc2=="")
+	{
+		return FALSE;	
+	}
+		
+	 return substr($lc,0,2)."_".strtoupper(substr($lc2,0,2)); 
+	// 
+}
 // ----------------------------------------------------------------------------
 
 function zip_up_lang($language)
 {
 	global $tp;
+	$ret = array();
+	$ret['file'] = "";
+	
+	if(!isset($_SESSION['lancheck_'.$language]))
+	{
+		$ret = array();
+		$ret['error'] = TRUE;
+		$ret['message'] = (defined('LANG_LAN_27')) ? LANG_LAN_27 : "Please verify your language files ('Verify') then try again.";
+		return $ret;	
+	}
+	
 		
 	if(!is_writable(e_FILE."public"))
 	{
@@ -536,11 +611,11 @@
 		return $ret;		
 	}
 	
-	if (is_readable(e_ADMIN."ver.php"))
+	if(is_readable(e_ADMIN."ver.php"))
 	{
-		include (e_ADMIN."ver.php");
+		include(e_ADMIN."ver.php");
 	}
-	 
+	
 	 $core_plugins = array(
 	"alt_auth","banner_menu","blogcalendar_menu","calendar_menu","chatbox_menu",
 	"clock_menu","comment_menu","compliance_menu","content","counter_menu",
@@ -554,21 +629,41 @@
 	 $core_themes = array("crahan","e107v4a","human_condition","interfectus","jayya",
 	 "khatru","kubrick","lamb","leaf","newsroom","reline","sebes","vekna_blue");
 
-	require_once (e_HANDLER.'pclzip.lib.php');
+	require_once(e_HANDLER.'pclzip.lib.php');
 	list($ver, $tmp) = explode(" ", $e107info['e107_version']);
-	$newfile = e_FILE."public/e107_".$ver."_".$language."_utf8.zip";
+	if(!$locale = find_locale($language))
+	{
+		$ret['error'] = TRUE;
+		$file = "e107_languages/{$language}/{$language}.php";
+		$def = (defined('LANG_LAN_25')) ? LANG_LAN_25 : "Please check that CORE_LC and CORE_LC2 have values in [lcpath] and try again.";
+		$ret['message'] = str_replace("[lcpath]",$file,$def); // 
+		return $ret;	
+	}
+		
+	global $THEMES_DIRECTORY, $PLUGINS_DIRECTORY, $LANGUAGES_DIRECTORY, $HANDLERS_DIRECTORY, $HELP_DIRECTORY;
+		
+	if(($HANDLERS_DIRECTORY != "e107_handlers/") || ( $LANGUAGES_DIRECTORY != "e107_languages/") || ($THEMES_DIRECTORY != "e107_themes/") || ($HELP_DIRECTORY != "e107_docs/help/") || ($PLUGINS_DIRECTORY != "e107_plugins/"))
+	{
+		$ret['error'] = TRUE;
+		$ret['message'] = (defined('LANG_LAN_26')) ? LANG_LAN_26 : "Please make sure you are using default folder names in e107_config.php (eg. e107_languages/, e107_plugins/ etc.) and try again.";
+		return $ret;	
+	}	
+		
+	$newfile = e_FILE."public/e107_".$ver."_".$language."_".$locale."-utf8.zip";
+	
 	$archive = new PclZip($newfile);
-	$core = grab_lans(e_LANGUAGEDIR.$language."/", $language);
-	$plugs = grab_lans(e_PLUGIN, $language, $core_plugins);
-	$theme = grab_lans(e_THEME, $language, $core_themes);
-	$file = array_merge($core, $plugs, $theme);
+	$core = grab_lans(e_LANGUAGEDIR.$language."/", $language,'',0);
+	$core_admin = grab_lans(e_BASE.$LANGUAGES_DIRECTORY.$language."/admin/", $language,'',2);
+	$plugs = grab_lans(e_BASE.$PLUGINS_DIRECTORY, $language, $core_plugins); // standardized path. 
+	$theme  = grab_lans(e_BASE.$THEMES_DIRECTORY, $language, $core_themes);
+	$docs = grab_lans(e_BASE.$HELP_DIRECTORY,$language);
+	$handlers = grab_lans(e_BASE.$HANDLERS_DIRECTORY,$language); // standardized path. 
+		
+	$file = array_merge($core,$core_admin, $plugs, $theme, $docs, $handlers);
 	$data = implode(",", $file);
-	
-	$ret = array();
-	
+				
 	if ($archive->create($data) == 0)
-	{
-		
+	{		
 		$ret['error'] = TRUE;
 		$ret['message'] = $archive->errorInfo(true);
 		return $ret;
@@ -583,41 +678,73 @@
 	}
 }
 
+function getLanList()
+{
+	global $ln;
+	
+	$lst = explode(",",e_LANLIST);
+	$valid_langs = $ln->list;
+	$list = array();
+	
+	foreach($lst as $lang)
+	{
+		if(in_array($lang,$valid_langs))
+		{
+			$list[] = $lang;
+		}
+	}
+	
+	sort($list);
+	return $list;	
+}
 
-function grab_lans($path, $language, $filter = "")
+function grab_lans($path, $language, $filter = "",$depth=5)
 {
-	global $fl;
+	global $fl,$ln;
 	
-	if ($lanlist = $fl->get_files($path, "", "standard", 4))
+	if ($lanlist = $fl->get_files($path, "^[\w]+(\.php|\.js){0,1}$", "standard", $depth))
 	{
 		sort($lanlist);
 	}
 	else
 	{
-		return;
+		return array();
 	}
+	
+	
 	$pzip = array();
 	
+	$isocode = $ln->convert($language);
+	
+
 	
 	foreach ($lanlist as $p)
 	{	
 		$fullpath = $p['path'].$p['fname'];
-		
-		if($p['fname'] == ($language."_custom.php"))
+						
+		if($p['fname'] == ($language."_custom.php") || ($p['fname'] == ($language."_config.php")))
 		{
 			continue;
 		}
 		
-		if (strpos($fullpath, $language) !== FALSE)
+		$phpmailer = "phpmailer.lang-".$isocode.".php";
+		$tinyMce1 = "/langs/".$isocode.".js";
+		$tinyMce2 = "/langs/".$isocode."_dlg.js";
+		
+		
+		if (strpos($fullpath, $language) !== FALSE || strpos($fullpath,$phpmailer)!==FALSE || strpos($fullpath,$tinyMce1)!==FALSE || strpos($fullpath,$tinyMce2)!==FALSE)
 		{
 			if(is_array($filter))
 			{
-				$dir =  basename(dirname($p['path']));	
-
-				if(in_array($dir,$filter))
+				$dir =  basename(dirname($p['path']));
+				foreach($filter as $val)
 				{
-					$pzip[] = $fullpath;
-				}			
+					if(strpos($fullpath,$val)!==FALSE)
+					{
+						$pzip[] = $fullpath;	
+					}
+				}
+		
 			}
 			else
 			{
@@ -626,6 +753,7 @@
 			
 		}
 	}
+	
 	return $pzip;
 }
 
@@ -661,4 +789,4 @@
     show_admin_menu(ADLAN_132, $action, $var);
 }
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_admin/links.php 0.7.24.src/e107_admin/links.php
--- 0.7.23.src/e107_admin/links.php	2010-07-23 18:16:05.000000000 -0500
+++ 0.7.24.src/e107_admin/links.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/links.php,v $
-|     $Revision: 11617 $
-|     $Date: 2010-07-23 18:16:29 -0500 (Fri, 23 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/links.php $
+|     $Revision: 11678 $
+|     $Id: links.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 |
 | links.php?debug shows stored data for each link after name (before constant conversion)
diff -x .svn -aruN 0.7.23.src/e107_admin/mailout.php 0.7.24.src/e107_admin/mailout.php
--- 0.7.23.src/e107_admin/mailout.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/mailout.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/mailout.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/mailout.php $
+|     $Revision: 11678 $
+|     $Id: mailout.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/menus.php 0.7.24.src/e107_admin/menus.php
--- 0.7.23.src/e107_admin/menus.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/menus.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/menus.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/menus.php $
+|     $Revision: 11678 $
+|     $Id: menus.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/message.php 0.7.24.src/e107_admin/message.php
--- 0.7.23.src/e107_admin/message.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/message.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/message.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/message.php $
+|     $Revision: 11678 $
+|     $Id: message.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/meta.php 0.7.24.src/e107_admin/meta.php
--- 0.7.23.src/e107_admin/meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/meta.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/meta.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/meta.php $
+|     $Revision: 11678 $
+|     $Id: meta.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/modcomment.php 0.7.24.src/e107_admin/modcomment.php
--- 0.7.23.src/e107_admin/modcomment.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/modcomment.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/modcomment.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/modcomment.php $
+|     $Revision: 11678 $
+|     $Id: modcomment.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/newspost.php 0.7.24.src/e107_admin/newspost.php
--- 0.7.23.src/e107_admin/newspost.php	2010-08-13 15:51:16.000000000 -0500
+++ 0.7.24.src/e107_admin/newspost.php	2010-09-16 12:16:25.000000000 -0500
@@ -1,94 +1,86 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        �Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|   $Source: /cvs_backup/e107_0.7/e107_admin/newspost.php,v $
-|   $Revision: 11655 $
-|   $Date: 2010-08-13 15:51:40 -0500 (Fri, 13 Aug 2010) $
-|   $Author: e107steved $
-+---------------------------------------------------------------+
-
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/newspost.php $
+|     $Revision: 11789 $
+|     $Id: newspost.php 11789 2010-09-16 17:16:49Z nlstart $
+|     $Author: nlstart $
++----------------------------------------------------------------------------+
 */
-require_once("../class2.php");
+require_once('../class2.php');
 
-if (!getperms("H")) {
-	header("location:".e_BASE."index.php");
+if (!getperms('H')) 
+{
+	header('location:'.e_BASE.'index.php');
 	exit;
 }
-require_once(e_HANDLER."calendar/calendar_class.php");
+require_once(e_HANDLER.'calendar/calendar_class.php');
 $cal = new DHTML_Calendar(true);
-function headerjs(){
+function headerjs()
+{
   	global $cal;
     $js = $cal->load_files();
-
-   return $js;
+	return $js;
 }
 $e_sub_cat = 'news';
-$e_wysiwyg = "data,news_extended";
+$e_wysiwyg = 'data,news_extended';
 
 // -------- Presets. ------------  // always load before auth.php
-require_once(e_HANDLER."preset_class.php");
-$pst = new e_preset;
-$pst->form = "dataform"; // form id of the form that will have it's values saved.
-$pst->page = "newspost.php?create"; // display preset options on which page(s).
-$pst->id = "admin_newspost";
+require_once(e_HANDLER.'preset_class.php');
+$pst       = new e_preset;
+$pst->form = 'dataform'; // form id of the form that will have it's values saved.
+$pst->page = 'newspost.php?create'; // display preset options on which page(s).
+$pst->id   = 'admin_newspost';
 // ------------------------------
 
 $newspost = new newspost;
-require_once("auth.php");
+require_once('auth.php');
 $pst->save_preset('news_datestamp'); // save and render result using unique name. Don't save item datestamp
-
-require_once(e_HANDLER."userclass_class.php");
-require_once(e_HANDLER."news_class.php");
-require_once(e_HANDLER."ren_help.php");
-require_once(e_HANDLER."form_handler.php");
-require_once(e_HANDLER."file_class.php");
+require_once(e_HANDLER.'userclass_class.php');
+require_once(e_HANDLER.'news_class.php');
+require_once(e_HANDLER.'ren_help.php');
+require_once(e_HANDLER.'form_handler.php');
+require_once(e_HANDLER.'file_class.php');
 
 $fl = new e_file;
 $rs = new form;
 $ix = new news;
 
-
 if (e_QUERY) 
 {
-	$tmp = explode(".", e_QUERY);
-	$action = $tmp[0];
+	$tmp 		= explode('.', e_QUERY);
+	$action 	= $tmp[0];
 	$sub_action = varset($tmp[1],'');
-	$id = intval(varset($tmp[2],0));
+	$id 		= intval(varset($tmp[2],0));
 	$sort_order = varset($tmp[2],'desc');
-	$from = intval(varset($tmp[3],0));
+	$from 		= intval(varset($tmp[3],0));
 	unset($tmp);
 }
-
 $from = ($from ? $from : 0);
 $amount = 10;
 
-// ##### Main loop -----------------------------------------------------------------------------------------------------------------------
-
+// ##### Main loop -----------------------------------------------------------
 if(isset($_POST['news_userclass']))
 {
-	$_POST['news_class'] = implode(",", array_keys($_POST['news_userclass']));
+	$_POST['news_class'] = implode(',', array_keys($_POST['news_userclass']));
 }
 
-
-
 if (isset($_POST['news_comments_recalc']))
 {
-$qry = "SELECT 
-		COUNT(`comment_id`) AS c_count,
-		`comment_item_id`
-		FROM `#comments`
-		WHERE (`comment_type`='0') OR (`comment_type`='news')
-		GROUP BY `comment_item_id`";
-		
+	$qry = "SELECT 
+			COUNT(`comment_id`) AS c_count,
+			`comment_item_id`
+			FROM `#comments`
+			WHERE (`comment_type`='0') OR (`comment_type`='news')
+			GROUP BY `comment_item_id`";
 	if ($sql->db_Select_gen($qry))
 	{
 		while ($row = $sql->db_Fetch(MYSQL_ASSOC))
@@ -99,79 +91,76 @@
 	$newspost->show_message(LAN_NEWS_53);
 }
 
-
-
 if(isset($_POST['delete']))
 {
 	$tmp = array_keys($_POST['delete']);
-	list($delete, $del_id) = explode("_", $tmp[0]);
+	list($delete, $del_id) = explode('_', $tmp[0]);
 }
 
-
-if ($delete == "main" && $del_id)
+if ($delete == 'main' && $del_id)
 {
+	$del_id = intval($del_id);
 	if ($sql->db_Count('news','(*)',"WHERE news_id = '{$del_id}'"))
 	{
-		$e_event->trigger("newsdel", $del_id);
-		if($sql->db_Delete("news", "news_id='$del_id' "))
+		$e_event->trigger('newsdel', $del_id);
+		if($sql->db_Delete('news', "news_id='{$del_id}'"))
 		{
-			$newspost->show_message(NWSLAN_31." #".$del_id." ".NWSLAN_32);
-			$e107cache->clear("news.php");
-			$e107cache->clear("othernews");
-			$e107cache->clear("othernews2");
-
-			admin_purge_related("news", $del_id);
+			$newspost->show_message(NWSLAN_31.' #'.$del_id.' '.NWSLAN_32);
+			$e107cache->clear('news.php');
+			$e107cache->clear('othernews');
+			$e107cache->clear('othernews2');
+			admin_purge_related('news', $del_id);
 		}
 	}
 	unset($delete, $del);
 }
 
-
-if ($delete == "category" && $del_id) {
-	if ($sql->db_Delete("news_category", "category_id='$del_id' ")) {
-		$newspost->show_message(NWSLAN_33." #".$del_id." ".NWSLAN_32);
+if ($delete == 'category' && $del_id)
+{
+	if ($sql->db_Delete('news_category', "category_id='{$del_id}'"))
+	{
+		$newspost->show_message(NWSLAN_33.' #'.$del_id.' '.NWSLAN_32);
 		unset($delete, $del_id);
 	}
 }
 
-
-if($delete == "sn" && $del_id)
+if($delete == 'sn' && $del_id)
 {
-	if ($sql->db_Delete("submitnews", "submitnews_id='$del_id' "))
+	if ($sql->db_Delete('submitnews', "submitnews_id='{$del_id}'"))
 	{
-		$newspost->show_message(NWSLAN_34." #".$del_id." ".NWSLAN_32);
-		$e107cache->clear("news.php");
-		$e107cache->clear("othernews");
-		$e107cache->clear("othernews2");
+		$newspost->show_message(NWSLAN_34.' #'.$del_id.' '.NWSLAN_32);
+		$e107cache->clear('news.php');
+		$e107cache->clear('othernews');
+		$e107cache->clear('othernews2');
 		unset($delete, $del_id);
 	}
 }
 
-
 if (isset($_POST['submitupload'])) 
 {
-	$pref['upload_storagetype'] = "1";
-	require_once(e_HANDLER."upload_handler.php");
-
-	$uploaded = file_upload(e_IMAGE."newspost_images/");
-
-	foreach($_POST['uploadtype'] as $key=>$uploadtype){
-		if($uploadtype == "thumb"){
-			rename(e_IMAGE."newspost_images/".$uploaded[$key]['name'],e_IMAGE."newspost_images/thumb_".$uploaded[$key]['name']);
+	$pref['upload_storagetype'] = '1';
+	require_once(e_HANDLER.'upload_handler.php');
+	$uploaded = file_upload(e_IMAGE.'newspost_images/');
+	foreach($_POST['uploadtype'] as $key=>$uploadtype)
+	{
+		if($uploadtype == 'thumb')
+		{
+			rename(e_IMAGE.'newspost_images/'.$uploaded[$key]['name'],e_IMAGE.'newspost_images/thumb_'.$uploaded[$key]['name']);
 		}
 
-		if($uploadtype == "file"){
-			rename(e_IMAGE."newspost_images/".$uploaded[$key]['name'],e_FILE."downloads/".$uploaded[$key]['name']);
+		if($uploadtype == 'file')
+		{
+			rename(e_IMAGE.'newspost_images/'.$uploaded[$key]['name'],e_FILE.'downloads/'.$uploaded[$key]['name']);
 		}
 
-		if ($uploadtype == "resize" && $_POST['resize_value']) {
-			require_once(e_HANDLER."resize_handler.php");
-			resize_image(e_IMAGE."newspost_images/".$uploaded[$key]['name'], e_IMAGE."newspost_images/".$uploaded[$key]['name'], $_POST['resize_value'], "copy");
+		if ($uploadtype == 'resize' && $_POST['resize_value'])
+		{
+			require_once(e_HANDLER.'resize_handler.php');
+			resize_image(e_IMAGE.'newspost_images/'.$uploaded[$key]['name'], e_IMAGE.'newspost_images/'.$uploaded[$key]['name'], $_POST['resize_value'], 'copy');
 		}
 	}
 }
 
-
 // required.
 if (isset($_POST['preview'])) 
 {
@@ -180,23 +169,27 @@
 	$newspost->preview_item($id);
 }
 
-
 if (isset($_POST['submit_news'])) 
 {
 	$newspost->submit_item($sub_action, $id);
-	$e107cache->clear("news.php");
-	$e107cache->clear("othernews");
-	$e107cache->clear("othernews2");
-	$action = "main";
+	$e107cache->clear('news.php');
+	$e107cache->clear('othernews');
+	$e107cache->clear('othernews2');
+	$action = 'main';
 	unset($sub_action, $id);
 }
 
-if (isset($_POST['create_category'])) {
-	if ($_POST['category_name']) {
-		if (empty($_POST['category_button'])) {
-			$handle = opendir(e_IMAGE."icons");
-			while ($file = readdir($handle)) {
-				if ($file != "." && $file != ".." && $file != "/" && $file != "null.txt" && $file != "CVS") {
+if (isset($_POST['create_category']))
+{
+	if ($_POST['category_name'])
+	{
+		if (empty($_POST['category_button']))
+		{
+			$handle = opendir(e_IMAGE.'icons');
+			while ($file = readdir($handle))
+			{
+				if ($file != '.' && $file != '..' && $file != '/' && $file != 'null.txt' && $file != 'CVS')
+				{
 					$iconlist[] = $file;
 				}
 			}
@@ -204,58 +197,58 @@
 			$_POST['category_button'] = $iconlist[0];
 		}
 		$_POST['category_name'] = $tp->toDB($_POST['category_name']);
-		$sql->db_Insert("news_category", "'0', '".$_POST['category_name']."', '".$_POST['category_button']."'");
+		$sql->db_Insert('news_category', "'0', '".$_POST['category_name']."', '".$_POST['category_button']."'");
 		$newspost->show_message(NWSLAN_35);
 	}
 }
 
-if (isset($_POST['update_category'])) {
-	if ($_POST['category_name']) {
-		$category_button = ($_POST['category_button'] ? $_POST['category_button'] : "");
+if (isset($_POST['update_category'])) 
+{
+	if ($_POST['category_name']) 
+	{
+		$category_button = ($_POST['category_button'] ? $_POST['category_button'] : '');
 		$_POST['category_name'] = $tp->toDB($_POST['category_name']);
-		$sql->db_Update("news_category", "category_name='".$_POST['category_name']."', category_icon='".$category_button."' WHERE category_id='".$_POST['category_id']."'");
+		$sql->db_Update('news_category', "category_name='".$_POST['category_name']."', category_icon='".$category_button."' WHERE category_id='".$_POST['category_id']."'");
 		$newspost->show_message(NWSLAN_36);
 	}
-	$e107cache->clear("news.php");
-	$e107cache->clear("othernews");
-	$e107cache->clear("othernews2");
+	$e107cache->clear('news.php');
+	$e107cache->clear('othernews');
+	$e107cache->clear('othernews2');
 }
 
 if (isset($_POST['save_prefs'])) 
 {
-	$pref['newsposts'] = $_POST['newsposts'];
-	$pref['newsposts_archive'] = $_POST['newsposts_archive'];
-	$pref['newsposts_archive_title'] = $tp->toDB($_POST['newsposts_archive_title']);
-	$pref['news_cats'] = $_POST['news_cats'];
-	$pref['nbr_cols'] = $_POST['nbr_cols'];
-	$pref['subnews_attach'] = $_POST['subnews_attach'];
-	$pref['subnews_resize'] = $_POST['subnews_resize'];
-	$pref['subnews_class'] = $_POST['subnews_class'];
-	$pref['subnews_htmlarea'] = $_POST['subnews_htmlarea'];
-	$pref['subnews_hide_news'] = $_POST['subnews_hide_news'];
-	$pref['news_subheader'] = $tp->toDB($_POST['news_subheader']);
-	$pref['news_newdateheader'] = $_POST['news_newdateheader'];
-	$pref['news_unstemplate'] = $_POST['news_unstemplate'];
-
+	$pref['newsposts']					= $_POST['newsposts'];
+	$pref['newsposts_archive']			= $_POST['newsposts_archive'];
+	$pref['newsposts_archive_title']	= $tp->toDB($_POST['newsposts_archive_title']);
+	$pref['news_cats']					= $_POST['news_cats'];
+	$pref['nbr_cols']					= $_POST['nbr_cols'];
+	$pref['subnews_attach']				= $_POST['subnews_attach'];
+	$pref['subnews_resize']				= $_POST['subnews_resize'];
+	$pref['subnews_class']				= $_POST['subnews_class'];
+	$pref['subnews_htmlarea']			= $_POST['subnews_htmlarea'];
+	$pref['subnews_hide_news']			= $_POST['subnews_hide_news'];
+	$pref['news_subheader']				= $tp->toDB($_POST['news_subheader']);
+	$pref['news_newdateheader']			= $_POST['news_newdateheader'];
+	$pref['news_unstemplate']			= $_POST['news_unstemplate'];
 	save_prefs();
-	$e107cache->clear("news.php");
-	$e107cache->clear("othernews");
-	$e107cache->clear("othernews2");
+	$e107cache->clear('news.php');
+	$e107cache->clear('othernews');
+	$e107cache->clear('othernews2');
 	$newspost->show_message(NWSLAN_119);
 }
 
-if (!e_QUERY || $action == "main") 
+if (!e_QUERY || $action == 'main') 
 {
   $newspost->show_existing_items($action, $sub_action, $sort_order, $from, $amount);
 }
 
-if ($action == "create") 
+if ($action == 'create') 
 {
-	$preset = $pst->read_preset("admin_newspost");  //only works here because $_POST is used.
-
-  if ($sub_action == "edit" && !$_POST['preview'] && !$_POST['submit_news']) 
-  {
-		if ($sql->db_Select("news", "*", "news_id='$id' "))
+	$preset = $pst->read_preset('admin_newspost');  //only works here because $_POST is used.
+	if ($sub_action == 'edit' && !$_POST['preview'] && !$_POST['submit_news']) 
+	{
+		if ($sql->db_Select('news', '*', "news_id='{$id}'"))
 		{
 			$row = $sql->db_Fetch();
 			extract($row);
@@ -267,47 +260,38 @@
 			$_POST['news_summary'] = $news_summary;
 			$_POST['news_sticky'] = $news_sticky;
 			$_POST['news_datestamp'] = ($_POST['news_datestamp']) ? $_POST['news_datestamp'] : $news_datestamp;
-
 			$_POST['cat_id'] = $news_category;
 			$_POST['news_start'] = $news_start;
 			$_POST['news_end'] = $news_end;
-			$_POST['comment_total'] = $sql->db_Count("comments", "(*)", " WHERE comment_item_id='$news_id' AND comment_type='0' ");
+			$_POST['comment_total'] = $sql->db_Count('comments', '(*)', "WHERE comment_item_id='{$news_id}' AND comment_type='0'");
 			$_POST['news_rendertype'] = $news_render_type;
 			$_POST['news_thumbnail'] = $news_thumbnail;
+			$_POST['news_author'] = $news_author;
 		}
 	}
 	$newspost->create_item($sub_action, $id);
 }
 
-
-
-if ($action == "cat") 
+if ($action == 'cat') 
 {
 	$newspost->show_categories($sub_action, $id);
 }
 
-
-
 if ($action == 'maint') 
 {
 	$newspost->show_maintenance($sub_action, $id);
 }
 
-
-
-if ($action == "sn") 
+if ($action == 'sn') 
 {
 	$newspost->submitted_news($sub_action, $id);
 }
 
-
-
-if ($action == "pref") 
+if ($action == 'pref') 
 {
 	$newspost->show_news_prefs($sub_action, $id);
 }
 
-
 echo "
 <script type=\"text/javascript\">
 function fclear() {
@@ -315,40 +299,34 @@
 	document.getElementById('dataform').news_extended.value = \"\";
 }
 </script>\n";
-
-require_once("footer.php");
+require_once('footer.php');
 exit;
 
-
-
-
-
 class newspost 
 {
-
 	function show_existing_items($action, $sub_action, $sort_order, $from, $amount) 
 	{
-	  // ##### Display scrolling list of existing news items
-	  global $sql, $ns, $tp;
-	  $text = "<div style='text-align:center'>";
-
-	  if (!$sort_order) $sort_order = 'desc';
-	  if ($sort_order != 'asc') $sort_order = 'desc';
-	  $sort_link = $sort_order == 'asc' ? 'desc' : 'asc';		// Effectively toggle setting for headings
+		// ##### Display scrolling list of existing news items
+		global $sql, $ns, $tp;
+		$text = "<div style='text-align:center'>";
+
+		if (!$sort_order) $sort_order = 'desc';
+		if ($sort_order != 'asc') $sort_order = 'desc';
+		$sort_link = $sort_order == 'asc' ? 'desc' : 'asc';		// Effectively toggle setting for headings
 	  
-	  if (isset($_POST['searchquery'])) 
-	  {
-		$query = "news_title REGEXP('".$_POST['searchquery']."') OR news_body REGEXP('".$_POST['searchquery']."') OR news_extended REGEXP('".$_POST['searchquery']."') ORDER BY news_datestamp DESC";
-	  } 
-	  else 
-	  {
-		$query = "ORDER BY ".($sub_action ? $sub_action : "news_datestamp")." ".strtoupper($sort_order)."  LIMIT {$from}, {$amount}";
-	  }
-
-	  if ($sql->db_Select("news", "*", $query, ($_POST['searchquery'] ? 0 : "nowhere")))
-	  {
-		$newsarray = $sql -> db_getList();
-		$text .= "
+		if (isset($_POST['searchquery'])) 
+		{
+			$query = "news_title REGEXP('".$_POST['searchquery']."') OR news_body REGEXP('".$_POST['searchquery']."') OR news_extended REGEXP('".$_POST['searchquery']."') ORDER BY news_datestamp DESC";
+		} 
+		else 
+		{
+			$query = "ORDER BY ".($sub_action ? $sub_action : "news_datestamp")." ".strtoupper($sort_order)." LIMIT {$from}, {$amount}";
+		}
+		
+		if ($sql->db_Select('news', '*', $query, ($_POST['searchquery'] ? 0 : 'nowhere')))
+		{
+			$newsarray = $sql -> db_getList();
+			$text .= "
 			<form action='".e_SELF."' id='newsform' method='post'>
 			<table class='fborder' style='".ADMIN_WIDTH."'>
 			<tr>
@@ -357,24 +335,23 @@
 			<td style='width:15%' class='fcaption'>".LAN_NEWS_49."</td>
 			<td style='width:15%' class='fcaption'>".LAN_OPTIONS."</td>
 			</tr>";
-		$ren_type = array("default","title","other-news","other-news 2");
-		foreach($newsarray as $row)
-		{
-		  extract($row);
-
+			$ren_type = array('default','title','other-news','other-news 2');
+			foreach($newsarray as $row)
+			{
+				extract($row);
 				// Note: To fix the alignment bug. Put both buttons inside the Form.
 				// But make EDIT a 'button' and DELETE 'submit'
-		  $text .= "<tr>
+				$text .= "<tr>
 				<td style='width:5%' class='forumheader3'>{$news_id}</td>
 				<td style='width:55%' class='forumheader3'><a href='".e_BASE."news.php?item.{$news_id}.{$news_category}'>".($news_title ? $tp->toHTML($news_title,"","no_hook,emotes_off,no_make_clickable") : "[".NWSLAN_42."]")."</a></td>
 				<td style='20%' class='forumheader3'>";
-		  $text .= $ren_type[$news_render_type];
-		  if($news_sticky)
-		  {
-			$sicon = (file_exists(THEME."images/sticky.png") ? THEME."images/sticky.png" : e_IMAGE."generic/".IMODE."/sticky.png");
-			$text .= " <img src='".$sicon."' alt='' />";
-		  }
-		  $text .= "
+				$text .= $ren_type[$news_render_type];
+				if($news_sticky)
+				{
+					$sicon = (file_exists(THEME.'images/sticky.png') ? THEME.'images/sticky.png' : e_IMAGE.'generic/'.IMODE.'/sticky.png');
+					$text .= " <img src='".$sicon."' alt='' />";
+				}
+				$text .= "
 				</td>
 
 				<td style='width:15%; text-align:center' class='forumheader3'>
@@ -382,91 +359,81 @@
 				<input type='image' title='".LAN_DELETE."' name='delete[main_{$news_id}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".NWSLAN_39." [ID: $news_id ]')\"/>
 				</td>
 				</tr>";
+			}
+			$text .= '</table></form>';
+		} 
+		else 
+		{
+			$text .= "<div style='text-align:center'>".NWSLAN_43."</div>";
 		}
-		$text .= "</table></form>";
-	  } 
-	  else 
-	  {
-		$text .= "<div style='text-align:center'>".NWSLAN_43."</div>";
-	  }
-
-	  $newsposts = $sql->db_Count("news");
-
-	  if (!$_POST['searchquery']) 
-	  {
-        $parms = $newsposts.",".$amount.",".$from.",".e_SELF."?".(e_QUERY ? "$action.$sub_action.$sort_order." : "main.news_datestamp.desc.")."[FROM]";
-        $text .= "<br />".$tp->parseTemplate("{NEXTPREV={$parms}}");
-
-	  }
 
-	  $text .= "<br /><form method='post' action='".e_SELF."'>\n<p>\n<input class='tbox' type='text' name='searchquery' size='20' value='' maxlength='50' />\n<input class='button' type='submit' name='searchsubmit' value='".NWSLAN_63."' />\n</p>\n</form>\n</div>";
-
-
-
-	  $ns->tablerender(NWSLAN_4, $text);
+		$newsposts = $sql->db_Count('news');
+		if (!$_POST['searchquery']) 
+		{
+			$parms = $newsposts.','.$amount.','.$from.','.e_SELF.'?'.(e_QUERY ? "{$action}.{$sub_action}.{$sort_order}." : "main.news_datestamp.desc.")."[FROM]";
+			$text .= '<br />'.$tp->parseTemplate("{NEXTPREV={$parms}}");
+		}
+		$text .= "<br /><form method='post' action='".e_SELF."'>\n<p>\n<input class='tbox' type='text' name='searchquery' size='20' value='' maxlength='50' />\n<input class='button' type='submit' name='searchsubmit' value='".NWSLAN_63."' />\n</p>\n</form>\n</div>";
+		$ns->tablerender(NWSLAN_4, $text);
 	}
 
-
 	function show_options($action) 
 	{
 		global $sql;
 
-		if ($action == "") {
-			$action = "main";
+		if ($action == '') {
+			$action = 'main';
 		}
 		$var['main']['text'] = NWSLAN_44;
 		$var['main']['link'] = e_SELF;
 
 		$var['create']['text'] = NWSLAN_45;
-		$var['create']['link'] = e_SELF."?create";
+		$var['create']['link'] = e_SELF.'?create';
 
 		$var['cat']['text'] = NWSLAN_46;
-		$var['cat']['link'] = e_SELF."?cat";
-		$var['cat']['perm'] = "7";
+		$var['cat']['link'] = e_SELF.'?cat';
+		$var['cat']['perm'] = '7';
 
 		$var['pref']['text'] = NWSLAN_90;
-		$var['pref']['link'] = e_SELF."?pref";
-		$var['pref']['perm'] = "N";
-		if ($sql->db_Select("submitnews", "*", "submitnews_auth ='0' ")) 
+		$var['pref']['link'] = e_SELF.'?pref';
+		$var['pref']['perm'] = 'N';
+		if ($sql->db_Select('submitnews', '*', "submitnews_auth ='0'"))
 		{
 			$var['sn']['text'] = NWSLAN_47;
-			$var['sn']['link'] = e_SELF."?sn";
-			$var['sn']['perm'] = "N";
+			$var['sn']['link'] = e_SELF.'?sn';
+			$var['sn']['perm'] = 'N';
 		}
 		if (getperms('0'))
 		{
 		$var['maint']['text'] = LAN_NEWS_50;
-		$var['maint']['link'] = e_SELF."?maint";
-		$var['maint']['perm'] = "N";
+		$var['maint']['link'] = e_SELF.'?maint';
+		$var['maint']['perm'] = 'N';
 		}
-
 		show_admin_menu(NWSLAN_48, $action, $var);
-
 	}
 
 	function create_item($sub_action, $id)
 	{
 		global $cal;
-	  // ##### Display creation form 
+		// ##### Display creation form 
 		global $sql, $rs, $ns, $pref, $tp, $pst, $e107;
 
-		if ($sub_action == "sn" && !$_POST['preview']) 
+		if ($sub_action == 'sn' && !$_POST['preview']) 
 		{
-			if ($sql->db_Select("submitnews", "*", "submitnews_id=$id", TRUE)) 
+			if ($sql->db_Select('submitnews', '*', 'submitnews_id='.$id, TRUE))
 			{
 				list($id, $submitnews_name, $submitnews_email, $_POST['news_title'], $submitnews_category, $_POST['data'], $submitnews_datestamp, $submitnews_ip, $submitnews_auth, $submitnews_file) = $sql->db_Fetch();
-
 				if (e_WYSIWYG)
 				{
-				  if (substr($_POST['data'],-7,7) == '[/html]') $_POST['data'] = substr($_POST['data'],0,-7);
-				  if (substr($_POST['data'],0,6) == '[html]') $_POST['data'] = substr($_POST['data'],6);
-					$_POST['data'] .= "<br /><b>".NWSLAN_49." ".$submitnews_name."</b>";
-					$_POST['data'] .= ($submitnews_file)? "<br /><br /><img src='{e_IMAGE}newspost_images/".$submitnews_file."' style='float:right; margin-left:5px;margin-right:5px;margin-top:5px;margin-bottom:5px; border:1px solid' />":	"";
+					if (substr($_POST['data'],-7,7) == '[/html]') $_POST['data'] = substr($_POST['data'],0,-7);
+					if (substr($_POST['data'],0,6) == '[html]') $_POST['data'] = substr($_POST['data'],6);
+					$_POST['data'] .= '<br /><b>'.NWSLAN_49.' '.$submitnews_name.'</b>';
+					$_POST['data'] .= ($submitnews_file)? "<br /><br /><img src='{e_IMAGE}newspost_images/".$submitnews_file."' style='float:right; margin-left:5px;margin-right:5px;margin-top:5px;margin-bottom:5px; border:1px solid' />":'';
 				}
 				else
 				{
-					$_POST['data'] .= "\n[[b]".NWSLAN_49." ".$submitnews_name."[/b]]";
-					$_POST['data'] .= ($submitnews_file)?"\n\n[img]{e_IMAGE}newspost_images/".$submitnews_file."[/img]": "";
+					$_POST['data'] .= "\n[[b]".NWSLAN_49.' '.$submitnews_name.'[/b]]';
+					$_POST['data'] .= ($submitnews_file)?"\n\n[img]{e_IMAGE}newspost_images/".$submitnews_file.'[/img]': '';
 				}
 				$_POST['cat_id'] = $submitnews_category;
 				$_POST['data'] = $tp->dataFilter($_POST['data']);		// Filter any nasties
@@ -474,39 +441,37 @@
 			}
 		}
 
-	  if ($sub_action == "upload" && !$_POST['preview']) 
-	  {
-			if ($sql->db_Select("upload", "*", "upload_id=$id")) {
+		if ($sub_action == 'upload' && !$_POST['preview']) 
+		{
+			if ($sql->db_Select('upload', '*', 'upload_id='.$id)) {
 				$row = $sql->db_Fetch();
 				extract($row);
-				$post_author_id = substr($upload_poster, 0, strpos($upload_poster, "."));
-				$post_author_name = substr($upload_poster, (strpos($upload_poster, ".")+1));
-				$upload_file = "pub_" . (preg_match("#Binary\s(.*?)\/#", $upload_file, $match) ? $match[1] : $upload_file);
-				$_POST['news_title'] = LAN_UPLOAD.": ".$upload_name;
+				$post_author_id = substr($upload_poster, 0, strpos($upload_poster, '.'));
+				$post_author_name = substr($upload_poster, (strpos($upload_poster, '.')+1));
+				$upload_file = 'pub_' . (preg_match("#Binary\s(.*?)\/#", $upload_file, $match) ? $match[1] : $upload_file);
+				$_POST['news_title'] = LAN_UPLOAD.': '.$upload_name;
 				$_POST['data'] = $upload_description."\n[b]".NWSLAN_49." <a href='user.php?id.".$post_author_id."'>".$post_author_name."</a>[/b]\n\n[file=request.php?".$upload_file."]".$upload_name."[/file]\n";
 			}
 		}
 
 		$text = "<div style='text-align:center'>
-		<form method='post' action='".e_SELF."?".e_QUERY."' id='dataform' ".(FILE_UPLOADS ? "enctype='multipart/form-data'" : "")." >
+		<form method='post' action='".e_SELF."?".e_QUERY."' id='dataform' ".(FILE_UPLOADS ? "enctype='multipart/form-data'" : '')." >
 		<table style='".ADMIN_WIDTH."' class='fborder'>
-
 		<tr>
 		<td style='width:20%' class='forumheader3'>".NWSLAN_6.": </td>
 		<td style='width:80%' class='forumheader3'>";
 
-		if (!$sql->db_Select("news_category"))
+		if (!$sql->db_Select('news_category'))
 		{
 			$text .= NWSLAN_10;
 		}
 		else
 		{
 			$text .= "\t<select name='cat_id' class='tbox'>\n";
-
 			while (list($cat_id, $cat_name, $cat_icon) = $sql->db_Fetch())
 			{
-				$sel = ($_POST['cat_id'] == $cat_id) ? "selected='selected'" : "";
-				$text .= "<option value='$cat_id' {$sel}>".$tp->toHTML($cat_name,FALSE,"defs")."</option>\n";
+				$sel = ($_POST['cat_id'] == $cat_id) ? "selected='selected'" : '';
+				$text .= "<option value='{$cat_id}' {$sel}>".$tp->toHTML($cat_name,FALSE,'defs')."</option>\n";
 			}
 			$text .= "</select>";
 		}
@@ -532,9 +497,8 @@
 
 		$insertjs = (!e_WYSIWYG) ? "rows='15' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'": "rows='25' ";
 //		$_POST['data'] = $tp->toForm($_POST['data']);
-		$text .= "<textarea class='tbox' id='data' name='data'  cols='80'  style='width:100%' $insertjs>".(strstr($tp->post_toForm($_POST['data']), "[img]http") ? $tp->post_toForm($_POST['data']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['data'])))."</textarea>
-		";
-        $text .= display_help("helpb", 'news');
+		$text .= "<textarea class='tbox' id='data' name='data'  cols='80'  style='width:100%' {$insertjs}>".(strstr($tp->post_toForm($_POST['data']), '[img]http') ? $tp->post_toForm($_POST['data']) : str_replace('[img]../', '[img]', $tp->post_toForm($_POST['data'])))."</textarea>";
+        $text .= display_help('helpb', 'news');
 
 		//Extended news form textarea
 		if(e_WYSIWYG){ $ff_expand = "tinyMCE.execCommand('mceResetDesignMode')";  } // Fixes Firefox issue with hidden wysiwyg textarea.
@@ -544,10 +508,10 @@
 		<tr>
 		<td style='width:20%' class='forumheader3'>".NWSLAN_14.":</td>
 		<td style='width:80%' class='forumheader3'>
-		<a style='cursor: pointer' onclick=\"expandit(this);$ff_expand\">".NWSLAN_83."</a>
+		<a style='cursor: pointer' onclick=\"expandit(this);{$ff_expand}\">".NWSLAN_83."</a>
 		<div style='display:none'>
-		<textarea class='tbox' id='news_extended' name='news_extended' cols='80' style='width:95%' $insertjs>".(strstr($tp->post_toForm($_POST['news_extended']), "[img]http") ? $tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_extended'])))."</textarea>
-		". display_help("helpc", 'extended')."
+		<textarea class='tbox' id='news_extended' name='news_extended' cols='80' style='width:95%' {$insertjs}>".(strstr($tp->post_toForm($_POST['news_extended']), "[img]http") ? $tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_extended'])))."</textarea>
+		". display_help('helpc', 'extended')."
 		</div>
 		</td>
 		</tr>
@@ -560,21 +524,21 @@
 
 		if (!FILE_UPLOADS)
 		{
-			$text .= "<b>".LAN_UPLOAD_SERVEROFF."</b>";
+			$text .= '<b>'.LAN_UPLOAD_SERVEROFF.'</b>';
 		}
 		else
 		{
-			if (!is_writable(e_FILE."downloads"))
+			if (!is_writable(e_FILE.'downloads'))
 			{
-				$text .= LAN_UPLOAD_777."<b>".str_replace("../","",e_FILE."downloads/")."</b><br /><br />";
+				$text .= LAN_UPLOAD_777.'<b>'.str_replace('../','',e_FILE.'downloads/').'</b><br /><br />';
 			}
-			if (!is_writable(e_IMAGE."newspost_images"))
+			if (!is_writable(e_IMAGE.'newspost_images'))
 			{
-				$text .= LAN_UPLOAD_777."<b>".str_replace("../","",e_IMAGE."newspost_images/")."</b><br /><br />";
+				$text .= LAN_UPLOAD_777.'<b>'.str_replace('../','',e_IMAGE.'newspost_images/').'</b><br /><br />';
 			}
 
 			$up_name = array(LAN_NEWS_24,NWSLAN_67,LAN_NEWS_22,NWSLAN_68);
-			$up_value = array("resize","image","thumb","file");
+			$up_value = array('resize','image','thumb','file');
 
 			$text .= "<div id='up_container' >
 			<span id='upline' style='white-space:nowrap'>
@@ -582,19 +546,17 @@
 			<select class='tbox' name='uploadtype[]'>";
 			for ($i=0; $i<count($up_value); $i++)
 			{
-				$selected = ($_POST['uploadtype'] == $up_value[$i]) ? "selected='selected'" : "";
-				$text .= "<option value='".$up_value[$i]."' $selected>".$up_name[$i]."</option>\n";
-			};
+				$selected = ($_POST['uploadtype'] == $up_value[$i]) ? "selected='selected'" : '';
+				$text .= "<option value='".$up_value[$i]."' {$selected}>".$up_name[$i]."</option>\n";
+			}
 
 			$text .="</select>&nbsp;</span>
-
 			</div>
 			<table style='width:100%'>
 			<tr><td><input type='button' class='button' value='".LAN_NEWS_26."' onclick=\"duplicateHTML('upline','up_container');\"  /></td>
 			<td><span class='smalltext'>".LAN_NEWS_25."</span>&nbsp;<input class='tbox' type='text' name='resize_value' value='".($_POST['resize_value'] ? $_POST['resize_value'] : '100')."' size='3' />&nbsp;px</td>
 			<td><input class='button' type='submit' name='submitupload' value='".NWSLAN_66."' /></td>
 			</tr></table>";
-
 		}
 		$text .= "</div>
 		</td>
@@ -606,13 +568,13 @@
 		<a style='cursor: pointer' onclick='expandit(this);'>".LAN_NEWS_23."</a>
 		<div style='display: none'><br />";
 
-        $parms = "name=news_thumbnail";
-		$parms .= "&path=".e_IMAGE."newspost_images/";
-		$parms .= "&default=".$_POST['news_thumbnail'];
-		$parms .= "&width=100px";
-		$parms .= "&height=100px";
-		$parms .= "&multiple=TRUE";
-		$parms .= "&label=-- ".LAN_NEWS_48." --";
+        $parms = 'name=news_thumbnail';
+		$parms .= '&path='.e_IMAGE.'newspost_images/';
+		$parms .= '&default='.$_POST['news_thumbnail'];
+		$parms .= '&width=100px';
+		$parms .= '&height=100px';
+		$parms .= '&multiple=TRUE';
+		$parms .= '&label=-- '.LAN_NEWS_48.' --';
 
         $text .= $tp->parseTemplate("{IMAGESELECTOR={$parms}}");
 
@@ -637,11 +599,12 @@
 		<td style='width:80%' class='forumheader3'>
 		<a style='cursor: pointer' onclick='expandit(this);'>".NWSLAN_74."</a>
 		<div style='display: none;'>";
-		$ren_type = array(NWSLAN_75,NWSLAN_76,NWSLAN_77,NWSLAN_77." 2");
-		foreach($ren_type as $key=>$value) {
-			$checked = ($_POST['news_rendertype'] == $key) ? "checked='checked'" : "";
-			$text .= "<input name='news_rendertype' type='radio' value='$key' $checked />";
-			$text .= $value."<br />";
+		$ren_type = array(NWSLAN_75,NWSLAN_76,NWSLAN_77,NWSLAN_77.' 2');
+		foreach($ren_type as $key=>$value) 
+		{
+			$checked = ($_POST['news_rendertype'] == $key) ? "checked='checked'" : '';
+			$text .= "<input name='news_rendertype' type='radio' value='{$key}' {$checked} />";
+			$text .= $value.'<br />';
 		}
 
 		$text .="</div>
@@ -658,31 +621,29 @@
 		<br />
 		".NWSLAN_21.":<br />";
 
-		$_startdate = ($_POST['news_start'] > 0) ? date("d/m/Y", $_POST['news_start']) : "";
+		$_startdate = ($_POST['news_start'] > 0) ? date('d/m/Y', $_POST['news_start']) : '';
 
 		$cal_options['showsTime'] = false;
 		$cal_options['showOthers'] = false;
 		$cal_options['weekNumbers'] = false;
-		$cal_options['ifFormat'] = "%d/%m/%Y";
-		$cal_attrib['class'] = "tbox";
-		$cal_attrib['size'] = "10";
-		$cal_attrib['name'] = "news_start";
+		$cal_options['ifFormat'] = '%d/%m/%Y';
+		$cal_attrib['class'] = 'tbox';
+		$cal_attrib['size'] = '10';
+		$cal_attrib['name'] = 'news_start';
 		$cal_attrib['value'] = $_startdate;
 		$text .= $cal->make_input_field($cal_options, $cal_attrib);
-
-		$text .= " - ";
-
-		$_enddate = ($_POST['news_end'] > 0) ? date("d/m/Y", $_POST['news_end']) : "";
+		$text .= ' - ';
+		$_enddate = ($_POST['news_end'] > 0) ? date('d/m/Y', $_POST['news_end']) : '';
 
 		unset($cal_options);
 		unset($cal_attrib);
 		$cal_options['showsTime'] = false;
 		$cal_options['showOthers'] = false;
 		$cal_options['weekNumbers'] = false;
-		$cal_options['ifFormat'] = "%d/%m/%Y";
-		$cal_attrib['class'] = "tbox";
-		$cal_attrib['size'] = "10";
-		$cal_attrib['name'] = "news_end";
+		$cal_options['ifFormat'] = '%d/%m/%Y';
+		$cal_attrib['class'] = 'tbox';
+		$cal_attrib['size'] = '10';
+		$cal_attrib['name'] = 'news_end';
 		$cal_attrib['value'] = $_enddate;
 		$text .= $cal->make_input_field($cal_options, $cal_attrib);
 
@@ -697,23 +658,23 @@
 		<td class='forumheader3'>
 		<a style='cursor: pointer' onclick='expandit(this);'>".LAN_NEWS_33."</a>
 		<div style='display: none;'>";
-		$update_checked = ($_POST['update_datestamp']) ? "checked='checked'" : "";
+		$update_checked = ($_POST['update_datestamp']) ? "checked='checked'" : '';
 
-		$_update_datestamp = ($_POST['news_datestamp'] > 0 && !strpos($_POST['news_datestamp'],"/")) ? date("d/m/Y H:i:s", $_POST['news_datestamp']) : trim($_POST['news_datestamp']);
+		$_update_datestamp = ($_POST['news_datestamp'] > 0 && !strpos($_POST['news_datestamp'],'/')) ? date('d/m/Y H:i:s', $_POST['news_datestamp']) : trim($_POST['news_datestamp']);
 		unset($cal_options);
 		unset($cal_attrib);
 		$cal_options['showsTime'] = true;
 		$cal_options['showOthers'] = true;
 		$cal_options['weekNumbers'] = false;
-		$cal_options['ifFormat'] = "%d/%m/%Y %H:%M:%S";
-		$cal_options['timeFormat'] = "24";
-		$cal_attrib['class'] = "tbox";
-		$cal_attrib['name'] = "news_datestamp";
+		$cal_options['ifFormat'] = '%d/%m/%Y %H:%M:%S';
+		$cal_options['timeFormat'] = '24';
+		$cal_attrib['class'] = 'tbox';
+		$cal_attrib['name'] = 'news_datestamp';
 		$cal_attrib['value'] = $_update_datestamp;
 		$text .= $cal->make_input_field($cal_options, $cal_attrib);
 
 		$text .= "<br />
-		<input type='checkbox' value='1' name='update_datestamp' $update_checked />".NWSLAN_105."
+		<input type='checkbox' value='1' name='update_datestamp' {$update_checked} />".NWSLAN_105."
 		</div>
 		</td></tr>";
 
@@ -727,11 +688,10 @@
 
 		<a style='cursor: pointer' onclick='expandit(this);'>".NWSLAN_84."</a>
 		<div style='display: none;'>
-		".r_userclass_check("news_userclass", $_POST['news_class'], "nobody,public,guest,member,admin,main,classes,language")."
+		".r_userclass_check('news_userclass', $_POST['news_class'], 'nobody,public,guest,member,admin,classes,language')."
 		</div>
 		</td></tr>
 
-
 		<tr>
 		<td class='forumheader3'>
 		".LAN_NEWS_28.":
@@ -747,11 +707,12 @@
 		}
 		else
 		{
-			$sel = "";
+			$sel = '';
 		}
 		$text .= "<input type='checkbox' {$sel} name='news_sticky' value='1' /> ".LAN_NEWS_30."\n</div>\n</td>\n</tr>\n";
 
-		if($pref['trackbackEnabled']){
+		if($pref['trackbackEnabled'])
+		{
 			$text .= "<tr>
 			<td class='forumheader3'>".LAN_NEWS_34.":</td>
 			<td class='forumheader3'><a style='cursor: pointer' onclick='expandit(this);'>".LAN_NEWS_35."</a>
@@ -765,16 +726,38 @@
 			</td>
 			</tr>\n";
 		}
-
+		
+		if($_POST['news_author'] == 0)
+		{	// create new article with current author
+			$_POST['news_author'] = USERID;
+		}
+		$user = get_user_data($tp->post_toForm($_POST['news_author']));
+		$text .= "
+			<tr>
+				<td class='forumheader3'>".LAN_NEWS_55.":</td>
+				<td class='forumheader3'><a style='cursor: pointer' onclick='expandit(this);'>".$user['user_name']."</a>
+					<div style='display: none;'>
+						<select class='tbox' name='news_author'>";
+		$query = "SELECT * FROM #user WHERE (user_admin = '1' AND ((user_perms  = '0') OR (user_perms  = '0.'))) OR (user_perms REGEXP 'H.') ORDER BY user_id";
+		$sql->db_Select_Gen($query);
+		while (list($user_id,$user_name) = $sql->db_Fetch())
+		{
+			$selected = (intval($user_id) == intval($user['user_id'])) ? "selected='selected'" : '';
+			$text .= "		<option value='".$user_id."' {$selected}>".$user_name."</option>";
+		}
+		$text .= "
+						</select>
+					</div>
+				</td>
+			</tr>\n";
 
 		$text .= "<tr style='vertical-align: top;'>
 		<td colspan='2'  style='text-align:center' class='forumheader'>".
 
 		(isset($_POST['preview']) ? "<input class='button' type='submit' name='preview' value='".NWSLAN_24."' /> " : "<input class='button' type='submit' name='preview' value='".NWSLAN_27."' /> ").
-		($id && $sub_action != "sn" && $sub_action != "upload" ? "<input class='button' type='submit' name='submit_news' value='".NWSLAN_25."' /> " : "<input class='button' type='submit' name='submit_news' value='".NWSLAN_26."' /> ")."
-
+		($id && $sub_action != 'sn' && $sub_action != 'upload' ? "<input class='button' type='submit' name='submit_news' value='".NWSLAN_25."' /> " : "<input class='button' type='submit' name='submit_news' value='".NWSLAN_26."' /> ")."
 
-		<input type='hidden' name='news_id' value='$news_id' />  \n</td>
+		<input type='hidden' name='news_id' value='{$news_id}' />  \n</td>
 		</tr>
 		</table>
 
@@ -783,17 +766,16 @@
 		$ns->tablerender(NWSLAN_29, $text);
 	}
 
-
 	function preview_item($id) 
 	{
-		// ##### Display news preview ---------------------------------------------------------------------------------------------------------
+		// ##### Display news preview -----------------------------------------
 		global $tp, $sql, $ix, $IMAGES_DIRECTORY;
 
 		$_POST['news_id'] = $id;
 
 		if($_POST['news_start'])
 		{
-			$tmp = explode("/", $_POST['news_start']);
+			$tmp = explode('/', $_POST['news_start']);
 			$_POST['news_start'] = mktime(0, 0, 0, $tmp[1], $tmp[0], $tmp[2]);
 		}
 		else
@@ -803,7 +785,7 @@
 
 		if($_POST['news_end'])
 		{
-			$tmp = explode("/", $_POST['news_end']);
+			$tmp = explode('/', $_POST['news_end']);
 			$_POST['news_end'] = mktime(0, 0, 0, $tmp[1], $tmp[0], $tmp[2]);
 		}
 		else
@@ -825,14 +807,13 @@
 			$_POST['news_datestamp'] = time();
 		}
 
-		$sql->db_Select("news_category", "*", "category_id='".$_POST['cat_id']."' ");
+		$sql->db_Select('news_category', '*', "category_id='".intval($_POST['cat_id'])."'");
 		list($_POST['category_id'], $_POST['category_name'], $_POST['category_icon']) = $sql->db_Fetch();
 		$_POST['user_id'] = USERID;
 		$_POST['user_name'] = USERNAME;
 		$_POST['comment_total'] = $comment_total;
 		$_PR = $_POST;
 
-
 /*		$_PR['news_body'] = $tp->post_toHTML($_PR['data'],FALSE);
 		$_PR['news_title'] = $tp->post_toHTML($_PR['news_title'],FALSE,"emotes_off, no_make_clickable");
 		$_PR['news_summary'] = $tp->post_toHTML($_PR['news_summary']);
@@ -848,12 +829,13 @@
 		echo $tp -> parseTemplate('{NEWSINFO}', FALSE, $news_shortcodes);
 	}
 
-	function submit_item($sub_action, $id) {
+	function submit_item($sub_action, $id)
+	{
 		// ##### Format and submit item ---------------------------------------------------------------------------------------------------------
 		global $tp, $ix, $sql;
 		if($_POST['news_start'])
 		{
-			$tmp = explode("/", $_POST['news_start']);
+			$tmp = explode('/', $_POST['news_start']);
 			$_POST['news_start'] = mktime(0, 0, 0, $tmp[1], $tmp[0], $tmp[2]);
 		}
 		else
@@ -863,7 +845,7 @@
 
 		if($_POST['news_end'])
 		{
-			$tmp = explode("/", $_POST['news_end']);
+			$tmp = explode('/', $_POST['news_end']);
 			$_POST['news_end'] = mktime(0, 0, 0, $tmp[1], $tmp[0], $tmp[2]);
 		}
 		else
@@ -887,16 +869,19 @@
 
 		if($sub_action == 'edit')
 		{
-			$_POST['news_author'] = -1;
+			if(!isset($_POST['news_author']))
+			{
+				$_POST['news_author'] = -1;
+			}
 		}
 
-		if ($id && $sub_action != "sn" && $sub_action != "upload")
+		if ($id && $sub_action != 'sn' && $sub_action != 'upload')
 		{
 			$_POST['news_id'] = $id;
 		}
 		else
 		{
-			$sql->db_Update("submitnews", "submitnews_auth='1' WHERE submitnews_id ='".$id."' ");
+			$sql->db_Update('submitnews', "submitnews_auth='1' WHERE submitnews_id ='".$id."' ");
 		}
 		if (!$_POST['cat_id']) {
 			$_POST['cat_id'] = 1;
@@ -905,56 +890,64 @@
 		unset($_POST['news_title'], $_POST['cat_id'], $_POST['data'], $_POST['news_extended'], $_POST['news_allow_comments'], $_POST['startday'], $_POST['startmonth'], $_POST['startyear'], $_POST['endday'], $_POST['endmonth'], $_POST['endyear'], $_POST['news_id'], $_POST['news_class']);
 	}
 
-	function show_message($message) {
-		// ##### Display comfort ---------------------------------------------------------------------------------------------------------
+	function show_message($message)
+	{
+		// ##### Display comfort ----------------------------------------------
 		global $ns;
-		$ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
+		$ns->tablerender('', "<div style='text-align:center'><b>".$message."</b></div>");
 	}
 
-
-	function show_categories($sub_action, $id) {
+	function show_categories($sub_action, $id) 
+	{
 		global $sql, $rs, $ns, $tp;
-		$handle = opendir(e_IMAGE."icons");
-		while ($file = readdir($handle)) {
-			if ($file != "." && $file != ".." && $file != "/" && $file != "null.txt" && $file != "CVS") {
+		$handle = opendir(e_IMAGE.'icons');
+		while ($file = readdir($handle))
+		{
+			if ($file != '.' && $file != '..' && $file != '/' && $file != 'null.txt' && $file != 'CVS') 
+			{
 				$iconlist[] = $file;
 			}
 		}
 		closedir($handle);
 
-		if ($sub_action == "edit") {
-			if ($sql->db_Select("news_category", "*", "category_id='$id' ")) {
+		if ($sub_action == 'edit') {
+			if ($sql->db_Select('news_category', '*', "category_id='{$id}'"))
+			{
 				$row = $sql->db_Fetch();
 				extract($row);
 			}
 		}
 
 		$text = "<div style='text-align:center'>
-		".$rs->form_open("post", e_SELF."?cat", "dataform")."
+		".$rs->form_open('post', e_SELF.'?cat', 'dataform')."
 		<table class='fborder' style='".ADMIN_WIDTH."'>
 		<tr>
 		<td class='forumheader3' style='width:30%'><span class='defaulttext'>".NWSLAN_52."</span></td>
-		<td class='forumheader3' style='width:70%'>".$rs->form_text("category_name", 30, $category_name, 200)."</td>
+		<td class='forumheader3' style='width:70%'>".$rs->form_text('category_name', 30, $category_name, 200)."</td>
 		</tr>
 		<tr>
 		<td class='forumheader3' style='width:30%'><span class='defaulttext'>".NWSLAN_53."</span></td>
 		<td class='forumheader3' style='width:70%'>
-		".$rs->form_text("category_button", 60, $category_icon, 100)."
+		".$rs->form_text('category_button', 60, $category_icon, 100)."
 		<br />
 		<input class='button' type ='button' style='cursor: pointer' size='30' value='".NWSLAN_54."' onclick='expandit(this)' />
 		<div id='caticn' style='display:none'>";
-		while (list($key, $icon) = each($iconlist)) {
-			$text .= "<a href=\"javascript:insertext('$icon','category_button','caticn')\"><img src='".e_IMAGE."icons/".$icon."' style='border:0' alt='' /></a>\n ";
+		while (list($key, $icon) = each($iconlist))
+		{
+			$text .= "<a href=\"javascript:insertext('{$icon}','category_button','caticn')\"><img src='".e_IMAGE."icons/".$icon."' style='border:0' alt='' /></a>\n ";
 		}
 		$text .= "</div></td>
 		</tr>
 
 		<tr><td colspan='2' style='text-align:center' class='forumheader'>";
-		if ($id) {
+		if ($id) 
+		{
 			$text .= "<input class='button' type='submit' name='update_category' value='".NWSLAN_55."' />
-			".$rs->form_button("submit", "category_clear", NWSLAN_79). $rs->form_hidden("category_id", $id)."
+			".$rs->form_button('submit', 'category_clear', NWSLAN_79). $rs->form_hidden('category_id', $id)."
 			</td></tr>";
-			} else {
+		}
+		else
+		{
 			$text .= "<input class='button' type='submit' name='create_category' value='".NWSLAN_56."' /></td></tr>";
 		}
 		$text .= "</table>
@@ -966,7 +959,8 @@
 		unset($category_name, $category_icon);
 
 		$text = "<div style='text-align: center'>";
-		if ($category_total = $sql->db_Select("news_category")) {
+		if ($category_total = $sql->db_Select('news_category'))
+		{
 			$text .= "
 			<form action='".e_SELF."?cat' id='newscatform' method='post'>
 			<table class='fborder' style='".ADMIN_WIDTH."'>
@@ -976,58 +970,57 @@
 			<td style='width:70%' class='fcaption'>".NWSLAN_6."</td>
 			<td style='width:20%; text-align:center' class='fcaption'>".LAN_OPTIONS."</td>
 			</tr>";
-			while ($row = $sql->db_Fetch()) {
+			while ($row = $sql->db_Fetch())
+			{
 				extract($row);
-
-				if ($category_icon) {
-					$icon = (strstr($category_icon, "images/") ? THEME."$category_icon" : e_IMAGE."icons/$category_icon");
+				if ($category_icon) 
+				{
+					$icon = (strstr($category_icon, 'images/') ? THEME.$category_icon : e_IMAGE.'icons/'.$category_icon);
 				}
 
 				$text .= "<tr>
 				<td style='width:5%; text-align:center' class='forumheader3'>{$category_id}</td>
-				<td style='width:5%; text-align:center' class='forumheader3'><img src='$icon' alt='' style='vertical-align:middle' /></td>
-				<td style='width:70%' class='forumheader3'>$category_name</td>
+				<td style='width:5%; text-align:center' class='forumheader3'><img src='{$icon}' alt='' style='vertical-align:middle' /></td>
+				<td style='width:70%' class='forumheader3'>{$category_name}</td>
 				<td style='width:20%; text-align:center' class='forumheader3'>
 				<a href='".e_SELF."?cat.edit.{$category_id}'>".ADMIN_EDIT_ICON."</a>
-				<input type='image' title='".LAN_DELETE."' name='delete[category_{$category_id}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(NWSLAN_37." [ID: $category_id ]")."') \"/>
+				<input type='image' title='".LAN_DELETE."' name='delete[category_{$category_id}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(NWSLAN_37." [ID: {$category_id} ]")."') \"/>
 				</td>
 				</tr>\n";
 			}
 			$text .= "</table></form>";
-			} else {
+		}
+		else
+		{
 			$text .= "<div style='text-align:center'><div style='vertical-align:middle'>".NWSLAN_10."</div>";
 		}
 		$text .= "</div>";
 		$ns->tablerender(NWSLAN_51, $text);
 	}
 
-
-
 	function show_news_prefs() 
 	{
 		global $sql, $rs, $ns, $pref;
 
 		$text = "<div style='text-align:center'>
-		".$rs->form_open("post", e_SELF."?pref", "dataform")."
+		".$rs->form_open('post', e_SELF.'?pref', 'dataform')."
 		<table class='fborder' style='".ADMIN_WIDTH."'>
 		<tr>
 		<td class='forumheader3' style='width:60%'><span class='defaulttext'>".NWSLAN_86."</span></td>
 		<td class='forumheader3' style='width:40%'>
-		<input type='checkbox' name='news_cats' value='1' ".($pref['news_cats'] == 1 ? " checked='checked'" : "")." />
+		<input type='checkbox' name='news_cats' value='1' ".($pref['news_cats'] == 1 ? " checked='checked'" : '')." />
 		</td>
-
 		</tr>
 
 		<tr>
 		<td class='forumheader3' style='width:60%'><span class='defaulttext'>".NWSLAN_87."</span></td>
 		<td class='forumheader3' style='width:40%'>
-		<select class='tbox' name='nbr_cols'>
-		<option value='1' ".($pref['nbr_cols'] == 1 ? "selected='selected'>" : "").">1</option>
-		<option value='2' ".($pref['nbr_cols'] == 2 ? "selected='selected'>" : "").">2</option>
-		<option value='3' ".($pref['nbr_cols'] == 3 ? "selected='selected'>" : "").">3</option>
-		<option value='4' ".($pref['nbr_cols'] == 4 ? "selected='selected'>" : "").">4</option>
-		<option value='5' ".($pref['nbr_cols'] == 5 ? "selected='selected'>" : "").">5</option>
-		<option value='6' ".($pref['nbr_cols'] == 6 ? "selected='selected'>" : "").">6</option>
+		<select class='tbox' name='nbr_cols'>";
+		for($i = 1; $i < 7; $i++) 
+		{	// Up to 6 category columns
+			$text .= "<option value='{$i}' ".($pref['nbr_cols'] == $i ? "selected='selected'>" : '').">{$i}</option>";
+		}
+		$text .= "
 		</select></td>
 		</tr>
 
@@ -1045,11 +1038,7 @@
 		//			</td>
 		//			</tr>";
 
-
-
-
-
-		// ##### ADDED FOR NEWS ARCHIVE --------------------------------------------------------------------
+		// ##### ADDED FOR NEWS ARCHIVE ---------------------------------------
 		// the possible archive values are from "0" to "< $pref['newsposts']"
 		// this should really be made as an onchange event on the selectbox for $pref['newsposts'] ...
 		$text .= "
@@ -1059,7 +1048,8 @@
 		</td>
 		<td class='forumheader3' style='width:40%'>
 		<select class='tbox' name='newsposts_archive'>";
-		for($i = 0; $i < $pref['newsposts']; $i++) {
+		for($i = 0; $i < $pref['newsposts']; $i++) 
+		{
 			$text .= ($i == $pref['newsposts_archive'] ? "<option value='".$i."' selected='selected'>".$i."</option>" : " <option value='".$i."'>".$i."</option>");
 		}
 		$text .= "</select></td>
@@ -1074,28 +1064,25 @@
 		";
 		// ##### END --------------------------------------------------------------------------------------
 
-
-		require_once(e_HANDLER."userclass_class.php");
+		require_once(e_HANDLER.'userclass_class.php');
 		$text .= " <tr>
 		<td class='forumheader3' style='width:60%'><span class='defaulttext'>".NWSLAN_106."</span></td>
 		<td class='forumheader3' style='width:40%'>
-		".r_userclass("subnews_class", $pref['subnews_class'],"off","nobody,public,guest,member,admin,main,classes"). "</td></tr>";
-
+		".r_userclass('subnews_class', $pref['subnews_class'],'off','nobody,public,guest,member,admin,classes'). "</td></tr>";
 
 		$text .= "
 		<tr>
 		<td class='forumheader3' style='width:60%'><span class='defaulttext'>".NWSLAN_107."</span></td>
 		<td class='forumheader3' style='width:40%'>
-		<input type='checkbox' name='subnews_htmlarea' value='1' ".($pref['subnews_htmlarea'] == 1 ? " checked='checked'" : "")." />
+		<input type='checkbox' name='subnews_htmlarea' value='1' ".($pref['subnews_htmlarea'] == 1 ? " checked='checked'" : '')." />
 		</td>
 		</tr>";
 
-
 		$text .= "
 		<tr>
 		<td class='forumheader3' style='width:60%'><span class='defaulttext'>".NWSLAN_100."</span></td>
 		<td class='forumheader3' style='width:40%'>
-		<input type='checkbox' name='subnews_attach' value='1' ".($pref['subnews_attach'] == 1 ? " checked='checked'" : "")." />
+		<input type='checkbox' name='subnews_attach' value='1' ".($pref['subnews_attach'] == 1 ? " checked='checked'" : '')." />
 		</td>
 		</tr>
 
@@ -1106,18 +1093,17 @@
 		<span class='smalltext'>".NWSLAN_102."</span></td>
 		</tr>
 
-
 		<tr>
 		<td class='forumheader3' style='width:60%'><span class='defaulttext'>".NWSLAN_111."</span><br /><i>".NWSLAN_112."</i></td>
 		<td class='forumheader3' style='width:40%'>
-		<input type='checkbox' name='news_newdateheader' value='1' ".($pref['news_newdateheader'] == 1 ? " checked='checked'" : "")." />
+		<input type='checkbox' name='news_newdateheader' value='1' ".($pref['news_newdateheader'] == 1 ? " checked='checked'" : '')." />
 		</td>
 		</tr>
 
 		<tr>
 		<td class='forumheader3' style='width:60%'><span class='defaulttext'>".NWSLAN_113."</span><br /><i>".NWSLAN_114."</i></td>
 		<td class='forumheader3' style='width:40%'>
-		<input type='checkbox' name='news_unstemplate' value='1' ".($pref['news_unstemplate'] == 1 ? " checked='checked'" : "")." />
+		<input type='checkbox' name='news_unstemplate' value='1' ".($pref['news_unstemplate'] == 1 ? " checked='checked'" : '')." />
 		</td>
 		</tr>
 
@@ -1128,86 +1114,76 @@
 		</td>
 		</tr>
 
-
 		<tr><td colspan='2' style='text-align:center' class='forumheader'>";
 		$text .= "<input class='button' type='submit' name='save_prefs' value='".NWSLAN_89."' /></td></tr>";
 
 		$text .= "</table>
 		".$rs->form_close()."
 		</div>";
-
 		$ns->tablerender(NWSLAN_90, $text);
 	}
 
-
-
-
 	function show_maintenance() 
 	{
 		global $sql, $rs, $ns, $pref;
 
-		$text = "<div style='text-align:center'>
-		".$rs->form_open("post", e_SELF."?maint", "dataform")."
+		$text = "<div style='text-align:center;'>
+		".$rs->form_open('post', e_SELF.'?maint', 'dataform')."
 		<table class='fborder' style='".ADMIN_WIDTH."'>
-
-		<tr><td class='forumheader3'>".LAN_NEWS_51."</td><td style='text-align:center' class='forumheader3'>";
+		<tr><td class='forumheader3'>".LAN_NEWS_51."</td><td style='text-align:center;' class='forumheader3'>";
 		$text .= "<input class='button' type='submit' name='news_comments_recalc' value='".LAN_NEWS_52."' /></td></tr>";
-
 		$text .= "</table>
 		".$rs->form_close()."
 		</div>";
-
 		$ns->tablerender(LAN_NEWS_54, $text);
 	}
 
-
-
-
 	function submitted_news($sub_action, $id) 
 	{
 		global $rs, $ns, $tp;
 		$sql2 = new db;
 		$text = "<div style='text-align: center'>";
-		if ($category_total = $sql2->db_Select("submitnews", "*", "submitnews_id !='' ORDER BY submitnews_id DESC")) 
+		if ($category_total = $sql2->db_Select('submitnews', '*', "submitnews_id !='' ORDER BY submitnews_id DESC")) 
 		{
-		  $text .= "<table class='fborder' style='".ADMIN_WIDTH."'>
-			<tr>
-			<td style='width:5%' class='fcaption'>ID</td>
-			<td style='width:70%' class='fcaption'>".NWSLAN_57."</td>
-			<td style='width:25%; text-align:center' class='fcaption'>".LAN_OPTIONS."</td>
-			</tr>";
-		  while ($row = $sql2->db_Fetch()) 
-		  {
-			extract($row);
-			if (substr($submitnews_item,-7,7) == '[/html]') $submitnews_item = substr($submitnews_item,0,-7);
-			if (substr($submitnews_item,0,6) == '[html]') $submitnews_item = substr($submitnews_item,6);
-			$submitnews_item = $tp->dataFilter($submitnews_item);		// Remove any nasties
-			$submitnews_title = $tp->dataFilter($submitnews_title);
-			$text .= "<tr>
-				<td style='width:5%; text-align:center; vertical-align:top' class='forumheader3'>$submitnews_id</td>
-				<td style='width:70%' class='forumheader3'>";
-			$text .= ($submitnews_auth == 0)? "<b>".$tp->toHTML($submitnews_title,FALSE,"emotes_off, no_make_clickable")."</b>": $tp->toHTML($submitnews_title,FALSE,"emotes_off, no_make_clickable");
-			$text .= " [ ".NWSLAN_104." ".$submitnews_name." ".NWSLAN_108." ".date("D dS M y, g:ia", $submitnews_datestamp)."]<br />".$tp->toHTML($submitnews_item, TRUE, 'USER_BODY')."</td>
-				<td style='width:25%; text-align:right; vertical-align:top' class='forumheader3'>";
-			$buttext = ($submitnews_auth == 0)? NWSLAN_58 :	NWSLAN_103;
-			$text .= $rs->form_open("post", e_SELF."?sn", "myform__{$submitnews_id}", "", "", " onsubmit=\"return jsconfirm('".$tp->toJS(NWSLAN_38." [ID: $submitnews_id ]")."')\"   ")
-				."<div>".$rs->form_button("button", "category_edit_{$submitnews_id}", $buttext, "onclick=\"document.location='".e_SELF."?create.sn.$submitnews_id'\"")."
-				".$rs->form_button("submit", "delete[sn_{$submitnews_id}]", LAN_DELETE)."
+			$text .= "
+			<table class='fborder' style='".ADMIN_WIDTH."'>
+				<tr>
+					<td style='width:5%' class='fcaption'>ID</td>
+					<td style='width:70%' class='fcaption'>".NWSLAN_57."</td>
+					<td style='width:25%; text-align:center' class='fcaption'>".LAN_OPTIONS."</td>
+				</tr>";
+			while ($row = $sql2->db_Fetch()) 
+			{
+				extract($row);
+				if (substr($submitnews_item,-7,7) == '[/html]') $submitnews_item = substr($submitnews_item,0,-7);
+				if (substr($submitnews_item,0,6) == '[html]') $submitnews_item = substr($submitnews_item,6);
+				$submitnews_item = $tp->dataFilter($submitnews_item);		// Remove any nasties
+				$submitnews_title = $tp->dataFilter($submitnews_title);
+				$text .= "
+				<tr>
+					<td style='width:5%; text-align:center; vertical-align:top' class='forumheader3'>$submitnews_id</td>
+					<td style='width:70%' class='forumheader3'>";
+				$text .= ($submitnews_auth == 0)? '<b>'.$tp->toHTML($submitnews_title,FALSE,'emotes_off, no_make_clickable').'</b>': $tp->toHTML($submitnews_title,FALSE,'emotes_off, no_make_clickable');
+				$text .= ' [ '.NWSLAN_104.' '.$submitnews_name.' '.NWSLAN_108.' '.date('D dS M y, g:ia', $submitnews_datestamp).']<br />'.$tp->toHTML($submitnews_item).
+				"</td><td style='width:25%; text-align:right; vertical-align:top' class='forumheader3'>";
+				$buttext = ($submitnews_auth == 0)? NWSLAN_58 :	NWSLAN_103;
+				$text .= $rs->form_open('post', e_SELF.'?sn', 'myform__{$submitnews_id}', '', '', " onsubmit=\"return jsconfirm('".$tp->toJS(NWSLAN_38." [ID: {$submitnews_id} ]")."')\"   ")
+				."<div>".$rs->form_button('button', 'category_edit_'.$submitnews_id, $buttext, "onclick=\"document.location='".e_SELF."?create.sn.{$submitnews_id}'\"")."
+				".$rs->form_button('submit', 'delete[sn_'.$submitnews_id.']', LAN_DELETE)."
 				</div>".$rs->form_close()."
 				</td>
 				</tr>\n";
-		  }
-		  $text .= "</table>";
+			}
+			$text .= "</table>";
 		}
 		else 
 		{
-		  $text .= "<div style='text-align:center'>".NWSLAN_59."</div>";
+			$text .= "<div style='text-align:center'>".NWSLAN_59."</div>";
 		}
 		$text .= "</div>";
 		$ns->tablerender(NWSLAN_47, $text);
 	}
-
-}
+} // End of class newspost
 
 function newspost_adminmenu() 
 {
@@ -1215,6 +1191,4 @@
 	global $action;
 	$newspost->show_options($action);
 }
-
-
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_admin/notify.php 0.7.24.src/e107_admin/notify.php
--- 0.7.23.src/e107_admin/notify.php	2010-07-31 03:45:05.000000000 -0500
+++ 0.7.24.src/e107_admin/notify.php	2010-08-23 13:12:06.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/notify.php,v $
-|     $Revision: 11641 $
-|     $Date: 2010-07-31 03:45:29 -0500 (Sat, 31 Jul 2010) $
-|     $Author: e107coders $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/notify.php $
+|     $Revision: 11695 $
+|     $Id: notify.php 11695 2010-08-23 18:12:30Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
@@ -29,7 +29,8 @@
 require_once(e_HANDLER.'form_handler.php');
 $rs = new form;
 $nc = new notify_config;
-if (isset($_POST['update'])) {
+if (isset($_POST['update'])) 
+{
 	$nc -> update();
 }
 $nc -> config();
@@ -38,11 +39,13 @@
 
 	var $notify_prefs;
 
-	function notify_config() {
+	function notify_config() 
+	{
 		global $sysprefs, $eArrayStorage, $tp, $sql,$pref;
 		$this -> notify_prefs = $sysprefs -> get('notify_prefs');
 		$this -> notify_prefs = $eArrayStorage -> ReadArray($this -> notify_prefs);
 
+		$recalibrate = FALSE;
 		// load every e_notify.php file.
         foreach($pref['e_notify_list'] as $val)
 		{
@@ -133,9 +136,10 @@
 		$ns -> tablerender(NT_LAN_1, $text);
 	}
 
-	function render_event($id, $description) {
+	function render_event($id, $description) 
+	{
 		global $rs, $tp;
-		$text .= "<tr>
+		$text = "<tr>
 		<td class='forumheader3' style='width: 30%'>
 		".$description.":
 		</td>
diff -x .svn -aruN 0.7.23.src/e107_admin/phpinfo.php 0.7.24.src/e107_admin/phpinfo.php
--- 0.7.23.src/e107_admin/phpinfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/phpinfo.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/phpinfo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/phpinfo.php $
+|     $Revision: 11678 $
+|     $Id: phpinfo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/plugin.php 0.7.24.src/e107_admin/plugin.php
--- 0.7.23.src/e107_admin/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/prefs.php 0.7.24.src/e107_admin/prefs.php
--- 0.7.23.src/e107_admin/prefs.php	2010-08-20 07:59:17.000000000 -0500
+++ 0.7.24.src/e107_admin/prefs.php	2010-09-17 16:58:03.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* Site preferences editing
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/prefs.php $
-* $Id: prefs.php 11670 2010-08-20 12:59:41Z e107steved $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/prefs.php $
+|     $Revision: 11797 $
+|     $Id: prefs.php 11797 2010-09-17 21:58:27Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 // Experimental e-token
@@ -163,7 +166,7 @@
 	<div style='text-align:center'>
 	<div style='text-align:center; ".ADMIN_WIDTH."; margin-left: auto; margin-right: auto'>
 	<form method='post' action='".e_SELF."'>
-	<input type='hidden' name='e-token' value='".e_TOKEN."' />
+	
 	<div id='main' style='text-align:center'>
 	<table style='width:100%' class='fborder'>
 	<colgroup>
@@ -686,7 +689,7 @@
 	<tr>
 	<td class='forumheader3' style='width:50%;'>".PRFLAN_215.":  <div class='smalltext'>".PRFLAN_216."</div></td>
 	<td class='forumheader3' style='width:50%; text-align: right;'>
-	".r_userclass('post_script',$pref['post_script'],'off','nobody,admin,main,classes')."
+	".r_userclass('post_script',$pref['post_script'],'off','nobody,member,admin,main,classes')."
 	</td>
 	</tr>\n
 
@@ -1038,25 +1041,13 @@
 
 function pref_submit() {
 	$text = "<tr>
-		<td colspan='2' style='text-align:center' class='forumheader'>";
+		<td colspan='2' style='text-align:center' class='forumheader'>
+	<input class='button' type='submit' name='updateprefs' value='".PRFLAN_52."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />";
 
-	// ML
-	/* if(e_MLANG == 1){
-	//$text .="<input class='fcaption' type='submit' name='updateprefs' value='".PRFLAN_52."' />
-	$but_typ = array(""); // empty = submit
-	$but_nam = array("updateprefs"); // empty = autobutX with X autoincrement
-	$but_val = array("updateprefs"); // empty = Submit
-	$but_class = array("caption"); // empty = button
-	$butjs = array(""); // empty = ""
-	$buttitle = array(""); // empty = ""
-	$text .= e107ml_adpanel(1,$but_typ,$but_nam,$but_val,$but_class,$butjs,$buttitle);
-	}else{*/
-	$text .= "<input class='button' type='submit' name='updateprefs' value='".PRFLAN_52."' />";
-	// }
 	$text .= "</td>
 		</tr>";
 
-	// END ML
 	return $text;
 }
 
diff -x .svn -aruN 0.7.23.src/e107_admin/review.php 0.7.24.src/e107_admin/review.php
--- 0.7.23.src/e107_admin/review.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/review.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/review.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/review.php $
+|     $Revision: 11678 $
+|     $Id: review.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/search.php 0.7.24.src/e107_admin/search.php
--- 0.7.23.src/e107_admin/search.php	2010-07-31 03:45:05.000000000 -0500
+++ 0.7.24.src/e107_admin/search.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/search.php,v $
-|     $Revision: 11641 $
-|     $Date: 2010-07-31 03:45:29 -0500 (Sat, 31 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/search.php $
+|     $Revision: 11678 $
+|     $Id: search.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_admin/sql/core_pg.php 0.7.24.src/e107_admin/sql/core_pg.php
--- 0.7.23.src/e107_admin/sql/core_pg.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/sql/core_pg.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/sql/core_pg.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/sql/core_pg.php $
+|     $Revision: 11678 $
+|     $Id: core_pg.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 header("location:../index.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/sql/core_sql.php 0.7.24.src/e107_admin/sql/core_sql.php
--- 0.7.23.src/e107_admin/sql/core_sql.php	2010-07-23 03:05:33.000000000 -0500
+++ 0.7.24.src/e107_admin/sql/core_sql.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/sql/core_sql.php,v $
-|     $Revision: 11614 $
-|     $Date: 2010-07-23 03:05:57 -0500 (Fri, 23 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/sql/core_sql.php $
+|     $Revision: 11678 $
+|     $Id: core_sql.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_admin/sql/extended_country.php 0.7.24.src/e107_admin/sql/extended_country.php
--- 0.7.23.src/e107_admin/sql/extended_country.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/sql/extended_country.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/sql/extended_country.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/sql/extended_country.php $
+|     $Revision: 11678 $
+|     $Id: extended_country.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 header("location:../index.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/theme.php 0.7.24.src/e107_admin/theme.php
--- 0.7.23.src/e107_admin/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/ugflag.php 0.7.24.src/e107_admin/ugflag.php
--- 0.7.23.src/e107_admin/ugflag.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/ugflag.php	2010-09-02 02:15:05.000000000 -0500
@@ -4,16 +4,16 @@
  |     e107 website system
  |
  |     Steve Dunstan 2001-2002
- |     http://e107.org
- |     jalist@e107.org
+ |     Copyright (C) 2008-2010 e107 Inc (e107.org)
+ |
  |
  |     Released under the terms and conditions of the
  |     GNU General Public License (http://gnu.org).
  |
- |     $Source: /cvs_backup/e107_0.7/e107_admin/ugflag.php,v $
- |     $Revision: 11643 $
- |     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
- |     $Author: secretr $
+ |     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/ugflag.php $
+ |     $Revision: 11732 $
+ |     $Id: ugflag.php 11732 2010-09-02 07:15:29Z e107steved $
+ |     $Author: e107steved $
  +----------------------------------------------------------------------------+
  */
 
@@ -31,6 +31,8 @@
 	exit();
 }
 
+$e_sub_cat = 'maintain';
+
 if(isset($_POST['updatesettings']))
 {
 	$pref['maintainance_flag'] = intval($_POST['maintainance_flag']);
@@ -106,7 +108,7 @@
 			<br />
 ';
 
-$text .= '
+$text .= '</td>
 		</tr>
 ';
 
diff -x .svn -aruN 0.7.23.src/e107_admin/updateadmin.php 0.7.24.src/e107_admin/updateadmin.php
--- 0.7.23.src/e107_admin/updateadmin.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/updateadmin.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* Admin password changing
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/updateadmin.php $
-* $Id: updateadmin.php 11643 2010-07-31 14:58:45Z secretr $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/updateadmin.php $
+|     $Revision: 11678 $
+|     $Id: updateadmin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 // Experimental e-token
diff -x .svn -aruN 0.7.23.src/e107_admin/update_routines.php 0.7.24.src/e107_admin/update_routines.php
--- 0.7.23.src/e107_admin/update_routines.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/update_routines.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/update_routines.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/update_routines.php $
+|     $Revision: 11678 $
+|     $Id: update_routines.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/upload.php 0.7.24.src/e107_admin/upload.php
--- 0.7.23.src/e107_admin/upload.php	2010-07-31 03:45:05.000000000 -0500
+++ 0.7.24.src/e107_admin/upload.php	2010-08-23 13:12:06.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/upload.php,v $
-|     $Revision: 11641 $
-|     $Date: 2010-07-31 03:45:29 -0500 (Sat, 31 Jul 2010) $
-|     $Author: e107coders $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/upload.php $
+|     $Revision: 11695 $
+|     $Id: upload.php 11695 2010-08-23 18:12:30Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -22,6 +22,7 @@
 	exit;
 }
 $e_sub_cat = 'upload';
+$action = '';
 if (e_QUERY) {
 	$tmp = explode(".", e_QUERY);
 	$action = $tmp[0];
@@ -253,7 +254,9 @@
 
 // options -------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-if (is_readable(e_ADMIN.'filetypes.php')) {
+$allowed_filetypes = '';
+if (is_readable(e_ADMIN.'filetypes.php')) 
+{
 	$allowed_filetypes = trim(file_get_contents(e_ADMIN.'filetypes.php'));
 }
 
diff -x .svn -aruN 0.7.23.src/e107_admin/userclass2.php 0.7.24.src/e107_admin/userclass2.php
--- 0.7.23.src/e107_admin/userclass2.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/userclass2.php	2010-09-17 08:28:04.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* Userclass management
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/userclass2.php $
-* $Id: userclass2.php 11643 2010-07-31 14:58:45Z secretr $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/userclass2.php $
+|     $Revision: 11794 $
+|     $Id: userclass2.php 11794 2010-09-17 13:28:28Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 // Experimental e-token
@@ -88,7 +91,7 @@
 	}
 }
 
-if (isset($_POST['delete']) && varset($_POST['e-token']))
+if (isset($_POST['delete']))
 {
 	if(isset($_POST['useraction']))
 	{
@@ -148,8 +151,9 @@
 		$_POST['userclass_name'] = $tp->toDB($_POST['userclass_name']);
 		$_POST['userclass_description'] = $tp->toDB($_POST['userclass_description']);
 
-		$editclass = intval(varset($_POST['userclass_editclass'], 0));
-		if ($editclass && (getperms('0') || check_class($editclass)))
+		$editclass_check = varset($_POST['userclass_editclass'], false);
+		$editclass = intval($editclass_check);
+		if (false !== $editclass_check && (getperms('0') || check_class($editclass)))
 		{
 			$i = 1;
 			while ($sql->db_Select('userclass_classes', '*', "userclass_id='".$i."' ") && $i < 255)
@@ -365,7 +369,8 @@
 			<tr>
 			<td class='forumheader3'>{$row['userclass_name']}</td>
 			<td class='forumheader3'>".r_userclass_name($rEditClass)."</td>
-			<td class='forumheader3'>{$row['userclass_description']}</td>";
+			<td class='forumheader3'>{$row['userclass_description']}</td>
+			</tr>";
 		}
 	}
 }
diff -x .svn -aruN 0.7.23.src/e107_admin/userclass.php 0.7.24.src/e107_admin/userclass.php
--- 0.7.23.src/e107_admin/userclass.php	2010-02-19 14:47:09.000000000 -0600
+++ 0.7.24.src/e107_admin/userclass.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/userclass.php,v $
-|     $Revision: 11349 $
-|     $Date: 2010-02-19 14:47:33 -0600 (Fri, 19 Feb 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/userclass.php $
+|     $Revision: 11678 $
+|     $Id: userclass.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/userinfo.php 0.7.24.src/e107_admin/userinfo.php
--- 0.7.23.src/e107_admin/userinfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/userinfo.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/userinfo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/userinfo.php $
+|     $Revision: 11678 $
+|     $Id: userinfo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_admin/users_extended.php 0.7.24.src/e107_admin/users_extended.php
--- 0.7.23.src/e107_admin/users_extended.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/users_extended.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* Extended user field management
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/users_extended.php $
-* $Id: users_extended.php 11643 2010-07-31 14:58:45Z secretr $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/users_extended.php $
+|     $Revision: 11678 $
+|     $Id: users_extended.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 // Experimental e-token
diff -x .svn -aruN 0.7.23.src/e107_admin/users_extended_predefined.php 0.7.24.src/e107_admin/users_extended_predefined.php
--- 0.7.23.src/e107_admin/users_extended_predefined.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_admin/users_extended_predefined.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/users_extended_predefined.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/users_extended_predefined.php $
+|     $Revision: 11678 $
+|     $Id: users_extended_predefined.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_admin/users.php 0.7.24.src/e107_admin/users.php
--- 0.7.23.src/e107_admin/users.php	2010-08-01 07:40:53.000000000 -0500
+++ 0.7.24.src/e107_admin/users.php	2010-09-17 16:58:03.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* User settings editing
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/users.php $
-* $Id: users.php 11644 2010-08-01 12:41:17Z e107coders $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/users.php $
+|     $Revision: 11797 $
+|     $Id: users.php 11797 2010-09-17 21:58:27Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 // Experimental e-token
@@ -834,7 +837,7 @@
 
 		$text .= "<div style='cursor:pointer' onclick=\"expandit('sdisp')\">".LAN_DISPLAYOPT."</div>";
 		$text .= "<div  id='sdisp' style='padding-top:4px;display:none;text-align:center;margin-left:auto;margin-right:auto'>
-		<table class='forumheader3' style='width:95%'><tr>";
+		<table class='forumheader3' style='width:95%'>";
 /*
 		$fields = mysql_list_fields($mySQLdefaultdb, MPREFIX."user");		// Returns a resource. Deprecated
 		$columns = mysql_num_fields($fields);			// Bug in PHP5.3 using mysql_num_fields() with mysql_list_fields()
@@ -857,16 +860,25 @@
         $m = 0;
 		foreach($fname as $fcol)
 		{
+			if($m == 0)
+			{
+				$text .= "<tr>";	
+			}
 			$checked = (in_array($fcol,$search_display)) ? "checked='checked'" : "";
 			$text .= "<td style='text-align:left; padding:0px'>";
 			$text .= "<input type='checkbox' name='searchdisp[]' value='".$fcol."' $checked />".str_replace("user_","",$fcol) . "</td>\n";
 			$m++;
-			if($m == 5){
-				$text .= "</tr><tr>";
+			if($m == 5)
+			{
+				$text .= "</tr>";
 				$m = 0;
-			 }
+			}
         }
 
+		if($m != 0)
+		{
+			$text .= "</tr>";
+		}
 		$text .= "</table></div>
 		</form>\n
 		</div>";
diff -x .svn -aruN 0.7.23.src/e107_admin/ver.php 0.7.24.src/e107_admin/ver.php
--- 0.7.23.src/e107_admin/ver.php	2010-08-20 15:08:30.000000000 -0500
+++ 0.7.24.src/e107_admin/ver.php	2010-09-22 16:21:26.000000000 -0500
@@ -2,12 +2,12 @@
 /*
 * Copyright (c) 2010 e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/ver.php $
-* $Id: ver.php 11672 2010-08-20 20:08:54Z e107coders $
+* $Id: ver.php 11811 2010-09-22 21:21:50Z e107coders $
 *
 * Version file
 */
 
 if (!defined('e107_INIT')) { exit; }
 
-$e107info['e107_version'] = "0.7.23";
+$e107info['e107_version'] = "0.7.24";
 ?>
diff -x .svn -aruN 0.7.23.src/e107_admin/wmessage.php 0.7.24.src/e107_admin/wmessage.php
--- 0.7.23.src/e107_admin/wmessage.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_admin/wmessage.php	2010-09-07 08:00:34.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_admin/wmessage.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/wmessage.php $
+|     $Revision: 11759 $
+|     $Id: wmessage.php 11759 2010-09-07 13:00:58Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -46,11 +46,13 @@
 
 $rs = new form;
 
-if (e_QUERY) {
+$action = '';
+if (e_QUERY) 
+{
 	$tmp = explode('.', e_QUERY);
 	$action = $tmp[0];
-	$sub_action = $tmp[1];
-	$id = $tmp[2];
+	$sub_action = varset($tmp[1], '');
+	$id = varset($tmp[2], 0);
 	unset($tmp);
 }
 
@@ -59,39 +61,46 @@
 	$e107cache->clear("wmessage");
 }
 
-if (isset($_POST['wm_update'])) {
+if (isset($_POST['wm_update'])) 
+{
 	$data = $tp->toDB($_POST['data']);
 	$wm_title = $tp->toDB($_POST['wm_caption']);
 	$message = ($sql->db_Update("generic", "gen_chardata ='$data',gen_ip ='$wm_title', gen_intdata='".$_POST['wm_active']."' WHERE gen_id='".$_POST['wm_id']."' ")) ? LAN_UPDATED : LAN_UPDATED_FAILED;
 }
 
-if (isset($_POST['wm_insert'])) {
+if (isset($_POST['wm_insert'])) 
+{
 	$wmtext = $tp->toDB($_POST['data']);
 	$wmtitle = $tp->toDB($_POST['wm_caption']);
 	$message = ($sql->db_Insert("generic", "0, 'wmessage', '".time()."', ".USERID.", '{$wmtitle}', '{$_POST['wm_active']}', '{$wmtext}' ")) ? LAN_CREATED :  LAN_CREATED_FAILED ;
 }
 
-if (isset($_POST['updateoptions'])) {
+if (isset($_POST['updateoptions'])) 
+{
 	$pref['wm_enclose'] = $_POST['wm_enclose'];
 	$pref['wmessage_sc'] = $_POST['wmessage_sc'];
 	save_prefs();
 	$message = LAN_SETSAVED;
 }
 
-if (isset($_POST['main_delete'])) {
+if (isset($_POST['main_delete'])) 
+{
 	$del_id = array_keys($_POST['main_delete']);
 	$message = ($sql->db_Delete("generic", "gen_id='".$del_id[0]."' ")) ? LAN_DELETED : LAN_DELETED_FAILED ;
 }
 
-if (isset($message)) {
+if (isset($message)) 
+{
 	$ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
 }
 
 // Show Existing -------
-if ($action == "main" || $action == "") {
-	if ($wm_total = $sql->db_Select("generic", "*", "gen_type='wmessage' ORDER BY gen_id ASC")) {
+if ($action == "main" || $action == "") 
+{
+	if ($wm_total = $sql->db_Select("generic", "*", "gen_type='wmessage' ORDER BY gen_id ASC")) 
+	{
 		$wmList = $sql->db_getList();
-		$text = $rs->form_open("post", e_SELF, "myform_{$gen_id}", "", "");
+		$text = $rs->form_open('post', e_SELF, 'myform_wmessage', '', '');
 		$text .= "<div style='text-align:center'>
 			<table class='fborder' style='".ADMIN_WIDTH."'>
 			<tr>
@@ -100,7 +109,8 @@
 			<td class='fcaption' style='width:20%'>".WMLAN_03."</td>
 			<td class='fcaption' style='width:15%'>".LAN_OPTIONS."</td>
 			</tr>";
-		foreach($wmList as $row) {
+		foreach($wmList as $row) 
+		{
 			$text .= "
 			<tr>
 				<td class='forumheader3' style='width:5%; text-align: center; vertical-align: middle'>".$row['gen_id']."</td>
@@ -134,7 +144,10 @@
 	if ($sub_action != 'edit')
 	{
 		$preset = $pst->read_preset("admin_wmessage");
-		extract($preset);
+		if (is_array($preset))
+		{
+			extract($preset);
+		}
 	}
 
 	$text = "
@@ -194,7 +207,7 @@
 		".WMLAN_05."<br />
 		<span class='smalltext'>".WMLAN_06."</span>
 		</td>
-		<td class='forumheader3' style='width:30%;text-align:center'>". ($pref['wm_enclose'] ? "<input type='checkbox' name='wm_enclose' value='1' checked='checked' />" : "<input type='checkbox' name='wm_enclose' value='1' />")."
+		<td class='forumheader3' style='width:30%;text-align:center'>". (varset($pref['wm_enclose'], 0) ? "<input type='checkbox' name='wm_enclose' value='1' checked='checked' />" : "<input type='checkbox' name='wm_enclose' value='1' />")."
 		</td>
 		</tr>
 		<tr>
@@ -202,7 +215,7 @@
 		<td style='width:70%' class='forumheader3'>
 		".WMLAN_07."
 		</td>
-		<td class='forumheader3' style='width:30%;text-align:center'>". ($pref['wmessage_sc'] ? "<input type='checkbox' name='wmessage_sc' value='1' checked='checked' />" : "<input type='checkbox' name='wmessage_sc' value='1' />")."
+		<td class='forumheader3' style='width:30%;text-align:center'>". (varset($pref['wmessage_sc'], 0) ? "<input type='checkbox' name='wmessage_sc' value='1' checked='checked' />" : "<input type='checkbox' name='wmessage_sc' value='1' />")."
 		</td>
 		</tr>
 
diff -x .svn -aruN 0.7.23.src/e107_files/bbcode/bb_youtube.php 0.7.24.src/e107_files/bbcode/bb_youtube.php
--- 0.7.23.src/e107_files/bbcode/bb_youtube.php	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.24.src/e107_files/bbcode/bb_youtube.php	2010-09-21 02:44:46.000000000 -0500
@@ -0,0 +1,234 @@
+<?php
+/*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/emote.php $
+|     $Revision: 11678 $
+|     $Id: emote.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
+*/
+
+if (!defined('e107_INIT')) { exit; }
+
+/**
+ *	Youtube handling
+ *
+ * [youtube=tiny|small|medium|big|huge or width,height|nofull&norel&border&privacy&hd]ID[/youtube]
+ * Youtube ID is the only required data!
+ * TODO - more: http://code.google.com/apis/youtube/player_parameters.html
+ * TODO - use swfobject JS - XHTML validation
+ */
+
+/**
+ *	Class-based bbcode validation
+ *
+ *	Class name must be 'bb_'.bbname - where bbname is the name of the bbcode. (Note some bbcodes begin '_', and this is retained)
+ *
+ *	This class must contain exactly two public methods:
+ *		toDB($code_text, $parm) - called prior to text being saved
+ *		toHTML($code_text, $parm) - called prior to text being displayed
+ */
+
+class bb_youtube extends e_bb_base
+{
+
+	/**
+	 *	Called prior to save
+	 *
+	 *	If user has posted the complete youtube 'copy and paste' text between the tags, parse it and generate the relevant bbcode
+	 */
+	function toDB($code_text, $parm)
+	{
+		$bbpars = array();
+		$widthString = '';
+		$parm = trim($parm);
+		if ($parm)
+		{
+			if (strpos($parm, '|') !== FALSE)
+			{
+				list($widthString, $parm) = explode('|', $parm);
+			}
+			elseif (in_array($parm, array('tiny', 'small', 'medium', 'big', 'huge')) || (strpos($parm, ',') !== FALSE))
+			{	// Assume we're just setting a width
+				$widthString = $parm;
+				$parm = '';
+			}
+			if ($parm)
+			{
+				$bbpars = explode('&', $parm);
+			}
+		}
+		$params = array();										// Accumulator for parameters from youtube code
+		$ok = 0;
+		if (strpos($code_text, '<') === FALSE)
+		{	// 'Properly defined' bbcode (we hope)
+			$picRef = $code_text;
+		}
+		else
+		{
+			//libxml_use_internal_errors(TRUE);
+			if (FALSE === ($info = simplexml_load_string($code_text)))
+			{
+				//print_a($matches);
+				//$xmlErrs = libxml_get_errors();
+				//print_a($xmlErrs);
+				$ok = 1;
+			}
+			else
+			{
+				$info1 = (array)$info;
+				if (!isset($info1['embed']))
+				{
+					$ok = 2;
+				}
+				else
+				{
+					$info2 = (array)$info1['embed'];
+					if (!isset($info2['@attributes']))
+					{
+						$ok = 3;
+					}
+				}
+			}
+			if ($ok != 0)
+			{
+				print_a($info);
+				return '[sanitised]'.$ok.'B'.htmlspecialchars($matches[0]).'B[/sanitised]';
+			}
+			$target =  (array)$info2['@attributes'];
+			unset($info);
+			$ws = varset($target['width'], 0);
+			$hs = varset($target['height'], 0);
+			if (($ws == 0) || ($hs == 0) || !isset($target['src'])) return  '[sanitised]A'.htmlspecialchars($matches[0]).'A[/sanitised]';
+			if (!$widthString)
+			{
+				$widthString = $ws.','.$hs;			// Set size of window
+			}
+			list($url, $query) = explode('?', $target['src']);
+			if (strpos($url, 'youtube-nocookie.com') !== FALSE)
+			{
+				$params[] = 'privacy';
+			}
+			parse_str($query, $vals);		// Various options set here
+			if (varset($vals['allowfullscreen'], 'true') != 'true')
+			{
+				$params[] = 'nofull';
+			}
+			if (varset($vals['border'], 0) != 0)
+			{
+				$params[] = 'border';
+			}
+			if (varset($vals['rel'], 1) == 0)
+			{
+				$params[] = 'norel';
+			}
+			$picRef = substr($url, strrpos($url, '/') + 1);
+		}
+
+
+		$yID = preg_replace('/[^0-9a-z]/i', '', $picRef);
+		if (($yID != $picRef) || (strlen($yID) > 20))
+		{	// Possible hack attempt
+		}
+		$params = array_merge($params, $bbpars);			// Any parameters set in bbcode override those in HTML
+		// Could check for valid array indices here
+		$paramString = implode('&', $params);
+		if ($paramString) $widthString .= '|'.$paramString;
+		$ans = '[youtube='.$widthString.']'.$picRef.'[/youtube]';
+		return $ans;
+	}
+
+
+
+	/**
+	 *	Translate youtube bbcode into the appropriate <EMBED> object
+	 */
+	function toHTML($code_text, $parm)
+	{
+		if(empty($code_text)) return '';
+
+		$parms = explode('|', $parm, 2);
+		parse_str(varset($parms[1], ''), $params);
+
+		if(empty($parms[0])) $parms[0] = 'small';
+
+		switch ($parms[0]) 
+		{
+			case 'tiny':
+				$params['w'] = 200;
+				$params['h'] = 180;
+			break;
+			
+			case 'small':
+				$params['w'] = 445;
+				$params['h'] = 364;
+			break;
+			
+			case 'medium':
+				$params['w'] = 500;
+				$params['h'] = 405;
+			break;
+			
+			case 'big':
+				$params['w'] = 660;
+				$params['h'] = 525;
+			break;
+			
+			case 'huge':
+				$params['w'] = 980;
+				$params['h'] = 765;
+			break;
+			
+			default:
+				$dim = explode(',', $parms[0], 2);
+				$params['w'] = (integer) varset($dim[0], 445);
+				if($params['w'] > 980 || $params['w'] < 200) $params['w'] = 445;
+				
+				$params['h'] = (integer) varset($dim[1], 364);
+				if($params['h'] > 765 || $params['h'] < 180) $params['h'] = 364;
+			break;
+		}
+
+		$yID = preg_replace('/[^0-9a-z\-_\&]/i', '', $code_text);
+
+		$url = isset($params['privacy']) ? 'http://www.youtube-nocookie.com/v/' : 'http://www.youtube.com/v/';
+		$url .= $yID.'?';
+
+		if(isset($params['nofull'])) 
+		{
+			$fscr = 'false';
+			$url = $url.'fs=0';
+		} 
+		else 
+		{
+			$fscr = 'true';
+			$url = $url.'fs=1';
+		}
+		if(isset($params['border'])) $url = $url.'&amp;border=1';
+		if(isset($params['norel'])) $url = $url.'&amp;rel=0';
+		if(isset($params['hd'])) $url = $url.'&amp;hd=1';
+
+		$ret = ' 
+		<object width="'.$params['w'].'" height="'.$params['h'].'">
+			<param name="movie" value="'.$url.'"></param>
+			<param name="allowFullScreen" value="'.$fscr.'"></param>
+			<param name="allowscriptaccess" value="always"></param>
+			<param name="wmode" value="transparent"></param>
+			<embed src="'.$url.'" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="'.$fscr.'" wmode="transparent" width="'.$params['w'].'" height="'.$params['h'].'"></embed>
+		</object>
+		';
+
+		return $ret;
+	}
+}
+
+?>
diff -x .svn -aruN 0.7.23.src/e107_files/bbcode/link.bb 0.7.24.src/e107_files/bbcode/link.bb
--- 0.7.23.src/e107_files/bbcode/link.bb	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/bbcode/link.bb	2010-08-24 02:26:20.000000000 -0500
@@ -1,4 +1,4 @@
-// $Id: link.bb 11346 2010-02-17 18:56:14Z secretr $
+// $Id: link.bb 11696 2010-08-24 07:26:44Z e107steved $
 global $pref;
 
 /*
@@ -37,7 +37,7 @@
 		$parm .= ']';
 	}
 
-	list($link,$extras) = explode(" ",$parm);
+	list($link,$extras) = explode(' ',$parm.' ');
 	if(!$parm) $link = $code_text;
 
 	if($link == "external" && $extras == "")
diff -x .svn -aruN 0.7.23.src/e107_files/bbcode/youtube.bb 0.7.24.src/e107_files/bbcode/youtube.bb
--- 0.7.23.src/e107_files/bbcode/youtube.bb	2010-08-19 09:50:04.000000000 -0500
+++ 0.7.24.src/e107_files/bbcode/youtube.bb	1969-12-31 18:00:00.000000000 -0600
@@ -1,71 +0,0 @@
-/* $Id: youtube.bb 11665 2010-08-19 14:50:28Z secretr $ */
-// [youtube=tiny|small|medium|big|huge or width,height|norel&border&privacy&nofull]ID[/youtube]
-// Youtube ID is the only required data!
-// TODO - more: http://code.google.com/apis/youtube/player_parameters.html
-// TODO - use swfobject JS - XHTML validation
-if(empty($code_text)) return '';
-
-$parms = explode('|', $parm, 2);
-parse_str(varset($parms[1], ''), $params);
-
-if(empty($parms[0])) $parms[0] = 'small';
-
-switch ($parms[0]) 
-{
-	case 'tiny':
-		$params['w'] = 200;
-		$params['h'] = 180;
-	break;
-	
-	case 'small':
-		$params['w'] = 445;
-		$params['h'] = 364;
-	break;
-	
-	case 'medium':
-		$params['w'] = 500;
-		$params['h'] = 405;
-	break;
-	
-	case 'big':
-		$params['w'] = 660;
-		$params['h'] = 525;
-	break;
-	
-	case 'huge':
-		$params['w'] = 980;
-		$params['h'] = 765;
-	break;
-	
-	default:
-		$dim = explode(',', $parms[0], 2);
-		$params['w'] = (integer) varset($dim[0], 445);
-		if($params['w'] > 980 || $params['w'] < 200) $params['w'] = 445;
-		
-		$params['h'] = (integer) varset($dim[1], 364);
-		if($params['h'] > 765 || $params['h'] < 180) $params['h'] = 364;
-	break;
-}
-
-$yID = preg_replace('/[^0-9a-z\-_]/i', '', $code_text);
-
-$url = isset($params['privacy']) ? 'http://www.youtube-nocookie.com/v/' : 'http://www.youtube.com/v/';
-$url .= $yID.'?fs=1';
-
-if(isset($params['border'])) $url .= $yID.'&amp;border=1';
-if(isset($params['norel'])) $url .= $yID.'&amp;rel=0';
-
-$fscr = 'true';
-if(isset($params['nofull'])) $fscr = 'false';
-
-$ret = ' 
-<object width="'.$params['w'].'" height="'.$params['h'].'">
-	<param name="movie" value="'.$url.'"></param>
-	<param name="allowFullScreen" value="'.$fscr.'"></param>
-	<param name="allowscriptaccess" value="always"></param>
-	<param name="wmode" value="transparent"></param>
-	<embed src="'.$url.'" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="'.$fscr.'" wmode="transparent" width="'.$params['w'].'" height="'.$params['h'].'"></embed>
-</object>
-';
-
-return $ret;
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_files/def_e107_prefs.php 0.7.24.src/e107_files/def_e107_prefs.php
--- 0.7.23.src/e107_files/def_e107_prefs.php	2010-08-14 03:16:27.000000000 -0500
+++ 0.7.24.src/e107_files/def_e107_prefs.php	2010-08-22 16:25:57.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/def_e107_prefs.php,v $
-|     $Revision: 11656 $
-|     $Date: 2010-08-14 03:16:51 -0500 (Sat, 14 Aug 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/def_e107_prefs.php $
+|     $Revision: 11681 $
+|     $Id: def_e107_prefs.php 11681 2010-08-22 21:26:21Z e107steved $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -143,8 +143,9 @@
   'themecss' => 'canvas.css',
   'plug_sc' => ':featurebox',
   'auth_method' => '',
-  'post_html' => '254',
-  'post_script' => '254',
+  'post_html' => '250',
+  'post_script' => '250',
+  'filter_script' => '1',
   'redirectsiteurl' => '0',
   'admin_alerts_uniquemenu' => '0',
   'null' => '',
diff -x .svn -aruN 0.7.23.src/e107_files/e107.js 0.7.24.src/e107_files/e107.js
--- 0.7.23.src/e107_files/e107.js	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/e107.js	2010-08-21 19:43:21.000000000 -0500
@@ -4,10 +4,9 @@
 + ----------------------------------------------------------------------------+
 |	e107 website system - Javascript File.
 |
-|	$Source: /cvs_backup/e107_0.7/e107_files/e107.js,v $
-|	$Revision: 11346 $
-|	$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|	$Author: secretr $
+|	$URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/e107.js $
+|	$Revision: 11678 $
+|	$Id: e107.js 11678 2010-08-22 00:43:45Z e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_files/import/mambo.php 0.7.24.src/e107_files/import/mambo.php
--- 0.7.23.src/e107_files/import/mambo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/import/mambo.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/import/mambo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/import/mambo.php $
+|     $Revision: 11678 $
+|     $Id: mambo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_files/import/phpbb2.php 0.7.24.src/e107_files/import/phpbb2.php
--- 0.7.23.src/e107_files/import/phpbb2.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/import/phpbb2.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/import/phpbb2.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/import/phpbb2.php $
+|     $Revision: 11678 $
+|     $Id: phpbb2.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 |     31/1/2006  Changes by Albert Drent
 |                Aducom Software
diff -x .svn -aruN 0.7.23.src/e107_files/import/phpnuke.php 0.7.24.src/e107_files/import/phpnuke.php
--- 0.7.23.src/e107_files/import/phpnuke.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/import/phpnuke.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/import/phpnuke.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/import/phpnuke.php $
+|     $Revision: 11678 $
+|     $Id: phpnuke.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_files/resetcore/fixyoutube.php 0.7.24.src/e107_files/resetcore/fixyoutube.php
--- 0.7.23.src/e107_files/resetcore/fixyoutube.php	2010-08-19 04:52:31.000000000 -0500
+++ 0.7.24.src/e107_files/resetcore/fixyoutube.php	2010-08-23 02:52:38.000000000 -0500
@@ -8,6 +8,10 @@
 	exit();
 }
 
+// Comment out whichever isn't required
+define('YT_TEST_MODE', FALSE);
+//define('YT_TEST_MODE', TRUE);
+
 
 echo "Youtube tag conversion<br /><br />";
 
@@ -21,7 +25,7 @@
  *	@param string $idField - the field which identifies a particular record in the table (usually the autoincrement field)
  *	@param string $fieldList - comma separated list of fields to check
  */
-function checkTable($tableName, $idField, $fieldList)
+function checkTable($tableName, $idField, $fieldList,$test = TRUE)
 {
 	global $sql, $sql2, $ytChanged;
 	echo 'Checking table: '.$tableName.'...';
@@ -59,8 +63,16 @@
 				$new_data .= $spacer."`{$fn}`='{$fv}'";
 				$spacer = ', ';
 			}
-			$sql2->db_Update($tableName,  $new_data." WHERE `{$idField}`='{$row[$idField]}'");
-			echo '<br />'.$tableName.": Row ID {$row[$idField]} changed";
+			if($test == FALSE)
+			{
+				$sql2->db_Update($tableName,  $new_data." WHERE `{$idField}`='{$row[$idField]}'");
+				echo '<br />'.$tableName.": Row ID {$row[$idField]} changed";	
+			}
+			else
+			{
+				echo "<br />Test: ".$new_data;
+			}
+			
 		}
 	}
 	echo '...Done<br />';
@@ -88,11 +100,18 @@
 }
 
 
-checkTable('forum_t', 'thread_id', 'thread_thread');
-checkTable('submitnews', 'submitnews_id', 'submitnews_item');
-checkTable('news', 'news_id', 'news_body,news_extended');
-checkTable('pcontent', 'content_id', 'content_text');
-checkTable('faq_info', 'faq_id', 'faq_answer');
+
+function quoteQuery($matches)
+{
+	return $matches[1].'?';
+}
+
+
+checkTable('forum_t', 'thread_id', 'thread_thread', YT_TEST_MODE);
+checkTable('submitnews', 'submitnews_id', 'submitnews_item', YT_TEST_MODE);
+checkTable('news', 'news_id', 'news_body,news_extended', YT_TEST_MODE);
+checkTable('pcontent', 'content_id', 'content_text', YT_TEST_MODE);
+checkTable('faq', 'faq_id', 'faq_answer', YT_TEST_MODE);
 
 echo 'Complete<br />';
 
diff -x .svn -aruN 0.7.23.src/e107_files/resetcore/resetcore.php 0.7.24.src/e107_files/resetcore/resetcore.php
--- 0.7.23.src/e107_files/resetcore/resetcore.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/resetcore/resetcore.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ?Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/resetcore/resetcore.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/resetcore/resetcore.php $
+|     $Revision: 11678 $
+|     $Id: resetcore.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_files/resetcore.php 0.7.24.src/e107_files/resetcore.php
--- 0.7.23.src/e107_files/resetcore.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/resetcore.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/resetcore.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/resetcore.php $
+|     $Revision: 11678 $
+|     $Id: resetcore.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/admin_alt_nav.sc 0.7.24.src/e107_files/shortcode/admin_alt_nav.sc
--- 0.7.23.src/e107_files/shortcode/admin_alt_nav.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/admin_alt_nav.sc	2010-08-23 12:56:45.000000000 -0500
@@ -1,130 +1,138 @@
-if (ADMIN) {
-	global $sql, $pref, $tp;
-	parse_str($parm);
-	require(e_ADMIN.'ad_links.php');
-	require_once(e_HANDLER.'admin_handler.php');
-	function adnav_cat($cat_title, $cat_link, $cat_img, $cat_id=FALSE) {
-		$cat_link = ($cat_link ? $cat_link : "javascript:void(0);");
-		$text = "<a class='menuButton' href='".$cat_link."' style='background-image: url(".$cat_img."); background-repeat: no-repeat;  background-position: 3px 1px' ";
-		if ($cat_id) {
-			$text .= "onclick=\"return buttonClick(event, '".$cat_id."');\" onmouseover=\"buttonMouseover(event, '".$cat_id."');\"";
-		}
-		$text .= ">".$cat_title."</a>";
-		return $text;
-	}
-
-	function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='') {
-		$text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' ";
-		if ($cat_id) {
-			$text .= "onclick=\"return false;\" onmouseover=\"menuItemMouseover(event, '".$cat_id."');\"";
-		}
-			$text .= "><span class='menuItemBuffer'>".$cat_img."</span><span class='menuItemText'>".$cat_title."</span>";
-		if ($cat_id) {
-			$text .= "<span class=\"menuItemArrow\">&#9654;</span>";
-		}
-			$text .= "</a>";
-		return $text;
-	}
-	if (file_exists(THEME.'nav_menu.js')) {
-		$text = "<script type='text/javascript' src='".THEME_ABS."nav_menu.js'></script>";
-	} else {
-		$text = "<script type='text/javascript' src='".e_FILE_ABS."nav_menu.js'></script>";
-	}
-
-	$text .= "<div style='width: 100%'><table border='0' cellspacing='0' cellpadding='0' style='width: 100%'>
-	<tr><td>
-	<div class='menuBar' style='width: 100%'>";
-
-	$text .= adnav_cat(ADLAN_151, e_ADMIN.'admin.php', E_16_NAV_MAIN);
-
-	for ($i = 1; $i < 5; $i++) {
-		$ad_tmpi = 0;
-		$ad_links_array = asortbyindex($array_functions, 1);
-		$nav_main = adnav_cat($admin_cat['title'][$i], '', $admin_cat['img'][$i], $admin_cat['id'][$i]);
-		$ad_texti = "<div id='".$admin_cat['id'][$i]."' class='menu' onmouseover=\"menuMouseover(event)\">";
-		while(list($key, $nav_extract) = each($ad_links_array)){
-			if($nav_extract[4]==$i){
-				if(getperms($nav_extract[3])){
-					$ad_texti .= adnav_main($nav_extract[1], $nav_extract[0], $nav_extract[5]);
-					$ad_tmpi = 1;
-				}
-			}
-		}
-		$ad_texti .= "</div>";
-		if ($ad_tmpi == 1) {
-			$text .= $nav_main;
-			$text .= $ad_texti;
-		}
-	}
-
-	$render_plugins = FALSE;
-	if($sql -> db_Select("plugin", "*", "plugin_installflag=1 ORDER BY plugin_path")){
-		while($row = $sql -> db_Fetch()){
-			if(getperms('P'.$row['plugin_id'])){
-				include_once(e_PLUGIN.$row['plugin_path']."/plugin.php");
-				if($eplug_conffile){
-					$eplug_name = $tp->toHTML($eplug_name,FALSE,"defs");
-					$plugin_icon = $eplug_icon_small ? "<img src='".e_PLUGIN_ABS.$eplug_icon_small."' alt='".$eplug_caption."' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />" : E_16_PLUGIN;
-					$plugin_array[ucfirst($eplug_name)] = adnav_main($eplug_name, e_PLUGIN.$row['plugin_path']."/".$eplug_conffile, $plugin_icon);
-				}
-				unset($eplug_conffile, $eplug_name, $eplug_caption, $eplug_icon_small);
-				$render_plugins = TRUE;
-				$active_plugs = TRUE;
-			}
-		}
-		ksort($plugin_array, SORT_STRING);
-		$plugs_text = '';
-		foreach ($plugin_array as $plugin_compile) {
-			$plugs_text .= $plugin_compile;
-		}
-	}
-
-	if (getperms('Z')) {
-		$pclass_extended = $active_plugs ? 'header' : '';
-		$plugin_text = adnav_main(ADLAN_98, e_ADMIN.'plugin.php', E_16_PLUGMANAGER, FALSE, $pclass_extended);
-		$render_plugins = TRUE;
-	}
-
-	if ($render_plugins) {
-		$text .= adnav_cat(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu');
-		$text .= "<div id='plugMenu' class='menu' onmouseover=\"menuMouseover(event)\">";
-		$text .= $plugin_text.$plugs_text;
-		$text .= "</div>";
-	}
-
-	$text .= adnav_cat(ADLAN_CL_8, '', E_16_NAV_DOCS, 'docsMenu');
-	$text .= "<div id='docsMenu' class='menu' onmouseover=\"menuMouseover(event)\">";
-	if (!$handle=opendir(e_DOCS.e_LANGUAGE."/")) {
-		$handle=opendir(e_DOCS."English/");
-	}
-	$i=1;
-	while ($file = readdir($handle)) {
-		if ($file != "." && $file != ".." && $file != "CVS") {
-			$text .= adnav_main(str_replace("_", " ", $file), e_ADMIN_ABS."docs.php?".$i, E_16_DOCS);
-			$i++;
-		}
-	}
-	closedir($handle);
-	$text .= "</div>";
-
-
-	$text .= "</div>
-	</td>";
-
-	if ($exit != 'off') {
-		$text .= "<td style='width: 160px; white-space: nowrap'>
-		<div class='menuBar' style='width: 100%'>";
-
-		$text .= adnav_cat(ADLAN_53, e_HTTP.'index.php', E_16_NAV_LEAV);
-		$text .= adnav_cat(ADLAN_46, e_ADMIN_ABS.'admin.php?logout', E_16_NAV_LGOT);
-
-		$text .= "</div>
-		</td>";
-	}
-
-	$text .= "</tr>
-	</table>
-	</div>";
-
-	return $text;
-}
+if (ADMIN) {
+	global $sql, $pref, $tp;
+	parse_str($parm);
+	require(e_ADMIN.'ad_links.php');
+	require_once(e_HANDLER.'admin_handler.php');
+	function adnav_cat($cat_title, $cat_link, $cat_img, $cat_id=FALSE) {
+		$cat_link = ($cat_link ? $cat_link : "javascript:void(0);");
+		$text = "<a class='menuButton' href='".$cat_link."' style='background-image: url(".$cat_img."); background-repeat: no-repeat;  background-position: 3px 1px' ";
+		if ($cat_id) 
+		{
+			$text .= "onclick=\"return buttonClick(event, '".$cat_id."');\" onmouseover=\"buttonMouseover(event, '".$cat_id."');\"";
+		}
+		$text .= ">".$cat_title."</a>";
+		return $text;
+	}
+
+	function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='') 
+	{
+		$text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' ";
+		if ($cat_id) {
+			$text .= "onclick=\"return false;\" onmouseover=\"menuItemMouseover(event, '".$cat_id."');\"";
+		}
+			$text .= "><span class='menuItemBuffer'>".$cat_img."</span><span class='menuItemText'>".$cat_title."</span>";
+		if ($cat_id) {
+			$text .= "<span class=\"menuItemArrow\">&#9654;</span>";
+		}
+			$text .= "</a>";
+		return $text;
+	}
+	if (file_exists(THEME.'nav_menu.js')) {
+		$text = "<script type='text/javascript' src='".THEME_ABS."nav_menu.js'></script>";
+	} else {
+		$text = "<script type='text/javascript' src='".e_FILE_ABS."nav_menu.js'></script>";
+	}
+
+	$text .= "<div style='width: 100%'><table border='0' cellspacing='0' cellpadding='0' style='width: 100%'>
+	<tr><td>
+	<div class='menuBar' style='width: 100%'>";
+
+	$text .= adnav_cat(ADLAN_151, e_ADMIN.'admin.php', E_16_NAV_MAIN);
+
+	for ($i = 1; $i < 5; $i++) {
+		$ad_tmpi = 0;
+		$ad_links_array = asortbyindex($array_functions, 1);
+		$nav_main = adnav_cat($admin_cat['title'][$i], '', $admin_cat['img'][$i], $admin_cat['id'][$i]);
+		$ad_texti = "<div id='".$admin_cat['id'][$i]."' class='menu' onmouseover=\"menuMouseover(event)\">";
+		while(list($key, $nav_extract) = each($ad_links_array)){
+			if($nav_extract[4]==$i){
+				if(getperms($nav_extract[3])){
+					$ad_texti .= adnav_main($nav_extract[1], $nav_extract[0], $nav_extract[5]);
+					$ad_tmpi = 1;
+				}
+			}
+		}
+		$ad_texti .= "</div>";
+		if ($ad_tmpi == 1) {
+			$text .= $nav_main;
+			$text .= $ad_texti;
+		}
+	}
+
+	$render_plugins = FALSE;
+	if($sql -> db_Select("plugin", "*", "plugin_installflag=1 ORDER BY plugin_path"))
+	{
+		while($row = $sql -> db_Fetch())
+		{
+			if(getperms('P'.$row['plugin_id']))
+			{
+				include_once(e_PLUGIN.$row['plugin_path']."/plugin.php");
+				if(varset($eplug_conffile, ''))
+				{
+					$eplug_name = $tp->toHTML($eplug_name,FALSE,"defs");
+					$plugin_icon = $eplug_icon_small ? "<img src='".e_PLUGIN_ABS.$eplug_icon_small."' alt='".$eplug_caption."' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />" : E_16_PLUGIN;
+					$plugin_array[ucfirst($eplug_name)] = adnav_main($eplug_name, e_PLUGIN.$row['plugin_path']."/".$eplug_conffile, $plugin_icon);
+				}
+				unset($eplug_conffile, $eplug_name, $eplug_caption, $eplug_icon_small);
+				$render_plugins = TRUE;
+				$active_plugs = TRUE;
+			}
+		}
+		ksort($plugin_array, SORT_STRING);
+		$plugs_text = '';
+		foreach ($plugin_array as $plugin_compile) 
+		{
+			$plugs_text .= $plugin_compile;
+		}
+	}
+
+	if (getperms('Z')) {
+		$pclass_extended = $active_plugs ? 'header' : '';
+		$plugin_text = adnav_main(ADLAN_98, e_ADMIN.'plugin.php', E_16_PLUGMANAGER, FALSE, $pclass_extended);
+		$render_plugins = TRUE;
+	}
+
+	if ($render_plugins) {
+		$text .= adnav_cat(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu');
+		$text .= "<div id='plugMenu' class='menu' onmouseover=\"menuMouseover(event)\">";
+		$text .= $plugin_text.$plugs_text;
+		$text .= "</div>";
+	}
+
+	$text .= adnav_cat(ADLAN_CL_8, '', E_16_NAV_DOCS, 'docsMenu');
+	$text .= "<div id='docsMenu' class='menu' onmouseover=\"menuMouseover(event)\">";
+	if (!$handle=opendir(e_DOCS.e_LANGUAGE."/")) {
+		$handle=opendir(e_DOCS."English/");
+	}
+	$i=1;
+	while ($file = readdir($handle)) {
+		if ($file != "." && $file != ".." && $file != "CVS") {
+			$text .= adnav_main(str_replace("_", " ", $file), e_ADMIN_ABS."docs.php?".$i, E_16_DOCS);
+			$i++;
+		}
+	}
+	closedir($handle);
+	$text .= "</div>";
+
+
+	$text .= "</div>
+	</td>";
+
+	if (varset($exit, '') != 'off') 
+	{
+		$text .= "<td style='width: 160px; white-space: nowrap'>
+		<div class='menuBar' style='width: 100%'>";
+
+		$text .= adnav_cat(ADLAN_53, e_HTTP.'index.php', E_16_NAV_LEAV);
+		$text .= adnav_cat(ADLAN_46, e_ADMIN_ABS.'admin.php?logout', E_16_NAV_LGOT);
+
+		$text .= "</div>
+		</td>";
+	}
+
+	$text .= "</tr>
+	</table>
+	</div>";
+
+	return $text;
+}
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/admin_lang.sc 0.7.24.src/e107_files/shortcode/admin_lang.sc
--- 0.7.23.src/e107_files/shortcode/admin_lang.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/admin_lang.sc	2010-09-09 16:34:33.000000000 -0500
@@ -1,7 +1,8 @@
-/* $Id: admin_lang.sc 11346 2010-02-17 18:56:14Z secretr $ */
+/* $Id: admin_lang.sc 11771 2010-09-09 21:34:57Z e107coders $ */
+//<?
 if(ADMIN)
 {
-	global $ns, $sql, $pref;
+	global $ns, $sql, $pref, $lng;
 	if($pref['multilanguage'])
 	{
 		include_lan(e_PLUGIN.'userlanguage_menu/languages/'.e_LANGUAGE.'.php');
@@ -14,26 +15,20 @@
 				$lanperms[] = $langval;
 			}
 		}
-		
-		require_once (e_HANDLER.'language_class.php');
-		$slng = new language;
-
-		
+			
 		if(!getperms($sql->mySQLlanguage) && $lanperms)
 		{
 			$sql->mySQLlanguage = ($lanperms[0] != $pref['sitelanguage']) ? $lanperms[0] : "";
-			if($pref['user_tracking'] == "session")
+			if(defset('MULTILANG_SUBDOMAIN')==TRUE)
 			{
-				$_SESSION['e107language_'.$pref['cookie_name']] = $lanperms[0];
-				if($pref['multilanguage_subdomain'])
-				{
-					header("Location:".$slng->subdomainUrl($lanperms[0]));
-				}
+				$_SESSION['e_language'] = $lanperms[0];
+				header("Location:".$lng->subdomainUrl($lanperms[0]));
 			}
 			else
 			{
-				setcookie('e107language_'.$pref['cookie_name'], $lanperms[0], time() + 86400, '/');
-				$_COOKIE['e107language_'.$pref['cookie_name']] = $lanperms[0];
+				$_SESSION['e_language'] = $lanperms[0];
+				setcookie('e107_language', $lanperms[0], time() + 86400, '/');
+				$_COOKIE['e107_language'] = $lanperms[0];
 			}
 		}
 		
@@ -51,8 +46,8 @@
 		if(isset($aff))
 		{
 			$text .= $sql->mySQLlanguage;
-			$text .= " (".$slng->convert($sql->mySQLlanguage).")
-			: <span class='button' style='cursor: pointer;' onclick='expandit(\"lan_tables\");'><a style='text-decoration:none' title='' href=\"javascript:void(0);\" >&nbsp;&nbsp;".count($aff)." ".UTHEME_MENU_L3."&nbsp;&nbsp;</a></span><br />
+			$text .= " (".$lng->convert($sql->mySQLlanguage).")
+			: <span class='button' style='cursor: pointer;' onclick='expandit(\"lan_tables\");'><a style='text-decoration:none;white-space:nowrap' title='' href=\"javascript:void(0);\" >&nbsp;&nbsp;".count($aff)." ".UTHEME_MENU_L3."&nbsp;&nbsp;</a></span><br />
 			<span style='display:none' id='lan_tables'>
 			";
 			$text .= implode("<br />", $aff);
@@ -61,7 +56,7 @@
 		elseif($sql->mySQLlanguage && ($sql->mySQLlanguage != $pref['sitelanguage']))
 		{
 			$text .= $sql->mySQLlanguage;
-			$text .= " (".$slng->convert($sql->mySQLlanguage)."): ".LAN_INACTIVE;
+			$text .= " (".$lng->convert($sql->mySQLlanguage)."): ".LAN_INACTIVE;
 		}
 		else
 		{
@@ -69,16 +64,15 @@
 		}
 		$text .= "<br /><br /></div>";
 
-		
-		if(isset($pref['multilanguage_subdomain']) && $pref['multilanguage_subdomain'])
+		if($lng->isLangDomain(e_DOMAIN))
 		{
 			$text .= "<div style='text-align:center'>
 			<select class='tbox' name='lang_select' style='width:95%' onchange=\"location.href=this.options[selectedIndex].value\">";
-			foreach ($lanperms as $lng)
+			foreach ($lanperms as $olng)
 			{
-				$selected = ($lng == $sql->mySQLlanguage || ($lng == $pref['sitelanguage'] && !$sql->mySQLlanguage)) ? "selected='selected'" : "";
-				$urlval = $slng->subdomainUrl($lng);
-				$text .= "<option value='".$urlval."' $selected>$lng</option>\n";
+				$selected = ($olng == $sql->mySQLlanguage || ($olng == $pref['sitelanguage'] && !$sql->mySQLlanguage)) ? "selected='selected'" : "";
+				$urlval = $lng->subdomainUrl($olng);
+				$text .= "<option value='".$urlval."' $selected>$olng</option>\n";
 			}
 			$text .= "</select></div>";
 			
@@ -91,11 +85,11 @@
 			<div>
 			<select name='sitelanguage' class='tbox'>";
 			
-			foreach ($lanperms as $lng)
+			foreach ($lanperms as $olng)
 			{
-				$langval = ($lng == $pref['sitelanguage'] && $lng == 'English') ? "" : $lng;
-				$selected = ($lng == $sql->mySQLlanguage || ($lng == $pref['sitelanguage'] && !$sql->mySQLlanguage)) ? "selected='selected'" : "";
-				$text .= "<option value='".$langval."' $selected>$lng</option>\n";
+				$langval = ($olng == $pref['sitelanguage'] && $olng == 'English') ? "" : $olng;
+				$selected = ($olng == $sql->mySQLlanguage || ($olng == $pref['sitelanguage'] && !$sql->mySQLlanguage)) ? "selected='selected'" : "";
+				$text .= "<option value='".$langval."' $selected>$olng</option>\n";
 			}
 			$text .= "</select>
 			<br /><br />
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/admin_latest.sc 0.7.24.src/e107_files/shortcode/admin_latest.sc
--- 0.7.23.src/e107_files/shortcode/admin_latest.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/admin_latest.sc	2010-08-27 08:06:14.000000000 -0500
@@ -1,44 +1,57 @@
-if (ADMIN) {
-	if (!function_exists('admin_latest')) {
-		function admin_latest() {
-			global $sql, $ns, $pref;
-
-	   		$active_uploads = $sql -> db_Count("upload", "(*)", "WHERE upload_active = '0' ");
-			$submitted_news = $sql -> db_Count("submitnews", "(*)", "WHERE submitnews_auth = '0' ");
-
-			$text = "<div style='padding-bottom: 2px;'>".E_16_NEWS.($submitted_news ? " <a href='".e_ADMIN_ABS."newspost.php?sn'>".ADLAN_LAT_2.": $submitted_news</a>" : " ".ADLAN_LAT_2.": 0")."</div>";
-			$text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS.($active_uploads ? " <a href='".e_ADMIN_ABS."upload.php'>".ADLAN_LAT_7.": $active_uploads</a>" : " ".ADLAN_LAT_7.": ".$active_uploads)."</div>";
-
-			foreach($pref['e_latest_list'] as $val)
-			{
-				if (is_readable(e_PLUGIN.$val."/e_latest.php"))
-				{
-				   		include_once(e_PLUGIN.$val."/e_latest.php");
-				}
-			}
-
-			$messageTypes = array("Broken Download", "Dev Team Message");
-			$queryString = "";
-			foreach($messageTypes as $types) {
-				$queryString .= " gen_type='$types' OR";
-			}
-			$queryString = substr($queryString, 0, -3);
-
-			if($amount = $sql -> db_Select("generic", "*", $queryString)) {
-				$text .= "<br /><b><a href='".e_ADMIN_ABS."message.php'>".ADLAN_LAT_8." [".$amount."]</a></b>";
-			}
-
-			return $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE);
-		}
-	}
-
-	if ($parm == 'request') {
-		if (function_exists('latest_request')) {
-			if (latest_request()) {
-				return admin_latest();
-			}
-		}
-	} else {
-		return admin_latest();
-	}
-}
+// $Id: admin_latest.sc 11711 2010-08-27 13:06:38Z e107steved $
+if (ADMIN) 
+{
+	if (!function_exists('admin_latest')) 
+	{
+		function admin_latest() 
+		{
+			global $sql, $ns, $pref;
+
+	   		$active_uploads = $sql -> db_Count("upload", "(*)", "WHERE upload_active = '0' ");
+			$submitted_news = $sql -> db_Count("submitnews", "(*)", "WHERE submitnews_auth = '0' ");
+
+			$text = "<div style='padding-bottom: 2px;'>".E_16_NEWS.($submitted_news ? " <a href='".e_ADMIN_ABS."newspost.php?sn'>".ADLAN_LAT_2.": $submitted_news</a>" : " ".ADLAN_LAT_2.": 0")."</div>";
+			$text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS.($active_uploads ? " <a href='".e_ADMIN_ABS."upload.php'>".ADLAN_LAT_7.": $active_uploads</a>" : " ".ADLAN_LAT_7.": ".$active_uploads)."</div>";
+
+			if (isset($pref['e_latest_list']) && is_array($pref['e_latest_list']))
+			{
+				foreach($pref['e_latest_list'] as $val)
+				{
+					if (is_readable(e_PLUGIN.$val."/e_latest.php"))
+					{
+							include_once(e_PLUGIN.$val."/e_latest.php");
+					}
+				}
+			}
+
+			$messageTypes = array("Broken Download", "Dev Team Message");
+			$queryString = "";
+			foreach($messageTypes as $types) {
+				$queryString .= " gen_type='$types' OR";
+			}
+			$queryString = substr($queryString, 0, -3);
+
+			if($amount = $sql -> db_Select("generic", "*", $queryString)) 
+			{
+				$text .= "<br /><b><a href='".e_ADMIN_ABS."message.php'>".ADLAN_LAT_8." [".$amount."]</a></b>";
+			}
+
+			return $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE);
+		}
+	}
+
+	if ($parm == 'request') 
+	{
+		if (function_exists('latest_request')) 
+		{
+			if (latest_request()) 
+			{
+				return admin_latest();
+			}
+		}
+	} 
+	else 
+	{
+		return admin_latest();
+	}
+}
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/admin_menu.sc 0.7.24.src/e107_files/shortcode/admin_menu.sc
--- 0.7.23.src/e107_files/shortcode/admin_menu.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/admin_menu.sc	2010-08-23 12:56:45.000000000 -0500
@@ -4,10 +4,15 @@
 	//Show upper_right menu if the function exists
 	$tmp = explode(".",e_PAGE);
 	$adminmenu_func = $tmp[0]."_adminmenu";
-	if(function_exists($adminmenu_func)){
-		if (!$parm) {
-			call_user_func($adminmenu_func,$adminmenu_parms);
-		} else {
+	if(function_exists($adminmenu_func))
+	{
+		if (!$parm) 
+		{
+			isset($adminmenu_parms) ? call_user_func($adminmenu_func, $adminmenu_parms) : call_user_func($adminmenu_func);
+			
+		} 
+		else 
+		{
 			ob_end_clean();
 			return 'pre';
 		}
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/admin_plugins.sc 0.7.24.src/e107_files/shortcode/admin_plugins.sc
--- 0.7.23.src/e107_files/shortcode/admin_plugins.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/admin_plugins.sc	2010-08-27 08:06:14.000000000 -0500
@@ -1,32 +1,47 @@
-if (ADMIN) {
+// $Id: admin_plugins.sc 11711 2010-08-27 13:06:38Z e107steved $
+if (ADMIN) 
+{
 	global $e107_plug, $ns, $pref;
-	if ($pref['admin_alerts_ok'] == 1) {
+	if ($pref['admin_alerts_ok'] == 1) 
+	{
 		ob_start();
 		$text = "";
 		$i = 0;
-		if (strstr(e_SELF, "/admin.php")) {
+		if (strstr(e_SELF, "/admin.php")) 
+		{
 			global $sql;
-			if ($sql -> db_Select("plugin", "*", "plugin_installflag=1")) {
-				while($rowplug = $sql -> db_Fetch()){
+			if ($sql -> db_Select("plugin", "*", "plugin_installflag=1")) 
+			{
+				while($rowplug = $sql -> db_Fetch())
+				{
 					extract($rowplug);
 					$e107_plug[$rowplug[1]] = $rowplug[3];
 				}
 			}
 		}
-		if (is_array($e107_plug)) {
-			foreach(array_keys($e107_plug) as $xplug){
-				if (file_exists(e_PLUGIN.$e107_plug[$xplug]."/admin_info.php")) {
-					if ($pref['admin_alerts_uniquemenu'] == 1) {
+		if (isset($e107_plug) && is_array($e107_plug)) 
+		{
+			foreach(array_keys($e107_plug) as $xplug)
+			{
+				if (file_exists(e_PLUGIN.$e107_plug[$xplug]."/admin_info.php")) 
+				{
+					if ($pref['admin_alerts_uniquemenu'] == 1) 
+					{
 						$text .= "<b>".$xplug."</b><br />";
-					} else {
+					} 
+					else 
+					{
 						$text = "";
 					}
 					require_once(e_PLUGIN.$e107_plug[$xplug]."/admin_info.php");
 					$text .= "<br />";
-					if ($pref['admin_alerts_uniquemenu'] != 1) {
+					if ($pref['admin_alerts_uniquemenu'] != 1) 
+					{
 						$caption = $xplug;
 						$ns -> tablerender($caption, $text);
-					} else {
+					} 
+					else 
+					{
 						$text .= "<br />";
 					}
 					$i++;
@@ -36,7 +51,8 @@
     
 		$caption = LAN_head_6;
     
-		if ($i>0 && $pref['admin_alerts_uniquemenu'] == 1) {
+		if ($i>0 && $pref['admin_alerts_uniquemenu'] == 1) 
+		{
 			$ns -> tablerender($caption, $text);
 		}
 		$plug_text = ob_get_contents();
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/admin_siteinfo.sc 0.7.24.src/e107_files/shortcode/admin_siteinfo.sc
--- 0.7.23.src/e107_files/shortcode/admin_siteinfo.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/admin_siteinfo.sc	2010-08-31 14:09:43.000000000 -0500
@@ -36,6 +36,10 @@
 	<br />
 	".$install_date."
 	<br /><br />
+	<b>".FOOTLAN_19."</b>
+	<br />
+	".date('r')."
+	<br /><br />
 	<b>".FOOTLAN_9."</b>
 	<br />".
 	 preg_replace("/PHP.*/i", "", $_SERVER['SERVER_SOFTWARE'])."<br />(".FOOTLAN_10.": ".$_SERVER['SERVER_NAME'].")
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/admin_status.sc 0.7.24.src/e107_files/shortcode/admin_status.sc
--- 0.7.23.src/e107_files/shortcode/admin_status.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/admin_status.sc	2010-08-27 08:06:14.000000000 -0500
@@ -1,45 +1,55 @@
-if (getperms('0') || getperms('4')) 
-{
-	if (!function_exists('admin_status')) {
-		function admin_status() {
-			global $sql, $ns, $pref;
-			$members = $sql -> db_Count("user");
-			$unverified = $sql -> db_Count("user", "(*)", "WHERE user_ban=2");
-			$banned = $sql -> db_Count("user", "(*)", "WHERE user_ban=1");
-			$comments = $sql -> db_Count("comments");
-			$unver = ($unverified ? " <a href='".e_ADMIN_ABS."users.php?unverified'>".ADLAN_111."</a>" : ADLAN_111);
-
-			$text = "<div style='padding-bottom: 2px;'>".E_16_USER." ".ADLAN_110.": ".$members."</div>";
-			$text .= "<div style='padding-bottom: 2px;'>".E_16_USER." {$unver}: ".$unverified."</div>";
-			$text .= "<div style='padding-bottom: 2px;'>".E_16_BANLIST." ".ADLAN_112.": ".$banned."</div>";
-			$text .= "<div style='padding-bottom: 2px;'>".E_16_COMMENT." ".ADLAN_114.": ".$comments."</div>";
-
-			foreach($pref['e_status_list'] as $val)
-			{
-				if (is_readable(e_PLUGIN.$val."/e_status.php"))
-				{
-				   		include_once(e_PLUGIN.$val."/e_status.php");
-				}
-			}
-
-
-			if($flo = $sql -> db_Count("generic", "(*)", "WHERE gen_type='failed_login'"))
-			{
-				$text .= "<img src='".e_IMAGE_ABS."admin_images/failedlogin_16.png' alt='' style='vertical-align: middle;' /> <a href='".e_ADMIN_ABS."fla.php'>".ADLAN_146.": $flo</a>";
-			}
-
-
-			return $ns -> tablerender(ADLAN_134, $text, '', TRUE);
-		}
-	}
-
-	if ($parm == 'request') {
-		if (function_exists('status_request')) {
-			if (status_request()) {
-				return admin_status();
-			}
-		}
-	} else {
-		return admin_status();
-	}
-}
+// $Id: admin_status.sc 11711 2010-08-27 13:06:38Z e107steved $
+if (getperms('0') || getperms('4')) 
+{
+	if (!function_exists('admin_status')) 
+	{
+		function admin_status() 
+		{
+			global $sql, $ns, $pref;
+			$members = $sql -> db_Count("user");
+			$unverified = $sql -> db_Count("user", "(*)", "WHERE user_ban=2");
+			$banned = $sql -> db_Count("user", "(*)", "WHERE user_ban=1");
+			$comments = $sql -> db_Count("comments");
+			$unver = ($unverified ? " <a href='".e_ADMIN_ABS."users.php?unverified'>".ADLAN_111."</a>" : ADLAN_111);
+
+			$text = "<div style='padding-bottom: 2px;'>".E_16_USER." ".ADLAN_110.": ".$members."</div>";
+			$text .= "<div style='padding-bottom: 2px;'>".E_16_USER." {$unver}: ".$unverified."</div>";
+			$text .= "<div style='padding-bottom: 2px;'>".E_16_BANLIST." ".ADLAN_112.": ".$banned."</div>";
+			$text .= "<div style='padding-bottom: 2px;'>".E_16_COMMENT." ".ADLAN_114.": ".$comments."</div>";
+
+			if (isset($pref['e_status_list']) && is_array($pref['e_status_list']))
+			{
+				foreach($pref['e_status_list'] as $val)
+				{
+					if (is_readable(e_PLUGIN.$val."/e_status.php"))
+					{
+							include_once(e_PLUGIN.$val."/e_status.php");
+					}
+				}
+			}
+
+
+			if($flo = $sql -> db_Count("generic", "(*)", "WHERE gen_type='failed_login'"))
+			{
+				$text .= "<img src='".e_IMAGE_ABS."admin_images/failedlogin_16.png' alt='' style='vertical-align: middle;' /> <a href='".e_ADMIN_ABS."fla.php'>".ADLAN_146.": $flo</a>";
+			}
+
+			return $ns -> tablerender(ADLAN_134, $text, '', TRUE);
+		}
+	}
+
+	if ($parm == 'request') 
+	{
+		if (function_exists('status_request')) 
+		{
+			if (status_request()) 
+			{
+				return admin_status();
+			}
+		}
+	} 
+	else 
+	{
+		return admin_status();
+	}
+}
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/admin_update.sc 0.7.24.src/e107_files/shortcode/admin_update.sc
--- 0.7.23.src/e107_files/shortcode/admin_update.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/admin_update.sc	2010-09-17 16:30:29.000000000 -0500
@@ -1,8 +1,9 @@
-// $Id: admin_update.sc 11346 2010-02-17 18:56:14Z secretr $
-global $tp;
+// $Id: admin_update.sc 11796 2010-09-17 21:30:53Z e107coders $
+//<?
+
 	if (!ADMIN) return "";
 
-	global $e107cache,$ns, $pref;
+	global $tp, $e107cache,$ns, $pref;
 	
   	if (!varset($pref['check_updates'], FALSE)) return "";
 	
@@ -13,13 +14,15 @@
 
 	$feed = "http://www.e107.org/releases.php";
 	
-	$e107cache->CachePageMD5 = md5($e107info['e107_version']);
+	$e107cache->CachePageMD5 = e_LANGUAGE;
 
-    if($cacheData = $e107cache->retrieve("updatecheck",3600, TRUE))
+	$cacheData = $e107cache->retrieve("releasecheck",3600, TRUE);
+	
+    if($cacheData)
     {
-   	  	return $ns -> tablerender(LAN_NEWVERSION, $cacheData);
+   	  	return ($cacheData !='up-to-date') ? $ns -> tablerender(LAN_NEWVERSION, $cacheData) : "";
     }
-
+	
 	// Keep commented out to be sure it continues to work under all circumstances.
 
 	//if ((strpos(e_SELF,'localhost') !== FALSE) || (strpos(e_SELF,'127.0.0.1') !== FALSE)) return '';
@@ -45,16 +48,16 @@
 			$link = varsettrue($val['attributes']['url']);
 			$compat = varsettrue($val['attributes']['compatibility']);
 	
-		 	if(($compat == '0.7') && version_compare($version,$cur_version)==1)
+		 	if(($compat == '0.7') && version_compare($version,$cur_version)==1 || (($compat == '0.7') && version_compare($version,$cur_version)==0 && ($tag =='svn')))
 			{
-	        	$ftext = "<a rel='external' href='".$link."' >".sprintf(LAN_NEWVERSION_DLD, "e107 v".$version)."</a><br />\n";
+	        	$ftext = "<a rel='external' href='".$link."' >".sprintf(LAN_NEWVERSION_DLD, "e107 v".$version)."</a>\n";
 	        	if(varsettrue($val['description']))
 	        	{
-	        		$ftext .= '<br />'.$tp->toHTML(trim($val['description']), true, 'BODY').'<br />';
+	        		$ftext .= '<br />'.$tp->toHTML(trim($val['description']), true, 'BODY');
 	        	}
 	        	if(varsettrue($val['attributes']['infourl']))
 	        	{
-	        		$ftext .= "<a rel='external' href='".$val['attributes']['infourl']."' >".LAN_NEWVERSION_MORE."</a>\n";
+	        		$ftext .= "<br /><a rel='external' href='".$val['attributes']['infourl']."' >".LAN_NEWVERSION_MORE."</a>\n";
 	        	}
 				break;
 			}
@@ -65,11 +68,14 @@
 	  $ftext = ADLAN_154;
 	}
 
-	$e107cache->set("updatecheck", $ftext, TRUE);
-	
 	if($ftext)
 	{
+		$e107cache->set("releasecheck", $ftext, TRUE);
 		return $ns -> tablerender(LAN_NEWVERSION, $ftext);
 	}
+	else
+	{
+		$e107cache->set("releasecheck", 'up-to-date', TRUE);
+	}
 
 
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/bbcode_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/bbcode_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/bbcode_shortcodes.php	2010-08-16 11:41:11.000000000 -0500
+++ 0.7.24.src/e107_files/shortcode/batch/bbcode_shortcodes.php	2010-09-13 19:30:14.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/bbcode_shortcodes.php,v $
-|     $Revision: 11660 $
-|     $Date: 2010-08-16 11:41:35 -0500 (Mon, 16 Aug 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/bbcode_shortcodes.php $
+|     $Revision: 11783 $
+|     $Id: bbcode_shortcodes.php 11783 2010-09-14 00:30:38Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -59,6 +59,7 @@
 $bbcode['center'] = array($bbcode_func,"[center][/center]", LANHELP_28,"center.png");
 $bbcode['left'] = array($bbcode_func,"[left][/left]", LANHELP_29,"left.png");
 $bbcode['right'] = array($bbcode_func,"[right][/right]", LANHELP_30,"right.png");
+$bbcode['justify'] = array($bbcode_func,"[justify][/justify]", LANHELP_49,"justify.png");
 $bbcode['bq'] = array($bbcode_func,"[blockquote][/blockquote]", LANHELP_31,"blockquote.png");
 $bbcode['code'] = array($bbcode_func,"[code][/code]", LANHELP_32,"code.png");
 $bbcode['list'] = array($bbcode_func,"[list][/list]", LANHELP_36,"list.png");
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/comment_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/comment_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/comment_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/batch/comment_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/comment_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/comment_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: comment_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/contact_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/contact_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/contact_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/batch/contact_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,16 +1,18 @@
 <?php
 /*
 + ----------------------------------------------------------------------------+
-|     e107 website system  Steve Dunstan 2001-2002
-|     http://e107.org jalist@e107.org
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/contact_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/contact_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: contact_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/download_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/download_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/download_shortcodes.php	2010-06-05 02:47:02.000000000 -0500
+++ 0.7.24.src/e107_files/shortcode/batch/download_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/download_shortcodes.php,v $
-|     $Revision: 11573 $
-|     $Date: 2010-06-05 02:47:26 -0500 (Sat, 05 Jun 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/download_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: download_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/news_archives.php 0.7.24.src/e107_files/shortcode/batch/news_archives.php
--- 0.7.23.src/e107_files/shortcode/batch/news_archives.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/batch/news_archives.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/news_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/news_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/news_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/batch/news_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/news_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/news_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: news_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/signup_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/signup_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/signup_shortcodes.php	2010-08-04 06:37:04.000000000 -0500
+++ 0.7.24.src/e107_files/shortcode/batch/signup_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/signup_shortcodes.php,v $
-|     $Revision: 11648 $
-|     $Date: 2010-08-04 06:37:28 -0500 (Wed, 04 Aug 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/signup_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: signup_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | Mods to show extended field categories
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/sitedown_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/sitedown_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/sitedown_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/batch/sitedown_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/sitedown_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/sitedown_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: sitedown_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit(); }
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/usersettings_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/usersettings_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/usersettings_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/batch/usersettings_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/usersettings_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/usersettings_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: usersettings_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/batch/user_shortcodes.php 0.7.24.src/e107_files/shortcode/batch/user_shortcodes.php
--- 0.7.23.src/e107_files/shortcode/batch/user_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/batch/user_shortcodes.php	2010-08-23 02:25:23.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/user_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/batch/user_shortcodes.php $
+|     $Revision: 11687 $
+|     $Id: user_shortcodes.php 11687 2010-08-23 07:25:47Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -496,7 +496,7 @@
 	{
 		$ret .= "<a href='".e_BASE.e_ADMIN."modcomment.php?profile.{$user['user_id']}'>".COMLAN_314."</a><br /><br />";
 	}
-	$ret .= $cobj->form_comment("comment", "profile", $user['user_id'], "", "", TRUE);
+	$ret .= $cobj->form_comment("comment", "profile", $user['user_id'], $user['user_name'], "", TRUE);
 	return $ret;
 }
 SC_END
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/languagelinks.sc 0.7.24.src/e107_files/shortcode/languagelinks.sc
--- 0.7.23.src/e107_files/shortcode/languagelinks.sc	2010-06-18 13:16:43.000000000 -0500
+++ 0.7.24.src/e107_files/shortcode/languagelinks.sc	2010-09-11 19:47:33.000000000 -0500
@@ -1,22 +1,19 @@
-//<? $Id: languagelinks.sc 11579 2010-06-18 18:17:07Z e107coders $
-global $pref;
-if( ! defined('LANGLINKS_SEPARATOR'))
+// $Id: languagelinks.sc 11782 2010-09-12 00:47:57Z e107coders $
+//<?
+global $pref,$lng;
+if(!defined('LANGLINKS_SEPARATOR'))
 {
 	define('LANGLINKS_SEPARATOR', '&nbsp;|&nbsp;');
 }
-//$cursub = explode('.', $_SERVER['HTTP_HOST']);
 
-require_once(e_HANDLER.'language_class.php');
-$slng = new language;
-
-if($parm)
+if($parm == "dropdown" || !$parm)
 {
-	$languageList = explode(',', $parm);
+	$languageList = explode(',', e_LANLIST);
+	sort($languageList);		
 }
-else
+elseif($parm)
 {
-	$languageList = explode(',', e_LANLIST);
-	sort($languageList);
+	$languageList = explode(',', $parm);
 }
 
 if(count($languageList) < 2)
@@ -24,25 +21,35 @@
 	return;
 }
 
+$option = array();
+$href = array();
+
 foreach($languageList as $languageFolder)
 {
-	$code = $slng->convert($languageFolder);
-	$name = $slng->toNative($languageFolder);
-	//$subdom = (isset($cursub[2])) ? $cursub[0] : '';
+	$code = $lng->convert($languageFolder);
+	$name = $lng->toNative($languageFolder);
 
-	if(varset($pref['multilanguage_subdomain']))
+	if(defset('MULTILANG_SUBDOMAIN')==TRUE)
 	{
-		$code = ($languageFolder == $pref['sitelanguage']) ? 'www' : $code;
-		$link = (e_QUERY)
-		        ? str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_SELF).'?'.e_QUERY
-		        : str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_SELF);
+		$code = ($languageFolder == $pref['sitelanguage']) ? 'www' : $code;		
+		$link = $lng->subdomainUrl($languageFolder);
 	}
 	else
 	{
 		$link = (e_QUERY) ? e_SELF.'?['.$code.']'.e_QUERY : e_SELF.'?['.$code.']';
 	}
 	$class = ($languageFolder == e_LANGUAGE) ? 'languagelink_active' : 'languagelink';
-	$ret[] =  "\n<a class='{$class}' href='{$link}'>{$name}</a>";
+	$sel = ($languageFolder == e_LANGUAGE) ? "selected='selected'" : '';
+	$href[] =  "\n<a class='{$class}' href='{$link}'>{$name}</a>";
+	$option[] =  "\n<option class='{$class}' value='{$link}' class='{$class}' {$sel}>{$name}</option>";
+}
+
+if($parm == "dropdown")
+{
+	return "<select class='languagelink_dropdown' onchange=\"location.href=this.options[selectedIndex].value\">".implode("\n",$option)."</select>";		
+}
+else
+{
+	return implode(LANGLINKS_SEPARATOR, $href);	
 }
 
-return implode(LANGLINKS_SEPARATOR, $ret);
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/sitelinks_alt.sc 0.7.24.src/e107_files/shortcode/sitelinks_alt.sc
--- 0.7.23.src/e107_files/shortcode/sitelinks_alt.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/sitelinks_alt.sc	2010-08-21 19:43:21.000000000 -0500
@@ -2,10 +2,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/sitelinks_alt.sc,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/shortcode/sitelinks_alt.sc $
+|     $Revision: 11678 $
+|     $Id: sitelinks_alt.sc 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_files/shortcode/wmessage.sc 0.7.24.src/e107_files/shortcode/wmessage.sc
--- 0.7.23.src/e107_files/shortcode/wmessage.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/shortcode/wmessage.sc	2010-08-27 08:06:14.000000000 -0500
@@ -1,47 +1,63 @@
-// $Id: wmessage.sc 11346 2010-02-17 18:56:14Z secretr $
+// $Id: wmessage.sc 11711 2010-08-27 13:06:38Z e107steved $
 $prefwmsc = isset($pref['wmessage_sc']) && $pref['wmessage_sc'];
-if (($prefwmsc && $parm == "header") || (!$prefwmsc && ($parm !='header')) ){
+if (($prefwmsc && $parm == "header") || (!$prefwmsc && ($parm !='header')) )
+{
 	return;
 }
 
 	global $e107,$e107cache;
 
 
-	if (isset($pref['frontpage']['all']) && $pref['frontpage']['all']) {
+	if (isset($pref['frontpage']['all']) && $pref['frontpage']['all']) 
+	{
 		$full_url = ((strpos($pref['frontpage']['all'], 'http') === FALSE) ? SITEURL : '').$pref['frontpage']['all'];
-	} else if (ADMIN) {
+	} 
+	else if (ADMIN) 
+	{
 		$full_url = ((strpos($pref['frontpage']['254'], 'http') === FALSE) ? SITEURL : '').$pref['frontpage']['254'];
-	} else if (USER) {
+	} 
+	else if (USER) 
+	{
 		require_once(e_HANDLER.'userclass_class.php');
 		$class_list = get_userclass_list();
-		foreach ($class_list as $fp_class) {
-			if (check_class($fp_class['userclass_id'])) {
-				$full_url = ((strpos($pref['frontpage'][$fp_class['userclass_id']], 'http') === FALSE) ? SITEURL : '').$pref['frontpage'][$fp_class['userclass_id']];
-        $class_match = true;
-				break;
+		if (is_array($class_list))
+		{
+			foreach ($class_list as $fp_class) 
+			{
+				if (check_class($fp_class['userclass_id'])) 
+				{
+					$full_url = ((strpos($pref['frontpage'][$fp_class['userclass_id']], 'http') === FALSE) ? SITEURL : '').$pref['frontpage'][$fp_class['userclass_id']];
+					$class_match = true;
+					break;
+				}
 			}
 		}
-		if (!$class_match) {
+		if (!$class_match) 
+		{
 			$full_url = ((strpos($pref['frontpage']['253'], 'http') === FALSE) ? SITEURL : '').$pref['frontpage']['253'];
 		}
-	} else {
+	} 
+	else 
+	{
 		$full_url = ((strpos($pref['frontpage']['252'], 'http') === FALSE) ? SITEURL : '').$pref['frontpage']['252'];
 	}
 	list($front_url,$front_qry) = explode("?",$full_url."?"); // extra '?' ensure the array is filled
 
-	if($parm == "ignore_query"){
+	if($parm == "ignore_query")
+	{
     	$front_qry = e_QUERY;
 	}
 
-	if($parm == "force"){
+	if($parm == "force")
+	{
     	$front_url = e_SELF;
 		$front_qry = e_QUERY;
 	}
 
-	if (e_SELF == $front_url && e_QUERY == $front_qry) {
+	if (e_SELF == $front_url && e_QUERY == $front_qry) 
+	{
 		global $sql, $pref, $tp, $ns;
 
-
 		if($cacheData = $e107cache->retrieve("wmessage"))
 		{
 			echo $cacheData;
@@ -49,7 +65,8 @@
 		}
 
 
-		if (!defined("WMFLAG")) {
+		if (!defined("WMFLAG")) 
+		{
 			$qry = "
 			SELECT * FROM #generic
 			WHERE gen_type ='wmessage' AND gen_intdata IN (".USERCLASS_LIST.")";
@@ -60,7 +77,8 @@
 				while ($row = $sql->db_Fetch())
 				{
 					$wmessage .= $tp->toHTML($row['gen_chardata'], TRUE, 'BODY, defs', 'admin')."<br />";
-					if(!$wmcaption){
+					if(!$wmcaption)
+					{
 						$wmcaption = $tp->toHTML($row['gen_ip'], TRUE, 'TITLE');
 					}
 				}
@@ -70,7 +88,7 @@
 			{
 				ob_start();
 
-				if ($pref['wm_enclose'])
+				if (varset($pref['wm_enclose'], FALSE))
 				{
 					$ns->tablerender($wmcaption, $wmessage, "wm");
 				}
diff -x .svn -aruN 0.7.23.src/e107_files/sleight_js.php 0.7.24.src/e107_files/sleight_js.php
--- 0.7.23.src/e107_files/sleight_js.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/sleight_js.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/sleight_js.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/sleight_js.php $
+|     $Revision: 11678 $
+|     $Id: sleight_js.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_files/thumb.php 0.7.24.src/e107_files/thumb.php
--- 0.7.23.src/e107_files/thumb.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_files/thumb.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_files/thumb.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_files/thumb.php $
+|     $Revision: 11678 $
+|     $Id: thumb.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 /*
diff -x .svn -aruN 0.7.23.src/e107_handlers/admin_log_class.php 0.7.24.src/e107_handlers/admin_log_class.php
--- 0.7.23.src/e107_handlers/admin_log_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/admin_log_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -5,16 +5,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/admin_log_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/admin_log_class.php $
+|     $Revision: 11678 $
+|     $Id: admin_log_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/arraystorage_class.php 0.7.24.src/e107_handlers/arraystorage_class.php
--- 0.7.23.src/e107_handlers/arraystorage_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/arraystorage_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,17 +4,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/arraystorage_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/arraystorage_class.php $
+|     $Revision: 11678 $
+|     $Id: arraystorage_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/avatar_handler.php 0.7.24.src/e107_handlers/avatar_handler.php
--- 0.7.23.src/e107_handlers/avatar_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/avatar_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/avatar_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/avatar_handler.php $
+|     $Revision: 11678 $
+|     $Id: avatar_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_handlers/bbcode_handler.php 0.7.24.src/e107_handlers/bbcode_handler.php
--- 0.7.23.src/e107_handlers/bbcode_handler.php	2010-08-16 11:41:11.000000000 -0500
+++ 0.7.24.src/e107_handlers/bbcode_handler.php	2010-09-18 09:31:48.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/bbcode_handler.php,v $
-|     $Revision: 11660 $
-|     $Date: 2010-08-16 11:41:35 -0500 (Mon, 16 Aug 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/bbcode_handler.php $
+|     $Revision: 11799 $
+|     $Id: bbcode_handler.php 11799 2010-09-18 14:32:12Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -23,6 +23,7 @@
 {
 	var $bbList;			// Caches the file contents for each bbcode processed
 	var $bbLocation;		// Location for each file - 'core' or a plugin name
+	var $preProcess = FALSE;	// Set when processing bbcodes prior to saving
 
 	function e_bbcode()
 	{
@@ -59,26 +60,42 @@
 		krsort($this->bbLocation);
 	}
 
-	// If $bb_strip is TRUE, all bbcodes are stripped. If FALSE, none are stripped.
+	// If $bbStrip is TRUE (boolean or word), all bbcodes are stripped. If FALSE, none are stripped.
 	// If a comma separated (lower case) list is passed, only the listed codes are stripped (and the rest are processed)
-	function parseBBCodes($value, $p_ID, $force_lower = 'default', $bb_strip = FALSE)
+	// If the first word of $bbStrip is 'PRE', sets pre-save mode. Any other parameters follow, comma separated
+	function parseBBCodes($value, $p_ID, $force_lower = 'default', $bbStrip = FALSE)
 	{
 		global $postID;
 		$postID = $p_ID;
 
 
-		if (strlen($value) <= 6) return $value;     // Don't waste time on trivia!
-		if ($force_lower == 'default') $force_lower = TRUE;	// Set the default behaviour if not overridden
-		$code_stack = array();				// Stack for unprocessed bbcodes and text
-		$unmatch_stack = array();				// Stack for unmatched bbcodes
-		$result = '';							// Accumulates fully processed text
-		$stacktext = '';						// Accumulates text which might be subject to one or more bbcodes
-		$nopro = FALSE;						// Blocks processing within [code]...[/code] tags
+		if (strlen($value) <= 6) return $value;   				// Don't waste time on trivia!
+		if ($force_lower == 'default') $force_lower = TRUE;		// Set the default behaviour if not overridden
+		$code_stack = array();									// Stack for unprocessed bbcodes and text
+		$unmatch_stack = array();								// Stack for unmatched bbcodes
+		$result = '';											// Accumulates fully processed text
+		$stacktext = '';										// Accumulates text which might be subject to one or more bbcodes
+		$nopro = FALSE;											// Blocks processing within [code]...[/code] tags
+		$this->preProcess = FALSE;
 
 		$strip_array = array();
-		if (!is_bool($bb_strip))
+		if (!is_bool($bbStrip))
 		{
-			$strip_array = explode(',',$bb_strip);
+			$strip_array = explode(',',$bbStrip);
+			if ($strip_array[0] == 'PRE')
+			{
+				$this->preProcess = TRUE;
+				unset($strip_array[0]);
+				if (count($strip_array) == 0) 
+				{
+					$bbStrip = FALSE;
+				}
+				elseif (in_array('TRUE', $strip_array))
+				{
+					$bbStrip = TRUE;
+				}
+				
+			}
 		}
 		$pattern = '#^\[(/?)([A-Za-z_]+)(\d*)([=:]?)(.*?)]$#i';	// Pattern to split up bbcodes
 		// $matches[0] - same as the input text
@@ -103,14 +120,13 @@
 					$bbword = (isset($matches[2])) ? $matches[2] : '';
 					if($cont[1] != '/')
 					{ 
-						$bbstart = $cont;
 						$bbsep = varset($matches[4]);
 					}
 					if ($force_lower) $bbword = strtolower($bbword);
 					if ($nopro && ($bbword == 'code') && ($matches[1] == '/')) $nopro = FALSE;		// End of code block
 					if (($bbword) && ($bbword == trim($bbword)) && !$nopro)
 					{  // Got a code to process here
-						if (($bb_strip === TRUE) || in_array($bbword,$strip_array))
+						if (($bbStrip === TRUE) || in_array($bbword,$strip_array))
 						{
 							$is_proc = TRUE;		// Just discard this bbcode
 						}
@@ -149,7 +165,7 @@
 											case 'bbcode' :
 												if (($code_stack[0]['code'] == $bbword) && ($code_stack[0]['numbers'] == $matches[3]))
 												{
-													$stacktext = $this->proc_bbcode($bbword,$code_stack[0]['param'],$stacktext,$bbparam, $bbsep, $bbstart.$stacktext.$cont);
+													$stacktext = $this->proc_bbcode($bbword,$code_stack[0]['param'],$stacktext,$bbparam, $code_stack[0]['bbsep'], $code_stack[0]['block'].$stacktext.$cont);
 													array_shift($code_stack);
 													// Intentionally don't terminate here - may be some text we can clean up
 													$bbword='';    // Necessary to make sure we don't double process if several instances on stack
@@ -178,11 +194,11 @@
 								{  // Single code to process
 									if (count($code_stack) == 0)
 									{
-										$result .= $this->proc_bbcode('_'.$bbword,$bbparam);
+										$result .= $this->proc_bbcode('_'.$bbword,$bbparam,'','','',$cont);
 									}
 									else
 									{
-										$stacktext .= $this->proc_bbcode('_'.$bbword,$bbparam);
+										$stacktext .= $this->proc_bbcode('_'.$bbword,$bbparam,'','','',$cont);
 									}
 									$is_proc = TRUE;
 								}
@@ -193,12 +209,11 @@
 										array_unshift($code_stack,array('type' => 'text','code' => $stacktext));
 										$stacktext = '';
 									}
-									array_unshift($code_stack,array('type' => 'bbcode','code' => $bbword, 'numbers'=> $matches[3], 'param'=>$bbparam));
+									array_unshift($code_stack,array('type' => 'bbcode','code' => $bbword, 'numbers'=> $matches[3], 'param'=>$bbparam, 'bbsep' => $bbsep, 'block' => $cont));
 									if ($bbword == 'code') $nopro = TRUE;
 									$is_proc = TRUE;
 								}
 							}
-
 						}
 					}
 					// Next lines could be deleted - but gives better rejection of 'stray' opening brackets
@@ -252,6 +267,8 @@
 	// $param1 - any text after '=' in the opening code
 	// $code_text_par - text between the opening and closing codes
 	// $param2 - any text after '=' for the closing code
+	// $sep - character separating bbcode name and any parameters
+	// $full_text - the 'raw' text between, and including, the opening and closing bbcode tags
 	{
 		global $tp, $postID, $code_text, $parm;
 		$parm = $param1;
@@ -272,15 +289,24 @@
 		{	// Find the file
 			if ($this->bbLocation[$code] == 'core')
 			{
-				$bbFile = e_FILE.'bbcode/'.strtolower(str_replace('_', '', $code)).'.bb';
+				$bbPath = e_FILE.'bbcode/';
+				$bbFile = strtolower(str_replace('_', '', $code));
 			}
 			else
 			{	// Add code to check for plugin bbcode addition
-				$bbFile = e_PLUGIN.$this->bbLocation[$code].'/'.strtolower($code).'.bb';
+				$bbPath = e_PLUGIN.$this->bbLocation[$code].'/';
+				$bbFile = strtolower($code);
 			}
-			if (file_exists($bbFile))
+			if (file_exists($bbPath.'bb_'.$bbFile.'.php'))
+			{	// Its a bbcode class file
+				require_once($bbPath.'bb_'.$bbFile.'.php');
+				//echo "Load: {$bbFile}.php<br />";
+				$className = 'bb_'.$code;
+				$this->bbList[$code] = new $className();
+			}
+			elseif (file_exists($bbPath.$bbFile.'.bb'))
 			{
-				$bbcode = file_get_contents($bbFile);
+				$bbcode = file_get_contents($bbPath.$bbFile.'.bb');
 				$this->bbList[$code] = $bbcode;
 			}
 			else
@@ -291,7 +317,19 @@
 		}
 		global $e107_debug;
 
+		if (is_object($this->bbList[$code]))
+		{
+			if ($this->preProcess)
+			{
+				return $this->bbList[$code]->bbPreSave($code_text, $param1);
+			}
+			return $this->bbList[$code]->bbPreDisplay($code_text, $param1);
+		}
+		if ($this->preProcess) return $full_text;		// No change
 
+		/**
+		 *	@todo - capturing output deprecated
+		 */
 		ob_start();
 		$bbcode_return = eval($bbcode);
 		$bbcode_output = ob_get_contents();
@@ -308,4 +346,53 @@
 	}
 }
 
+
+
+/**
+ *	Base class for bbcode handlers
+ *
+ *	Contains core routines for entry, security, logging....
+ */
+class e_bb_base
+{
+	/**
+	 *	Constructor
+	 */
+	function e_bb_base()
+	{
+	}
+
+
+
+	/**
+	 *	Called prior to save of user-entered text
+	 *
+	 *	Allows initial parsing of bbcode, including the possibility of removing or transforming the enclosed text (as is done by the youtube processing)
+	 *
+	 *	This is the 'new' facility
+	 *
+	 *	@todo - make 'final' for PHP5
+	 */
+	function bbPreSave(&$code_text, &$parm)
+	{
+		// Could add logging, security in here
+		return $this->toDB($code_text, $parm);
+	}
+
+
+
+	/**
+	 *	Process bbcode prior to display
+	 *
+	 *	Functionally this routine does exactly the same as the existing bbcodes
+	 *
+	 *	@todo - make 'final' for PHP5
+	 */
+	function bbPreDisplay(&$code_text, &$parm)
+	{
+		// Could add logging, security in here
+		return $this->toHTML($code_text, $parm);
+	}
+}
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_handlers/cache_handler.php 0.7.24.src/e107_handlers/cache_handler.php
--- 0.7.23.src/e107_handlers/cache_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/cache_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,17 +4,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/cache_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/cache_handler.php $
+|     $Revision: 11678 $
+|     $Id: cache_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -24,8 +24,8 @@
 * Class to cache data as files, improving site speed and throughput.
 *
 * @package     e107
-* @version     $Revision: 11346 $
-* @author      $Author: secretr $
+* @version     $Revision: 11678 $
+* @author      $Author: e107coders $
 */
 class ecache {
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/comment_class.php 0.7.24.src/e107_handlers/comment_class.php
--- 0.7.23.src/e107_handlers/comment_class.php	2010-07-31 03:26:21.000000000 -0500
+++ 0.7.24.src/e107_handlers/comment_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/comment_class.php,v $
-|     $Revision: 11639 $
-|     $Date: 2010-07-31 03:26:45 -0500 (Sat, 31 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/comment_class.php $
+|     $Revision: 11678 $
+|     $Id: comment_class.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_handlers/date_handler.php 0.7.24.src/e107_handlers/date_handler.php
--- 0.7.23.src/e107_handlers/date_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/date_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/date_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/date_handler.php $
+|     $Revision: 11678 $
+|     $Id: date_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_handlers/db_debug_class.php 0.7.24.src/e107_handlers/db_debug_class.php
--- 0.7.23.src/e107_handlers/db_debug_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/db_debug_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/db_debug_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/db_debug_class.php $
+|     $Revision: 11678 $
+|     $Id: db_debug_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/debug_handler.php 0.7.24.src/e107_handlers/debug_handler.php
--- 0.7.23.src/e107_handlers/debug_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/debug_handler.php	2010-09-07 16:46:03.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/debug_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/debug_handler.php $
+|     $Revision: 11765 $
+|     $Id: debug_handler.php 11765 2010-09-07 21:46:27Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -41,7 +41,9 @@
 // If debugging enabled, set it all up
 // If no debugging, then E107_DEBUG_LEVEL will be zero
 //
-if (strstr(e_MENU, "debug") || isset($_COOKIE['e107_debug_level'])) {
+
+
+if (strstr(e_MENU, "debug") || isset($_COOKIE['e107_debug_level']) || defined('e_DEBUG')) {
 	$e107_debug = new e107_debug;
 	require_once(e_HANDLER.'db_debug_class.php');
 	$db_debug = new e107_db_debug;
@@ -109,15 +111,25 @@
 		                        // (but shortcode paths removed: inline debug breaks pages!
 	);
 
-	function e107_debug() {
-		if (preg_match('/debug(=?)(.*?),?(\+|stick|-|unstick|$)/', e_MENU, $debug_param) || isset($_COOKIE['e107_debug_level'])) {
+	function e107_debug()
+	{
+		if (preg_match('/debug(=?)(.*?),?(\+|stick|-|unstick|$)/', e_MENU, $debug_param) || isset($_COOKIE['e107_debug_level']) || defined('e_DEBUG'))
+		{
 			$dVals=0;
+			
+			if(defined('e_DEBUG')) // manual debug via e107_config 
+			{
+				$dVals = e_DEBUG;	
+			}
+			
 			if (isset($_COOKIE['e107_debug_level'])) {
 				$dVals = substr($_COOKIE['e107_debug_level'],6);
 			}
 			if (preg_match('/debug(=?)(.*?),?(\+|stick|-|unstick|$)/', e_MENU)) {
 				$dVals = $debug_param[1] == '=' ? $debug_param[2] : 'everything';
 			}
+
+
 			
 			$aDVal = explode('.',$dVals); // support multiple values, OR'd together
 			$dVal = 0;
@@ -143,10 +155,11 @@
 			}
 
 				$this->debug_level = $dVal;
-			}
 		}
+	}
 
-	function set_error_reporting() {
+	function set_error_reporting()
+	{
 	}
 }
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_handlers/e107_class.php 0.7.24.src/e107_handlers/e107_class.php
--- 0.7.23.src/e107_handlers/e107_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/e107_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Copyright (C) 2001-2009 e107 Inc
-|     http://e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/e107_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/e107_class.php $
+|     $Revision: 11678 $
+|     $Id: e107_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/e107_Compat_handler.php 0.7.24.src/e107_handlers/e107_Compat_handler.php
--- 0.7.23.src/e107_handlers/e107_Compat_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/e107_Compat_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/e107_Compat_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/e107_Compat_handler.php $
+|     $Revision: 11678 $
+|     $Id: e107_Compat_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/emailprint_class.php 0.7.24.src/e107_handlers/emailprint_class.php
--- 0.7.23.src/e107_handlers/emailprint_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/emailprint_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/emailprint_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/emailprint_class.php $
+|     $Revision: 11678 $
+|     $Id: emailprint_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/emote_filter.php 0.7.24.src/e107_handlers/emote_filter.php
--- 0.7.23.src/e107_handlers/emote_filter.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/emote_filter.php	2010-09-05 20:16:05.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/emote_filter.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/emote_filter.php $
+|     $Revision: 11750 $
+|     $Id: emote_filter.php 11750 2010-09-06 01:16:29Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -34,51 +34,55 @@
 		}
 		$this->emotes = $sysprefs->getArray("emote_".$pref['emotepack']);
 
-		foreach($this->emotes as $key => $value)
+		if(is_array($this->emotes))
 		{
-		  $value = trim($value);
-
-		  if ($value)
-		  {	// Only 'activate' emote if there's a substitution string set
-			$key = preg_replace("#!(\w{3,}?)$#si", ".\\1", $key);
-			// Next two probably to sort out legacy issues - may not be required any more
-			$key = preg_replace("#_(\w{3})$#", ".\\1", $key);
-			$key = str_replace("!", "_", $key);
-
-			  $filename = e_IMAGE."emotes/" . $pref['emotepack'] . "/" . $key;
-			  $fileloc = SITEURLBASE.e_IMAGE_ABS."emotes/" . $pref['emotepack'] . "/" . $key;
-
-			  if(file_exists($filename))
-			  {
-				if(strstr($value, " "))
-				{
-					$tmp = explode(" ", $value);
-					foreach($tmp as $code)
+			foreach($this->emotes as $key => $value)
+			{
+			  $value = trim($value);
+	
+			  if ($value)
+			  {	// Only 'activate' emote if there's a substitution string set
+				$key = preg_replace("#!(\w{3,}?)$#si", ".\\1", $key);
+				// Next two probably to sort out legacy issues - may not be required any more
+				$key = preg_replace("#_(\w{3})$#", ".\\1", $key);
+				$key = str_replace("!", "_", $key);
+	
+				  $filename = e_IMAGE."emotes/" . $pref['emotepack'] . "/" . $key;
+				  $fileloc = SITEURLBASE.e_IMAGE_ABS."emotes/" . $pref['emotepack'] . "/" . $key;
+	
+				  if(file_exists($filename))
+				  {
+					if(strstr($value, " "))
 					{
-						$this->search[] = " ".$code;
-						$this->search[] = "\n".$code;
-						$this->replace[] = " <img src='".$fileloc."' alt='' style='vertical-align:middle; border:0' /> ";
-						$this->replace[] = "\n <img src='".$fileloc."' alt='' style='vertical-align:middle; border:0' /> ";
+						$tmp = explode(" ", $value);
+						foreach($tmp as $code)
+						{
+							$this->search[] = " ".$code;
+							$this->search[] = "\n".$code;
+							$this->replace[] = " <img src='".$fileloc."' alt='' style='vertical-align:middle; border:0' /> ";
+							$this->replace[] = "\n <img src='".$fileloc."' alt='' style='vertical-align:middle; border:0' /> ";
+						}
+						unset($tmp);
 					}
-					unset($tmp);
-				}
-				else
-				{
-					if($value)
+					else
 					{
-						$this->search[] = " ".$value;
-						$this->search[] = "\n".$value;
-						$this->replace[] = " <img src='".$filename."' alt='' style='vertical-align:middle; border:0' /> ";
-						$this->replace[] = "\n <img src='".$filename."' alt='' style='vertical-align:middle; border:0' /> ";
+						if($value)
+						{
+							$this->search[] = " ".$value;
+							$this->search[] = "\n".$value;
+							$this->replace[] = " <img src='".$filename."' alt='' style='vertical-align:middle; border:0' /> ";
+							$this->replace[] = "\n <img src='".$filename."' alt='' style='vertical-align:middle; border:0' /> ";
+						}
 					}
-				}
+				  }
+			  }
+			  else
+			  {
+				unset($this->emotes[$key]);
 			  }
-		  }
-		  else
-		  {
-			unset($this->emotes[$key]);
-		  }
+			}	
 		}
+		
 	}
 	 
 	function filterEmotes($text)
diff -x .svn -aruN 0.7.23.src/e107_handlers/emote.php 0.7.24.src/e107_handlers/emote.php
--- 0.7.23.src/e107_handlers/emote.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/emote.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/emote.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/emote.php $
+|     $Revision: 11678 $
+|     $Id: emote.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_handlers/encrypt_handler.php 0.7.24.src/e107_handlers/encrypt_handler.php
--- 0.7.23.src/e107_handlers/encrypt_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/encrypt_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/encrypt_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/encrypt_handler.php $
+|     $Revision: 11678 $
+|     $Id: encrypt_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/e_parse_class.php 0.7.24.src/e107_handlers/e_parse_class.php
--- 0.7.23.src/e107_handlers/e_parse_class.php	2010-08-19 04:52:31.000000000 -0500
+++ 0.7.24.src/e107_handlers/e_parse_class.php	2010-09-21 02:38:16.000000000 -0500
@@ -4,15 +4,15 @@
 |     e107 website system
 |
 |      Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/e_parse_class.php,v $
-|     $Revision: 11663 $
-|     $Date: 2010-08-19 04:52:55 -0500 (Thu, 19 Aug 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/e_parse_class.php $
+|     $Revision: 11804 $
+|     $Id: e_parse_class.php 11804 2010-09-21 07:38:40Z e107steved $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -107,6 +107,8 @@
 
 	var $replaceVars = array();
 
+
+
 	function e_parse()
 	{
 		// Preprocess the supermods to be useful default arrays with all values
@@ -119,9 +121,15 @@
 		{
 			$this->e_modSet[$key] = TRUE;
 		}
-
 	}
 
+
+
+	/**
+	 *
+	 *	@param boolean|'no_html'|'pReFs' $mod [optional]. 
+	 *			The 'pReFs' value is for internal use only, when saving prefs, to prevent sanitisation of HTML.
+	 */
 	function toDB($data, $nostrip = false, $no_encode = false, $mod = false)
 	{
 		global $pref;
@@ -139,10 +147,13 @@
 			{
 				$data = stripslashes($data);
 			}
-			$data = $this->preFilter($data);
-			if (!isset($pref['post_html']) || !check_class($pref['post_html']) || !isset($pref['post_script']) || !check_class($pref['post_script']))
+			if ($mod != 'pReFs')
 			{
-				$data = $this->dataFilter($data);
+				$data = $this->preFilter($data);
+				if (!check_class(varset($pref['post_html'], e_UC_MAINADMIN)) || !check_class(varset($pref['post_script'], e_UC_MAINADMIN)))
+				{
+					$data = $this->dataFilter($data);
+				}
 			}
 			if (isset($pref['post_html']) && check_class($pref['post_html']))
 			{
@@ -181,7 +192,7 @@
 
 		foreach ($ret as $s)
 		{
-			if (strpos($s, '[code') === FALSE)
+			if (substr($s, 0, 5) != '[code')
 			{
 				$vl = array();
 				$t = html_entity_decode(rawurldecode($s), ENT_QUOTES, CHARSET);
@@ -233,7 +244,12 @@
 
 	function preFilter($data)
 	{
-		$ret = preg_replace_callback('#\[(\w+?)(?:([\=\s])(.*?)){0,1}\](.*?)\[\/\\1(.*?)\]#is', array($this, 'filtTag'), $data);
+		if (!is_object($this->e_bb)) 
+		{
+			require_once(e_HANDLER.'bbcode_handler.php');
+			$this->e_bb = new e_bbcode;
+		}
+		$ret = $this->e_bb->parseBBCodes($data, 0, 'default', 'PRE');			// $postID zero for now - probably doesn't mater
 		return $ret;
 	}
 
@@ -249,7 +265,7 @@
 	 *		[5] - text after the closing tag but before the closing bracket (if any)
 	 *		[6] -
 	 */
-	function filtTag($matches)
+/*	function filtTag($matches)
 	{
 		switch (strtolower($matches[1]))
 		{
@@ -259,9 +275,10 @@
 				return $matches[0];
 		}
 	}
+*/
 
 
-
+	/* Deprecated function - leave in for now for the use of fixyoutube.php */
 	function checkYoutube(&$matches)
 	{
 		$bbpars = array();
@@ -291,7 +308,6 @@
 		}
 		else
 		{
-			//libxml_use_internal_errors(TRUE);
 			if (FALSE === ($info = simplexml_load_string($matches[4])))
 			{
 				//print_a($matches);
@@ -320,7 +336,7 @@
 				print_a($info);
 				return '[sanitised]'.$ok.'B'.htmlspecialchars($matches[0]).'B[/sanitised]';
 			}
-			$target =  $info2['@attributes'];
+			$target =  (array)$info2['@attributes'];
 			unset($info);
 			$ws = varset($target['width'], 0);
 			$hs = varset($target['height'], 0);
@@ -990,7 +1006,8 @@
         // Start parse [bb][/bb] codes
         if ($parseBB === TRUE)
 		{
-            if (!is_object($this->e_bb)) {
+			if (!is_object($this->e_bb)) 
+			{
                 require_once(e_HANDLER.'bbcode_handler.php');
                 $this->e_bb = new e_bbcode;
             }
diff -x .svn -aruN 0.7.23.src/e107_handlers/event_class.php 0.7.24.src/e107_handlers/event_class.php
--- 0.7.23.src/e107_handlers/event_class.php	2010-08-04 20:17:45.000000000 -0500
+++ 0.7.24.src/e107_handlers/event_class.php	2010-09-09 05:03:25.000000000 -0500
@@ -1,16 +1,18 @@
 <?php
 /*
 + ----------------------------------------------------------------------------+
-|	e107 website system
+|     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)
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|	$Source: /cvs_backup/e107_0.7/e107_handlers/event_class.php,v $
-|	$Revision: 11649 $
-|	$Date: 2010-08-04 20:18:09 -0500 (Wed, 04 Aug 2010) $
-|	$Author: e107coders $
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/event_class.php $
+|     $Revision: 11769 $
+|     $Id: event_class.php 11769 2010-09-09 10:03:49Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
@@ -48,7 +50,16 @@
 	 */
 	function register($eventname, $function, $include='')
 	{
-		// 
+		if(!isset($_SESSION['e_EVENT_functions'][$eventname])) // Notice removal
+		{
+			$_SESSION['e_EVENT_functions'][$eventname] = array();		
+		}
+		
+		if(!isset($_SESSION['e_EVENT_includes'][$eventname])) // Notice removal
+		{
+			$_SESSION['e_EVENT_includes'][$eventname] = array();		
+		}  
+		
 		if ($include!='')
 		{
 			// $this->includes[$eventname][] = $include;
diff -x .svn -aruN 0.7.23.src/e107_handlers/file_class.php 0.7.24.src/e107_handlers/file_class.php
--- 0.7.23.src/e107_handlers/file_class.php	2010-07-27 15:55:04.000000000 -0500
+++ 0.7.24.src/e107_handlers/file_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/file_class.php,v $
-|     $Revision: 11631 $
-|     $Date: 2010-07-27 15:55:28 -0500 (Tue, 27 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/file_class.php $
+|     $Revision: 11678 $
+|     $Id: file_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/form_handler.php 0.7.24.src/e107_handlers/form_handler.php
--- 0.7.23.src/e107_handlers/form_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/form_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/form_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/form_handler.php $
+|     $Revision: 11678 $
+|     $Id: form_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_handlers/language_class.php 0.7.24.src/e107_handlers/language_class.php
--- 0.7.23.src/e107_handlers/language_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/language_class.php	2010-09-11 19:47:33.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language Class.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/language_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/language_class.php $
+|     $Revision: 11782 $
+|     $Id: language_class.php 11782 2010-09-12 00:47:57Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -14,6 +14,11 @@
 
 // http://www.loc.gov/standards/iso639-2/php/code_list.php
 
+	var $detect 		= FALSE;
+	var $e_language 	= 'English'; // replaced later with $pref
+
+// Valid Language Pack Names are shown directly below on the right. 
+
 	var $list = array(
             "aa" => "Afar",
 			"ab" => "Abkhazian",
@@ -177,6 +182,7 @@
 
 		var $names = array(
 			"Arabic" 		=> "العربية",
+			"Bengali"		=> "বাংলা",
 			"Bosnian"		=> "Bosanski",
 			"Bulgarian"		=> "Български",
 			"Croatian"		=> "Hrvatski",
@@ -184,6 +190,7 @@
 			"ChineseSimp"  	=> "简体中文",
 			"Dutch"			=> "Nederlands",
 			"English"		=> "English",
+			"Finnish"		=> "Suomi",
 			"French"		=> "Français",
 			"German"		=> "Deutsch",
 			"Greek"			=> "Ελληνικά",
@@ -195,10 +202,11 @@
 			"Lithuanian"	=> "Lietuvių",
 			"Mongolian"		=> "монгол",
 			"Nepali"		=> "नेपाली",
+			"Norwegian"		=> "Norsk",
 			"Persian"	   	=> "فارسي",
 		    "Portuguese"	=> "Português",
 			"Polish"		=> "Polski",
-			"Romanian"		=> "Romanesc",
+			"Romanian"		=> "Română",
 			"Russian"		=> "Pусский",
 			"Serbian"		=> "Srpski",
 			"Spanish"		=> "Español",
@@ -210,40 +218,306 @@
 			"Turkish"		=> "Türkçe"
 		);
 
-// ---  Converts iso to language-name and visa-versa. ----------------
 
+	/**
+	 * Converts iso to language-name and visa-versa.
+	 * @param object $data
+	 * @return 
+	 */
 	function convert($data){
 
 		if(strlen($data) > 2)
 		{
         	$tmp = array_flip($this->list);
-			return $tmp[$data];
+			return isset($tmp[$data]) ? $tmp[$data] : FALSE;
 		}
 		else
 		{
-			return $this->list[$data];
+			return (isset($this->list[$data])) ? $this->list[$data] : FALSE;
 		}
 	}
 
 // -------------------------------------------------------------------
+	/**
+	 * Check if a Language is installed and valid
+	 * @param object $lang - Language to check. eg. 'es' or 'Spanish'
+	 * @return FALSE or the name of the valid Language
+	 */
+	function isValid($lang='')
+	{	
+		global $pref;
+				
+		if(!$lang)
+		{
+			return $pref['sitelanguage'];
+		}
+		
+		if(strpos($lang,"debug")!==FALSE)
+		{
+			 return FALSE;			
+		}
+		
+		if(strlen($lang)== 2)
+		{
+			$iso = $lang;
+			$lang = $this->convert($lang);	
+		}
+		else
+		{
+			$iso = $this->convert($lang);
+		}
+			
+		if($iso==FALSE || $lang==FALSE)
+		{
+			$diz = ($lang) ? $lang : $iso;
+			trigger_error("The selected language (".$diz.") is invalid. See e107_handlers/language_class.php for a list of valid languages. ", E_USER_ERROR);
+			return FALSE;
+		}
+		
+		if(is_readable(e_LANGUAGEDIR.$lang.'/'.$lang.'.php'))
+		{
+			return $lang;	
+		}
+		else
+		{
+			trigger_error("The selected language (".$lang.") was not found.", E_USER_ERROR);
+			return FALSE;	
+		}
+		
+		return FALSE;	
+	}
+	
+	/**
+	 * Check if the specified domain has multi-language subdomains enabled.
+	 * @return 
+	 */
+	function isLangDomain($domain='')
+	{
+		if(!$domain)
+		{
+			return FALSE;
+		}
+		
+		global $pref;
+		$mtmp = explode("\n", $pref['multilanguage_subdomain']);
+        foreach($mtmp as $val)
+		{
+        	if($domain == trim($val))
+			{
+            	return TRUE;
+			}
+		}
+		
+		return FALSE;
+		
+	}
+	
 
+	/**
+	 * Return a list of Installed Language Packs
+	 * @return array
+	 */
+	function installed()
+	{
+		$handle = opendir(e_LANGUAGEDIR);
+		$lanlist = array();
+		while ($file = readdir($handle))
+		{
+			if ($file != '.' && $file != '..' && is_readable(e_LANGUAGEDIR.$file.'/'.$file.'.php'))
+			{
+				$lanlist[] = $file;
+			}
+		}
+		closedir($handle);
+		
+		$filtered = array_intersect($lanlist,$this->list);
+		
+		return $filtered;
+	}
+	
+	
+	/**
+	 * Convert a Language to its Native title. eg. 'Spanish' becomes 'Español'
+	 * @param string $lang
+	 * @return string
+	 */
 	function toNative($lang)
 	{
 		return ($this->names[$lang]) ? $this->names[$lang] : $lang;
 	}
 
-
+	/**
+	 * Convert the current URL to a multi-lang for the specified language. 
+	 * eg. 'http://www.mydomain.com' becomes 'http://es.mydomain.com'
+	 * @param string $language eg. 'Spanish'
+	 * @return URL
+	 */
 	function subdomainUrl($language)
 	{
 		global $pref;
 		$codelnk = ($language == $pref['sitelanguage']) ? "www" : $this->convert($language);
-        $urlval = str_replace($_SERVER['HTTP_HOST'],$codelnk.".".e_DOMAIN,e_SELF);
+		
+      //  $urlval = str_replace($_SERVER['HTTP_HOST'],$codelnk.".".e_DOMAIN,e_SELF);
+		
+		$urlval = (e_QUERY)
+		        ? str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF).'?'.e_QUERY
+		        : str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF);
+		
         return $urlval;
 	}
+	
+	
+	
+	/**
+ 	* Detect a Language Change
+ 	* 1. Parked (sub)Domain		eg. http://es.mydomain.com (Preferred for SEO)
+ 	* 2. e_MENU Query			eg. /index.php?[es]
+ 	* 3. $_GET['elan']			eg. /index.php?elan=es
+ 	* 4. $_POST['sitelanguage']	eg. <input type='hidden' name='sitelanguage' value='Spanish' /> 
+ 	* 5. $GLOBALS['elan']		eg. <?php $GLOBALS['elan']='es' (deprecated) 
+ 	*/
+	function detect()
+	{
+		global $pref;
+		if(varsettrue($pref['multilanguage_subdomain']) && $this->isLangDomain(e_DOMAIN) && (defset('MULTILANG_SUBDOMAIN') !== FALSE)) 
+		{
+			$detect_language = (e_SUBDOMAIN) ? $this->isValid(e_SUBDOMAIN) : $pref['sitelanguage'];
+			e107_ini_set("session.cookie_domain", ".".e_DOMAIN); // Must be before session_start()
+			define('MULTILANG_SUBDOMAIN',TRUE);
+		}
+		elseif(e_MENU && ($detect_language = $this->isValid(e_MENU))) // 
+		{
+			define("e_LANCODE",TRUE);	
+
+		}
+		elseif(isset($_GET['elan']) && ($detect_language = $this->isValid($_GET['elan']))) // eg: /index.php?elan=Spanish
+		{
+			// Do nothing			
+		}
+		elseif(isset($_POST['setlanguage']) && ($detect_language = $this->isValid($_POST['sitelanguage'])))
+		{
+			// Do nothing	
+		}		
+		elseif(isset($GLOBALS['elan']) && ($detect_language = $this->isValid($GLOBALS['elan'])))
+		{
+			// Do nothing		
+		}
+		else
+		{
+			$detect_language = FALSE; // ie. No Change. 
+		}
+		
+		e107_ini_set("session.cookie_path", e_HTTP);
+
+		
+		$this->detect = $detect_language;	
+		return $detect_language;
+	}
+
+
+
+	/**
+	 * Set the Language (Constants, $_SESSION and $_COOKIE) for the current page. 
+	 * @return 
+	 */
+	function set()
+	{
+		global $pref;
+				
+		if($this->detect) // Language-Change Trigger Detected. 
+		{
+			if(!varset($_SESSION['e_language']) || (($_SESSION['e_language'] != $this->detect) && $this->isValid($_SESSION['e_language'])))
+			{
+				$_SESSION['e_language'] = $this->detect;	
+				// echo "Assigning Session Language";	
+			}
+			
+			if(varset($_COOKIE['e107_language'])!=$this->detect && (defset('MULTILANG_SUBDOMAIN') != TRUE))
+			{
+				setcookie('e107_language', $this->detect, time() + 86400, e_HTTP);
+				$_COOKIE['e107_language'] = $this->detect; // Used only when a user returns to the site. Not used during this session. 
+			}
+			else // Multi-lang SubDomains should ignore cookies and remove old ones if they exist. 
+			{
+				if(isset($_COOKIE['e107_language']))
+				{
+					unset($_COOKIE['e107_language']);
+				}
+			}
+			
+			$user_language = $this->detect;		
+		}
+		else // No Language-change Trigger Detected. 
+		{	
+			if(varset($_SESSION['e_language'])!='')
+			{
+				$user_language = $_SESSION['e_language'];
+			}
+			elseif(isset($_COOKIE['e107_language']) && ($user_language = $this->isValid($_COOKIE['e107_language']))) 
+			{
+				$_SESSION['e_language'] = $user_language;	 		
+			}
+			else
+			{	
+				$user_language = $pref['sitelanguage'];	
+				
+				if(isset($_SESSION['e_language']))
+				{
+					unset($_SESSION['e_language']);
+				}
+			
+				if(isset($_COOKIE['e107_language']))
+				{
+					unset($_COOKIE['e107_language']);
+				}	
+			}	
+		}
+		
+		$this->e_language = $user_language;
+		$this->setDefs();
+		return;
+	}
+
+
+	
+	/**
+	 * Set Language-specific Constants
+	 * @param string $language
+	 * @return 
+	 */
+	function setDefs()
+	{
+		global $pref;
+		
+		$language = $this->e_language;
+		
+		if(!isset($_SESSION['language-list']))
+		{
+			$_SESSION['language-list'] = implode(',',$this->installed());
+		}
+		
+		define('e_LANLIST', $_SESSION['language-list']);
+		define('e_LANGUAGE', $language);
+		define('USERLAN', $language); // Keep USERLAN for backward compatibility
+		$iso = $this->convert($language);	
+		define("e_LAN", $iso);
+		
+		// Below is for BC
+		if(defined('e_LANCODE') && varset($pref['multilanguage']) && ($language != $pref['sitelanguage']))
+		{			
+			define("e_LANQRY", "[".$iso."]");
+		}
+		else
+		{
+			define("e_LANCODE", '');		
+			define("e_LANQRY", FALSE);	
+		} 	
+	}
+	
 
 }
 
 
 
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_handlers/level_handler.php 0.7.24.src/e107_handlers/level_handler.php
--- 0.7.23.src/e107_handlers/level_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/level_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/level_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/level_handler.php $
+|     $Revision: 11678 $
+|     $Id: level_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_handlers/login.php 0.7.24.src/e107_handlers/login.php
--- 0.7.23.src/e107_handlers/login.php	2010-06-05 23:18:45.000000000 -0500
+++ 0.7.24.src/e107_handlers/login.php	2010-08-21 19:43:21.000000000 -0500
@@ -5,15 +5,15 @@
 |     e107 website system
 |
 |     ?Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/login.php,v $
-|     $Revision: 11574 $
-|     $Date: 2010-06-05 23:19:09 -0500 (Sat, 05 Jun 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/login.php $
+|     $Revision: 11678 $
+|     $Id: login.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_handlers/mail.php 0.7.24.src/e107_handlers/mail.php
--- 0.7.23.src/e107_handlers/mail.php	2010-08-07 05:45:40.000000000 -0500
+++ 0.7.24.src/e107_handlers/mail.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/mail.php,v $
-|     $Revision: 11650 $
-|     $Date: 2010-08-07 05:46:04 -0500 (Sat, 07 Aug 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/mail.php $
+|     $Revision: 11678 $
+|     $Id: mail.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/mail_validation_class.php 0.7.24.src/e107_handlers/mail_validation_class.php
--- 0.7.23.src/e107_handlers/mail_validation_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/mail_validation_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -5,9 +5,6 @@
 /* Manuel Lemos's PHP E-mail validation class
  * http://freshmeat.net/projects/emailaddressvalidationcomponent/
  * email_validation.php
- *
- * @(#) $Header: /cvs_backup/e107_0.7/e107_handlers/mail_validation_class.php,v 1.1 2006-03-14 17:29:08 e107coders Exp $
- *
  */
 
 class email_validation_class
diff -x .svn -aruN 0.7.23.src/e107_handlers/message_handler.php 0.7.24.src/e107_handlers/message_handler.php
--- 0.7.23.src/e107_handlers/message_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/message_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/message_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/message_handler.php $
+|     $Revision: 11678 $
+|     $Id: message_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/mysql_class.php 0.7.24.src/e107_handlers/mysql_class.php
--- 0.7.23.src/e107_handlers/mysql_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/mysql_class.php	2010-09-07 23:44:47.000000000 -0500
@@ -4,17 +4,17 @@
 +---------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/mysql_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/mysql_class.php $
+|     $Revision: 11766 $
+|     $Id: mysql_class.php 11766 2010-09-08 04:45:11Z e107coders $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
@@ -30,8 +30,8 @@
 * MySQL Abstraction class
 *
 * @package e107
-* @version $Revision: 11346 $
-* @author $Author: secretr $
+* @version $Revision: 11766 $
+* @author $Author: e107coders $
 */
 class db {
 
@@ -62,10 +62,18 @@
 	{
 		global $pref, $eTraffic;
 		$eTraffic->BumpWho('Create db object', 1);
+		if (!isset($_SESSION['e_language']))
+		{
+			return;
+		}
+		
+		$this->mySQLlanguage = ($_SESSION['e_language'] != $pref['sitelanguage']) ? $_SESSION['e_language'] : '';
+		
+		/*
 		$langid = 'e107language_'.$pref['cookie_name'];
 		if ($pref['user_tracking'] == 'session')
 		{
-			if (!isset($_SESSION[$langid]))
+			if (!isset($_SESSION['e_language']))
 			{
 				return;
 			}
@@ -73,12 +81,13 @@
 		}
 		else
 		{
-			if (!isset($_COOKIE[$langid]))
+			if (!isset($_COOKIE['e107_language']))
 			{
 				return;
 			}
-			$this->mySQLlanguage = $_COOKIE[$langid];
+			$this->mySQLlanguage = $_COOKIE['e107_language'];
 		}
+		*/
 	}
 
 	/**
diff -x .svn -aruN 0.7.23.src/e107_handlers/news_class.php 0.7.24.src/e107_handlers/news_class.php
--- 0.7.23.src/e107_handlers/news_class.php	2010-05-25 13:14:05.000000000 -0500
+++ 0.7.24.src/e107_handlers/news_class.php	2010-08-25 06:36:18.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* News handler
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/news_class.php $
-* $Id: news_class.php 11552 2010-05-25 18:14:29Z mcfly_e107 $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/news_class.php $
+|     $Revision: 11702 $
+|     $Id: news_class.php 11702 2010-08-25 11:36:42Z nlstart $
+|     $Author: nlstart $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -29,7 +32,7 @@
 		$news['news_userid'] = ($news['news_userid']) ? $news['news_userid'] : USERID;
 		if(!isset($news['news_sticky'])) {$news['news_sticky'] = 0;}
 		$author_insert = ($news['news_author'] == 0) ? "news_author = '".USERID."'," : "";
-		$news['news_author'] = ($news['news_author']) ? $news['news_author'] : USERID;
+		$author_insert = (isset($news['news_author'])) ?  "news_author = '".$news['news_author']."'," : "";
 		$news['news_class'] = (varset($news['news_class'], '255'));
 
 		if ($news['news_id']) {
diff -x .svn -aruN 0.7.23.src/e107_handlers/notify_class.php 0.7.24.src/e107_handlers/notify_class.php
--- 0.7.23.src/e107_handlers/notify_class.php	2010-07-23 18:36:16.000000000 -0500
+++ 0.7.24.src/e107_handlers/notify_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/notify_class.php,v $
-|     $Revision: 11619 $
-|     $Date: 2010-07-23 18:36:40 -0500 (Fri, 23 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/notify_class.php $
+|     $Revision: 11678 $
+|     $Id: notify_class.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_handlers/np_class.php 0.7.24.src/e107_handlers/np_class.php
--- 0.7.23.src/e107_handlers/np_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/np_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/np_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/np_class.php $
+|     $Revision: 11678 $
+|     $Id: np_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/override_class.php 0.7.24.src/e107_handlers/override_class.php
--- 0.7.23.src/e107_handlers/override_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/override_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/override_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/override_class.php $
+|     $Revision: 11678 $
+|     $Id: override_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_handlers/parser_functions.php 0.7.24.src/e107_handlers/parser_functions.php
--- 0.7.23.src/e107_handlers/parser_functions.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/parser_functions.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/parser_functions.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/parser_functions.php $
+|     $Revision: 11678 $
+|     $Id: parser_functions.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/parser_handler.php 0.7.24.src/e107_handlers/parser_handler.php
--- 0.7.23.src/e107_handlers/parser_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/parser_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/parser_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/parser_handler.php $
+|     $Revision: 11678 $
+|     $Id: parser_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_handlers/php_compatibility_handler.php 0.7.24.src/e107_handlers/php_compatibility_handler.php
--- 0.7.23.src/e107_handlers/php_compatibility_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/php_compatibility_handler.php	2010-09-22 17:07:53.000000000 -0500
@@ -1,84 +1,116 @@
-<?php
-
-if (!defined('e107_INIT')) { exit; }
-
-// e107 requires PHP > 4.3.0, all functions that are used in e107, introduced in newer
-// versions than that should be recreated in here for compatabilty reasons..
-
-if (!function_exists('file_put_contents')) {
-	/**
-	* @return int
-	* @param string $filename
-	* @param mixed $data
-	* @desc Write a string to a file
-	*/
-	define('FILE_APPEND', 1);
-	function file_put_contents($filename, $data, $flag = false) 
-	{
-      $mode = ($flag == FILE_APPEND || strtoupper($flag) == 'FILE_APPEND') ? 'a' : 'w';
-	  if (($h = @fopen($filename, $mode)) === false) 
-	  {
-		return false;
-	  }
-      if (is_array($data)) $data = implode($data);
-	  if (($bytes = @fwrite($h, $data)) === false) 
-	  {
-		return false;
-	  }
-	  fclose($h);
-	  return $bytes;
-	}
-}
-
-
-
-if (!function_exists('stripos')) {
- 	function stripos($str,$needle,$offset=0)
-	{
-		return strpos(strtolower($str), strtolower($needle), $offset);
-	}
-}
-
-
-
-if(!function_exists("mime_content_type")){
-	function mime_content_type($filename){
-
-		$filename = basename($filename);
-
-		$mime[".zip"] = "application/x-zip-compressed";
-		$mime[".gif"] = "image/gif";
-		$mime[".png"] = "image/x-png";
-		$mime[".jpg"] = "image/jpeg";
-		$mime[".jpeg"] = "image/jpeg";
-		$mime[".tif"] = "image/tiff";
-		$mime[".tiff"] = "image/tiff";
-		$mime[".pdf"] = "application/pdf";
-		$mime[".hqx"] = "application/mac-binhex40";
-		$mime[".doc"] = "application/msword";
-		$mime[".dot"] = "application/msword";
-		$mime[".exe"] = "application/octet-stream";
-		$mime[".au"] = "audio/basic";
-		$mime[".snd"] = "audio/basic";
-		$mime[".mid"] = "audio/mid";
-		$mime[".mp3"] = "audio/mpeg";
-		$mime[".aif"] = "audio/x-aiff";
-		$mime[".ra"] = "audio/x-pn-realaudio";
-		$mime[".ram"] = "audio/x-pn-realaudio";
-		$mime[".wav"] = "audio/x-wav";
-		$mime[".bmp"] = "image/bmp";
-		$mime[".ra"] = "audio/x-pn-realaudio";
-		$mime[".htm"] = "text/html";
-		$mime[".html"] = "text/html";
-		$mime[".css"] = "text/css";
-		$mime[".txt"] = "text/plain";
-		$mime[".mov"] = "video/quicktime";
-		$mime[".mpg"] = "video/mpeg";
-		$mime[".asx"] = "video/x-ms-asf";
-		$mime[".avi"] = "video/x-msvideo";
-
-		$ext = strrchr($filename, '.');
-		return $mime[$ext];
-	}
-}
+<?php
+
+if (!defined('e107_INIT')) { exit; }
+
+// e107 requires PHP > 4.3.0, all functions that are used in e107, introduced in newer
+// versions than that should be recreated in here for compatabilty reasons..
+
+
+/**
+ *	file_put_contents - introduced in PHP5
+ */
+if (!function_exists('file_put_contents')) 
+{
+	/**
+	* @return int
+	* @param string $filename
+	* @param mixed $data
+	* @desc Write a string to a file
+	*/
+	define('FILE_APPEND', 1);
+	function file_put_contents($filename, $data, $flag = false) 
+	{
+      $mode = ($flag == FILE_APPEND || strtoupper($flag) == 'FILE_APPEND') ? 'a' : 'w';
+	  if (($h = @fopen($filename, $mode)) === false) 
+	  {
+		return false;
+	  }
+      if (is_array($data)) $data = implode($data);
+	  if (($bytes = @fwrite($h, $data)) === false) 
+	  {
+		return false;
+	  }
+	  fclose($h);
+	  return $bytes;
+	}
+}
+
+
+
+/**
+ *	stripos() - introduced in PHP5
+ */
+if (!function_exists('stripos')) 
+{
+ 	function stripos($str,$needle,$offset=0)
+	{
+		return strpos(strtolower($str), strtolower($needle), $offset);
+	}
+}
+
+
+
+/**
+ *	simplexml_load_string - introduced in PHP5
+ *
+ *	Copied from 0.8 compatibility file
+ */
+if (!function_exists('simplexml_load_string'))
+{
+	function simplexml_load_string($xml)
+	{
+		require_once(e_HANDLER.'xml_class.php');
+		$xmlClass = new simplexml;
+		return $xmlClass->xml_load_string($xml);
+	}
+}
+
+
+/**
+ *	mime_content_type - introduced PHP4.3, present in PHP5.3
+ *	Deprecated PHP function - yet needed until alternative found. 
+ */
+
+if(!function_exists("mime_content_type"))
+{
+	function mime_content_type($filename)
+	{
+		$filename = basename($filename);
+
+		$mime[".zip"] = "application/x-zip-compressed";
+		$mime[".gif"] = "image/gif";
+		$mime[".png"] = "image/x-png";
+		$mime[".jpg"] = "image/jpeg";
+		$mime[".jpeg"] = "image/jpeg";
+		$mime[".tif"] = "image/tiff";
+		$mime[".tiff"] = "image/tiff";
+		$mime[".pdf"] = "application/pdf";
+		$mime[".hqx"] = "application/mac-binhex40";
+		$mime[".doc"] = "application/msword";
+		$mime[".dot"] = "application/msword";
+		$mime[".exe"] = "application/octet-stream";
+		$mime[".au"] = "audio/basic";
+		$mime[".snd"] = "audio/basic";
+		$mime[".mid"] = "audio/mid";
+		$mime[".mp3"] = "audio/mpeg";
+		$mime[".aif"] = "audio/x-aiff";
+		$mime[".ra"] = "audio/x-pn-realaudio";
+		$mime[".ram"] = "audio/x-pn-realaudio";
+		$mime[".wav"] = "audio/x-wav";
+		$mime[".bmp"] = "image/bmp";
+		$mime[".ra"] = "audio/x-pn-realaudio";
+		$mime[".htm"] = "text/html";
+		$mime[".html"] = "text/html";
+		$mime[".css"] = "text/css";
+		$mime[".txt"] = "text/plain";
+		$mime[".mov"] = "video/quicktime";
+		$mime[".mpg"] = "video/mpeg";
+		$mime[".asx"] = "video/x-ms-asf";
+		$mime[".avi"] = "video/x-msvideo";
+
+		$ext = strrchr($filename, '.');
+		return $mime[$ext];
+	}
+}
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_handlers/phpmailer/mailout_process.php 0.7.24.src/e107_handlers/phpmailer/mailout_process.php
--- 0.7.23.src/e107_handlers/phpmailer/mailout_process.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/phpmailer/mailout_process.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/phpmailer/mailout_process.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/phpmailer/mailout_process.php $
+|     $Revision: 11678 $
+|     $Id: mailout_process.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_handlers/plugin_class.php 0.7.24.src/e107_handlers/plugin_class.php
--- 0.7.23.src/e107_handlers/plugin_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/plugin_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/plugin_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/plugin_class.php $
+|     $Revision: 11678 $
+|     $Id: plugin_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_handlers/popup_handler.php 0.7.24.src/e107_handlers/popup_handler.php
--- 0.7.23.src/e107_handlers/popup_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/popup_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_handlers/popup_handler.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/popup_handler.php $
+|     $Revision: 11678 $
+|     $Id: popup_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_handlers/pref_class.php 0.7.24.src/e107_handlers/pref_class.php
--- 0.7.23.src/e107_handlers/pref_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/pref_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-| e107 website system
-| /e107_handlers/pref_class.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-| Steve Dunstan 2001-2002
-| http://e107.org
-| jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-| Released under the terms and conditions of the
-| GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_handlers/pref_class.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/pref_class.php $
+|     $Revision: 11678 $
+|     $Id: pref_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_handlers/preset_class.php 0.7.24.src/e107_handlers/preset_class.php
--- 0.7.23.src/e107_handlers/preset_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/preset_class.php	2010-09-07 08:00:34.000000000 -0500
@@ -1,25 +1,25 @@
 <?php
 /*
 + ----------------------------------------------------------------------------+
-|		e107 website system
+|     e107 website system
 |
-|		Steve Dunstan 2001-2002
-|		http://e107.org
-|		jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|		Released under the terms and conditions of the
-|		GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_handlers/preset_class.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/preset_class.php $
+|     $Revision: 11759 $
+|     $Id: preset_class.php 11759 2010-09-07 13:00:58Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
 
-class e_preset {
+class e_preset 
+{
 
 	var $form;
 	var $page;
@@ -27,38 +27,38 @@
 
 	function save_preset($exclude_fields = '')    // Comma separated list of fields not to save
 	{
-	global $sql,$tp,$ns;
-	$qry = explode(".",e_QUERY);
-	$unique_id = is_array($this->id) ? $this->id : array($this->id);
-	$uid = $qry[1];
+		global $sql, $ns, $tp;
+		$qry = explode(".", e_QUERY);
+		$unique_id = is_array($this->id) ? $this->id : array($this->id);
+		$uid = varset($qry[1], 0);
 
-	if($_POST && $qry[0] =="savepreset")
-	{
-	  $exclude_array = explode(',',$exclude_fields);
-	  foreach($_POST as $key => $value)
-	  {
-	    if (!in_array($key,$exclude_array))
+		if($_POST && $qry[0] == "savepreset")
 		{
-		  $value = $tp->toDB($value);
-		  if ($sql -> db_Update("preset", "preset_value='$value'  WHERE preset_name ='".$unique_id[$uid]."' AND preset_field ='$key' "))
-		  {
-
-		  } 
-		  elseif ($value !="" && !$sql -> db_Select("preset","*","preset_name ='".$unique_id[$uid]."' AND preset_field ='$key' "))
-		  {
-			$sql -> db_Insert("preset", "0, '".$unique_id[$uid]."', '$key', '$value' ");
-		  }
-
-		  if($value == "")
-		  {
-			$sql -> db_Delete("preset", "preset_field ='".$key."' ");
-		  }
+			$saveID = $tp -> toDB($unique_id[$uid], true);
+			$exclude_array = explode(',',$exclude_fields);
+			$existing = $sql->db_Count("preset", "(*)", " WHERE preset_name='".$saveID."'  ") ? TRUE : FALSE;
+			foreach($_POST as $key => $value)
+			{
+				if (in_array($key,$exclude_array) || ($tp->toDB($key) != $key))
+				{
+					unset($_POST[$key]);		// Remove any fields excluded from preset, and those with potentially dubious key names
+				}
+				$_POST[$key] = $tp->toDB($value);
+				
+			}
+			if ($existing)
+			{		// Delete any existing entries for this preset (else checkbox settings not updated)
+				$sql -> db_Delete("preset", "preset_name ='".$saveID."' ");
+			}
+			foreach($_POST as $key => $value)
+			{
+				$sql -> db_Insert("preset", "0, '".$saveID."', '$key', '$value' ");
+			}
+			$ns -> tablerender(LAN_SAVED, LAN_PRESET_SAVED);
 		}
-	  }
-	  $ns -> tablerender(LAN_SAVED, LAN_PRESET_SAVED);
-	}
 
-		if ($_POST['delete_preset'] && e_QUERY=="clr_preset"){
+		if (isset($_POST['delete_preset']) && e_QUERY=="clr_preset")
+		{
 			$del = $_POST['del_id'];
 			$text = ($sql -> db_Delete("preset", "preset_name ='".$unique_id[$del]."' ")) ? LAN_DELETED : LAN_DELETED_FAILED;
 			$ns -> tablerender($text, LAN_PRESET_DELETED);
@@ -68,11 +68,15 @@
 
 // ------------------------------------------------------------------------
 
-	function read_preset($unique_id){
+	function read_preset($unique_id)
+	{
 		global $sql,$tp;
-		if (!$_POST){
-			if ($sql -> db_Select("preset", "*", "preset_name ='$unique_id' ")){
-				while ($row = $sql-> db_Fetch()){
+		if (!$_POST)
+		{
+			if ($sql -> db_Select("preset", "*", "preset_name ='$unique_id' "))
+			{
+				while ($row = $sql-> db_Fetch())
+				{
 					extract($row);
 					$val[$preset_field] = $tp->toForm($preset_value);
 					$_POST[$preset_field] = $tp->toForm($preset_value);
diff -x .svn -aruN 0.7.23.src/e107_handlers/profanity_filter.php 0.7.24.src/e107_handlers/profanity_filter.php
--- 0.7.23.src/e107_handlers/profanity_filter.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/profanity_filter.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/profanity_filter.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/profanity_filter.php $
+|     $Revision: 11678 $
+|     $Id: profanity_filter.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/rate_class.php 0.7.24.src/e107_handlers/rate_class.php
--- 0.7.23.src/e107_handlers/rate_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/rate_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/rate_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/rate_class.php $
+|     $Revision: 11678 $
+|     $Id: rate_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/ren_help.php 0.7.24.src/e107_handlers/ren_help.php
--- 0.7.23.src/e107_handlers/ren_help.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/ren_help.php	2010-09-07 08:00:34.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/ren_help.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/ren_help.php $
+|     $Revision: 11759 $
+|     $Id: ren_help.php 11759 2010-09-07 13:00:58Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -182,7 +182,8 @@
 }
 
 
-function PreImage_Select($formid) {
+function PreImage_Select($formid) 
+{
 	global $fl, $tp, $bbcode_imagedir;
 
 	$path = ($bbcode_imagedir) ?  $bbcode_imagedir : e_IMAGE."newspost_images/";
@@ -194,8 +195,7 @@
 		$fl = new e_file;
 	}
 
-	$rejecthumb = array('$.','$..','/','CVS','thumbs.db','*._$', 'index', 'null*');
-	$imagelist = $fl->get_files($path,"",$rejecthumb,2);
+	$imagelist = $fl->get_files($path,"",'standard',2);
     sort($imagelist);
 
 	$text ="<!-- Start of PreImage selector -->
@@ -205,71 +205,71 @@
 	<tr><td class='forumheader3' style='white-space: nowrap'>";
 
 	if(!count($imagelist))
-			{
+	{
 
-				$text .= LANHELP_46."<b>".str_replace("../","",$path)."</b>";
-			}
-			else
+		$text .= LANHELP_46."<b>".str_replace("../","",$path)."</b>";
+	}
+	else
+	{
+		$text .= "<select class='tbox' name='preimageselect' onchange=\"addtext(this.value, true); expandit('{$formid}')\">
+		<option value=''>".LANHELP_42."</option>";
+		foreach($imagelist as $image)
+		{
+			$e_path = $tp->createConstants($image['path'],1);
+			$showpath = str_replace($path,"",$image['path']);
+			if(strstr($image['fname'], "thumb"))
 			{
-				$text .= "<select class='tbox' name='preimageselect' onchange=\"addtext(this.value, true); expandit('{$formid}')\">
-				<option value=''>".LANHELP_42."</option>";
-				foreach($imagelist as $image)
+				$fi = str_replace("thumb_", "", $image['fname']);
+				if(file_exists($path.$fi))
 				{
-					$e_path = $tp->createConstants($image['path'],1);
-					$showpath = str_replace($path,"",$image['path']);
-					if(strstr($image['fname'], "thumb"))
-					{
-						$fi = str_replace("thumb_", "", $image['fname']);
-						if(file_exists($path.$fi))
-						{
-							// thumb and main image found
-							$text .= "<option value=\"[link=".$e_path.$fi."][img]".$e_path.$image['fname']."[/img][/link]\">".$showpath.$image['fname']." (".LANHELP_38.")</option>\n
-							";
-						}
-						else
-						{
-							$text .= "<option value=\"[img]".$e_path.$image['fname']."[/img]\">".$showpath.$image['fname']."</option>\n
-							";
-						}
-					}
-					else
-					{
-						$text .= "<option value=\"[img]".$e_path.$image['fname']."[/img]\">".$showpath.$image['fname']."</option>\n";
-					}
+					// thumb and main image found
+					$text .= "<option value=\"[link=".$e_path.$fi."][img]".$e_path.$image['fname']."[/img][/link]\">".$showpath.$image['fname']." (".LANHELP_38.")</option>\n
+					";
+				}
+				else
+				{
+					$text .= "<option value=\"[img]".$e_path.$image['fname']."[/img]\">".$showpath.$image['fname']."</option>\n
+					";
 				}
-				$text .="</select>";
 			}
+			else
+			{
+				$text .= "<option value=\"[img]".$e_path.$image['fname']."[/img]\">".$showpath.$image['fname']."</option>\n";
+			}
+		}
+		$text .="</select>";
+	}
 	$text .="</td></tr>	\n </table></div>
 	</div>\n<!-- End of PreImage selector -->\n";
 	return $text;
 }
 
-function PreFile_Select($formid='prefile_selector',$bbcode_filedir) {
+function PreFile_Select($formid='prefile_selector',$bbcode_filedir = '') 
+{
 	require_once(e_HANDLER."userclass_class.php");
 	global $IMAGES_DIRECTORY, $fl, $sql;
-		$rejecthumb = array('$.','$..','/','CVS','thumbs.db','*._$', 'index', 'null*');
 
-		$filelist = array();
-		$downloadList = array();
+	$filelist = array();
+	$downloadList = array();
 
-		$sql->db_Select("download", "*", "download_class != ".e_UC_NOBODY);
-		while ($row = $sql->db_Fetch()) {
-			extract($row);
-			if($download_url)
-			{
-				$filelist[] = array("id" => $download_id, "name" => $download_name, "url" => $download_url, "class" => $download_class);
-				$downloadList[] = $download_url;
-			}
+	$sql->db_Select("download", "*", "download_class != ".e_UC_NOBODY);
+	while ($row = $sql->db_Fetch()) {
+		extract($row);
+		if($download_url)
+		{
+			$filelist[] = array("id" => $download_id, "name" => $download_name, "url" => $download_url, "class" => $download_class);
+			$downloadList[] = $download_url;
 		}
+	}
 
-		$tmp = $fl->get_files(e_FILE."downloads/","",$rejecthumb);
-		foreach($tmp as $value)
+	$tmp = $fl->get_files(e_FILE."downloads/");
+	foreach($tmp as $value)
+	{
+		if(!in_array($value['fname'], $downloadList))
 		{
-			if(!in_array($value['fname'], $downloadList))
-			{
-				$filelist[] = array("id" => 0, "name" => $value['fname'], "url" => $value['fname']);
-			}
+			$filelist[] = array("id" => 0, "name" => $value['fname'], "url" => $value['fname']);
 		}
+	}
 	$text ="<!-- Start of PreFile selector -->
 	<div style='margin-left:0px;margin-right:0px; position:relative;z-index:1000;float:right;display:none' id='{$formid}'>";
 	$text .="<div style='position:absolute; bottom:30px; right:75px'>";
@@ -316,7 +316,8 @@
 	return $text;
 }
 
-function Emoticon_Select($formid='emoticon_selector') {
+function Emoticon_Select($formid='emoticon_selector') 
+{
 	require_once(e_HANDLER."emote.php");
 	$text ="<!-- Start of Emoticon selector -->
 	<div style='margin-left:0px;margin-right:0px; position:relative;z-index:1000;float:right;display:none' id='{$formid}' onclick=\"this.style.display='none'\" >
diff -x .svn -aruN 0.7.23.src/e107_handlers/resize_handler.php 0.7.24.src/e107_handlers/resize_handler.php
--- 0.7.23.src/e107_handlers/resize_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/resize_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/resize_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/resize_handler.php $
+|     $Revision: 11678 $
+|     $Id: resize_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/advanced_comment.php 0.7.24.src/e107_handlers/search/advanced_comment.php
--- 0.7.23.src/e107_handlers/search/advanced_comment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/advanced_comment.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_comment.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/advanced_comment.php $
+|     $Revision: 11678 $
+|     $Id: advanced_comment.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/advanced_download.php 0.7.24.src/e107_handlers/search/advanced_download.php
--- 0.7.23.src/e107_handlers/search/advanced_download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/advanced_download.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_download.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/advanced_download.php $
+|     $Revision: 11678 $
+|     $Id: advanced_download.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/advanced_news.php 0.7.24.src/e107_handlers/search/advanced_news.php
--- 0.7.23.src/e107_handlers/search/advanced_news.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/advanced_news.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_news.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/advanced_news.php $
+|     $Revision: 11678 $
+|     $Id: advanced_news.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/advanced_pages.php 0.7.24.src/e107_handlers/search/advanced_pages.php
--- 0.7.23.src/e107_handlers/search/advanced_pages.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/advanced_pages.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_pages.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/advanced_pages.php $
+|     $Revision: 11678 $
+|     $Id: advanced_pages.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/advanced_user.php 0.7.24.src/e107_handlers/search/advanced_user.php
--- 0.7.23.src/e107_handlers/search/advanced_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/advanced_user.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_user.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/advanced_user.php $
+|     $Revision: 11678 $
+|     $Id: advanced_user.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/comments_download.php 0.7.24.src/e107_handlers/search/comments_download.php
--- 0.7.23.src/e107_handlers/search/comments_download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/comments_download.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/comments_download.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/comments_download.php $
+|     $Revision: 11678 $
+|     $Id: comments_download.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/comments_news.php 0.7.24.src/e107_handlers/search/comments_news.php
--- 0.7.23.src/e107_handlers/search/comments_news.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/comments_news.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/comments_news.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/comments_news.php $
+|     $Revision: 11678 $
+|     $Id: comments_news.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/comments_page.php 0.7.24.src/e107_handlers/search/comments_page.php
--- 0.7.23.src/e107_handlers/search/comments_page.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/comments_page.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/comments_page.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/comments_page.php $
+|     $Revision: 11678 $
+|     $Id: comments_page.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/comments_user.php 0.7.24.src/e107_handlers/search/comments_user.php
--- 0.7.23.src/e107_handlers/search/comments_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/comments_user.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/comments_user.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/comments_user.php $
+|     $Revision: 11678 $
+|     $Id: comments_user.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/search_comment.php 0.7.24.src/e107_handlers/search/search_comment.php
--- 0.7.23.src/e107_handlers/search/search_comment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/search_comment.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_comment.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/search_comment.php $
+|     $Revision: 11678 $
+|     $Id: search_comment.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/search_download.php 0.7.24.src/e107_handlers/search/search_download.php
--- 0.7.23.src/e107_handlers/search/search_download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/search_download.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_download.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/search_download.php $
+|     $Revision: 11678 $
+|     $Id: search_download.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/search_event.php 0.7.24.src/e107_handlers/search/search_event.php
--- 0.7.23.src/e107_handlers/search/search_event.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/search_event.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_event.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/search_event.php $
+|     $Revision: 11678 $
+|     $Id: search_event.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/search_news.php 0.7.24.src/e107_handlers/search/search_news.php
--- 0.7.23.src/e107_handlers/search/search_news.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/search_news.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_news.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/search_news.php $
+|     $Revision: 11678 $
+|     $Id: search_news.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/search_pages.php 0.7.24.src/e107_handlers/search/search_pages.php
--- 0.7.23.src/e107_handlers/search/search_pages.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/search_pages.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_pages.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/search_pages.php $
+|     $Revision: 11678 $
+|     $Id: search_pages.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search/search_user.php 0.7.24.src/e107_handlers/search/search_user.php
--- 0.7.23.src/e107_handlers/search/search_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search/search_user.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_user.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search/search_user.php $
+|     $Revision: 11678 $
+|     $Id: search_user.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/search_class.php 0.7.24.src/e107_handlers/search_class.php
--- 0.7.23.src/e107_handlers/search_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/search_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/search_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/search_class.php $
+|     $Revision: 11678 $
+|     $Id: search_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/secure_img_handler.php 0.7.24.src/e107_handlers/secure_img_handler.php
--- 0.7.23.src/e107_handlers/secure_img_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/secure_img_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/secure_img_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/secure_img_handler.php $
+|     $Revision: 11678 $
+|     $Id: secure_img_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/secure_img_render.php 0.7.24.src/e107_handlers/secure_img_render.php
--- 0.7.23.src/e107_handlers/secure_img_render.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/secure_img_render.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/secure_img_render.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/secure_img_render.php $
+|     $Revision: 11678 $
+|     $Id: secure_img_render.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/session_handler.php 0.7.24.src/e107_handlers/session_handler.php
--- 0.7.23.src/e107_handlers/session_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/session_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/session_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/session_handler.php $
+|     $Revision: 11678 $
+|     $Id: session_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/shortcode_handler.php 0.7.24.src/e107_handlers/shortcode_handler.php
--- 0.7.23.src/e107_handlers/shortcode_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/shortcode_handler.php	2010-09-09 16:37:24.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
-
 /*
 + ----------------------------------------------------------------------------+
-| e107 website system
+|     e107 website system
 |
-| Steve Dunstan 2001-2002
-| http://e107.org
-| jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-| Released under the terms and conditions of the
-| GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-| $Source: /cvs_backup/e107_0.7/e107_handlers/shortcode_handler.php,v $
-| $Revision: 11346 $
-| $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-| $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/shortcode_handler.php $
+|     $Revision: 11773 $
+|     $Id: shortcode_handler.php 11773 2010-09-09 21:37:48Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -104,11 +102,12 @@
 		}
 		$parm = trim($parm);
 
-		if (E107_DBG_BBSC || E107_DBG_SC)
+		if (E107_DBG_BBSC || E107_DBG_SC || E107_DBG_TIMEDETAILS)
 		{
 			global $db_debug;
 			$sql->db_Mark_Time("SC $code");
 			$db_debug->logCode(2, $code, $parm, "");
+			
 		}
 
 		if (is_array($this->scList) && array_key_exists($code, $this->scList))
@@ -187,8 +186,8 @@
 				}
 			}
 		}
-		if (E107_DBG_SC) {
-			$sql->db_Mark_Time("(SC $code Done)");
+		if (E107_DBG_SC || E107_DBG_TIMEDETAILS) {
+			$sql->db_Mark_Time("(After SC $code)");
 		}
 		return $ret;
 	}
diff -x .svn -aruN 0.7.23.src/e107_handlers/sitelinks_class.php 0.7.24.src/e107_handlers/sitelinks_class.php
--- 0.7.23.src/e107_handlers/sitelinks_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/sitelinks_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,17 +4,17 @@
 |     e107 website system
 |     /sitelinks_class.php
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/sitelinks_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/sitelinks_class.php $
+|     $Revision: 11678 $
+|     $Id: sitelinks_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +---------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/theme_handler.php 0.7.24.src/e107_handlers/theme_handler.php
--- 0.7.23.src/e107_handlers/theme_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/theme_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/theme_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/theme_handler.php $
+|     $Revision: 11678 $
+|     $Id: theme_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/tiny_mce/filelist.php 0.7.24.src/e107_handlers/tiny_mce/filelist.php
--- 0.7.23.src/e107_handlers/tiny_mce/filelist.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/tiny_mce/filelist.php	2010-08-29 06:14:25.000000000 -0500
@@ -1,4 +1,5 @@
 <?php
+define('e_TOKEN_FREEZE', true);
 require_once("../../class2.php");
 require_once(e_HANDLER."file_class.php");
 if(!ADMIN){
diff -x .svn -aruN 0.7.23.src/e107_handlers/tiny_mce/plugins/emoticons/emoticons.php 0.7.24.src/e107_handlers/tiny_mce/plugins/emoticons/emoticons.php
--- 0.7.23.src/e107_handlers/tiny_mce/plugins/emoticons/emoticons.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/tiny_mce/plugins/emoticons/emoticons.php	2010-08-29 06:14:25.000000000 -0500
@@ -1,4 +1,6 @@
 <?php
+define('e_TOKEN_FREEZE', true);
+
 require_once("../../../../class2.php");
 if(!USER || check_class($pref['post_html']) == FALSE){
 exit;
diff -x .svn -aruN 0.7.23.src/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php 0.7.24.src/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php
--- 0.7.23.src/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php	2010-08-29 06:14:25.000000000 -0500
@@ -9,16 +9,19 @@
 // ------------------------------------------------
 //                                   www.j-cons.com
 // ================================================
-// $Revision: 11346 $Date: 2004/10/04
+// $Revision: 11346 Date: 2004/10/04
 // ================================================
 //
-// $Source: /cvs_backup/e107_0.7/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php,v $
-// $Revision: 11346 $
-// $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-// $Author: secretr $
+// $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php $
+// $Revision: 11716 $
+// $Id: ibrowser.php 11716 2010-08-29 11:14:49Z secretr $
 // +----------------------------------------------------------------------------+
 // Major Re-work by CaMer0n
 
+if(!defined('e_TOKEN_FREEZE'))
+{
+	define('e_TOKEN_FREEZE', true);
+}
 
 // unset $tinyMCE_imglib_include
 require_once("../../../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_handlers/tiny_mce/wysiwyg.php 0.7.24.src/e107_handlers/tiny_mce/wysiwyg.php
--- 0.7.23.src/e107_handlers/tiny_mce/wysiwyg.php	2010-03-07 15:04:01.000000000 -0600
+++ 0.7.24.src/e107_handlers/tiny_mce/wysiwyg.php	2010-08-29 06:14:25.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Tiny MCE controller file.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/tiny_mce/wysiwyg.php,v $
-|     $Revision: 11387 $
-|     $Date: 2010-03-07 15:04:25 -0600 (Sun, 07 Mar 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/tiny_mce/wysiwyg.php $
+|     $Revision: 11716 $
+|     $Id: wysiwyg.php 11716 2010-08-29 11:14:49Z secretr $
+|     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
@@ -206,4 +206,4 @@
 }
 
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_handlers/traffic_class_display.php 0.7.24.src/e107_handlers/traffic_class_display.php
--- 0.7.23.src/e107_handlers/traffic_class_display.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/traffic_class_display.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/traffic_class_display.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/traffic_class_display.php $
+|     $Revision: 11678 $
+|     $Id: traffic_class_display.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/traffic_class.php 0.7.24.src/e107_handlers/traffic_class.php
--- 0.7.23.src/e107_handlers/traffic_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/traffic_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/traffic_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/traffic_class.php $
+|     $Revision: 11678 $
+|     $Id: traffic_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/upload_handler.php 0.7.24.src/e107_handlers/upload_handler.php
--- 0.7.23.src/e107_handlers/upload_handler.php	2010-04-07 16:12:32.000000000 -0500
+++ 0.7.24.src/e107_handlers/upload_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /classes/upload_class.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|   $Source: /cvs_backup/e107_0.7/e107_handlers/upload_handler.php,v $
-|   $Revision: 11467 $
-|   $Date: 2010-04-07 16:12:56 -0500 (Wed, 07 Apr 2010) $
-|   $Author: e107steved $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/upload_handler.php $
+|     $Revision: 11678 $
+|     $Id: upload_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_handlers/userclass_class.php 0.7.24.src/e107_handlers/userclass_class.php
--- 0.7.23.src/e107_handlers/userclass_class.php	2010-08-20 14:16:43.000000000 -0500
+++ 0.7.24.src/e107_handlers/userclass_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/userclass_class.php,v $
-|     $Revision: 11671 $
-|     $Date: 2010-08-20 14:17:07 -0500 (Fri, 20 Aug 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/userclass_class.php $
+|     $Revision: 11678 $
+|     $Id: userclass_class.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_handlers/user_extended_class.php 0.7.24.src/e107_handlers/user_extended_class.php
--- 0.7.23.src/e107_handlers/user_extended_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/user_extended_class.php	2010-08-23 13:12:06.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/user_extended_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/user_extended_class.php $
+|     $Revision: 11695 $
+|     $Id: user_extended_class.php 11695 2010-08-23 18:12:30Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -342,7 +342,7 @@
 				{
 					$choice = trim($choice);
 					$chk = ($curval == $choice)? " checked='checked' " : "";
-					$ret .= "<input {$include} type='radio' name='{$fname}' value='{$choice}' {$chk} /> {$choice}";
+					$ret = "<input {$include} type='radio' name='{$fname}' value='{$choice}' {$chk} /> {$choice}";
 				}
 				return $ret;
 				break;
diff -x .svn -aruN 0.7.23.src/e107_handlers/user_func.php 0.7.24.src/e107_handlers/user_func.php
--- 0.7.23.src/e107_handlers/user_func.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/user_func.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/user_func.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/user_func.php $
+|     $Revision: 11678 $
+|     $Id: user_func.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/user_select_class.php 0.7.24.src/e107_handlers/user_select_class.php
--- 0.7.23.src/e107_handlers/user_select_class.php	2010-07-31 04:27:29.000000000 -0500
+++ 0.7.24.src/e107_handlers/user_select_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,15 +4,15 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/user_select_class.php,v $
-|     $Revision: 11642 $
-|     $Date: 2010-07-31 04:27:53 -0500 (Sat, 31 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/user_select_class.php $
+|     $Revision: 11678 $
+|     $Id: user_select_class.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_handlers/usersession_class.php 0.7.24.src/e107_handlers/usersession_class.php
--- 0.7.23.src/e107_handlers/usersession_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/usersession_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,17 +4,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/usersession_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/usersession_class.php $
+|     $Revision: 11678 $
+|     $Id: usersession_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_handlers/xml_class.php 0.7.24.src/e107_handlers/xml_class.php
--- 0.7.23.src/e107_handlers/xml_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_handlers/xml_class.php	2010-09-21 02:38:16.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/xml_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/xml_class.php $
+|     $Revision: 11804 $
+|     $Id: xml_class.php 11804 2010-09-21 07:38:40Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -29,6 +29,15 @@
 	var $counterArray = array();
 	var $data;
 	var $xmlFileContents;
+	var $Url = FALSE;
+
+	function setUrl($feed)
+	{
+		if($feed)
+		{
+			$this->Url = $feed;
+		}	
+	}
 
 
     function getRemoteXmlFile($address, $timeout = 10)
@@ -36,12 +45,24 @@
 		// Could do something like: if ($timeout <= 0) $timeout = $pref['get_remote_timeout'];  here
 		$timeout = min($timeout, 120);
 		$timeout = max($timeout, 3);
-		$address = str_replace(array("\r", "\n", "\t"), '', $address); // May be paranoia, but streaky thought it might be a good idea
-		// ... and there shouldn't be unprintable characters in the URL anyway
+		
+		if($this->Url) // override option for use when part of the address needs to be encoded. 
+		{
+			$address = $this->Url;	
+		}
+		else
+		{
+			$address = str_replace(array("\r", "\n", "\t"), '', $address); // May be paranoia, but streaky thought it might be a good idea	
+			// ... and there shouldn't be unprintable characters in the URL anyway
+		}
+				
 		if (function_exists('file_get_contents'))
 		{
 			$old_timeout = e107_ini_set('default_socket_timeout', $timeout);
-			$data = file_get_contents(urldecode($address));
+			
+			$address = ($this->Url) ? $this->Url : urldecode($address);
+
+			$data = file_get_contents($address);
 
 			// $data = file_get_contents(htmlspecialchars($address));	// buggy - sometimes fails.
 			if ($old_timeout !== FALSE)
@@ -406,4 +427,331 @@
     }
 }
 
+
+
+
+
+
+/**
+ *	Code below here obtained from http://www.phpclasses.org/browse/file/22596.html
+ *	SimpleXML for PHP4
+ *	Thanks to Taha Paksu
+ *
+ *	Minor changes to decode from string rather than file
+ */
+
+/**
+ * If the result will be an object, this container class is used.
+ *
+ */
+
+class SimpleXMLObject
+{
+	function attributes()
+	{
+		$container = get_object_vars($this);
+		return (object) $container["@attributes"];
+	}
+	function content()
+	{
+		$container = get_object_vars($this);
+		return (object) $container["@content"];
+	}
+
+}
+
+/**
+ * The Main XML Parser Class
+ *
+ */
+class simplexml 
+{
+	var $result = array();
+	var $ignore_level = 0;
+	var $skip_empty_values = false;
+	var $php_errormsg;
+	var $evalCode="";
+
+	/**
+	 * Adds Items to Array
+	 *
+	 * @param int $level
+	 * @param array $tags
+	 * @param $value
+	 * @param string $type
+	 */
+	function array_insert($level, $tags, $value, $type)
+	{
+		$temp = '';
+		for ($c = $this->ignore_level + 1; $c < $level + 1; $c++) {
+			if (isset($tags[$c]) && (is_numeric(trim($tags[$c])) || trim($tags[$c]))) {
+				if (is_numeric($tags[$c])) {
+					$temp .= '[' . $tags[$c] . ']';
+				} else {
+					$temp .= '["' . $tags[$c] . '"]';
+				}
+			}
+		}
+		$this->evalCode .= '$this->result' . $temp . "=\"" . addslashes($value) . "\";//(" . $type . ")\n";
+		#echo $code. "\n";
+	}
+
+	/**
+	 * Define the repeated tags in XML file so we can set an index
+	 *
+	 * @param array $array
+	 * @return array
+	 */
+	function xml_tags($array)
+	{	$repeats_temp = array();
+	$repeats_count = array();
+	$repeats = array();
+
+	if (is_array($array)) {
+		$n = count($array) - 1;
+		for ($i = 0; $i < $n; $i++) {
+			$idn = $array[$i]['tag'].$array[$i]['level'];
+			if(in_array($idn,$repeats_temp)){
+				$repeats_count[array_search($idn,$repeats_temp)]+=1;
+			}else{
+				array_push($repeats_temp,$idn);
+				$repeats_count[array_search($idn,$repeats_temp)]=1;
+			}
+		}
+	}
+	$n = count($repeats_count);
+	for($i=0;$i<$n;$i++){
+		if($repeats_count[$i]>1){
+			array_push($repeats,$repeats_temp[$i]);
+		}
+	}
+	unset($repeats_temp);
+	unset($repeats_count);
+	return array_unique($repeats);
+	}
+
+
+	/**
+	 * Converts Array Variable to Object Variable
+	 *
+	 * @param array $arg_array
+	 * @return $tmp
+	 */
+	function array2object ($arg_array)
+	{
+
+		if (is_array($arg_array)) {
+			$keys = array_keys($arg_array);
+			if(!is_numeric($keys[0])) $tmp = new SimpleXMLObject;
+			foreach ($keys as $key) {
+				if (is_numeric($key)) $has_number = true;
+				if (is_string($key)) $has_string = true;
+			}
+			if (isset($has_number) and !isset($has_string)) {
+				foreach ($arg_array as $key => $value) {
+					$tmp[] = $this->array2object($value);
+				}
+			} elseif (isset($has_string)) {
+				foreach ($arg_array as $key => $value) {
+					if (is_string($key))
+					$tmp->$key = $this->array2object($value);
+				}
+			}
+		} elseif (is_object($arg_array)) {
+			foreach ($arg_array as $key => $value) {
+				if (is_array($value) or is_object($value))
+				$tmp->$key = $this->array2object($value);
+				else
+				$tmp->$key = $value;
+			}
+		} else {
+			$tmp = $arg_array;
+		}
+		return $tmp; //return the object
+	}
+
+	/**
+	 * Reindexes the whole array with ascending numbers
+	 *
+	 * @param array $array
+	 * @return array
+	 */
+	function array_reindex($array)
+	{
+		if (is_array($array)) {
+			if(count($array) == 1 && $array[0]){
+				return $this->array_reindex($array[0]);
+			}else{
+				foreach($array as $keys => $items) {
+					if (is_array($items)) {
+						if (is_numeric($keys)) {
+							$array[$keys] = $this->array_reindex($items);
+						} else {
+							$array[$keys] = $this->array_reindex(array_merge(array(), $items));
+						}
+					}
+				}
+			}
+		}
+
+		return $array;
+	}
+
+
+	/**
+	 * Parse the XML generation to array object
+	 *
+	 * @param array $array
+	 * @return array
+	 */
+	function xml_reorganize($array)
+	{
+		$count = count($array);
+		$repeat = $this->xml_tags($array);
+		$repeatedone = false;
+		$tags = array();
+		$k = 0;
+		for ($i = 0; $i < $count; $i++) {
+			switch ($array[$i]['type']) {
+				case 'open':
+					array_push($tags, $array[$i]['tag']);
+					if ($i > 0 && ($array[$i]['tag'] == $array[$i-1]['tag']) && ($array[$i-1]['type'] == 'close'))
+					$k++;
+					if (isset($array[$i]['value']) && ($array[$i]['value'] || !$this->skip_empty_values)) {
+						array_push($tags, '@content');
+						$this->array_insert(count($tags), $tags, $array[$i]['value'], "open");
+						array_pop($tags);
+					}
+
+					if (in_array($array[$i]['tag'] . $array[$i]['level'], $repeat)) {
+						if (($repeatedone == $array[$i]['tag'] . $array[$i]['level']) && ($repeatedone)) {
+							array_push($tags, strval($k++));
+						} else {
+							$repeatedone = $array[$i]['tag'] . $array[$i]['level'];
+							array_push($tags, strval($k));
+						}
+					}
+
+					if (isset($array[$i]['attributes']) && $array[$i]['attributes'] && $array[$i]['level'] != $this->ignore_level) {
+						array_push($tags, '@attributes');
+						foreach ($array[$i]['attributes'] as $attrkey => $attr) {
+							array_push($tags, $attrkey);
+							$this->array_insert(count($tags), $tags, $attr, "open");
+							array_pop($tags);
+						}
+						array_pop($tags);
+					}
+					break;
+
+				case 'close':
+					array_pop($tags);
+					if (in_array($array[$i]['tag'] . $array[$i]['level'], $repeat)) {
+						if ($repeatedone == $array[$i]['tag'] . $array[$i]['level']) {
+							array_pop($tags);
+						} else {
+							$repeatedone = $array[$i + 1]['tag'] . $array[$i + 1]['level'];
+							array_pop($tags);
+						}
+					}
+					break;
+
+				case 'complete':
+					array_push($tags, $array[$i]['tag']);
+					if (in_array($array[$i]['tag'] . $array[$i]['level'], $repeat)) {
+						if ($repeatedone == $array[$i]['tag'] . $array[$i]['level'] && $repeatedone) {
+							array_push($tags, strval($k));
+						} else {
+							$repeatedone = $array[$i]['tag'] . $array[$i]['level'];
+							array_push($tags, strval($k));
+						}
+					}
+
+					if (isset($array[$i]['value']) && ($array[$i]['value'] || !$this->skip_empty_values)) {
+						if (isset($array[$i]['attributes']) && $array[$i]['attributes']) {
+							array_push($tags, '@content');
+							$this->array_insert(count($tags), $tags, $array[$i]['value'], "complete");
+							array_pop($tags);
+						} else {
+							$this->array_insert(count($tags), $tags, $array[$i]['value'], "complete");
+						}
+					}
+
+					if (isset($array[$i]['attributes']) && $array[$i]['attributes']) {
+						array_push($tags, '@attributes');
+						foreach ($array[$i]['attributes'] as $attrkey => $attr) {
+							array_push($tags, $attrkey);
+							$this->array_insert(count($tags), $tags, $attr, "complete");
+							array_pop($tags);
+						}
+						array_pop($tags);
+					}
+
+					if (in_array($array[$i]['tag'] . $array[$i]['level'], $repeat)) {
+						array_pop($tags);
+						$k++;
+					}
+
+					array_pop($tags);
+					break;
+			}
+		}
+		eval($this->evalCode);
+		$last = $this->array_reindex($this->result);
+		return $last;
+	}
+
+	/**
+	 * Get the XML contents and parse like SimpleXML
+	 *
+	 * @param string $file
+	 * @param string $resulttype
+	 * @return array/object
+	 */
+	function xml_load_file($file, $resulttype = 'object')
+	{
+		$php_errormsg="";
+		$this->result="";
+		$this->evalCode="";
+		$values="";
+		$data = file_get_contents($file);
+		if (!$data)
+		return 'Cannot open xml document: ' . (isset($php_errormsg) ? $php_errormsg : $file);
+		
+		return $this->xml_load_string($data, $resulttype);
+	}
+
+	/**
+	 * parse string like SimpleXML
+	 *
+	 * @param string $data
+	 * @param string $resulttype
+	 * @return array/object
+	 */
+	function xml_load_string($data, $resulttype = 'object')
+	{
+		$parser = xml_parser_create('UTF-8');
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+		$ok = xml_parse_into_struct($parser, $data, $values);
+		if (!$ok) {
+			$errmsg = sprintf("XML parse error %d '%s' at line %d, column %d (byte index %d)",
+			xml_get_error_code($parser),
+			xml_error_string(xml_get_error_code($parser)),
+			xml_get_current_line_number($parser),
+			xml_get_current_column_number($parser),
+			xml_get_current_byte_index($parser));
+		}
+
+		xml_parser_free($parser);
+		if (!$ok)
+		return $errmsg;
+		if ($resulttype == 'array')
+		return $this->xml_reorganize($values);
+		// default $resulttype is 'object'
+		return $this->array2object($this->xml_reorganize($values));
+	}
+}
+
+
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107.htaccess 0.7.24.src/e107.htaccess
--- 0.7.23.src/e107.htaccess	2004-09-21 14:12:23.000000000 -0500
+++ 0.7.24.src/e107.htaccess	2010-08-28 06:32:04.000000000 -0500
@@ -1,5 +1,8 @@
-ErrorDocument 400 /error.php?400
-ErrorDocument 401 /error.php?401
-ErrorDocument 403 /error.php?403
-ErrorDocument 404 /error.php?404
-ErrorDocument 500 /error.php?500
\ No newline at end of file
+# Custom error pages for php scripts only
+<FilesMatch \.php$> 
+	ErrorDocument 400 /error.php?400
+	ErrorDocument 401 /error.php?401
+	ErrorDocument 403 /error.php?403
+	ErrorDocument 404 /error.php?404 
+	ErrorDocument 500 /error.php?500
+</FilesMatch>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_content_16.png 0.7.24.src/e107_images/admin_images/cat_content_16.png
--- 0.7.23.src/e107_images/admin_images/cat_content_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_content_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,5 +1,5 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  aPLTE _ÿdʆ XžDǘ\}\D^ | $gg n׬
-C(c wGK]ÿ< jԈ͛)hdrԻŴٰK
^iϐEaÿ bЗ :>Ɏg鴴 Mu~t>l0Z vv)jqѫ \ū韵Oh楥Dw d˱¾h:sK ^ɻMX F9c?7:i
-p JYh K4u寯ݻˢn܌ ]@]Y|cd<Zоޗؠ.Gfq1ǅ
v )κmDex K W Vxg   tRNS 椢   tEXtSoftware Adobe ImageReadyqe<  IDAT(c8u?<9lN1 Y$, >Y쉉ӳJ2BBR[;pI)1خvKO|5u`S>fwH7vW$	a5m[<b)';8jbd`jgIWU#saQ2*A|+/McPtTw47Ғ_R̰9ǽ1B0;m&W'6kS&Fk.>Axo.طKN/8 8w{Bj    IENDB`
\ No newline at end of file
+   
IHDR         a   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  ?IDATxbTSSc
+3S#Qv6f6ff&Vf6&FFf&&F&& q}[  X}_2~rJpr3ffd1~!&A]U`>.o 
+Sn)Ƴji!	n~:VV_?3hà&+v Xԁ߿}g|jz88~G+%q6N./ {@^aa<|\jo|b`d``h '~3J3	=yh@ 11i3 ×_~`n$1ax?Y)I- rO5EQs~_5Yf\<y2|gaWR>~$@ 0 4G,WN)>ϟ1hj0(b0gg  '/y A  OF Ń^%#,          ERoN(;n?~bv*"!-痌F  A 2u52#L8      G4+   '.s A -M 	!   
 5@@ ( RF?4<8#.	3102b77V^)-3g~~﷗?s0'#:E+ A HbtyQ!      !   I;#   ՈMB1 PJQ#0щ SG/&7}`x{$=~֫W. 0. @ 1+[\Nz7orSU@E(13oFF&0 JtZ[;    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_content_32.png 0.7.24.src/e107_images/admin_images/cat_content_32.png
--- 0.7.23.src/e107_images/admin_images/cat_content_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_content_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,7 +1,15 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTEkM~+QjjqWuuzXL2l bvܲ ㇪ۀ 
ɉճYZe뗖|栠WUU̓^ Y<wkԫVy VWeekê |㘹xYvU :uw݋ 4g -lvvCɸ F My{zJr tbFL
E{{ys &kj+ea@~Ĥһpoxj A ]4mM 梢	n Lq x Q0nuTqhp}qb\dqwepgķvvTRXaӉpl ;zJG~,l*y;z訦a댦qtO_ffyj訨tuqz_^rpS pJLnWLxX	?~;<c@   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  lIDAT8cjEEA@
f0@/X3||酜I~#&িݾ^~8q?1ɟdd7Dy{Eʴg wNXb0oH9B1:LZEDx2BR3iHsvvg
-IKX2Y@=ݛ&'t[LW@2B+χMY2%	c
-06 ]	t7R*@(TӐ Ŝ9s$WPzwP~?7ᛛ_Iٛ>YDr
-y[=73,vݹC%ok9-&L(X,Pdi_LvDG3) +ޛ""9Iz.gugtF	ـ,NY{uGF}A8$URn`JtQ#!`n*X[DdO#i%imVH6~2ήjt˂
-zg|We~!&&- 벡չ]|ƺ]4&ւxY2TesQ-hUv7ƺ:qق+34ϼۢrݶêKJ8P£WRrfӖ_c_>1oa6Q^O\E/TJZo\UNT/(ڪ7Ed`@Y协絵uQ{"TYkV5!Nޢ9uT_ae([SNwtRP>UQP0(Hpi
,$:.6660G HYf՞=aQ  ".D    IENDB`
\ No newline at end of file
+   
IHDR           szz   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  IDATxb?6: s233{Xrppqpps 1fccAbl,,l쬬l@10(AJ9\rnΜOB  cp K_>Ƭ:<.?$ŏS,[3rRUA'$9ڻ;40VMhINQ TA@0_E(,N >\RߊOXXLVo
 !\Zwb[`(d1d(00UUw;Ɋs]?@
ϟߗ^z˗ǒ?&dxDAHs10`b3#20x~'2j0
+}
 ; < WO_~NZCCNc```
t 'P;h?0t~];,xTܹTf@ S /~AZGGACa)Cف3B1RN fbP1_FHh0!g6`(> ; Z1
+7?|`&-U8\gc8H2<|
+x2IbP*;@ mp߿vÇ)}(9X h);0MC
Ͽg`x

+fE^`6JP o߾ MW?}Ç/*
+_00!$8,$Jf?~20|L|@3_ O &..=vXV >8` >~˗rj
g:+"^`
+AG w8(g C/oo>d`T:   ,P #;l w/^<Wif`NPb}/$!YHoHB,(GqA2GeYq~~!q*^] vWhǣԯL@ˠ0݅7( ,XXXY L~tw.O?2ز2ʃ  vMgAOW0􂁕寧?AMIPag[@_C?~`)
+,w`N1|	I ?g   Ef '_
&1dx8ė` }99xxhL23|f X>c
@X+_~1gd`5ap7㳝/x~302?HX9	2`AXs1s -bdgUe`df(} jŕ#
EE9_~gua#?+	a^I~6` gA_A@P뷟ܼp7?~|  b%.FmogMqjƪ`1`MO`LdZ=eae0b fqׯ2z'0|g/~}T~ _||: 8{(X=ԏe)p'&>f`Vfbx7W`N}nc=܅Kg߿y߾}D%W@A18$
+bRSSc,#R`8∷1"ٓO60=E@R:Oh <r\e12\|/wex ,D	X}.ɓg(f=h6f#-&
ǎO  $8~}}¥c°#*׮1<|
+"Cr߫=xpm_0b`nfg\\\_|zϏ}7o^Y  po|kRz|dس{/r`	O7o?2e@@FN`f 2<70's1|}Go\~ul0 g_\;SR
+Pg`ʥ}`طw?XUTFAIS֢ĥ&߿`O.]p}EU׮ r @ 174408w|З%`gggxQX1J28+*"<x4^~ap2`.xx4TEUTt_>
+@4 }!a1K:N\πq@pv`𖁍X11<zAE`L`9%af^V`gPVQؾ}c[M꤂dU	TPdx%>p#`J5_0|e	P+/!,ZXxy"?$5LKg8q760 8
pYyf.çb#,oų̏kiX)kH&``ex-7l߾>|x}-Pf Lr=S"2C ]a^Fu'<31k߁-/ sO<sK>y_?w
+ 5 `rR͜4 ?hZA'#" ̢lzه'g	rWV{՗[W^ W@yX?vɞAl@ IT㴊H3&!nŠQ?=׷Ӿ9_ʡG`5'h+c+	`ĥXl'-)ls[k1|||󦥳o}a/065bt8̟&71  8 c"$e/?`?"2l   @R϶1    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_plugins_16.png 0.7.24.src/e107_images/admin_images/cat_plugins_16.png
--- 0.7.23.src/e107_images/admin_images/cat_plugins_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_plugins_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,7 +1,6 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  PLTE``a||wwxYY^y|YYY艉배{u|ssxڱH$%ݬB+ΥI"mpsbbsllpՕ ֶ^R5p
:N(ggǼKKSZ9ѳ||[[`\\`٥ZZ\xx㹻~~Ýat+(((hhn$˄A% ކբzuS``fИzqggi
-|̫yyxؐvv{Ԣ?"կ"(   tRNS =   tEXtSoftware Adobe ImageReadyqe<   IDAT(Sc>5p,&&0a3 XDwor@vߩ*@pҹũ=3fOftQK+*
-2
-D7WV*g`?s`I]|^~>VUv
iÐjf:`
-YA2s=x9MNR4b>'slLQsrĥQnRN:peHLai{	  h
0    IENDB`
\ No newline at end of file
+   
IHDR         a   tEXtSoftware Adobe ImageReadyqe<  IDATxڤSKLQ=J˧PA)U1!DM4kBhbYF1+Q.ԍOl:Ogoyﾓs9BK$Avv*+g.LBd2	MS6tTgTlm -a7"ιD,KNIS1qVJЅML
b-(\.X6'()Oyy{gcu8Oy{oF${g3*\2PUv;ÀVqa0}Kg6pd@c/2f"#'YNEꣾ"#S=~pAқn=QZx]@Ubvo/++XJGC19@|ή]Z{
9>>kF<i#l|>/Uݲ!5.ԶNBB84)'iӌS
+F-Ͳٴ`5B>-BcB kpQԘ
+6Rlž*t~'*uD,UL{yuض9޻ gy/)*Guҙ
+"\	RhfI@1I9r85::M$%"u(s)((Mƺb9DA?'Hww7o¿
t]=b/bjxX4:KK-o%hjj(VЀ%!.O:i$JS].] Sh
[    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_plugins_32.png 0.7.24.src/e107_images/admin_images/cat_plugins_32.png
--- 0.7.23.src/e107_images/admin_images/cat_plugins_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_plugins_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,6 +1,13 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTE;<DϬh+pj3yiƁns''+|뭭ҾV
- YYhR jjm)sssIISmmq55<MMXt{{}΁갰lmm}щxxUU[DDLڃԶӔSSa ~~#ɽe솆z#FFRbNNaag㠠KKOXX_	
|y`eΈ)!ʊ뾀ōLŐ[փєQuux{_b}Xymr$|

םNN_<!+\\b]#b)$KA\IK-ܻ" @@CRRSD
-uҫȷݛ]ѼpcctfjtkkiW̯TZ]wwg   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  IDAT8cO 0`޻W@k!=\W'o\~CJ""J(S14\]AfLfW\9k&qơ*q`̺mDI
-oyPյr\>iǬe4SSM]9`KTe{tsgQ"3p8(l&EG5TU"69=s?b=sJmm=AARS+D%:)~,9..V Q(Q-Ī!uβnKi7Cq;b'`dіϯFu11*/WP]w<ԶYX%Vj%JZ JifgiLf\e&U7bz4V]]]uq%t^Nfڞqڿvjk,3[R1Wd=mT`c t*%W%-gY1kz GJb~-mzER󆟏3B]E}Ay_t(ebgeq M}[W<m͖a-^1!,=_ieyy/H5(irUd&--.{l+DKB)uڇJCy[ϧ3㬲33ix݉=g9TZr<ř 7M1    IENDB`
\ No newline at end of file
+   
IHDR           szz   tEXtSoftware Adobe ImageReadyqe<  9IDATxWklS~9>>CLI1&	)JQUѭӪ1mS1iM.LSiS*mV:u?6U4*XVKZJ.,۱Ǘc~::uğ}+[}}Ý\p{ۇZ?2VGZEX2,l6\(JC>HU(\":~ʰunKoPl(
ZuYId&SuC<ڄȔFS^Jn!dBbn.jpX<7vcoA.y#
+q9+
|hGPb~r[V
++4Dgpeb3rvc>߷Wں1 =D׫iX?Kaa֏U	"M4HJؽ~lHjS5=kVPˉެ@Jw $I,p&7*{ɏ;XU$_QPo3CHa$4w?swX7z`!!	[ ȲT=L$o|m;;#HR$=Zi e'>d@".[ ~pIa׆
'L"*)dK?7\ֱtrD!RtlV~
 pW819yeexC@6J4w{0	@X8Mʎ<V/鲢h0W-3o
];V7@%6:5W-YA-0ۅB]mbא-kTkY
^|4g(tZHdutu`I0`s^4B8ߔ"/Q9u9
+KS:|NEӭv˨Y}ʓETU}l6A#F$.Y|!ՁSfʝbFA9'w,C$ i#QaFA
+&x-^4Y^ًr҅"r6bZ.Il% eܛ|\Oll3OsnB#lNXh#AUZ^
+C
H>-1] n[8B+]sciH6_Qpr.ʑjdW.ܐ] +$\dFYNR}`ط:@.QwD,KŦHKRM;%e- ?ҙ8ʶ^\ͣ=}oDaݺiyp iXXBU͌^EGG=?k`0t:J솢(TFP'L}(vAہ3 b$ 
+;)̉NxȖ3ڹ7nJchrgQn >2Nv<\+\u.w>7
+oXA~T*	Fth˖
&ڨɃx'8M% 6H먔JiFZjG^;gOYה+Fj_ޯ
+>è{~}
u0VrѶ-säxpSb!FĥKazzezMJ1	S.{œ,Ȳh4gK&la!ǲ<uV*U*uMcLvF&vAֺ	/SqGV78*RJgHVl"f\#RUׯ)?~ߥg^%)(6RB˅O=gC%dn3"/ulhh'?.
+rbx$jߴ{\x|$9*ΝklzzY	P.9	J%Z=8#
]m:4>>>E01|2@-/zotO
+@cֱXFRL#1#NM2ly/X<+Re:;~NZuDӫ;
 F7}    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_settings_16.png 0.7.24.src/e107_images/admin_images/cat_settings_16.png
--- 0.7.23.src/e107_images/admin_images/cat_settings_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_settings_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,3 +1,6 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  PLTE켼jjmݩŶwwx͇ffjس}}ႂŰꧧ훛cckqqz䢢򰰶詩nnt߭yyˣllqzz|rrtpps񙙙ɘȶcchՉәwwzmmw||vvwPq#   tRNS *=l   tEXtSoftware Adobe ImageReadyqe<   IDAT(cX`<ង.\YPil9I02@uǴ; k9ճh|+z3J7ZV<9ي}6ênsY%{<[,W	/Xaq|9&9UJYVtlS!69`/phUTgdbUveFfo9yf3 'hD    IENDB`
\ No newline at end of file
+   
IHDR         a   tEXtSoftware Adobe ImageReadyqe<  IDATxtSmhSg>MSMvo5MIvAmk
+ETc
+UFA:j)lCckbZmqX41I%\+Ώޏs<y	Yx0_|ebsWo8ah@?Qxڱkhj]vwfH3I%I:<_j1y}>}EmѯΑ$._:Ė-O~:]5db+P.KrYswcc-H<$p֬%].`BСE==}}YY N-&s/_2ӛ#D+7%V(*~
`vs.rLtttD$)T[LtwUSCC |SWVAV_~fxm!)B<$%3E0hxXbaaE66
+X<6qWUxN	=ti^9G8	JXǏp4B*gf@xTZ,n}Bp~\86T.sVk}}fS'3n78>Ͱ $-\1x*M\\^4z{:j(hk;,[u8UrY \.Ѩ'S(\e:ngO[}CMсvm<xghpp;}{]A{v:7~{%bqH&pt Иd5hC$p\FuufEKT<<y7~Lx}ijQlZ(b8	\Эu,8'A`(R!ž"aS3ɴ'):>a>_I&&_7O \y    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_settings_32.png 0.7.24.src/e107_images/admin_images/cat_settings_32.png
--- 0.7.23.src/e107_images/admin_images/cat_settings_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_settings_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,5 +1,12 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTEϘ灁秧ԶԊ采ǯٖީˍ꒒䮮ܶڮ􄄑췷wwz֝Ѽʹι͕Ï~~{{к̢{{헗텅Նėަܬ÷úЊ}}ݱǸ՟rrx暚󩩾ﴴڡ썍а￿ˎη뢢xx韟tt}n   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  lIDAT8cO 0@/šz+aJ '1nja,
-Tyd%$~+^CAƫ7򫫋Ct,ےޔ. yMIigfٝ䅐Xj2̅OI< `*&q/UY!_3KoJVS=ʀ] S Dxi\l(?6kǖ6%#9F#'87TT¨\O?zś=r['NS+giQR2wn'4=t\C2_QW̭CHL*,xV{N
AiPW|SPrŧ$=/|3<y_Yi	LUE)E)^Jz
-ȷk)cKLCMr2Er,)<EA̭]ߪd3'Ts߫""3Id%HjPk߭-]IuIg'٬sCO|jwdF[tAW?]M)N,!KьU$([LX	3yW&9뢫s++HŞl	Lg^4  ә?!F    IENDB`
\ No newline at end of file
+   
IHDR           szz   tEXtSoftware Adobe ImageReadyqe<  	IDATxڤWil/ݻf=q1%`1iqB"Rh*PK)I"@RE UJ4i)n,1,%8c86x<3ϾO{T"pIà[=s'H$	"&x|T(H$JF0jz$Ϯ]QY,YM{ Q4d4f
+##c?F[֬YZ 
+l6OcXggx_PY<:pXˌF_:QT*Wh@86`o@,y D,lʮ*.6\.!BG˳@mNhXjAz6w   PWrK*U>;$<G$Ջy fSKKCCC;C
+x<tLɔL8`	 @ J^oL TTzFی @`Hsټd
+ H8>"٦QΈT*4=͚	AXc[n.g@BRo5d	1Cpzz:F}>h1͖i&hth4N/^?ûN?fXej:g CE"1n:votZ3̯oذi
Z-FDP$IWRe.P0\N`>cJg	QIMۭ>xbSmZpyyTSwWkk?|~9\Xt"H)	T*ҔJ5s?{Z	ȤjjUh>0EF㬸R)
+)+%d#xkJJ{Ze6KϞnpp
+jN	9qFcH$KSڵE2{IBS '0˵o!MMMSh^UTT-)`|N`,U\I_Nׯt|
KO( 0FJ+W4`7K鼥K[htd=HbE!7{<~4J @"D=Md%E99Ւ`0H*ao<"m73gN @_κ4NNz(#cY]'b ${w,A[6JNNFTN+}VJ}ZLNjk{/Q.S5/uQX˓9F? ~@QhkC[~Bu9%1=q_9đHH"(vX,O87׈E1Ц J!tJ@SR2f XZ&' >/R&cxB`ɍeNh֥%3E8 Dmmt8$,.~Z04M,@Eh/;"+QGW6QZZ#d-HoX
+5d43LxP4CMO?ۉ	kcFQ3c6g32r(%EjQ#0yE\v7;c7|C활t~0BUixƝMV@Hĕǐ޶mo||20_n*Ӈt 2*QYYb<Z[@IOO硉T*^NSS>.tA&@٨S{z0ikgg[4+hEbz{{i˖MJ;@_͉?{Qw9TB&"%D$r
+V:vZZflʵ\@jTLljj*͛7Z:qïXWW[Zhs[	ڨ
Ll&`Nks`?J
+"2 K~ZQ@m0N
Q>K_xǎ_<ς/<zZݍ]LʲeK]ʛ]pPj򊊅p>	I$"=<l-)tt/^ȹI߲Xǳ6㳢` .͝t:L't;[8)aGqaw>jl<wu Q>jVG㔙3B^>tc2VATJ;]ܳZ +ZZ঵a/y, nS&f5;>v9o@RhBaŰVK`#xkkv{&ol3<Rm_߂!D%R [^Ne 6DRĜfsG3T|zTq pzGmbb~FSNwb}>R
s6qPr
d|0bE:p`O:6/A{"_ʺ3*6lɚ
+a' t0Q}}.nF  1y?y>[@,D`HB6:p`?1xWUhzu~Ξ=np/oc/R3p˹@G? *
%_afᥡ~mDxȑufkj:E'+ I1`3    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_tools_16.png 0.7.24.src/e107_images/admin_images/cat_tools_16.png
--- 0.7.23.src/e107_images/admin_images/cat_tools_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_tools_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,4 +1,7 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  PLTEsstĺ،~reѭʴҽyTE輼no|Ш砟K2ГonpkLLti^ȉ"릦|޼ӷ¿Ƙdnfv
-ҸᦠǠSHOJڬn`PFF԰iD.MIЦȫ{s·gԗkkkTAĘ˦qd[ٿpbVݲΑ❚rYYٙ흝̹ks]æլV@fgk½盖wsᡛ[T嬬͡Y[ȸqëlHGÒȜRȰccX˃~@   tRNS J   tEXtSoftware Adobe ImageReadyqe<   IDAT(b  ڶm۶m۶m۶M  W 81]ͱ^ ,˚6Mc.6U'A`]k3ܢc 5@d*ףlvykDij80202櫝Ӻ:2rR}|Ouߟx#,
5lU(k6@"jkau{<'d%z4K ( pMl/    IENDB`
\ No newline at end of file
+   
IHDR         a   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  IDATxbLKKc?0222߿<"ۏ?vѣ@?!!!bb߾}mPSӊ@L߿
+~cÏ?޽{go+K+,f% ?3HHUI	zR @?XYY,#b#Ve"aa+A.}i	:y	 ^]@`v>^A0dd1=zOߡg/TUm{Na; l߿}}C6p}xqϊKAYQQZۂS%ۼsLϯh&& 	` gEn{y7!_?_0>WĘIA{Wl  A 99:RMNW
+ '%  ɖ  !  =7 LD*   A !!!_=[T $E     O\;  +-(4,3  A ȷ76(      *^R &   &)3$2 A ;d9%:  ߞ  `b ! 	   32  D91% A $   $Q{
+ 䒋   2    "   3 A /  !" a>  	F3     >F+  Yg]IBl޳Kپ;o;%8krp<&g~-Sz%?ޜԆZ$@ߵ >31$8rtGkq
+1@@ 1LT|UJjL Ic8 .&&i^tz U @ 1h30X20gd\R	Aư00)=4 ` ct]Ԓ    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_tools_32.png 0.7.24.src/e107_images/admin_images/cat_tools_32.png
--- 0.7.23.src/e107_images/admin_images/cat_tools_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_tools_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,8 +1,15 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTEƮ,܈캛H1겪v0jQytwƖho~spë⼱ܮ|T*\.zsizxx}XLo*f18weVF:ՌӅشj}uWKGĔGv0*wXEϤXŻ̜ٻkklj93拂f֙! Ϧߚj쨢˨Դˤ2,ŐWX`ʩs]}ٔSSS[\\Νѧ95梟a[Yׅ,%郄V<ńJJLXPIm||ONPR>?oo^ǭaefiڔ<7эٳٶC~珐kzS?@p:_YVßvd؎|yǱѻfgrčơ]Fehmh<Ϳ^]y`KMҝyA@r^\λ*&zjzٳͱrܼy<?ꋲupfp__a}jtRKYUἵۘ[TPvn]ԗS𘙣ͬ   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  IDAT8cO 0 srX]DLDdKBQL(~!˙n?QUX|."LI+MMPFsk^o<kI'+i9!|p,YW25~fG^y7BA,-Ջ
lz'jsXV/d*8/P"WJ+EױL)W^*å7/,4ՆAs$f2QFk<5V-4
-?}|:K
-
-TjL%h݀ﬖ/9(/薲Μ\rjgu,J[T!
-"XV0I>۹'}3,+rL~d&Q9浚K|skٕ*@zL_$P=ZRZ2k8jg4ُ|V{vjE,</Nx}
ֳX/p(ɬc/&paN{7ӟ3Q6pdNL^RoS;;2{Gb@y74믳uv7qcm:2$$kM܅ۯ,xGlMܺstk{{M9n;7"{A?~v(*6DNNB.H8q{gt(~_f
-iTVnŃ`Ь`E-{`@_ֈ[Aq&57F )@p<z!'    IENDB`
\ No newline at end of file
+   
IHDR           szz   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  IDATxb?@ b#M#3ŋcdypP[_ XV? ab~O>]%2է&[Xؚ~pw ++ׯΟ?3_?x/##n6mM<3Ofxé']ׯ R򹈈8~

X g>XRRaΜ=hPMtK!3 }U<yg#Gvy> bA
+^?~5;ϟ,,9116o̰t颷B\?~xkP(VTT\ի/}e8w47P] b!FSA\\r%֭=y+d*7eפVDBysE~x{ןf3X fZmmm-[0<y
;.	Uf1Y.%W
+X wDD
+qqE۶ߣ@{@|8!Y?0bhMNΪQSScػw/ãOx^eHJd``\ǯNWn>׏ZZaI::j>عi߿ 
=̓ /81%%XJJa=<dg.d#w|6f*?~uddV/kj,{1,?C  lBBS33>p#y;I!,Vof}0 1J
+1*?.'ǎ\c)(h d9XvG1ܻwP)CpL8;}&uV_2˷oJ7X~vy.dXg}  O>))11)8q8Ã{wU^2hkk1|! tQ@LbNRBn]dbx͋[
+$xe_yoG%t ;_*R#Sn_gpyϠg̰GuL
+cp%,?k7%
nݺpv[sc]E&~N7f{aPQ Ĭϧ"""
+b4\?0h28+EÅ=541x%01V7o<fx"C2Ãל<LT~޻ǯi7 L֒RgLz,6*_2(	]gVilaw-Cwo`?ÿ2MlX>dp10?0/:$w_<{TBv @ 1?y͛7>}cǏά./WP(00<saG2sGk66`1,)31>cgb7`4j0~1yw_Gr@ 1CKo޽;K/|y㮈.
`}d81
+Ϝap"÷ğdz1GuMs_o1red$lg?t$y~=zF黯d7@ 1#@
X~g$x
<`}\	]wgO3|Ç^<x7\)j"O~}?+0[}bs	J	XÊ0hhk2H0x;@ 1#<
'>Jy7 w'2|rぃ?dxo`%rFpa7g,6>~ .Š /O_}>@@ŁXX}rp0qp210q,IR6f|&ç3'\1~2|	ciHfb07ed
+}a`Yep}n2AS_ARǯ~@,~@/Z2N04fx8WO`][M|KJ*Ι2Ȟ>euM.YDd|؁e?;7W9Un2l\a֖_} XB#0~i&?7lbNvIi1~?/g5%uyǛ,DY}b#B.'/CGXRe8ðbֲ}knB; w9?&?\bNWE>qē8|sa`pkfx-74Q[1K:zV^=q@7s   ~> A6& W      /2R      M5  &]  j          ^UfKK-
@>u
+߷o32L_Pߕ޿^˰^2gRbcʠ-A
S?{01
w>. 5r@ 1T00LW[k-c}.I%.@@,^󲳨Ě?:ϗy}s}Hr3o*a0aO_G:i(<~1
+L&KR9YcDw#
+.` Ǧ IRo?.20ݼWEYN_?B+?~sϛ'o$n}wajov=?P6CNEY7+&fP\S FpS5e^r8XVZ@̅O@ JMY`&ܿ,B2>y!`@+/8^ 
Q  hY O5V
MH!@ za2    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_users_16.png 0.7.24.src/e107_images/admin_images/cat_users_16.png
--- 0.7.23.src/e107_images/admin_images/cat_users_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_users_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,4 +1,5 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  sPLTEENkDLihCѹ|}W䤈>lFOUm겥λSG5y* *YژE&vBLjǹyk]y/棄}s̔𻶵й{{{Ӷggqgjbɡ寲IǄ{tߧނҼ||R\wjLL<tԂz<KULӨBJoVភDtnϪx裙䣕ǉ\ƷۜcYzqQ}߹hϑ?:p[szNC1٩~хƌx՚c@Kl~^Y5V;GMe▫=Vj鈋edѭòƜsᤜڝSFzcۖz{dpv(pdx3eNQdtH樚sF   tRNS J   tEXtSoftware Adobe ImageReadyqe<  IDAT(ScpAW5y(`0e)I'#z[\J`PN޳=	$sLq@}{
-
]`:heyhdaq}]8Lf֬Wqa룖dm=S~݊v5lpai6A5<60v4qC'4߹XR3J2,``)1'c`zF.	BR&N]VvT:"p)\Ye #x|    IENDB`
\ No newline at end of file
+   
IHDR         a   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  'IDATxb\^L_8ܾo/1IXAܘŭ7n1e``Č@@,@v
;ysb9x~d0TN4mlׯf3  @ HHH Mogt͗'@o0{kV="%ik{  b .)+vo}dx^T?Pq/G{=Iݸmu  A N %1+P
+    Xw    61 2̱   A + K/    ' '2      
+2#E3ykϞ2ݾg"%L>?200  11Fnu7;1oe|  7/3F10~zǰ}˞[W|>	H b1U2IRb
Яm~1(pH2l+z2{Gvzdק  A <_1!     
 )#    %; CH:&ŵ\f`'`b !KJAXxX&@\ 0??,Í@XEY'P30\x Xn|ٸimOAc!Q6ϞJ0*1<&x/@L$@3V.> b:ܝEO||*ĮWEG$,3Fv&@0o>10<7@ 13r10K2_/xWAT];'gO@b8pÏzf#P0``Э9XXX@|ŁW  Qu    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/cat_users_32.png 0.7.24.src/e107_images/admin_images/cat_users_32.png
--- 0.7.23.src/e107_images/admin_images/cat_users_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/cat_users_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,9 +1,11 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTEZMW +H29uhuؠ]ǧ׶ٙwދ,[QOkR3G3֓=szHr<PSmÿlFʔkZjrɋ=衾t}jZP0^Ŵ͇Ǧ{漰xܠzzzӐܯ(q1/zt<裚cjνeXzhvuȁыt}:DɃmxx{!1GSVelݸgލfͼCTkߨȫɷG?Ѣmv71kE11ْXz|ز߸r򥓿ֲ_y_^Sڳ҉z'ͳawebǶð}[h~~ZBପŸönмw  ꪗVZű^\uO~i}҈~lµݸӦuaץqpϥO_al\6cJS%*V^Lo   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  IDAT8cO 0@CQw<+QޭQ} ׊
-B^¢`^jљa!::J2vWp!)#.-=c>.s߯36iPT|wX@@@X_NZ-F~9[n#2/(ؐԩJxZu@G'DRe`xW.e
-@PR]+((9Zy>>>ե-
g͊Y՟Y@l_Z6}tIL66
-2YUhyTATE']vܸk9{v&PM',
-`B GqS8~;GMw% `quTS>`vm9561fH8ܾZ,ng!W۵kllΝc~ϖ0t
- RP\&5yPY*]G93,@
-Eʤ&OV?mekD?`<B&f/|7[YقUcva9%3Ь3rtȨ"[?WAd?Ҍ@ -O^9!0$s',7')GvwE*u_ ŔZF^]UIʑ@<)X-$Oq<dW~Ϊ^&B(Y/Hv|EQpGy5բeSGLxa`f"'TC%Br <@,Қ    IENDB`
\ No newline at end of file
+   
IHDR           szz   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  +IDATxb?@ bb` @, bV ?_2h! ++'ӇO=sUo~Zd}DL130|Cg  lebc窳
O)ְd`h[/x=|y<p  30^h
_~=WHAőA^YʋepGQ?1Kd``I
+ i7b`" Lh'v&/_$ͽ5*,@)ֿ@o2*Kc 쌿3Hh{1|y<[LBMwqUuWׯ7633;O/|:,ɸ @`p2=	0%c``f``dßo@TAVW.*6M!<X_^'*^tӚ9  `&?9A	kF&@@L^wK,>PCYXM[fRKw'e`؄  [T߾}A?p߿~÷?>mȠ_ x!i70"J-
u^{  6߁pwt}h10s?@/0ʞ_ "30#0ciߏoyTnN
_a  _@_s9}0Hҝз@#2?=fw8B A!]P 
65u_SmyO)U]Y@π&`߶NU
+	8I30+0z?3ϧ,B$B2R`<C'ALBPF+W  @A2d\[y{=2>B_7/b	\B
+`ˁA&o"J> 8-AIFwON2Hj1|oK@.o?1\cJ5a`y
+4)y`bL32@ÅoC 
g`cJgf9?u?M^_r|AB-{2HP`f' )+0|&J&`2 N@TH_P _ؾ}b|ʿ'._RB @ AB_+25qqo1h001p}cg0`٤.(u{_d>v,	ff`Ɋ ,+	,H?2zд؝>9<Ͼ>`cx9+;$KA˚"LFƋ˞3=dawU^? oP-gKUc8o/~_ @`H;12X
耯,L,̿XX> q}ǰ,/eQ}׺rL2~A0<y(1gc6`sVǳ}`  
~0c`+`3 YX_b0!ʐ+#OAOl"{p-o_32)3cg/x͝8>ÿ }Q0؀ ;,t 03aص=ßX| &bQ&[
	o$n [%_@͈
+LoDxϐ r`oa		@ ~~ 
fr ` WMy``d&`N ֿfbA&, c1Y^=hӅ v˻_|NY6Vt Jf~^Ny/-߁ekf0`V(Tl513yAU]GHӧk o78덛W/L@Gl9+22VY GLrğԐo`aeA  ,cw`-
+z6`?0
2d􅟁'A	6A`TPGJ!u(~/@|@% m ۶OJ.)#NyV6nXOJ`߳1C L-<@߀
 l ,g߮>;TI`bTʱ
+Ƽ5G7̐A b6xgA^ ~qX^eT1+*ћ.TtVQ i H!쀿L|~5o.O .j3%gudkAiP FpS^ق,b`pqU˫:x-@$9 @8[<XZATTI0pqCo`-ëk Au "jɀAşA\EPP|t%Vҧ "0 jC
+40#x@1 A=#>(  yTٰ    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/docs_16.png 0.7.24.src/e107_images/admin_images/docs_16.png
--- 0.7.23.src/e107_images/admin_images/docs_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/docs_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,6 +1,4 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  PLTE:svYdB\g][gJ ;IXb	76xx*cLG*`h^']Q 8dmE ^zJ 5uᑱ:ws{ T PїQWO1kAdY(\ FÒ0s5vi#Xş	I3M5
<e~)Htw N Bv}I}ݔ/e5zWad~^;qyRO<pf搸@;^̀HpJzwj啱aF;v뉼^ChR|o|ae
MĢAu;[k5gӉ NW'tt4~DXd :Ms#9 ?p~,c66   tRNS L   tEXtSoftware Adobe ImageReadyqe<   IDAT(Scdo<<B |:wYeLSE3"Vd`ai/+ʖ*Otd 
-YiO- Uw7,(1c
-kuԦ6V	LBRrgdg
-M0ӑpPRMVQåIW9Yvzʢ-P;L49qAL! jZ     IENDB`
\ No newline at end of file
+   
IHDR         a   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  dIDATxb?%  X@?c`W5_T\_PWoo>{ն?~300]f
TJ bA1t%>__}.UO_~1|V^${&@+ 
ffX1q1<}B;ïv]e`fb9Cc@
] m 㷖tknV6O~3LZGOc5zßF  	Fooa>V@~|o+o?2~T쏟3|{w+ 6_T %$Ý'?~21gۿ@À|y𛙉_ 
+	̵&,a0@	ɼi.0s30qr؀cap70J13\c`AY?/|g?2s > çB~1c g0=( Jhe
H/@ c㋷?F#01joA/0_̌@Kp مDY^a09 h1+H`-~h H:`aڽO3K1p1yI2po /%aEQ6Q^0z|
$%20B޷0aѷ4񛁓wk?yds!@ !2#파n\l<0Z7Pb6 b4; /u[?&A    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/docs_32.png 0.7.24.src/e107_images/admin_images/docs_32.png
--- 0.7.23.src/e107_images/admin_images/docs_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/docs_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,13 +1,10 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTE]=r!T_-d =J} [iڧKc_4kBBiM.b%bω:卵K X N˚ Ją47SmUˋ▽
-% @/hɱ\JAyCwJ3r 9{섮;I~1{돽tTZK}{ ><f
- R B>a V^ [WEySeP̞~~ EBwP*"F.fӑL<ZR', U;)aқj}qe憊èsNYQQ<qjjm[ioXdGbIB[P7P D/w
-JG
3'/M
CA~¢(@'` TᚧG;-fԄ6o@x;)[^HHxHUY\1N'`$h
-I0{sT~bctp>wwҲ2w7v듺OɁ WPTZ4o8nT&k?'m> F ; :*i_q`q:p̏V@KL d
-L 0M;q:w?|Oׇ`1PVbi   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  rIDAT8cO 0PULS+ª Y#kD7/ƵvO`*f:~DA1.*fTa&Bw>z56'Z
E>׌f$u&	oysVgBMBҝKTCil2
@	hR<C3y@W{*i((oiwWtP^z"Aq|ff|\柅
-ܚRU!qysR659Z9^+ܹ=
-:JemU?e		-Q`TQQ.1ƞrz[gsZCL=p_߿erz_n
-]SнCD	#6A9otbgì\XtMp^*'HOsrTK%@
-V'.pL*%ҥ(U4`>,w&"3'!HOsf4@y@> ҧ8 *˄xI2"Z@p-r
-ח8AzrrЙ{F20Hל"52` ĉϛ
-hqHn,S'Y,=1`֌STV\֔4?Vy+  GZ    IENDB`
\ No newline at end of file
+   
IHDR           szz   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  IDATxb?@ bb` @  bA0­S21ÿ@11(yhf@;10!zY
+gQ_|^b
+JRbbl20|N<e#0Ld`d@ ~0)(h);;j1h0q33u20ޝ2O^Nx|zPA3K/pY@w'+wo%: Ï 710+..e5U		99k<wk6[6м, ~(5ՍLȧ_Ap?o
+|E~ǰx}nv%-5v>A7Dy-- 6.TwS1߀>	oJ#UELcF__AGށ׀(V_w5(o Aq3|0p2p3t/#yEl]ʁY  L]$ ؘf`s9011ʽ4O#:Ni`Qb+ 44?Fo;;aFOsaay_1Ni_^^^o?~_@?@z~~`#û]<J B
%D^(ݗ_o?b`fac&oA !jA;젏ρQ-!' *H3̰7s`CeG/>3p3}fБ_vV&6&VN|atH?o?`facr ĂVj	
+0|%Pgf2b:0bdfp7`P0G0 	+ákw?Ā˗\|̜\ [ &41|&$?GgX|+qAn`2xpg_@u>d 9 fϠJf 4g&@`cpw?1\z~ea;;1ew|T`3"[	@ݏ?!U ן0l>A>fca\222B|g`Z
̊?|J Bs ÍOo?832c@ex_E->}-`'-Y~ &X9.j [6FhȀ	Vp,02@k>` 	P~RtJ Bu 3w^>('' `4
 r4ظx~؉l%@ 1E=`ruu)!vA>`
1"0#
+Ж?P`f~!ЬAuJ BLߓ+7}AKQ(7$x>b V:BB TS¡@A!-"6~ܽ	@
( Bp^*j/E%   ,$O [	!)a@a`9_3؉D L03s]ܲ-u	n.`t|,ŰCAY;#7+ ×_,i>Rڭx9ɓW\S?
+lM bDNDA:CP B֜S\w|	T ޓ/Xb÷sXU>Ft# &Ɩ[76)VWfVSfAopcF`Vcd7n0߿f -, |!hg
,YX@U*07b."Tfڋ8 [  LGq߿_>r!
+,Z]nF@[c4@ 1t o@   =f-,    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/leave_16.png 0.7.24.src/e107_images/admin_images/leave_16.png
--- 0.7.23.src/e107_images/admin_images/leave_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/leave_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,3 +1,9 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  YPLTEWrrµfujiDmrC>{hVcyŨYk{|Lmӊʴ(t%qҦցࢦt@UjuOpZĎehhB跾owB^f+|臩آҨHWtvsdl灥H9su0ViRq☡嗗y%mI   stRNS ~   tEXtSoftware Adobe ImageReadyqe<   IDAT(c(B*XUMIJE&-,^00&HJ[g1iBY5ӜBxѢvZI\`fׂCq|@ e< 9~L
+$EŨ"',C  XfL詯    IENDB`
\ No newline at end of file
+   
IHDR         a   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  uIDATxb?%  X@JFF13S>?ȿ?=|ų۾TsTm;r bA6
(.cfܧ%0#S7^ub@ 
k0>EDӣG/]e'++ U_i 
+%Zg7o`gxw"
~=7P\1,ݾ/?@L`Ss4
+]YN10O3ܹw7VRp 2^3߿3'304{W.1 
+@0m
Ë$6fxf(33䗯/;;d1p=@`wF6@'=}?oO?N`[@ 
bO_30
+0ymwodۯBֶ,<|_do  O_l{ï#[;Xť~<Wn!n71|x';ó?8Z+|Arv^.73"+//n3d`wWe &?.ݸz/"/~-[mlka}fkvbp6  v`^
+4%%656F>`fߟ~gx
L7~[0q5B^  
+`^*/:#P+  FJ3@ c튢B    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/leave_32.png 0.7.24.src/e107_images/admin_images/leave_32.png
--- 0.7.23.src/e107_images/admin_images/leave_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/leave_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,6 +1,10 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTEJ45JZuM>D/XZ]ߠH]i}AT3ʝ**3z[A窭;cjˊ^mSO1RG챲*vyYy+B?25	7no7%"&h0M
3@U"b*n2~EeY*u:Ta_f#bPVWCUՏ͟%k)ڛӀ.s"iɴP>GcGvISV [!44w':Uo[۷諼,lƮ?db&p{SU^`yO|Q쏏/{PBDZЏV0P9W\8څΓ^}/t0r̲g("H묳E|@jjHX|Ɨѵ`b)qB(g.w%n͸O"f]O   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  IDAT8cO 0PWA*
-EH>ģ@QiL	T2:.YRނ83r]x}v pKݕ_tP677? ~vJѠI7
-c4i&3gzN$,=ֳo	nO
-pDRVXe{Znf06mQ,< MVGU*~=Pe`zMS%!#tLi$(UTUX0s~\@/vA)
DR0[i_\2C51ҏ
IBBewiK~q[b3GbTShHջ=.S8'7<!)m
^q0O{e8;[I(#oB+/ɷP[7wS/u_Hޏ'ٿ?0نy  d    IENDB`
\ No newline at end of file
+   
IHDR           szz   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  	 IDATxb?@ bb` @  bAfdĩQd008f`05bb@/[ }Є@4H@,ĸ\hi>U31bURb`e/wo?x
O?ډ 2 : Zd
U]E%88Atҗ10<{cggN\ڳ'څ+!@6`| bDhQI''7GaE1Bv>(DO'0ݰ/cdĠ֟޽du -;~!E@ 
+F.^~"93Cob@9N^ 8n;VX-  )\fX9߾eZh`'"Kog+ÇDDBxqP(  $8EBFHW% [d3,@?3t>fr- @,Y
XPL>a91SR@qFha)WfxOjjz3&/ɇO Ђ^oxF~A`&&s&00* ؁j^^-=c`c8s30$ׇ&LL@  %Ą8 f-%wdx}}[ËӧX P[xY23ܿp/߾2pq1H	#N Bwg?:
+ypwFt&W@.[ƠakJ@g?*gx|8T70<zÏR<7@ У@O\?/fx!, bj
+NpQi^T ^Xa:A(~0JH03ܸ{7?邏^N bBK?}d̸ocf`Fk`r (J!.nn^42dx(dˇl'@ .@OԃF.޴&pn2@9Rbt*2
)D9f]&yff}5>FfJ bA+ :`ʅ?@?~𴷟?73?g5@G2ξ 	@kGF]E\/3{n`~/31/TEEepP307|3 210H0Ex,-~+LM|&"
5~w7p̆l'@ {B bB}1p*k20 uF`p`nne``d!~f`gbcPnic#!Lo֮cJ\b[w"	@=`vÏ60[0@
+2K^UAg
+F__`*cd9g.C` pg/ 9l'@ &002axy-Sf2KOe~w?o`j,N?@Yh6mb8pw-1/暝 LV.tT+=ã}8gP*)c`*c&&L',[q<
7?bPbVzϟ";~> ^D	Ey3p SÓ'=  djO\a|Vd~,{6F`	
+
o1{	 !fF؛2H2~po be׈?~ex/ 4K`ɷG``J?ك   f^ULL
+2rl,?|b/`,9|? S;(߷g sl  B c`ΰ:MZXOX*P*^A%`	Ǐ/ I,[ D:	
\P*ہ{d_nz q; 4}C p  Z    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/logout_16.png 0.7.24.src/e107_images/admin_images/logout_16.png
--- 0.7.23.src/e107_images/admin_images/logout_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/logout_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,4 +1,3 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  }PLTEɦțάxz{z"٬#ɞȥȦݔ Ƽ縸Ӏ"ϲ⁸pe˭ ɫ!ؤ-Üΰzg`ɴ쒓♝ rZŻæG Ĭ`隞ɴ}wśג!pFz Ǥï   tRNS <	   tEXtSoftware Adobe ImageReadyqe<   IDAT(ScCuu	N&He\FVRr
-`T?	b>P !Eyb=PP773T.ǔS)=;D̻H
jhV(C<XBKU]19l kJ9KXMX.݅)M9*PQew)x0i; ETr@  \T"L    IENDB`
\ No newline at end of file
+   
IHDR         a   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  DIDATxb?%  X@Dxx:b1r&o}n=n@LHX7?)"wf&W|{| <,K{FGϸTb=ܲK33#жYŰZ  VAF````dbfx֍Xc{2030\\0 tΟ9'WWKÇ0o+}Dg8  6ǏWXX-DDxo`ve{*p={tOߏau &Ó'~h60>|22pp0{E&_suSH[ <F lׯ?6_rmo}[w2\xg/>~AZR-=4##  bҿ?~z̹#n _`@1((H:s١Czvw2|<<<˗o?}ԥ+t7o>}͛w,,/^g.  (033n_x7/fPJϛ7_x[Gn G oLLnfPWW1- Z_?`b/;#t& "Å._>0Ǐ':tƻw 4z?0 )  MY    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/logout_32.png 0.7.24.src/e107_images/admin_images/logout_32.png
--- 0.7.23.src/e107_images/admin_images/logout_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/logout_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,7 +1,18 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTE ͬT}}4h ʢkᑑ}}ܕWH  mm|pq}¬井ѺͲwwuu\] 8( Îppy 6ߘ5qq4ķ~}~ѷ Ã_aрĢ`aʠǲܿ°t;:~||wpvvsrDB  ?7||] ƪhyzrw{̰hhjp[)}Ѣ&ÿb)c9y$~(FNćÆtwrJuwl:ssopw`\yvm  yyxxoa½6^b)E@MǿƐF>Rد^2ek2hhw%  MDYX[Wtt}iLPyBC ޶ŵOQ   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  GIDAT8cO 0@//XbUG3~eG
l
-m8w`S`
-gp)+۱Xg7+,~nj]{L-3LOCP)1{w&B/4D7K;s'd:Ux_)|f2k?"} n${@9`؉IR}/-
zA}Q֫dUlk-z8pLIT4Uh+ᑀ௠ooYcN8fdNBA9eppdg-tW,>n8JTmN[󕀰jx3kUT{. /m+Ҳ1߈G[H
-8tV?
%T`,Wʞ4tY4I3Pd13sx5o '#_ʏhJU|Ҷr8FR[dqVz)j
-uK~T-kj %Wi۪(UVHƗy}H LrlՅ    IENDB`
\ No newline at end of file
+   
IHDR           szz   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  
+LIDATxb?@ bb` @,0###PA-3o?߿}_O <7uv<$Z
_BC aQ
+u @?,i~F:2bb
+?`x=ó{߿|EP{2@`d:=˜aY1cebc7Ơ!W~Y
+4'<$ox dn^R~pGolem.wDx3
+3	n`f78N>ee`nĥn^b9-iia;_0j30ܺsIO»$<\A	
+W%ggDH??e#6.#f/@ OL~1 1}`pu͛103s ooWw#Gcg`o6C
+-R>aI "'_j#PG ?mA5}o2|AEEAOOѣocHHcpq1ddشYéO 
+$X*sXYP
( 0k9GȪOpbA1,Z!..Z0h}(T
+E^9e@+^g`pAӘ[:	!f'@ !; WJJ\[[MZHHԩ>}dx5L@_._! ͻZWlX+á=Wmmˠc3/J2i1pO aBBU,,\	-22pp1|A\t}ʰuEUm1L_@޳3~@ g]'3r?~^<..N/u^x@ &!̊r?bP``a.dxل}Q`-_Y? +ؐ @p|cӧ/ (3'';ï_Y	2"O>g`Pr3g/bQ:30s0\;>ǐ @LHuǏ_01e?0!ȯ_?D
+ddgPPey	?f?AF:Q8';_E5p
u$ rۏ>} @1AE(@ycgg:oO
+7-sg__oC^h1`fF)^5R>".zNN..6Ą@}p
^^Vz Lgff:ǏWb8}O>WL[_޿=t0$J = ԙ7Tx&}-fOb
x[/^p}W3p0r //{ }`-1{{/ O,,4{, ol@},3yA[[ʕn߾}""B\*6`tt?~_`zA ebbK|ڍo~9(03<{RMwo.]z˯Οk~~n!#h0	 @4 !!,d.e0ypp0+
f:/@^mێx!uff&P._ff4}}uuy` =N}y2+'-  	230
֊@o ),,tXLLPYJJ? +[uv{0 3@`ZX*))ç3?~: 4k?S͛. @( ii`"G	H$̆@:QGGOVV+`j'C.R#@%(H@}LL Q	+f0 G@ a>}p
XrkDWLTݽ۷O?

yP4	[
+0A%):  Y0'[ݻ/	R z(	
+8j@ j@;wL5aPf'ٳGugwO@Zfhiݠ*[` F@v .j!--Ψ
	 GG:RKkvAZ =/2޽%|zݾ [N<Lޠ\ _  ꚁ{B0oy`0"01| DtݻW
+Zpz6Am0hlq XܹsÇʠ
+e
+ׯ7YYYug`W	@=0 R"w    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/main_16.png 0.7.24.src/e107_images/admin_images/main_16.png
--- 0.7.23.src/e107_images/admin_images/main_16.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/main_16.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,4 +1,9 @@
 PNG
 
-   
IHDR         (-S   gAMA  7  PLTE=6οî>71)0+6).&<6LNZ\w7*8"8*Vž-#5$(";+{(=6fK7p2u@@w~n^e`mT|Bӊ7&n6(F!eǂ1&i&& 3&֔t{MA݄B?[L]Wuh e^{|d]\P*kHֲ.$% 6+<9>66'4(YY8&),霌6$c6$ֆkk҇S}b_z`lV^93&LQг||[ZF/$:,$ ,#6);)ȣaպ糳ٻ?<ݤXⰄ:-_9lc@7ÎUqVڈ
-K4'>6/"5#]C11+rP|   tRNS    tEXtSoftware Adobe ImageReadyqe<   IDAT(ScXOX6#VG"(2Y+NT6$P'aU)njP(q5V/4dLKB;7/_!A<ǳDC$Խ* hZ=jW9vF]fg
W7E,m,7@)N֍5ٝޓYYTe+zW8vZ01.(TGO#RW;ZQ6>9÷ o
I`    IENDB`
\ No newline at end of file
+   
IHDR         a   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  IDATxb?%  Á0)'g`?̟3g`	>νO&  bc48ÿle`Ie	Բf`
@Ľn\0|oc?#PǛ_|%xgr  f-6e.mfl"VjJ<?c7@/0mgav+#_D? =&2I3Z10pr30? W?)6V̺g}?@LL?AQZ[E狟_?×1ff$#f5   A RP2     
 
+  
%  	 #   r A   +
+
+? 	 70  :'       $   nɚ o,fv4?	o2lMc`b(x
+@LN_7_x
+`/
+7 0Ҥy1ĉ>a`ba B h+#+ VNwy3s00 ARM/mF1p bߟ|Y50y	K.6Nq`6>pd"W`9 Xv O.MtWfqQ0``2@<@\d{(Ñ]{<yɛ p;  b4f%s@7JF57&v{ǋ^y"41 ܀@Oh0=A	oPh'ǖ 4<    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/admin_images/main_32.png 0.7.24.src/e107_images/admin_images/main_32.png
--- 0.7.23.src/e107_images/admin_images/main_32.png	2005-05-02 17:12:48.000000000 -0500
+++ 0.7.24.src/e107_images/admin_images/main_32.png	2010-09-17 04:57:58.000000000 -0500
@@ -1,5 +1,17 @@
 PNG
 
-   
IHDR           D   gAMA  7   PLTEvkkj}tsw9@34#,챺l>2HsP x깃̂ۘǫ1$|}{c9^44L4͉WzXXƅn;*."4*zYۚ"91f)QB35NNZNI($gXX2c4+ԏߐj&l8)-,UM* 88;5( UC4bԭj{N+*A.K벥s-*210%<sxAfJJ 9%C<ͮ>+oU3͑d)&%y=69+n-3+;/ω =.(()(՚n[̰_9.ΰдnϻ|G?g53gX9Rġ^JKiО4ƌ}pӞrֿ%VW??$v.O4e}QV)΀MX(ݕN^cc+ٺ^¡ݬ\
x<a«ݟ``|iݟ_FґfI vqÁ'6  ¦UG{b&%{0!W%%q!?%8#S%]4&j,v"K?'+ EȖ=.aj~N6|j{##++纏!!25:S   tRNS S%   tEXtSoftware Adobe ImageReadyqe<  IDAT8cO 0MAYz/ĂA:XGVpq]qjqjΜw%p[vwpqgz{JszrqۥE l]ol¥>I:EE`qΙ\ҙ&Q̷=?WfFzWOz93@j:?&: Z9XDZ㲴q&'ONH0}j]YaWaרv!K6L>r|ii	9/igL쬼geV/or4?IΥW$Tnobsdḓlwႝz]`bߒ"77Wl7Ƀ[yyyIH`K!
-'N=.b<`-g3U0$BBHɅ7&f]2N:_􋊷	~"@L8UD\&V;"#0@T]eɚtU*6rݛOR,g؛0%۩߼#O9鈤 Clj	N3Atp+ KMp㹖ߣc("	LQT-uO<ȈFe҂((<bVIn777niKo4^c_X Mr%9{XIh߬fH"]]i
-E|z(l^J">f$z֊`h)v XE`    IENDB`
\ No newline at end of file
+   
IHDR           szz   gAMA  7   tEXtSoftware Adobe ImageReadyqe<  
+IDATxb?@ bb` @  p c #3Ofc`2߿A<0LG%)FF1l  tQyyg鋋
+22{P,̌lL@'?_?1p11|	1c`	?~a6 4e``X/'g|
!~~O2' e`eea3783ۇ/?
o  &6  G01A@U4#3ç31 b37ïL\@yf_aO?0;C	Cxt 8A_Ff|e,efcv
ï@;XٹP05010OFv` CWq	~f6?p  B9X}/e
Lv aL r</0h?M'+C$/_)?7r  v.RR?nfrgЍPzkYX}3p^_v&>aab0xX~38N__0YV֏p߃@կ@  p9 	qrr|12$
7323p220p0A
CQ^`=_B|\f!n9X0D)j12?n bf`֓Y7ϟwo$MHLfa`c'3 a8x~~ *%	Wl\`=}a`cr/'0:Dٸ5|N 
Rvvo_3|F$@y#QQ/̂@Cـp
L+ ߿L@〡((1Y\"@ 13ׯ?P2PHFEh!0i-g: FVmqߧ2|{;#30Y
+Lt?b??Pzdce`&Rav?W|d8?z_q
@gE!C<s30JafpJg`%`<1E00>*)X!o{3pw4'3W&f8#B	 ~#F`I7`	3~,>20}T1_1x)AzZ@x_˚w~00	 Vy 8Њp3~-~aV^c /Pa,/np_"R@Ggxv*TV~z2&hfBs?@ bl40~<a{#;)Gve[5	^Hh*95
~lW00pk6`He!
+,Agj j/X
+f`L&
+_00]b~7Ù@'r
GC@ASXrKXi0!q`a  qhXb_( rNH vrX30V:<`u+7:'|esP YP
+ X
rPT:
+'.&2
v`V>^ewY` bl#M
+`:[n10CfH O9IR߂ARY`0'h  XQ[C,l<`0.`x!
+, !V!69!h>Jb`&$8`t}?F/0vAu 6+#'/nH!`
+ 0B/LФ`
ܯ~=G2ܽ  bل";vnbυp=m1sG&fn `|3z`Wѐ
{`p{%[{1<8yƵ?.{10<g  Ĉ
+R@[K~B+\g3 P	)mBerëgpؙWpϿρE-x@te Ĉj ]}lM|<Cpa뇎?}>>r7mO-Br b$ 
+9`i00
+0kπA_A-M HFOZxK  W{ 8нc !@ U |-H    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/generic/bbcode/justify.png 0.7.24.src/e107_images/generic/bbcode/justify.png
--- 0.7.23.src/e107_images/generic/bbcode/justify.png	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.24.src/e107_images/generic/bbcode/justify.png	2010-09-13 19:30:14.000000000 -0500
@@ -0,0 +1,14 @@
+PNG
+
+   
IHDR         j	   	pHYs  '  'iQ  
+OiCCPPhotoshop ICC profile  xڝSgTS=BKKoR RB&*!	J!QEEȠQ,
+!{kּ>H3Q5B.@
+$p d!s# ~<<+" x M0B\t8K @zB @F&S  `cb P- `' { [!  eD h; VE X0 fK9 - 0IWfH    0Q) { `##x  FW<+*  x<$9E[-qWW.(I+6aa@.y24  x6_-"bbϫp@  t~,/;m%h^uf@ Wp~<<EJB[aW}g_Wl~<$2]GLϒ	bG"IbX*QqD2"B)%d,>5 j>{-]cK'Xt  o(hw?G% fIq  ^D$.Tʳ?  D*A,`6B$BB
+dr`)B(Ͱ*`/@4Qhp.U=pa(	Aa!ڈbX#!H$ ɈQ"K5H1RT UH=r9\F; 2G1Q=C7Fdt1r=6Ыhڏ>C03l0.B8,	c˱"VcϱwE	6wB aAHXLXNH $4	7	Q'"K&b21XH,#/{C7$C2'ITFnR#,4H#dk9, +ȅ3![
+b@qS(RjJ4e2AURݨT5ZBRQ4u9̓IKhhitݕNWGw
ǈg(gwLӋT071oUX**|
+J&*/TުUUT^S}FU3S	ԖUPSSg;goT?~YYLOCQ_ cx,!k
u5&|v*=9C3J3WRf?qtN	(~))4L1e\kXHQG6EYAJ'\'GgSSݧ
+M=:.kDwn^Loy}/TmGX$<5qo</QC]@Caaᄑ<FFi\$mmƣ&&!&KMMRM);L;L֙͢5=12כ߷`ZxZ,eIZYnZ9YXUZ]F%ֻNNgðɶۮm}agbgŮ}}=
Z~sr:V:ޚΜ?}/gX3)iSGggs󈋉K.>.ȽJtq]zۯ6iܟ4)Y3sCQ?0k߬~OCOg#/c/Wװwa>>r><72Y_7ȷOo_C#dz %gA[z|!?:eAAA!h쐭!ΑiP~aa~'W?pX15wCsDDDޛg1O9-J5*>.j<74?.fYXXIlK9.*6nl{/]py.,:@LN8A*%w%
+yg"/6шC\*NH*Mz쑼5y$3,幄'L
Lݛ:v m2=:1qB!Mggfvˬen/kY-
+BTZ(*geWf͉9+̳ې7ᒶKW-X潬j9<qy
++V<*mOW~&zMk^ʂkU
+}]OX/Yߵa>(xoʿܔĹdff-[n
ڴ
VE/(ۻC<e;?TTTT6ݵan{4[>ɾUUMfeI?m]Nmq#׹=TR+Gw-
6
U#pDy	
:v{vg/jBFS[b[O>zG4<YyJTiӓgό}~.`ۢ{cjotE;;\tWW:_mt<Oǻ\kz{f7y՞9=ݽzo~r'˻w'O_@AC݇?[jwGCˆ
8>99?rCd&ˮ/~јѡ򗓿m|x31^VwwO| (hSЧc3-    cHRM  z%        u0  `  :  o_F   PLTE lll      !!!"""###$$$%%%&&&'''((()))***+++,,,---...///000111222333444555666777888999:::;;;<<<===>>>???@@@AAABBBCCCDDDEEEFFFGGGHHHIIIJJJKKKLLLMMMNNNOOOPPPQQQRRRSSSTTTUUUVVVWWWXXXYYYZZZ[[[\\\]]]^^^___```aaabbbcccdddeeefffggghhhiiijjjkkklllmmmnnnooopppqqqrrrssstttuuuvvvwwwxxxyyyzzz{{{|||}}}~~~	   tRNS @f   fIDATxI Dю8!	#.2U|_k^ @>4klc3;/ھ}Y_cSv0a# TQڮi |(    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_images/thumb.php 0.7.24.src/e107_images/thumb.php
--- 0.7.23.src/e107_images/thumb.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_images/thumb.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_images/thumb.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_images/thumb.php $
+|     $Revision: 11678 $
+|     $Id: thumb.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 /*
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/administrator.php 0.7.24.src/e107_languages/English/admin/help/administrator.php
--- 0.7.23.src/e107_languages/English/admin/help/administrator.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/administrator.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/administrator.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/administrator.php $
+|     $Revision: 11678 $
+|     $Id: administrator.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/banlist.php 0.7.24.src/e107_languages/English/admin/help/banlist.php
--- 0.7.23.src/e107_languages/English/admin/help/banlist.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/banlist.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/banlist.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/banlist.php $
+|     $Revision: 11678 $
+|     $Id: banlist.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/cache.php 0.7.24.src/e107_languages/English/admin/help/cache.php
--- 0.7.23.src/e107_languages/English/admin/help/cache.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/cache.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/cache.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/cache.php $
+|     $Revision: 11678 $
+|     $Id: cache.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/cpage.php 0.7.24.src/e107_languages/English/admin/help/cpage.php
--- 0.7.23.src/e107_languages/English/admin/help/cpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/cpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/cpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/cpage.php $
+|     $Revision: 11678 $
+|     $Id: cpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/db.php 0.7.24.src/e107_languages/English/admin/help/db.php
--- 0.7.23.src/e107_languages/English/admin/help/db.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/db.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/db.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/db.php $
+|     $Revision: 11678 $
+|     $Id: db.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/download.php 0.7.24.src/e107_languages/English/admin/help/download.php
--- 0.7.23.src/e107_languages/English/admin/help/download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/download.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/download.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/download.php $
+|     $Revision: 11678 $
+|     $Id: download.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/emoticon.php 0.7.24.src/e107_languages/English/admin/help/emoticon.php
--- 0.7.23.src/e107_languages/English/admin/help/emoticon.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/emoticon.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/emoticon.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/emoticon.php $
+|     $Revision: 11678 $
+|     $Id: emoticon.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/fileinspector.php 0.7.24.src/e107_languages/English/admin/help/fileinspector.php
--- 0.7.23.src/e107_languages/English/admin/help/fileinspector.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/fileinspector.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/fileinspector.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/fileinspector.php $
+|     $Revision: 11678 $
+|     $Id: fileinspector.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/filemanager.php 0.7.24.src/e107_languages/English/admin/help/filemanager.php
--- 0.7.23.src/e107_languages/English/admin/help/filemanager.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/filemanager.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/filemanager.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/filemanager.php $
+|     $Revision: 11678 $
+|     $Id: filemanager.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/frontpage.php 0.7.24.src/e107_languages/English/admin/help/frontpage.php
--- 0.7.23.src/e107_languages/English/admin/help/frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/frontpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/frontpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/frontpage.php $
+|     $Revision: 11678 $
+|     $Id: frontpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/image.php 0.7.24.src/e107_languages/English/admin/help/image.php
--- 0.7.23.src/e107_languages/English/admin/help/image.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/image.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/image.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/image.php $
+|     $Revision: 11678 $
+|     $Id: image.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/language.php 0.7.24.src/e107_languages/English/admin/help/language.php
--- 0.7.23.src/e107_languages/English/admin/help/language.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/language.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/language.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/language.php $
+|     $Revision: 11678 $
+|     $Id: language.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/links.php 0.7.24.src/e107_languages/English/admin/help/links.php
--- 0.7.23.src/e107_languages/English/admin/help/links.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/links.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/links.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/links.php $
+|     $Revision: 11678 $
+|     $Id: links.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/mailout.php 0.7.24.src/e107_languages/English/admin/help/mailout.php
--- 0.7.23.src/e107_languages/English/admin/help/mailout.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/mailout.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/mailout.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/mailout.php $
+|     $Revision: 11678 $
+|     $Id: mailout.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/menus.php 0.7.24.src/e107_languages/English/admin/help/menus.php
--- 0.7.23.src/e107_languages/English/admin/help/menus.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/menus.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/menus.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/menus.php $
+|     $Revision: 11678 $
+|     $Id: menus.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/meta.php 0.7.24.src/e107_languages/English/admin/help/meta.php
--- 0.7.23.src/e107_languages/English/admin/help/meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/meta.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/meta.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/meta.php $
+|     $Revision: 11678 $
+|     $Id: meta.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/news_category.php 0.7.24.src/e107_languages/English/admin/help/news_category.php
--- 0.7.23.src/e107_languages/English/admin/help/news_category.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/news_category.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/news_category.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/news_category.php $
+|     $Revision: 11678 $
+|     $Id: news_category.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/newspost.php 0.7.24.src/e107_languages/English/admin/help/newspost.php
--- 0.7.23.src/e107_languages/English/admin/help/newspost.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/newspost.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/newspost.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/newspost.php $
+|     $Revision: 11678 $
+|     $Id: newspost.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/notify.php 0.7.24.src/e107_languages/English/admin/help/notify.php
--- 0.7.23.src/e107_languages/English/admin/help/notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/notify.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/notify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/notify.php $
+|     $Revision: 11678 $
+|     $Id: notify.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/phpinfo.php 0.7.24.src/e107_languages/English/admin/help/phpinfo.php
--- 0.7.23.src/e107_languages/English/admin/help/phpinfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/phpinfo.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/phpinfo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/phpinfo.php $
+|     $Revision: 11678 $
+|     $Id: phpinfo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/prefs.php 0.7.24.src/e107_languages/English/admin/help/prefs.php
--- 0.7.23.src/e107_languages/English/admin/help/prefs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/prefs.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/prefs.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/prefs.php $
+|     $Revision: 11678 $
+|     $Id: prefs.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/search.php 0.7.24.src/e107_languages/English/admin/help/search.php
--- 0.7.23.src/e107_languages/English/admin/help/search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/search.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/search.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/search.php $
+|     $Revision: 11678 $
+|     $Id: search.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/theme.php 0.7.24.src/e107_languages/English/admin/help/theme.php
--- 0.7.23.src/e107_languages/English/admin/help/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/ugflag.php 0.7.24.src/e107_languages/English/admin/help/ugflag.php
--- 0.7.23.src/e107_languages/English/admin/help/ugflag.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/ugflag.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/ugflag.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/ugflag.php $
+|     $Revision: 11678 $
+|     $Id: ugflag.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/updateadmin.php 0.7.24.src/e107_languages/English/admin/help/updateadmin.php
--- 0.7.23.src/e107_languages/English/admin/help/updateadmin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/updateadmin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/updateadmin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/updateadmin.php $
+|     $Revision: 11678 $
+|     $Id: updateadmin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/upload.php 0.7.24.src/e107_languages/English/admin/help/upload.php
--- 0.7.23.src/e107_languages/English/admin/help/upload.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/upload.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/upload.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/upload.php $
+|     $Revision: 11678 $
+|     $Id: upload.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/userclass2.php 0.7.24.src/e107_languages/English/admin/help/userclass2.php
--- 0.7.23.src/e107_languages/English/admin/help/userclass2.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/userclass2.php	2010-09-03 07:18:13.000000000 -0500
@@ -3,23 +3,23 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/userclass2.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/userclass2.php $
+|     $Revision: 11737 $
+|     $Id: userclass2.php 11737 2010-09-03 12:18:37Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
 
-$caption = "Use Class Help";
+$caption = "User Class Help";
 $text = "You can create or edit/delete existing classes from this page.<br />This is useful for restricting users to certain parts of your site. For example, you could create a class called TEST, then create a forum which only allowed users in the TEST class to access it.";
 $ns -> tablerender($caption, $text);
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/users_extended.php 0.7.24.src/e107_languages/English/admin/help/users_extended.php
--- 0.7.23.src/e107_languages/English/admin/help/users_extended.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/users_extended.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/users_extended.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/users_extended.php $
+|     $Revision: 11678 $
+|     $Id: users_extended.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/users.php 0.7.24.src/e107_languages/English/admin/help/users.php
--- 0.7.23.src/e107_languages/English/admin/help/users.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/users.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/users.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/users.php $
+|     $Revision: 11678 $
+|     $Id: users.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/help/wmessage.php 0.7.24.src/e107_languages/English/admin/help/wmessage.php
--- 0.7.23.src/e107_languages/English/admin/help/wmessage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/help/wmessage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/wmessage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/help/wmessage.php $
+|     $Revision: 11678 $
+|     $Id: wmessage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_administrator.php 0.7.24.src/e107_languages/English/admin/lan_administrator.php
--- 0.7.23.src/e107_languages/English/admin/lan_administrator.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_administrator.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_administrator.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_administrator.php $
+|     $Revision: 11678 $
+|     $Id: lan_administrator.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("ADMSLAN_0", "New user/admin entry created for");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_admin_log.php 0.7.24.src/e107_languages/English/admin/lan_admin_log.php
--- 0.7.23.src/e107_languages/English/admin/lan_admin_log.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_admin_log.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_admin_log.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_admin_log.php $
+|     $Revision: 11678 $
+|     $Id: lan_admin_log.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: lisa_ 
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_admin.php 0.7.24.src/e107_languages/English/admin/lan_admin.php
--- 0.7.23.src/e107_languages/English/admin/lan_admin.php	2010-04-05 16:34:33.000000000 -0500
+++ 0.7.24.src/e107_languages/English/admin/lan_admin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_admin.php,v $
-|     $Revision: 11461 $
-|     $Date: 2010-04-05 16:34:57 -0500 (Mon, 05 Apr 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_admin.php $
+|     $Revision: 11678 $
+|     $Id: lan_admin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("ADLAN_0", "News");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_banlist.php 0.7.24.src/e107_languages/English/admin/lan_banlist.php
--- 0.7.23.src/e107_languages/English/admin/lan_banlist.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_banlist.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_banlist.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_banlist.php $
+|     $Revision: 11678 $
+|     $Id: lan_banlist.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("BANLAN_1", "Ban removed.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_banner.php 0.7.24.src/e107_languages/English/admin/lan_banner.php
--- 0.7.23.src/e107_languages/English/admin/lan_banner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_banner.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_banner.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_banner.php $
+|     $Revision: 11678 $
+|     $Id: lan_banner.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("BNRLAN_1", "Banner deleted.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_cache.php 0.7.24.src/e107_languages/English/admin/lan_cache.php
--- 0.7.23.src/e107_languages/English/admin/lan_cache.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_cache.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_cache.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_cache.php $
+|     $Revision: 11678 $
+|     $Id: lan_cache.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("CACLAN_1", "Cache System Status");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_check_user.php 0.7.24.src/e107_languages/English/admin/lan_check_user.php
--- 0.7.23.src/e107_languages/English/admin/lan_check_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_check_user.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_check_user.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_check_user.php $
+|     $Revision: 11678 $
+|     $Id: lan_check_user.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_cpage.php 0.7.24.src/e107_languages/English/admin/lan_cpage.php
--- 0.7.23.src/e107_languages/English/admin/lan_cpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_cpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_cpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_cpage.php $
+|     $Revision: 11678 $
+|     $Id: lan_cpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("CUSLAN_1", "Title");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_credits.php 0.7.24.src/e107_languages/English/admin/lan_credits.php
--- 0.7.23.src/e107_languages/English/admin/lan_credits.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_credits.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_credits.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_credits.php $
+|     $Revision: 11678 $
+|     $Id: lan_credits.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_db.php 0.7.24.src/e107_languages/English/admin/lan_db.php
--- 0.7.23.src/e107_languages/English/admin/lan_db.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_db.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_db.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_db.php $
+|     $Revision: 11678 $
+|     $Id: lan_db.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("DBLAN_1", "Core settings backed up in database.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_db_verify.php 0.7.24.src/e107_languages/English/admin/lan_db_verify.php
--- 0.7.23.src/e107_languages/English/admin/lan_db_verify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_db_verify.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_db_verify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_db_verify.php $
+|     $Revision: 11678 $
+|     $Id: lan_db_verify.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("DBLAN_1", "Unable to read the sql datafile<br /><br />Please ensure the file <b>core_sql.php</b> exists in the <b>/admin/sql</b> directory.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_download.php 0.7.24.src/e107_languages/English/admin/lan_download.php
--- 0.7.23.src/e107_languages/English/admin/lan_download.php	2010-08-16 02:12:50.000000000 -0500
+++ 0.7.24.src/e107_languages/English/admin/lan_download.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_download.php,v $
-|     $Revision: 11658 $
-|     $Date: 2010-08-16 02:13:14 -0500 (Mon, 16 Aug 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_download.php $
+|     $Revision: 11678 $
+|     $Id: lan_download.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_e107_update.php 0.7.24.src/e107_languages/English/admin/lan_e107_update.php
--- 0.7.23.src/e107_languages/English/admin/lan_e107_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_e107_update.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_e107_update.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_e107_update.php $
+|     $Revision: 11678 $
+|     $Id: lan_e107_update.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_emoticon.php 0.7.24.src/e107_languages/English/admin/lan_emoticon.php
--- 0.7.23.src/e107_languages/English/admin/lan_emoticon.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_emoticon.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_emoticon.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_emoticon.php $
+|     $Revision: 11678 $
+|     $Id: lan_emoticon.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("EMOLAN_1", "Emote activation");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_fileinspector.php 0.7.24.src/e107_languages/English/admin/lan_fileinspector.php
--- 0.7.23.src/e107_languages/English/admin/lan_fileinspector.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_fileinspector.php	2010-08-30 02:36:13.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_fileinspector.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_fileinspector.php $
+|     $Revision: 11717 $
+|     $Id: lan_fileinspector.php 11717 2010-08-30 07:36:37Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -54,8 +54,8 @@
 intentionally edited this file then you need not worry and can ignore this integrity check fail. If however
 the file was edited by someone else without authorisation you may want to re-upload the proper version of
 this file from the e107 zip.");
-define("FR_LAN_17", "If you are a CVS user");
-define("FR_LAN_18", "If you run checkouts of the e107 CVS on your site instead of the official e107 stable 
+define("FR_LAN_17", "If you are an SVN user");
+define("FR_LAN_18", "If you run checkouts of the e107 SVN on your site instead of the official e107 stable 
 releases, then you will discover files have failed integrity check because they have been edited by a dev 
 after the latest core image snapshot was created.");
 define("FR_LAN_19", "files failed");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_filemanager.php 0.7.24.src/e107_languages/English/admin/lan_filemanager.php
--- 0.7.23.src/e107_languages/English/admin/lan_filemanager.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_filemanager.php	2010-09-16 15:01:45.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_filemanager.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_filemanager.php $
+|     $Revision: 11790 $
+|     $Id: lan_filemanager.php 11790 2010-09-16 20:02:09Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("FMLAN_1", "Uploaded");
@@ -18,7 +18,7 @@
 // define("FMLAN_7", "No file was uploaded.");
 // define("FMLAN_8", "Uploaded file size 0 bytes");
 // define("FMLAN_9", "The file did not upload. Filename");
-// define("FMLAN_10", "Error");
+define('FMLAN_10', 'Error');
 // define("FMLAN_11", "Probably incorrect permissions on upload directory.");
 define("FMLAN_12", "file");
 define("FMLAN_13", "files");
@@ -61,6 +61,8 @@
 define("FMLAN_48", "Move selected to");
 define("FMLAN_49", "Please confirm you wish to move the selected files.");
 define("FMLAN_50", "Move");
+define('FMLAN_51', 'Unidentified error: ');
+
 
 
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_fla.php 0.7.24.src/e107_languages/English/admin/lan_fla.php
--- 0.7.23.src/e107_languages/English/admin/lan_fla.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_fla.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_fla.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_fla.php $
+|     $Revision: 11678 $
+|     $Id: lan_fla.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("FLALAN_1", "Failed login attempts");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_footer.php 0.7.24.src/e107_languages/English/admin/lan_footer.php
--- 0.7.23.src/e107_languages/English/admin/lan_footer.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_footer.php	2010-08-31 14:09:43.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_footer.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_footer.php $
+|     $Revision: 11728 $
+|     $Id: lan_footer.php 11728 2010-08-31 19:10:07Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("FOOTLAN_1", "Site");
@@ -27,5 +27,6 @@
 define("FOOTLAN_16", "Database");
 define("FOOTLAN_17", "Charset");
 define("FOOTLAN_18", "Site Theme");
+define("FOOTLAN_19", "Current Server Time");
 
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_frontpage.php 0.7.24.src/e107_languages/English/admin/lan_frontpage.php
--- 0.7.23.src/e107_languages/English/admin/lan_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_frontpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_frontpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_frontpage.php $
+|     $Revision: 11678 $
+|     $Id: lan_frontpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_header.php 0.7.24.src/e107_languages/English/admin/lan_header.php
--- 0.7.23.src/e107_languages/English/admin/lan_header.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_header.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_header.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_header.php $
+|     $Revision: 11678 $
+|     $Id: lan_header.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LAN_head_1", "Admin Navigation");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_image.php 0.7.24.src/e107_languages/English/admin/lan_image.php
--- 0.7.23.src/e107_languages/English/admin/lan_image.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_image.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_image.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_image.php $
+|     $Revision: 11678 $
+|     $Id: lan_image.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("IMALAN_1", "Enable image display");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_lancheck.php 0.7.24.src/e107_languages/English/admin/lan_lancheck.php
--- 0.7.23.src/e107_languages/English/admin/lan_lancheck.php	2010-06-05 01:13:27.000000000 -0500
+++ 0.7.24.src/e107_languages/English/admin/lan_lancheck.php	2010-09-06 18:31:23.000000000 -0500
@@ -3,14 +3,14 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_lancheck.php,v $
-|     $Revision: 11572 $
-|     $Date: 2010-06-05 01:13:51 -0500 (Sat, 05 Jun 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_lancheck.php $
+|     $Revision: 11756 $
+|     $Id: lan_lancheck.php 11756 2010-09-06 23:31:47Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LAN_CHECK_1", "Verify/Edit Language Files"); // modified in 0.7.6
-define("LAN_CHECK_2", "Begin Verify");
+define("LAN_CHECK_2", "Verify");
 define("LAN_CHECK_3", "Verification of");
 define("LAN_CHECK_4", "File missing!");
 define("LAN_CHECK_5", "Phrase missing!");
@@ -30,6 +30,12 @@
 define("LAN_CHECK_17", "A write problem occured while trying to save the file.");
 define("LAN_CHECK_18", "Language files in the standard format are NOT available for this plugin/theme.");
 define("LAN_CHECK_19", "Non-UTF-8 characters found!");
+define("LAN_CHECK_20", "Generate Language Pack");
+define("LAN_CHECK_21", "Verify Again");
+define("LAN_CHECK_22", "Theme");
+define("LAN_CHECK_23", "Errors Found");
+define("LAN_CHECK_24", "Summary");
+define("LAN_CHECK_25", "Themes");
+define("LAN_CHECK_26", "File");
 
-
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_language.php 0.7.24.src/e107_languages/English/admin/lan_language.php
--- 0.7.23.src/e107_languages/English/admin/lan_language.php	2010-07-22 21:53:03.000000000 -0500
+++ 0.7.24.src/e107_languages/English/admin/lan_language.php	2010-09-15 17:12:25.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_language.php,v $
-|     $Revision: 11613 $
-|     $Date: 2010-07-22 21:53:27 -0500 (Thu, 22 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_language.php $
+|     $Revision: 11786 $
+|     $Id: lan_language.php 11786 2010-09-15 22:12:49Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -38,4 +38,11 @@
 
 define("LANG_LAN_AGR", "Note: By using these tools you agree to share your language pack(s) with the e107 community.");
 define("LANG_LAN_EML", "Please email your language pack to:");
+
+define("LANG_LAN_25", "Please check that CORE_LC and CORE_LC2 have values in [lcpath] and try again.");
+define("LANG_LAN_26", "Please make sure you are using default folder names in e107_config.php (eg. 'e107_languages/', 'e107_plugins/' etc.) and try again.");
+define("LANG_LAN_27", "Please verify your language files ('Verify') then try again.");
+define("LANG_LAN_28", "Check this box if you're an [e107 certified translator].");
+
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_links.php 0.7.24.src/e107_languages/English/admin/lan_links.php
--- 0.7.23.src/e107_languages/English/admin/lan_links.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_links.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_links.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_links.php $
+|     $Revision: 11678 $
+|     $Id: lan_links.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LCLAN_1", "Options Saved");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_mailout.php 0.7.24.src/e107_languages/English/admin/lan_mailout.php
--- 0.7.23.src/e107_languages/English/admin/lan_mailout.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_mailout.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_mailout.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_mailout.php $
+|     $Revision: 11678 $
+|     $Id: lan_mailout.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PRFLAN_52", "Save Changes");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_menus.php 0.7.24.src/e107_languages/English/admin/lan_menus.php
--- 0.7.23.src/e107_languages/English/admin/lan_menus.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_menus.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_menus.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_menus.php $
+|     $Revision: 11678 $
+|     $Id: lan_menus.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("MENLAN_1", "Visible to all");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_message.php 0.7.24.src/e107_languages/English/admin/lan_message.php
--- 0.7.23.src/e107_languages/English/admin/lan_message.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_message.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_message.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_message.php $
+|     $Revision: 11678 $
+|     $Id: lan_message.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("MESSLAN_1", "Received messages");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_meta.php 0.7.24.src/e107_languages/English/admin/lan_meta.php
--- 0.7.23.src/e107_languages/English/admin/lan_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_meta.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_meta.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_meta.php $
+|     $Revision: 11678 $
+|     $Id: lan_meta.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("METLAN_1", "Meta tags updated in database");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_modcomment.php 0.7.24.src/e107_languages/English/admin/lan_modcomment.php
--- 0.7.23.src/e107_languages/English/admin/lan_modcomment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_modcomment.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_modcomment.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_modcomment.php $
+|     $Revision: 11678 $
+|     $Id: lan_modcomment.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("MDCLAN_1", "Moderated.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_newspost.php 0.7.24.src/e107_languages/English/admin/lan_newspost.php
--- 0.7.23.src/e107_languages/English/admin/lan_newspost.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_newspost.php	2010-08-26 16:08:13.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_newspost.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_newspost.php $
+|     $Revision: 11705 $
+|     $Id: lan_newspost.php 11705 2010-08-26 21:08:37Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("NWSLAN_1", "News story deleted.");
@@ -175,5 +175,6 @@
 define('LAN_NEWS_52', 'Proceed');
 define('LAN_NEWS_53', 'Update complete');
 define('LAN_NEWS_54', 'News Maintenance');
+define('LAN_NEWS_55', 'Author (Posted by)');
 
 ?>
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_notify.php 0.7.24.src/e107_languages/English/admin/lan_notify.php
--- 0.7.23.src/e107_languages/English/admin/lan_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_notify.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_notify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_notify.php $
+|     $Revision: 11678 $
+|     $Id: lan_notify.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_plugin.php 0.7.24.src/e107_languages/English/admin/lan_plugin.php
--- 0.7.23.src/e107_languages/English/admin/lan_plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_plugin.php $
+|     $Revision: 11678 $
+|     $Id: lan_plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("EPL_ADLAN_0", "Install");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_search.php 0.7.24.src/e107_languages/English/admin/lan_search.php
--- 0.7.23.src/e107_languages/English/admin/lan_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_search.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_search.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_search.php $
+|     $Revision: 11678 $
+|     $Id: lan_search.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("SEALAN_1", "Search Configuration");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_theme.php 0.7.24.src/e107_languages/English/admin/lan_theme.php
--- 0.7.23.src/e107_languages/English/admin/lan_theme.php	2010-05-01 15:58:57.000000000 -0500
+++ 0.7.24.src/e107_languages/English/admin/lan_theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,17 +1,22 @@
 <?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)
-*
-* Language file - Theme manager admin
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_theme.php $
-* $Id: lan_theme.php 11512 2010-05-01 20:59:21Z e107steved $
-*
-*/define("TPVLAN_1", "You are looking at a preview of the <b>'".PREVIEWTHEMENAME."'</b> theme. It has not been set as the main theme for your site, it has been activated to provide a preview of how the theme looks.<br />To set this theme as your site theme, <a href='".e_ADMIN."theme.php'>return to your theme manager</a> and select 'Set As Site Theme'.<br />To preview more themes please <a href='".e_ADMIN."theme.php'>click here</a>");
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_theme.php $
+|     $Revision: 11678 $
+|     $Id: lan_theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
+*/
+
+define("TPVLAN_1", "You are looking at a preview of the <b>'".PREVIEWTHEMENAME."'</b> theme. It has not been set as the main theme for your site, it has been activated to provide a preview of how the theme looks.<br />To set this theme as your site theme, <a href='".e_ADMIN."theme.php'>return to your theme manager</a> and select 'Set As Site Theme'.<br />To preview more themes please <a href='".e_ADMIN."theme.php'>click here</a>");
 define("TPVLAN_2", "Theme Preview");
 define("TPVLAN_3", "Main site theme set to");
 define("TPVLAN_4", "Author");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_ugflag.php 0.7.24.src/e107_languages/English/admin/lan_ugflag.php
--- 0.7.23.src/e107_languages/English/admin/lan_ugflag.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_ugflag.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_ugflag.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_ugflag.php $
+|     $Revision: 11678 $
+|     $Id: lan_ugflag.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define('UGFLAN_1', 'maintenance setting updated');
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_updateadmin.php 0.7.24.src/e107_languages/English/admin/lan_updateadmin.php
--- 0.7.23.src/e107_languages/English/admin/lan_updateadmin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_updateadmin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_updateadmin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_updateadmin.php $
+|     $Revision: 11678 $
+|     $Id: lan_updateadmin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("UDALAN_1", "Error - please re-submit");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_upload.php 0.7.24.src/e107_languages/English/admin/lan_upload.php
--- 0.7.23.src/e107_languages/English/admin/lan_upload.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_upload.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_upload.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_upload.php $
+|     $Revision: 11678 $
+|     $Id: lan_upload.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("UPLLAN_1", "Upload removed from list.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_userclass2.php 0.7.24.src/e107_languages/English/admin/lan_userclass2.php
--- 0.7.23.src/e107_languages/English/admin/lan_userclass2.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_userclass2.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_userclass2.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_userclass2.php $
+|     $Revision: 11678 $
+|     $Id: lan_userclass2.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("UCSLAN_1", "Cleared all users from class.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_userclass.php 0.7.24.src/e107_languages/English/admin/lan_userclass.php
--- 0.7.23.src/e107_languages/English/admin/lan_userclass.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_userclass.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_userclass.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_userclass.php $
+|     $Revision: 11678 $
+|     $Id: lan_userclass.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_userinfo.php 0.7.24.src/e107_languages/English/admin/lan_userinfo.php
--- 0.7.23.src/e107_languages/English/admin/lan_userinfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_userinfo.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_userinfo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_userinfo.php $
+|     $Revision: 11678 $
+|     $Id: lan_userinfo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("USFLAN_1", "Unable to find poster's IP address - no information is available.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_users_extended.php 0.7.24.src/e107_languages/English/admin/lan_users_extended.php
--- 0.7.23.src/e107_languages/English/admin/lan_users_extended.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_users_extended.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_users_extended.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_users_extended.php $
+|     $Revision: 11678 $
+|     $Id: lan_users_extended.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("EXTLAN_1", "Name");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_users.php 0.7.24.src/e107_languages/English/admin/lan_users.php
--- 0.7.23.src/e107_languages/English/admin/lan_users.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_users.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_users.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_users.php $
+|     $Revision: 11678 $
+|     $Id: lan_users.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("USRLAN_1", "Options Saved.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/admin/lan_wmessage.php 0.7.24.src/e107_languages/English/admin/lan_wmessage.php
--- 0.7.23.src/e107_languages/English/admin/lan_wmessage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/admin/lan_wmessage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_wmessage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_wmessage.php $
+|     $Revision: 11678 $
+|     $Id: lan_wmessage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 // define("WMGLAN_1", "Message for Guests");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/English.php 0.7.24.src/e107_languages/English/English.php
--- 0.7.23.src/e107_languages/English/English.php	2010-08-16 11:41:11.000000000 -0500
+++ 0.7.24.src/e107_languages/English/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/English.php,v $
-|     $Revision: 11660 $
-|     $Date: 2010-08-16 11:41:35 -0500 (Mon, 16 Aug 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 setlocale(LC_ALL, 'en_GB.UTF-8', 'en_GB.utf8', 'eng_eng.utf8', 'en');
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_banner.php 0.7.24.src/e107_languages/English/lan_banner.php
--- 0.7.23.src/e107_languages/English/lan_banner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_banner.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_banner.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_banner.php $
+|     $Revision: 11678 $
+|     $Id: lan_banner.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Banner");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_comment.php 0.7.24.src/e107_languages/English/lan_comment.php
--- 0.7.23.src/e107_languages/English/lan_comment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_comment.php	2010-08-23 02:25:23.000000000 -0500
@@ -1,14 +1,16 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system - Language File.
-|
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_comment.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2002-2010 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * Comment handling - language files
+ *
+ * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_comment.php $
+ * $Id: lan_comment.php 11687 2010-08-23 07:25:47Z e107steved $
+ */
 
 define("COMLAN_0", "[blocked by admin]");
 define("COMLAN_1", "Unblock");
@@ -22,6 +24,7 @@
 define("COMLAN_9", "Submit comment");
 define("COMLAN_10", "Administrator");
 define("COMLAN_11", "Was unable to enter your comment into the database - please retype leaving out any non-standard characters.");
+define('COMLAN_12', 'User');
 define("COMLAN_16", "Username: ");
 define("COMLAN_99", "Comments");
 define("COMLAN_100", "News");
@@ -63,6 +66,6 @@
 define("COMLAN_TYPE_6", "bugtrack");
 define("COMLAN_TYPE_7", "ideas");
 define("COMLAN_TYPE_8", "userprofile");
-define("COMLAN_TYPE_PAGE", "Content");		// Reall custom page, but use a 'non-technical' description
+define("COMLAN_TYPE_PAGE", "Content");		// Really custom page, but use a 'non-technical' description
 
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_contact.php 0.7.24.src/e107_languages/English/lan_contact.php
--- 0.7.23.src/e107_languages/English/lan_contact.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_contact.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_contact.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_contact.php $
+|     $Revision: 11678 $
+|     $Id: lan_contact.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_date.php 0.7.24.src/e107_languages/English/lan_date.php
--- 0.7.23.src/e107_languages/English/lan_date.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_date.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_date.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_date.php $
+|     $Revision: 11678 $
+|     $Id: lan_date.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_download.php 0.7.24.src/e107_languages/English/lan_download.php
--- 0.7.23.src/e107_languages/English/lan_download.php	2010-08-16 16:26:04.000000000 -0500
+++ 0.7.24.src/e107_languages/English/lan_download.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_download.php,v $
-|     $Revision: 11661 $
-|     $Date: 2010-08-16 16:26:28 -0500 (Mon, 16 Aug 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_download.php $
+|     $Revision: 11678 $
+|     $Id: lan_download.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_email.php 0.7.24.src/e107_languages/English/lan_email.php
--- 0.7.23.src/e107_languages/English/lan_email.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_email.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_email.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_email.php $
+|     $Revision: 11678 $
+|     $Id: lan_email.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined("PAGE_NAME")) { define("PAGE_NAME", "Email"); }
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_error.php 0.7.24.src/e107_languages/English/lan_error.php
--- 0.7.23.src/e107_languages/English/lan_error.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_error.php	2010-08-30 11:58:42.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_error.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_error.php $
+|     $Revision: 11721 $
+|     $Id: lan_error.php 11721 2010-08-30 16:59:06Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Error");
@@ -39,7 +39,7 @@
 define("LAN_ERROR_25", "[1]: Unable to read core settings from database - Core settings exist but cannot be unserialized. Attempting to restore core backup ...");
 define("LAN_ERROR_26", "[2]: Unable to read core settings from database - non-existent core settings.");
 define("LAN_ERROR_27", "[3]: Core settings saved - backup made active.");
-define("LAN_ERROR_28", "[4]: No core backup found. Check that your database has valid content. If not, please run the <a href='".e_FILE."resetcore/resetcore.php'>Reset_Core</a> utility to rebuild your core settings. <br />After rebuilding your core please save a backup from the admin/sql screen.");
+define("LAN_ERROR_28", "[4]: No core backup found. Check that your database has valid content. If not, please run the <a href='".e_FILE_ABS."resetcore/resetcore.php'>Reset_Core</a> utility to rebuild your core settings. <br />After rebuilding your core please save a backup from the admin/sql screen.");
 define("LAN_ERROR_29", "[5]: Field(s) have been left blank. Please resubmit the form and fill in the required fields.");
 define("LAN_ERROR_30", "[6]: Unable to form a valid connection to mySQL. Please check that your e107_config.php contains the correct information.");
 define("LAN_ERROR_31", "[7]: mySQL is running but database ({$mySQLdefaultdb}) couldn't be connected to.<br />Please check it exists and that your e107_config.php contains the correct information.");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_fpw.php 0.7.24.src/e107_languages/English/lan_fpw.php
--- 0.7.23.src/e107_languages/English/lan_fpw.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_fpw.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_fpw.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_fpw.php $
+|     $Revision: 11678 $
+|     $Id: lan_fpw.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Password Reset");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_installer.php 0.7.24.src/e107_languages/English/lan_installer.php
--- 0.7.23.src/e107_languages/English/lan_installer.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_installer.php	2010-08-31 12:54:09.000000000 -0500
@@ -145,7 +145,7 @@
 //define("LANINS_103", 'Reviews');
 //define("LANINS_104", 'Review Front Page ...');
 
-define("LANINS_105", 'A database name or prefix beginning with some digits followed by “e” or “E” is not acceptable.  <br />A database name or prefix can not be empty.');
+define("LANINS_105", "A database name or prefix beginning with some digits followed by 'e' or 'E' is not acceptable.  <br />A database name or prefix can not be empty.");
 define("LANINS_106", 'WARNING - E107 cannot write to the directories and/or files listed. While this will not stop E107 installing, it will mean that certain features are not available. 
 				You will need to change the file permissions to use these features');
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_login.php 0.7.24.src/e107_languages/English/lan_login.php
--- 0.7.23.src/e107_languages/English/lan_login.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_login.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_login.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_login.php $
+|     $Revision: 11678 $
+|     $Id: lan_login.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LAN_27", "You left required field(s) blank");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_mail_handler.php 0.7.24.src/e107_languages/English/lan_mail_handler.php
--- 0.7.23.src/e107_languages/English/lan_mail_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_mail_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_mail_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_mail_handler.php $
+|     $Revision: 11678 $
+|     $Id: lan_mail_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LANMAILH_1", "Produced by e107 website system");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_membersonly.php 0.7.24.src/e107_languages/English/lan_membersonly.php
--- 0.7.23.src/e107_languages/English/lan_membersonly.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_membersonly.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_membersonly.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_membersonly.php $
+|     $Revision: 11678 $
+|     $Id: lan_membersonly.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Members Only");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_news.php 0.7.24.src/e107_languages/English/lan_news.php
--- 0.7.23.src/e107_languages/English/lan_news.php	2010-05-31 16:04:26.000000000 -0500
+++ 0.7.24.src/e107_languages/English/lan_news.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_news.php,v $
-|     $Revision: 11560 $
-|     $Date: 2010-05-31 16:04:50 -0500 (Mon, 31 May 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_news.php $
+|     $Revision: 11678 $
+|     $Id: lan_news.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "News");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_notify.php 0.7.24.src/e107_languages/English/lan_notify.php
--- 0.7.23.src/e107_languages/English/lan_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_notify.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_notify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_notify.php $
+|     $Revision: 11678 $
+|     $Id: lan_notify.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_np.php 0.7.24.src/e107_languages/English/lan_np.php
--- 0.7.23.src/e107_languages/English/lan_np.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_np.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_np.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_np.php $
+|     $Revision: 11678 $
+|     $Id: lan_np.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("NP_1", "Previous page");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_online.php 0.7.24.src/e107_languages/English/lan_online.php
--- 0.7.23.src/e107_languages/English/lan_online.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_online.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_online.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_online.php $
+|     $Revision: 11678 $
+|     $Id: lan_online.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_page.php 0.7.24.src/e107_languages/English/lan_page.php
--- 0.7.23.src/e107_languages/English/lan_page.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_page.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_page.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_page.php $
+|     $Revision: 11678 $
+|     $Id: lan_page.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_parser_functions.php 0.7.24.src/e107_languages/English/lan_parser_functions.php
--- 0.7.23.src/e107_languages/English/lan_parser_functions.php	2010-07-30 04:30:35.000000000 -0500
+++ 0.7.24.src/e107_languages/English/lan_parser_functions.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_parser_functions.php,v $
-|     $Revision: 11634 $
-|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_parser_functions.php $
+|     $Revision: 11678 $
+|     $Id: lan_parser_functions.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_prefs.php 0.7.24.src/e107_languages/English/lan_prefs.php
--- 0.7.23.src/e107_languages/English/lan_prefs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_prefs.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_prefs.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_prefs.php $
+|     $Revision: 11678 $
+|     $Id: lan_prefs.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_print.php 0.7.24.src/e107_languages/English/lan_print.php
--- 0.7.23.src/e107_languages/English/lan_print.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_print.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_print.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_print.php $
+|     $Revision: 11678 $
+|     $Id: lan_print.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined("PAGE_NAME")) { define("PAGE_NAME", "Printer Friendly"); }
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_rate.php 0.7.24.src/e107_languages/English/lan_rate.php
--- 0.7.23.src/e107_languages/English/lan_rate.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_rate.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_rate.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_rate.php $
+|     $Revision: 11678 $
+|     $Id: lan_rate.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_ren_help.php 0.7.24.src/e107_languages/English/lan_ren_help.php
--- 0.7.23.src/e107_languages/English/lan_ren_help.php	2010-08-16 11:41:11.000000000 -0500
+++ 0.7.24.src/e107_languages/English/lan_ren_help.php	2010-09-18 16:22:05.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_ren_help.php,v $
-|     $Revision: 11660 $
-|     $Date: 2010-08-16 11:41:35 -0500 (Mon, 16 Aug 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_ren_help.php $
+|     $Revision: 11801 $
+|     $Id: lan_ren_help.php 11801 2010-09-18 21:22:29Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("LANHELP_1", "Black");
@@ -65,4 +65,7 @@
 define("LANHELP_47", "Insert flash: [flash=width,height]http://www.example.com/file.swf[/flash]");
 // 0.7.23
 define("LANHELP_48", "YouTube video: [youtube=tiny|small|medium|big|huge|width,height]6kYjxJmk0wc[/youtube]");
+// 0.7.24
+define("LANHELP_49", "Justify align: [justify]This text will be justified[/justify]");
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_search.php 0.7.24.src/e107_languages/English/lan_search.php
--- 0.7.23.src/e107_languages/English/lan_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_search.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_search.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_search.php $
+|     $Revision: 11678 $
+|     $Id: lan_search.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_signup.php 0.7.24.src/e107_languages/English/lan_signup.php
--- 0.7.23.src/e107_languages/English/lan_signup.php	2010-07-30 04:30:35.000000000 -0500
+++ 0.7.24.src/e107_languages/English/lan_signup.php	2010-09-07 12:02:03.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_signup.php,v $
-|     $Revision: 11634 $
-|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
-|     $Author: e107coders $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_signup.php $
+|     $Revision: 11760 $
+|     $Id: lan_signup.php 11760 2010-09-07 17:02:27Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Register");
@@ -130,6 +130,9 @@
 define("LAN_SIGNUP_100", "Admin Approval Pending");
 
 
+define('LAN_SIGNUP_102', 'Signup refused');
+define('LAN_SIGNUP_103', 'Too many users already using IP address: ');
+
 
 
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_sitedown.php 0.7.24.src/e107_languages/English/lan_sitedown.php
--- 0.7.23.src/e107_languages/English/lan_sitedown.php	2010-07-30 04:30:35.000000000 -0500
+++ 0.7.24.src/e107_languages/English/lan_sitedown.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_sitedown.php,v $
-|     $Revision: 11634 $
-|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_sitedown.php $
+|     $Revision: 11678 $
+|     $Id: lan_sitedown.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_sitelinks.php 0.7.24.src/e107_languages/English/lan_sitelinks.php
--- 0.7.23.src/e107_languages/English/lan_sitelinks.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_sitelinks.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_sitelinks.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_sitelinks.php $
+|     $Revision: 11678 $
+|     $Id: lan_sitelinks.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LAN_SITELINKS_183", "Main Menu");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_submitnews.php 0.7.24.src/e107_languages/English/lan_submitnews.php
--- 0.7.23.src/e107_languages/English/lan_submitnews.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_submitnews.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_submitnews.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_submitnews.php $
+|     $Revision: 11678 $
+|     $Id: lan_submitnews.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Submit News");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_top.php 0.7.24.src/e107_languages/English/lan_top.php
--- 0.7.23.src/e107_languages/English/lan_top.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_top.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_top.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_top.php $
+|     $Revision: 11678 $
+|     $Id: lan_top.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_upload_handler.php 0.7.24.src/e107_languages/English/lan_upload_handler.php
--- 0.7.23.src/e107_languages/English/lan_upload_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_upload_handler.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_upload_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_upload_handler.php $
+|     $Revision: 11678 $
+|     $Id: lan_upload_handler.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LANUPLOAD_1", "The filetype");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_upload.php 0.7.24.src/e107_languages/English/lan_upload.php
--- 0.7.23.src/e107_languages/English/lan_upload.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_upload.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_upload.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_upload.php $
+|     $Revision: 11678 $
+|     $Id: lan_upload.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Upload");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_userclass.php 0.7.24.src/e107_languages/English/lan_userclass.php
--- 0.7.23.src/e107_languages/English/lan_userclass.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_userclass.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_userclass.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_userclass.php $
+|     $Revision: 11678 $
+|     $Id: lan_userclass.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("UC_LAN_0", "Everyone (public)");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_user_extended.php 0.7.24.src/e107_languages/English/lan_user_extended.php
--- 0.7.23.src/e107_languages/English/lan_user_extended.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_user_extended.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_user_extended.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_user_extended.php $
+|     $Revision: 11678 $
+|     $Id: lan_user_extended.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("UE_LAN_1", "Text Box");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_user.php 0.7.24.src/e107_languages/English/lan_user.php
--- 0.7.23.src/e107_languages/English/lan_user.php	2010-05-04 14:04:13.000000000 -0500
+++ 0.7.24.src/e107_languages/English/lan_user.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_user.php,v $
-|     $Revision: 11520 $
-|     $Date: 2010-05-04 14:04:37 -0500 (Tue, 04 May 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_user.php $
+|     $Revision: 11678 $
+|     $Id: lan_user.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Members");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_userposts.php 0.7.24.src/e107_languages/English/lan_userposts.php
--- 0.7.23.src/e107_languages/English/lan_userposts.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_userposts.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_userposts.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_userposts.php $
+|     $Revision: 11678 $
+|     $Id: lan_userposts.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "User Posts");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_user_select.php 0.7.24.src/e107_languages/English/lan_user_select.php
--- 0.7.23.src/e107_languages/English/lan_user_select.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_languages/English/lan_user_select.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_user_select.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_user_select.php $
+|     $Revision: 11678 $
+|     $Id: lan_user_select.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("US_LAN_1", "Select user");
diff -x .svn -aruN 0.7.23.src/e107_languages/English/lan_usersettings.php 0.7.24.src/e107_languages/English/lan_usersettings.php
--- 0.7.23.src/e107_languages/English/lan_usersettings.php	2010-05-25 14:30:10.000000000 -0500
+++ 0.7.24.src/e107_languages/English/lan_usersettings.php	2010-08-22 13:40:08.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_usersettings.php,v $
-|     $Revision: 11553 $
-|     $Date: 2010-05-25 14:30:34 -0500 (Tue, 25 May 2010) $
-|     $Author: mcfly_e107 $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/lan_usersettings.php $
+|     $Revision: 11679 $
+|     $Id: lan_usersettings.php 11679 2010-08-22 18:40:32Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "User Settings");
@@ -29,7 +29,7 @@
 //define("LAN_118", "Birthday: ");
 //define("LAN_119", "Location: ");
 define("LAN_120", "Signature: ");
-//define("LAN_121", "Avatar: ");
+define("LAN_121", "Avatar: ");
 define("LAN_122", "Timezone:");
 //define("LAN_144", "Website URL: ");
 define("LAN_150", "Settings updated and saved into database.");
diff -x .svn -aruN 0.7.23.src/e107_plugins/admin_menu/admin_menu.php 0.7.24.src/e107_plugins/admin_menu/admin_menu.php
--- 0.7.23.src/e107_plugins/admin_menu/admin_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/admin_menu/admin_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/admin_menu/admin_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/admin_menu/admin_menu.php $
+|     $Revision: 11678 $
+|     $Id: admin_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_auth/alt_auth_conf.php 0.7.24.src/e107_plugins/alt_auth/alt_auth_conf.php
--- 0.7.23.src/e107_plugins/alt_auth/alt_auth_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_auth/alt_auth_conf.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/alt_auth_conf.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/alt_auth/alt_auth_conf.php $
+|     $Revision: 11678 $
+|     $Id: alt_auth_conf.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = true;
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_auth/alt_auth_login_class.php 0.7.24.src/e107_plugins/alt_auth/alt_auth_login_class.php
--- 0.7.23.src/e107_plugins/alt_auth/alt_auth_login_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_auth/alt_auth_login_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/alt_auth_login_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/alt_auth/alt_auth_login_class.php $
+|     $Revision: 11678 $
+|     $Id: alt_auth_login_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 class alt_login
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_auth/alt_login_class.php 0.7.24.src/e107_plugins/alt_auth/alt_login_class.php
--- 0.7.23.src/e107_plugins/alt_auth/alt_login_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_auth/alt_login_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/alt_login_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/alt_auth/alt_login_class.php $
+|     $Revision: 11678 $
+|     $Id: alt_login_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_auth/ldap_auth.php 0.7.24.src/e107_plugins/alt_auth/ldap_auth.php
--- 0.7.23.src/e107_plugins/alt_auth/ldap_auth.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_auth/ldap_auth.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/ldap_auth.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/alt_auth/ldap_auth.php $
+|     $Revision: 11678 $
+|     $Id: ldap_auth.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_auth/ldap_conf.php 0.7.24.src/e107_plugins/alt_auth/ldap_conf.php
--- 0.7.23.src/e107_plugins/alt_auth/ldap_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_auth/ldap_conf.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/ldap_conf.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/alt_auth/ldap_conf.php $
+|     $Revision: 11678 $
+|     $Id: ldap_conf.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = true;
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_auth/otherdb_auth.php 0.7.24.src/e107_plugins/alt_auth/otherdb_auth.php
--- 0.7.23.src/e107_plugins/alt_auth/otherdb_auth.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_auth/otherdb_auth.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/otherdb_auth.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/alt_auth/otherdb_auth.php $
+|     $Revision: 11678 $
+|     $Id: otherdb_auth.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_auth/otherdb_conf.php 0.7.24.src/e107_plugins/alt_auth/otherdb_conf.php
--- 0.7.23.src/e107_plugins/alt_auth/otherdb_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_auth/otherdb_conf.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,8 +4,8 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_auth/plugin.php 0.7.24.src/e107_plugins/alt_auth/plugin.php
--- 0.7.23.src/e107_plugins/alt_auth/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_auth/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/alt_auth/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/alt_news/alt_news.php 0.7.24.src/e107_plugins/alt_news/alt_news.php
--- 0.7.23.src/e107_plugins/alt_news/alt_news.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/alt_news/alt_news.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_news/alt_news.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/alt_news/alt_news.php $
+|     $Revision: 11678 $
+|     $Id: alt_news.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/banner_menu/banner_menu.php 0.7.24.src/e107_plugins/banner_menu/banner_menu.php
--- 0.7.23.src/e107_plugins/banner_menu/banner_menu.php	2010-06-01 16:55:03.000000000 -0500
+++ 0.7.24.src/e107_plugins/banner_menu/banner_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/banner_menu/banner_menu.php,v $
-|     $Revision: 11564 $
-|     $Date: 2010-06-01 16:55:27 -0500 (Tue, 01 Jun 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/banner_menu/banner_menu.php $
+|     $Revision: 11678 $
+|     $Id: banner_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/banner_menu/config.php 0.7.24.src/e107_plugins/banner_menu/config.php
--- 0.7.23.src/e107_plugins/banner_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/banner_menu/config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/banner_menu/config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/banner_menu/config.php $
+|     $Revision: 11678 $
+|     $Id: config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = TRUE;
diff -x .svn -aruN 0.7.23.src/e107_plugins/banner_menu/languages/English.php 0.7.24.src/e107_plugins/banner_menu/languages/English.php
--- 0.7.23.src/e107_plugins/banner_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/banner_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/banner_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/banner_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/blogcalendar_menu/archive.php 0.7.24.src/e107_plugins/blogcalendar_menu/archive.php
--- 0.7.23.src/e107_plugins/blogcalendar_menu/archive.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/blogcalendar_menu/archive.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/archive.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/blogcalendar_menu/archive.php $
+|     $Revision: 11678 $
+|     $Id: archive.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 | Based on code by: Thomas Bouve (crahan@gmx.net)
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/blogcalendar_menu/blogcalendar_menu.php 0.7.24.src/e107_plugins/blogcalendar_menu/blogcalendar_menu.php
--- 0.7.23.src/e107_plugins/blogcalendar_menu/blogcalendar_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/blogcalendar_menu/blogcalendar_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/blogcalendar_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/blogcalendar_menu/blogcalendar_menu.php $
+|     $Revision: 11678 $
+|     $Id: blogcalendar_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 | Based on code by: Thomas Bouve (crahan@gmx.net)
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/blogcalendar_menu/calendar.php 0.7.24.src/e107_plugins/blogcalendar_menu/calendar.php
--- 0.7.23.src/e107_plugins/blogcalendar_menu/calendar.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/blogcalendar_menu/calendar.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/calendar.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/blogcalendar_menu/calendar.php $
+|     $Revision: 11678 $
+|     $Id: calendar.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 | Based on code by: Thomas Bouve (crahan@gmx.net) and
 | and Based on: PHP Calendar by Keith Devens http://www.keithdevens.com/software/php_calendar/
diff -x .svn -aruN 0.7.23.src/e107_plugins/blogcalendar_menu/config.php 0.7.24.src/e107_plugins/blogcalendar_menu/config.php
--- 0.7.23.src/e107_plugins/blogcalendar_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/blogcalendar_menu/config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/blogcalendar_menu/config.php $
+|     $Revision: 11678 $
+|     $Id: config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = TRUE;
diff -x .svn -aruN 0.7.23.src/e107_plugins/blogcalendar_menu/functions.php 0.7.24.src/e107_plugins/blogcalendar_menu/functions.php
--- 0.7.23.src/e107_plugins/blogcalendar_menu/functions.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/blogcalendar_menu/functions.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/functions.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/blogcalendar_menu/functions.php $
+|     $Revision: 11678 $
+|     $Id: functions.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/blogcalendar_menu/languages/English.php 0.7.24.src/e107_plugins/blogcalendar_menu/languages/English.php
--- 0.7.23.src/e107_plugins/blogcalendar_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/blogcalendar_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,15 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-| e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-| Steve Dunstan 2001-2002
-| http://e107.org
-| jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-| Released under the terms and conditions of the
-| GNU General Public License (http://gnu.org).
-+---------------------------------------------------------------+
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/blogcalendar_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 	
 define("BLOGCAL_L1", "News for ");
diff -x .svn -aruN 0.7.23.src/e107_plugins/blogcalendar_menu/styles.php 0.7.24.src/e107_plugins/blogcalendar_menu/styles.php
--- 0.7.23.src/e107_plugins/blogcalendar_menu/styles.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/blogcalendar_menu/styles.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/styles.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/blogcalendar_menu/styles.php $
+|     $Revision: 11678 $
+|     $Id: styles.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/admin_config.php 0.7.24.src/e107_plugins/calendar_menu/admin_config.php
--- 0.7.23.src/e107_plugins/calendar_menu/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | 02.11.06 - Cache clear option added
 | 10.11.06 - Support for updated templates etc
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/calendar.php 0.7.24.src/e107_plugins/calendar_menu/calendar.php
--- 0.7.23.src/e107_plugins/calendar_menu/calendar.php	2010-07-13 17:04:05.000000000 -0500
+++ 0.7.24.src/e107_plugins/calendar_menu/calendar.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/calendar.php,v $
-|     $Revision: 11598 $
-|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/calendar.php $
+|     $Revision: 11678 $
+|     $Id: calendar.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | 11.11.06 - steved - mods for next CVS release
 |
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/calendar_shortcodes.php 0.7.24.src/e107_plugins/calendar_menu/calendar_shortcodes.php
--- 0.7.23.src/e107_plugins/calendar_menu/calendar_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/calendar_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/calendar_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/calendar_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: calendar_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | 10.11.06 - mods for next CVS release
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/calendar_template.php 0.7.24.src/e107_plugins/calendar_menu/calendar_template.php
--- 0.7.23.src/e107_plugins/calendar_menu/calendar_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/calendar_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/calendar_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/calendar_template.php $
+|     $Revision: 11678 $
+|     $Id: calendar_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | 10.11.06 steved - mods for next CVS release
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/ecal_class.php 0.7.24.src/e107_plugins/calendar_menu/ecal_class.php
--- 0.7.23.src/e107_plugins/calendar_menu/ecal_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/ecal_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/ecal_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/ecal_class.php $
+|     $Revision: 11678 $
+|     $Id: ecal_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | Event calendar class for gradual enhancement
 | (Some bits may be usefully transferred to common code later)
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/e_notify.php 0.7.24.src/e107_plugins/calendar_menu/e_notify.php
--- 0.7.23.src/e107_plugins/calendar_menu/e_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/e_notify.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/e_notify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/e_notify.php $
+|     $Revision: 11678 $
+|     $Id: e_notify.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/event.php 0.7.24.src/e107_plugins/calendar_menu/event.php
--- 0.7.23.src/e107_plugins/calendar_menu/event.php	2010-07-13 17:04:05.000000000 -0500
+++ 0.7.24.src/e107_plugins/calendar_menu/event.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |     jali.@e107.org
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/event.php,v $
-|     $Revision: 11598 $
-|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/event.php $
+|     $Revision: 11678 $
+|     $Id: event.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | 09.11.06 - Started next batch of mods
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/languages/English.php 0.7.24.src/e107_plugins/calendar_menu/languages/English.php
--- 0.7.23.src/e107_plugins/calendar_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ?Steve Dun.an 2001-2002
-|     http://e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |     jali.@e107.org
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | Various mods by steved:
 |	a) To reflect updates
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/next_event_menu.php 0.7.24.src/e107_plugins/calendar_menu/next_event_menu.php
--- 0.7.23.src/e107_plugins/calendar_menu/next_event_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/next_event_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/next_event_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/next_event_menu.php $
+|     $Revision: 11678 $
+|     $Id: next_event_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | 09.11.06 - Cache support added, templating/shortcode tweaks
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/plugin.php 0.7.24.src/e107_plugins/calendar_menu/plugin.php
--- 0.7.23.src/e107_plugins/calendar_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/plugin.php,v $
-|     $Revision: 11346 $ - with mods to hopefully trigger upgrade to new version
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/plugin.php $
+|     $Revision: 11678 $ - with mods to hopefully trigger upgrade to new version
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | 22.07.06 - Mods for V3.6 upgrade, including log directory
 | 02.08.06 - Support for category icon display added
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/search/search_parser.php 0.7.24.src/e107_plugins/calendar_menu/search/search_parser.php
--- 0.7.23.src/e107_plugins/calendar_menu/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/search/search_parser.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/search/search_parser.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/search/search_parser.php $
+|     $Revision: 11678 $
+|     $Id: search_parser.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }    
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/subscribe.php 0.7.24.src/e107_plugins/calendar_menu/subscribe.php
--- 0.7.23.src/e107_plugins/calendar_menu/subscribe.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/subscribe.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,18 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dun.an 2001-2002
-|     http://e107.org
-|     jali.@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/subscribe.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/subscribe.php $
+|     $Revision: 11678 $
+|     $Id: subscribe.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/calendar_menu/subs_menu.php 0.7.24.src/e107_plugins/calendar_menu/subs_menu.php
--- 0.7.23.src/e107_plugins/calendar_menu/subs_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/calendar_menu/subs_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,18 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dun.an 2001-2002
-|     http://e107.org
-|     jali.@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/subs_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/subs_menu.php $
+|     $Revision: 11678 $
+|     $Id: subs_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 | 09.07.06 - Mods by steved:
 |	General restructuring to use common routines
 | 	Support for sending emails on previous day.
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/admin_chatbox.php 0.7.24.src/e107_plugins/chatbox_menu/admin_chatbox.php
--- 0.7.23.src/e107_plugins/chatbox_menu/admin_chatbox.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/admin_chatbox.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/admin_chatbox.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/admin_chatbox.php $
+|     $Revision: 11678 $
+|     $Id: admin_chatbox.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/chatbox_menu.php 0.7.24.src/e107_plugins/chatbox_menu/chatbox_menu.php
--- 0.7.23.src/e107_plugins/chatbox_menu/chatbox_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/chatbox_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/chatbox_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/chatbox_menu.php $
+|     $Revision: 11678 $
+|     $Id: chatbox_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/chat.php 0.7.24.src/e107_plugins/chatbox_menu/chat.php
--- 0.7.23.src/e107_plugins/chatbox_menu/chat.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/chat.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/chat.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/chat.php $
+|     $Revision: 11678 $
+|     $Id: chat.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/e_notify.php 0.7.24.src/e107_plugins/chatbox_menu/e_notify.php
--- 0.7.23.src/e107_plugins/chatbox_menu/e_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/e_notify.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/e_notify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/e_notify.php $
+|     $Revision: 11678 $
+|     $Id: e_notify.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/languages/English/English_config.php 0.7.24.src/e107_plugins/chatbox_menu/languages/English/English_config.php
--- 0.7.23.src/e107_plugins/chatbox_menu/languages/English/English_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/languages/English/English_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/languages/English/English_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/languages/English/English_config.php $
+|     $Revision: 11678 $
+|     $Id: English_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |     Encoding:
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/languages/English/English.php 0.7.24.src/e107_plugins/chatbox_menu/languages/English/English.php
--- 0.7.23.src/e107_plugins/chatbox_menu/languages/English/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/languages/English/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/languages/English/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/languages/English/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php 0.7.24.src/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php
--- 0.7.23.src/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php $
+|     $Revision: 11678 $
+|     $Id: lan_chatbox_search.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/plugin.php 0.7.24.src/e107_plugins/chatbox_menu/plugin.php
--- 0.7.23.src/e107_plugins/chatbox_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/search/search_advanced.php 0.7.24.src/e107_plugins/chatbox_menu/search/search_advanced.php
--- 0.7.23.src/e107_plugins/chatbox_menu/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/search/search_advanced.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/search/search_advanced.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/search/search_advanced.php $
+|     $Revision: 11678 $
+|     $Id: search_advanced.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/chatbox_menu/search/search_parser.php 0.7.24.src/e107_plugins/chatbox_menu/search/search_parser.php
--- 0.7.23.src/e107_plugins/chatbox_menu/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/chatbox_menu/search/search_parser.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/search/search_parser.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/chatbox_menu/search/search_parser.php $
+|     $Revision: 11678 $
+|     $Id: search_parser.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/clock_menu/clock_menu.php 0.7.24.src/e107_plugins/clock_menu/clock_menu.php
--- 0.7.23.src/e107_plugins/clock_menu/clock_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/clock_menu/clock_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -16,10 +16,10 @@
 | Released under the terms and conditions of the
 | GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/clock_menu/clock_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/clock_menu/clock_menu.php $
+|     $Revision: 11678 $
+|     $Id: clock_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +---------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/clock_menu/config.php 0.7.24.src/e107_plugins/clock_menu/config.php
--- 0.7.23.src/e107_plugins/clock_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/clock_menu/config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/clock_menu/config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/clock_menu/config.php $
+|     $Revision: 11678 $
+|     $Id: config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = TRUE;
diff -x .svn -aruN 0.7.23.src/e107_plugins/clock_menu/languages/admin/English.php 0.7.24.src/e107_plugins/clock_menu/languages/admin/English.php
--- 0.7.23.src/e107_plugins/clock_menu/languages/admin/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/clock_menu/languages/admin/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/clock_menu/languages/admin/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/clock_menu/languages/admin/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/clock_menu/languages/English.php 0.7.24.src/e107_plugins/clock_menu/languages/English.php
--- 0.7.23.src/e107_plugins/clock_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/clock_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/clock_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/clock_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/comment_menu/comment_menu.php 0.7.24.src/e107_plugins/comment_menu/comment_menu.php
--- 0.7.23.src/e107_plugins/comment_menu/comment_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/comment_menu/comment_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/comment_menu/comment_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/comment_menu/comment_menu.php $
+|     $Revision: 11678 $
+|     $Id: comment_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/comment_menu/comment_menu_shortcodes.php 0.7.24.src/e107_plugins/comment_menu/comment_menu_shortcodes.php
--- 0.7.23.src/e107_plugins/comment_menu/comment_menu_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/comment_menu/comment_menu_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/comment_menu/comment_menu_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/comment_menu/comment_menu_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: comment_menu_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/comment_menu/comment_menu_template.php 0.7.24.src/e107_plugins/comment_menu/comment_menu_template.php
--- 0.7.23.src/e107_plugins/comment_menu/comment_menu_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/comment_menu/comment_menu_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/comment_menu/comment_menu_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/comment_menu/comment_menu_template.php $
+|     $Revision: 11678 $
+|     $Id: comment_menu_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/comment_menu/config.php 0.7.24.src/e107_plugins/comment_menu/config.php
--- 0.7.23.src/e107_plugins/comment_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/comment_menu/config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/comment_menu/config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/comment_menu/config.php $
+|     $Revision: 11678 $
+|     $Id: config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = TRUE;
diff -x .svn -aruN 0.7.23.src/e107_plugins/comment_menu/languages/English.php 0.7.24.src/e107_plugins/comment_menu/languages/English.php
--- 0.7.23.src/e107_plugins/comment_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/comment_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,15 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-| e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-| Steve Dunstan 2001-2002
-| http://e107.org
-| jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-| Released under the terms and conditions of the
-| GNU General Public License (http://gnu.org).
-+---------------------------------------------------------------+
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/comment_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 define("CM_L1", "No comments yet.");
@@ -26,4 +30,4 @@
 define("CM_L12", "Re:");
 define("CM_L13", "Posted by");
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_plugins/compliance_menu/languages/English.php 0.7.24.src/e107_plugins/compliance_menu/languages/English.php
--- 0.7.23.src/e107_plugins/compliance_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/compliance_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/compliance_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/compliance_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/admin_content_config.php 0.7.24.src/e107_plugins/content/admin_content_config.php
--- 0.7.23.src/e107_plugins/content/admin_content_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/admin_content_config.php	2010-08-31 14:24:44.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /admin/review.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        (C)Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/content/admin_content_config.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/admin_content_config.php $
+|     $Revision: 11729 $
+|     $Id: admin_content_config.php 11729 2010-08-31 19:25:08Z e107steved $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
 */
 
 require_once("../../class2.php");
@@ -29,9 +27,15 @@
 
 include_lan($plugindir.'languages/'.e_LANGUAGE.'/lan_content.php');
 
+require_once(e_HANDLER."calendar/calendar_class.php");
+$cal = new DHTML_Calendar(true);
+
 require_once(e_ADMIN."auth.php");
 require_once(e_HANDLER."form_handler.php");
 $rs = new form;
+
+
+
 require_once(e_HANDLER."userclass_class.php");
 require_once($plugindir."handlers/content_class.php");
 $aa = new content;
@@ -561,4 +565,11 @@
 
 require_once(e_ADMIN."footer.php");
 
+function headerjs()
+{
+	global $cal;
+	return $cal->load_files();
+}
+
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/content_manager.php 0.7.24.src/e107_plugins/content/content_manager.php
--- 0.7.23.src/e107_plugins/content/content_manager.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.24.src/e107_plugins/content/content_manager.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /admin/review.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        (C)Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/content/content_manager.php,v $
-|		$Revision: 11464 $
-|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
-|		$Author: e107steved $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/content_manager.php $
+|     $Revision: 11678 $
+|     $Id: content_manager.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/content.php 0.7.24.src/e107_plugins/content/content.php
--- 0.7.23.src/e107_plugins/content/content.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.24.src/e107_plugins/content/content.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /admin/review.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        (C)Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/content/content.php,v $
-|		$Revision: 11464 $
-|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
-|		$Author: e107steved $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/content.php $
+|     $Revision: 11678 $
+|     $Id: content.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 require_once('../../class2.php');
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/content_sql.php 0.7.24.src/e107_plugins/content/content_sql.php
--- 0.7.23.src/e107_plugins/content/content_sql.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/content_sql.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/content_sql.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/content_sql.php $
+|     $Revision: 11678 $
+|     $Id: content_sql.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 header("location:../index.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/content_submit.php 0.7.24.src/e107_plugins/content/content_submit.php
--- 0.7.23.src/e107_plugins/content/content_submit.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.24.src/e107_plugins/content/content_submit.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /admin/review.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        (C)Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/content/content_submit.php,v $
-|		$Revision: 11464 $
-|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
-|		$Author: e107steved $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/content_submit.php $
+|     $Revision: 11678 $
+|     $Id: content_submit.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/content_update_check.php 0.7.24.src/e107_plugins/content/content_update_check.php
--- 0.7.23.src/e107_plugins/content/content_update_check.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/content_update_check.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/content_update_check.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/content_update_check.php $
+|     $Revision: 11678 $
+|     $Id: content_update_check.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/content_update.php 0.7.24.src/e107_plugins/content/content_update.php
--- 0.7.23.src/e107_plugins/content/content_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/content_update.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/content_update.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/content_update.php $
+|     $Revision: 11678 $
+|     $Id: content_update.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/e_meta.php 0.7.24.src/e107_plugins/content/e_meta.php
--- 0.7.23.src/e107_plugins/content/e_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/e_meta.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/e_meta.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/e_meta.php $
+|     $Revision: 11678 $
+|     $Id: e_meta.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/e_notify.php 0.7.24.src/e107_plugins/content/e_notify.php
--- 0.7.23.src/e107_plugins/content/e_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/e_notify.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/e_notify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/e_notify.php $
+|     $Revision: 11678 $
+|     $Id: e_notify.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }   
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/handlers/content_class.php 0.7.24.src/e107_plugins/content/handlers/content_class.php
--- 0.7.23.src/e107_plugins/content/handlers/content_class.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.24.src/e107_plugins/content/handlers/content_class.php	2010-08-31 14:24:44.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /admin/review.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        (C)Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/content/handlers/content_class.php,v $
-|		$Revision: 11464 $
-|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
-|		$Author: e107steved $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/handlers/content_class.php $
+|     $Revision: 11729 $
+|     $Id: content_class.php 11729 2010-08-31 19:25:08Z e107steved $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -153,6 +151,7 @@
 			$content_pref['content_nextprev'] = "1";						//use nextprev buttons
 			$content_pref['content_nextprev_number'] = "10";				//how many items on a page
 			$content_pref['content_defaultorder'] = "orderddate";			//default sort and order method
+			$content_pref['content_allow_display_times'] = '0';				// Option to display times with start/end dates
 			//upload icon/image size handling
 			$content_pref['content_upload_image_size'] = "500";				//resize size of uploaded image
 			$content_pref['content_upload_image_size_thumb'] = "100";		//resize size of created thumb on uploaded image
@@ -452,9 +451,9 @@
 
 			//insert default preferences into core
 			if($id == "0"){
-				$num_rows = $sql -> db_Select("core", "*", "e107_name='$plugintable' ");
+				$num_rows = $sql -> db_Select("core", "*", "e107_name='{$plugintable}' ");
 				if ($num_rows == 0) {
-					$sql -> db_Insert("core", "'$plugintable', '' ");
+					$sql -> db_Insert("core", "'{$plugintable}', '' ");
 				}else{
 					$row = $sql -> db_Fetch();
 				}
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/handlers/content_convert_class.php 0.7.24.src/e107_plugins/content/handlers/content_convert_class.php
--- 0.7.23.src/e107_plugins/content/handlers/content_convert_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/handlers/content_convert_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        content_convert_class.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        (C)Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/content/handlers/content_convert_class.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/handlers/content_convert_class.php $
+|     $Revision: 11678 $
+|     $Id: content_convert_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/handlers/content_db_class.php 0.7.24.src/e107_plugins/content/handlers/content_db_class.php
--- 0.7.23.src/e107_plugins/content/handlers/content_db_class.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.24.src/e107_plugins/content/handlers/content_db_class.php	2010-08-31 14:24:44.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /admin/review.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/content/handlers/content_db_class.php,v $
-|		$Revision: 11464 $
-|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
-|		$Author: e107steved $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/handlers/content_db_class.php $
+|     $Revision: 11729 $
+|     $Id: content_db_class.php 11729 2010-08-31 19:25:08Z e107steved $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -267,32 +265,48 @@
 				}
 			}
 
-			if($_POST['update_datestamp']){
+			$zam = array("-", ":", " ");
+			if($_POST['update_datestamp'])
+			{
 				$starttime = time();
-			}else{
-				if( isset($_POST['ne_day']) && $_POST['ne_day']!='' && $_POST['ne_day']!='0' && $_POST['ne_day'] != "none" 
-				&& isset($_POST['ne_month']) && $_POST['ne_month']!='' && $_POST['ne_month']!='0' && $_POST['ne_month'] != "none" 
-				&& isset($_POST['ne_year']) && $_POST['ne_year']!='' && $_POST['ne_year']!='0' && $_POST['ne_year'] != "none" ){
-					$newstarttime = mktime( 0, 0, 0, intval($_POST['ne_month']), intval($_POST['ne_day']), intval($_POST['ne_year']));
-				}else{
+			}
+			else
+			{
+				if(isset($_POST['startdate']) && $_POST['startdate'] != "0" && $_POST['startdate'] != "")
+				{
+					$newstarttime = str_replace($zam, "*", $_POST['startdate']);
+					$newstarttime = explode("*", $newstarttime);
+					$newstarttime = mktime($newstarttime[3], $newstarttime[4], 0, $newstarttime[1], $newstarttime[2], $newstarttime[0]);
+				}
+				else
+				{
 					$newstarttime = time();
 				}
-				if(isset($_POST['content_datestamp']) && $_POST['content_datestamp'] != "" && $_POST['content_datestamp'] != "0"){
-					if($newstarttime != $starttime){
+				if(isset($_POST['content_datestamp']) && $_POST['content_datestamp'] != "" && $_POST['content_datestamp'] != "0")
+				{
+					if($newstarttime != $starttime)
+					{
 						$starttime = $newstarttime;
-					}else{
+					}
+					else
+					{
 						$starttime = intval($_POST['content_datestamp']);
 					}
-				}else{
+				}
+				else
+				{
 					$starttime = time();
 				}
 			}
 
-			if( isset($_POST['end_day']) && $_POST['end_day']!='' && $_POST['end_day']!='0' && $_POST['end_day'] != "none" 
-				&& isset($_POST['end_month']) && $_POST['end_month']!='' && $_POST['end_month']!='0' && $_POST['end_month'] != "none" 
-				&& isset($_POST['end_year']) && $_POST['end_year']!='' && $_POST['end_year']!='0' && $_POST['end_year'] != "none" ){
-				$endtime = mktime( 0, 0, 0, intval($_POST['end_month']), intval($_POST['end_day']), intval($_POST['end_year']));
-			}else{
+			if(isset($_POST['enddate']) && $_POST['enddate'] != "0" && $_POST['enddate'] != "")
+			{
+					$endtime = str_replace($zam, "*", $_POST['enddate']);
+					$endtime = explode("*", $endtime);
+					$endtime = mktime($endtime[3], $endtime[4], 0, $endtime[1], $endtime[2], $endtime[0]);
+			}
+			else
+			{
 				$endtime = "0";
 			}
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/handlers/content_form_class.php 0.7.24.src/e107_plugins/content/handlers/content_form_class.php
--- 0.7.23.src/e107_plugins/content/handlers/content_form_class.php	2010-04-13 21:44:28.000000000 -0500
+++ 0.7.24.src/e107_plugins/content/handlers/content_form_class.php	2010-08-31 14:24:44.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        /admin/review.php
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        �Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/content/handlers/content_form_class.php,v $
-|		$Revision: 11474 $
-|		$Date: 2010-04-13 21:44:52 -0500 (Tue, 13 Apr 2010) $
-|		$Author: mcfly_e107 $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/handlers/content_form_class.php $
+|     $Revision: 11729 $
+|     $Id: content_form_class.php 11729 2010-08-31 19:25:08Z e107steved $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -146,16 +144,22 @@
 		$CONTENT_CONTENT_PREVIEW_LAYOUT = ($_POST['content_layout'] ? $TRPRE.$TDPRE1.CONTENT_ADMIN_ITEM_LAN_92.$TDPOST.$TDPRE2.($_POST['content_layout'] == "none" || $_POST['content_layout'] =="content_content_template.php" ? CONTENT_ADMIN_ITEM_LAN_120 : substr($_POST['content_layout'],25 ,-4)).$TDPOST.$TRPOST : "");
 
 		//start date
-		if($_POST['ne_day'] != "none" && $_POST['ne_month'] != "none" && $_POST['ne_year'] != "none"){
-		$CONTENT_CONTENT_PREVIEW_STARTDATE = $TRPRE.$TDPRE1.CONTENT_ADMIN_DATE_LAN_15.$TDPOST.$TDPRE2.$_POST['ne_day']." ".$months[($_POST['ne_month']-1)]." ".$_POST['ne_year'].$TDPOST.$TRPOST;
-		}else{
-		$CONTENT_CONTENT_PREVIEW_STARTDATE = $TRPRE.$TDPRE1.CONTENT_ADMIN_DATE_LAN_15.$TDPOST.$TDPRE2.strftime("%d %b %Y", time()).$TDPOST.$TRPOST;
+		if(isset($_POST['startdate']) && $_POST['startdate'] != "0" && $_POST['startdate'] != "")
+		{
+			$CONTENT_CONTENT_PREVIEW_STARTDATE = $TRPRE.$TDPRE1.CONTENT_ADMIN_DATE_LAN_15.$TDPOST.$TDPRE2.$_POST['startdate'].$TDPOST.$TRPOST;
+		}
+		else
+		{
+			$CONTENT_CONTENT_PREVIEW_STARTDATE = $TRPRE.$TDPRE1.CONTENT_ADMIN_DATE_LAN_15.$TDPOST.$TDPRE2.strftime("%d %b %Y", time()).$TDPOST.$TRPOST;
 		}
 		//end date
-		if($_POST['end_day'] != "none" && $_POST['end_month'] != "none" && $_POST['end_year'] != "none"){
-		$CONTENT_CONTENT_PREVIEW_ENDDATE = $TRPRE.$TDPRE1.CONTENT_ADMIN_DATE_LAN_16.$TDPOST.$TDPRE2.$_POST['end_day']." ".$months[($_POST['end_month']-1)]." ".$_POST['end_year'].$TDPOST.$TRPOST;
-		}else{
-		$CONTENT_CONTENT_PREVIEW_ENDDATE = $TRPRE.$TDPRE1.CONTENT_ADMIN_DATE_LAN_16.$TDPOST.$TDPRE2.CONTENT_ADMIN_ITEM_LAN_118." ".CONTENT_ADMIN_DATE_LAN_16." ".CONTENT_ADMIN_ITEM_LAN_119.$TDPOST.$TRPOST;
+		if(isset($_POST['enddate']) && $_POST['enddate'] != "0" && $_POST['enddate'] != "")
+		{
+			$CONTENT_CONTENT_PREVIEW_ENDDATE = $TRPRE.$TDPRE1.CONTENT_ADMIN_DATE_LAN_16.$TDPOST.$TDPRE2.$_POST['enddate'].$TDPOST.$TRPOST;
+		}
+		else
+		{
+			$CONTENT_CONTENT_PREVIEW_ENDDATE = $TRPRE.$TDPRE1.CONTENT_ADMIN_DATE_LAN_16.$TDPOST.$TDPRE2.CONTENT_ADMIN_ITEM_LAN_118." ".CONTENT_ADMIN_DATE_LAN_16." ".CONTENT_ADMIN_ITEM_LAN_119.$TDPOST.$TRPOST;
 		}
 		$CONTENT_CONTENT_PREVIEW_CUSTOM = "";
 
@@ -228,6 +232,7 @@
 	{
 		global $qs, $sql, $ns, $rs, $aa, $fl, $tp, $plugintable, $plugindir, $pref, $eArrayStorage;
 		global $message, $stylespacer, $TOPIC_ROW_SPACER, $TOPIC_ROW, $TOPIC_ROW_NOEXPAND;
+		global $cal;
 
 		$months = array(CONTENT_ADMIN_DATE_LAN_0, CONTENT_ADMIN_DATE_LAN_1, CONTENT_ADMIN_DATE_LAN_2, CONTENT_ADMIN_DATE_LAN_3, CONTENT_ADMIN_DATE_LAN_4, CONTENT_ADMIN_DATE_LAN_5, CONTENT_ADMIN_DATE_LAN_6, CONTENT_ADMIN_DATE_LAN_7, CONTENT_ADMIN_DATE_LAN_8, CONTENT_ADMIN_DATE_LAN_9, CONTENT_ADMIN_DATE_LAN_10, CONTENT_ADMIN_DATE_LAN_11);
 
@@ -534,12 +539,10 @@
 			$authordetails[0]					= $_POST['content_author_id'];
 			$authordetails[1]					= $_POST['content_author_name'];
 			$authordetails[2]					= $_POST['content_author_email'];
-			$ne_day								= $_POST['ne_day'];
-			$ne_month							= $_POST['ne_month'];
-			$ne_year							= $_POST['ne_year'];
-			$end_day							= $_POST['end_day'];
-			$end_month							= $_POST['end_month'];
-			$end_year							= $_POST['end_year'];
+
+			$startdate = $_POST['startdate'];
+			$enddate = $_POST['enddate'];
+
 			$row['content_comment']				= $_POST['content_comment'];
 			$row['content_rate']				= $_POST['content_rate'];
 			$row['content_pe']					= $_POST['content_pe'];
@@ -641,7 +644,8 @@
 		}
 
 		//text
-		if(e_WYSIWYG){
+		if(e_WYSIWYG)
+		{
 			$row['content_text'] = $tp->replaceConstants($row['content_text'], true);
 		}
 		require_once(e_HANDLER."ren_help.php");
@@ -666,15 +670,13 @@
 			</td></tr></table>";
 		$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW_NOEXPAND);
 
-		if(isset($row['content_datestamp']) && $row['content_datestamp'] != "0" && $row['content_datestamp'] != ""){
-			$startdate	= getdate($row['content_datestamp']);
-			$ne_day		= $startdate['mday'];
-			$ne_month	= $startdate['mon'];
-			$ne_year	= $startdate['year'];
-		}else{
-			$ne_day		= (isset($ne_day) ? $ne_day : "0");
-			$ne_month	= (isset($ne_month) ? $ne_month : "0");
-			$ne_year	= (isset($ne_year) ? $ne_year : "0");
+		if(isset($row['content_datestamp']) && $row['content_datestamp'] != "0" && $row['content_datestamp'] != "")
+		{
+			$startdate = strftime("%Y-%m-%d %H:%M", $row['content_datestamp']);
+		}
+		else
+		{
+			$startdate = (isset($startdate) ? $startdate : "");
 		}
 
 		$smarray = getdate();
@@ -686,43 +688,33 @@
 			$TOPIC_TOPIC = CONTENT_ADMIN_DATE_LAN_15;
 			$TOPIC_HEADING = CONTENT_ADMIN_ITEM_LAN_73;
 			$TOPIC_HELP = CONTENT_ADMIN_DATE_LAN_17;
-			$TOPIC_FIELD = "
-				".$rs -> form_select_open("ne_day")."
-				".$rs -> form_option(CONTENT_ADMIN_DATE_LAN_12, 0, "none");
-				for($count=1; $count<=31; $count++){
-					$TOPIC_FIELD .= $rs -> form_option($count, (isset($ne_day) && $ne_day == $count ? "1" : "0"), $count);
-				}
-				$TOPIC_FIELD .= $rs -> form_select_close()."
-				".$rs -> form_select_open("ne_month")."
-				".$rs -> form_option(CONTENT_ADMIN_DATE_LAN_13, 0, "none");
-				for($count=1; $count<=12; $count++){
-					$TOPIC_FIELD .= $rs -> form_option($months[($count-1)], (isset($ne_month) && $ne_month == $count ? "1" : "0"), $count);
-				}
-				$TOPIC_FIELD .= $rs -> form_select_close()."
-				".$rs -> form_select_open("ne_year")."
-				".$rs -> form_option(CONTENT_ADMIN_DATE_LAN_14, 0, "none");
-				for($count=($current_year-5); $count<=($current_year+1); $count++){
-					$TOPIC_FIELD .= $rs -> form_option($count, (isset($ne_year) && $ne_year == $count ? "1" : "0"), $count);
-				}
-				$TOPIC_FIELD .= $rs -> form_select_close()."
-			";
+			unset($cal_options);
+			unset($cal_attrib);
+			$cal_options['firstDay'] = 1; // pierwszy dzien tygodnia -> first day of the week 
+			$cal_options['showsTime'] = varset($content_pref['content_allow_display_times'], false); //pokazac czas -> show time
+			$cal_options['showOthers'] = false;
+			$cal_options['weekNumbers'] = true;
+			$cal_options['ifFormat'] = "%Y-%m-%d %H:%M";//opcje strftime() -> option strftime()
+			$cal_attrib['class'] = "tbox";
+			$cal_attrib['name'] = 'startdate';
+			$cal_attrib['value'] = $startdate;
+			$cal_attrib['size'] = 25;
+			$TOPIC_FIELD = $cal->make_input_field($cal_options, $cal_attrib);
 			$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW);
-		}else{
-			$hidden .= $rs -> form_hidden("ne_day", $ne_day);
-			$hidden .= $rs -> form_hidden("ne_month", $ne_month);
-			$hidden .= $rs -> form_hidden("ne_year", $ne_year);
+		}
+		else
+		{
+			$hidden .= $rs -> form_hidden("startdate", $startdate);
 		}
 
 
-		if(isset($row['content_enddate']) && $row['content_enddate'] != "0" && $row['content_enddate'] != ""){
-			$enddate	= getdate($row['content_enddate']);
-			$end_day	= $enddate['mday'];
-			$end_month	= $enddate['mon'];
-			$end_year	= $enddate['year'];
-		}else{
-			$end_day	= (isset($end_day) ? $end_day : "0");
-			$end_month	= (isset($end_month) ? $end_month : "0");
-			$end_year	= (isset($end_year) ? $end_year : "0");
+		if(isset($row['content_enddate']) && $row['content_enddate'] != "0" && $row['content_enddate'] != "")
+		{
+			$enddate = strftime("%Y-%m-%d %H:%M", $row['content_datestamp']);
+		}
+		else
+		{
+			$enddate = (isset($enddate) ? $enddate : "");
 		}
 
 		if($checkenddate)
@@ -731,35 +723,28 @@
 			$TOPIC_TOPIC = CONTENT_ADMIN_DATE_LAN_16;
 			$TOPIC_HEADING = CONTENT_ADMIN_ITEM_LAN_74;
 			$TOPIC_HELP = CONTENT_ADMIN_DATE_LAN_18;
-			$TOPIC_FIELD = "
-				".$rs -> form_select_open("end_day")."
-				".$rs -> form_option(CONTENT_ADMIN_DATE_LAN_12, 0, "none");
-				for($count=1; $count<=31; $count++){
-					$TOPIC_FIELD .= $rs -> form_option($count, (isset($end_day) && $end_day == $count ? "1" : "0"), $count);
-				}
-				$TOPIC_FIELD .= $rs -> form_select_close()."
-				".$rs -> form_select_open("end_month")."
-				".$rs -> form_option(CONTENT_ADMIN_DATE_LAN_13, 0, "none");
-				for($count=1; $count<=12; $count++){
-					$TOPIC_FIELD .= $rs -> form_option($months[($count-1)], (isset($end_month) && $end_month == $count ? "1" : "0"), $count);
-				}
-				$TOPIC_FIELD .= $rs -> form_select_close()."
-				".$rs -> form_select_open("end_year")."
-				".$rs -> form_option(CONTENT_ADMIN_DATE_LAN_14, 0, "none");
-				for($count=($current_year-5); $count<=($current_year+1); $count++){
-					$TOPIC_FIELD .= $rs -> form_option($count, (isset($end_year) && $end_year == $count ? "1" : "0"), $count);
-				}
-				$TOPIC_FIELD .= $rs -> form_select_close()."
-			";
+			unset($cal_options);
+			unset($cal_attrib);
+			$cal_options['firstDay'] = 1; //pierwszy dzien tygodnia
+			$cal_options['showsTime'] = varset($content_pref['content_allow_display_times'], false); //pokazac czas
+			$cal_options['showOthers'] = false;
+			$cal_options['weekNumbers'] = true;
+			$cal_options['ifFormat'] = "%Y-%m-%d %H:%M"; //strftime
+			$cal_attrib['class'] = "tbox";
+			$cal_attrib['name'] = 'enddate';
+			$cal_attrib['value'] = $enddate;
+			$cal_attrib['size'] = 25;
+			$TOPIC_FIELD = $cal->make_input_field($cal_options, $cal_attrib);
 			$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW);
-		}else{
-			$hidden .= $rs -> form_hidden("end_day", $end_day);
-			$hidden .= $rs -> form_hidden("end_month", $end_month);
-			$hidden .= $rs -> form_hidden("end_year", $end_year);
+		}
+		else
+		{
+			$hidden .= $rs -> form_hidden("enddate", $enddate);
 		}
 
 		//$text .= $TOPIC_ROW_SPACER;
-		if( $checkicon || $checkattach || $checkimages ){
+		if( $checkicon || $checkattach || $checkimages )
+		{
 			//$text .= $TOPIC_ROW_SPACER;
 
 			//upload icon
@@ -2981,6 +2966,14 @@
 			";
 			$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW_NOEXPAND);
 
+			//content_allow_display_times
+			$TOPIC_TOPIC = CONTENT_ADMIN_OPT_LAN_178;
+			$TOPIC_FIELD = "
+			".$rs -> form_radio("content_allow_display_times", "1", ($content_pref['content_allow_display_times'] ? "1" : "0"), "", "").CONTENT_ADMIN_OPT_LAN_SECTION_30."
+			".$rs -> form_radio("content_allow_display_times", "0", ($content_pref['content_allow_display_times'] ? "0" : "1"), "", "").CONTENT_ADMIN_OPT_LAN_SECTION_31."
+			";
+			$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW_NOEXPAND);
+
 			//content_upload_image_size_
 			$TOPIC_TOPIC = CONTENT_ADMIN_OPT_LAN_52;
 			$TOPIC_HEADING = CONTENT_ADMIN_OPT_LAN_53;
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/languages/English/lan_content_admin.php 0.7.24.src/e107_plugins/content/languages/English/lan_content_admin.php
--- 0.7.23.src/e107_plugins/content/languages/English/lan_content_admin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/languages/English/lan_content_admin.php	2010-08-31 14:24:44.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content_admin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/languages/English/lan_content_admin.php $
+|     $Revision: 11729 $
+|     $Id: lan_content_admin.php 11729 2010-08-31 19:25:08Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -635,7 +635,7 @@
 define("CONTENT_ADMIN_OPT_LAN_103", "link : recent items");
 define("CONTENT_ADMIN_OPT_LAN_104", "link : submit item");
 define("CONTENT_ADMIN_OPT_LAN_105", "icon : links");
-define("CONTENT_ADMIN_OPT_LAN_106", "none (), bullet (), middot (&middot;), white bullet (), arrow (&raquo;), category_icon()");
+define("CONTENT_ADMIN_OPT_LAN_106", "none (), bullet (), middot (&middot;), white bullet (�), arrow (&raquo;), category_icon()");
 define("CONTENT_ADMIN_OPT_LAN_107", "none");
 define("CONTENT_ADMIN_OPT_LAN_108", "bullet");
 define("CONTENT_ADMIN_OPT_LAN_109", "middot");
@@ -704,4 +704,9 @@
 define("CONTENT_ADMIN_OPT_LAN_172", "numeric value to show that amount of levels of subcategories of the category tree. leave blank to show all levels.");
 define("CONTENT_ADMIN_OPT_LAN_173", "include 'home' in the breadcrumb");
 define("CONTENT_ADMIN_OPT_LAN_174", "include the content start page in the breadcrumb");
+
+// Gap for compatibility with 0.8
+
+define('CONTENT_ADMIN_OPT_LAN_178', 'Start times for items');
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/languages/English/lan_content_frontpage.php 0.7.24.src/e107_plugins/content/languages/English/lan_content_frontpage.php
--- 0.7.23.src/e107_plugins/content/languages/English/lan_content_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/languages/English/lan_content_frontpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content_frontpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/languages/English/lan_content_frontpage.php $
+|     $Revision: 11678 $
+|     $Id: lan_content_frontpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/languages/English/lan_content_help.php 0.7.24.src/e107_plugins/content/languages/English/lan_content_help.php
--- 0.7.23.src/e107_plugins/content/languages/English/lan_content_help.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/languages/English/lan_content_help.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content_help.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/languages/English/lan_content_help.php $
+|     $Revision: 11678 $
+|     $Id: lan_content_help.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/languages/English/lan_content.php 0.7.24.src/e107_plugins/content/languages/English/lan_content.php
--- 0.7.23.src/e107_plugins/content/languages/English/lan_content.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/languages/English/lan_content.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/languages/English/lan_content.php $
+|     $Revision: 11678 $
+|     $Id: lan_content.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/languages/English/lan_content_search.php 0.7.24.src/e107_plugins/content/languages/English/lan_content_search.php
--- 0.7.23.src/e107_plugins/content/languages/English/lan_content_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/languages/English/lan_content_search.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content_search.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/languages/English/lan_content_search.php $
+|     $Revision: 11678 $
+|     $Id: lan_content_search.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/plugin.php 0.7.24.src/e107_plugins/content/plugin.php
--- 0.7.23.src/e107_plugins/content/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,16 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|        e107 website system
-|        code adapted from original by Lolo Irie (lolo_irie@e107coders.org)
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|        Steve Dunstan 2001-2002
-|        http://e107.org
-|        jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|        Released under the terms and conditions of the
-|        GNU General Public License (http://gnu.org).
-+---------------------------------------------------------------+
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/search/search_advanced.php 0.7.24.src/e107_plugins/content/search/search_advanced.php
--- 0.7.23.src/e107_plugins/content/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/search/search_advanced.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/search/search_advanced.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/search/search_advanced.php $
+|     $Revision: 11678 $
+|     $Id: search_advanced.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/search/search_parser.php 0.7.24.src/e107_plugins/content/search/search_parser.php
--- 0.7.23.src/e107_plugins/content/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/search/search_parser.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/search/search_parser.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/search/search_parser.php $
+|     $Revision: 11678 $
+|     $Id: search_parser.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/content_manager_template.php 0.7.24.src/e107_plugins/content/templates/content_manager_template.php
--- 0.7.23.src/e107_plugins/content/templates/content_manager_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/content_manager_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/content_manager_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/content_manager_template.php $
+|     $Revision: 11678 $
+|     $Id: content_manager_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 global $sc_style, $content_shortcodes;
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/content_submit_type_template.php 0.7.24.src/e107_plugins/content/templates/content_submit_type_template.php
--- 0.7.23.src/e107_plugins/content/templates/content_submit_type_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/content_submit_type_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/content_submit_type_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/content_submit_type_template.php $
+|     $Revision: 11678 $
+|     $Id: content_submit_type_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 global $sc_style, $content_shortcodes;
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/content_type_template.php 0.7.24.src/e107_plugins/content/templates/content_type_template.php
--- 0.7.23.src/e107_plugins/content/templates/content_type_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/content_type_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/content_type_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/content_type_template.php $
+|     $Revision: 11678 $
+|     $Id: content_type_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_archive_template.php 0.7.24.src/e107_plugins/content/templates/default/content_archive_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_archive_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_archive_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_archive_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_archive_template.php $
+|     $Revision: 11678 $
+|     $Id: content_archive_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_author_template.php 0.7.24.src/e107_plugins/content/templates/default/content_author_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_author_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_author_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_author_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_author_template.php $
+|     $Revision: 11678 $
+|     $Id: content_author_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 global $sc_style, $content_shortcodes;
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_cat_template.php 0.7.24.src/e107_plugins/content/templates/default/content_cat_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_cat_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_cat_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_cat_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_cat_template.php $
+|     $Revision: 11678 $
+|     $Id: content_cat_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_content_template_bigtext.php 0.7.24.src/e107_plugins/content/templates/default/content_content_template_bigtext.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_content_template_bigtext.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_content_template_bigtext.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_content_template_bigtext.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_content_template_bigtext.php $
+|     $Revision: 11678 $
+|     $Id: content_content_template_bigtext.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_content_template_blackonwhite.php 0.7.24.src/e107_plugins/content/templates/default/content_content_template_blackonwhite.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_content_template_blackonwhite.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_content_template_blackonwhite.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_content_template_blackonwhite.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_content_template_blackonwhite.php $
+|     $Revision: 11678 $
+|     $Id: content_content_template_blackonwhite.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_content_template.php 0.7.24.src/e107_plugins/content/templates/default/content_content_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_content_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_content_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_content_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_content_template.php $
+|     $Revision: 11678 $
+|     $Id: content_content_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_content_template_whiteonblack.php 0.7.24.src/e107_plugins/content/templates/default/content_content_template_whiteonblack.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_content_template_whiteonblack.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_content_template_whiteonblack.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_content_template_whiteonblack.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_content_template_whiteonblack.php $
+|     $Revision: 11678 $
+|     $Id: content_content_template_whiteonblack.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_np_template.php 0.7.24.src/e107_plugins/content/templates/default/content_np_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_np_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_np_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_np_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_np_template.php $
+|     $Revision: 11678 $
+|     $Id: content_np_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_recent_template.php 0.7.24.src/e107_plugins/content/templates/default/content_recent_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_recent_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_recent_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_recent_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_recent_template.php $
+|     $Revision: 11678 $
+|     $Id: content_recent_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_score_template.php 0.7.24.src/e107_plugins/content/templates/default/content_score_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_score_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_score_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_score_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_score_template.php $
+|     $Revision: 11678 $
+|     $Id: content_score_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_searchresult_template.php 0.7.24.src/e107_plugins/content/templates/default/content_searchresult_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_searchresult_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_searchresult_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_searchresult_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_searchresult_template.php $
+|     $Revision: 11678 $
+|     $Id: content_searchresult_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_search_template.php 0.7.24.src/e107_plugins/content/templates/default/content_search_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_search_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_search_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_search_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_search_template.php $
+|     $Revision: 11678 $
+|     $Id: content_search_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 global $sc_style, $content_shortcodes;
diff -x .svn -aruN 0.7.23.src/e107_plugins/content/templates/default/content_top_template.php 0.7.24.src/e107_plugins/content/templates/default/content_top_template.php
--- 0.7.23.src/e107_plugins/content/templates/default/content_top_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/content/templates/default/content_top_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_top_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/content/templates/default/content_top_template.php $
+|     $Revision: 11678 $
+|     $Id: content_top_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/counter_menu/counter_menu.php 0.7.24.src/e107_plugins/counter_menu/counter_menu.php
--- 0.7.23.src/e107_plugins/counter_menu/counter_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/counter_menu/counter_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/counter_menu/counter_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/counter_menu/counter_menu.php $
+|     $Revision: 11678 $
+|     $Id: counter_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/counter_menu/languages/English.php 0.7.24.src/e107_plugins/counter_menu/languages/English.php
--- 0.7.23.src/e107_plugins/counter_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/counter_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/counter_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/counter_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/featurebox/admin_config.php 0.7.24.src/e107_plugins/featurebox/admin_config.php
--- 0.7.23.src/e107_plugins/featurebox/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/featurebox/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/featurebox/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/featurebox/featurebox.php 0.7.24.src/e107_plugins/featurebox/featurebox.php
--- 0.7.23.src/e107_plugins/featurebox/featurebox.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/featurebox/featurebox.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/featurebox.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/featurebox/featurebox.php $
+|     $Revision: 11678 $
+|     $Id: featurebox.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/featurebox/languages/English.php 0.7.24.src/e107_plugins/featurebox/languages/English.php
--- 0.7.23.src/e107_plugins/featurebox/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/featurebox/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/featurebox/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/featurebox/plugin.php 0.7.24.src/e107_plugins/featurebox/plugin.php
--- 0.7.23.src/e107_plugins/featurebox/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/featurebox/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/featurebox/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/featurebox/templates/centered.php 0.7.24.src/e107_plugins/featurebox/templates/centered.php
--- 0.7.23.src/e107_plugins/featurebox/templates/centered.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/featurebox/templates/centered.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/templates/centered.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/featurebox/templates/centered.php $
+|     $Revision: 11678 $
+|     $Id: centered.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/featurebox/templates/default.php 0.7.24.src/e107_plugins/featurebox/templates/default.php
--- 0.7.23.src/e107_plugins/featurebox/templates/default.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/featurebox/templates/default.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/templates/default.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/featurebox/templates/default.php $
+|     $Revision: 11678 $
+|     $Id: default.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/e_linkgen.php 0.7.24.src/e107_plugins/forum/e_linkgen.php
--- 0.7.23.src/e107_plugins/forum/e_linkgen.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/e_linkgen.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/e_linkgen.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/e_linkgen.php $
+|     $Revision: 11678 $
+|     $Id: e_linkgen.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/e_notify.php 0.7.24.src/e107_plugins/forum/e_notify.php
--- 0.7.23.src/e107_plugins/forum/e_notify.php	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/e_notify.php	2010-09-04 13:12:13.000000000 -0500
@@ -0,0 +1,91 @@
+<?php
+/*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Steve Dunstan 2001-2002
+|     http://e107.org
+|     jalist@e107.org
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $Source: ... $
+|     $Revision: 1.1 $
+|     $Date: 2010-08-25 23:00:14 -0500 (Thu, 25 Aug 2010) $
+|     $Author: Nowwhat $
++----------------------------------------------------------------------------+
+*/
+
+if (!defined('e107_INIT')) { exit; }
+
+if(defined('ADMIN_PAGE') && ADMIN_PAGE === true)
+{
+	include_lan(e_PLUGIN."forum/languages/".e_LANGUAGE."/lan_forum_notify.php");
+	$config_category = NT_LAN_FT_1;
+	$config_events = array(
+		'forumthreadcreate'	=> NT_LAN_FO_1,
+		'forumpostcreate' 	=> NT_LAN_MP_1,
+		'forumthreaddelete'	=> NT_LAN_FD_1,
+		'forumpostdelete'		=> NT_LAN_FP_1,
+		'forumthreadmove'		=> NT_LAN_FM_1);
+}
+
+if (!function_exists('notify_forumthreadcreate')) {
+	function notify_forumthreadcreate($data) {
+		global $nt;
+		include_lan(e_PLUGIN."forum/languages/".e_LANGUAGE."/lan_forum_notify.php");
+		$message = NT_LAN_FO_3.': '.USERNAME.' ('.NT_LAN_FO_4.': '.$data['forum_name'].' )<br />';
+		$message .= NT_LAN_FO_5.': '.$data['subject'].'<br /><br />';
+		$message .= NT_LAN_FO_6.':<br />'.$data['post'].'<br /><br />';
+		$nt -> send('forumthreadcreate', NT_LAN_FO_7, $message);
+	}
+}
+
+if (!function_exists('notify_forumpostcreate')) {
+	function notify_forumpostcreate($data) {
+		global $nt;
+		include_lan(e_PLUGIN."forum/languages/".e_LANGUAGE."/lan_forum_notify.php");
+		$message = NT_LAN_MP_3.': '.USERNAME.' ('.NT_LAN_MP_4.': '.$data['forum_name'].' )<br />';
+		$message .= NT_LAN_MP_6.':<br />'.$data['post'].'<br /><br />';
+		$nt -> send('forumpostcreate', NT_LAN_MP_7, $message);
+	}
+}
+
+if (!function_exists('notify_forumthreaddelete')) {
+	function notify_forumthreaddelete($data) {
+		global $nt;
+		include_lan(e_PLUGIN."forum/languages/".e_LANGUAGE."/lan_forum_notify.php");
+		$message = NT_LAN_FD_3.': '.$data['poster'].' ('.NT_LAN_FD_4.': '.$data['forum_name'].' )<br />';
+		$message .= NT_LAN_FD_5.': '.$data['subject'].'<br /><br />';
+		$message .= NT_LAN_FD_8.': '.$data['deleter'].'<br /><br />';
+		$message .= NT_LAN_FD_6.':<br />'.$data['post'].'<br /><br />';
+		$nt -> send('forumthreaddelete', NT_LAN_FD_7, $message);
+	}
+}
+
+if (!function_exists('notify_forumpostdelete')) {
+	function notify_forumpostdelete($data) {
+		global $nt;
+		include_lan(e_PLUGIN."forum/languages/".e_LANGUAGE."/lan_forum_notify.php");
+		$message = NT_LAN_FP_3.': '.$data['poster'].' ('.NT_LAN_FP_4.': '.$data['forum_name'].' )<br />';
+		$message .= NT_LAN_FP_8.': '.$data['deleter'].'<br /><br />';
+		$message .= NT_LAN_FP_6.':<br />'.$data['post'].'<br /><br />';
+		$nt -> send('forumpostdelete', NT_LAN_FP_7, $message);
+	}
+}
+
+if (!function_exists('notify_forumthreadmove')) {
+	function notify_forumthreadmove($data) {
+		global $nt;
+		include_lan(e_PLUGIN."forum/languages/".e_LANGUAGE."/lan_forum_notify.php");
+		$message = NT_LAN_FM_3.': '.$data['poster'].'<br />';
+		$message .= NT_LAN_FM_4.': '.$data['old_thread_name'].'<br />';
+		$message .= NT_LAN_FM_5.': '.$data['new_thread_name'].'<br />';
+		$message .= NT_LAN_FM_6.': '.$data['old_forum'].'<br />';		
+		$message .= NT_LAN_FM_7.': '.$data['new_forum'].'<br />';		
+		$message .= NT_LAN_FM_9.': '.$data['mover'].'<br /><br />';
+		$nt -> send('forumthreadmove', NT_LAN_FM_8, $message);
+	}
+}
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_admin.php 0.7.24.src/e107_plugins/forum/forum_admin.php
--- 0.7.23.src/e107_plugins/forum/forum_admin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/forum_admin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_admin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_admin.php $
+|     $Revision: 11678 $
+|     $Id: forum_admin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = true;
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_conf.php 0.7.24.src/e107_plugins/forum/forum_conf.php
--- 0.7.23.src/e107_plugins/forum/forum_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/forum_conf.php	2010-09-04 03:32:18.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-| e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-| Steve Dunstan 2001-2002
-| http://e107.org
-| jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-| Released under the terms and conditions of the
-| GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-| $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_conf.php,v $
-| $Revision: 11346 $
-| $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-| $Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_conf.php $
+|     $Revision: 11741 $
+|     $Id: forum_conf.php 11741 2010-09-04 08:32:42Z e107steved $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
 include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_conf.php');
@@ -66,7 +65,7 @@
 	$forum = new e107forum;
 	$new_forum = intval($_POST['forum_move']);
 	$replies = $sql->db_Select("forum_t", "*", "thread_parent='$thread_id' ");
-	$sql->db_Select("forum_t", "thread_name, thread_forum_id", "thread_id ='".$thread_id."' ");
+	$sql->db_Select("forum_t", "thread_name, thread_user, thread_forum_id", "thread_id ='".$thread_id."' ");
 	$row = $sql->db_Fetch();
 	$old_forum = $row['thread_forum_id'];
 	$new_thread_name = $row['thread_name'];
@@ -89,6 +88,21 @@
 
 	$forum->update_lastpost('forum', $old_forum, FALSE);
 	$forum->update_lastpost('forum', $new_forum, FALSE);
+	
+	// fire event 'forumthreadmove'
+	$tmp = explode(".", $row['thread_user']);
+	$sql->db_Select("forum", "forum_name", "forum_id='$old_forum' ");
+	$forum_old_row = 	$sql->db_Fetch();
+	$sql->db_Select("forum", "forum_name", "forum_id='$new_forum' ");
+	$forum_new_row = 	$sql->db_Fetch();
+	$edata_fo = array(
+		"old_thread_name"	=> $row['thread_name'],
+		"new_thread_name"	=> $new_thread_name,
+		"old_forum"				=> $forum_old_row['forum_name'],
+		"new_forum"				=> $forum_new_row['forum_name'],
+		"poster"			=> (intval($tmp[0]) ? $tmp[1] : "Anonymous"),
+		"mover"			=> USERNAME);
+	$e_event -> trigger("forumthreadmove", $edata_fo);
 	 
 	$message = FORLAN_9;
 	$url = e_PLUGIN."forum/forum_viewforum.php?".$new_forum;
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_mod.php 0.7.24.src/e107_plugins/forum/forum_mod.php
--- 0.7.23.src/e107_plugins/forum/forum_mod.php	2010-04-25 15:17:27.000000000 -0500
+++ 0.7.24.src/e107_plugins/forum/forum_mod.php	2010-09-04 03:32:18.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_mod.php,v $
-|     $Revision: 11499 $
-|     $Date: 2010-04-25 15:17:51 -0500 (Sun, 25 Apr 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_mod.php $
+|     $Revision: 11741 $
+|     $Id: forum_mod.php 11741 2010-09-04 08:32:42Z e107steved $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -62,12 +62,12 @@
 
 function forum_delete_thread($thread_id)
 {
-	global $sql;
+	global $sql, $e_event;
 	$thread_id = (int)$thread_id;
 	require_once(e_PLUGIN.'forum/forum_class.php');
 	$f = new e107forum;
 	$qry = "
-	SELECT t.thread_forum_id, t.thread_parent, t.thread_user, f.forum_sub
+	SELECT t.thread_forum_id, t.thread_parent, t.thread_user, t.thread_thread, t.thread_name, f.forum_sub, f.forum_name
 	FROM #forum_t AS t
 	LEFT JOIN #forum AS f ON t.thread_forum_id = f.forum_id
 	WHERE t.thread_id = ".$thread_id;
@@ -95,6 +95,15 @@
 			// update lastpost info
 			$f->update_lastpost('thread', $row['thread_parent']);
 			$f->update_lastpost('forum', $row['thread_forum_id']);
+			
+			// fire event 'forumpostdelete'
+			$edata_fo = array(
+				"post"				=> $row['thread_thread'],
+				"poster"			=> (intval($tmp[0]) ? $tmp[1] : "Anonymous"),
+				"forum_name"	=> $row['forum_name'],
+				"deleter"			=> USERNAME);
+			$e_event -> trigger("forumpostdelete", $edata_fo);
+			
 			$ret = FORLAN_154;
 		}
 		else
@@ -113,6 +122,17 @@
 
 			// update lastpost info
 			$f->update_lastpost('forum', $row['thread_forum_id']);
+			
+			// fire event 'forumthreaddelete'
+			$tmp = explode(".", $row['thread_user']);
+			$edata_fo = array(
+				"subject"			=> $row['thread_name'],
+				"post"				=> $row['thread_thread'],
+				"poster"			=> (intval($tmp[0]) ? $tmp[1] : "Anonymous"),
+				"forum_name"	=> $row['forum_name'],
+				"deleter"			=> USERNAME);
+			$e_event -> trigger("forumthreaddelete", $edata_fo);
+
 			$ret = FORLAN_6.($count ? ", ".$count." ".FORLAN_7."." : ".");
 		}
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum.php 0.7.24.src/e107_plugins/forum/forum.php
--- 0.7.23.src/e107_plugins/forum/forum.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/forum.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ?Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum.php $
+|     $Revision: 11678 $
+|     $Id: forum.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if(!defined("e107_INIT")) {
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_post.php 0.7.24.src/e107_plugins/forum/forum_post.php
--- 0.7.23.src/e107_plugins/forum/forum_post.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_plugins/forum/forum_post.php	2010-09-04 03:32:18.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_post.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_post.php $
+|     $Revision: 11741 $
+|     $Id: forum_post.php 11741 2010-09-04 08:32:42Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -87,7 +87,7 @@
 require_once(e_HANDLER."ren_help.php");
 $gen = new convert;
 $fp = new floodprotect;
-global $tp;
+global $tp, $e_event;
 
 if ($sql->db_Select("tmp", "*", "tmp_ip='$ip' ")) {
 	$row = $sql->db_Fetch();
@@ -283,6 +283,21 @@
 		}
 
 		$iid = $forum->thread_insert($subject, $post, $forum_id, $parent, $poster, $email_notify, $threadtype, $forum_info['forum_sub']);
+
+		//fire event forumthreadcreate
+		if (isset($_POST['newthread']))
+		{
+			$edata_fo = array("subject" => $subject, "post" => $post, "poster" => $poster, "forum_name" => $forum_info['forum_name']);
+			$e_event -> trigger("forumthreadcreate", $edata_fo);
+		}
+		
+		// fire event 'forumpostcreate
+		if (isset($_POST['reply']))
+		{
+			$edata_fo = array("post" => $post, "poster" => $poster, "forum_name" => $forum_info['forum_name']);
+			$e_event -> trigger("forumpostcreate", $edata_fo);
+		}		
+		
 		if($iid === -1)
 		{
 			require_once(HEADERF);
@@ -291,6 +306,7 @@
 			exit;
 		}
 		if (isset($_POST['reply'])) {
+			$reply = $iid;
 			$iid = $parent;
 		}
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_stats.php 0.7.24.src/e107_plugins/forum/forum_stats.php
--- 0.7.23.src/e107_plugins/forum/forum_stats.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/forum_stats.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_stats.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_stats.php $
+|     $Revision: 11678 $
+|     $Id: forum_stats.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_update_check.php 0.7.24.src/e107_plugins/forum/forum_update_check.php
--- 0.7.23.src/e107_plugins/forum/forum_update_check.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/forum_update_check.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_update_check.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_update_check.php $
+|     $Revision: 11678 $
+|     $Id: forum_update_check.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_update.php 0.7.24.src/e107_plugins/forum/forum_update.php
--- 0.7.23.src/e107_plugins/forum/forum_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/forum_update.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_update.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_update.php $
+|     $Revision: 11678 $
+|     $Id: forum_update.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_uploads.php 0.7.24.src/e107_plugins/forum/forum_uploads.php
--- 0.7.23.src/e107_plugins/forum/forum_uploads.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/e107_plugins/forum/forum_uploads.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_uploads.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_uploads.php $
+|     $Revision: 11678 $
+|     $Id: forum_uploads.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_viewforum.php 0.7.24.src/e107_plugins/forum/forum_viewforum.php
--- 0.7.23.src/e107_plugins/forum/forum_viewforum.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/forum_viewforum.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_viewforum.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_viewforum.php $
+|     $Revision: 11678 $
+|     $Id: forum_viewforum.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/forum_viewtopic.php 0.7.24.src/e107_plugins/forum/forum_viewtopic.php
--- 0.7.23.src/e107_plugins/forum/forum_viewtopic.php	2010-07-11 08:35:40.000000000 -0500
+++ 0.7.24.src/e107_plugins/forum/forum_viewtopic.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,14 +4,14 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
 |     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_viewtopic.php $
-|     $Id: forum_viewtopic.php 11597 2010-07-11 13:36:04Z e107steved $
+|     $Id: forum_viewtopic.php 11678 2010-08-22 00:43:45Z e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/index.php 0.7.24.src/e107_plugins/forum/index.php
--- 0.7.23.src/e107_plugins/forum/index.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/index.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/index.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/index.php $
+|     $Revision: 11678 $
+|     $Id: index.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_admin.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_admin.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_admin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_admin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_admin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_admin.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_admin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("FORLAN_1", "You must enter the number of days you wish to prune.");
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_conf.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_conf.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_conf.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_conf.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_conf.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_conf.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("FORLAN_5", "Poll deleted.");
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_frontpage.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_frontpage.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_frontpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_frontpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_frontpage.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_frontpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_notify.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_notify.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_notify.php	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_notify.php	2010-09-04 03:32:18.000000000 -0500
@@ -0,0 +1,66 @@
+<?php
+/*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_post.php $
+|     $Revision: 11678 $
+|     $Id: forum_post.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
+*/
+
+
+// Forum Notify Types 
+define('NT_LAN_FT_1', 'Forum Events');
+define('NT_LAN_FO_1', 'Forum thread posted');
+define('NT_LAN_MP_1', 'Forum message posted');
+define('NT_LAN_FD_1', 'Forum thread deleted');
+define('NT_LAN_FP_1', 'Forum message deleted');
+define('NT_LAN_FM_1', 'Forum thread moved');
+
+// Forum thread posted
+define('NT_LAN_FO_3', 'Forum thread created by');
+define('NT_LAN_FO_4', 'Forum name');
+define('NT_LAN_FO_5', 'Subject');
+define('NT_LAN_FO_6', 'Message');
+define('NT_LAN_FO_7', 'New forum thread created');
+
+// Forum message posted
+define('NT_LAN_MP_3', 'Forum message created by');
+define('NT_LAN_MP_4', 'Forum name');
+define('NT_LAN_MP_6', 'Message');
+define('NT_LAN_MP_7', 'New forum message created');
+
+// Forum thread deleted
+define('NT_LAN_FD_3', 'Forum thread created by');
+define('NT_LAN_FD_4', 'Forum name');
+define('NT_LAN_FD_5', 'Subject');
+define('NT_LAN_FD_6', 'Message');
+define('NT_LAN_FD_7', 'Forum thread is deleted');
+define('NT_LAN_FD_8', 'Forum thread deleted by');
+
+// Forum message deleted
+define('NT_LAN_FP_3', 'Forum message created by');
+define('NT_LAN_FP_4', 'Forum name');
+define('NT_LAN_FP_6', 'Message');
+define('NT_LAN_FP_7', 'Forum message is deleted');
+define('NT_LAN_FP_8', 'Forum message deleted by');
+
+// Forum thread moved
+define('NT_LAN_FM_3', 'Forum thread created by');
+define('NT_LAN_FM_4', 'Old subject');
+define('NT_LAN_FM_5', 'New subject');
+define('NT_LAN_FM_6', 'Old (source) forum name');
+define('NT_LAN_FM_7', 'New (destination) forum name');
+define('NT_LAN_FM_8', 'Forum thread is moved');
+define('NT_LAN_FM_9', 'Forum thread is moved by');
+
+?>
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("e_PAGETITLE", "Forum");
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_post.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_post.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_post.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_post.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_post.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_post.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_post.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Forum");
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_search.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_search.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_search.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_search.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_search.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_search.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_stats.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_stats.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_stats.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_stats.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_stats.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_stats.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_stats.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("e_PAGETITLE", "Forum Statistics");
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_uploads.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_uploads.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_uploads.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_uploads.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_uploads.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_uploads.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_uploads.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Forum Uploads");
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_viewforum.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_viewforum.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_viewforum.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_viewforum.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_viewforum.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_viewforum.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_viewforum.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Forum");
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_viewtopic.php 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_viewtopic.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_viewtopic.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_forum_viewtopic.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_viewtopic.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_forum_viewtopic.php $
+|     $Revision: 11678 $
+|     $Id: lan_forum_viewtopic.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Forum");
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/languages/English/lan_newforumposts_menu.php 0.7.24.src/e107_plugins/forum/languages/English/lan_newforumposts_menu.php
--- 0.7.23.src/e107_plugins/forum/languages/English/lan_newforumposts_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/languages/English/lan_newforumposts_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_newforumposts_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/languages/English/lan_newforumposts_menu.php $
+|     $Revision: 11678 $
+|     $Id: lan_newforumposts_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/newforumposts_menu_config.php 0.7.24.src/e107_plugins/forum/newforumposts_menu_config.php
--- 0.7.23.src/e107_plugins/forum/newforumposts_menu_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/newforumposts_menu_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/newforumposts_menu_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/newforumposts_menu_config.php $
+|     $Revision: 11678 $
+|     $Id: newforumposts_menu_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = TRUE;
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/newforumposts_menu.php 0.7.24.src/e107_plugins/forum/newforumposts_menu.php
--- 0.7.23.src/e107_plugins/forum/newforumposts_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/newforumposts_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/newforumposts_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/newforumposts_menu.php $
+|     $Revision: 11678 $
+|     $Id: newforumposts_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/plugin.php 0.7.24.src/e107_plugins/forum/plugin.php
--- 0.7.23.src/e107_plugins/forum/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/search/search_advanced.php 0.7.24.src/e107_plugins/forum/search/search_advanced.php
--- 0.7.23.src/e107_plugins/forum/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/search/search_advanced.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/search/search_advanced.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/search/search_advanced.php $
+|     $Revision: 11678 $
+|     $Id: search_advanced.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/search/search_parser.php 0.7.24.src/e107_plugins/forum/search/search_parser.php
--- 0.7.23.src/e107_plugins/forum/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/search/search_parser.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/search/search_parser.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/search/search_parser.php $
+|     $Revision: 11678 $
+|     $Id: search_parser.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/templates/forum_icons_template.php 0.7.24.src/e107_plugins/forum/templates/forum_icons_template.php
--- 0.7.23.src/e107_plugins/forum/templates/forum_icons_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/templates/forum_icons_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_icons_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/templates/forum_icons_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_icons_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/templates/forum_posted_template.php 0.7.24.src/e107_plugins/forum/templates/forum_posted_template.php
--- 0.7.23.src/e107_plugins/forum/templates/forum_posted_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/templates/forum_posted_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/templates/forum_post_template.php 0.7.24.src/e107_plugins/forum/templates/forum_post_template.php
--- 0.7.23.src/e107_plugins/forum/templates/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/templates/forum_post_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_post_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/templates/forum_post_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_post_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/templates/forum_preview_template.php 0.7.24.src/e107_plugins/forum/templates/forum_preview_template.php
--- 0.7.23.src/e107_plugins/forum/templates/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/templates/forum_preview_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_preview_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/templates/forum_preview_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_preview_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/templates/forum_template.php 0.7.24.src/e107_plugins/forum/templates/forum_template.php
--- 0.7.23.src/e107_plugins/forum/templates/forum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/templates/forum_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/templates/forum_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/templates/forum_viewforum_template.php 0.7.24.src/e107_plugins/forum/templates/forum_viewforum_template.php
--- 0.7.23.src/e107_plugins/forum/templates/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/templates/forum_viewforum_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_viewforum_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/templates/forum_viewforum_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_viewforum_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/forum/templates/forum_viewtopic_template.php 0.7.24.src/e107_plugins/forum/templates/forum_viewtopic_template.php
--- 0.7.23.src/e107_plugins/forum/templates/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/forum/templates/forum_viewtopic_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_viewtopic_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/templates/forum_viewtopic_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_viewtopic_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/gsitemap/admin_config.php 0.7.24.src/e107_plugins/gsitemap/admin_config.php
--- 0.7.23.src/e107_plugins/gsitemap/admin_config.php	2010-07-23 19:24:47.000000000 -0500
+++ 0.7.24.src/e107_plugins/gsitemap/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/gsitemap/admin_config.php,v $
-|     $Revision: 11620 $
-|     $Date: 2010-07-23 19:25:11 -0500 (Fri, 23 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/gsitemap/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/gsitemap/languages/gsitemap_English.php 0.7.24.src/e107_plugins/gsitemap/languages/gsitemap_English.php
--- 0.7.23.src/e107_plugins/gsitemap/languages/gsitemap_English.php	2010-07-23 19:24:47.000000000 -0500
+++ 0.7.24.src/e107_plugins/gsitemap/languages/gsitemap_English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/gsitemap/languages/gsitemap_English.php,v $
-|     $Revision: 11620 $
-|     $Date: 2010-07-23 19:25:11 -0500 (Fri, 23 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/gsitemap/languages/gsitemap_English.php $
+|     $Revision: 11678 $
+|     $Id: gsitemap_English.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/gsitemap/plugin.php 0.7.24.src/e107_plugins/gsitemap/plugin.php
--- 0.7.23.src/e107_plugins/gsitemap/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/gsitemap/plugin.php	2010-08-21 19:31:34.000000000 -0500
@@ -1,19 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|       e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|       Steve Dunstan 2001-2002
-|       http://e107.org
-|       jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|       Released under the terms and conditions of the
-|       GNU General Public License (http://gnu.org).
-|     	$Source: /cvs_backup/e107_0.7/e107_plugins/gsitemap/plugin.php,v $
-|     	$Revision: 11346 $
-|     	$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     	$Author: secretr $
-+---------------------------------------------------------------+
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/gsitemap/plugin.php $
+|     $Revision: 11677 $
+|     $Id: plugin.php 11677 2010-08-22 00:31:58Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/integrity_check/languages/English.php 0.7.24.src/e107_plugins/integrity_check/languages/English.php
--- 0.7.23.src/e107_plugins/integrity_check/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/integrity_check/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/integrity_check/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/integrity_check/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/integrity_check/plugin.php 0.7.24.src/e107_plugins/integrity_check/plugin.php
--- 0.7.23.src/e107_plugins/integrity_check/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/integrity_check/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,21 @@
 <?php
 /*
-+---------------------------------------------------------------+
-| e107 website system
-| Steve Dunstan 2001-2002
-| http://e107.org
-| jalist@e107.org
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-| Plugin : Integrity-Checker
-| Version: 0.01 (first release)
-| HeX0R 2004
-| http://h3x0r.ath.cx
-| hex0r@h3x0r.ath.cx
-
-| Released under the terms and conditions of the
-| GNU General Public License (http://gnu.org).
-+---------------------------------------------------------------+
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|     Plugin : Integrity-Checker Version: 0.01 (first release)
+|     Copyright (C) 2004 HeX0R (http://h3x0r.ath.cx hex0r@h3x0r.ath.cx) 
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/integrity_check/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/lastseen/languages/English.php 0.7.24.src/e107_plugins/lastseen/languages/English.php
--- 0.7.23.src/e107_plugins/lastseen/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/lastseen/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/lastseen/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/lastseen/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/lastseen/lastseen_menu.php 0.7.24.src/e107_plugins/lastseen/lastseen_menu.php
--- 0.7.23.src/e107_plugins/lastseen/lastseen_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/lastseen/lastseen_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/lastseen/lastseen_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/lastseen/lastseen_menu.php $
+|     $Revision: 11678 $
+|     $Id: lastseen_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/admin_linkspage_config.php 0.7.24.src/e107_plugins/links_page/admin_linkspage_config.php
--- 0.7.23.src/e107_plugins/links_page/admin_linkspage_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/admin_linkspage_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,19 +1,18 @@
 <?php
 /*
 + ----------------------------------------------------------------------------+
-|    e107 website system
+|     e107 website system
 |
-|    (C)Steve Dunstan 2001-2002
-|    http://e107.org
-|    jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|    Released   under the   terms and   conditions of the
-|    GNU    General Public  License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|    $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/admin_linkspage_config.php,v $
-|    $Revision: 11346 $
-|    $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|    $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/admin_linkspage_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_linkspage_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/e_frontpage.php 0.7.24.src/e107_plugins/links_page/e_frontpage.php
--- 0.7.23.src/e107_plugins/links_page/e_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/e_frontpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/e_frontpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/e_frontpage.php $
+|     $Revision: 11678 $
+|     $Id: e_frontpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/e_help.php 0.7.24.src/e107_plugins/links_page/e_help.php
--- 0.7.23.src/e107_plugins/links_page/e_help.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/e_help.php	2010-09-07 07:17:36.000000000 -0500
@@ -1,8 +1,27 @@
 <?php
-/* $Id: e_help.php 11346 2010-02-17 18:56:14Z secretr $ */
+/*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|		Links plugin - help
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/e_help.php $
+|     $Revision: 11758 $
+|     $Id: e_help.php 11758 2010-09-07 12:18:00Z e107steved $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
+*/
+
+
 if (!defined('e107_INIT')) { exit; }
 
-include_lan(e_PLUGIN.'links_page/languages/'.e_LANGUAGE.'.php');
+include_lan(e_PLUGIN.'links_page/languages/'.e_LANGUAGE.'_help.php');
 
 if(!e_QUERY){
 	$text = LAN_ADMIN_HELP_1;
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/e_notify.php 0.7.24.src/e107_plugins/links_page/e_notify.php
--- 0.7.23.src/e107_plugins/links_page/e_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/e_notify.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/e_notify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/e_notify.php $
+|     $Revision: 11678 $
+|     $Id: e_notify.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/languages/English_help.php 0.7.24.src/e107_plugins/links_page/languages/English_help.php
--- 0.7.23.src/e107_plugins/links_page/languages/English_help.php	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/languages/English_help.php	2010-09-07 07:17:36.000000000 -0500
@@ -0,0 +1,68 @@
+<?php
+/*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|		Links plugin - help language file
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/db_debug_class.php $
+|     $Revision: 11678 $
+|     $Id: db_debug_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
+*/
+
+
+define("LAN_ADMIN_HELP_0", "linkspage help area");
+
+define("LAN_ADMIN_HELP_1", "<i>the manage link categories page shows all categories present.</i><br /><br /><b>detailed list</b><br />You see a list of all categories with their icon, name and description, options, and sorting options.<br /><br /><b>explanation of icons</b><br />
+".LINK_ICON_LINK." : link to the category<br /><br />
+".LINK_ICON_EDIT." : edit the category<br /><br />
+".LINK_ICON_DELETE." : delete the category<br /><br />
+".LINK_ICON_ORDER_UP." : the up button allows you to move the category item one up in order.<br /><br />
+".LINK_ICON_ORDER_DOWN." : the down button allows you to move the category item one down in order.<br />
+<br />
+<b>order</b><br />here you can manually set the order of all the categories. You need to change the values in the select boxes to your desired order, and click on the reorder button below to save the new order.<br />");
+
+define("LAN_ADMIN_HELP_2", "<i>the create link category page allows you to add new categories</i><br /><br />You can upload a new icon, and after uploading assign the icon to the category.");
+define("LAN_ADMIN_HELP_3", "<i>the manage links page first show all categories.</i><br /><br />".LINK_ICON_LINK." : link to the category<br /><br />".LINK_ICON_EDIT." : click the icon to view all links in this category<br />");
+define("LAN_ADMIN_HELP_4", "<i>the create link page allows you to add a new link</i><br /><br />You can upload a new icon, and after uploading assign the icon to the link.<br /><br />the open type allows you to define how the link will be opened when a user clicks on it.");
+define("LAN_ADMIN_HELP_5", "<i>the submitted links page shows all links that are submitted by users</i><br /><br /><b>detailed list</b><br />You see the link url, the name of the user who submitted the link and options.<br /><br /><b>explanation of icons</b><br />
+".LINK_ICON_EDIT." : post the submitted link to the link create form<br /><br />
+".LINK_ICON_DELETE." : delete the submitted link<br />
+");
+define("LAN_ADMIN_HELP_6", "<i>the options page allows you to change the behaviour of the links_page plugin</i><br /><br />
+general options<br />
+these options are generally used throughout the link pages.<br /><br />
+personal link managers<br />
+the personal link managers are privileged users who can manage their own personally added links.<br /><br />
+category page<br />
+here you can change options for the category page.<br /><br />
+links page<br />
+These options are used on the link pages.<br /><br />
+refer page<br />
+These options are used on the top refer links page.<br /><br />
+rating page<br />
+These options are used on the top rated links page.<br />
+");
+
+define("LAN_ADMIN_HELP_7", "<i>the edit link category page allows you to edit an existing category</i><br /><br />You can upload a new icon, and after uploading assign the icon to the category.<br />You can update the timestamp of the link by checking the box.");
+
+define("LAN_ADMIN_HELP_8", "<i>this page shows all existing links in the selected category.</i><br /><br /><b>detailed list</b><br />You see a list of the links with their image, name, options, and sorting options.<br /><br /><b>explanation of icons</b><br />
+".LINK_ICON_LINK." : link to the website<br /><br />
+".LINK_ICON_EDIT." : edit the link<br /><br />
+".LINK_ICON_DELETE." : delete the link<br /><br />
+".LINK_ICON_ORDER_UP." : the up button allows you to move a link up one in the list.<br /><br />
+".LINK_ICON_ORDER_DOWN." : the down button allows you to move a link down one in the list.<br />
+<br />
+<b>order</b><br />here you can manually set the order of all the links. You need to change the values in the select boxes to your desired order, and click on the reorder button below to save the new order.<br />");
+
+define("LAN_ADMIN_HELP_9", "<i>the edit link page allows you to edit an existing link</i><br /><br />You can upload a new icon, and after uploading assign the icon to the link.<br /><br />the open type allows you to define how the link will be opened when a user clicks on it.");
+define("LAN_ADMIN_HELP_10", "<i>the post submitted link page allows you to add a submitted link to the existing links</i><br /><br />A small submitted text is added into the description field.<br /><br />You can upload a new icon, and after uploading assign the icon to the link.<br /><br />the open type allows you to define how the link will be opened when a user clicks on it.");
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/languages/English.php 0.7.24.src/e107_plugins/links_page/languages/English.php
--- 0.7.23.src/e107_plugins/links_page/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/languages/English.php	2010-09-07 07:17:36.000000000 -0500
@@ -1,361 +1,316 @@
-<?php
-/*
-+ ----------------------------------------------------------------------------+
-|     e107 website system - Language File.
-|
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
-*/
-
-
-define("LCLAN_PLUGIN_LAN_1", "Links Page");
-define("LCLAN_PLUGIN_LAN_2", "Links Page For Displaying External Web Links");
-define("LCLAN_PLUGIN_LAN_3", "Configure Links Page");
-define("LCLAN_PLUGIN_LAN_4", "links");
-define("LCLAN_PLUGIN_LAN_5", "Links page has successfully installed, please configure it from the Links Page link on the admin front page.");
-define("LCLAN_PLUGIN_LAN_6", "Links_page successfully upgraded, now using version");
-
-define("LCLAN_OPT_MENU_1", "general options");
-define("LCLAN_OPT_MENU_2", "personal link managers");
-define("LCLAN_OPT_MENU_3", "category page");
-define("LCLAN_OPT_MENU_4", "links display");
-define("LCLAN_OPT_MENU_5", "refer page");
-define("LCLAN_OPT_MENU_6", "rating page");
-define("LCLAN_OPT_MENU_7", "menu");
-
-define("LCLAN_PAGETITLE_1", "Links");
-define("LCLAN_PAGETITLE_2", "All categories");
-define("LCLAN_PAGETITLE_3", "All Links");
-define("LCLAN_PAGETITLE_4", "category");
-define("LCLAN_PAGETITLE_5", "Top Rated");
-define("LCLAN_PAGETITLE_6", "Top Referrals");
-define("LCLAN_PAGETITLE_7", "Personal Link Manager");
-define("LCLAN_PAGETITLE_8", "Link Comments");
-define("LCLAN_PAGETITLE_9", "Submit Link");
-define("LCLAN_PAGETITLE_10", "");
-
-
-define("LCLAN_OPT_1", "general options");
-define("LCLAN_OPT_2", "Link Page Options");
-define("LCLAN_OPT_3", "enabled");
-define("LCLAN_OPT_4", "disabled");
-define("LCLAN_OPT_5", "px");
-define("LCLAN_OPT_6", "");
-define("LCLAN_OPT_7", "divide categories into individual pages");
-define("LCLAN_OPT_8", "allow links to be submitted");
-define("LCLAN_OPT_9", "who can submit links");
-define("LCLAN_OPT_10", "use multiple pages to show the links");
-define("LCLAN_OPT_11", "number of links per page");
-define("LCLAN_OPT_12", "category page");
-define("LCLAN_OPT_13", "display which sections");
-define("LCLAN_OPT_14", "icon");
-define("LCLAN_OPT_15", "description");
-define("LCLAN_OPT_16", "amount");
-define("LCLAN_OPT_17", "referral");
-define("LCLAN_OPT_18", "url");
-define("LCLAN_OPT_19", "total category info line");
-define("LCLAN_OPT_20", "link to top refer");
-define("LCLAN_OPT_21", "link to top rated");
-define("LCLAN_OPT_22", "show default icon if none is present");
-define("LCLAN_OPT_23", "default sort method");
-define("LCLAN_OPT_24", "default order method");
-define("LCLAN_OPT_25", "default resize value");
-define("LCLAN_OPT_26", "links page");
-define("LCLAN_OPT_27", "allow users to rate links");
-define("LCLAN_OPT_28", "show default icon if none present");
-define("LCLAN_OPT_29", "display sort and order menu");
-define("LCLAN_OPT_30", "ascending");
-define("LCLAN_OPT_31", "descending");
-define("LCLAN_OPT_32", "use override of link open method");
-define("LCLAN_OPT_33", "default resize value");
-define("LCLAN_OPT_34", "name");
-define("LCLAN_OPT_35", "url");
-define("LCLAN_OPT_36", "order");
-define("LCLAN_OPT_37", "refer");
-define("LCLAN_OPT_38", "");
-define("LCLAN_OPT_39", "");
-define("LCLAN_OPT_40", "name");
-define("LCLAN_OPT_41", "id");
-define("LCLAN_OPT_42", "use individual link setting");
-define("LCLAN_OPT_43", "Opens in same window");
-define("LCLAN_OPT_44", "Opens in new window");
-define("LCLAN_OPT_45", "Opens in 600x400 mini-window");
-define("LCLAN_OPT_46", "who can manage links");
-define("LCLAN_OPT_47", "these users can add/edit their own personal links");
-define("LCLAN_OPT_48", "allow direct posting");
-define("LCLAN_OPT_49", "if enabled links are submitted directly, else a site admin needs to approve them");
-define("LCLAN_OPT_50", "allow direct deleting");
-define("LCLAN_OPT_51", "if enabled the link managers can delete their own links");
-define("LCLAN_OPT_52", "personal link managers");
-define("LCLAN_OPT_53", "date");
-define("LCLAN_OPT_54", "allow personal management on links");
-define("LCLAN_OPT_55", "allow comments on all links");
-define("LCLAN_OPT_56", "minimum refer value");
-define("LCLAN_OPT_57", "only links with a refer count larger then the given value are displayed (0 or empty = all)");
-define("LCLAN_OPT_58", "link to submit link");
-define("LCLAN_OPT_59", "link to personal manager (only if allowed)");
-define("LCLAN_OPT_60", "link to link frontpage");
-define("LCLAN_OPT_61", "link to all categories");
-define("LCLAN_OPT_62", "show these navigator links");
-define("LCLAN_OPT_63", "minimum rating value");
-define("LCLAN_OPT_64", "only links with a rating larger then the given value are displayed (0 or empty = all)");
-define("LCLAN_OPT_65", "show empty categories");
-define("LCLAN_OPT_66", "link to each category");
-define("LCLAN_OPT_67", "link to all links");
-define("LCLAN_OPT_68", "view all links");
-
-define("LCLAN_OPT_69", "rendertype navigator links");
-define("LCLAN_OPT_70", "show category links");
-define("LCLAN_OPT_71", "rendertype category links");
-define("LCLAN_OPT_72", "show recent links");
-define("LCLAN_OPT_73", "display which data");
-define("LCLAN_OPT_74", "how many recent links are displayed");
-define("LCLAN_OPT_75", "hyperlinks");
-define("LCLAN_OPT_76", "selectbox");
-define("LCLAN_OPT_77", "category");
-define("LCLAN_OPT_78", "description");
-define("LCLAN_OPT_79", "caption navigator");
-define("LCLAN_OPT_80", "caption categories");
-define("LCLAN_OPT_81", "caption recent list");
-define("LCLAN_OPT_82", "navigator");
-define("LCLAN_OPT_83", "categories");
-define("LCLAN_OPT_84", "recent list");
-define("LCLAN_OPT_85", "caption menu");
-define("LCLAN_OPT_86", "link menu");
-define("LCLAN_OPT_87", "show amount of links");
-
-define("LCLAN_ADMIN_1", "update");  // deprecated
-define("LCLAN_ADMIN_2", "Link saved to database.");
-define("LCLAN_ADMIN_3", "Link updated in database.");
-define("LCLAN_ADMIN_4", "Link Category Saved");
-define("LCLAN_ADMIN_5", "Link Category Updated");
-define("LCLAN_ADMIN_6", "Options Saved");
-define("LCLAN_ADMIN_7", "link icon was uploaded successfully !");
-define("LCLAN_ADMIN_8", "link icon was not uploaded !");
-define("LCLAN_ADMIN_9", "Order updated");
-define("LCLAN_ADMIN_10", "Link");
-define("LCLAN_ADMIN_11", "deleted"); // deprecated
-define("LCLAN_ADMIN_12", "Link Category");
-define("LCLAN_ADMIN_13", "Submitted link deleted");
-define("LCLAN_ADMIN_14", "Links");
-define("LCLAN_ADMIN_15", "This category still contains links, please (re)move them first");
-
-define("LCLAN_SL_1", "Submitted Links");
-define("LCLAN_SL_2", "No submitted links");
-define("LCLAN_SL_3", "Link");
-define("LCLAN_SL_4", "Submitted by");
-define("LCLAN_SL_5", "Options");
-define("LCLAN_SL_6", "Post");
-define("LCLAN_SL_7", "Delete");
-define("LCLAN_SL_8", "Are you sure you want to delete this submitted link?");
-define("LCLAN_SL_9", "After submitting your link it will be reviewed by a site admin and if appropriate it will be added to the main links page.");
-define("LCLAN_SL_10", "Category:");
-define("LCLAN_SL_11", "name");
-define("LCLAN_SL_12", "url");
-define("LCLAN_SL_13", "description");
-define("LCLAN_SL_14", "URL to link button:");
-define("LCLAN_SL_15", "Underlined fields are required.");
-define("LCLAN_SL_16", "Submit Link");
-define("LCLAN_SL_17", "");
-define("LCLAN_SL_18", "");
-
-define("LCLAN_CAT_1", "Image");
-define("LCLAN_CAT_2", "Category");
-define("LCLAN_CAT_3", "Options");
-define("LCLAN_CAT_4", "Move");
-define("LCLAN_CAT_5", "Order");
-define("LCLAN_CAT_6", "Edit");
-define("LCLAN_CAT_7", "Are");
-define("LCLAN_CAT_8", "Are you sure you want to delete this category?");
-define("LCLAN_CAT_9", "View Links");
-define("LCLAN_CAT_10", "Reorder");
-define("LCLAN_CAT_11", "No link categories");
-define("LCLAN_CAT_12", "Existing Link Categories");
-define("LCLAN_CAT_13", "Name:");
-define("LCLAN_CAT_14", "Description:");
-define("LCLAN_CAT_15", "Upload a new icon:");
-define("LCLAN_CAT_16", "Auto-Thumbnail size:");
-define("LCLAN_CAT_17", "This option is disabled as file uploading is not enabled on your server");
-define("LCLAN_CAT_18", "The");
-define("LCLAN_CAT_19", "folder is not writable, you need to CHMOD 777 the folder before uploading");
-define("LCLAN_CAT_20", "px");
-define("LCLAN_CAT_21", "upload");
-define("LCLAN_CAT_22", "Choose an icon:");
-define("LCLAN_CAT_23", "View Images");
-define("LCLAN_CAT_24", "Visible for:");
-define("LCLAN_CAT_25", "tick to update timestamp to current time");
-define("LCLAN_CAT_26", "Update Link Category");
-define("LCLAN_CAT_27", "Clear Form");
-define("LCLAN_CAT_28", "Create Link Category");
-define("LCLAN_CAT_29", "Link Category");
-
-define("LCLAN_ITEM_1", "Submitted by");
-define("LCLAN_ITEM_2", "Category:");
-define("LCLAN_ITEM_3", "no categories yet");
-define("LCLAN_ITEM_4", "Name:");
-define("LCLAN_ITEM_5", "Url:");
-define("LCLAN_ITEM_6", "Description:");
-define("LCLAN_ITEM_7", "Upload an icon:");
-define("LCLAN_ITEM_8", "Auto-Thumbnail size:");
-define("LCLAN_ITEM_9", "This option is disabled as file uploading is not enabled on your server");
-define("LCLAN_ITEM_10", "The");
-define("LCLAN_ITEM_11", "folder is not writable, you need to CHMOD 777 the folder before uploading");
-define("LCLAN_ITEM_12", "px");
-define("LCLAN_ITEM_13", "upload");
-define("LCLAN_ITEM_14", "Choose an icon:");
-define("LCLAN_ITEM_15", "View Images");
-define("LCLAN_ITEM_16", "Open Type:");
-define("LCLAN_ITEM_17", "Opens in same window");
-define("LCLAN_ITEM_18", "Opens in new window");
-define("LCLAN_ITEM_19", "Opens in 600x400 mini-window");
-define("LCLAN_ITEM_20", "Visible for:");
-define("LCLAN_ITEM_21", "tick to update timestamp to current time");
-define("LCLAN_ITEM_22", "Update Link");
-define("LCLAN_ITEM_23", "Create link");
-define("LCLAN_ITEM_24", "Links");
-define("LCLAN_ITEM_25", "Image");
-define("LCLAN_ITEM_26", "Link Name");
-define("LCLAN_ITEM_27", "Options");
-define("LCLAN_ITEM_28", "Move");
-define("LCLAN_ITEM_29", "Order");
-define("LCLAN_ITEM_30", "Reorder");
-define("LCLAN_ITEM_31", "edit");
-define("LCLAN_ITEM_32", "delete");
-define("LCLAN_ITEM_33", "Are you sure you want to delete this link?");
-define("LCLAN_ITEM_34", "no icon");
-define("LCLAN_ITEM_35", "manage personal links");
-define("LCLAN_ITEM_36", "go");
-define("LCLAN_ITEM_37", "view all links");
-define("LCLAN_ITEM_38", "All Links");
-define("LCLAN_ITEM_39", "Rating");
-
-define("LCLAN_ADMINMENU_1", "Link Options");
-define("LCLAN_ADMINMENU_2", "Manage Link Categories");
-define("LCLAN_ADMINMENU_3", "Create Link Category");
-define("LCLAN_ADMINMENU_4", "Manage Links");
-define("LCLAN_ADMINMENU_5", "Create Link");
-define("LCLAN_ADMINMENU_6", "Options");
-define("LCLAN_ADMINMENU_7", "Submitted Links");
-define("LCLAN_ADMINMENU_8", "Categories");
-
-define("NT_LAN_LP_1", "Links Page Events");
-define("NT_LAN_LP_2", "Link submitted by user");
-define("NT_LAN_LP_3", "Link Submitted");
-
-define("LNK_SCH_LAN_2", "All Links Categories");
-define("LNK_SCH_LAN_3", "All links details");
-
-define("LAN_LINKS_MANAGER_0", "icon");
-define("LAN_LINKS_MANAGER_1", "link");
-define("LAN_LINKS_MANAGER_2", "options");
-define("LAN_LINKS_MANAGER_3", "create new link");
-define("LAN_LINKS_MANAGER_4", "you don't have any links present");
-define("LAN_LINKS_MANAGER_5", "category");
-define("LAN_LINKS_MANAGER_6", "");
-define("LAN_LINKS_MANAGER_7", "");
-define("LAN_LINKS_MANAGER_8", "");
-define("LAN_LINKS_MANAGER_9", "");
-
-define("LAN_LINKS_1", "Total links");
-define("LAN_LINKS_2", "Total links activated");
-define("LAN_LINKS_3", "Anonymous");
-define("LAN_LINKS_4", "heading");
-define("LAN_LINKS_5", "url");
-define("LAN_LINKS_6", "order");
-define("LAN_LINKS_7", "refer");
-define("LAN_LINKS_8", "ascending");
-define("LAN_LINKS_9", "descending");
-define("LAN_LINKS_10", "Top Links : Refer");
-define("LAN_LINKS_11", "Top Links : Rating");
-define("LAN_LINKS_12", "view links by refer");
-define("LAN_LINKS_13", "view links by rating");
-define("LAN_LINKS_14", "view links frontpage");
-define("LAN_LINKS_15", "sort by");
-define("LAN_LINKS_16", "in this category");
-define("LAN_LINKS_17", "link");
-define("LAN_LINKS_18", "links");
-define("LAN_LINKS_19", "categories");
-define("LAN_LINKS_20", "category");
-define("LAN_LINKS_21", "There");
-define("LAN_LINKS_22", "is");
-define("LAN_LINKS_23", "are");
-define("LAN_LINKS_24", "total in");
-define("LAN_LINKS_25", "show all links");
-define("LAN_LINKS_26", "Referrals");
-define("LAN_LINKS_27", "submit a link");
-define("LAN_LINKS_28", "Thank you");
-define("LAN_LINKS_29", "Your link has been saved and will be reviewed by a site administrator.");
-define("LAN_LINKS_30", "Link Categories");
-define("LAN_LINKS_31", "submit a link");
-define("LAN_LINKS_32", "Category:");
-define("LAN_LINKS_33", "No Links are rated yet.");
-define("LAN_LINKS_34", "There are currently no links");
-define("LAN_LINKS_35", "personal links manager");
-define("LAN_LINKS_36", "link comments");
-define("LAN_LINKS_37", "Comments");
-define("LAN_LINKS_38", "date");
-define("LAN_LINKS_39", "Links");
-define("LAN_LINKS_40", "Category");
-define("LAN_LINKS_41", "no categories yet");
-define("LAN_LINKS_42", "no links are referred yet");
-define("LAN_LINKS_43", "view all categories");
-define("LAN_LINKS_44", "id");
-define("LAN_LINKS_45", "Link Category");
-define("LAN_LINKS_46", "Link Subcategories");
-define("LAN_LINKS_47", "link navigator...");
-define("LAN_LINKS_48", "-- view category --");
-define("LAN_LINKS_49", "");
-define("LAN_LINKS_50", "You do not have permission to submit links at present");
-
-define('LAN_LINKS_SCH_1','Posted in reply to link');
-
-define("LAN_ADMIN_HELP_0", "linkspage help area");
-
-define("LAN_ADMIN_HELP_1", "<i>the manage link categories page shows all categories present.</i><br /><br /><b>detailed list</b><br />You see a list of all categories with their icon, name and description, options, and sorting options.<br /><br /><b>explanation of icons</b><br />
-".LINK_ICON_LINK." : link to the category<br /><br />
-".LINK_ICON_EDIT." : edit the category<br /><br />
-".LINK_ICON_DELETE." : delete the category<br /><br />
-".LINK_ICON_ORDER_UP." : the up button allows you to move the category item one up in order.<br /><br />
-".LINK_ICON_ORDER_DOWN." : the down button allows you to move the category item one down in order.<br />
-<br />
-<b>order</b><br />here you can manually set the order of all the categories. You need to change the values in the select boxes to the order of your kind and press the reorder button below to save the new order.<br />");
-
-define("LAN_ADMIN_HELP_2", "<i>the create link category page allows you to add new categories</i><br /><br />You can upload a new icon, and after uploading assign the icon to the category.");
-define("LAN_ADMIN_HELP_3", "<i>the manage links page first show all categories.</i><br /><br />".LINK_ICON_LINK." : link to the category<br /><br />".LINK_ICON_EDIT." : click the icon to view all links in this category<br />");
-define("LAN_ADMIN_HELP_4", "<i>the create link page allows you to add a new link</i><br /><br />You can upload a new icon, and after uploading assign the icon to the link.<br /><br />the open type allows you to define how the link will be opened when a user clicks on it.");
-define("LAN_ADMIN_HELP_5", "<i>the submitted links page shows all links that are submitted by users</i><br /><br /><b>detailed list</b><br />You see the link url, the name of the user who submitted the link and options.<br /><br /><b>explanation of icons</b><br />
-".LINK_ICON_EDIT." : post the submitted link to the link create form<br /><br />
-".LINK_ICON_DELETE." : delete the submitted link<br />
-");
-define("LAN_ADMIN_HELP_6", "<i>the options page allows you to change the behaviour of the links_page plugin</i><br /><br />
-general options<br />
-these options are generally used throughout the link pages.<br /><br />
-personal link managers<br />
-the personal link managers are privileged users who can manage their own personally added links.<br /><br />
-category page<br />
-here you can change options for the category page.<br /><br />
-links page<br />
-These options are used on the link pages.<br /><br />
-refer page<br />
-These options are used on the top refer links page.<br /><br />
-rating page<br />
-These options are used on the top rated links page.<br />
-");
-
-define("LAN_ADMIN_HELP_7", "<i>the edit link category page allows you to edit an existing category</i><br /><br />You can upload a new icon, and after uploading assign the icon to the category.<br />You can update the timestamp of the link by checking the box.");
-
-define("LAN_ADMIN_HELP_8", "<i>this page shows all existing links in the selected category.</i><br /><br /><b>detailed list</b><br />You see a list of the links with their image, name, options, and sorting options.<br /><br /><b>explanation of icons</b><br />
-".LINK_ICON_LINK." : link to the website<br /><br />
-".LINK_ICON_EDIT." : edit the link<br /><br />
-".LINK_ICON_DELETE." : delete the link<br /><br />
-".LINK_ICON_ORDER_UP." : the up button allows you to move the link one up in order.<br /><br />
-".LINK_ICON_ORDER_DOWN." : the down button allows you to move the link one down in order.<br />
-<br />
-<b>order</b><br />here you can manually set the order of all the links. You need to change the values in the select boxes to the order of your kind and press the reorder button below to save the new order.<br />");
-
-define("LAN_ADMIN_HELP_9", "<i>the edit link page allows you to edit an existing link</i><br /><br />You can upload a new icon, and after uploading assign the icon to the link.<br /><br />the open type allows you to define how the link will be opened when a user clicks on it.");
-define("LAN_ADMIN_HELP_10", "<i>the post submitted link page allows you to add a submitted link to the existing links</i><br /><br />A small submitted text is added into the description field.<br /><br />You can upload a new icon, and after uploading assign the icon to the link.<br /><br />the open type allows you to define how the link will be opened when a user clicks on it.");
+<?php
+/*
++ ----------------------------------------------------------------------------+
+|     e107 website system - Language File.
+|
+|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/languages/English.php,v $
+|     $Revision: 11758 $
+|     $Date: 2010-09-07 07:18:00 -0500 (Tue, 07 Sep 2010) $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
+*/
+
+
+define("LCLAN_PLUGIN_LAN_1", "Links Page");
+define("LCLAN_PLUGIN_LAN_2", "Links Page For Displaying External Web Links");
+define("LCLAN_PLUGIN_LAN_3", "Configure Links Page");
+define("LCLAN_PLUGIN_LAN_4", "links");
+define("LCLAN_PLUGIN_LAN_5", "Links page has successfully installed, please configure it from the Links Page link on the admin front page.");
+define("LCLAN_PLUGIN_LAN_6", "Links_page successfully upgraded, now using version");
+
+define("LCLAN_OPT_MENU_1", "general options");
+define("LCLAN_OPT_MENU_2", "personal link managers");
+define("LCLAN_OPT_MENU_3", "category page");
+define("LCLAN_OPT_MENU_4", "links display");
+define("LCLAN_OPT_MENU_5", "refer page");
+define("LCLAN_OPT_MENU_6", "rating page");
+define("LCLAN_OPT_MENU_7", "menu");
+
+define("LCLAN_PAGETITLE_1", "Links");
+define("LCLAN_PAGETITLE_2", "All categories");
+define("LCLAN_PAGETITLE_3", "All Links");
+define("LCLAN_PAGETITLE_4", "category");
+define("LCLAN_PAGETITLE_5", "Top Rated");
+define("LCLAN_PAGETITLE_6", "Top Referrals");
+define("LCLAN_PAGETITLE_7", "Personal Link Manager");
+define("LCLAN_PAGETITLE_8", "Link Comments");
+define("LCLAN_PAGETITLE_9", "Submit Link");
+define("LCLAN_PAGETITLE_10", "");
+
+
+define("LCLAN_OPT_1", "general options");
+define("LCLAN_OPT_2", "Link Page Options");
+define("LCLAN_OPT_3", "enabled");
+define("LCLAN_OPT_4", "disabled");
+define("LCLAN_OPT_5", "px");
+define("LCLAN_OPT_6", "");
+define("LCLAN_OPT_7", "divide categories into individual pages");
+define("LCLAN_OPT_8", "allow links to be submitted");
+define("LCLAN_OPT_9", "who can submit links");
+define("LCLAN_OPT_10", "use multiple pages to show the links");
+define("LCLAN_OPT_11", "number of links per page");
+define("LCLAN_OPT_12", "category page");
+define("LCLAN_OPT_13", "display which sections");
+define("LCLAN_OPT_14", "icon");
+define("LCLAN_OPT_15", "description");
+define("LCLAN_OPT_16", "amount");
+define("LCLAN_OPT_17", "referral");
+define("LCLAN_OPT_18", "url");
+define("LCLAN_OPT_19", "total category info line");
+define("LCLAN_OPT_20", "link to top refer");
+define("LCLAN_OPT_21", "link to top rated");
+define("LCLAN_OPT_22", "show default icon if none is present");
+define("LCLAN_OPT_23", "default sort method");
+define("LCLAN_OPT_24", "default order method");
+define("LCLAN_OPT_25", "default resize value");
+define("LCLAN_OPT_26", "links page");
+define("LCLAN_OPT_27", "allow users to rate links");
+define("LCLAN_OPT_28", "show default icon if none present");
+define("LCLAN_OPT_29", "display sort and order menu");
+define("LCLAN_OPT_30", "ascending");
+define("LCLAN_OPT_31", "descending");
+define("LCLAN_OPT_32", "use override of link open method");
+define("LCLAN_OPT_33", "default resize value");
+define("LCLAN_OPT_34", "name");
+define("LCLAN_OPT_35", "url");
+define("LCLAN_OPT_36", "order");
+define("LCLAN_OPT_37", "refer");
+define("LCLAN_OPT_38", "");
+define("LCLAN_OPT_39", "");
+define("LCLAN_OPT_40", "name");
+define("LCLAN_OPT_41", "id");
+define("LCLAN_OPT_42", "use individual link setting");
+define("LCLAN_OPT_43", "Opens in same window");
+define("LCLAN_OPT_44", "Opens in new window");
+define("LCLAN_OPT_45", "Opens in 600x400 mini-window");
+define("LCLAN_OPT_46", "who can manage links");
+define("LCLAN_OPT_47", "these users can add/edit their own personal links");
+define("LCLAN_OPT_48", "allow direct posting");
+define("LCLAN_OPT_49", "if enabled links are submitted directly, else a site admin needs to approve them");
+define("LCLAN_OPT_50", "allow direct deleting");
+define("LCLAN_OPT_51", "if enabled the link managers can delete their own links");
+define("LCLAN_OPT_52", "personal link managers");
+define("LCLAN_OPT_53", "date");
+define("LCLAN_OPT_54", "allow personal management on links");
+define("LCLAN_OPT_55", "allow comments on all links");
+define("LCLAN_OPT_56", "minimum refer value");
+define("LCLAN_OPT_57", "only links with a refer count larger then the given value are displayed (0 or empty = all)");
+define("LCLAN_OPT_58", "link to submit link");
+define("LCLAN_OPT_59", "link to personal manager (only if allowed)");
+define("LCLAN_OPT_60", "link to link frontpage");
+define("LCLAN_OPT_61", "link to all categories");
+define("LCLAN_OPT_62", "show these navigator links");
+define("LCLAN_OPT_63", "minimum rating value");
+define("LCLAN_OPT_64", "only links with a rating larger then the given value are displayed (0 or empty = all)");
+define("LCLAN_OPT_65", "show empty categories");
+define("LCLAN_OPT_66", "link to each category");
+define("LCLAN_OPT_67", "link to all links");
+define("LCLAN_OPT_68", "view all links");
+
+define("LCLAN_OPT_69", "rendertype navigator links");
+define("LCLAN_OPT_70", "show category links");
+define("LCLAN_OPT_71", "rendertype category links");
+define("LCLAN_OPT_72", "show recent links");
+define("LCLAN_OPT_73", "display which data");
+define("LCLAN_OPT_74", "how many recent links are displayed");
+define("LCLAN_OPT_75", "hyperlinks");
+define("LCLAN_OPT_76", "selectbox");
+define("LCLAN_OPT_77", "category");
+define("LCLAN_OPT_78", "description");
+define("LCLAN_OPT_79", "caption navigator");
+define("LCLAN_OPT_80", "caption categories");
+define("LCLAN_OPT_81", "caption recent list");
+define("LCLAN_OPT_82", "navigator");
+define("LCLAN_OPT_83", "categories");
+define("LCLAN_OPT_84", "recent list");
+define("LCLAN_OPT_85", "caption menu");
+define("LCLAN_OPT_86", "link menu");
+define("LCLAN_OPT_87", "show amount of links");
+
+define("LCLAN_ADMIN_1", "update");  // deprecated
+define("LCLAN_ADMIN_2", "Link saved to database.");
+define("LCLAN_ADMIN_3", "Link updated in database.");
+define("LCLAN_ADMIN_4", "Link Category Saved");
+define("LCLAN_ADMIN_5", "Link Category Updated");
+define("LCLAN_ADMIN_6", "Options Saved");
+define("LCLAN_ADMIN_7", "link icon was uploaded successfully !");
+define("LCLAN_ADMIN_8", "link icon was not uploaded !");
+define("LCLAN_ADMIN_9", "Order updated");
+define("LCLAN_ADMIN_10", "Link");
+define("LCLAN_ADMIN_11", "deleted"); // deprecated
+define("LCLAN_ADMIN_12", "Link Category");
+define("LCLAN_ADMIN_13", "Submitted link deleted");
+define("LCLAN_ADMIN_14", "Links");
+define("LCLAN_ADMIN_15", "This category still contains links, please (re)move them first");
+
+define("LCLAN_SL_1", "Submitted Links");
+define("LCLAN_SL_2", "No submitted links");
+define("LCLAN_SL_3", "Link");
+define("LCLAN_SL_4", "Submitted by");
+define("LCLAN_SL_5", "Options");
+define("LCLAN_SL_6", "Post");
+define("LCLAN_SL_7", "Delete");
+define("LCLAN_SL_8", "Are you sure you want to delete this submitted link?");
+define("LCLAN_SL_9", "After submitting your link it will be reviewed by a site admin and if appropriate it will be added to the main links page.");
+define("LCLAN_SL_10", "Category:");
+define("LCLAN_SL_11", "name");
+define("LCLAN_SL_12", "url");
+define("LCLAN_SL_13", "description");
+define("LCLAN_SL_14", "URL to link button:");
+define("LCLAN_SL_15", "Underlined fields are required.");
+define("LCLAN_SL_16", "Submit Link");
+define("LCLAN_SL_17", "");
+define("LCLAN_SL_18", "");
+
+define("LCLAN_CAT_1", "Image");
+define("LCLAN_CAT_2", "Category");
+define("LCLAN_CAT_3", "Options");
+define("LCLAN_CAT_4", "Move");
+define("LCLAN_CAT_5", "Order");
+define("LCLAN_CAT_6", "Edit");
+define("LCLAN_CAT_7", "Are");
+define("LCLAN_CAT_8", "Are you sure you want to delete this category?");
+define("LCLAN_CAT_9", "View Links");
+define("LCLAN_CAT_10", "Reorder");
+define("LCLAN_CAT_11", "No link categories");
+define("LCLAN_CAT_12", "Existing Link Categories");
+define("LCLAN_CAT_13", "Name:");
+define("LCLAN_CAT_14", "Description:");
+define("LCLAN_CAT_15", "Upload a new icon:");
+define("LCLAN_CAT_16", "Auto-Thumbnail size:");
+define("LCLAN_CAT_17", "This option is disabled as file uploading is not enabled on your server");
+define("LCLAN_CAT_18", "The");
+define("LCLAN_CAT_19", "folder is not writable, you need to CHMOD 777 the folder before uploading");
+define("LCLAN_CAT_20", "px");
+define("LCLAN_CAT_21", "upload");
+define("LCLAN_CAT_22", "Choose an icon:");
+define("LCLAN_CAT_23", "View Images");
+define("LCLAN_CAT_24", "Visible for:");
+define("LCLAN_CAT_25", "tick to update timestamp to current time");
+define("LCLAN_CAT_26", "Update Link Category");
+define("LCLAN_CAT_27", "Clear Form");
+define("LCLAN_CAT_28", "Create Link Category");
+define("LCLAN_CAT_29", "Link Category");
+
+define("LCLAN_ITEM_1", "Submitted by");
+define("LCLAN_ITEM_2", "Category:");
+define("LCLAN_ITEM_3", "no categories yet");
+define("LCLAN_ITEM_4", "Name:");
+define("LCLAN_ITEM_5", "Url:");
+define("LCLAN_ITEM_6", "Description:");
+define("LCLAN_ITEM_7", "Upload an icon:");
+define("LCLAN_ITEM_8", "Auto-Thumbnail size:");
+define("LCLAN_ITEM_9", "This option is disabled as file uploading is not enabled on your server");
+define("LCLAN_ITEM_10", "The");
+define("LCLAN_ITEM_11", "folder is not writable, you need to CHMOD 777 the folder before uploading");
+define("LCLAN_ITEM_12", "px");
+define("LCLAN_ITEM_13", "upload");
+define("LCLAN_ITEM_14", "Choose an icon:");
+define("LCLAN_ITEM_15", "View Images");
+define("LCLAN_ITEM_16", "Open Type:");
+define("LCLAN_ITEM_17", "Opens in same window");
+define("LCLAN_ITEM_18", "Opens in new window");
+define("LCLAN_ITEM_19", "Opens in 600x400 mini-window");
+define("LCLAN_ITEM_20", "Visible for:");
+define("LCLAN_ITEM_21", "tick to update timestamp to current time");
+define("LCLAN_ITEM_22", "Update Link");
+define("LCLAN_ITEM_23", "Create link");
+define("LCLAN_ITEM_24", "Links");
+define("LCLAN_ITEM_25", "Image");
+define("LCLAN_ITEM_26", "Link Name");
+define("LCLAN_ITEM_27", "Options");
+define("LCLAN_ITEM_28", "Move");
+define("LCLAN_ITEM_29", "Order");
+define("LCLAN_ITEM_30", "Reorder");
+define("LCLAN_ITEM_31", "edit");
+define("LCLAN_ITEM_32", "delete");
+define("LCLAN_ITEM_33", "Are you sure you want to delete this link?");
+define("LCLAN_ITEM_34", "no icon");
+define("LCLAN_ITEM_35", "manage personal links");
+define("LCLAN_ITEM_36", "go");
+define("LCLAN_ITEM_37", "view all links");
+define("LCLAN_ITEM_38", "All Links");
+define("LCLAN_ITEM_39", "Rating");
+
+define("LCLAN_ADMINMENU_1", "Link Options");
+define("LCLAN_ADMINMENU_2", "Manage Link Categories");
+define("LCLAN_ADMINMENU_3", "Create Link Category");
+define("LCLAN_ADMINMENU_4", "Manage Links");
+define("LCLAN_ADMINMENU_5", "Create Link");
+define("LCLAN_ADMINMENU_6", "Options");
+define("LCLAN_ADMINMENU_7", "Submitted Links");
+define("LCLAN_ADMINMENU_8", "Categories");
+
+define("NT_LAN_LP_1", "Links Page Events");
+define("NT_LAN_LP_2", "Link submitted by user");
+define("NT_LAN_LP_3", "Link Submitted");
+
+define("LNK_SCH_LAN_2", "All Links Categories");
+define("LNK_SCH_LAN_3", "All links details");
+
+define("LAN_LINKS_MANAGER_0", "icon");
+define("LAN_LINKS_MANAGER_1", "link");
+define("LAN_LINKS_MANAGER_2", "options");
+define("LAN_LINKS_MANAGER_3", "create new link");
+define("LAN_LINKS_MANAGER_4", "you don't have any links present");
+define("LAN_LINKS_MANAGER_5", "category");
+define("LAN_LINKS_MANAGER_6", "");
+define("LAN_LINKS_MANAGER_7", "");
+define("LAN_LINKS_MANAGER_8", "");
+define("LAN_LINKS_MANAGER_9", "");
+
+define("LAN_LINKS_1", "Total links");
+define("LAN_LINKS_2", "Total links activated");
+define("LAN_LINKS_3", "Anonymous");
+define("LAN_LINKS_4", "heading");
+define("LAN_LINKS_5", "url");
+define("LAN_LINKS_6", "order");
+define("LAN_LINKS_7", "refer");
+define("LAN_LINKS_8", "ascending");
+define("LAN_LINKS_9", "descending");
+define("LAN_LINKS_10", "Top Links : Refer");
+define("LAN_LINKS_11", "Top Links : Rating");
+define("LAN_LINKS_12", "view links by refer");
+define("LAN_LINKS_13", "view links by rating");
+define("LAN_LINKS_14", "view links frontpage");
+define("LAN_LINKS_15", "sort by");
+define("LAN_LINKS_16", "in this category");
+define("LAN_LINKS_17", "link");
+define("LAN_LINKS_18", "links");
+define("LAN_LINKS_19", "categories");
+define("LAN_LINKS_20", "category");
+define("LAN_LINKS_21", "There");
+define("LAN_LINKS_22", "is");
+define("LAN_LINKS_23", "are");
+define("LAN_LINKS_24", "total in");
+define("LAN_LINKS_25", "show all links");
+define("LAN_LINKS_26", "Referrals");
+define("LAN_LINKS_27", "submit a link");
+define("LAN_LINKS_28", "Thank you");
+define("LAN_LINKS_29", "Your link has been saved and will be reviewed by a site administrator.");
+define("LAN_LINKS_30", "Link Categories");
+define("LAN_LINKS_31", "submit a link");
+define("LAN_LINKS_32", "Category:");
+define("LAN_LINKS_33", "No Links are rated yet.");
+define("LAN_LINKS_34", "There are currently no links");
+define("LAN_LINKS_35", "personal links manager");
+define("LAN_LINKS_36", "link comments");
+define("LAN_LINKS_37", "Comments");
+define("LAN_LINKS_38", "date");
+define("LAN_LINKS_39", "Links");
+define("LAN_LINKS_40", "Category");
+define("LAN_LINKS_41", "no categories yet");
+define("LAN_LINKS_42", "no links are referred yet");
+define("LAN_LINKS_43", "view all categories");
+define("LAN_LINKS_44", "id");
+define("LAN_LINKS_45", "Link Category");
+define("LAN_LINKS_46", "Link Subcategories");
+define("LAN_LINKS_47", "link navigator...");
+define("LAN_LINKS_48", "-- view category --");
+define("LAN_LINKS_49", "");
+define("LAN_LINKS_50", "You do not have permission to submit links at present");
+
+define('LAN_LINKS_SCH_1','Posted in reply to link');
+
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/link_class.php 0.7.24.src/e107_plugins/links_page/link_class.php
--- 0.7.23.src/e107_plugins/links_page/link_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/link_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,19 +1,18 @@
 <?php
 /*
 + ----------------------------------------------------------------------------+
-|    e107 website system
+|     e107 website system
 |
-|    Steve Dunstan 2001-2002
-|    http://e107.org
-|    jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|    Released   under the   terms and   conditions of the
-|    GNU    General Public  License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|    $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/link_class.php,v $
-|    $Revision: 11346 $
-|    $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|    $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/link_class.php $
+|     $Revision: 11678 $
+|     $Id: link_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/link_defines.php 0.7.24.src/e107_plugins/links_page/link_defines.php
--- 0.7.23.src/e107_plugins/links_page/link_defines.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/link_defines.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,19 +1,18 @@
 <?php
 /*
 + ----------------------------------------------------------------------------+
-|    e107 website system
+|     e107 website system
 |
-|    Steve Dunstan 2001-2002
-|    http://e107.org
-|    jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|    Released   under the   terms and   conditions of the
-|    GNU    General Public  License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|    $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/link_defines.php,v $
-|    $Revision: 11346 $
-|    $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|    $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/link_defines.php $
+|     $Revision: 11678 $
+|     $Id: link_defines.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/links_page_sql.php 0.7.24.src/e107_plugins/links_page/links_page_sql.php
--- 0.7.23.src/e107_plugins/links_page/links_page_sql.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/links_page_sql.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/links_page_sql.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/links_page_sql.php $
+|     $Revision: 11678 $
+|     $Id: links_page_sql.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 header("location:../index.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/links.php 0.7.24.src/e107_plugins/links_page/links.php
--- 0.7.23.src/e107_plugins/links_page/links.php	2010-07-13 17:04:05.000000000 -0500
+++ 0.7.24.src/e107_plugins/links_page/links.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/links.php,v $
-|     $Revision: 11598 $
-|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/links.php $
+|     $Revision: 11678 $
+|     $Id: links.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once('../../class2.php');
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/links_template.php 0.7.24.src/e107_plugins/links_page/links_template.php
--- 0.7.23.src/e107_plugins/links_page/links_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/links_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/links_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/links_template.php $
+|     $Revision: 11678 $
+|     $Id: links_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/plugin.php 0.7.24.src/e107_plugins/links_page/plugin.php
--- 0.7.23.src/e107_plugins/links_page/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/search/search_advanced.php 0.7.24.src/e107_plugins/links_page/search/search_advanced.php
--- 0.7.23.src/e107_plugins/links_page/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/search/search_advanced.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/search/search_advanced.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/search/search_advanced.php $
+|     $Revision: 11678 $
+|     $Id: search_advanced.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/links_page/search/search_parser.php 0.7.24.src/e107_plugins/links_page/search/search_parser.php
--- 0.7.23.src/e107_plugins/links_page/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/links_page/search/search_parser.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/search/search_parser.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/links_page/search/search_parser.php $
+|     $Revision: 11678 $
+|     $Id: search_parser.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/linkwords/admin_config.php 0.7.24.src/e107_plugins/linkwords/admin_config.php
--- 0.7.23.src/e107_plugins/linkwords/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/linkwords/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/linkwords/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/linkwords/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/linkwords/languages/English.php 0.7.24.src/e107_plugins/linkwords/languages/English.php
--- 0.7.23.src/e107_plugins/linkwords/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/linkwords/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/linkwords/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/linkwords/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/linkwords/linkwords.php 0.7.24.src/e107_plugins/linkwords/linkwords.php
--- 0.7.23.src/e107_plugins/linkwords/linkwords.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/linkwords/linkwords.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/linkwords/linkwords.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/linkwords/linkwords.php $
+|     $Revision: 11678 $
+|     $Id: linkwords.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/linkwords/plugin.php 0.7.24.src/e107_plugins/linkwords/plugin.php
--- 0.7.23.src/e107_plugins/linkwords/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/linkwords/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/linkwords/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/linkwords/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/list_new/admin_list_config.php 0.7.24.src/e107_plugins/list_new/admin_list_config.php
--- 0.7.23.src/e107_plugins/list_new/admin_list_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/list_new/admin_list_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|       e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|       (C)Steve Dunstan 2001-2002
-|       http://e107.org
-|       jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|       Released under the terms and conditions of the
-|       GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/admin_list_config.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/list_new/admin_list_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_list_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 //include and require several classes
diff -x .svn -aruN 0.7.23.src/e107_plugins/list_new/languages/English.php 0.7.24.src/e107_plugins/list_new/languages/English.php
--- 0.7.23.src/e107_plugins/list_new/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/list_new/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/list_new/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/list_new/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/list_new/list_class.php 0.7.24.src/e107_plugins/list_new/list_class.php
--- 0.7.23.src/e107_plugins/list_new/list_class.php	2010-04-15 14:45:32.000000000 -0500
+++ 0.7.24.src/e107_plugins/list_new/list_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|       e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|       (C)Steve Dunstan 2001-2002
-|       http://e107.org
-|       jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|       Released under the terms and conditions of the
-|       GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/list_class.php,v $
-|		$Revision: 11478 $
-|		$Date: 2010-04-15 14:45:56 -0500 (Thu, 15 Apr 2010) $
-|		$Author: e107steved $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/list_new/list_class.php $
+|     $Revision: 11678 $
+|     $Id: list_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit(); }
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/list_new/list_new_menu.php 0.7.24.src/e107_plugins/list_new/list_new_menu.php
--- 0.7.23.src/e107_plugins/list_new/list_new_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/list_new/list_new_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|       e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|       Steve Dunstan 2001-2002
-|       http://e107.org
-|       jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|       Released under the terms and conditions of the
-|       GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/list_new_menu.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/list_new/list_new_menu.php $
+|     $Revision: 11678 $
+|     $Id: list_new_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/list_new/list.php 0.7.24.src/e107_plugins/list_new/list.php
--- 0.7.23.src/e107_plugins/list_new/list.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/list_new/list.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|       e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|       Steve Dunstan 2001-2002
-|       http://e107.org
-|       jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|       Released under the terms and conditions of the
-|       GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/list.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/list_new/list.php $
+|     $Revision: 11678 $
+|     $Id: list.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/list_new/list_recent_menu.php 0.7.24.src/e107_plugins/list_new/list_recent_menu.php
--- 0.7.23.src/e107_plugins/list_new/list_recent_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/list_new/list_recent_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|       e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|       Steve Dunstan 2001-2002
-|       http://e107.org
-|       jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|       Released under the terms and conditions of the
-|       GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/list_recent_menu.php,v $
-|		$Revision: 11346 $
-|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|		$Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/list_new/list_recent_menu.php $
+|     $Revision: 11678 $
+|     $Id: list_recent_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/admin_config.php 0.7.24.src/e107_plugins/log/admin_config.php
--- 0.7.23.src/e107_plugins/log/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/consolidate.php 0.7.24.src/e107_plugins/log/consolidate.php
--- 0.7.23.src/e107_plugins/log/consolidate.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/consolidate.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/consolidate.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/consolidate.php $
+|     $Revision: 11678 $
+|     $Id: consolidate.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/languages/admin/English.php 0.7.24.src/e107_plugins/log/languages/admin/English.php
--- 0.7.23.src/e107_plugins/log/languages/admin/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/languages/admin/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/languages/admin/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/languages/admin/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/languages/English.php 0.7.24.src/e107_plugins/log/languages/English.php
--- 0.7.23.src/e107_plugins/log/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/loginfo.php 0.7.24.src/e107_plugins/log/loginfo.php
--- 0.7.23.src/e107_plugins/log/loginfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/loginfo.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ?Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/loginfo.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/loginfo.php $
+|     $Revision: 11678 $
+|     $Id: loginfo.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 | File locking added
 |
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/log.php 0.7.24.src/e107_plugins/log/log.php
--- 0.7.23.src/e107_plugins/log/log.php	2010-07-26 17:04:24.000000000 -0500
+++ 0.7.24.src/e107_plugins/log/log.php	2010-09-01 07:48:35.000000000 -0500
@@ -9,7 +9,7 @@
 * Site access logging - 'receiver'
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/log.php $
-* $Id: log.php 11628 2010-07-26 22:04:48Z e107steved $
+* $Id: log.php 11731 2010-09-01 12:48:59Z e107steved $
 *
 */
 
@@ -24,6 +24,8 @@
 */
 define('log_INIT', TRUE);
 
+//define('STATS_LOG_DEBUG', TRUE);			// Enables separate logging of first reference of each page to a separate file
+
 //$logVals = urldecode(base64_decode($_SERVER['QUERY_STRING']));
 $logVals = urldecode(base64_decode($_GET['lv']));
 parse_str($logVals, $vals);
@@ -68,7 +70,7 @@
 	$ref = addslashes(strip_tags(isset($vals['err_referer']) ? $vals['err_referer'] : ''));
 // Uncomment the next two lines to create a separate CSV format log of invalid accesses - error code, entered URL, referrer
 //	$log_string = $err_code.",".$self.",".$ref;
-//  $logfp = fopen("logs/errpages.csv", 'a+'); fwrite($logfp, $log_string."\n\r"); fclose($logfp);
+//  $logfp = fopen("logs/errpages.csv", 'a+'); fwrite($logfp, $log_string."\n"); fclose($logfp);
 	$err_code .= ':';
 }
 
@@ -136,6 +138,16 @@
 	if(preg_match("/".$pageDisallow."/i", $url)) return;
 	$pageInfo[$pageName] = array('url' => $url, 'ttl' => 1, 'unq' => 1);
 	$flag = TRUE;
+
+	if (defined('STATS_LOG_DEBUG'))
+	{	// log first access of each page (each day)
+		preg_match("#//(?:.*?)(/.*?)(\?|$)#si", $self, $match);
+		$longPage = isset($match[1]) ? $match[1] : 'blankpage';
+
+		//$log_string = $ip.",".$pageName.",".$longPage.",".$ref.",".$_SERVER['PHP_SELF'].",".$agent;
+		$log_string = $ip.",".$pageName.",".$longPage.",".$ref.",".$agent;
+		$logfp = fopen("logs/firstpages.log", 'a+'); fwrite($logfp, $log_string."\n"); fclose($logfp);
+	}
 }
 
 if(!strstr($ipAddresses, $ip)) 
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/log_update_check.php 0.7.24.src/e107_plugins/log/log_update_check.php
--- 0.7.23.src/e107_plugins/log/log_update_check.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/log_update_check.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/log_update_check.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/log_update_check.php $
+|     $Revision: 11678 $
+|     $Id: log_update_check.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/log_update.php 0.7.24.src/e107_plugins/log/log_update.php
--- 0.7.23.src/e107_plugins/log/log_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/log_update.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/log_update.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/log_update.php $
+|     $Revision: 11678 $
+|     $Id: log_update.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/plugin.php 0.7.24.src/e107_plugins/log/plugin.php
--- 0.7.23.src/e107_plugins/log/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/log/stats.php 0.7.24.src/e107_plugins/log/stats.php
--- 0.7.23.src/e107_plugins/log/stats.php	2010-03-13 16:13:31.000000000 -0600
+++ 0.7.24.src/e107_plugins/log/stats.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/stats.php,v $
-|     $Revision: 11422 $
-|     $Date: 2010-03-13 16:13:55 -0600 (Sat, 13 Mar 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/stats.php $
+|     $Revision: 11678 $
+|     $Id: stats.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/login_menu/config.php 0.7.24.src/e107_plugins/login_menu/config.php
--- 0.7.23.src/e107_plugins/login_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/login_menu/config.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,17 +4,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/login_menu/config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/login_menu/config.php $
+|     $Revision: 11678 $
+|     $Id: config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/login_menu/languages/English.php 0.7.24.src/e107_plugins/login_menu/languages/English.php
--- 0.7.23.src/e107_plugins/login_menu/languages/English.php	2010-07-30 04:30:35.000000000 -0500
+++ 0.7.24.src/e107_plugins/login_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/login_menu/languages/English.php,v $
-|     $Revision: 11634 $
-|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/login_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/login_menu/login_menu.php 0.7.24.src/e107_plugins/login_menu/login_menu.php
--- 0.7.23.src/e107_plugins/login_menu/login_menu.php	2010-04-16 21:16:27.000000000 -0500
+++ 0.7.24.src/e107_plugins/login_menu/login_menu.php	2010-09-07 12:02:03.000000000 -0500
@@ -1,20 +1,25 @@
 <?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)
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/login_menu/login_menu.php $
-* $Id: login_menu.php 11483 2010-04-17 02:16:51Z mcfly_e107 $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/login_menu/login_menu.php $
+|     $Revision: 11760 $
+|     $Id: login_menu.php 11760 2010-09-07 17:02:27Z e107steved $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
 */
 
 /**
 *	@package e107
 *	@subpackage	login_menu
-*	@version $Id: login_menu.php 11483 2010-04-17 02:16:51Z mcfly_e107 $;
+*	@version $Id: login_menu.php 11760 2010-09-07 17:02:27Z e107steved $;
 *
 */
 if (!defined('e107_INIT')) { exit; }
@@ -69,7 +74,7 @@
 
 		// ------------ News Stats -----------
 
-		if (isset($menu_pref['login_menu']) && $menu_pref['login_menu']['new_news'] == true)
+		if (isset($menu_pref['login_menu']) && isset($menu_pref['login_menu']['new_news']) && ($menu_pref['login_menu']['new_news'] == true))
 		{
 			$new_news = $sql->db_Count("news", "(*)", "WHERE `news_datestamp` > {$time} AND news_class REGEXP '".e_CLASS_REGEXP."'");
 			$new_total += $new_news;
@@ -171,7 +176,7 @@
 }
 else
 {
-	if (!$LOGIN_MENU_FORM || !$LOGIN_MENU_MESSAGE)
+	if (!isset($LOGIN_MENU_FORM) || !isset($LOGIN_MENU_MESSAGE))
 	{
 		if (file_exists(THEME."login_menu_template.php"))
 		{
@@ -182,7 +187,8 @@
 			require_once(e_PLUGIN."login_menu/login_menu_template.php");
 		}
 	}
-	if(!$LOGIN_MENU_FORM || !$LOGIN_MENU_MESSAGE){
+	if(!isset($LOGIN_MENU_FORM) || !isset($LOGIN_MENU_MESSAGE))
+	{
     	require(e_PLUGIN."login_menu/login_menu_template.php");
 	}
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/login_menu/login_menu_shortcodes.php 0.7.24.src/e107_plugins/login_menu/login_menu_shortcodes.php
--- 0.7.23.src/e107_plugins/login_menu/login_menu_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/login_menu/login_menu_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/login_menu/login_menu_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/login_menu/login_menu_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: login_menu_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/login_menu/login_menu_template.php 0.7.24.src/e107_plugins/login_menu/login_menu_template.php
--- 0.7.23.src/e107_plugins/login_menu/login_menu_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/login_menu/login_menu_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/login_menu/login_menu_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/login_menu/login_menu_template.php $
+|     $Revision: 11678 $
+|     $Id: login_menu_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $sc_style['LM_SIGNUP_LINK']['pre'] = "<br />[ ";
diff -x .svn -aruN 0.7.23.src/e107_plugins/newforumposts_main/admin_config.php 0.7.24.src/e107_plugins/newforumposts_main/admin_config.php
--- 0.7.23.src/e107_plugins/newforumposts_main/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newforumposts_main/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newforumposts_main/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newforumposts_main/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/newforumposts_main/newforumposts_main.php 0.7.24.src/e107_plugins/newforumposts_main/newforumposts_main.php
--- 0.7.23.src/e107_plugins/newforumposts_main/newforumposts_main.php	2010-07-20 11:47:20.000000000 -0500
+++ 0.7.24.src/e107_plugins/newforumposts_main/newforumposts_main.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newforumposts_main/newforumposts_main.php,v $
-|     $Revision: 11608 $
-|     $Date: 2010-07-20 11:47:44 -0500 (Tue, 20 Jul 2010) $
-|     $Author: nlstart $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newforumposts_main/newforumposts_main.php $
+|     $Revision: 11678 $
+|     $Id: newforumposts_main.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/newforumposts_main/plugin.php 0.7.24.src/e107_plugins/newforumposts_main/plugin.php
--- 0.7.23.src/e107_plugins/newforumposts_main/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newforumposts_main/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newforumposts_main/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newforumposts_main/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/admin_config.php 0.7.24.src/e107_plugins/newsfeed/admin_config.php
--- 0.7.23.src/e107_plugins/newsfeed/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/e_help.php 0.7.24.src/e107_plugins/newsfeed/e_help.php
--- 0.7.23.src/e107_plugins/newsfeed/e_help.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/e_help.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/e_help.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/e_help.php $
+|     $Revision: 11678 $
+|     $Id: e_help.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/languages/English_frontpage.php 0.7.24.src/e107_plugins/newsfeed/languages/English_frontpage.php
--- 0.7.23.src/e107_plugins/newsfeed/languages/English_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/languages/English_frontpage.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/languages/English_frontpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/languages/English_frontpage.php $
+|     $Revision: 11678 $
+|     $Id: English_frontpage.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/languages/English.php 0.7.24.src/e107_plugins/newsfeed/languages/English.php
--- 0.7.23.src/e107_plugins/newsfeed/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/newsfeed_functions.php 0.7.24.src/e107_plugins/newsfeed/newsfeed_functions.php
--- 0.7.23.src/e107_plugins/newsfeed/newsfeed_functions.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/newsfeed_functions.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ?Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/newsfeed_functions.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/newsfeed_functions.php $
+|     $Revision: 11678 $
+|     $Id: newsfeed_functions.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/newsfeed_menu.php 0.7.24.src/e107_plugins/newsfeed/newsfeed_menu.php
--- 0.7.23.src/e107_plugins/newsfeed/newsfeed_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/newsfeed_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/newsfeed_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/newsfeed_menu.php $
+|     $Revision: 11678 $
+|     $Id: newsfeed_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/newsfeed.php 0.7.24.src/e107_plugins/newsfeed/newsfeed.php
--- 0.7.23.src/e107_plugins/newsfeed/newsfeed.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/newsfeed.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/newsfeed.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/newsfeed.php $
+|     $Revision: 11678 $
+|     $Id: newsfeed.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/plugin.php 0.7.24.src/e107_plugins/newsfeed/plugin.php
--- 0.7.23.src/e107_plugins/newsfeed/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/templates/newsfeed_menu_template.php 0.7.24.src/e107_plugins/newsfeed/templates/newsfeed_menu_template.php
--- 0.7.23.src/e107_plugins/newsfeed/templates/newsfeed_menu_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/templates/newsfeed_menu_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ?Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/templates/newsfeed_menu_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/templates/newsfeed_menu_template.php $
+|     $Revision: 11678 $
+|     $Id: newsfeed_menu_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsfeed/templates/newsfeed_template.php 0.7.24.src/e107_plugins/newsfeed/templates/newsfeed_template.php
--- 0.7.23.src/e107_plugins/newsfeed/templates/newsfeed_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsfeed/templates/newsfeed_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/templates/newsfeed_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsfeed/templates/newsfeed_template.php $
+|     $Revision: 11678 $
+|     $Id: newsfeed_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsletter/admin_config.php 0.7.24.src/e107_plugins/newsletter/admin_config.php
--- 0.7.23.src/e107_plugins/newsletter/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsletter/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsletter/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsletter/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once('../../class2.php');
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsletter/languages/English.php 0.7.24.src/e107_plugins/newsletter/languages/English.php
--- 0.7.23.src/e107_plugins/newsletter/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsletter/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsletter/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsletter/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsletter/newsletter_menu.php 0.7.24.src/e107_plugins/newsletter/newsletter_menu.php
--- 0.7.23.src/e107_plugins/newsletter/newsletter_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsletter/newsletter_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsletter/newsletter_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsletter/newsletter_menu.php $
+|     $Revision: 11678 $
+|     $Id: newsletter_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/newsletter/plugin.php 0.7.24.src/e107_plugins/newsletter/plugin.php
--- 0.7.23.src/e107_plugins/newsletter/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/newsletter/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/newsletter/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/newsletter/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/online_extended_menu/languages/English.php 0.7.24.src/e107_plugins/online_extended_menu/languages/English.php
--- 0.7.23.src/e107_plugins/online_extended_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/online_extended_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/online_extended_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/online_extended_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/online_extended_menu/online_extended_menu.php 0.7.24.src/e107_plugins/online_extended_menu/online_extended_menu.php
--- 0.7.23.src/e107_plugins/online_extended_menu/online_extended_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/online_extended_menu/online_extended_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/online_extended_menu/online_extended_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/online_extended_menu/online_extended_menu.php $
+|     $Revision: 11678 $
+|     $Id: online_extended_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/online_menu/languages/English.php 0.7.24.src/e107_plugins/online_menu/languages/English.php
--- 0.7.23.src/e107_plugins/online_menu/languages/English.php	2010-07-30 04:30:35.000000000 -0500
+++ 0.7.24.src/e107_plugins/online_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/online_menu/languages/English.php,v $
-|     $Revision: 11634 $
-|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/online_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/online_menu/online_menu.php 0.7.24.src/e107_plugins/online_menu/online_menu.php
--- 0.7.23.src/e107_plugins/online_menu/online_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/online_menu/online_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/online_menu/online_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/online_menu/online_menu.php $
+|     $Revision: 11678 $
+|     $Id: online_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/other_news_menu/languages/English.php 0.7.24.src/e107_plugins/other_news_menu/languages/English.php
--- 0.7.23.src/e107_plugins/other_news_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/other_news_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/other_news_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/other_news_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/other_news_menu/other_news2_menu.php 0.7.24.src/e107_plugins/other_news_menu/other_news2_menu.php
--- 0.7.23.src/e107_plugins/other_news_menu/other_news2_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/other_news_menu/other_news2_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/other_news_menu/other_news2_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/other_news_menu/other_news2_menu.php $
+|     $Revision: 11678 $
+|     $Id: other_news2_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/other_news_menu/other_news_menu.php 0.7.24.src/e107_plugins/other_news_menu/other_news_menu.php
--- 0.7.23.src/e107_plugins/other_news_menu/other_news_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/other_news_menu/other_news_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/other_news_menu/other_news_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/other_news_menu/other_news_menu.php $
+|     $Revision: 11678 $
+|     $Id: other_news_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/pdf/admin_pdf_config.php 0.7.24.src/e107_plugins/pdf/admin_pdf_config.php
--- 0.7.23.src/e107_plugins/pdf/admin_pdf_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pdf/admin_pdf_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,19 +1,18 @@
 <?php
 /*
 + ----------------------------------------------------------------------------+
-|    e107 website system
+|     e107 website system
 |
-|    Steve Dunstan 2001-2002
-|    http://e107.org
-|    jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|    Released under the terms and conditions of the
-|    GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|    $Source: /cvs_backup/e107_0.7/e107_plugins/pdf/admin_pdf_config.php,v $
-|    $Revision: 11346 $
-|    $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|    $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pdf/admin_pdf_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_pdf_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/pdf/e107pdf.php 0.7.24.src/e107_plugins/pdf/e107pdf.php
--- 0.7.23.src/e107_plugins/pdf/e107pdf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pdf/e107pdf.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pdf/e107pdf.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pdf/e107pdf.php $
+|     $Revision: 11678 $
+|     $Id: e107pdf.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/pdf/languages/English.php 0.7.24.src/e107_plugins/pdf/languages/English.php
--- 0.7.23.src/e107_plugins/pdf/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pdf/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + -----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pdf/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pdf/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +-----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/pdf/pdf.php 0.7.24.src/e107_plugins/pdf/pdf.php
--- 0.7.23.src/e107_plugins/pdf/pdf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pdf/pdf.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pdf/pdf.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pdf/pdf.php $
+|     $Revision: 11678 $
+|     $Id: pdf.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/plugin.php 0.7.24.src/e107_plugins/pm/plugin.php
--- 0.7.23.src/e107_plugins/pm/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pm/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/pm_class.php 0.7.24.src/e107_plugins/pm/pm_class.php
--- 0.7.23.src/e107_plugins/pm/pm_class.php	2010-06-12 16:45:02.000000000 -0500
+++ 0.7.24.src/e107_plugins/pm/pm_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_class.php,v $
-|     $Revision: 11576 $
-|     $Date: 2010-06-12 16:45:26 -0500 (Sat, 12 Jun 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/pm_class.php $
+|     $Revision: 11678 $
+|     $Id: pm_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/pm_conf.php 0.7.24.src/e107_plugins/pm/pm_conf.php
--- 0.7.23.src/e107_plugins/pm/pm_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pm/pm_conf.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_conf.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/pm_conf.php $
+|     $Revision: 11678 $
+|     $Id: pm_conf.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $retrieve_prefs[] = 'pm_prefs';
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/pm_func.php 0.7.24.src/e107_plugins/pm/pm_func.php
--- 0.7.23.src/e107_plugins/pm/pm_func.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pm/pm_func.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_func.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/pm_func.php $
+|     $Revision: 11678 $
+|     $Id: pm_func.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/pm_shortcodes.php 0.7.24.src/e107_plugins/pm/pm_shortcodes.php
--- 0.7.23.src/e107_plugins/pm/pm_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pm/pm_shortcodes.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/pm_shortcodes.php $
+|     $Revision: 11678 $
+|     $Id: pm_shortcodes.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/pm_template.php 0.7.24.src/e107_plugins/pm/pm_template.php
--- 0.7.23.src/e107_plugins/pm/pm_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/pm/pm_template.php	2010-09-11 14:02:22.000000000 -0500
@@ -3,25 +3,24 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/pm_template.php $
+|     $Revision: 11779 $
+|     $Id: pm_template.php 11779 2010-09-11 19:02:46Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
 
 global $sc_style;
 
-define("PM_READ_ICON", "<img src='".e_PLUGIN_ABS."/pm/images/read.png' style='height:16px; width:16px; border:0px' alt='".LAN_PM_111."' />");
-define("PM_UNREAD_ICON", "<img src='".e_PLUGIN_ABS."/pm/images/unread.png' style='height:16px; width:16px; border:0px' alt='".LAN_PM_27."' />");
+define("PM_READ_ICON", "<img src='".e_PLUGIN_ABS."pm/images/read.png' style='height:16px; width:16px; border:0px' alt='".LAN_PM_111."' />");
+define("PM_UNREAD_ICON", "<img src='".e_PLUGIN_ABS."pm/images/unread.png' style='height:16px; width:16px; border:0px' alt='".LAN_PM_27."' />");
 
 $sc_style['PM_ATTACHMENT_ICON']['pre'] = " ";
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/pm_update_check.php 0.7.24.src/e107_plugins/pm/pm_update_check.php
--- 0.7.23.src/e107_plugins/pm/pm_update_check.php	2010-07-13 17:04:05.000000000 -0500
+++ 0.7.24.src/e107_plugins/pm/pm_update_check.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_update_check.php,v $
-|     $Revision: 11598 $
-|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/pm_update_check.php $
+|     $Revision: 11678 $
+|     $Id: pm_update_check.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/pm_update.php 0.7.24.src/e107_plugins/pm/pm_update.php
--- 0.7.23.src/e107_plugins/pm/pm_update.php	2010-04-25 15:17:27.000000000 -0500
+++ 0.7.24.src/e107_plugins/pm/pm_update.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_update.php,v $
-|     $Revision: 11499 $
-|     $Date: 2010-04-25 15:17:51 -0500 (Sun, 25 Apr 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/pm_update.php $
+|     $Revision: 11678 $
+|     $Id: pm_update.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/pm/private_msg_menu.php 0.7.24.src/e107_plugins/pm/private_msg_menu.php
--- 0.7.23.src/e107_plugins/pm/private_msg_menu.php	2010-07-13 17:04:05.000000000 -0500
+++ 0.7.24.src/e107_plugins/pm/private_msg_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/private_msg_menu.php,v $
-|     $Revision: 11598 $
-|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/private_msg_menu.php $
+|     $Revision: 11678 $
+|     $Id: private_msg_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/poll/admin_config.php 0.7.24.src/e107_plugins/poll/admin_config.php
--- 0.7.23.src/e107_plugins/poll/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/poll/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/poll/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/poll/languages/English.php 0.7.24.src/e107_plugins/poll/languages/English.php
--- 0.7.23.src/e107_plugins/poll/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/poll/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/poll/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/poll/oldpolls.php 0.7.24.src/e107_plugins/poll/oldpolls.php
--- 0.7.23.src/e107_plugins/poll/oldpolls.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/poll/oldpolls.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
  + ----------------------------------------------------------------------------+
  |     e107 website system
  |
- |     Steve Dunstan 2001-2002
- |     http://e107.org
- |     jalist@e107.org
+ |     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+ |     Copyright (C) 2008-2010 e107 Inc (e107.org)
+ |
  |
  |     Released under the terms and conditions of the
  |     GNU General Public License (http://gnu.org).
  |
- |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/oldpolls.php,v $
- |     $Revision: 11346 $
- |     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
- |     $Author: secretr $
+ |     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/poll/oldpolls.php $
+ |     $Revision: 11678 $
+ |     $Id: oldpolls.php 11678 2010-08-22 00:43:45Z e107coders $
+ |     $Author: e107coders $
  +----------------------------------------------------------------------------+
  */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/poll/plugin.php 0.7.24.src/e107_plugins/poll/plugin.php
--- 0.7.23.src/e107_plugins/poll/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/poll/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/poll/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/poll/poll_class.php 0.7.24.src/e107_plugins/poll/poll_class.php
--- 0.7.23.src/e107_plugins/poll/poll_class.php	2010-07-19 04:22:15.000000000 -0500
+++ 0.7.24.src/e107_plugins/poll/poll_class.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/poll_class.php,v $
-|     $Revision: 11606 $
-|     $Date: 2010-07-19 04:22:39 -0500 (Mon, 19 Jul 2010) $
-|     $Author: nlstart $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/poll/poll_class.php $
+|     $Revision: 11678 $
+|     $Id: poll_class.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/poll/poll_menu.php 0.7.24.src/e107_plugins/poll/poll_menu.php
--- 0.7.23.src/e107_plugins/poll/poll_menu.php	2010-07-19 04:22:15.000000000 -0500
+++ 0.7.24.src/e107_plugins/poll/poll_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/poll_menu.php,v $
-|     $Revision: 11606 $
-|     $Date: 2010-07-19 04:22:39 -0500 (Mon, 19 Jul 2010) $
-|     $Author: nlstart $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/poll/poll_menu.php $
+|     $Revision: 11678 $
+|     $Id: poll_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/poll/poll.php 0.7.24.src/e107_plugins/poll/poll.php
--- 0.7.23.src/e107_plugins/poll/poll.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/poll/poll.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/poll.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/poll/poll.php $
+|     $Revision: 11678 $
+|     $Id: poll.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/poll/templates/poll_template.php 0.7.24.src/e107_plugins/poll/templates/poll_template.php
--- 0.7.23.src/e107_plugins/poll/templates/poll_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/poll/templates/poll_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/templates/poll_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/poll/templates/poll_template.php $
+|     $Revision: 11678 $
+|     $Id: poll_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/powered_by_menu/languages/English.php 0.7.24.src/e107_plugins/powered_by_menu/languages/English.php
--- 0.7.23.src/e107_plugins/powered_by_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/powered_by_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/powered_by_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/powered_by_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/powered_by_menu/powered_by_menu.php 0.7.24.src/e107_plugins/powered_by_menu/powered_by_menu.php
--- 0.7.23.src/e107_plugins/powered_by_menu/powered_by_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/powered_by_menu/powered_by_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/powered_by_menu/powered_by_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/powered_by_menu/powered_by_menu.php $
+|     $Revision: 11678 $
+|     $Id: powered_by_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/rss_menu/admin_prefs.php 0.7.24.src/e107_plugins/rss_menu/admin_prefs.php
--- 0.7.23.src/e107_plugins/rss_menu/admin_prefs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/rss_menu/admin_prefs.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/admin_prefs.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/rss_menu/admin_prefs.php $
+|     $Revision: 11678 $
+|     $Id: admin_prefs.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 /*
diff -x .svn -aruN 0.7.23.src/e107_plugins/rss_menu/e_meta.php 0.7.24.src/e107_plugins/rss_menu/e_meta.php
--- 0.7.23.src/e107_plugins/rss_menu/e_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/rss_menu/e_meta.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/e_meta.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/rss_menu/e_meta.php $
+|     $Revision: 11678 $
+|     $Id: e_meta.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/rss_menu/languages/English.php 0.7.24.src/e107_plugins/rss_menu/languages/English.php
--- 0.7.23.src/e107_plugins/rss_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/rss_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/rss_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/rss_menu/plugin.php 0.7.24.src/e107_plugins/rss_menu/plugin.php
--- 0.7.23.src/e107_plugins/rss_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/rss_menu/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/rss_menu/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit(); }
diff -x .svn -aruN 0.7.23.src/e107_plugins/rss_menu/rss_menu.php 0.7.24.src/e107_plugins/rss_menu/rss_menu.php
--- 0.7.23.src/e107_plugins/rss_menu/rss_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/rss_menu/rss_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/rss_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/rss_menu/rss_menu.php $
+|     $Revision: 11678 $
+|     $Id: rss_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/rss_menu/rss.php 0.7.24.src/e107_plugins/rss_menu/rss.php
--- 0.7.23.src/e107_plugins/rss_menu/rss.php	2010-07-01 15:03:35.000000000 -0500
+++ 0.7.24.src/e107_plugins/rss_menu/rss.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,16 +3,15 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/rss.php,v $
-|     $Revision: 11589 $
-|     $Date: 2010-07-01 15:03:59 -0500 (Thu, 01 Jul 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/rss_menu/rss.php $
+|     $Revision: 11678 $
+|     $Id: rss.php 11678 2010-08-22 00:43:45Z e107coders $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.23.src/e107_plugins/search_menu/languages/English.php 0.7.24.src/e107_plugins/search_menu/languages/English.php
--- 0.7.23.src/e107_plugins/search_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/search_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,10 +3,10 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system - Language File.
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/search_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/search_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LAN_180", "Search");
diff -x .svn -aruN 0.7.23.src/e107_plugins/search_menu/search_menu.php 0.7.24.src/e107_plugins/search_menu/search_menu.php
--- 0.7.23.src/e107_plugins/search_menu/search_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/search_menu/search_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/search_menu/search_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/search_menu/search_menu.php $
+|     $Revision: 11678 $
+|     $Id: search_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/sitebutton_menu/languages/English.php 0.7.24.src/e107_plugins/sitebutton_menu/languages/English.php
--- 0.7.23.src/e107_plugins/sitebutton_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/sitebutton_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/sitebutton_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/sitebutton_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/sitebutton_menu/sitebutton_menu.php 0.7.24.src/e107_plugins/sitebutton_menu/sitebutton_menu.php
--- 0.7.23.src/e107_plugins/sitebutton_menu/sitebutton_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/sitebutton_menu/sitebutton_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/sitebutton_menu/sitebutton_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/sitebutton_menu/sitebutton_menu.php $
+|     $Revision: 11678 $
+|     $Id: sitebutton_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/trackback/admin_config.php 0.7.24.src/e107_plugins/trackback/admin_config.php
--- 0.7.23.src/e107_plugins/trackback/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/trackback/admin_config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/trackback/admin_config.php $
+|     $Revision: 11678 $
+|     $Id: admin_config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/trackback/e_meta.php 0.7.24.src/e107_plugins/trackback/e_meta.php
--- 0.7.23.src/e107_plugins/trackback/e_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/trackback/e_meta.php	2010-08-21 19:43:21.000000000 -0500
@@ -5,10 +5,10 @@
 |     Steve Dunstan 2001-2002 : jalist@e107.org
 |     Released under the terms and conditions of the GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/e_meta.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/trackback/e_meta.php $
+|     $Revision: 11678 $
+|     $Id: e_meta.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +-----------------------------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/trackback/languages/English.php 0.7.24.src/e107_plugins/trackback/languages/English.php
--- 0.7.23.src/e107_plugins/trackback/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/trackback/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/trackback/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/trackback/modtrackback.php 0.7.24.src/e107_plugins/trackback/modtrackback.php
--- 0.7.23.src/e107_plugins/trackback/modtrackback.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/trackback/modtrackback.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/modtrackback.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/trackback/modtrackback.php $
+|     $Revision: 11678 $
+|     $Id: modtrackback.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/trackback/plugin.php 0.7.24.src/e107_plugins/trackback/plugin.php
--- 0.7.23.src/e107_plugins/trackback/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/trackback/plugin.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/plugin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/trackback/plugin.php $
+|     $Revision: 11678 $
+|     $Id: plugin.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/trackback/trackbackClass.php 0.7.24.src/e107_plugins/trackback/trackbackClass.php
--- 0.7.23.src/e107_plugins/trackback/trackbackClass.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/trackback/trackbackClass.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/trackbackClass.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/trackback/trackbackClass.php $
+|     $Revision: 11678 $
+|     $Id: trackbackClass.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/trackback/trackback.php 0.7.24.src/e107_plugins/trackback/trackback.php
--- 0.7.23.src/e107_plugins/trackback/trackback.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/trackback/trackback.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/trackback.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/trackback/trackback.php $
+|     $Revision: 11678 $
+|     $Id: trackback.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/tree_menu/config.php 0.7.24.src/e107_plugins/tree_menu/config.php
--- 0.7.23.src/e107_plugins/tree_menu/config.php	2010-05-01 15:45:42.000000000 -0500
+++ 0.7.24.src/e107_plugins/tree_menu/config.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,17 +1,21 @@
 <?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)
-*
-* Tree menu configuration
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/tree_menu/config.php $
-* $Id: config.php 11510 2010-05-01 20:46:06Z e107steved $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/tree_menu/config.php $
+|     $Revision: 11678 $
+|     $Id: config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
+
 $eplug_admin = TRUE;
 require_once("../../class2.php");
 include_lan(e_PLUGIN."tree_menu/languages/".e_LANGUAGE.".php");
diff -x .svn -aruN 0.7.23.src/e107_plugins/tree_menu/languages/English.php 0.7.24.src/e107_plugins/tree_menu/languages/English.php
--- 0.7.23.src/e107_plugins/tree_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/tree_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/tree_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/tree_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/tree_menu/tree_menu.php 0.7.24.src/e107_plugins/tree_menu/tree_menu.php
--- 0.7.23.src/e107_plugins/tree_menu/tree_menu.php	2010-05-01 15:45:42.000000000 -0500
+++ 0.7.24.src/e107_plugins/tree_menu/tree_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* Tree menu
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/tree_menu/tree_menu.php $
-* $Id: tree_menu.php 11510 2010-05-01 20:46:06Z e107steved $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/tree_menu/tree_menu.php $
+|     $Revision: 11678 $
+|     $Id: tree_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_plugins/userlanguage_menu/languages/English.php 0.7.24.src/e107_plugins/userlanguage_menu/languages/English.php
--- 0.7.23.src/e107_plugins/userlanguage_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/userlanguage_menu/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/userlanguage_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/userlanguage_menu/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_plugins/userlanguage_menu/userlanguage_menu.php 0.7.24.src/e107_plugins/userlanguage_menu/userlanguage_menu.php
--- 0.7.23.src/e107_plugins/userlanguage_menu/userlanguage_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/userlanguage_menu/userlanguage_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/userlanguage_menu/userlanguage_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/userlanguage_menu/userlanguage_menu.php $
+|     $Revision: 11678 $
+|     $Id: userlanguage_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_plugins/usertheme_menu/config.php 0.7.24.src/e107_plugins/usertheme_menu/config.php
--- 0.7.23.src/e107_plugins/usertheme_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/usertheme_menu/config.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/usertheme_menu/config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/usertheme_menu/config.php $
+|     $Revision: 11678 $
+|     $Id: config.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 $eplug_admin = TRUE;
diff -x .svn -aruN 0.7.23.src/e107_plugins/usertheme_menu/usertheme_menu.php 0.7.24.src/e107_plugins/usertheme_menu/usertheme_menu.php
--- 0.7.23.src/e107_plugins/usertheme_menu/usertheme_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_plugins/usertheme_menu/usertheme_menu.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/usertheme_menu/usertheme_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/usertheme_menu/usertheme_menu.php $
+|     $Revision: 11678 $
+|     $Id: usertheme_menu.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/crahan/languages/English.php 0.7.24.src/e107_themes/crahan/languages/English.php
--- 0.7.23.src/e107_themes/crahan/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/crahan/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/crahan/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/crahan/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/crahan/theme.php 0.7.24.src/e107_themes/crahan/theme.php
--- 0.7.23.src/e107_themes/crahan/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/crahan/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/crahan/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/crahan/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/e107v4a/forum_template.php 0.7.24.src/e107_themes/e107v4a/forum_template.php
--- 0.7.23.src/e107_themes/e107v4a/forum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/e107v4a/forum_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/e107v4a/forum_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/e107v4a/forum_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/e107v4a/languages/English.php 0.7.24.src/e107_themes/e107v4a/languages/English.php
--- 0.7.23.src/e107_themes/e107v4a/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/e107v4a/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/e107v4a/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/e107v4a/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/e107v4a/newsfeed_template.php 0.7.24.src/e107_themes/e107v4a/newsfeed_template.php
--- 0.7.23.src/e107_themes/e107v4a/newsfeed_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/e107v4a/newsfeed_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/e107v4a/newsfeed_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/e107v4a/newsfeed_template.php $
+|     $Revision: 11678 $
+|     $Id: newsfeed_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/e107v4a/theme.php 0.7.24.src/e107_themes/e107v4a/theme.php
--- 0.7.23.src/e107_themes/e107v4a/theme.php	2010-07-26 05:07:45.000000000 -0500
+++ 0.7.24.src/e107_themes/e107v4a/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/e107v4a/theme.php,v $
-|     $Revision: 11623 $
-|     $Date: 2010-07-26 05:08:09 -0500 (Mon, 26 Jul 2010) $
-|     $Author: nlstart $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/e107v4a/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/human_condition/languages/English.php 0.7.24.src/e107_themes/human_condition/languages/English.php
--- 0.7.23.src/e107_themes/human_condition/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/human_condition/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/human_condition/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/human_condition/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/human_condition/newforumpost.php 0.7.24.src/e107_themes/human_condition/newforumpost.php
--- 0.7.23.src/e107_themes/human_condition/newforumpost.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/human_condition/newforumpost.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/human_condition/newforumpost.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/human_condition/newforumpost.php $
+|     $Revision: 11678 $
+|     $Id: newforumpost.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/human_condition/theme.php 0.7.24.src/e107_themes/human_condition/theme.php
--- 0.7.23.src/e107_themes/human_condition/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/human_condition/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/human_condition/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/human_condition/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/interfectus/languages/English.php 0.7.24.src/e107_themes/interfectus/languages/English.php
--- 0.7.23.src/e107_themes/interfectus/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/interfectus/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/interfectus/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/interfectus/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/interfectus/theme.php 0.7.24.src/e107_themes/interfectus/theme.php
--- 0.7.23.src/e107_themes/interfectus/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/interfectus/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/interfectus/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/interfectus/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/jayya/admin_template.php 0.7.24.src/e107_themes/jayya/admin_template.php
--- 0.7.23.src/e107_themes/jayya/admin_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/jayya/admin_template.php	2010-08-25 07:12:20.000000000 -0500
@@ -4,15 +4,15 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/jayya/admin_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/jayya/admin_template.php $
+|     $Revision: 11703 $
+|     $Id: admin_template.php 11703 2010-08-25 12:12:44Z secretr $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
@@ -65,7 +65,7 @@
     if (file_exists(THEME.'admin_nav.js')) {
         $ADMIN_HEADER .= "<script type='text/javascript' src='".THEME."admin_nav.js'></script>";
     } else {
-        $ADMIN_HEADER .= "<script type='text/javascript' src='".e_FILE."admin_nav.js'></script>";
+        $ADMIN_HEADER .= "<script type='text/javascript' src='".e_FILE."nav_menu.js'></script>";
     }
 
     $ADMIN_HEADER .= "<div style='width: 100%'><table style='width:100%; border-collapse: collapse; border-spacing: 0px;'>
diff -x .svn -aruN 0.7.23.src/e107_themes/jayya/forum/forum_icons_template.php 0.7.24.src/e107_themes/jayya/forum/forum_icons_template.php
--- 0.7.23.src/e107_themes/jayya/forum/forum_icons_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/jayya/forum/forum_icons_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/jayya/forum/forum_icons_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/jayya/forum/forum_icons_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_icons_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 	
diff -x .svn -aruN 0.7.23.src/e107_themes/jayya/languages/English.php 0.7.24.src/e107_themes/jayya/languages/English.php
--- 0.7.23.src/e107_themes/jayya/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/jayya/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/jayya/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/jayya/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/jayya/theme.php 0.7.24.src/e107_themes/jayya/theme.php
--- 0.7.23.src/e107_themes/jayya/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/jayya/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/jayya/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/jayya/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/download_template.php 0.7.24.src/e107_themes/khatru/download_template.php
--- 0.7.23.src/e107_themes/khatru/download_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/download_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/download_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/khatru/download_template.php $
+|     $Revision: 11678 $
+|     $Id: download_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/forum_posted_template.php 0.7.24.src/e107_themes/khatru/forum_posted_template.php
--- 0.7.23.src/e107_themes/khatru/forum_posted_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/forum_posted_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_posted_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/khatru/forum_posted_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_posted_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/forum_post_template.php 0.7.24.src/e107_themes/khatru/forum_post_template.php
--- 0.7.23.src/e107_themes/khatru/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/forum_post_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_post_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/khatru/forum_post_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_post_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/forum_preview_template.php 0.7.24.src/e107_themes/khatru/forum_preview_template.php
--- 0.7.23.src/e107_themes/khatru/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/forum_preview_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_preview_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/khatru/forum_preview_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_preview_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/forum_template.php 0.7.24.src/e107_themes/khatru/forum_template.php
--- 0.7.23.src/e107_themes/khatru/forum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/forum_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/khatru/forum_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/forum_viewforum_template.php 0.7.24.src/e107_themes/khatru/forum_viewforum_template.php
--- 0.7.23.src/e107_themes/khatru/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/forum_viewforum_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_viewforum_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/khatru/forum_viewforum_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_viewforum_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/forum_viewtopic_template.php 0.7.24.src/e107_themes/khatru/forum_viewtopic_template.php
--- 0.7.23.src/e107_themes/khatru/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/forum_viewtopic_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_viewtopic_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/khatru/forum_viewtopic_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_viewtopic_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/languages/English.php 0.7.24.src/e107_themes/khatru/languages/English.php
--- 0.7.23.src/e107_themes/khatru/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/khatru/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/khatru/news_template.php 0.7.24.src/e107_themes/khatru/news_template.php
--- 0.7.23.src/e107_themes/khatru/news_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/khatru/news_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
diff -x .svn -aruN 0.7.23.src/e107_themes/kubrick/languages/English.php 0.7.24.src/e107_themes/kubrick/languages/English.php
--- 0.7.23.src/e107_themes/kubrick/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/kubrick/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/kubrick/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/kubrick/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/kubrick/theme.php 0.7.24.src/e107_themes/kubrick/theme.php
--- 0.7.23.src/e107_themes/kubrick/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/kubrick/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,19 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|	e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|	Steve Dunstan 2001-2005
-|	http://e107.org
-|	jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|	Released under the terms and conditions of the
-|	GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|   $Revision: 11346 $
-|   $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|   $Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/kubrick/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/alt_theme.php 0.7.24.src/e107_themes/lamb/alt_theme.php
--- 0.7.23.src/e107_themes/lamb/alt_theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/alt_theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,15 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|	e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|	Steve Dunstan 2001-2005
-|	http://e107.org
-|	jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|	Released under the terms and conditions of the
-|	GNU General Public License (http://gnu.org).
-+---------------------------------------------------------------+
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/alt_theme.php $
+|     $Revision: 11678 $
+|     $Id: alt_theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/download_template.php 0.7.24.src/e107_themes/lamb/download_template.php
--- 0.7.23.src/e107_themes/lamb/download_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/download_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/download_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/download_template.php $
+|     $Revision: 11678 $
+|     $Id: download_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/forum_posted_template.php 0.7.24.src/e107_themes/lamb/forum_posted_template.php
--- 0.7.23.src/e107_themes/lamb/forum_posted_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/forum_posted_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_posted_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/forum_posted_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_posted_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/forum_post_template.php 0.7.24.src/e107_themes/lamb/forum_post_template.php
--- 0.7.23.src/e107_themes/lamb/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/forum_post_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_post_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/forum_post_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_post_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/forum_preview_template.php 0.7.24.src/e107_themes/lamb/forum_preview_template.php
--- 0.7.23.src/e107_themes/lamb/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/forum_preview_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_preview_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/forum_preview_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_preview_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/forum_template.php 0.7.24.src/e107_themes/lamb/forum_template.php
--- 0.7.23.src/e107_themes/lamb/forum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/forum_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/forum_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/forum_viewforum_template.php 0.7.24.src/e107_themes/lamb/forum_viewforum_template.php
--- 0.7.23.src/e107_themes/lamb/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/forum_viewforum_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_viewforum_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/forum_viewforum_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_viewforum_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/forum_viewtopic_template.php 0.7.24.src/e107_themes/lamb/forum_viewtopic_template.php
--- 0.7.23.src/e107_themes/lamb/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/forum_viewtopic_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_viewtopic_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/forum_viewtopic_template.php $
+|     $Revision: 11678 $
+|     $Id: forum_viewtopic_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/languages/English.php 0.7.24.src/e107_themes/lamb/languages/English.php
--- 0.7.23.src/e107_themes/lamb/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/news_template.php 0.7.24.src/e107_themes/lamb/news_template.php
--- 0.7.23.src/e107_themes/lamb/news_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/news_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,9 +3,9 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
diff -x .svn -aruN 0.7.23.src/e107_themes/lamb/theme.php 0.7.24.src/e107_themes/lamb/theme.php
--- 0.7.23.src/e107_themes/lamb/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/lamb/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|	e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|	Steve Dunstan 2001-2005
-|	http://e107.org
-|	jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|	Released under the terms and conditions of the
-|	GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/lamb/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/leaf/languages/English.php 0.7.24.src/e107_themes/leaf/languages/English.php
--- 0.7.23.src/e107_themes/leaf/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/leaf/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/leaf/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/leaf/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/leaf/theme.php 0.7.24.src/e107_themes/leaf/theme.php
--- 0.7.23.src/e107_themes/leaf/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/leaf/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|	e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|	Steve Dunstan 2001-2005
-|	http://e107.org
-|	jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|	Released under the terms and conditions of the
-|	GNU General Public License (http://gnu.org).
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/leaf/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+---------------------------------------------------------------+
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/leaf/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/newsroom/languages/English.php 0.7.24.src/e107_themes/newsroom/languages/English.php
--- 0.7.23.src/e107_themes/newsroom/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/newsroom/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/newsroom/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/newsroom/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/reline/admin_template.php 0.7.24.src/e107_themes/reline/admin_template.php
--- 0.7.23.src/e107_themes/reline/admin_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/reline/admin_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/reline/admin_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/reline/admin_template.php $
+|     $Revision: 11678 $
+|     $Id: admin_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/reline/languages/English.php 0.7.24.src/e107_themes/reline/languages/English.php
--- 0.7.23.src/e107_themes/reline/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/reline/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/reline/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/reline/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/reline/theme.php 0.7.24.src/e107_themes/reline/theme.php
--- 0.7.23.src/e107_themes/reline/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/reline/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /*
-+----------------------------------------------------------------------------+
-|	e107 website system
-|
-|	Steve Dunstan 2001-2002
-|	http://e107.org
-|	jalist@e107.org
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|	Released under the terms and conditions of the
-|	GNU General Public License (http://gnu.org).
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|	$Source: /cvs_backup/e107_0.7/e107_themes/reline/theme.php,v $
-|	$Revision: 11346 $
-|	$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|	$Author: secretr $
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
 |
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/reline/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 |	Photo Credits
 |
diff -x .svn -aruN 0.7.23.src/e107_themes/sebes/languages/English.php 0.7.24.src/e107_themes/sebes/languages/English.php
--- 0.7.23.src/e107_themes/sebes/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/sebes/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/sebes/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/sebes/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/sebes/theme.php 0.7.24.src/e107_themes/sebes/theme.php
--- 0.7.23.src/e107_themes/sebes/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/sebes/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,15 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|	e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|	Steve Dunstan 2001-2002
-|	http://e107.org
-|	jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|	Released under the terms and conditions of the
-|	GNU General Public License (http://gnu.org).
-+---------------------------------------------------------------+
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/sebes/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
 
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/admin_template.php 0.7.24.src/e107_themes/templates/admin_template.php
--- 0.7.23.src/e107_themes/templates/admin_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/admin_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/admin_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/admin_template.php $
+|     $Revision: 11678 $
+|     $Id: admin_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/bbcode_template.php 0.7.24.src/e107_themes/templates/bbcode_template.php
--- 0.7.23.src/e107_themes/templates/bbcode_template.php	2010-08-17 03:18:38.000000000 -0500
+++ 0.7.24.src/e107_themes/templates/bbcode_template.php	2010-09-13 19:30:14.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/bbcode_template.php,v $
-|     $Revision: 11662 $
-|     $Date: 2010-08-17 03:19:02 -0500 (Tue, 17 Aug 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/bbcode_template.php $
+|     $Revision: 11783 $
+|     $Id: bbcode_template.php 11783 2010-09-14 00:30:38Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 // How to register your own BBcode button.
@@ -22,7 +22,7 @@
 // $register_bb['blank'] = array("", "[blank][/blank]","Blank example helper text",e_IMAGE."generic/bbcode/template.png");
 
 $BBCODE_TEMPLATE = "
-	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right}
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right}{BB=justify}
 	{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}{BB=youtube}
 ";
 
@@ -34,7 +34,7 @@
 
 $BBCODE_TEMPLATE_SUBMITNEWS = "
 	{BB_HELP}<br />
-    {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right}
+    {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right}{BB=justify}
 	{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}{BB=flash}{BB=youtube}
 ";
 
@@ -43,8 +43,8 @@
 
 $BBCODE_TEMPLATE_ADMIN = "
 	{BB_HELP=admin}<br />
-	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}
-	{BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right}{BB=justify}
+	{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}
 	{BB_PREIMAGEDIR=".e_IMAGE."}
 	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
 ";
@@ -53,8 +53,8 @@
 
 $BBCODE_TEMPLATE_NEWSPOST = "
 	{BB_HELP=$mode}<br />
-	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}
-	{BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right}{BB=justify}
+	{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}
 	{BB_PREIMAGEDIR=".e_IMAGE."newspost_images/}
 	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
 ";
@@ -62,7 +62,7 @@
 $BBCODE_TEMPLATE_CPAGE = "
 	{BB_HELP}<br />
 	{BB=newpage}
-	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right}
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right}{BB=justify}
 	{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}
 	{BB_PREIMAGEDIR=".e_IMAGE."custom/}
 	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/comment_template.php 0.7.24.src/e107_themes/templates/comment_template.php
--- 0.7.23.src/e107_themes/templates/comment_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/comment_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/comment_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/comment_template.php $
+|     $Revision: 11678 $
+|     $Id: comment_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/download_template.php 0.7.24.src/e107_themes/templates/download_template.php
--- 0.7.23.src/e107_themes/templates/download_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/download_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/download_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/download_template.php $
+|     $Revision: 11678 $
+|     $Id: download_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/email_template.php 0.7.24.src/e107_themes/templates/email_template.php
--- 0.7.23.src/e107_themes/templates/email_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/email_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/email_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/email_template.php $
+|     $Revision: 11678 $
+|     $Id: email_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/footer_default.php 0.7.24.src/e107_themes/templates/footer_default.php
--- 0.7.23.src/e107_themes/templates/footer_default.php	2010-07-26 16:46:53.000000000 -0500
+++ 0.7.24.src/e107_themes/templates/footer_default.php	2010-09-07 16:46:03.000000000 -0500
@@ -9,13 +9,44 @@
 * Default footer for user pages
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/footer_default.php $
-* $Id: footer_default.php 11625 2010-07-26 21:47:17Z e107steved $
+* $Id: footer_default.php 11765 2010-09-07 21:46:27Z e107coders $
 *
 */
 
 if (!defined('e107_INIT')) { exit; }
 $In_e107_Footer = TRUE;	// For registered shutdown function
 
+// simple SESSION Fixation
+	if(!session_id()) // someone closed the session?
+	{
+		session_start(); // restart
+	}
+	
+	// regenerate SID
+	$oldSID = session_id(); // old SID
+	$oldSData = $_SESSION; // old session data
+	session_regenerate_id(false); // true don't work on php4 - so time to move on people!	
+	$newSID = session_id(); // new SID
+	
+	// Clean
+	session_id($oldSID); // switch to the old session
+	session_destroy(); // destroy it
+	
+	// set new ID, reopen the session, set saved data
+	session_id($newSID);
+	session_start();
+	$_SESSION = $oldSData;
+	// give 3rd party code a way to prevent token re-generation
+	if(!defsettrue('e_TOKEN_FREEZE'))
+	{
+		$_SESSION['regenerate_'.e_TOKEN_NAME] = time(); // class2 have to re-create token on the next request
+	}
+	unset($oldSID, $newSID, $oldSData);
+	
+	// write session data
+	session_write_close();
+// SESSION End
+
 global $eTraffic, $error_handler, $db_time, $sql, $sql2, $mySQLserver, $mySQLuser, $mySQLpassword, $mySQLdefaultdb, $CUSTOMFOOTER, $FOOTER, $e107, $e107ParseHeaderFlag, $e107CustomFooter;
 global $pref;
 //
@@ -77,7 +108,7 @@
 	echo ($rinfo ? "\n<div style='text-align:center' class='smalltext'>{$rinfo}</div>\n" : "");
 
 
-	if ((ADMIN || $pref['developer']) && E107_DEBUG_LEVEL) {
+	if ((ADMIN || $pref['developer'] || defined('e_DEBUG')) && E107_DEBUG_LEVEL) {
 		global $db_debug;
 		echo "\n<!-- DEBUG -->\n";
 		$db_debug->Show_All();
@@ -142,7 +173,8 @@
 	}
 }
 
-if((ADMIN == true || $pref['developer']) && count($error_handler->errors) && $error_handler->debug == true) 
+
+if((ADMIN == true || $pref['developer'] || defined('e_DEBUG')) && count($error_handler->errors) && $error_handler->debug == true) 
 {
 	echo "
 	<div class='e107_debug php_err block-text'>
@@ -203,8 +235,22 @@
 $page = ob_get_clean();
 
 $etag = md5($page);
-header("Cache-Control: must-revalidate");
-header("ETag: {$etag}");
+
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
+{
+	$IF_NONE_MATCH = str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH']);
+	/*
+	$data = "IF_NON_MATCH = ".$IF_NONE_MATCH;
+	$data .= "\nEtag = ".$etag;
+	file_put_contents(e_THEME."templates/etag_log.txt",$data);
+	*/
+	
+	if($IF_NONE_MATCH == $etag || ($IF_NONE_MATCH == ($etag."-gzip")))
+	{
+		header('HTTP/1.1 304 Not Modified');
+		exit();	
+	}
+}
 
 $pref['compression_level'] = 6;
 $browser_support = FALSE;
@@ -220,6 +266,7 @@
 if(varset($pref['compress_output'],false) && $server_support == true && $browser_support == true) 
 {
 	$level = intval($pref['compression_level']);
+	header("ETag: \"{$etag}-gzip\"");
 	$page = gzencode($page, $level);
 	header("Content-Encoding: gzip", true);
 	header("Content-Length: ".strlen($page), true);
@@ -227,6 +274,15 @@
 } 
 else 
 {
+	if($browser_support==TRUE) 
+	{
+		header("ETag: \"{$etag}-gzip\"");	
+	}
+	else
+	{
+		header("ETag: \"{$etag}\"");	
+	}
+	
 	header("Content-Length: ".strlen($page), true);
 	echo $page;
 }
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/header_default.php 0.7.24.src/e107_themes/templates/header_default.php
--- 0.7.23.src/e107_themes/templates/header_default.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/header_default.php	2010-09-07 13:51:19.000000000 -0500
@@ -5,10 +5,10 @@
 |     Steve Dunstan 2001-2002 : jalist@e107.org
 |     Released under the terms and conditions of the GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/header_default.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/header_default.php $
+|     $Revision: 11763 $
+|     $Id: header_default.php 11763 2010-09-07 18:51:43Z e107coders $
+|     $Author: e107coders $
 +-----------------------------------------------------------------------------------------------+
 */
 
@@ -220,7 +220,7 @@
 echo "<!-- *META* -->\n";
 
 // --- Load plugin Meta files and eplug_ before others --------
-if (is_array($pref['e_meta_list']))
+if (varset($pref['e_meta_list']) && is_array($pref['e_meta_list']))
 {
 	foreach($pref['e_meta_list'] as $val)
 	{
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/membersonly_template.php 0.7.24.src/e107_themes/templates/membersonly_template.php
--- 0.7.23.src/e107_themes/templates/membersonly_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/membersonly_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/membersonly_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/membersonly_template.php $
+|     $Revision: 11678 $
+|     $Id: membersonly_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/signup_template.php 0.7.24.src/e107_themes/templates/signup_template.php
--- 0.7.23.src/e107_themes/templates/signup_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/signup_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/signup_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/signup_template.php $
+|     $Revision: 11678 $
+|     $Id: signup_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/sitedown_template.php 0.7.24.src/e107_themes/templates/sitedown_template.php
--- 0.7.23.src/e107_themes/templates/sitedown_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/sitedown_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/sitedown_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/sitedown_template.php $
+|     $Revision: 11678 $
+|     $Id: sitedown_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/userposts_template.php 0.7.24.src/e107_themes/templates/userposts_template.php
--- 0.7.23.src/e107_themes/templates/userposts_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/userposts_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/userposts_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/userposts_template.php $
+|     $Revision: 11678 $
+|     $Id: userposts_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/usersettings_template.php 0.7.24.src/e107_themes/templates/usersettings_template.php
--- 0.7.23.src/e107_themes/templates/usersettings_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/usersettings_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/usersettings_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/usersettings_template.php $
+|     $Revision: 11678 $
+|     $Id: usersettings_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/templates/user_template.php 0.7.24.src/e107_themes/templates/user_template.php
--- 0.7.23.src/e107_themes/templates/user_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/templates/user_template.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/templates/user_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/templates/user_template.php $
+|     $Revision: 11678 $
+|     $Id: user_template.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/vekna_blue/languages/English.php 0.7.24.src/e107_themes/vekna_blue/languages/English.php
--- 0.7.23.src/e107_themes/vekna_blue/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/vekna_blue/languages/English.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/e107_themes/vekna_blue/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/vekna_blue/languages/English.php $
+|     $Revision: 11678 $
+|     $Id: English.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/e107_themes/vekna_blue/theme.php 0.7.24.src/e107_themes/vekna_blue/theme.php
--- 0.7.23.src/e107_themes/vekna_blue/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/e107_themes/vekna_blue/theme.php	2010-08-21 19:43:21.000000000 -0500
@@ -1,15 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|	e107 website system
++ ----------------------------------------------------------------------------+
+|     e107 website system
 |
-|	Steve Dunstan 2001-2005
-|	http://e107.org
-|	jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
-|	Released under the terms and conditions of the
-|	GNU General Public License (http://gnu.org).
-+---------------------------------------------------------------+
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_themes/vekna_blue/theme.php $
+|     $Revision: 11678 $
+|     $Id: theme.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
diff -x .svn -aruN 0.7.23.src/email.php 0.7.24.src/email.php
--- 0.7.23.src/email.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/email.php	2010-09-21 13:04:12.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/email.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/email.php $
+|     $Revision: 11808 $
+|     $Id: email.php 11808 2010-09-21 18:04:36Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -94,7 +94,7 @@
 
 	if ($comments == '')
 	{
-		$message = LAN_EMAIL_188.' '.SITENAME.' ('.SITEURL.')';
+		$message = LAN_EMAIL_6.' '.SITENAME.' ('.SITEURL.')';
 		if (USER == TRUE)
 		{
 			$message .= "\n\n".LAN_EMAIL_1." ".USERNAME;
@@ -106,7 +106,7 @@
 	}
 	else
 	{
-		$message .= $comments."\n";
+//		$message .= $comments."\n";		// Added into message later
 	}
 	$ip = $e107->getip();
 	$message .= "\n\n".LAN_EMAIL_2." ".$ip."\n\n";
diff -x .svn -aruN 0.7.23.src/error.php 0.7.24.src/error.php
--- 0.7.23.src/error.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/error.php	2010-08-28 12:02:14.000000000 -0500
@@ -3,24 +3,24 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/error.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/error.php $
+|     $Revision: 11715 $
+|     $Id: error.php 11715 2010-08-28 17:02:38Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
 
 
 define("ERR_PAGE_ACTIVE",'error');
-
+unset($_POST);
 require_once("class2.php");
 
 if (!defined('PAGE_NAME')) define('PAGE_NAME','Unknown page');
diff -x .svn -aruN 0.7.23.src/fpw.php 0.7.24.src/fpw.php
--- 0.7.23.src/fpw.php	2010-06-04 13:16:34.000000000 -0500
+++ 0.7.24.src/fpw.php	2010-09-06 15:58:51.000000000 -0500
@@ -3,19 +3,20 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/fpw.php,v $
-|     $Revision: 11570 $
-|     $Date: 2010-06-04 13:16:58 -0500 (Fri, 04 Jun 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/fpw.php $
+|     $Revision: 11753 $
+|     $Id: fpw.php 11753 2010-09-06 20:59:15Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
+define('e_NOCACHE',TRUE);
 require_once("class2.php");
 
 if(USER)
diff -x .svn -aruN 0.7.23.src/gsitemap.php 0.7.24.src/gsitemap.php
--- 0.7.23.src/gsitemap.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/gsitemap.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/gsitemap.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/gsitemap.php $
+|     $Revision: 11678 $
+|     $Id: gsitemap.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
diff -x .svn -aruN 0.7.23.src/index.php 0.7.24.src/index.php
--- 0.7.23.src/index.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/index.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,17 +4,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/index.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/index.php $
+|     $Revision: 11678 $
+|     $Id: index.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/login.php 0.7.24.src/login.php
--- 0.7.23.src/login.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/login.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/login.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/login.php $
+|     $Revision: 11678 $
+|     $Id: login.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/membersonly.php 0.7.24.src/membersonly.php
--- 0.7.23.src/membersonly.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/membersonly.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/membersonly.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/membersonly.php $
+|     $Revision: 11678 $
+|     $Id: membersonly.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
diff -x .svn -aruN 0.7.23.src/news.php 0.7.24.src/news.php
--- 0.7.23.src/news.php	2010-07-31 03:38:55.000000000 -0500
+++ 0.7.24.src/news.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/news.php,v $
-|     $Revision: 11640 $
-|     $Date: 2010-07-31 03:39:19 -0500 (Sat, 31 Jul 2010) $
-|     $Author: e107steved $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/news.php $
+|     $Revision: 11678 $
+|     $Id: news.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
diff -x .svn -aruN 0.7.23.src/online.php 0.7.24.src/online.php
--- 0.7.23.src/online.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/online.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/online.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/online.php $
+|     $Revision: 11678 $
+|     $Id: online.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
diff -x .svn -aruN 0.7.23.src/page.php 0.7.24.src/page.php
--- 0.7.23.src/page.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/page.php	2010-09-16 08:04:35.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/page.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/page.php $
+|     $Revision: 11787 $
+|     $Id: page.php 11787 2010-09-16 13:04:59Z e107steved $
+|     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
 */
@@ -224,6 +224,17 @@
 
 		if(preg_match_all("/\[newpage.*?\]/si", $this -> pageText, $pt))
 		{
+			if (substr($this->pageText, 0, 6) == '[html]')
+			{	// Need to strip html bbcode from wysiwyg on multi-page docs (handled automatically on single pages)
+				if (substr($this->pageText, -7, 7) == '[/html]')
+				{
+					$this->pageText = substr($this->pageText, 6, -7);
+				}
+				else
+				{
+					$this->pageText = substr($this->pageText, 6);
+				}
+			}
 			$pages = preg_split("/\[newpage.*?\]/si", $this -> pageText, -1, PREG_SPLIT_NO_EMPTY);
 			$this -> multipageFlag = TRUE;
 		}
diff -x .svn -aruN 0.7.23.src/print.php 0.7.24.src/print.php
--- 0.7.23.src/print.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/print.php	2010-08-23 12:31:52.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     (C)Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/print.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/print.php $
+|     $Revision: 11692 $
+|     $Id: print.php 11692 2010-08-23 17:32:16Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
@@ -71,7 +71,7 @@
 	}
 	$news_datestamp = $con->convert_date($news_datestamp, "long");
 	$print_text = "<span style=\"font-size: 13px; color: black; font-family: tahoma, verdana, arial, helvetica; text-decoration: none\">
-	<b>".LAN_PRINT_135.": ".$news_title."</b>
+	<b>".LAN_PRINT_135.$news_title."</b>
 	<br />
 	(".LAN_PRINT_86." ".$tp->toHTML($category_name, FALSE, "defs").")
 	<br />
diff -x .svn -aruN 0.7.23.src/rate.php 0.7.24.src/rate.php
--- 0.7.23.src/rate.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/rate.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/rate.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/rate.php $
+|     $Revision: 11678 $
+|     $Id: rate.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/request.php 0.7.24.src/request.php
--- 0.7.23.src/request.php	2010-08-16 16:26:04.000000000 -0500
+++ 0.7.24.src/request.php	2010-08-25 10:05:10.000000000 -0500
@@ -5,21 +5,22 @@
 |     e107 website system
 |
 |     Copyright (c) e107 Inc. 2008-2010
-|     http://e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/request.php,v $
-|     $Revision: 11661 $
-|     $Date: 2010-08-16 16:26:28 -0500 (Mon, 16 Aug 2010) $
-|     $Author: e107coders $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/request.php $
+|     $Revision: 11704 $
+|     $Id: request.php 11704 2010-08-25 15:05:34Z secretr $
+|     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
 // ********************************** SEE HIGHLIGHTED AND NUMBERED QUERIES *****************************
 
-
+// Prevent token re-generation
+define('e_TOKEN_FREEZE', true);
 
 require_once("class2.php");
 include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_download.php");
diff -x .svn -aruN 0.7.23.src/search.php 0.7.24.src/search.php
--- 0.7.23.src/search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/search.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/search.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/search.php $
+|     $Revision: 11678 $
+|     $Id: search.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/signup.php 0.7.24.src/signup.php
--- 0.7.23.src/signup.php	2010-08-04 06:37:04.000000000 -0500
+++ 0.7.24.src/signup.php	2010-09-07 12:02:03.000000000 -0500
@@ -4,14 +4,14 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
 |     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/signup.php $
-|     $Id: signup.php 11648 2010-08-04 11:37:28Z secretr $
+|     $Id: signup.php 11760 2010-09-07 17:02:27Z e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -21,7 +21,7 @@
 	// set e-token so it can be processed by class2
 	$_POST['e-token'] = '';
 }
-
+define("e_NOCACHE",TRUE);
 require_once("class2.php");
 $qs = explode(".", e_QUERY);
 //@TODO what fix?
@@ -483,6 +483,7 @@
 		{
 			$error_message .= LAN_202."\\n";
 			$error = TRUE;
+			$admin_log->log_event(LAN_SIGNUP_102,LAN_SIGNUP_103.$e107->getip(),4);
 		}
 	}
 
diff -x .svn -aruN 0.7.23.src/sitedown.php 0.7.24.src/sitedown.php
--- 0.7.23.src/sitedown.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/sitedown.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/sitedown.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/sitedown.php $
+|     $Revision: 11678 $
+|     $Id: sitedown.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once('class2.php');
diff -x .svn -aruN 0.7.23.src/subcontent.php 0.7.24.src/subcontent.php
--- 0.7.23.src/subcontent.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/subcontent.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/subcontent.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/subcontent.php $
+|     $Revision: 11678 $
+|     $Id: subcontent.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
diff -x .svn -aruN 0.7.23.src/submitnews.php 0.7.24.src/submitnews.php
--- 0.7.23.src/submitnews.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/submitnews.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/submitnews.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/submitnews.php $
+|     $Revision: 11678 $
+|     $Id: submitnews.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/top.php 0.7.24.src/top.php
--- 0.7.23.src/top.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/top.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/top.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/top.php $
+|     $Revision: 11678 $
+|     $Id: top.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
diff -x .svn -aruN 0.7.23.src/upload.php 0.7.24.src/upload.php
--- 0.7.23.src/upload.php	2010-07-31 09:58:21.000000000 -0500
+++ 0.7.24.src/upload.php	2010-08-21 19:43:21.000000000 -0500
@@ -4,16 +4,16 @@
 |     e107 website system
 |
 |     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/upload.php,v $
-|     $Revision: 11643 $
-|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/upload.php $
+|     $Revision: 11678 $
+|     $Id: upload.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
diff -x .svn -aruN 0.7.23.src/user.php 0.7.24.src/user.php
--- 0.7.23.src/user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/user.php	2010-08-23 02:25:23.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/user.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/user.php $
+|     $Revision: 11687 $
+|     $Id: user.php 11687 2010-08-23 07:25:47Z e107steved $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
@@ -124,16 +124,16 @@
 		exit;
 	}
 
-	if (isset($_POST['commentsubmit']) && $pref['profile_comments'])
+	if($pref['profile_comments'])
 	{
 		require_once(e_HANDLER."comment_class.php");
-		$cobj = new comment;
-		$cobj->enter_comment($_POST['author_name'], $_POST['comment'], 'profile', $id, $pid, $_POST['subject']);
+		$comment_edit_query = 'comment.user.'.$id;
 	}
 
-	if($pref['profile_comments'])
+	if (isset($_POST['commentsubmit']) && $pref['profile_comments'])
 	{
-		include_once(e_HANDLER."comment_class.php");
+		$cobj = new comment;
+		$cobj->enter_comment($_POST['author_name'], $_POST['comment'], 'profile', $id, $pid, $_POST['subject']);
 	}
 
 	if($text = renderuser($id))
diff -x .svn -aruN 0.7.23.src/userposts.php 0.7.24.src/userposts.php
--- 0.7.23.src/userposts.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.24.src/userposts.php	2010-08-21 19:43:21.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $Source: /cvs_backup/e107_0.7/userposts.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/userposts.php $
+|     $Revision: 11678 $
+|     $Id: userposts.php 11678 2010-08-22 00:43:45Z e107coders $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
diff -x .svn -aruN 0.7.23.src/usersettings.php 0.7.24.src/usersettings.php
--- 0.7.23.src/usersettings.php	2010-08-01 07:56:47.000000000 -0500
+++ 0.7.24.src/usersettings.php	2010-08-26 18:19:52.000000000 -0500
@@ -1,16 +1,19 @@
 <?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)
-*
-* User settings editing
-*
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/usersettings.php $
-* $Id: usersettings.php 11645 2010-08-01 12:57:11Z e107coders $
-*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     Copyright (C) 2001-2002 Steve Dunstan (jalist@e107.org)
+|     Copyright (C) 2008-2010 e107 Inc (e107.org)
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/usersettings.php $
+|     $Revision: 11707 $
+|     $Id: usersettings.php 11707 2010-08-26 23:20:16Z e107coders $
+|     $Author: e107coders $
++----------------------------------------------------------------------------+
 */
 
 // Experimental e-token
@@ -19,7 +22,7 @@
 	// set e-token so it can be processed by class2
 	$_POST['e-token'] = '';
 }
-
+define("e_NOCACHE",TRUE);
 require_once("class2.php");
 require_once(e_HANDLER."ren_help.php");
 require_once(e_HANDLER."user_extended_class.php");
@@ -645,7 +648,7 @@
 
 $text .= "
 	<input type='hidden' name='_uid' value='{$uuid}' />
-	<input type='hidden' name='e-token' value='".e_TOKEN."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' style='width:100%' />
 	</div>
 	</form>
 	";
