diff -x .svn -aruN 0.7.22.src/article.php 0.7.23.src/article.php
--- 0.7.22.src/article.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/article.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/article.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/backend.php 0.7.23.src/backend.php
--- 0.7.22.src/backend.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/backend.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,105 +0,0 @@
-<?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: /cvs_backup/e107_0.7/backend.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
-*/
-require_once("class2.php");
-	
-$pubdate = strftime("%a, %d %b %Y %I:%M:00 GMT", time());
-$rss = "<?xml version=\"1.0\"?>
-	<rss version=\"2.0\">
-	<channel>
-	<title>".SITENAME."</title>
-	<link>".SITEURL."</link>
-	<description>".SITEDESCRIPTION."</description>
-	<language>en-gb</language>
-	<copyright>".SITEDISCLAIMER."</copyright>
-	<managingEditor>".SITEADMIN."</managingEditor>
-	<webMaster>".SITEADMINEMAIL."</webMaster>
-	<pubDate>{$pubdate}</pubDate>
-	<lastBuildDate>{$pubdate}</lastBuildDate>
-	<docs>http://backend.userland.com/rss</docs>
-	<skipDays><day></day></skipDays>
-	<skipHours><hour></hour></skipHours>
-	<generator>e107 website system (http://e107.org)</generator>
-	<ttl>60<ttl>
-	 
-	<image>
-	<title>".SITENAME."</title>
-	<url>".SITEBUTTON."</url>
-	<link>".SITEURL."</link>
-	<width>88</width>
-	<height>31</height>
-	<description>".SITETAG."</description>
-	</image>
-	 
-	<textInput>
-	<title>Search</title>
-	<description>Search ".SITENAME."</description>
-	<name>query</name>
-	<link>".SITEURL."search.php</link>
-	</textInput>
-	";
-	
-$sql2 = new db;
-$sql->db_Select("news", "*", "news_class=0 AND (news_start=0 || news_start < ".time().") AND (news_end=0 || news_end>".time().") ORDER BY news_datestamp DESC LIMIT 0, 10");
-while ($row = $sql->db_Fetch()) {
-	extract($row);
-	 
-	$sql2->db_Select("news_category", "*", "category_id='{$news_category}'");
-	$row = $sql->db_Fetch();
-	 extract($row);
-	 
-	$sql2->db_Select("user", "user_name", "user_id='{$news_author}' ");
-	$row = $sql->db_Fetch();
-	 extract($row);
-	 
-	 
-	$tmp = explode(" ", $news_body);
-	unset($nb);
-	for($a = 0; $a <= 100; $a++) {
-		$nb .= $tmp[$a]." ";
-	}
-	$nb = htmlspecialchars($nb);
-	$wlog .= $news_title."\n".SITEURL."/comment.php?comment.news.".$news_id."\n\n";
-	 
-	$itemdate = strftime("%a, %d %b %Y %I:%M:00 GMT", $news_datestamp);
-	 
-	 
-	 
-	 
-	$rss .= "<item>
-		<title>$news_title</title>
-		<link>http://".$_SERVER['HTTP_HOST'].e_HTTP."comment.php?comment.news.".$news_id."</link>
-		<description>$nb</description>
-		<category domain=\"".SITEURL."\">$category_name</category>
-		<comments>http://".$_SERVER['HTTP_HOST'].e_HTTP."comment.php?comment.news.".$news_id."</comments>
-		<author>$user_name</author>
-		<pubDate>$itemdate</pubDate>
-		<guid isPermaLink=\"true\">http://".$_SERVER['HTTP_HOST'].e_HTTP."comment.php?comment.news.".$news_id."</guid>
-		</item>
-		";
-	 
-}
-	
-	
-$rss .= "</channel>
-	</rss>";
-	
-	
-echo $rss;	
-	
-?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/banner.php 0.7.23.src/banner.php
--- 0.7.22.src/banner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/banner.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/banner.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/class2.php 0.7.23.src/class2.php
--- 0.7.22.src/class2.php	2010-05-03 16:30:54.000000000 -0500
+++ 0.7.23.src/class2.php	2010-08-20 04:20:24.000000000 -0500
@@ -3,17 +3,17 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|	  Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
+|	  Steve Dunstan 2001-2002 (jalist@e107.org)
+|
+|	  Copyright (C) 2008-2010 e107 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: 11518 $
-|     $Date: 2010-05-03 17:31:18 -0400 (Mon, 03 May 2010) $
-|     $Author: e107steved $
+|     $Revision: 11668 $
+|     $Date: 2010-08-20 04:20:48 -0500 (Fri, 20 Aug 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 //
@@ -45,6 +45,12 @@
 $eTimingStart = microtime();					// preserve these when destroying globals in step C
 $oblev_before_start = ob_get_level();
 
+// Filter common bad agents / queries. 
+if(strpos($_SERVER['QUERY_STRING'],"=http")!==FALSE || strpos($_SERVER["HTTP_USER_AGENT"],"libwww-perl")!==FALSE)
+{
+	exit();
+}
+
 //
 // B: Remove all output buffering
 //
@@ -144,6 +150,13 @@
 // F: Grab e107_config, get directory paths and create $e107 object
 //
 @include_once(realpath(dirname(__FILE__).'/e107_config.php'));
+
+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..
@@ -167,6 +180,27 @@
 	}
 }
 
+// Experimental Code Below.
+// e-Token START
+
+session_start();
+session_regenerate_id(true); // true don't work on php4 - so time to move on people!	
+
+
+
+$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)
@@ -408,10 +442,10 @@
 }
 
 // start a session if session based login is enabled
-if ($pref['user_tracking'] == "session")
-{
-	session_start();
-}
+// 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']));
 
@@ -811,10 +845,10 @@
 	$udata=(USER === TRUE) ? USERID.".".USERNAME : "0";
 	$sql->db_Update("online", "online_user_id = '0', online_pagecount=online_pagecount+1 WHERE online_user_id = '{$udata}' LIMIT 1");
 
-	if ($pref['user_tracking'] == 'session')
+	//if ($pref['user_tracking'] == 'session')
 	{
-		session_destroy();
 		$_SESSION[$pref['cookie_name']]='';
+		session_destroy();
 	}
 
 	cookie($pref['cookie_name'], '', (time() - 2592000));
@@ -1577,20 +1611,19 @@
 
 	define('USERCLASS_LIST', class_list());
 	define('e_CLASS_REGEXP', "(^|,)(".str_replace(",", "|", USERCLASS_LIST).")(,|$)");
-
-	if(USER)
-	{
-		define('POST_REFERER', md5($currentUser['user_password'].$currentUser['user_lastvisit'].USERCLASS_LIST));
-	}
-	else
-	{
-		define('POST_REFERER', '');
-	}
-	if(isset($_POST['__referer']) && $_POST['__referer'] != POST_REFERER) {
-		header('location:'.e_BASE.'index.php');
-		exit;
-	}
-
+//
+//	if(USER)
+//	{
+//		define('POST_REFERER', md5($currentUser['user_password'].$currentUser['user_lastvisit'].USERCLASS_LIST));
+//	}
+//	else
+//	{
+//		define('POST_REFERER', '');
+//	}
+//	if(isset($_POST['__referer']) && $_POST['__referer'] != POST_REFERER) {
+//		header('location:'.e_BASE.'index.php');
+//		exit;
+//	}
 }
 
 $sql->db_Mark_Time('Start: Go online');
diff -x .svn -aruN 0.7.22.src/comment.php 0.7.23.src/comment.php
--- 0.7.22.src/comment.php	2010-04-25 15:17:27.000000000 -0500
+++ 0.7.23.src/comment.php	2010-04-25 15:17:27.000000000 -0500
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/comment.php,v $
 |     $Revision: 11499 $
-|     $Date: 2010-04-25 16:17:51 -0400 (Sun, 25 Apr 2010) $
+|     $Date: 2010-04-25 15:17:51 -0500 (Sun, 25 Apr 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/contact.php 0.7.23.src/contact.php
--- 0.7.22.src/contact.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/contact.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,29 +11,48 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/contact.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if(isset($_POST['send-contactus']) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("class2.php");
 
     // security image may be disabled by removing the appropriate shortcodes from the template.
 	require_once(e_HANDLER."secure_img_handler.php");
 	$sec_img = new secure_image;
 
-
-require_once(HEADERF);
-
-if (!$CONTACT_FORM) {
-	if (file_exists(THEME."contact_template.php")) {
+if (!$CONTACT_FORM)
+{
+	if (file_exists(THEME."contact_template.php"))
+	{
 		require_once(THEME."contact_template.php");
-	} else {
+	}
+	else
+	{		
+		// Redirect Page if no contact-form or contact-info is available. 
+		if(($pref['sitecontacts']== e_UC_NOBODY) && trim(SITECONTACTINFO) == "")
+		{
+				header("location:".e_BASE."index.php");
+				exit;
+		}
+		
 		require_once(e_THEME."templates/contact_template.php");
 	}
 }
 
-if(isset($_POST['send-contactus'])){
+require_once(HEADERF);
+
+if(isset($_POST['send-contactus'])/* && isset($_POST['e-token'])*/)
+{
 
 	$error = "";
 
@@ -86,6 +105,8 @@
 
 	}
 
+
+
 // No errors - so proceed to email the admin and the user (if selected).
     if(!$error)
 	{
diff -x .svn -aruN 0.7.22.src/content.php 0.7.23.src/content.php
--- 0.7.22.src/content.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/content.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/content.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/download.php 0.7.23.src/download.php
--- 0.7.22.src/download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/download.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/download.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_admin/ad_links.php 0.7.23.src/e107_admin/ad_links.php
--- 0.7.22.src/e107_admin/ad_links.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/ad_links.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/ad_links.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/adminb.php 0.7.23.src/e107_admin/adminb.php
--- 0.7.22.src/e107_admin/adminb.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/adminb.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/adminb.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/admin_classis.php 0.7.23.src/e107_admin/admin_classis.php
--- 0.7.22.src/e107_admin/admin_classis.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/admin_classis.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/admin_classis.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/admin_combo.php 0.7.23.src/e107_admin/admin_combo.php
--- 0.7.22.src/e107_admin/admin_combo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/admin_combo.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/admin_combo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/admin_etalkers.php 0.7.23.src/e107_admin/admin_etalkers.php
--- 0.7.22.src/e107_admin/admin_etalkers.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/admin_etalkers.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/admin_etalkers.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/administrator.php 0.7.23.src/e107_admin/administrator.php
--- 0.7.22.src/e107_admin/administrator.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/administrator.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,11 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/administrator.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once('../class2.php');
 if (!getperms('3'))
 {
@@ -260,7 +268,8 @@
 	<td colspan='2' style='text-align:center' class='forumheader'>";
 
 	$text .= "<input class='button' type='submit' name='update_admin' value='".ADMSLAN_52."' />
-	<input type='hidden' name='a_id' value='$a_id' />";
+	<input type='hidden' name='a_id' value='$a_id' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />";
 
 	$text .= "</td>
 	</tr>
diff -x .svn -aruN 0.7.22.src/e107_admin/admin_log.php 0.7.23.src/e107_admin/admin_log.php
--- 0.7.22.src/e107_admin/admin_log.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/admin_log.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/admin_log.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/admin.php 0.7.23.src/e107_admin/admin.php
--- 0.7.22.src/e107_admin/admin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/admin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/admin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/article.php 0.7.23.src/e107_admin/article.php
--- 0.7.22.src/e107_admin/article.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/article.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/article.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/auth.php 0.7.23.src/e107_admin/auth.php
--- 0.7.22.src/e107_admin/auth.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/auth.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,11 +11,17 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/auth.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+// Experimental e-token
+if(isset($_POST['authsubmit']) && !isset($_POST['e-token']))
+{
+	// die - it got through class2 check, it's a bad guy request!
+	die('Access denied!');
+}
 
 if (!defined('e107_INIT')) { exit; }
 
@@ -37,7 +43,7 @@
         $sec_img = new secure_image;
     }
 
-    if ($_POST['authsubmit'])
+    if (isset($_POST['authsubmit']))
     {
         $obj = new auth;
 
@@ -52,12 +58,14 @@
         }
 
         $row = $authresult = $obj->authcheck($_POST['authname'], $_POST['authpass']);
-        if ($row[0] == "authfail") {
+        if ($authresult === FALSE) 
+		{
             echo "<script type='text/javascript'>document.location.href='../index.php'</script>\n";
             header("location: ../index.php");
             exit;
-        } else {
-
+        } 
+		else 
+		{
             $userpass = md5($_POST['authpass']);
             $cookieval = $row['user_id'].".".md5($userpass);
 
@@ -68,6 +76,10 @@
             } else {
                 cookie($pref['cookie_name'], $cookieval, (time()+3600 * 24 * 30));
             }
+			
+			$edata_li = array("user_id" => $user_id, "user_name" => $user_name, "user_admin" => 1);
+			$e_event->trigger("login", $edata_li);
+			
             echo "<script type='text/javascript'>document.location.href='admin.php'</script>\n";
         }
     }
@@ -131,6 +143,7 @@
             <td colspan='2' style='text-align:center' class='forumheader'>
 
             <input class='button' type='submit' name='authsubmit' value='".ADLAN_91."' />
+			<input type='hidden' name='e-token' value='".e_TOKEN."' />
             </td>
             </tr>
             </table>
@@ -171,7 +184,7 @@
                 return $row;
             }
         }
-        return array("authfail");
+        return FALSE;
     }
 }
 
diff -x .svn -aruN 0.7.22.src/e107_admin/banlist.php 0.7.23.src/e107_admin/banlist.php
--- 0.7.22.src/e107_admin/banlist.php	2010-05-24 14:58:19.000000000 -0500
+++ 0.7.23.src/e107_admin/banlist.php	2010-07-31 09:58:21.000000000 -0500
@@ -9,14 +9,21 @@
 * User ban management
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/banlist.php $
-* $Id: banlist.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+* $Id: banlist.php 11643 2010-07-31 14:58:45Z secretr $
 *
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../class2.php");
-if(count($_POST) && !varset($_POST['__referer']))
+if(count($_POST) && !varset($_POST['e-token']))
 {
-	header('location:'.e_BASE.'index.php');
-	exit;
+	die('Access denied');
 }
 if (!getperms("4")) {
 	header("location:".e_BASE."index.php");
@@ -71,7 +78,7 @@
 
 $text .= "<div style='text-align:center'>
 	<form method='post' action='".e_SELF."'>
-	<input type='hidden' name='__referer' value='".POST_REFERER."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />
 
 	<table style='".ADMIN_WIDTH."' class='fborder'>
 
@@ -92,7 +99,7 @@
 	<tr style='vertical-align:top'>
 	<td colspan='2' style='text-align:center' class='forumheader'>".
 ($action == "edit" ? "<input type='hidden' name='old_ip' value='$banlist_ip' /><input class='button' type='submit' name='update_ban' value='".LAN_UPDATE."' />" : "<input class='button' type='submit' name='add_ban' value='".BANLAN_8."' />")."
-	<input type='hidden' name='__referer' value='".POST_REFERER."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />
 
 	</td>
 	</tr>
@@ -124,7 +131,7 @@
 			$banlist_reason = str_replace("LAN_LOGIN_18", BANLAN_11, $banlist_reason);
 			$text .= "<tr><td style='width:70%' class='forumheader3'>$banlist_ip<br />".BANLAN_7.": $banlist_reason</td>
 				<td style='width:30%; text-align:center' class='forumheader3'>
-				<input type='hidden' name='__referer' value='".POST_REFERER."' />
+				<input type='hidden' name='e-token' value='".e_TOKEN."' />
 				".
 				$rs->form_button("submit", "main_edit_$count", LAN_EDIT, "onclick=\"document.getElementById('ban_form').action='".e_SELF."?edit-$banlist_ip'\"").
 				$rs->form_button("submit", "main_delete_$count", BANLAN_4, "onclick=\"document.getElementById('ban_form').action='".e_SELF."?remove-$banlist_ip'\"")."</td>\n</tr>";
diff -x .svn -aruN 0.7.22.src/e107_admin/banner.php 0.7.23.src/e107_admin/banner.php
--- 0.7.22.src/e107_admin/banner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/banner.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/banner.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/cache.php 0.7.23.src/e107_admin/cache.php
--- 0.7.22.src/e107_admin/cache.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/cache.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/cache.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/cascade.php 0.7.23.src/e107_admin/cascade.php
--- 0.7.22.src/e107_admin/cascade.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/cascade.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/cascade.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/categories.php 0.7.23.src/e107_admin/categories.php
--- 0.7.22.src/e107_admin/categories.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/categories.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/categories.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/check_user.php 0.7.23.src/e107_admin/check_user.php
--- 0.7.22.src/e107_admin/check_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/check_user.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/check_user.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/classis.php 0.7.23.src/e107_admin/classis.php
--- 0.7.22.src/e107_admin/classis.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/classis.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/classis.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/combo.php 0.7.23.src/e107_admin/combo.php
--- 0.7.22.src/e107_admin/combo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/combo.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/combo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/comment.php 0.7.23.src/e107_admin/comment.php
--- 0.7.22.src/e107_admin/comment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/comment.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/comment.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/compact.php 0.7.23.src/e107_admin/compact.php
--- 0.7.22.src/e107_admin/compact.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/compact.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/compact.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/content.php 0.7.23.src/e107_admin/content.php
--- 0.7.22.src/e107_admin/content.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/content.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/content.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/core_image.php 0.7.23.src/e107_admin/core_image.php
--- 0.7.22.src/e107_admin/core_image.php	2010-05-27 13:26:13.000000000 -0500
+++ 0.7.23.src/e107_admin/core_image.php	2010-08-20 15:08:46.000000000 -0500
@@ -3,15 +3,14 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Copyright (C) 2008-2010 e107 Inc. 
 |     http://e107.org
-|     jalist@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/core_image.php $
-|     $Id: core_image.php 11555 2010-05-27 18:26:37Z mcfly_e107 $
+|     $Id: core_image.php 11673 2010-08-20 20:09:10Z e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -22,12 +21,12 @@
   array (
     'includes' => 
     array (
-      'beginner.php' => '0c1e2f39f3bbca0217fb8270faab89b0',
-      'cascade.php' => '0a72b3d79df54528c3f1ddadf2be5ee8',
-      'categories.php' => '398244539922ca23a6353e9e4f1331d5',
-      'classis.php' => 'bce057b2375e4a0dd00a864bdc37e712',
-      'combo.php' => '67dec71c9f59e754ef6897488025da2c',
-      'compact.php' => '3637443c93ff52fa2c4383023a40540c',
+      'beginner.php' => '88df2b0272c6d0c83ae519e36e3f25ea',
+      'cascade.php' => '46c0b6234d0f16ce875617ffab8b5557',
+      'categories.php' => 'abd5add905a8b79a0c6bbd01924faf2c',
+      'classis.php' => '9352bea38ac71179891ff81ac3f0464e',
+      'combo.php' => '955eb82d086c91c83b9b6d00f2dfa174',
+      'compact.php' => '86623fd88a33d245c0577425dd58527b',
     ),
     'sql' => 
     array (
@@ -35,77 +34,77 @@
       array (
         'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       ),
-      'core_pg.php' => 'e0e3a52fb4b8b0cc4f5a66adc033d539',
-      'core_sql.php' => 'cfe673b1cb625d896faaa2f06811d2df',
-      'extended_country.php' => 'fb6727081d3d5e70e553e5675b56b0cf',
-    ),
-    'ad_links.php' => '3d247825b962565940ab77a4c43c6e90',
-    'admin.php' => '977748426df2a3f1e96a1bf2cb9ed663',
-    'admin_classis.php' => 'adba935d8473a32194b82e3cec5aa622',
-    'admin_combo.php' => '91b2b95881fbfc164e3cec3a4e66fc69',
-    'admin_etalkers.php' => '2238f6bf06345250f2e776f0fa121e05',
-    'admin_log.php' => '1f7e1d657466fcbcb1bafff70f495d97',
-    'adminb.php' => '7f6e5ec637b4caac6e5234af7917e708',
-    'administrator.php' => 'd5ca4e8934f0f606567a2dbdb5981bc8',
-    'article.php' => '7b86b603fd057a03a5e8a9fee33804c6',
-    'auth.php' => '073a03fb01d40c080cb59af60ee75dea',
-    'banlist.php' => '9f5ed7e5947ff55daf15b0e83653f64c',
-    'banner.php' => '230435a3e6a05e31554a34ccccd958b3',
-    'cache.php' => 'fe8562fde538ad402714a2c862aaeb66',
-    'cascade.php' => 'eaeb7cf8f771405c49d213e3f72ed87c',
-    'categories.php' => 'e254ffe85990cfc1eb036b7b3140b24b',
-    'check_user.php' => '544997ad1d9b4b8311fd0a487915b0e6',
-    'classis.php' => '96576bff4d09dc75923244bc61dfd5f0',
-    'combo.php' => '4a9bd0f6f59f91e8b06b46cd1aeb2c24',
-    'comment.php' => 'e19cef505e9e34b173347776822fc938',
-    'compact.php' => '7d2fb15144e156001a5ba509c8e9460c',
-    'content.php' => '11c0b2775685a764568e56309b9f6640',
-    'core_image.php' => 'ae17cae0f8c8801923991e5c185563de',
-    'cpage.php' => '42db23338a2c22c6b36dba22c4a2d8c4',
-    'credits.php' => '517a7fa63891e1ddf081022124b55484',
-    'db.php' => '04bfff9ac83efefc421fbfc2f9e47a2f',
-    'db_verify.php' => '1ab7878539ad1cf6fb46cc9803aeefc5',
-    'docs.php' => '59dc6f2bd08de69e258e15b8fb6267f7',
-    'download.php' => 'f9965e27a84e40558531275f8035cbaf',
-    'e107_update.php' => 'c205921e0a76ef06ada605695ff375a2',
-    'emoticon.php' => 'dcc20e1ad560497c1acceeb171326f1e',
-    'fileinspector.php' => '6d553f064fca7b6ce6020b708dd85bcc',
-    'filemanager.php' => '03dfdc82d9c028a4a8f5c5eb36c05ff0',
+      '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',
     'filetypes_.php' => 'f951037335e993337792606cc1475cec',
-    'fla.php' => 'd395ebdb71b93c5fb91b5f0010a0583c',
-    'footer.php' => '7c5cb77384b0c26c0e853ff94af159eb',
-    'frontpage.php' => '09a719ebde54fff768512e66c65ea48d',
-    'header.php' => 'eda855f45afaa837b6c15b4d0a94ab7a',
-    'image.php' => '0dba1ae5f7457274306d5eb59fc0bb36',
-    'index.php' => 'b77288a6b391609f60b2409564992c3e',
-    'lancheck.php' => 'fdaaa24230441e2f023814281556ef45',
-    'language.php' => '0d405c326c3b60041b104e370c477134',
-    'links.php' => '4961429bdb5ef190e305f2dadd507f8a',
-    'mailout.php' => '5a2bdfde65c0182aa0010e491f2c5381',
-    'menus.php' => '1906276d0272894631c32ad6aa764623',
-    'message.php' => '8743cf843760bbf32c7847feaa09c027',
-    'meta.php' => 'dc5e505f4281f56c7c461d284f90ea7d',
-    'modcomment.php' => '6609b8ff954984f078d9157f9570981a',
-    'newspost.php' => '31e02cf945f70c6786be8622e4cc8400',
-    'notify.php' => '4a1bd8344d67380b856154adba33c5c1',
-    'phpinfo.php' => '4df5e29409b5a5b09dbca5ad581fda7b',
-    'plugin.php' => '8e41c495bb1f2e9c5a8d3e48f0665776',
-    'prefs.php' => 'cf935336390bfb04a2ee4dad50ee6463',
-    'review.php' => '5162c3c4b56fd4f969fc75f995a8c345',
-    'search.php' => '1f6c001e78f4a2cb2763f9f467d94f14',
-    'theme.php' => '48ed356f966bd680dc141292e1909da9',
-    'ugflag.php' => 'e3ec924906d125af6a02947b8da53ca3',
-    'update_routines.php' => '6de15787113bc251019d5e592f95d538',
-    'updateadmin.php' => '226df1061c04098f9290b1ed8bf1f79c',
-    'upload.php' => 'd30f38af5626f7136db2de9ad161782f',
-    'userclass.php' => 'eac06ad3c95825ec0622b9285016e939',
-    'userclass2.php' => 'a79836ce63f75c9f111d75fe6a1f621d',
-    'userinfo.php' => '85390decefb4ca067ce27a301a51507c',
-    'users.php' => '6bf5bc0280834b5bc4aef7a148711191',
-    'users_extended.php' => 'd2f37b278a17f39e6604eb48cc7a6097',
-    'users_extended_predefined.php' => 'dfcd9bfa4780211dd5973e01d49831b0',
-    'ver.php' => 'f497d5025efb617170d08b4498c3f532',
-    'wmessage.php' => '351f74bf0a1a756f00b3ae5e2b84acae',
+    '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',
   ),
   $coredir['docs'] => 
   array (
@@ -167,13 +166,15 @@
       'php.bb' => 'a118b04688efa7c626f9bb35acb16423',
       'quote.bb' => '12bfbba32661e309a33972e388b0e912',
       'right.bb' => '9bd60ca738b30f35742a0049c5efc191',
+      'sanitised.bb' => '7e6fb575a630bb52731ca8c4d371e755',
       'size.bb' => 'bd62172ecb7083b85b534c2e45e79d48',
       'spoiler.bb' => '5929f20a04438093df87b7246e843bf0',
       'stream.bb' => '9661057e8db23c681e3ec2340ff3a4fa',
       'textarea.bb' => 'c9af59e1cd5aedc873f40f40727b3685',
-      'time.bb' => '3d83b0dfa9b139004bb19ee34b142b44',
+      'time.bb' => 'dda6c9f9d1245b82921e85f4c9950532',
       'u.bb' => '7f8703e65a5f24bd9d2edd5fc0dfef48',
       'url.bb' => 'e155b50c04ccfc87608a4b13486b9c46',
+      'youtube.bb' => '317858b7bba01feee6bb1de930b696b4',
     ),
     'cache' => 
     array (
@@ -205,9 +206,9 @@
       'import_mapper.php' => '78a98bfedbe66b043e8562bcd6449125',
       'import_readme.txt' => 'a76f8a52208d648e1c9e3afe71929755',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'mambo.php' => '947b1ad30a87f7f542a2324c7d6e709f',
-      'phpbb2.php' => 'bb4c710c520b9d1ed2384141861f867e',
-      'phpnuke.php' => '11d0458d44e2976cacd7e33d3c939df8',
+      'mambo.php' => 'e2b535b1af09e9836d018d4b8052af79',
+      'phpbb2.php' => '90941e90656ef053a7e0d2bbfbbde6e9',
+      'phpnuke.php' => '6c5c83e4dea621d263f35027178e7f21',
     ),
     'misc' => 
     array (
@@ -224,25 +225,26 @@
     ),
     'resetcore' => 
     array (
+      'fixyoutube.php' => '99cbd4dd3cf8070e4b33e370b34f4d7f',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'resetcore.php' => '46055c8acaf6848b3d3be3569c8cc5e3',
+      'resetcore.php' => 'dd8e23f51472cb8b9a8ce08f99586885',
       'style.css' => 'e294495db6f91c4514c4f40d7b09fcd5',
     ),
     'shortcode' => 
     array (
       'batch' => 
       array (
-        'bbcode_shortcodes.php' => '46af3ed7c2b0f5fc135ada558603ac7e',
-        'comment_shortcodes.php' => 'd0a1cca3bb01a4b1056131ff532ce96d',
-        'contact_shortcodes.php' => 'dc84266c922c02f8855bbadb95bcf45e',
-        'download_shortcodes.php' => '72adc4bb3862266f3fbbfbe59070021f',
+        'bbcode_shortcodes.php' => '916eae765997774837ac4cc108892b32',
+        'comment_shortcodes.php' => '18f87a7f2639c3f35e62f46c298989df',
+        'contact_shortcodes.php' => '9526d6857950bfbe6911fbfe73516ba4',
+        'download_shortcodes.php' => '84b57e0e99cb7146ef22c0d716d975e0',
         'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
         'news_archives.php' => 'b7513e4539e166bd371833f77b2c2434',
-        'news_shortcodes.php' => '267e26bb1dd9a759d45d9f87a3835b6d',
-        'signup_shortcodes.php' => '07590cd7c0131411157d7f5b662c9a72',
-        'sitedown_shortcodes.php' => 'cb098045b438d2840c56d42ef17a9583',
-        'user_shortcodes.php' => '8a12717ccd590d357d6486c699f743ad',
-        'usersettings_shortcodes.php' => '6c48f41de4638cd6bb02f0c55ab896c1',
+        'news_shortcodes.php' => '8f0517e5c427ac8412cf4e34a33ac2e7',
+        'signup_shortcodes.php' => 'bb29285e136dba9668c6a228571b3155',
+        'sitedown_shortcodes.php' => '43174bac69d04449e92046b337f0155a',
+        'user_shortcodes.php' => '9a3504346d0a5c2067be9804d68b1b8a',
+        'usersettings_shortcodes.php' => 'dc787d39d92df14b1ac5553d17ee14ba',
       ),
       'admin_alt_nav.sc' => '89693e0f8bded49fc0e75801e0d7086d',
       'admin_credits.sc' => '1b7e691941c78f4a1d2cca5c7a81e839',
@@ -278,7 +280,7 @@
       'extended_value.sc' => '1b720e5d3155c6d4a1464fc1e9cac5f1',
       'imageselector.sc' => '558b028f8a4978f7845224387a141fd6',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'languagelinks.sc' => '0eddea31c4d364d590b36d8f4eb66d33',
+      'languagelinks.sc' => 'b52ab4e95c240a101e781a5bd8a42837',
       'linkstyle.sc' => '5ed64d972bc892a798f80179878f1266',
       'logo.sc' => '7989dac8bea9ec4c0da489fb942ae507',
       'menu.sc' => 'a59149f7071b59afdb17a9be17d0c901',
@@ -298,7 +300,7 @@
       'sitedescription.sc' => 'c617f50a35752e7cb8de2d15f7e6b614',
       'sitedisclaimer.sc' => '6a9e25a899608fd05a56e90a3f4bfd38',
       'sitelinks.sc' => '754259e3bdab4efc147d92b50efdf262',
-      'sitelinks_alt.sc' => 'b5bee24ee1e33ab136408ea13684c986',
+      'sitelinks_alt.sc' => '699ad1453a9251da281c49b9f8503adb',
       'sitename.sc' => 'a62bd1e1600931a2585f16b611fd0c6b',
       'sitetag.sc' => '338e16589e67c9fe45613e3c6dbb9b0d',
       'stylesheet.sc' => 'fff86593b238e374763dab535f6f40a3',
@@ -308,19 +310,19 @@
       'user_extended.sc' => 'cea27d6ef17122c2368703c67b3cb363',
       'wmessage.sc' => '898c3b8537dcad72e5c94bdcf3313631',
     ),
-    'def_e107_prefs.php' => '3f51858e34042c96e8b8cadd3248fd7a',
+    'def_e107_prefs.php' => '2e1b554ccf648590ae4f91ee1b2cdbc6',
     'e107.css' => 'e5cfa4047831f19def7df032ef8bc830',
-    'e107.js' => '6d3d3d6a80202f3b00f1ce3ac3f83f92',
+    'e107.js' => 'f6c99e77afbae971f0ac959f72516674',
     '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' => '1fcfca893ed2a8e18e59a9d0d8ac6eaa',
+    'resetcore.php' => 'b1ef727dcdcc59a823e60763235f6424',
     'sleight_img.gif' => '7616b49c48ca0cd6cbd15e9f747c8886',
-    'sleight_js.php' => 'eaaa144f0233577f2b61023fe587afc4',
-    'thumb.php' => 'e77953c7917cf5f129999e89daab069c',
+    'sleight_js.php' => '6e60ac8f412ca4d42d143e14724e83f8',
+    'thumb.php' => 'c83152eda9c271bc76903208bad3491a',
   ),
   $coredir['handlers'] => 
   array (
@@ -352,26 +354,26 @@
       'class.pop3.php' => '4ee33629dec2b6c217792d2d75f83b51',
       'class.smtp.php' => '3703c67c81f61a223cd6bc1c10687dbf',
       'e107.htaccess' => '507de3fb6f951cafa6b1a346d232604f',
-      'mailout_process.php' => 'c6236cab0e64700bdc310a33ecab498b',
+      'mailout_process.php' => '500f2efb1b41ea88eafee7be20007582',
     ),
     'search' => 
     array (
-      'advanced_comment.php' => 'd34dfe23eb4f9a3017cd6442cde0362c',
-      'advanced_download.php' => '5e40f2db36fae60c95e31ead8ddff76b',
-      'advanced_news.php' => '47c447ce479ddaaa635e8443182450b9',
-      'advanced_pages.php' => '6d55eeeb9cafe99aa17f26a70a0c13ea',
-      'advanced_user.php' => '921a9e23fb7e2dced0be36eb417a632f',
-      'comments_download.php' => 'f6e26822ee94af08b89f8b3aa4b100bd',
-      'comments_news.php' => '2800550914d8503d88929279c52d8cf3',
-      'comments_page.php' => 'edaa3133a59bd16b480b6e3af144bcc8',
-      'comments_user.php' => '9cfbb487bb8e8ede985580fb26512560',
+      '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',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'search_comment.php' => '5b64292b085be9475e406433c431ecfd',
-      'search_download.php' => '7432890755b56238ac15371c13272b6a',
-      'search_event.php' => 'f9864e2351684bb25d4e8b25d0257619',
-      'search_news.php' => 'b304b27463f174db0495adafdd671e82',
-      'search_pages.php' => '9f02e1a8b3b952efabe0940f459ea496',
-      'search_user.php' => 'f07a291c110a6744f749498cbd710b97',
+      'search_comment.php' => '74d7e7da6eb955f9ae0e82b70e7b469c',
+      'search_download.php' => '6b8f9ca5c0bfd263871abc0a4b40b212',
+      'search_event.php' => '13f54974e31421a8379d0a76d388e83d',
+      'search_news.php' => '2fe6ba12cf3bcf9e70578b9800bbf2f6',
+      'search_pages.php' => 'c00c99fb0b35d32d37ab5c66dff47ec4',
+      'search_user.php' => '28a7ca15687b44e918c922cf41627600',
     ),
     'tiny_mce' => 
     array (
@@ -426,10 +428,11 @@
           array (
             'English.php' => 'b4716dc46edddd195dc6a27d95630e2a',
             'en.js' => '2f2d7290102dc90e696f878a96329f3c',
+            'en_dlg.js' => 'eee2f2062df5c75a44991bff169b8ea7',
           ),
           'config.php' => '4e178e32efb96453c26523ded26f6ee7',
           'editor_plugin.js' => 'da29c9b99d2509ac620533ea4e1fee14',
-          'ibrowser.php' => 'd8a10a8cb085104d9e9612b541921095',
+          'ibrowser.php' => '83164c55d16c435dee833c9054d1595c',
         ),
         'iespell' => 
         array (
@@ -729,74 +732,74 @@
       'tiny_mce_gzip.php' => 'def6c78847a3a181cfed52b93d8d5f06',
       'tiny_mce_popup.js' => '8ccd8e1ecd2700cb83ee770337b3b542',
       'tiny_mce_src.js' => '3e0019162c45c999336c2fa811e4f522',
-      'wysiwyg.php' => '8f3cd9616eb6d35c5f2371dd4e155e4d',
+      'wysiwyg.php' => '74fe95471b10c7400f4db3aa41bcc7d8',
     ),
     'admin_handler.php' => '2d593943e40bf02d5d46cf6b6af6b7e7',
-    'admin_log_class.php' => 'df5b496de9c56a9563bb49f865baa38e',
-    'arraystorage_class.php' => '0b364646f2be0ce73e8fc5b11f90f571',
-    'avatar_handler.php' => 'b590a5d240735451574ba78f7c90104f',
-    'bbcode_handler.php' => 'e4673121655289a8f46d00e35ecee8e6',
-    'cache_handler.php' => '9459f0ebc23c886abf263eef2c790496',
-    'comment_class.php' => '2dc74e12d0c97dd26953fa51b05ec5d4',
-    'date_handler.php' => 'f7575b54a437d5fb47a6de2f02f2a77a',
-    'db_debug_class.php' => '03f4813120706c99bb92612ab78628d2',
-    'debug_handler.php' => '2f44151020c12425b530e0abbbb10382',
-    'e107_Compat_handler.php' => '90eda35c373c697ba7c95ceab5f43830',
-    'e107_class.php' => '7d45b73804f9ee3425c76ee4abaac5dc',
-    'e_parse_class.php' => 'fb46649331de7256f4ac82bfa2a6bf67',
-    'emailprint_class.php' => 'd9c12318267ee842882376b90c07f009',
-    'emote.php' => '5cb04e55433d18a973cae4b84becb9bf',
-    'emote_filter.php' => '111b2ea89469b71aaebb5c479f947c27',
-    'encrypt_handler.php' => '50d57fd8b478a0dd466620659c678fd3',
-    'event_class.php' => 'b836b1ca68cc583c4884d5bad9559091',
-    'file_class.php' => 'e0e41c10710af9a35dc01d6596b45c9a',
-    'form_handler.php' => 'c469a6006195b1c9a4f6e67b6955b76f',
+    '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',
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-    'language_class.php' => 'e091be509d8cb776e7312c000a29cdf0',
-    'level_handler.php' => 'dbfc82241789bef8b968b946601c2ebb',
-    'login.php' => '20dade8e7ce1fa1dd7a3a5d2963dfe60',
+    'language_class.php' => 'a85e23250a7fd9f866849cb46a4ac979',
+    'level_handler.php' => '1747cea1f25e09dfb456d26a951b1e66',
+    'login.php' => 'f385142f60fcd5a03bae599afa142479',
     'magpie_rss.php' => 'a04efb623cda4635cf46d9fe7c327d44',
-    'mail.php' => 'f0cda7264feb91375890de5eee883805',
+    'mail.php' => '704bb8225be0e86ce723bd19a9b01e6d',
     'mail_validation_class.php' => '6b27b22b839b06058bbf7da4be345f3f',
-    'message_handler.php' => 'cd03f9fd76c7aca2a744ec02486dcd07',
-    'mysql_class.php' => 'ff31490412a65a6923b7da0421eb9d56',
+    'message_handler.php' => '7346d49fdf97fdeb2e3edf531e3e8bd6',
+    'mysql_class.php' => '6ecbf6bf2bd54a54c7a6a8a57b50fceb',
     'news_class.php' => '03b176867dc946a015c1e4180ce1fc98',
-    'notify_class.php' => '66ff6e42bc6a626a0baa1590fc51881a',
-    'np_class.php' => '7add79abecaa6cd864bb0fbcc29a4032',
-    'override_class.php' => '8e1d0e650e5c6ad51b9db7889aabb4e9',
-    'parser_functions.php' => 'aefea0c8c0b1bd9d8dde7d1d14ed3f7c',
-    'parser_handler.php' => 'e827d016588e59b08eb001a9fa9b63ff',
+    'notify_class.php' => '984e7928c7e7844191ee401069ad72f2',
+    'np_class.php' => '39923bdcf4f1cede200e9584d196c4b9',
+    'override_class.php' => '5fae0f931304de3c66a178f692c5975f',
+    'parser_functions.php' => 'f942200decf4ff1d4f926608f4233073',
+    'parser_handler.php' => '1a3feefd6bd74d4f3ac43ddce7c0273c',
     'pclerror.lib.php' => '7b1498a7efb4524dd899c954526c3ca2',
     'pcltar.lib.php' => 'b9313066aad3049bb0041099137a648e',
     'pcltrace.lib.php' => 'eb165fe908cc30c85975b7d35614990b',
     'pclzip.lib.php' => '7c5bc3eb535a051df497e2be6311a075',
     'php_compatibility_handler.php' => '04e73e8835f5fd14a5febd20028c27d9',
-    'plugin_class.php' => 'a74ae53ac568d2520e97ec4219057bff',
+    'plugin_class.php' => 'c1123a3af3332b735eb39e694bb90927',
     'pop3_class.php' => 'c2c157306f6c670ca8f085a041ea2b3a',
-    'popup_handler.php' => 'b73df6f021801e4bd55b9ef98875a972',
-    'pref_class.php' => '5eb01ce860059f2ff23451da265de8f3',
-    'preset_class.php' => '60ddb9dd3275fb742dafe464cdfe8ffc',
-    'profanity_filter.php' => '5b759a1948bfce32da617d3fe5f77e7c',
-    'rate_class.php' => '77f4304c6147b7010bb729d10b534158',
-    'ren_help.php' => '7d6a0476f8671ffde02b8dc9ba5675cb',
-    'resize_handler.php' => 'bab73fa95e4f83b7b4e5a10d8982116b',
-    'search_class.php' => '99096bb9a2d1c7c35f611a4b06f1adf4',
-    'secure_img_handler.php' => 'dde46ed63b75c0e20e2fa637a3d791ba',
-    'secure_img_render.php' => 'd66dc845568abd43a66e4f21bd9f98b0',
-    'session_handler.php' => '8166f89dcc9d0902f61971b8d11f1dfd',
-    'shortcode_handler.php' => '640a16c3fb3ff8fa58ab5b61a8d94b71',
-    'sitelinks_class.php' => 'ddab2a7dea39067a7bfa8f414ce68878',
+    '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',
     'smtp.php' => 'e3802cca9a715e79e93569750c0459fc',
-    'theme_handler.php' => '1fe3a701a0d5ec518e4dc3da43f28c36',
-    'traffic_class.php' => 'bcbd2aec962fad5c9cc7f8e62633139c',
-    'traffic_class_display.php' => '90ee3f8a726661cabc025d2d05a84858',
-    'upload_handler.php' => '719e8be9c411108e155b12eace32c30f',
-    'user_extended_class.php' => '62a4329dc5bbea162e3149e6a944f47e',
-    'user_func.php' => '0c3240d996023127051008878f91ece7',
-    'user_select_class.php' => '25dece13f184f003e10cd2ef79aa0a25',
-    'userclass_class.php' => 'ca106f00cba12c1003d0be6acf376b04',
-    'usersession_class.php' => '0f345bb13019552761722da1cbbd8bcf',
-    'xml_class.php' => '1cb93dd3aa242cfc2b633e35ce291cc2',
+    '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',
   ),
   $coredir['images'] => 
   array (
@@ -1058,6 +1061,7 @@
         'shortcode.png' => '2c296e414c6e833bdcab2e3dda798061',
         'template.png' => '54281aba1f70c00dc1c947fd053fddfe',
         'underline.png' => '09d08b8f890c4ebba77ecb9f25f20705',
+        'youtube.png' => '3188c5b0da7c042945a450a62ddcd445',
       ),
       'dark' => 
       array (
@@ -1250,7 +1254,7 @@
     'logo_template_large.png' => 'cce83a8f84255d2bab00522b73a4e6d4',
     'pcmag.png' => 'abe521ccc3a89a43ff641ab3daf1f37d',
     'splash.jpg' => '7f749391cb6d31dcf9c9145f3d30df4d',
-    'thumb.php' => '07db74672bdcfb4131159ca303148345',
+    'thumb.php' => 'cdbdab9476fc7fe1813886d6349193d1',
   ),
   $coredir['languages'] => 
   array (
@@ -1260,121 +1264,121 @@
       array (
         'help' => 
         array (
-          'administrator.php' => 'f3257946a015535a0f6ae8443f39bc46',
-          'banlist.php' => '59a2b0e6e458dee21158a94ac738dfab',
-          'cache.php' => '430be999ff9f66aa8187a71f3001177a',
-          'cpage.php' => 'da4af0c609af22c2ab1157355d5badb6',
-          'db.php' => '4b9d11a5622ee08b2bcf56ae52f1d56a',
-          'download.php' => 'ab05bcdef040f8ad2fa0cd217736df21',
-          'emoticon.php' => 'fc0a5ce091e2fa931673389dd1259311',
-          'fileinspector.php' => 'fba10f3ed267757e7f830c58c4813878',
-          'filemanager.php' => 'e591c4029b1c787751efe95b6b1b2dbf',
-          'frontpage.php' => '98864cee5c7bd97a077ef779a69ed9bf',
-          'image.php' => '498925be2ce8baca4821ec9176eddbf8',
+          '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',
           'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-          'language.php' => 'b76843e5f5454eb561c5a017166e2264',
-          'links.php' => 'db0494c61cd969bff7d86288b1f99167',
-          'mailout.php' => 'cd44cc33135f0bcbd37e7b19de35c79e',
-          'menus.php' => 'c8a361b65bbd6ce2c12c1af5dc6734d5',
-          'meta.php' => '10ec51f6c12b0d5137051b73c419fc26',
-          'news_category.php' => 'f50de991b9927da47a65da9113bf2c43',
-          'newspost.php' => 'fda4616753f8c046484dee91eb2455fe',
-          'notify.php' => '0779a463f900f3f669f6ca52f441f2b6',
-          'phpinfo.php' => '266e0f1cb749df0c5c0a45b2b761713d',
-          'prefs.php' => '1288ff61d7b2d3d4dda4570196e3f3fa',
-          'search.php' => 'f828c6108f1fc8e5cc9a551ec6dd8b32',
-          'theme.php' => '354a31ddb7347639b888efdc42489310',
-          'ugflag.php' => '1350f372bfa2b8bad991998352ad84e9',
-          'updateadmin.php' => '23bde263652602e6989f4e4fdb6f3571',
-          'upload.php' => 'c392a8f0a4e68baf65aa89e8c44bc961',
-          'userclass2.php' => '3cfce1d3dba94623644573a8d2886e3e',
-          'users.php' => 'afee7a0cd4c4600f07cd9b7df44c2eba',
-          'users_extended.php' => '5c052a374fbd18b4346486b8335eb1f6',
-          'wmessage.php' => 'f567067e08538f26c9efe9f770e0a055',
-        ),
-        'lan_admin.php' => '2bdeb1acc3e49e95d774d866608f8c51',
-        'lan_admin_log.php' => 'f08c7b17c6fc8078020affd72aa954f1',
-        'lan_administrator.php' => '991b91136d8b3b6a03c7135d06d354a3',
-        'lan_banlist.php' => 'd2bdfed7daa93dda96014dc79534edb6',
-        'lan_banner.php' => 'fb60e0fec97591f025d5653dd38090dd',
-        'lan_cache.php' => '0070612a8d0b3daa86d8651a4da1184f',
-        'lan_check_user.php' => 'eab76ac4a8743724a36488b050c34b14',
-        'lan_cpage.php' => '4ac70059ee8b32cf38200cd26a2665eb',
-        'lan_credits.php' => 'd1a61840e3994f190d72694895722d89',
-        'lan_db.php' => 'db002573e4aea80d3e840bb4c09d18f5',
-        'lan_db_verify.php' => 'd66df684700e66c5b763ba47705fb02e',
+          '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',
         'lan_docs.php' => '9df02b4a6fafef4e9be2962bfeaed509',
-        'lan_download.php' => '5cd1194c7a9ab06d574cec09b6328e19',
-        'lan_e107_update.php' => '200e9e227652e6c2f975eee9f488eca8',
-        'lan_emoticon.php' => '349322694052c8c62953c90bdd040aa6',
-        'lan_fileinspector.php' => '10f44bbe2acf208cce7a6249ca4f7e38',
-        'lan_filemanager.php' => 'd87a00793399815af393eea8bd4b78f1',
-        'lan_fla.php' => 'd9d6ec632046b13b2953abea84b0e0e8',
-        'lan_footer.php' => 'f8b4e75e161533d71cfcefd8afa504eb',
-        'lan_frontpage.php' => '6437890f87a3c5030b6896ce32ea4e3d',
-        'lan_header.php' => '2d44b082e70e147fa0f2b393c32ed7f3',
-        'lan_image.php' => 'b4f7d9899a9e12f848fc2129ffb1b97b',
-        'lan_lancheck.php' => '4c0099b18a29ec74374e4e4478d75c2e',
-        'lan_language.php' => 'ac094637817f17651b1b197c0bda632d',
-        'lan_links.php' => '216cdd892d26d2707c2bebdc95cad4f4',
-        'lan_mailout.php' => '05f462a3bebed82d8e2525fc74025502',
-        'lan_menus.php' => '0d80f1e70979bb6fa3c84884deeabf39',
-        'lan_message.php' => 'e0ccc199099fbca4b7111597946ca4bc',
-        'lan_meta.php' => 'c6927757e13df4fba5e2e0e87620ff0b',
-        'lan_modcomment.php' => '6cb37e4a5530cc635f57e6c101f2125b',
-        'lan_newspost.php' => 'abd9a03c308402197c760249b5850c60',
-        'lan_notify.php' => '0d762b28fd507a83bb3d44fdf7eef1c7',
-        'lan_plugin.php' => '00f4d9649e6852fe844b5440d6451bdb',
-        'lan_prefs.php' => '35bb0648d3db02c382fd97b074155799',
-        'lan_search.php' => 'f6c9cd7a0d2de5b4068be1bafa02e311',
+        '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_prefs.php' => '3c6c33f6a06ea4fbed06e77cb0d836fb',
+        'lan_search.php' => 'ba45f93e2a560037a85aa58f5ed0b418',
         'lan_theme.php' => '62ad19c5bde555bd2d32b4b9bb4e85c2',
-        'lan_ugflag.php' => '6148a4ea081541efb913ad9243b009d8',
-        'lan_updateadmin.php' => '9e012beb6b29469ff49caa2547d20e9b',
-        'lan_upload.php' => '4356f6c1e717a8f20c1bd5f4857ecd1e',
-        'lan_userclass.php' => '6007d7792bd44c62bd2abf329366faa6',
-        'lan_userclass2.php' => '5d3dec50079c9d2622998d073709b8f5',
-        'lan_userinfo.php' => '64aa410d605b972c54f135d159ccf46c',
-        'lan_users.php' => '48d1540ce2acad3b047830005bb8d11d',
-        'lan_users_extended.php' => '02e50b035aff289e3456681d447563a3',
-        'lan_wmessage.php' => 'ab868ffcbf486de63beb8ea483ca3d49',
-      ),
-      'English.php' => 'cffacb3e065309f39bf2411843ef8275',
-      'lan_banner.php' => '08d799095424424ae09402f1bb83b867',
-      'lan_comment.php' => '81c5fec133c4000f1cb63df2afe539ec',
-      'lan_contact.php' => '89020c7ee3976acfbbcab7192356d9d4',
-      'lan_date.php' => 'd4201e4256923bb45b766f8352bc2185',
-      'lan_download.php' => 'db6cf0424c312d0fc76b3d7b6aee805a',
-      'lan_email.php' => '19e940b26b19d5a5892d4f39207c93b3',
-      'lan_error.php' => 'f9232a0ae701f715832ed1592a6dfe2d',
-      'lan_fpw.php' => '7890921ed71edd6e7d43db5e35d06538',
+        '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' => '809182c05d7f00262c689e2a75003b25',
-      'lan_mail_handler.php' => '34e92ba1926cd6b0d25052bb20c4da66',
-      'lan_membersonly.php' => '0a053f203c69099945a4f6831f2846f7',
-      'lan_news.php' => '67d838f38d41c4e7dff7a88aa1aa8983',
-      'lan_notify.php' => '0451881149a74d4ae19da258e6f8af2b',
-      'lan_np.php' => 'e039d68fc6948a13c0197374f1d60630',
-      'lan_online.php' => 'a96e1b8d6573a417bc73adab645ca1f7',
-      'lan_page.php' => 'c3ba89a64d080345989ce367875dc63f',
-      'lan_parser_functions.php' => 'a650c8715b5f1e5c419967ddbe8e2e2a',
-      'lan_prefs.php' => 'db0224c4aa22ee637204a0ea901c0862',
-      'lan_print.php' => '781248028150fbc796e327705248fe0e',
-      'lan_rate.php' => '98716351af6ed5e4322d4f402467a00d',
-      'lan_ren_help.php' => 'cdfb933d1a638221efdb2c7f187cf11b',
-      'lan_search.php' => '17a96e2bb71703cd18ea7dcb50be222c',
-      'lan_signup.php' => 'ca941c2186d29331cfdbaedaac9792b6',
-      'lan_sitedown.php' => '5da0240f701c62b0da8e91ccbfe1abc7',
-      'lan_sitelinks.php' => '0cd527711321b63adaf2ff53cf5ea306',
-      'lan_submitnews.php' => 'a3166e5eb2a498650b4fa5c98d05852b',
-      'lan_top.php' => 'ba03ddba654e2dcefc8ab571a948915b',
-      'lan_upload.php' => '2db1529e1035cd908742ebe20f90b1ad',
-      'lan_upload_handler.php' => '7c84d13e7db13c699e22dca0aa98c828',
-      'lan_user.php' => 'bf0983f7b4446417ebb8e89c9fcd17b9',
-      'lan_user_extended.php' => 'e39efa66a121dcb37b0eaf2ecef505d8',
-      'lan_user_select.php' => '1b0fbeb61e678ede80515de672fe0e1e',
-      'lan_userclass.php' => '5fe7b35289182033c5e3a0cf412159a0',
-      'lan_userposts.php' => 'b373e7c3f0f77163f035a2969cacaa55',
-      'lan_usersettings.php' => 'b5b677205adc5bf8a2d7be70e58da5cf',
+      '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',
     ),
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
   ),
@@ -1382,7 +1386,7 @@
   array (
     'admin_menu' => 
     array (
-      'admin_menu.php' => 'ebaf5a8f9c08236248b72631963dd05b',
+      'admin_menu.php' => '75cf1f65b92398af33b5ba646605620d',
     ),
     'alt_auth' => 
     array (
@@ -1400,28 +1404,28 @@
         ),
       ),
       'alt_auth_adminmenu.php' => '3dddfee80a662a804a06d833ad9d2670',
-      'alt_auth_conf.php' => '3095b9e21a6cbe9755b8c6f6c2f4d4a3',
-      'alt_auth_login_class.php' => '05da3a70fc4c18040b69ad51814096d8',
+      'alt_auth_conf.php' => '5f7c726f433380e1176750973dad9263',
+      'alt_auth_login_class.php' => '26567337e2a843675fc18df3e91fd1a2',
       'alt_auth_readme.txt' => '75b056df0169fa9a03bb31633d7fcbdb',
-      'alt_login_class.php' => '1cac1024e44727f5d7db2dde8c2b18b8',
-      'ldap_auth.php' => '522ba99e8cfe59e0de02484e4ad271fd',
-      'ldap_conf.php' => '5fde191357bd2e7f6531ac54f1fdf7d6',
-      'otherdb_auth.php' => 'c2aaae1e5f7b7c320c67b16693da9001',
+      'alt_login_class.php' => '87e6e5dcd62619232d2c97378f5f8054',
+      'ldap_auth.php' => '9fd09bac8f10078d7ccc564fc63ea8fb',
+      'ldap_conf.php' => 'bd3603b781855af9b3e6a05fb8bbffee',
+      'otherdb_auth.php' => '2a2b982f0a83f4c61eef731de6e91dc7',
       'otherdb_conf.php' => 'eeb2f8f50cef75a4c6f417fb87c8f4db',
-      'plugin.php' => 'b1387a9e4bf796ae65ff3c01db29e78f',
+      'plugin.php' => '5cb486b214d8d709224d3d0351b86bd0',
     ),
     'alt_news' => 
     array (
-      'alt_news.php' => '58eae729324664b94a545f1da10294fd',
+      'alt_news.php' => 'b05a110643e5ed3d247644b23838a123',
     ),
     'banner_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => 'c0b852de4b48b95be1ca0d06d4841f18',
+        'English.php' => '3cfb6eae241e5e4a0df54412d3919041',
       ),
-      'banner_menu.php' => '7b393003e4b4bee3c67a2b7e88567eae',
-      'config.php' => '5f04d4d3273ddb2ed463a1578437f017',
+      'banner_menu.php' => '3cd7a9dfc877a06dc2c4c96d5e2bd2ad',
+      'config.php' => '22ab17dbfbea5ec6ff89013c83c02144',
     ),
     'blogcalendar_menu' => 
     array (
@@ -1429,12 +1433,12 @@
       array (
         'English.php' => 'bc4d844c9b0b8bb553913eb462542620',
       ),
-      'archive.php' => '7ee24ae2e5224bcd076242e98580a2a7',
-      'blogcalendar_menu.php' => '14c2d9a1a20705e600d537b9fd4cbf7a',
-      'calendar.php' => '0a679e78f9c1afc664e860084d0d118a',
-      'config.php' => '07afe40701ad8da4c49e358f46229803',
-      'functions.php' => '4465c4bde49e53b873c1b4b177a28a07',
-      'styles.php' => '7afeff6d9c54ac8c4458df3eeaf820c9',
+      'archive.php' => '818cbf4d8a2f3a5ee129fe173abdc457',
+      'blogcalendar_menu.php' => 'dbc22280f5f152ff10526300670318ef',
+      'calendar.php' => 'bb83275e6138ac8906ad59f8e41994bc',
+      'config.php' => 'c80bf0b94080e80c8d965979b5fcb4f6',
+      'functions.php' => 'cb306a8d9df94d8224e2330dc720f4ec',
+      'styles.php' => '61d6e222a1897d9c513c3e18a50e162d',
     ),
     'calendar_menu' => 
     array (
@@ -1473,7 +1477,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'fceba4859a23240622862aa6a4381cf0',
+        'English.php' => '9e91a9954a17ee273d15f3626c2f4611',
         'English_search.php' => 'fc1f68851e4c41b94e1bf1fcf9c25e10',
       ),
       'log' => 
@@ -1482,25 +1486,25 @@
       ),
       'search' => 
       array (
-        'search_parser.php' => '0a57109774075e09ab9c5c81ae43c24a',
+        'search_parser.php' => 'b8c8b7082d8e65c8ed66f0f7f983ff18',
       ),
-      'admin_config.php' => '9803e95550853ab0aec63517e86fdcbb',
-      'calendar.php' => '39293d69702a8133f1526fb126e32a47',
+      'admin_config.php' => '706d36fa117acfa1170285875cf208de',
+      'calendar.php' => '8d017d76ecc9d6753a30dd36f6a1ecec',
       'calendar_menu.php' => '898974d7e3c17bbb6f410fd7a9f81c36',
-      'calendar_shortcodes.php' => '14508816696fc376d57ec8a43b1529ff',
+      'calendar_shortcodes.php' => '1dfe4e14627976961fde7b2839c959d5',
       'calendar_sql.php' => '39899457df794d8b56c58d3b1c8db88e',
-      'calendar_template.php' => 'd00fdc534145833c4559e08cfa3a1e6a',
-      'e_list.php' => 'bc86836aabe7f01b4285d512a3079e9e',
-      'e_notify.php' => '2d8eb29ee5fc8f3e8ce40d9d7b0e4658',
+      'calendar_template.php' => '71e4dba7fa93563842d10adb983de798',
+      'e_list.php' => '645f43cf7f01952906dbb83b8cb13cc0',
+      'e_notify.php' => '142cea7487ea058e68b69123f6f6c8a3',
       'e_rss.php' => '077b415bf70aaae7b8de3d55a5912632',
       'e_search.php' => '2c9d89dbe14cf0240c681dc99aec0df5',
-      'ecal_class.php' => '829d53d0e163f62d966c86d2ff7c7441',
-      'event.php' => '96f01d1a8c802a5b2016c757f3c0007f',
+      'ecal_class.php' => 'c25935803b5373764f999a3f9672f342',
+      'event.php' => 'd52f8d620b28534d2333339e4875f178',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'next_event_menu.php' => '16cac459c9f96cc40609b271000d1369',
-      'plugin.php' => '45cb010400215abaf467202608994686',
-      'subs_menu.php' => 'bd72e3b6bb7b60b0d05ef48dbec331e5',
-      'subscribe.php' => 'ff3d258e62600f7a2567afc88e0d172c',
+      'next_event_menu.php' => '7660ff0632b9ef09b237227eedf5a4e1',
+      'plugin.php' => '88853f80c039b94fc3dbcb31a8a05d0e',
+      'subs_menu.php' => '7926c01cc667e824caacb5b4a79d4992',
+      'subscribe.php' => '2bdfe66e8ba33a5614f27e8b56a3f8a1',
     ),
     'chatbox_menu' => 
     array (
@@ -1514,27 +1518,27 @@
       array (
         'English' => 
         array (
-          'English.php' => 'dd55505492dc93245428b5f07aeca247',
-          'English_config.php' => 'aaad4feccb8ffad408f16a885ab0ba3c',
-          'lan_chatbox_search.php' => '0728f984fc94e9ec34eaf22c442908dd',
+          'English.php' => '67263bc883f310faccd32a94328cdeb5',
+          'English_config.php' => '31af57ee674b21e44059147d66c033f9',
+          'lan_chatbox_search.php' => '2fecec1185fac98372dfaed71d600fb8',
         ),
       ),
       'search' => 
       array (
-        'search_advanced.php' => '4c3c618bd355ea3ec7ed4c5f22174bc5',
-        'search_parser.php' => '0229017216c2b03af941ef36edd9b9f5',
+        'search_advanced.php' => '0caff453252573c5fe168b6040de5b5c',
+        'search_parser.php' => '0b7de64b52b4569c66980161e3ec48b6',
       ),
-      'admin_chatbox.php' => '0597060dbd29acfdfdb2fd7c7a1bfbe0',
-      'chat.php' => '5f179e4201c3d23a2de3d3050829ebfd',
+      'admin_chatbox.php' => 'e57e123c71ea85a952304db2c60ec615',
+      'chat.php' => 'c938bca54ed2bad30c4b6bfa40642db6',
       'chat_template.php' => '14c2ebf62352cf10f2b0b83e100ae856',
-      'chatbox_menu.php' => 'c4044f134a24bfbadfaaf662a53a5b3b',
+      'chatbox_menu.php' => '1fe4e8f35c31008ae6644b4f57f9190a',
       'chatbox_sql.php' => 'aeb0d501ff23212e304f7f9a83d6926d',
       'e_list.php' => '11fde3fe8b58bec52bc6220053498509',
-      'e_notify.php' => 'b48f094e9be5ba61d1824a2f05c16c34',
+      'e_notify.php' => '624752de4224a60d5d3dcf8687623d40',
       'e_rss.php' => 'e48224955d484055c9c662f430d529ae',
       'e_search.php' => 'd1438d8ba352df93c5fcdcf67805c229',
       'e_status.php' => 'ec7b5b0100e4be7210ea7e786096eeee',
-      'plugin.php' => 'ea31219aacda4b8ed78e454dad401ddb',
+      'plugin.php' => 'cb4ffef2c60529dec3b354377db16f4d',
     ),
     'clock_menu' => 
     array (
@@ -1542,13 +1546,13 @@
       array (
         'admin' => 
         array (
-          'English.php' => 'd6ca6d34defb237df50f6f7fe28f093e',
+          'English.php' => 'e6592858c7fd2ad31868945376fe28af',
         ),
-        'English.php' => 'd84952e9cb7e030366daa6b40d94fe28',
+        'English.php' => 'e0257ba82ec6301edd2faf678b5f374d',
       ),
       'clock.js' => '98871f097e7b77f981df163421edb721',
-      'clock_menu.php' => 'c5b662876406bf64e8beef8150811f62',
-      'config.php' => '70aa0e03998d1eaaf155e6f841bd7980',
+      'clock_menu.php' => 'ecedcfdd8919a613812e12288970bb1a',
+      'config.php' => 'c047a546a6463c12bdec033c346cb236',
     ),
     'comment_menu' => 
     array (
@@ -1556,10 +1560,10 @@
       array (
         'English.php' => '10c5f9fd588de9eaa9bf96b42b11b535',
       ),
-      'comment_menu.php' => 'f44ef374e184231cb0150e83cf088f18',
-      'comment_menu_shortcodes.php' => 'ad848157f521735218b357a3c6e179b6',
-      'comment_menu_template.php' => 'd5faafef97cfcd82246fe74d798189f4',
-      'config.php' => '4186d5dcd1b37d893c99c988b39aed14',
+      'comment_menu.php' => 'ac370b8cf01654097c19664edfde486e',
+      'comment_menu_shortcodes.php' => 'c33e15bc1b11543bed23602781a61eda',
+      'comment_menu_template.php' => '7649e064fb2d6f1e0d07914ccf5e876e',
+      'config.php' => 'ae3e3885471a313c82443bf85b833bd4',
     ),
     'compliance_menu' => 
     array (
@@ -1570,7 +1574,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'd74c4705be0ecaaf860bec9b8f4a7223',
+        'English.php' => 'b3bc465e99b1b8cb0563c6782e216f73',
       ),
       'compliance_menu.php' => 'a7b456e895ef89cd819835238b1482e6',
     ),
@@ -1578,11 +1582,11 @@
     array (
       'handlers' => 
       array (
-        'content_class.php' => '693d362e8882e1d62970b40e4ab7a517',
-        'content_convert_class.php' => 'bca013a5032381acd3c753a487a406e0',
-        'content_db_class.php' => '1149ee881ec33ca5f6ecd2554f612c02',
+        'content_class.php' => '6f68002afc246b2bef981a0ff819b80c',
+        'content_convert_class.php' => '3145b418246ae1e7deff08501ba64e42',
+        'content_db_class.php' => '6ade245428c991c3ba4fcb732f1ff1ab',
         'content_defines.php' => '17705ead3b96dabdd746a32c8f29935f',
-        'content_form_class.php' => '8770ba4660c6813ed040efcc66dfd5cb',
+        'content_form_class.php' => 'd9e689eb34ddd86fbe953742858bf2dd',
         'content_preset.php' => 'f3061b1451c85ffa473bf5520d41b49a',
       ),
       'images' => 
@@ -1661,11 +1665,11 @@
       array (
         'English' => 
         array (
-          'lan_content.php' => '9ab4d3470a7af13c10046bac943c6945',
-          'lan_content_admin.php' => 'cde885d9f4bb9c05ebcb01170e5d025d',
-          'lan_content_frontpage.php' => 'daeea9b16454dae0ecbeb20c62d3199c',
-          'lan_content_help.php' => '923b79aabe03304498ab8ce14002425a',
-          'lan_content_search.php' => '60d9e65985fc91a29e9a5b6c8289855c',
+          'lan_content.php' => 'af32c7fa54a4efb822e0136066cf7b7d',
+          'lan_content_admin.php' => 'e1f6dcd8d7fb01b50c4157ed5251038d',
+          'lan_content_frontpage.php' => '6d72081b6494b29b62b2b56cde90136f',
+          'lan_content_help.php' => '1b1f055e3f211ffb2b5c14ec958dd76c',
+          'lan_content_search.php' => '1f0b40a1b8fce5f4260ac3ca8a19515d',
         ),
       ),
       'menus' => 
@@ -1674,49 +1678,49 @@
       ),
       'search' => 
       array (
-        'search_advanced.php' => '56f0d69f57e772e5cb712b0f3d1d7ffa',
+        'search_advanced.php' => '02d65164d0b68d66abc4a20caf7a7abd',
         'search_comments.php' => '34b14edbe1d2e8fbac541dc03262b21d',
-        'search_parser.php' => '96a5acc5aafba377a69a0c470c443308',
+        'search_parser.php' => '2094b0bd299b6f4dcd96c635816e4533',
       ),
       'templates' => 
       array (
         'default' => 
         array (
-          'content_archive_template.php' => '80be33e8722dd82670858e11e636a026',
-          'content_author_template.php' => 'bb8188b983d8f759fe149037dc42b1d4',
-          'content_cat_template.php' => 'fb9685209ec8e9be76b63b9aa845a935',
-          'content_content_template.php' => 'f0be65d969896e18e17a6115e3caa241',
-          'content_content_template_bigtext.php' => '827123e8e2a5a6b22a9a3ba7a5a741bd',
-          'content_content_template_blackonwhite.php' => '481197a6ad8e0ee3c87f8ff8176d414d',
-          'content_content_template_whiteonblack.php' => '8caae9f0d05553400bbd2bc386af3d7e',
-          'content_np_template.php' => '9892c7a44b01c20198b9723b78812479',
-          'content_recent_template.php' => 'ba1823a7a21064959e5175b7340f8fd3',
-          'content_score_template.php' => '596f2f28ab05177355247f5aeaf46cef',
-          'content_search_template.php' => '571f87f0a3da3ebf639220359bc03d0d',
-          'content_searchresult_template.php' => '0d48f49a54d0bc7fcc89a693954e181e',
-          'content_top_template.php' => '4bbbcbc5b3fbbe47fd8ca07414de7279',
-        ),
-        'content_manager_template.php' => '1e487af35d5410dd14db40b1b610b7a1',
-        'content_submit_type_template.php' => '7968f19bd92db65a057fd258d101b150',
-        'content_type_template.php' => 'db1b5137de1fdac081dd59b687ce8d14',
+          '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',
       ),
-      'admin_content_config.php' => 'bf233d943d27ea429d4f035c69654c82',
+      'admin_content_config.php' => 'ae171a1f8593a2e203be944ddb4da5b5',
       'content.js' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'content.php' => '6fee3ccce9dbdad72bfe851a6ee1b44d',
-      'content_manager.php' => '770aad2333abbee246660a87b56d2e30',
+      'content.php' => '3ae0933908dfb4707cb6b24277051c5f',
+      'content_manager.php' => '4b53853924c944bcdd7589007e05c98b',
       'content_shortcodes.php' => '6fe643a18d7f1b8a877eed93f82bb165',
-      'content_sql.php' => '4f0d506e09421f21708a36e96f80c7db',
-      'content_submit.php' => 'c9ae8cac4aa857e31f18bcc270e6b515',
-      'content_update.php' => '307ca362312109b3dabe8ba173710a48',
-      'content_update_check.php' => '25753c2c070b06f0352f6e5d3a366d9a',
+      'content_sql.php' => '10382c00ac7f15537416dab4f2cd97b8',
+      'content_submit.php' => '5616f71f5526458068bb735b4a632f9a',
+      'content_update.php' => '6fa9b1be8b74b6272cbf32ea2bc79a98',
+      'content_update_check.php' => 'c26a5eeba721a94d8cbb4343624f5fa6',
       'e_comment.php' => 'd1f4f87a428c69c499818721d0f48331',
-      'e_emailprint.php' => 'df752a74cd6ae446780b4d9f403252df',
+      'e_emailprint.php' => 'aa8753897ec82ed8fda64d5ce2492eae',
       'e_frontpage.php' => 'fe4139040c268b13517b9a78fa35f190',
       'e_help.php' => '4320e5f811fd90d98d2339b11575d57c',
       'e_latest.php' => 'dad7101dbd2063723e94300723e67c2e',
       'e_list.php' => '179fdb2049690d93d67b50629c92e5e3',
-      'e_meta.php' => '6026564b4dec2a4dbaa5cdaebce4a7f4',
-      'e_notify.php' => '477f94be0cc87c30ce9171d6744b1738',
+      'e_meta.php' => 'ccca6b1ff1a112d8b5b6150b682da042',
+      'e_notify.php' => '211f854dc01476e3d0094f69f96f24dc',
       'e_rss.php' => '76954b881d598f26ecaebb4422f87696',
       'e_search.php' => '4018912931e0edd7377caaa4b8c1071b',
       'e_status.php' => 'cf12158206b16c94292788fb9771c478',
@@ -1726,9 +1730,9 @@
     array (
       'languages' => 
       array (
-        'English.php' => 'd4a477ed7ccdb8800f0cac2716b898f4',
+        'English.php' => '36a348b34b6d710e54f82dd2570e76aa',
       ),
-      'counter_menu.php' => 'ea7d244d521accacf633aa897d5194a8',
+      'counter_menu.php' => '35adc3b5e2e0a48804144604425f68db',
     ),
     'featurebox' => 
     array (
@@ -1739,17 +1743,17 @@
       ),
       'languages' => 
       array (
-        'English.php' => '8535106a3945d0b794616cc5e322edba',
+        'English.php' => '38592bcb471eb1e3b4bb2d8cce51c13e',
       ),
       'templates' => 
       array (
-        'centered.php' => '01d28d71697ad1315f6f8d4c67cbb3de',
-        'default.php' => 'afeff12b02ea429c454d131c675f2152',
+        'centered.php' => 'fabbbb8672d8a60ffb0449ba6b676b78',
+        'default.php' => '4d0d6232cbfe6b0bd0873037edb4b94e',
       ),
-      'admin_config.php' => 'e8ca74f1cf6ea15be42345ce4c4fa248',
+      'admin_config.php' => '8c00da8b4dee72f84005ad026354e070',
       'e_rss.php' => 'e3b277cca6f5262dcee948434aacfc5e',
-      'featurebox.php' => '05c7169b2c3fa2bc8b850985eaf6c9e8',
-      'plugin.php' => '7edbac0af204deeadb33d4aeaec55998',
+      'featurebox.php' => '7f13cd908f9e06fdb1b8f97d0050914a',
+      'plugin.php' => '284a352d580af16a065c2ae1b2702fb2',
     ),
     'forum' => 
     array (
@@ -1870,62 +1874,62 @@
       array (
         'English' => 
         array (
-          'lan_forum.php' => '4a2e840b7bf51b98cd8e3b44ecd12f13',
-          'lan_forum_admin.php' => 'b3894ec16bbc42244ddbd0930a6a7d43',
-          'lan_forum_conf.php' => 'ab1f351bd2be17bd8a96b311bffbfb1f',
-          'lan_forum_frontpage.php' => '347d02226b6c32d31e39455c811291b8',
-          'lan_forum_post.php' => 'b82a0acad209ccf375e8f49b9b9c3dd0',
-          'lan_forum_search.php' => '1605fe5f3062ad86f031e1fa9e809fb6',
-          'lan_forum_stats.php' => '3fac50e2818d3e68faeacbd4258b8fc7',
-          'lan_forum_uploads.php' => 'c5de71b299abe8fca08ee2f348178f9e',
-          'lan_forum_viewforum.php' => '9334a797cd2348fd0ae8b90d1449e2d4',
-          'lan_forum_viewtopic.php' => '20fcf5af6598da1745ddff79daa70660',
-          'lan_newforumposts_menu.php' => '67fde4e83a45902f0d2c2a1d7cfa2684',
+          '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',
         ),
       ),
       'search' => 
       array (
-        'search_advanced.php' => '1381b67b80061ab00d7326c0cc48d70a',
-        'search_parser.php' => '1ae2f2ade06797eab392f51f3958dc07',
+        'search_advanced.php' => '016e5d3f8e32b12206195dbbb21235a2',
+        'search_parser.php' => '16a073a273efbc5405689a79d1bd744e',
       ),
       'templates' => 
       array (
-        'forum_icons_template.php' => '93485080b36352811fda31dbe9455083',
-        'forum_post_template.php' => '620e3d30c1cf3e91d35fb1b17c6dd7df',
+        'forum_icons_template.php' => '55838672874094d43cf53cbdece4a087',
+        'forum_post_template.php' => '1e0b7cbe6ebf71fc03b33e445dd83f02',
         'forum_posted_template.php' => 'd0790156815c4f32a794becbe68da4cc',
-        'forum_preview_template.php' => '14ed0d3c9af9d5e273ccae951114459d',
-        'forum_template.php' => 'a25ffce7b7493c3e4a1ecd76da64daf7',
-        'forum_viewforum_template.php' => '609b7c69a40668ec72ffbd1bfe35373f',
-        'forum_viewtopic_template.php' => '682cebaec02117a4c39b72f68f7ca165',
+        'forum_preview_template.php' => '7e314d99fa6ba431aeb59c81c729a852',
+        'forum_template.php' => 'de9e6e03f3e29c51b64fd07c23b310d6',
+        'forum_viewforum_template.php' => '8e246edd63ef534cb2f57a85064f95ef',
+        'forum_viewtopic_template.php' => 'f4398c320ac0f1daf77cf512c98ff967',
       ),
       'e_emailprint.php' => '8a41fe10faf7c2293a65bd66e598dd82',
       'e_frontpage.php' => '47fc49f7f27140d518eb73932b6023c6',
       'e_latest.php' => 'ba485c38b9ab90c0f572a2397b49c9f5',
-      'e_linkgen.php' => '9149ffa2aa65de7e21eec81f3b3617ec',
+      'e_linkgen.php' => '0ded8666191d738eb75674e928dd2981',
       'e_list.php' => '8c318e2f3a838ca643e1434a199a11f7',
       'e_rss.php' => 'cf96fbd5d8ae9f83f6ca2b98ac069970',
       'e_search.php' => 'f0c6eabebb2359afd8bc4557bbc3dd02',
       'e_status.php' => 'e707e64a960612d443e16906faaf0e22',
-      'forum.php' => 'ba1bc241fa370cc49013d7dc570e8b55',
-      'forum_admin.php' => '35eda3e42fa8290a792d5c90635b304a',
-      'forum_class.php' => 'f2119e0da13f070538e5a802ee5edd67',
-      'forum_conf.php' => '5fd7e39ba5e703cd0d056e222f4a6326',
-      'forum_mod.php' => '828dd907c511fd7fb8a6f3f48ca3ef9c',
-      'forum_post.php' => '801d11e219485e652fa328bb6565263c',
+      'forum.php' => 'd5b95a8beda5d0a0dcd600011c820587',
+      'forum_admin.php' => '9b3e7dd3eb15b4faa7288d460b1a2141',
+      'forum_class.php' => 'bbd3791f40a8092244579fedfe51c536',
+      'forum_conf.php' => '3747a02ff672b24b1ab2df3ec03535d8',
+      'forum_mod.php' => 'faf0c5a5487a5453b54f4a6119912664',
+      'forum_post.php' => '988dd1f5449c61fccc2b8f37cb1c1300',
       'forum_post_shortcodes.php' => '58d0390a6fa95d713603a203025eb3f2',
       'forum_shortcodes.php' => 'dce37f018fa3be3a2bb67c740fe4725f',
       'forum_sql.php' => '3355b8219c200d8d669ce08e59053465',
-      'forum_stats.php' => '74a5ee8a78e7dcdb059c4c1ab5526ecd',
+      'forum_stats.php' => 'b8564b5b8047396ad8e8fdcfa798d462',
       'forum_test.php' => 'ed668e3268952cb268b3f4aca0d2e37a',
-      'forum_update.php' => 'c6cd093939cac7725b724578abb70e47',
-      'forum_update_check.php' => '1ceb30488c2b133d3db0509a94918ca8',
-      'forum_uploads.php' => '16b247a726a5bd51577eb79af996a139',
-      'forum_viewforum.php' => '1271f3b17ccde1dd7f7631f1f47fb889',
-      'forum_viewtopic.php' => '7a685952740e9241a22ede596912a138',
-      'index.php' => '9e54a47db67f66024d8bc38adb3ac684',
-      'newforumposts_menu.php' => 'dc9815c72ac5f412ac2133e55d90f015',
-      'newforumposts_menu_config.php' => 'c24ec475bbecb8573d4217fdd068a7a6',
-      'plugin.php' => 'f9793559f6c89bae4b716186507051c8',
+      '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',
     ),
     'gsitemap' => 
     array (
@@ -1936,11 +1940,11 @@
       ),
       'languages' => 
       array (
-        'gsitemap_English.php' => 'c869fa7dad2e090a640dd957e868c163',
+        'gsitemap_English.php' => 'c2b50474d37b986868286b1dcfaab6ad',
       ),
-      'admin_config.php' => 'f85eb72de38bc5e0441bd6241e8d7711',
+      'admin_config.php' => 'c398f2b54168449b8a413ea3f5cde037',
       'gsitemap_sql.php' => '81a34608c8cdd19c51fece5a25109159',
-      'plugin.php' => '03016126a3ecb4281bdd552db3e43224',
+      'plugin.php' => '127a675a6900de930e4ecf1ec5a376b4',
     ),
     'integrity_check' => 
     array (
@@ -1952,7 +1956,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'f2929aa8fd5250614e7b3d36e3c5b98c',
+        'English.php' => '536c73b18ce84d44740b259a66c8f425',
       ),
       'admin_integrity_check.php' => '99eeeea29f99c039499dfcecb9ed722d',
       'plugin.php' => 'b32f26e2fc819c93a60a0c53692888fa',
@@ -1961,9 +1965,9 @@
     array (
       'languages' => 
       array (
-        'English.php' => '41a5ae96c760a3a019b9ead44e50c626',
+        'English.php' => '1424d68ea20604aac6e7724588a2a7f9',
       ),
-      'lastseen_menu.php' => 'e41dd1f46f2f50af06dce23b5e0051a7',
+      'lastseen_menu.php' => '0107eb28fe31ccc1ffd67790315f5b6c',
     ),
     'links_page' => 
     array (
@@ -1980,7 +1984,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => '3aefc1cef292c025e32bde90371aea6f',
+        'English.php' => '2342fd45ea8ce5b5779d347191b00230',
       ),
       'link_images' => 
       array (
@@ -1988,28 +1992,28 @@
       ),
       'search' => 
       array (
-        'search_advanced.php' => 'fc2de2f6045119af6cc39fd96ae9249a',
+        'search_advanced.php' => 'a1e384c4a85e03aa2b9231be9b02be53',
         'search_comments.php' => 'f887861124deb8c3b087359cb9f3210c',
-        'search_parser.php' => '91d90f2ca3ca4bc0a3b5707045a55ae2',
+        'search_parser.php' => 'd8e6262f5c31512181d23aea2eb88cc4',
       ),
-      'admin_linkspage_config.php' => '830bdbd7e8d1f410f7e90ce35319357d',
+      'admin_linkspage_config.php' => '6774c1e600c6bfd8da1d78ac6da81771',
       'e_comment.php' => '13b0aa38e21d08a535276a7526cedde2',
-      'e_frontpage.php' => '27b75c02ea104196dc9d5d3bc24a8696',
+      'e_frontpage.php' => 'e1aeb87c94051f759f7c31cd45931b21',
       'e_help.php' => 'fb1b8218954ee9a4fcf22738af7f385c',
       'e_latest.php' => '68bacd178e137861748385080b253ee4',
-      'e_list.php' => '41486a930bbaf136d0a371c3201aa0e6',
-      'e_notify.php' => '7d03df79f1a7a640fa4d7bd87c66cf3b',
+      'e_list.php' => 'fa78ae50d1600648929de3d2bfbf2a97',
+      'e_notify.php' => 'f5abec86b9d63ff5b61a3454a4f308a8',
       'e_rss.php' => 'd213cc9cc0d5eeed3442b861e565961e',
       'e_search.php' => '7a7416dde4bc42481cf92431f4832b65',
       'e_status.php' => 'e1b28e610e6f89277440430a2f8747d8',
-      'link_class.php' => '6d6ca4f566f58bbb235a3e53c21ce51d',
-      'link_defines.php' => 'eef3dbb8baebeca575b66730c552d8e2',
-      'link_menu.php' => 'db5245c494ebbf51adf0b2d7deafcd87',
+      'link_class.php' => '3a31ae30067dde8c26b56b0268e78461',
+      'link_defines.php' => '9afb087dd7941f64fbedacda37fab3f9',
+      'link_menu.php' => '2bf6afd0218a170b8d27b6a48c6b1320',
       'link_shortcodes.php' => '0f5e9fd5e457177a51096a5952c3a15a',
-      'links.php' => '7cd774455ce6dedabfee1740acc0c82f',
-      'links_page_sql.php' => '93e1d3c68d7ea9bb2431c8a73f03788f',
-      'links_template.php' => '709481a83f39018db990895d6b773666',
-      'plugin.php' => 'b465721ff90a99f09e12a68d39346c36',
+      'links.php' => '9ad1c71f17dcb7a240f9d761b2209371',
+      'links_page_sql.php' => '3632bf42fcc776e6064f0e53a0a6b2fe',
+      'links_template.php' => 'cfcb83d469276b8ffe555ece022c9a3f',
+      'plugin.php' => 'b0fea17c110d9a72259367ddcd57e402',
     ),
     'linkwords' => 
     array (
@@ -2020,12 +2024,12 @@
       ),
       'languages' => 
       array (
-        'English.php' => '338525e3bf8fb5c8d05d450a61be0204',
+        'English.php' => '728080e146e83cb64eff5e9117ecd4a4',
       ),
-      'admin_config.php' => '699d14addd67895b9ea5872480d442b4',
-      'linkwords.php' => '6d9a85c2933cdcaae2d58de7a479349e',
+      'admin_config.php' => 'a2fa31e08c4f5a034d1c2a53840f2c52',
+      'linkwords.php' => '28f395016a8200ee71758e4c3b20b492',
       'linkwords_sql.php' => '33f4d40e8da9aa758c512d4847f6d5d7',
-      'plugin.php' => 'e341a3751d78a000287b45afd555e113',
+      'plugin.php' => '034eac275429e80cd89c148779064295',
     ),
     'list_new' => 
     array (
@@ -2050,7 +2054,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'ca4344c3be604fc1acd354a8ac157d34',
+        'English.php' => '651c7f54bd159c7185c5b9ff34320f63',
       ),
       'section' => 
       array (
@@ -2059,11 +2063,11 @@
         'list_members.php' => 'f2cec9a4125081502c309f794f72dc1b',
         'list_news.php' => '7faa1d6728ff1e692aa834ac4027c4e0',
       ),
-      'admin_list_config.php' => '2402d279dbe973c14e92e639bcdafa82',
-      'list.php' => '49440e7676ada4c34b4cf3db2a9c612d',
-      'list_class.php' => '51ddf5aca0dec2cf111dfc31c4d88b7e',
-      'list_new_menu.php' => 'd27da980c790204a24044f293acb50d5',
-      'list_recent_menu.php' => 'a43717a8366f090d199ad1d58c802591',
+      'admin_list_config.php' => '39a46c2daf2e9c0b1ed1542729187fba',
+      'list.php' => 'ead10cac732c1ba7166f0d341b543c68',
+      'list_class.php' => 'fcb6d9ea7ee9afe4b6031d58fc934ddd',
+      'list_new_menu.php' => '4bde376179da946aa3c00df1771ad17b',
+      'list_recent_menu.php' => '67ffdab4915be1024d260d9dafa35a80',
       'list_shortcodes.php' => '1c4972d09e83f1945c6652126bba6248',
       'list_template.php' => 'ca73750411b19f1b8df71c5111fe1789',
       'plugin.php' => 'b1e1a641faa99690f826efb8e29ead63',
@@ -2159,35 +2163,35 @@
       array (
         'admin' => 
         array (
-          'English.php' => '48f25e622454a719ae34abc2a859053e',
+          'English.php' => '90a94f547a209544e93e8504fdaeb375',
         ),
-        'English.php' => '03d3f60977c0d64d0e558170822dd03d',
+        'English.php' => '446f070229e7bfc3996988f2a6da012b',
       ),
       'logs' => 
       array (
         'null.txt' => 'd41d8cd98f00b204e9800998ecf8427e',
       ),
-      'admin_config.php' => 'e964da7be4b27e9653d7735512dc3df8',
-      'consolidate.php' => 'd5892fa96215be57470468ca51fc7182',
-      'e_meta.php' => 'e9a83faf198c26d91d15836533f3d313',
-      'log.php' => '2094c43ce2e5a385e1620d35314774a5',
+      'admin_config.php' => '02b664d8fef5e4d5171342297230c8d1',
+      'consolidate.php' => '079ed9d7d0c07624874353ae9d3d46ea',
+      'e_meta.php' => 'c7c1bff20fb308d2461bf3bf9ac89d45',
+      'log.php' => 'dd45c934539c05fed49dfe5260ce886b',
       'log_sql.php' => '6593acd37950a8e486b0fc1490cf1750',
-      'log_update.php' => 'dcb77cf696611c7da43ff031fbde2fe7',
-      'log_update_check.php' => '90239b4b5094816a98717d84beaf552e',
-      'loginfo.php' => '8f0ec65ba581c4acb45fcd485360be15',
-      'plugin.php' => 'e7258008c2c318735c1722a739497985',
-      'stats.php' => '0e31333d0394a98345f7b7f3d550a6a3',
+      'log_update.php' => '4434f0dcd7d37eef8aab1785bd459ad1',
+      'log_update_check.php' => 'a6bfb2aef82e5ec9573e47c7ac3fdaa8',
+      'loginfo.php' => '9c447b38fed455e4f0cd34ed69cec99e',
+      'plugin.php' => '91dfebd8d4203844fab64de919c200c8',
+      'stats.php' => '6d747b1ed110636ed0027313089da276',
     ),
     'login_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '0da2b7f104ed1366874be78e2826e5aa',
+        'English.php' => 'd2f3038ae7a6a5e8b1ab85f459a9faf9',
       ),
-      'config.php' => '718f6f27c3f29ceea99465d3ac843da3',
+      'config.php' => 'ea9869a523a0292a24ce91fac78cae21',
       'login_menu.php' => '24bc3d5d9c67a614ac5ca5429ce18587',
-      'login_menu_shortcodes.php' => '2204e45c45c484461c72417133a80f21',
-      'login_menu_template.php' => '17aaa7e2895d7321be6e6940a06f8d6f',
+      'login_menu_shortcodes.php' => '83a1e0f6dd029a27f7cb2c79f2de96a8',
+      'login_menu_template.php' => '337f633163e7126d1a7f7c2459426817',
     ),
     'newforumposts_main' => 
     array (
@@ -2199,12 +2203,12 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'cbabc36202b6ab51003f0b859fb14598',
+        'English.php' => 'ac28ac7fc2d32603b1eedd76d56be335',
       ),
-      'admin_config.php' => '889a8d7da4a37a319e8da18111192411',
+      'admin_config.php' => '0e5420c75952e31e6faf495a5587a4f5',
       'newforumposts.sc' => '29784d1f53f650fa7327e367878217d3',
-      'newforumposts_main.php' => '6084790f21070cf222c2b84cfd7a8595',
-      'plugin.php' => '7d7088163fc89ed6b51c440b1797b396',
+      'newforumposts_main.php' => '01f2ab11c8dadfd0653091a1e121a9d0',
+      'plugin.php' => 'ea6783007150117f00557894607d8c5d',
     ),
     'newsfeed' => 
     array (
@@ -2215,21 +2219,21 @@
       ),
       'languages' => 
       array (
-        'English.php' => '3b33a8c881ebf6748ce250739e94af89',
-        'English_frontpage.php' => '0b7edb7c0cf88e175bc6992554203b3b',
+        'English.php' => 'ee913331e533ec8670b6544976ef3bda',
+        'English_frontpage.php' => '085811065b3d597a1c7490b59e769c1f',
       ),
       'templates' => 
       array (
-        'newsfeed_menu_template.php' => 'f2038243e98d6659ad377711a4562797',
-        'newsfeed_template.php' => 'f5ae66abafef21d4ae59dbb2777e36f9',
+        'newsfeed_menu_template.php' => '948dc46a9eb665e64b8914c72eaaa80f',
+        'newsfeed_template.php' => '749de29d39a35b10336bee0587446465',
       ),
-      'admin_config.php' => '0256f20b4a3ad6c82e3f3a41807b1226',
+      'admin_config.php' => 'a4559dff29fb4f86f70bf5ac6981454e',
       'e_frontpage.php' => 'e382f0f562128593eb6f92ec404fa6e3',
-      'e_help.php' => '76ea62eb825192981ff0e17f28315191',
-      'newsfeed.php' => '1c1fe73098687e862f6deb02c002a61b',
-      'newsfeed_functions.php' => '1c8b068c90251e461eeb726325b463d8',
-      'newsfeed_menu.php' => 'da18ba37b0550d57af196f94d395b18d',
-      'plugin.php' => '98636913c492c859dd5c8b6b75f6aee6',
+      'e_help.php' => '6b07bab0d52deb0150c0ce9d6ce59704',
+      'newsfeed.php' => 'd24848551d0118f03af1e4ed7e4c65ed',
+      'newsfeed_functions.php' => '8020ed3a14e872ed3ce80c4dc92547e1',
+      'newsfeed_menu.php' => 'ea2eaee7ce4d09722be4307c539da0b1',
+      'plugin.php' => '2e99cbb5d6d4459cc1775bc8c5949b75',
     ),
     'newsletter' => 
     array (
@@ -2240,11 +2244,11 @@
       ),
       'languages' => 
       array (
-        'English.php' => '94b1ba107e8e5ca06f6f1c8b0b066ad7',
+        'English.php' => '03cde0b639484d82fdba6f053ae4d0e4',
       ),
-      'admin_config.php' => '068576b866b9085dc8f91aeefefd96fc',
-      'newsletter_menu.php' => '3ef6fe697ed1ee540e00cb67fdb37aba',
-      'plugin.php' => 'ab4cc3d2c9cee321a724d0fed34df5af',
+      'admin_config.php' => 'a1e9c64157013528e2dabf154513d24b',
+      'newsletter_menu.php' => 'd42546312900cfc9645023fab188cf26',
+      'plugin.php' => 'a8073dc96226157e3c4a8f545b90d796',
     ),
     'online_extended_menu' => 
     array (
@@ -2254,26 +2258,26 @@
       ),
       'languages' => 
       array (
-        'English.php' => '3ad73f83c07ae23b2f1a70b03b336d5a',
+        'English.php' => '7c99860dda78f24642aa8adddc3d3ca3',
       ),
-      'online_extended_menu.php' => 'b9a3124701c671ac8ed676b858ae40ab',
+      'online_extended_menu.php' => 'f678d197dd3a86087de8f19a600de143',
     ),
     'online_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '04fa5ecca874ed58d03335c18b6479b2',
+        'English.php' => '0e8b188aa808e46641fcb13f854493b4',
       ),
-      'online_menu.php' => '90e4397e1c060e584142e59b7fd16298',
+      'online_menu.php' => '2276b23c808fcac2951ea43464a06c05',
     ),
     'other_news_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '2357c89a4e006e8e78b15f53a4e6898e',
+        'English.php' => '99ba90f9b6d8528852ce6373345ae73e',
       ),
-      'other_news2_menu.php' => '8458a94234fe501c753457112bdb5a88',
-      'other_news_menu.php' => 'f2fc2d9bdd96f07e428f7b0c95fef3a5',
+      'other_news2_menu.php' => '101618a5206882eb0bb61d2da2c3589c',
+      'other_news_menu.php' => 'd6a781186309232be8521d8f472af246',
     ),
     'pdf' => 
     array (
@@ -2322,13 +2326,13 @@
       ),
       'languages' => 
       array (
-        'English.php' => '703622b7e7c5facfe52c412652dd0328',
+        'English.php' => '2e3c70490e6fd5550bf1e90ff3ea2ca8',
       ),
-      'admin_pdf_config.php' => 'e12a5ccb82d625f39f52cccfb5a75a5f',
-      'e107pdf.php' => 'c06b4f024864a01f8d023fe660e06c56',
+      'admin_pdf_config.php' => 'bd0608c7e5525cd823737026830a082b',
+      'e107pdf.php' => '45fa36526b9af5ae3d0986052be5d596',
       'fpdf.css' => '35c07d5049ac6e55b8ab473c6dc38bf0',
       'fpdf.php' => 'da7385d29345f1c12fe85b6cacf5e905',
-      'pdf.php' => 'dd7ff5ca8afb1820d7e7e730cdc0679e',
+      'pdf.php' => '9d20d60ec0dd77512cc8314062a4b7c0',
       'pdf.sc' => 'c6d60562a17736112f283861a44cd186',
       'plugin.php' => '6796823038ad4e146e9365ebbb8bc59a',
       'ufpdf.php' => 'ba87afe3cb2f777f921ea8a3a0457abd',
@@ -2363,19 +2367,19 @@
         'English.php' => '8d2a4b55dbf033d50c674566a6ec9886',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'plugin.php' => '8f3ff7866acee13e7a59960667eead07',
-      'pm.php' => '88e132f7b736f5b746fcaf75d36ddd8e',
-      'pm_class.php' => '38c6784dbffe643bb31bcd351b0733cd',
-      'pm_conf.php' => '0b9316164cf7bca971bd96d7d0d60f62',
+      'plugin.php' => '0626369bcd1c2f139a273cfd8091db3b',
+      'pm.php' => '78e6fcfb4199245e645ae1d366e8657a',
+      'pm_class.php' => '963207f668f0ec1305596449a62fb721',
+      'pm_conf.php' => '374450b0faaa0e6d22131902cc647231',
       'pm_default.php' => 'b7981b895e3afc6bc95a2198f0c40423',
-      'pm_func.php' => 'bd31efc08d073df35a569e50df696904',
+      'pm_func.php' => '8c193823f9d6f1bca40fad4a3b224cfe',
       'pm_notes.txt' => 'df26332907da1f35c4731d8893aea23e',
-      'pm_shortcodes.php' => '6491f9e4fefb066159ca38efa3974e70',
+      'pm_shortcodes.php' => '44a6f3dbfb3029618c0d7d810569f8fe',
       'pm_sql.php' => '4608486c1027c6485dc32674fd536dc5',
-      'pm_template.php' => '57633ae252bdee9eb9848b3d52c470d2',
-      'pm_update.php' => 'b2797e3ee7e6293816330297460b35e5',
-      'pm_update_check.php' => '3a5b17e133342e29d46583f3680845ec',
-      'private_msg_menu.php' => '8fd8f2f2e11743d735c1f1a317d17f41',
+      'pm_template.php' => '07067647573d3c9f64554dce365f4969',
+      'pm_update.php' => 'bbcb20baf18d3e4dbe49dffba7e0298b',
+      'pm_update_check.php' => '7c6830b5cf3036869eebe7efe9702cc1',
+      'private_msg_menu.php' => 'e475270e0203d17afce3bf7794a7fdb9',
       'sendpm.sc' => '67d107ca6fc1d9016d81abc9d8943a7f',
     ),
     'poll' => 
@@ -2390,7 +2394,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => '0cf3be7bfcfc868788bb3b6e582f51fb',
+        'English.php' => '520b6ef59166c9fbfe65bfbca0494dce',
       ),
       'search' => 
       array (
@@ -2398,23 +2402,23 @@
       ),
       'templates' => 
       array (
-        'poll_template.php' => 'cd91da9a047231f78d0d82550daf0757',
+        'poll_template.php' => 'fc4c7579dd1a6f611a39a6926cb4ef68',
       ),
-      'admin_config.php' => 'b04c613c5be0f37faa7eab8c3c439020',
-      'oldpolls.php' => '7ecfe0af8dff88c298df08615c71b888',
-      'plugin.php' => '742e95cc589e0329b0efd6da4f46e429',
-      'poll.php' => '7a88f99864a2d690af5ee49048f78aee',
-      'poll_class.php' => '11b6151f397ce45a1ca163df0876f09e',
-      'poll_menu.php' => '7d2b7f1040006a2ebd555a813281ace1',
+      'admin_config.php' => 'ad311916296314b514e123de8a138f63',
+      'oldpolls.php' => '8416ed6f8078c556136a7938f1bd45fc',
+      'plugin.php' => 'b5f2ddba3adb53d83c98db6974e5167b',
+      'poll.php' => 'c8836003cdcbad6a3d7d46cb2a322254',
+      'poll_class.php' => '62e55593211c88ea1d0421044e96bbae',
+      'poll_menu.php' => '324aebd1d67394afa4c11b4e93d071d1',
       'poll_sql.php' => 'ffe53748dbd1504f7c4204027814064a',
     ),
     'powered_by_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '34058fe521036e578fefd20f8a2e6a06',
+        'English.php' => '6d9e3cd8deabf18858c6eebef2e0567c',
       ),
-      'powered_by_menu.php' => 'a89c178642c655c81b107b61f08cb85d',
+      'powered_by_menu.php' => '3cf132f46778e64c43e69c0946575a63',
     ),
     'rss_menu' => 
     array (
@@ -2429,13 +2433,13 @@
       ),
       'languages' => 
       array (
-        'English.php' => '4275380283242534289de224c058cddc',
+        'English.php' => 'b07e2d30f464eb5917b80f3d0f2e4eaf',
       ),
-      'admin_prefs.php' => '350c98bd529939f214fb13b5ba0211e3',
-      'e_meta.php' => '35989b743d26229855efee47005b9d15',
-      'plugin.php' => 'a1e6f76436ef340b25f9acbc10b7279b',
-      'rss.php' => '14297e8157133832abf4b8e50909847f',
-      'rss_menu.php' => '3b8106323c98ce5cabc25efe42718994',
+      'admin_prefs.php' => '89b59410aaa7f6a13765f8b47ac0cd61',
+      'e_meta.php' => '9958e50a7621a6e06378cb7e75b8ef95',
+      'plugin.php' => 'e8db775d071944b9eb4acae73010312d',
+      'rss.php' => '717b14a78b0344055e8bca2d77fb737a',
+      'rss_menu.php' => 'cd872bf219f785dedfcf3248db787843',
       'rss_shortcodes.php' => '349873d68c904be89422f464f2be5d4c',
       'rss_sql.php' => 'efee18037cab9fbf35cdf81f97efc2a3',
       'rss_template.php' => '023614657d162b0f155fbe50e6e3dce2',
@@ -2449,17 +2453,17 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'b8c79cf052fcb9b782b33a53b43330d8',
+        'English.php' => '78a63f15be267f33ee1aa2f128f5260d',
       ),
-      'search_menu.php' => '6b27ebd079f042b20e8cb0c02f635b24',
+      'search_menu.php' => '815d46b5374c1fa887b198933baa25e2',
     ),
     'sitebutton_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => '15e16c4a23588a166961c9dc80bf47e7',
+        'English.php' => '60ceaffa1749967932303f6944510a3f',
       ),
-      'sitebutton_menu.php' => 'ae0d0e5f14052e7c9c8c7f594f84f2cb',
+      'sitebutton_menu.php' => '8cba92fe2e7b967425d5e3f8570229fb',
     ),
     'trackback' => 
     array (
@@ -2470,20 +2474,20 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'ddd97b40f67fa70287bd43e20d09a65a',
+        'English.php' => '9fe9fd8941a2097fd134a92052d22d92',
       ),
-      'admin_config.php' => 'af314a555fcb4ce49c8e92bb1eb46532',
-      'e_meta.php' => '9a2c96cf33d8b01761e7640b35a2ebf8',
-      'modtrackback.php' => '94c959fb4901c6307427d3d376113a11',
-      'plugin.php' => '33017ee2fb87cf5dacc29ce35f405bd7',
-      'trackback.php' => 'bce5fd43dcecbfda1b46cf0367a3a4b0',
-      'trackbackClass.php' => 'ca60f7fa9137ba247da93d6d01929c39',
+      'admin_config.php' => '36623c2b1b66bfe3ccf39038700b161a',
+      'e_meta.php' => '21f26d325a88f4c97c96fea82c490b07',
+      'modtrackback.php' => 'e9fa7f6307c0698c92ec0a07ac60af2a',
+      'plugin.php' => 'e6d478bbab19cbb9c64b3391cf0d3337',
+      'trackback.php' => 'b2c846790faa6773e2f0d482793c9865',
+      'trackbackClass.php' => 'd96190b63b5caea8eb8dbac46b45d7f3',
     ),
     'tree_menu' => 
     array (
       'languages' => 
       array (
-        'English.php' => 'ff16196d68aae90f24695d79a281c4e2',
+        'English.php' => 'fe85311f5c5392a839627028d2b3343c',
       ),
       'config.php' => 'e38d0924af50d7a3ac077ce0d464a81b',
       'tree_menu.php' => '88570c8c3f551a24f735b6df2d3c0005',
@@ -2492,9 +2496,9 @@
     array (
       'languages' => 
       array (
-        'English.php' => '37c0f0b157b3bcb1c9d68f8c6c1b0703',
+        'English.php' => '3d40344c8d1e0ec9561e899ebc2eaa86',
       ),
-      'userlanguage_menu.php' => 'bf2b64e5454add4fed2240ea82846ec2',
+      'userlanguage_menu.php' => '276b12cf07295ff561eff140a9cd1c8e',
     ),
     'usertheme_menu' => 
     array (
@@ -2502,8 +2506,8 @@
       array (
         'English.php' => 'cee12f306f38b237a4ee461a1346db5c',
       ),
-      'config.php' => 'fb722691207d96f1d38ebeb9050025f0',
-      'usertheme_menu.php' => '95b2d21faab338ed920cd74dc6e470f0',
+      'config.php' => '30d23b57b0e1b8ac554cb856dfad5ac5',
+      'usertheme_menu.php' => '4d9a9b7611e0befe823d76ac619fb9fa',
     ),
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
   ),
@@ -2521,12 +2525,12 @@
       ),
       'languages' => 
       array (
-        'English.php' => '9dc423b54416c8cd5fbf0a235722825b',
+        'English.php' => '5832e8f1af33c041192d4e7b16f32310',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'b841409838526ba769866861bf236100',
       'style.css' => 'ea3af6647ce3d7ed62c5a973b8a2a7bb',
-      'theme.php' => '1f83cbde099b2e14bbdf7055bd988f49',
+      'theme.php' => '5b62e87b20cab7e114d898bc37b87754',
     ),
     'e107v4a' => 
     array (
@@ -2567,14 +2571,14 @@
       ),
       'languages' => 
       array (
-        'English.php' => '4a40d61704822f653a98de35f74f1cd9',
+        'English.php' => '545de02af07227435bcfd7bda8b9498d',
       ),
-      'forum_template.php' => 'c94c7e2708ea4e475eebb8bc9eeed002',
+      'forum_template.php' => '9a49bbf6817aafd0a689f31dd26fd399',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'newsfeed_template.php' => 'e4f07dacc647f00139ede34f45b0a4a7',
+      'newsfeed_template.php' => '6f642de44c7eaf97e102e673d32bcec0',
       'preview.jpg' => '1f1e5815a674ceb1eaa562caa0e23607',
       'style.css' => '18850902efe5f0feb78f6b1841639ffc',
-      'theme.php' => '030ec1d72899b3f3df51506b1489f5a4',
+      'theme.php' => '4e28f2c410d3dae76afcc228f8916376',
     ),
     'human_condition' => 
     array (
@@ -2591,13 +2595,13 @@
       ),
       'languages' => 
       array (
-        'English.php' => '396a0e9bc15fe85b31b06ac4d67b71b7',
+        'English.php' => '4545016a80656b1c93e76753747e6e5a',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
-      'newforumpost.php' => '058e706a4fdc58b9f729717437d5c0dc',
+      'newforumpost.php' => 'b1dbb3fb97c454788686e895c68e28a2',
       'preview.jpg' => '37766edab6519ba0d82d89d0fad9b9df',
       'style.css' => '77b477d84c413fa5f3412fb28137b533',
-      'theme.php' => '803363c62f2bf5e6df8feee2c8b91c23',
+      'theme.php' => '733db07aa3716bfce15a34139d05f2e9',
     ),
     'interfectus' => 
     array (
@@ -2636,12 +2640,12 @@
       ),
       'languages' => 
       array (
-        'English.php' => '54ddd5bccda7e7291d190180141c1167',
+        'English.php' => '3b508ac6d1be739ce0ec81cd2887c6d1',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'a4b48f473468c22cb5f03054eda08794',
       'style.css' => 'bb2e6303ad7fed8a1119fd08b7bd11e8',
-      'theme.php' => '884a7bd6e6ef9117428a5233be15a242',
+      'theme.php' => '0c3a2df9a79ddd2cd17344cdefe25e20',
     ),
     'jayya' => 
     array (
@@ -2666,7 +2670,7 @@
         'fcap2.png' => '0a733fe6e51713f13276eec753da2d9c',
         'fcap2orig.png' => '5f6f45697bc185d51f2c06d904642aad',
         'finfobar.png' => '71585c0c2d3340ece8cf769a135286b9',
-        'forum_icons_template.php' => '8def8d7afd397c75895fce8d2d062142',
+        'forum_icons_template.php' => 'a6c731248e7be08738d38ab0a5739ada',
         'main_admin.png' => '4033115a6d4c622f16e23c7d82bc1bd9',
         'moderator.png' => 'd3100a24d0bf141c8d3e5445d24b712a',
         'new.png' => 'f80e5840a07b08c9502af386b9c6c928',
@@ -2719,16 +2723,16 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'ea5e0677578291bf2428d4374102082e',
+        'English.php' => '087a029b75bb6a6e29665e4a17bd9e1c',
       ),
-      'admin_template.php' => 'a165f2e36b667a600d1c56edcf742182',
+      'admin_template.php' => '6d9c2bbfbf39da112329ab08dc1631d0',
       'canvas.css' => 'acdfee6441e3dc292657ca469b669df4',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'nav_menu.css' => 'ac9d2df99166eb5ce87c16bb146bc413',
       'pepper.css' => 'bcd1ac74e7cacb3ace1396355f238cc8',
       'preview.jpg' => '1d775846dbe1b7ea66065fc0eac72eaa',
       'style.css' => 'c406d47937f253e08d655b1d1008a6c2',
-      'theme.php' => 'a7069bccecf5d9a7057f246559b6df7d',
+      'theme.php' => '6b2b3d0a32b30572f33ab10dd3774437',
     ),
     'khatru' => 
     array (
@@ -2761,15 +2765,15 @@
       ),
       'languages' => 
       array (
-        'English.php' => '4b18cfc85ae13a70ff9a759a68d08400',
+        'English.php' => '9011895953df939ad6f9fd0a70809451',
       ),
-      'download_template.php' => '47dbea82295b80f93dd07007945cc3df',
-      'forum_post_template.php' => 'da8bbb0abc79c78c1f2e84b2bb426487',
-      'forum_posted_template.php' => 'b6fa0b1bf1b641c5ef450a32e152fb75',
-      'forum_preview_template.php' => '2c225d0fe39a75197d4bee91e3eb3b96',
-      'forum_template.php' => '0a29c84d55f881f1fa0025f56cd774ca',
-      'forum_viewforum_template.php' => '8d7dbfca0d106e0164065994a11d2be4',
-      'forum_viewtopic_template.php' => '5cc3f71c230e1b618854faaf57917f23',
+      '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',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'newforumpost.php' => 'bd44d5240db6fb7af02138dd2499a8ef',
       'news_template.php' => '0f5b689c4ad3d212934707f44b959b11',
@@ -2795,13 +2799,13 @@
       ),
       'languages' => 
       array (
-        'English.php' => '842f0ab62f8cfabad39a0616e3a55ce5',
+        'English.php' => '72992e9bdc0c2e146f61efec7431f3a0',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'cb94c52db72d1ba8bd4d1e08ee41cbfb',
       'style.css' => '0f93072e98199ac87d3d2957cda402b9',
       'theme.js' => '092a48b0a95fcb44c48236c40948eb13',
-      'theme.php' => '00c269a79837707d4e5dfae01f7814f2',
+      'theme.php' => '2a3b3f659d90a51b89c2f3f352152bb2',
       'ul.sc' => 'd06064877926df43530b0039a4a30069',
     ),
     'lamb' => 
@@ -2833,24 +2837,24 @@
       ),
       'languages' => 
       array (
-        'English.php' => '1ba4adf2391bd1dac108628fe961da9b',
+        'English.php' => 'be646b1270738dc17229ef9183b69a09',
       ),
       'alt_style.css' => '35aa4c44b4194a12623da7c9a107d21b',
       'alt_theme.php' => '09fc4de57c31e85eac390e643d401ed7',
       'chat_template.php' => '8a57696d7ecb512823073c64768c8ed7',
-      'download_template.php' => '9502ad444569864f79fb2023be575c8e',
-      'forum_post_template.php' => 'd9b12c22b97e13b6e5625543f901296b',
-      'forum_posted_template.php' => '2b8498f27db997595460418f91717e70',
-      'forum_preview_template.php' => 'dc6eddccb7ea53afea4387f36dc4bd42',
-      'forum_template.php' => 'fe2466f0b216b59a8390d12ce8199e5c',
-      'forum_viewforum_template.php' => '6fe2b9a9dc461efd6ece5f5efd2c5865',
-      'forum_viewtopic_template.php' => 'e83b1bb29246ae21274d4164308b25ec',
+      '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',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'newforumpost.php' => '7ec9f0bb87045e10862dc2b7dcc9757d',
       'news_template.php' => '0f5b689c4ad3d212934707f44b959b11',
       'preview.jpg' => '184658c1d2222cd0137cc445fcc785ea',
       'style.css' => '475d1badb0a770d6da07c350ffd6dcb7',
-      'theme.php' => 'd0685231981da64deafd4b789641c61c',
+      'theme.php' => 'bdfef691a9c3d97394131369c3bd8ae6',
     ),
     'leaf' => 
     array (
@@ -2896,7 +2900,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => '682704beae9ce647d64f68e37d485e14',
+        'English.php' => 'e1a84f5f4b70580bce505271e2c9f131',
       ),
       'bluehigh.ttf' => 'd3003ad3a5de2a785fbb898c89cf40ff',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
@@ -2904,7 +2908,7 @@
       'preview.png' => '804c22db1f71223d10e6f7b8b85f69a9',
       'style.css' => 'a54048b5029e3711fdbe23ef3abb9f05',
       'theme.js' => '16285b5ba2631979457e5e2ec1cf10af',
-      'theme.php' => 'c9e163753440fe47a90f442298f1a489',
+      'theme.php' => '1271879896bafec899191ac6be749458',
       'ul.sc' => '40e66ba9fbd2f99d59b9f7f9ba55256c',
     ),
     'newsroom' => 
@@ -2918,7 +2922,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'd253a004943df9b90e5d89709d313c28',
+        'English.php' => '22f0a43f440d729ef7e94cc9d62c4606',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'de22b398f66e271fdd908ac31f25e7e4',
@@ -2956,16 +2960,16 @@
       ),
       'languages' => 
       array (
-        'English.php' => '44b3f44a61e1f94358098988d01384e7',
+        'English.php' => '0135bd5e47ae5966c561574b085dfd55',
       ),
       'admin_style.css' => '7850d3c2db60fb1e649a6eb6201cfc11',
-      'admin_template.php' => '7c20727a2f14d9042e9312ace4108844',
+      'admin_template.php' => 'dff76ef36c5df24346370d1b7bbb860b',
       'cube.sc' => 'f85e6d1f10ab3372ec7ebdb0548651ad',
       'full_width.css' => 'f806f549c1200131c4c043db72408da7',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => '30da9e1ef04e5f1fef38ae3d23e0f3c4',
       'style.css' => 'aa2df8aa8519c802f10e3eddfd95aed3',
-      'theme.php' => '7fc5b12bc42d5873cf0a0663a3a107b7',
+      'theme.php' => 'd0cf88370fc6303fcb95148cbbdd530e',
     ),
     'sebes' => 
     array (
@@ -2987,7 +2991,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => 'e0530d482e0db826eacfb1bd6cde277a',
+        'English.php' => '0136dbae1d09ee1a237f8fbdd74fcf58',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'preview.jpg' => 'a9e7139c84a52e4b164c460a6428b317',
@@ -2996,27 +3000,27 @@
     ),
     'templates' => 
     array (
-      'admin_template.php' => '4fc20c6daf52ce73af4f003db5c600cf',
+      'admin_template.php' => '522b4fb698a871e2303864ba1c19c368',
       'banner_template.php' => 'df1a7cc8e987130f21f604123484b109',
-      'bbcode_template.php' => '929d133b19e8ccdcffb1b33aa397d6f5',
-      'comment_template.php' => 'a4902ac0d69b0e54c72195e90fa24d48',
-      'contact_template.php' => '8a1387a99a2b46720285908a9e2698c9',
-      'download_template.php' => 'c4d12bd7bd39e4ff181a9fed47572b30',
-      'email_template.php' => '4cfa941132e8e5a00cb3d5bc319ba217',
-      'footer_default.php' => 'a01aa25a60cbaeff1ef4fa280e5d6049',
+      'bbcode_template.php' => '34453d7f41db389f60185cf430e551f0',
+      'comment_template.php' => '936bce85c42cc142807925206ea73684',
+      'contact_template.php' => '130fbecbfd4a8a89e3515feb658263f9',
+      'download_template.php' => '27511cc1449179a7d9deef068446708b',
+      'email_template.php' => '185e817fa9c605d54aafe8e9ec35a050',
+      'footer_default.php' => 'f6d75a218887aebdb7d0d9406a2a2eeb',
       'fpw_template.php' => 'd3cb36082e7c0450f48f6f844f1ba2f0',
-      'header_default.php' => 'a49db4486bf03c81152baba8cd6e6856',
+      'header_default.php' => '50f2ad44941bde876c90425d026c0489',
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'login_template.php' => '17768e7adc245a95975467f7194aa4b8',
-      'membersonly_template.php' => '4caf0b12ffa16876b28133324127774f',
+      'membersonly_template.php' => 'b3e2ad471b7586d23e91643d5122d451',
       'online_template.php' => 'd30fad967e63d6bcfdbdabcd13faec0b',
       'search_template.php' => '100782de2e0ac37b7286bc2a1f65a2c2',
-      'signup_template.php' => '51bffd1a489ca5edaae02547c71bf84f',
-      'sitedown_template.php' => '2aaa58f719359e26f7a9262315a0fc66',
+      'signup_template.php' => 'db90c33b84a1efc46439c00232b9f7cd',
+      'sitedown_template.php' => 'f603877d1a98f55dbdedeb97651da8b8',
       'trackback_template.php' => 'fd54d8c26c75f9d380e8ec90860b0107',
-      'user_template.php' => 'ec342940b53449d2a515d7fca2134116',
-      'userposts_template.php' => '7a9959cfe5a5f5b5b5b310a522718119',
-      'usersettings_template.php' => '4ec9e8084cd224bebdeb4b90448f9f22',
+      'user_template.php' => 'ad49c6c90c0966249ebf206143adb915',
+      'userposts_template.php' => '9996da40bf6e41fc1671a02a0dc66a4e',
+      'usersettings_template.php' => '4bbd391b74060b850b5b7251984fdb3d',
     ),
     'vekna_blue' => 
     array (
@@ -3038,7 +3042,7 @@
       ),
       'languages' => 
       array (
-        'English.php' => '89ca2c88d8a39ebaeb889dc24b1b48d8',
+        'English.php' => 'ca1650b3a3f81abc721cdff2b0d5ff16',
       ),
       'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
       'nav_menu.css' => '74b91306b957f69bc390ed612df76ac9',
@@ -3048,45 +3052,44 @@
     ),
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
   ),
-  'article.php' => 'dee1a91db0a668afce191f0ebebf22dd',
-  'backend.php' => '42ec5ced70b13df9882353ccd67f1aa7',
-  'banner.php' => 'e4f388810336f37eec744dbc8e533209',
-  'class2.php' => '1affbdda9542da1403d6861e69369942',
-  'comment.php' => 'b30f8cfbcdceb6a36ab93f677279a4df',
-  'contact.php' => 'd67ede29c87f5521e33857a5e806d9d7',
-  'content.php' => '4e6fab5219681b8e078e006a2b33ff94',
-  'download.php' => '2f4324c4ffa9e0d4ad3fb4e01ce9dfb0',
+  'article.php' => 'b5fece2c0a57d4c2218d891ef5b5b278',
+  'banner.php' => '07f1de93043c325f0b2a869a1aafdbf6',
+  'class2.php' => 'db4acfb885a2b6cf5de85bbceaf3af35',
+  'comment.php' => '96cc8a58d3c5ce889ceb8c659b7fbb4e',
+  'contact.php' => '8c29b1abd560b4665666aa4a0cf53be4',
+  'content.php' => '538364e5bc367d0f4bcecfe7f1d831a2',
+  'download.php' => 'bc605e23ee7dfe3f46eabb567ce13297',
   'e107.htaccess' => 'c5e1ad68b41f947be285926c0f81d914',
   'e107.robots.txt' => '3f7b0f4a9348e494b4cbc1ff8ce84831',
   'e107_config.php' => 'd41d8cd98f00b204e9800998ecf8427e',
-  'email.php' => '283b4ec75546c05511c6c1e77b44ddb1',
-  'error.php' => 'd6aeb24e9773edbb5477fc5f0be6bdff',
+  'email.php' => '009db056265f595a6cf7b8e7da5832c2',
+  'error.php' => '8ece95a121d277cb9960dbce1a4d9357',
   'favicon.ico' => '5fceb78b9124ddae4027396d7cfcd328',
   'forum.php' => '3c10184d52685d7c9a6906a967b7e3d8',
   'forum_viewforum.php' => '4b9fcc3a820ed2f93b4dc707c3ebe3b4',
   'forum_viewtopic.php' => '5fea10d40850fd6f72cfbec7a328e120',
-  'fpw.php' => 'd0bbc2ce9e2cb74eb644f3a59b9275f1',
-  'gsitemap.php' => '296340bc1de2b684ada9eef958c2bc1b',
-  'index.php' => 'beabdced432f18ec110eec6345716c30',
+  'fpw.php' => '84f00171dd2cf34be4959700b387b2d8',
+  'gsitemap.php' => 'c5f2f456652be4ffca539a8f9a4ac024',
+  'index.php' => '66deb9caa6412342a269b19114c0abf3',
   'links.php' => 'bed206fc2abe8f1307ef4db3b7fee63e',
-  'login.php' => '6466e040063af9242f68a2f897eac7c0',
-  'membersonly.php' => '0089b319ff74bb44d4ed284f9817b1bd',
-  'news.php' => 'bf8138e9ca40472053f20db7e5080f36',
-  'online.php' => 'cc1723a30c127b0850e0a59b43f5e66d',
-  'page.php' => 'd85502c586e4c33952a5ef2611e11903',
-  'print.php' => 'c701a9e78536556b4252412d1fc1ffd1',
-  'rate.php' => '1f5447c7ca26d65bd556ef3183d8a85f',
-  'request.php' => '129ddc01b3a6f8203493bd0df550fd90',
-  'search.php' => '2dd2bae246758f3325b52b88355799c9',
-  'signup.php' => '1646cc6cb6c067a88e09587870ab33f4',
-  'sitedown.php' => '715b490ee3e430078b72098fd2cc0182',
-  'subcontent.php' => '904275b02d5bf229ac734c9a26f42686',
-  'submitnews.php' => 'cd97a0777f7e07037b3d72df1a12dc9d',
-  'top.php' => 'cae63905d359ede9b6c9f5fb8f185b52',
-  'upload.php' => 'b70a08b20a7bf52088038c057a36d64a',
-  'user.php' => 'c12af9f6ad66aec6325e6e1e7b382ca0',
-  'userposts.php' => 'acabb6f8f3e261572aa115f4e72f6824',
-  'usersettings.php' => '23be46afa371ec5540f103cdab6f4eb0',
+  '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',
 );
 
 $deprecated_image = array (
@@ -4535,7 +4538,6 @@
       array (
         'English.php' => '9cc7dc759d47e98f86d2223097fb6dd8',
       ),
-      '.#admin_menu.php.1.1' => '996aec68e661d293d168721272bdeb79',
     ),
     'alt_auth' => 
     array (
@@ -5832,12 +5834,12 @@
   'Copy of forum_post.php' => '0063a6cdd546d5f90374bbb3ae342a2a',
   'README.txt' => 'f27b32ddbf780a758df1b720a9adb8ac',
   'ReadMe_English_iso-8859-1.txt' => 'a15c32416143ecdebb10fab747a9065a',
+  'backend.php' => '42ec5ced70b13df9882353ccd67f1aa7',
   'chat.php' => 'f99ca9a68e350852ff12b6f201ff46e4',
   'e107_6171_readme.txt' => '7f411eaafccc974f91447c8efd9992d4',
   'forum_post.php' => 'b4537a7296252a0d8c010824b698259b',
   'install.php' => '608c273d656960375693be1e5af7d446',
   'oldpolls.php' => '2758e56550195c508819c6062b950bc3',
-  'readme.txt' => 'ff257006036939e779d287cdfee3b4b3',
   'sitemap.php' => 'd72fdc265a68f5a3b8a5d4b51d776f84',
   'stats.php' => '70a4419f7b5ce5ad398a2f2d38ab55eb',
   'upgrade.php' => '5e74e594b56732d62183c0300e222f2a',
diff -x .svn -aruN 0.7.22.src/e107_admin/cpage.php 0.7.23.src/e107_admin/cpage.php
--- 0.7.22.src/e107_admin/cpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/cpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/cpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/credits.php 0.7.23.src/e107_admin/credits.php
--- 0.7.22.src/e107_admin/credits.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/credits.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/credits.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/db.php 0.7.23.src/e107_admin/db.php
--- 0.7.22.src/e107_admin/db.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/db.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,12 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/db.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
+// Experimental e-token
+if((isset($_POST['sqltext']) || isset($_POST['delpref_checked'])) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../class2.php");
 if (!getperms('0')) 
 {
@@ -132,6 +139,7 @@
 	<td style='width:70%' class='forumheader3'>".DBLAN_8."</td>
 	<td class='forumheader3' style='width:30%;text-align:center'><input class='button' style='width: 100%' type='submit' name='backup_core' value='".DBLAN_9."' />
 	<input type='hidden' name='sqltext' value='{$sqltext}' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />
 	</td></tr>
 	</table>
 	</form>
@@ -273,6 +281,7 @@
 		}
         $text .= "<tr><td class='forumheader' colspan='4' style='text-align:center'>
 			<input class='button' type='submit' title='".LAN_DELETE."' value=\"".DBLAN_21."\" name='delpref_checked' onclick=\"return jsconfirm('".LAN_CONFIRMDEL."')\" />
+			<input type='hidden' name='e-token' value='".e_TOKEN."' />
 			</tr>
 		</table></div></form>";
         $text .= "<div style='text-align:center'><br /><a href='".e_SELF."'>".DBLAN_13."</a></div>\n";
diff -x .svn -aruN 0.7.22.src/e107_admin/db_verify.php 0.7.23.src/e107_admin/db_verify.php
--- 0.7.22.src/e107_admin/db_verify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/db_verify.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/db_verify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/docs.php 0.7.23.src/e107_admin/docs.php
--- 0.7.22.src/e107_admin/docs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/docs.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/docs.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/download.php 0.7.23.src/e107_admin/download.php
--- 0.7.22.src/e107_admin/download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/download.php	2010-08-14 18:30:25.000000000 -0500
@@ -3,17 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Copyright (c) e107 Inc. 2008-2010
 |     http://e107.org
-|     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_admin/download.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11657 $
+|     $Date: 2010-08-14 18:30:49 -0500 (Sat, 14 Aug 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -163,6 +162,7 @@
 	$pref['download_order'] = $_POST['download_order'];
 	$pref['agree_flag'] = $_POST['agree_flag'];
 	$pref['download_email'] = $_POST['download_email'];
+	$pref['download_nomultiple'] = $_POST['download_nomultiple'];
 	$pref['agree_text'] = $tp->toDB($_POST['agree_text']);
 	$pref['download_denied'] = $tp->toDB($_POST['download_denied']);
 	$pref['download_reportbroken'] = $_POST['download_reportbroken'];
@@ -374,6 +374,11 @@
 		<td class='forumheader3'>".DOWLAN_100."</td>
 		<td class='forumheader3' style='text-align:left'>". ($agree_flag ? "<input type='checkbox' name='agree_flag' value='1' checked='checked' />" : "<input type='checkbox' name='agree_flag' value='1' />")."</td>
 		</tr>
+		
+		<tr>
+		<td class='forumheader3'>".DOWLAN_160."</td>
+		<td class='forumheader3' style='text-align:left'>". ($pref['download_nomultiple'] ? "<input type='checkbox' name='download_nomultiple' value='1' checked='checked' />" : "<input type='checkbox' name='download_nomultiple' value='1' />")."</td>
+		</tr>
 
 
 
@@ -1103,13 +1108,13 @@
 		$text .= "
 			<tr>
 			<td style='width:20%' class='forumheader3'>".DOWLAN_145.":</td>
-			<td style='width:80%' class='forumheader3'>".r_userclass('download_visible', $download_visible, 'off', 'public, nobody, member, admin, classes, language')."</td>
+			<td style='width:80%' class='forumheader3'>".r_userclass('download_visible', $download_visible, 'off', 'public, nobody, member, admin, main, classes, language')."</td>
 			</tr>
 
 
 			<tr>
 			<td style='width:20%' class='forumheader3'>".DOWLAN_106.":</td>
-			<td style='width:80%' class='forumheader3'>".r_userclass('download_class', $download_class, 'off', 'public, nobody, member, admin, classes, language')."</td>
+			<td style='width:80%' class='forumheader3'>".r_userclass('download_class', $download_class, 'off', 'public, nobody, member, admin, main, classes, language')."</td>
 			</tr>
 			";
 
@@ -1633,7 +1638,7 @@
 
 			<tr>
 			<td style='width:30%' class='forumheader3'>".DOWLAN_43.":<br /><span class='smalltext'>(".DOWLAN_44.")</span></td>
-			<td style='width:70%' class='forumheader3'>".r_userclass("download_category_class", $download_category_class, 'off', 'public, nobody, member, admin, classes, language')."
+			<td style='width:70%' class='forumheader3'>".r_userclass("download_category_class", $download_category_class, 'off', 'public, nobody, member, admin, main, classes, language')."
 
 			</td></tr>";
 
diff -x .svn -aruN 0.7.22.src/e107_admin/e107_update.php 0.7.23.src/e107_admin/e107_update.php
--- 0.7.22.src/e107_admin/e107_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/e107_update.php	2010-07-13 17:04:05.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/e107_update.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11598 $
+|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -70,24 +70,28 @@
 	$ns->tablerender(($additional ? (defined("LAN_UPDATE_11") ? LAN_UPDATE_11 : '.617 to .7 Update Continued') : LAN_UPDATE_10), $text);
 }
 
-if ($_POST) {
+if ($_POST) 
+{
 	$message = run_updates($dbupdate);
 }
 
-if($sql->db_Select("plugin", "plugin_version", "plugin_path = 'forum' AND plugin_installflag='1' ")) {
+if (isset($pref['plug_installed']['forum']))
+{
 	if(file_exists(e_PLUGIN.'forum/forum_update_check.php'))
 	{
 		include_once(e_PLUGIN.'forum/forum_update_check.php');
 	}
 }
-if ($sql -> db_Query("SHOW COLUMNS FROM ".MPREFIX."stat_info") && $sql -> db_Select("plugin", "*", "plugin_path = 'log' AND plugin_installflag='1'")) {
+
+if ($sql -> db_Query("SHOW COLUMNS FROM ".MPREFIX."stat_info") && (isset($pref['plug_installed']['log']))) 
+{
 	if(file_exists(e_PLUGIN.'log/log_update_check.php'))
 	{
 		include_once(e_PLUGIN.'log/log_update_check.php');
 	}
 }
 
-if($sql->db_Select("plugin", "plugin_version", "plugin_path = 'content' AND plugin_installflag='1' "))
+if (isset($pref['plug_installed']['content']))
 {
 	if(file_exists(e_PLUGIN.'content/content_update_check.php'))
 	{
@@ -95,7 +99,7 @@
 	}
 }
 
-if ($sql->db_Select("plugin", "plugin_version", "plugin_path = 'pm' AND plugin_installflag='1' "))
+if (isset($pref['plug_installed']['pm']))
 {
 	if(file_exists(e_PLUGIN.'pm/pm_update_check.php'))
 	{
diff -x .svn -aruN 0.7.22.src/e107_admin/emoticon.php 0.7.23.src/e107_admin/emoticon.php
--- 0.7.22.src/e107_admin/emoticon.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/emoticon.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/emoticon.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/fileinspector.php 0.7.23.src/e107_admin/fileinspector.php
--- 0.7.22.src/e107_admin/fileinspector.php	2010-02-23 10:26:53.000000000 -0600
+++ 0.7.23.src/e107_admin/fileinspector.php	2010-07-23 18:16:05.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/fileinspector.php,v $
-|     $Revision: 11366 $
-|     $Date: 2010-02-23 11:27:17 -0500 (Tue, 23 Feb 2010) $
-|     $Author: mcfly_e107 $
+|     $Revision: 11617 $
+|     $Date: 2010-07-23 18:16:29 -0500 (Fri, 23 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
@@ -701,9 +701,9 @@
 		$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: 11366 $\n";
-		$data .= "|     \$Date: 2010-02-23 11:27:17 -0500 (Tue, 23 Feb 2010) $\n";
-		$data .= "|     \$Author: mcfly_e107 $\n";
+		$data .= "|     \$Revision: 11617 $\n";
+		$data .= "|     \$Date: 2010-07-23 18:16:29 -0500 (Fri, 23 Jul 2010) $\n";
+		$data .= "|     \$Author: e107coders $\n";
 		$data .= "+----------------------------------------------------------------------------+\n";
 		$data .= "*/\n\n";
 		$data .= "if (!defined('e107_INIT')) { exit; }\n\n";
@@ -815,7 +815,7 @@
 	}
 }
 
-require_once('footer.php');
+require_once(e_ADMIN.'footer.php');
 
 function headerjs() {
 global $e107;
diff -x .svn -aruN 0.7.22.src/e107_admin/filemanager.php 0.7.23.src/e107_admin/filemanager.php
--- 0.7.22.src/e107_admin/filemanager.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/filemanager.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,11 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/filemanager.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../class2.php");
 if (!getperms("6")) {
 	header("location:".e_BASE."index.php");
@@ -192,7 +200,8 @@
 
 	<tr style='vertical-align:top'>\n
 	<td colspan='2'  style='text-align:center' class='forumheader'>\n
-	<input class='button' type='submit' name='updateoptions' value='".FMLAN_33."' />\n
+	<input class='button' type='submit' name='updateoptions' value='".FMLAN_33."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />\n
 	</td>\n
 	</tr>\n\n
 
@@ -247,6 +256,7 @@
 			<input class=\"tbox\" type=\"file\" name=\"file_userfile[]\" size=\"50\" />
 			<input class=\"button\" type=\"submit\" name=\"upload\" value=\"".FMLAN_22."\" />
 			<input type=\"hidden\" name=\"upload_dir[]\" value=\"".$path.$dirs[$c]."\" />
+			<input type='hidden' name='e-token' value='".e_TOKEN."' />
 			</div>";
 	} else {
 		$text .= "&nbsp;";
@@ -325,7 +335,7 @@
 		}
 		$text .= "</select>&nbsp;";
 		$text .="<input class=\"button\" type=\"submit\" name=\"movetodls\" value=\"".FMLAN_50."\" onclick=\"return jsconfirm('".$tp->toJS(FMLAN_49)."') \" />
-		";
+		<input type='hidden' name='e-token' value='".e_TOKEN."' />";
 	}
 
 	$text .= "<input class=\"button\" type=\"submit\" name=\"deletefiles\" value=\"".FMLAN_43."\" onclick=\"return jsconfirm('".$tp->toJS(FMLAN_46)."') \" />
diff -x .svn -aruN 0.7.22.src/e107_admin/fla.php 0.7.23.src/e107_admin/fla.php
--- 0.7.22.src/e107_admin/fla.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/fla.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/fla.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/footer.php 0.7.23.src/e107_admin/footer.php
--- 0.7.22.src/e107_admin/footer.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/footer.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/footer.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/frontpage.php 0.7.23.src/e107_admin/frontpage.php
--- 0.7.22.src/e107_admin/frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/frontpage.php	2010-07-31 03:45:05.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/frontpage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11641 $
+|     $Date: 2010-07-31 03:45:29 -0500 (Sat, 31 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -108,7 +108,7 @@
 		<td style='width: 50%' class='forumheader3'>
 		".$rs -> form_radio('type', 'all_users', (isset($pref['frontpage']['all']) ? TRUE : FALSE))." ".FRTLAN_31."&nbsp;
 		".$rs -> form_radio('type', 'user_class', (isset($pref['frontpage']['all']) ? FALSE : TRUE))." ".FRTLAN_32.":
-		".r_userclass('class', '', 'off', 'guest,member,admin,classes')."</td>
+		".r_userclass('class', '', 'off', 'guest,member,admin, main, classes')."</td>
 		</tr>";
 
 		$text .= "<tr style='vertical-align:top'>
@@ -261,6 +261,6 @@
 	}
 }
 
-require_once('footer.php');
+require_once(e_ADMIN.'footer.php');
 
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_admin/header.php 0.7.23.src/e107_admin/header.php
--- 0.7.22.src/e107_admin/header.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/header.php	2010-07-23 17:09:52.000000000 -0500
@@ -4,7 +4,7 @@
 |        e107 website system
 |        /e107_admin/header.php
 |
-|        Steve Dunstan 2001-2002
+|        �Steve Dunstan 2001-2002
 |        http://e107.org
 |        jalist@e107.org
 |
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.7/e107_admin/header.php,v $
-|   $Revision: 11346 $
-|   $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|   $Author: secretr $
+|   $Revision: 11615 $
+|   $Date: 2010-07-23 17:10:16 -0500 (Fri, 23 Jul 2010) $
+|   $Author: e107coders $
 +---------------------------------------------------------------+
 */
 
@@ -140,9 +140,21 @@
 	if (file_exists(THEME.'theme.js')) { echo "<script type='text/javascript' src='".THEME_ABS."theme.js'></script>\n"; }
 	if (is_readable(e_FILE.'user.js') && filesize(e_FILE.'user.js')) { echo "<script type='text/javascript' src='".e_FILE_ABS."user.js'></script>\n"; }
 
-if (isset($eplug_js) && $eplug_js) {
+if (isset($eplug_js) && $eplug_js) 
+{
 	echo "\n<!-- eplug_js -->\n";
-	echo "<script type='text/javascript' src='{$eplug_js}'></script>\n";
+	if(is_array($eplug_js))
+	{
+    	foreach($eplug_js as $kjs)
+		{
+        	echo "<script type='text/javascript' src='{$kjs}'></script>\n";
+		}
+	}
+	else
+	{
+		echo "<script type='text/javascript' src='{$eplug_js}'></script>\n";
+	}
+
 }
 
 
@@ -170,7 +182,18 @@
 
 if (isset($eplug_css) && $eplug_css) {
 	echo "\n<!-- eplug_css -->\n";
-	echo "<link rel='stylesheet' href='{$eplug_css}' type='text/css' />\n";
+    if(is_array($eplug_css))
+	{
+      foreach($eplug_css as $kcss)
+	  {	// Allow inline style definition - but only if $eplug_css is an array (maybe require an array later)
+        if ('<style' == substr($kcss,0,6)) echo $kcss; else echo "<link rel='stylesheet' href='{$kcss}' type='text/css' />\n";
+	  }
+	}
+	else
+	{
+		echo "<link rel='stylesheet' href='{$eplug_css}' type='text/css' />\n";
+	}
+
 }
 
 echo "<!-- Theme css -->\n";
diff -x .svn -aruN 0.7.22.src/e107_admin/image.php 0.7.23.src/e107_admin/image.php
--- 0.7.22.src/e107_admin/image.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/image.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/image.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/includes/beginner.php 0.7.23.src/e107_admin/includes/beginner.php
--- 0.7.22.src/e107_admin/includes/beginner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/includes/beginner.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/includes/beginner.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/includes/cascade.php 0.7.23.src/e107_admin/includes/cascade.php
--- 0.7.22.src/e107_admin/includes/cascade.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/includes/cascade.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/includes/cascade.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/includes/categories.php 0.7.23.src/e107_admin/includes/categories.php
--- 0.7.22.src/e107_admin/includes/categories.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/includes/categories.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/includes/categories.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/includes/classis.php 0.7.23.src/e107_admin/includes/classis.php
--- 0.7.22.src/e107_admin/includes/classis.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/includes/classis.php	2010-07-16 16:28:42.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/includes/classis.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11599 $
+|     $Date: 2010-07-16 16:29:06 -0500 (Fri, 16 Jul 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -52,9 +52,14 @@
 	}
 }
 
-ksort($plugin_array, SORT_STRING);
-foreach ($plugin_array as $plug_key => $plug_value) {
+
+if (is_array($plugin_array))
+{
+	ksort($plugin_array, SORT_STRING);
+	foreach ($plugin_array as $plug_key => $plug_value) 
+	{
 	$text .= render_links($plug_value['link'], $plug_value['title'], $plug_value['caption'], $plug_value['perms'], $plug_value['icon'], 'classis');
+	}
 }
 
 $text .= render_clean();
diff -x .svn -aruN 0.7.22.src/e107_admin/includes/combo.php 0.7.23.src/e107_admin/includes/combo.php
--- 0.7.22.src/e107_admin/includes/combo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/includes/combo.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/includes/combo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/includes/compact.php 0.7.23.src/e107_admin/includes/compact.php
--- 0.7.22.src/e107_admin/includes/compact.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/includes/compact.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/includes/compact.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/index.php 0.7.23.src/e107_admin/index.php
--- 0.7.22.src/e107_admin/index.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/index.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/index.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/lancheck.php 0.7.23.src/e107_admin/lancheck.php
--- 0.7.22.src/e107_admin/lancheck.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/lancheck.php	2010-07-22 21:53:03.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/lancheck.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11613 $
+|     $Date: 2010-07-22 21:53:27 -0500 (Thu, 22 Jul 2010) $
+|     $Author: e107coders $
 |	  With code from Izydor and Lolo.
 +----------------------------------------------------------------------------+
 */
@@ -197,7 +197,7 @@
 	<td class='fcaption'>".LAN_PLUGIN."</td>
 	<td class='fcaption'>".LAN_CHECK_16."</td>
 	<td class='fcaption'>".$_POST['language']."</td>
-	<td class='fcaption'>".LAN_OPTIONS."</tr>";
+	<td class='fcaption'>".LAN_OPTIONS."</td></tr>";
 
 	foreach($core_plugins as $plugs)
 	{
@@ -214,7 +214,7 @@
 	<td class='fcaption'>Theme</td>
 	<td class='fcaption'>".LAN_CHECK_16."</td>
 	<td class='fcaption'>".$_POST['language']."</td>
-	<td class='fcaption'>".LAN_OPTIONS."</tr>";
+	<td class='fcaption'>".LAN_OPTIONS."</td></tr>";
 	foreach($core_themes as $them)
 	{
 		if(is_readable(e_THEME.$them))
@@ -240,7 +240,7 @@
 	<tr>
 	<td class='fcaption'>".LAN_CHECK_16."</td>
 	<td class='fcaption'>".$_POST['language']." File</td>
-	<td class='fcaption'>".LAN_OPTIONS."</tr>";
+	<td class='fcaption'>".LAN_OPTIONS."</td></tr>";
 
 	$keys = array_keys($English);
 
@@ -285,7 +285,7 @@
 				$style = ($er) ? "forumheader2" : "forumheader3";
 				$text .= "<td class='{$style}' style='width:50%'><div class='smalltext'>";
 				$text .= $bom_error . $utf_error;
-				$text .= (!$er && !$bom_error && !$utf_error) ? LAN_OK : $er."<br />";
+				$text .= (!$er && !$bom_error && !$utf_error) ? "<img src='".e_IMAGE."fileinspector/integrity_pass.png' alt='".LAN_OK."' />" : $er."<br />";
 				$text .= "</div></td>";
 			}
 			else
@@ -337,6 +337,8 @@
 			$ret['bom'][$key] = $fname;
 		}
 	}
+	
+
 	return $ret;
 }
 
@@ -357,13 +359,37 @@
 	{
 		if(preg_match($regexp,$f['path'].$f['fname']) && is_file($f['path'].$f['fname']))
 		{
-			$data = file($f['path'].$f['fname']);
+			$allData = file_get_contents($f['path'].$f['fname']);
+			$data = explode("\n",$allData);
+			// $data = file($f['path'].$f['fname']);
 			$relpath = str_replace($comp_dir,"",$f['path']);
+			
+			$key = str_replace(".php","",$relpath.$f['fname']);
+			
 			if(substr($data[0],0,5) != "<?php")
 			{
-				$key = str_replace(".php","",$relpath.$f['fname']);
+				
 				$ret['bom'][$key] = $f['fname'];
 			}
+					
+			$end_of_file = 0;
+						
+			foreach($data as $line)
+			{
+				if($end_of_file == 1)
+				{
+					$ret['bom'][$key] = $f['fname'];
+				}
+										
+				$line = trim($line);
+				if($line == "?>")
+				{
+					$end_of_file = 1;  	
+				}
+			}
+				
+		
+			
 			if($f['path'].$f['fname'] == e_LANGUAGEDIR.$lang."/".$lang.".php")
 			{
 				$f['fname'] = "English.php";  // change the key for the main language file.
@@ -400,6 +426,12 @@
 
 	foreach($keys as $k)
 	{
+		
+		if($k == 'bom')
+		{
+			continue;
+		}
+		
 		$lnk = $k;
 		//echo "klucz ".$k."<br />";
 		$k_check = str_replace("English",$target_lan,$k);
@@ -433,7 +465,7 @@
 			$style = ($er) ? "forumheader2" : "forumheader3";
 			$text .= "<td class='{$style}' style='width:50%'><div class='smalltext'>";
 			$text .= $bom_error . $utf_error;
-			$text .= (!$er && !$bom_error && !$utf_error) ? LAN_OK : $er."<br />";
+			$text .= (!$er && !$bom_error && !$utf_error) ? "<img src='".e_IMAGE."fileinspector/integrity_pass.png' alt='".LAN_OK."' />" : $er."<br />";
 			$text .= "</div></td>";
 		}
 		else
@@ -558,6 +590,9 @@
 	$retloc = array();
 
 	foreach($data as $line){
+		
+		$line = str_replace('define (',"define(",$line);
+		
 		//echo "line--> ".$line."<br />";
 		if (strpos($line,"define(") !== FALSE && strpos($line,");") === FALSE)
 		{
diff -x .svn -aruN 0.7.22.src/e107_admin/language.php 0.7.23.src/e107_admin/language.php
--- 0.7.22.src/e107_admin/language.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/language.php	2010-08-14 18:30:25.000000000 -0500
@@ -3,17 +3,16 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Copyright (c) e107 Inc. 2008-2010
 |     http://e107.org
-|     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_admin/language.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11657 $
+|     $Date: 2010-08-14 18:30:49 -0500 (Sat, 14 Aug 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -27,6 +26,8 @@
 
 require_once("auth.php");
 require_once(e_HANDLER."form_handler.php");
+require_once(e_HANDLER."file_class.php");
+$fl = new e_file;
 $rs = new form;
 
 $tabs = table_list(); // array("news","content","links");
@@ -72,7 +73,7 @@
 
 // ----------create tables -----------------------------------------------------
 
-if (isset($_POST['create_tables']) && $_POST['language']) {
+if (isset($_POST['kreate_tbl']) && $_POST['language']) {
 
     $table_to_copy = array();
     $lang_to_create = array();
@@ -103,11 +104,75 @@
 
 
 
+
+
+
+if (varset($_POST['ziplang']) && varset($_POST['language']))
+{
+		$status = zip_up_lang($_POST['language']);
+		if($status['error']==FALSE)
+		{	
+			$text = $status['message']."<br />";
+			$text .= share($status['file']); 
+			$ns->tablerender(LAN_CREATED, $text );
+			
+		}
+		else
+		{
+			$ns->tablerender(LAN_CREATED_FAILED, $status['message']);
+		}
+}
+
     if(isset($message) && $message){
         $ns->tablerender(LAN_OK, $message);
     }
 
-
+/**
+ * Share Language File
+ * @param object $newfile
+ * Usage of e107 is granted to you provided that this function is not modified or removed in any way. 
+ * @return 
+ */
+function share($newfile)
+{
+	if(!$newfile)
+	{
+		return;
+	}
+	
+	global $tp;
+	$full_link = $tp->createConstants($newfile);
+	
+	$email_message = "<br />Site: <a href='".SITEURL."'>".SITENAME."</a>
+	<br />User: ".USERNAME."\n
+	<br />Email: ".USEREMAIL."\n
+	<br />IP:".USERIP."
+	<br />...would like to contribute the following language pack for e107. (see attached):
+	";
+	
+	require_once(e_HANDLER."mail.php");
+	
+	$send_to = "languagepacks@e107inc.org"; 
+	$to_name = "e107 Inc.";
+	$Cc = "";
+	$Bcc = "";
+	$returnpath='';
+	$returnreceipt='';
+	$inline ="";
+	$subject = basename($newfile);
+	
+	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 .= "</div>";
+		
+		return $text;
+	} 
+	
+	return "";
+}
 
 unset($text);
 
@@ -120,6 +185,7 @@
     multilang_db();
 }
 
+
 if($action == "tools"){
     show_tools();
 }
@@ -170,8 +236,8 @@
         <tr>
             <td colspan='2' style='width:100%; text-align: center;' class='forumheader' >";
 
-            $button_capt = LANG_LAN_06. " / ". LAN_UPDATE;
-            $text .="<input type='submit' class='button' name='create_tables' value=\"".$button_capt."\" />";
+            $button_capt = LAN_CREATE. " / ". LAN_UPDATE;
+            $text .="<input type='submit' class='button' name='kreate_tbl' value=\"".$button_capt."\" />";
 
        $text .="</td>
         </tr>
@@ -403,7 +469,7 @@
     <form name='lancheck' method='post' action='".e_ADMIN."lancheck.php'>
     <table class='fborder' style='".ADMIN_WIDTH."'>
     <tr>
-    <td class='fcaption'>".LAN_CHECK_1."</td>
+    <td class='fcaption' style='width:40%'>".LAN_CHECK_1."</td>
     <td class='forumheader3' style='text-align:center'>
     <select name='language' class='tbox'>
     <option value=''>".LAN_SELECT."</option>";
@@ -424,6 +490,34 @@
     <input type='submit' name='language_sel' value=\"".LAN_CHECK_2."\" class='button' />
     </td></tr>
     </table></form>";
+	
+	  $text .= "
+    <form name='lancheck' 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'>
+    <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";
+        }
+    }
+
+    $text .= "
+    </select>
+    <input type='submit' name='ziplang' value=\"".LANG_LAN_24."\" class='button' />
+    </td></tr>
+    </table></form>";
+	
+	$text .= "<div class='smalltext' style='padding-top:50px;text-align:center'>".LANG_LAN_AGR."</div>";
 
     $ns->tablerender(LANG_LAN_21, $text);
 }
@@ -431,6 +525,115 @@
 
 // ----------------------------------------------------------------------------
 
+function zip_up_lang($language)
+{
+	global $tp;
+		
+	if(!is_writable(e_FILE."public"))
+	{
+		$ret['error'] = TRUE;
+		$ret['message'] = LAN_UPLOAD_777 . " ".e_FILE."public";
+		return $ret;		
+	}
+	
+	if (is_readable(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",
+	"featurebox","forum","gsitemap","integrity_check","lastseen","links_page",
+	"linkwords","list_new","log","login_menu","newforumposts_main","newsfeed",
+	"newsletter","online_extended_menu","online_menu","other_news_menu","pdf",
+	"pm","poll","powered_by_menu","rss_menu","search_menu","sitebutton_menu",
+	"trackback","tree_menu","userlanguage_menu","usertheme_menu"
+	);
+	 
+	 $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');
+	list($ver, $tmp) = explode(" ", $e107info['e107_version']);
+	$newfile = e_FILE."public/e107_".$ver."_".$language."_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);
+	$data = implode(",", $file);
+	
+	$ret = array();
+	
+	if ($archive->create($data) == 0)
+	{
+		
+		$ret['error'] = TRUE;
+		$ret['message'] = $archive->errorInfo(true);
+		return $ret;
+	}
+	else
+	{
+	
+		$ret['file']  = $newfile; 
+		$ret['message'] = str_replace("../", "", e_FILE.'public/')."<a href='".$newfile."' >".basename($newfile)."</a>"; 
+		$ret['error'] = FALSE;
+		return $ret;
+	}
+}
+
+
+function grab_lans($path, $language, $filter = "")
+{
+	global $fl;
+	
+	if ($lanlist = $fl->get_files($path, "", "standard", 4))
+	{
+		sort($lanlist);
+	}
+	else
+	{
+		return;
+	}
+	$pzip = array();
+	
+	
+	foreach ($lanlist as $p)
+	{	
+		$fullpath = $p['path'].$p['fname'];
+		
+		if($p['fname'] == ($language."_custom.php"))
+		{
+			continue;
+		}
+		
+		if (strpos($fullpath, $language) !== FALSE)
+		{
+			if(is_array($filter))
+			{
+				$dir =  basename(dirname($p['path']));	
+
+				if(in_array($dir,$filter))
+				{
+					$pzip[] = $fullpath;
+				}			
+			}
+			else
+			{
+				$pzip[] = $fullpath;	
+			}
+			
+		}
+	}
+	return $pzip;
+}
+
+
+
+// --------------------------------------------------------------------------
+
+
 function language_adminmenu() {
     global $action,$pref;
     if ($action == "") {
diff -x .svn -aruN 0.7.22.src/e107_admin/links.php 0.7.23.src/e107_admin/links.php
--- 0.7.22.src/e107_admin/links.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/links.php	2010-07-23 18:16:05.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/links.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11617 $
+|     $Date: 2010-07-23 18:16:29 -0500 (Fri, 23 Jul 2010) $
+|     $Author: e107coders $
 |
 | links.php?debug shows stored data for each link after name (before constant conversion)
 +----------------------------------------------------------------------------+
@@ -189,7 +189,7 @@
   $linkpost->show_sublink_generator();
 }
 
-require_once('footer.php');
+require_once(e_ADMIN.'footer.php');
 exit;
 
 // End ---------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff -x .svn -aruN 0.7.22.src/e107_admin/mailout.php 0.7.23.src/e107_admin/mailout.php
--- 0.7.22.src/e107_admin/mailout.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/mailout.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/mailout.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/menus.php 0.7.23.src/e107_admin/menus.php
--- 0.7.22.src/e107_admin/menus.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/menus.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/menus.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/message.php 0.7.23.src/e107_admin/message.php
--- 0.7.22.src/e107_admin/message.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/message.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,11 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/message.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../class2.php");
 
 $e_sub_cat = 'message';
@@ -90,6 +98,7 @@
 $text .= "
 <tr>
 <td><br /><input class='button' type='submit' name='delete_all' value='".MESSLAN_4."' />
+<input type='hidden' name='e-token' value='".e_TOKEN."' />
 <input type='checkbox' name='deleteconfirm' value='1' /> ".MESSLAN_5."
 </td>
 </tr>
diff -x .svn -aruN 0.7.22.src/e107_admin/meta.php 0.7.23.src/e107_admin/meta.php
--- 0.7.22.src/e107_admin/meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/meta.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/meta.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/modcomment.php 0.7.23.src/e107_admin/modcomment.php
--- 0.7.22.src/e107_admin/modcomment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/modcomment.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,11 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/modcomment.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../class2.php");
 if (!getperms("B")) {
 	header("location:".e_BASE."index.php");
@@ -84,6 +92,7 @@
 $text = "
 <div style='text-align:center'>
 <form method='post' action='".e_SELF."?".e_QUERY."'>
+<input type='hidden' name='e-token' value='".e_TOKEN."' />
 <table class='fborder' style='".ADMIN_WIDTH."'>";
 
 if ($editid)
@@ -95,7 +104,8 @@
 	{
 		$row = $sql->db_Fetch();
 		$text .= "<tr><td><textarea class='tbox' name='comment_comment' cols='1' rows='15' style='width:100%;'>".$row['comment_comment']."</textarea></td></tr>";
-		$text .= "<tr><td colspan='5' class='forumheader' style='text-align:center'><input class='button' type='submit' name='moderate' value='".MDCLAN_8."' /></td></tr>";
+		$text .= "<tr><td colspan='5' class='forumheader' style='text-align:center'><input class='button' type='submit' name='moderate' value='".MDCLAN_8."' />
+		</td></tr>";
 	}
 
 	$text .= "</table></form></div>";
diff -x .svn -aruN 0.7.22.src/e107_admin/newspost.php 0.7.23.src/e107_admin/newspost.php
--- 0.7.22.src/e107_admin/newspost.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/newspost.php	2010-08-13 15:51:16.000000000 -0500
@@ -3,7 +3,7 @@
 +---------------------------------------------------------------+
 |        e107 website system
 |
-|        Steve Dunstan 2001-2002
+|        �Steve Dunstan 2001-2002
 |        http://e107.org
 |        jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.7/e107_admin/newspost.php,v $
-|   $Revision: 11346 $
-|   $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|   $Author: secretr $
+|   $Revision: 11655 $
+|   $Date: 2010-08-13 15:51:40 -0500 (Fri, 13 Aug 2010) $
+|   $Author: e107steved $
 +---------------------------------------------------------------+
 
 */
@@ -450,10 +450,10 @@
 	  // ##### Display creation form 
 		global $sql, $rs, $ns, $pref, $tp, $pst, $e107;
 
-	  if ($sub_action == "sn" && !$_POST['preview']) 
-	  {
-		if ($sql->db_Select("submitnews", "*", "submitnews_id=$id", TRUE)) 
+		if ($sub_action == "sn" && !$_POST['preview']) 
 		{
+			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)
@@ -469,6 +469,8 @@
 					$_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
+				$_POST['news_title'] = $tp->dataFilter($_POST['news_title']);
 			}
 		}
 
@@ -725,7 +727,7 @@
 
 		<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,classes,language")."
+		".r_userclass_check("news_userclass", $_POST['news_class'], "nobody,public,guest,member,admin,main,classes,language")."
 		</div>
 		</td></tr>
 
@@ -1077,7 +1079,7 @@
 		$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,classes"). "</td></tr>";
+		".r_userclass("subnews_class", $pref['subnews_class'],"off","nobody,public,guest,member,admin,main,classes"). "</td></tr>";
 
 
 		$text .= "
@@ -1179,11 +1181,13 @@
 			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>
+			$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 ]")."')\"   ")
diff -x .svn -aruN 0.7.22.src/e107_admin/notify.php 0.7.23.src/e107_admin/notify.php
--- 0.7.22.src/e107_admin/notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/notify.php	2010-07-31 03:45:05.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/notify.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11641 $
+|     $Date: 2010-07-31 03:45:29 -0500 (Sat, 31 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
@@ -143,7 +143,7 @@
 		<input type='radio' name='event[".$id."][type]' value='off' ".(($this -> notify_prefs['event'][$id]['type'] == 'off' || !$this -> notify_prefs['event'][$id]['type']) ? " checked='checked'" : "")." /> ".NT_LAN_3."
 		<input type='radio' name='event[".$id."][type]' value='main' ".($this -> notify_prefs['event'][$id]['type'] == 'main' ? " checked='checked'" : "")." /> ".NT_LAN_4."
 		<input type='radio' name='event[".$id."][type]' value='class' ".($this -> notify_prefs['event'][$id]['type'] == 'class' ? " checked='checked'" : "")." /> ".NT_LAN_5.":
-		".r_userclass('event['.$id.'][class]', $this -> notify_prefs['event'][$id]['class'], 'off', 'member,admin,classes')."
+		".r_userclass('event['.$id.'][class]', $this -> notify_prefs['event'][$id]['class'], 'off', 'member,admin,main,classes')."
 		<input type='radio' name='event[".$id."][type]' value='email' ".($this -> notify_prefs['event'][$id]['type'] == 'email' ? " checked='checked'" : "")." /> ".NT_LAN_6.":
 		".$rs -> form_text('event['.$id.'][email]', 40, $tp -> toForm($this -> notify_prefs['event'][$id]['email']), 150)."
 		</td>
@@ -182,6 +182,6 @@
 	}
 }
 
-require_once('footer.php');
+require_once(e_ADMIN.'footer.php');
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_admin/phpinfo.php 0.7.23.src/e107_admin/phpinfo.php
--- 0.7.22.src/e107_admin/phpinfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/phpinfo.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/phpinfo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/plugin.php 0.7.23.src/e107_admin/plugin.php
--- 0.7.22.src/e107_admin/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/prefs.php 0.7.23.src/e107_admin/prefs.php
--- 0.7.22.src/e107_admin/prefs.php	2010-05-24 14:58:19.000000000 -0500
+++ 0.7.23.src/e107_admin/prefs.php	2010-08-20 07:59:17.000000000 -0500
@@ -9,10 +9,17 @@
 * Site preferences editing
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/prefs.php $
-* $Id: prefs.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+* $Id: prefs.php 11670 2010-08-20 12:59:41Z e107steved $
 *
 */
 
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../class2.php");
 include_once(e_HANDLER."userclass_class.php");
 include_once(e_HANDLER."user_extended_class.php");
@@ -43,12 +50,6 @@
 
 if (isset($_POST['updateprefs']))
 {
-	if(!varset($_POST['__referer']))
-	{
-		header('location:'.e_BASE.'index.php');
-		exit;
-	}
-
 	unset($_POST['updateprefs'],$_POST['sitelanguage']);
 
 	$_POST['cookie_name'] = str_replace(array(" ","."), "_", $_POST['cookie_name']);
@@ -98,7 +99,9 @@
 	exit;
 }
 
-if($sql->db_Select("plugin", "plugin_path", "plugin_installflag='1' AND plugin_path = 'alt_auth'"))
+
+
+if (isset($pref['plug_installed']['alt_auth']))
 {
 	$authlist[] = "e107";
 	$handle=opendir(e_PLUGIN."alt_auth");
@@ -160,7 +163,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='__referer' value='".POST_REFERER."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />
 	<div id='main' style='text-align:center'>
 	<table style='width:100%' class='fborder'>
 	<colgroup>
@@ -680,6 +683,21 @@
 	</td>
 	</tr>\n
 
+	<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')."
+	</td>
+	</tr>\n
+
+    <tr>
+	<td class='forumheader3' style='width:50%;'>".PRFLAN_217.":  <div class='smalltext'>".PRFLAN_218."</div></td>
+	<td class='forumheader3' style='width:50%; text-align: right;'>
+	<input type='radio' name='filter_script' value='1'".(varset($pref['filter_script'], 1) ? " checked='checked'" : "")." /> ".PRFLAN_112."&nbsp;&nbsp;
+	<input type='radio' name='filter_script' value='0'".(!varset($pref['filter_script'], 1) ? " checked='checked'" : "")." /> ".PRFLAN_113."
+	</td>
+	</tr>\n
+
     <tr>
 	<td class='forumheader3' style='width:50%;'>".PRFLAN_122.":  <div class='smalltext'>".PRFLAN_123."</div></td>
 	<td class='forumheader3' style='width:50%; text-align: right;'>
diff -x .svn -aruN 0.7.22.src/e107_admin/review.php 0.7.23.src/e107_admin/review.php
--- 0.7.22.src/e107_admin/review.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/review.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/review.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/search.php 0.7.23.src/e107_admin/search.php
--- 0.7.22.src/e107_admin/search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/search.php	2010-07-31 03:45:05.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/search.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11641 $
+|     $Date: 2010-07-31 03:45:29 -0500 (Sat, 31 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -154,7 +154,7 @@
 	$text .= "<tr>
 	<td style='width:50%' class='forumheader3'>".SEALAN_15.": </td>
 	<td style='width:50%' class='forumheader3'>
-	".r_userclass("search_restrict", $pref['search_restrict'], "off", "public,guest,nobody,member,admin,classes")."
+	".r_userclass("search_restrict", $pref['search_restrict'], "off", "public,guest,nobody,member,admin,main,classes")."
 	</td>
 	</tr>";
 
@@ -251,7 +251,7 @@
 	$text .= "<tr>
 	<td style='width:50%' class='forumheader3'>".SEALAN_44.":</td>
 	<td style='width:50%' class='forumheader3'>";
-	$text .= r_userclass("class", $search_prefs[$handler_type][$query[2]]['class'], "off", "public,guest,nobody,member,admin,classes");
+	$text .= r_userclass("class", $search_prefs[$handler_type][$query[2]]['class'], "off", "public,guest,nobody,member,admin,main,classes");
 	$text .= "</td>
 	</tr><tr>
 	<td style='width:50%' class='forumheader3'>".SEALAN_45.":</td>
@@ -319,7 +319,7 @@
 		$text .= "<tr>
 		<td style='width:55%; white-space:nowrap' class='forumheader3'>".$search_info[0]['qtype']."</td>
 		<td style='width:25%' class='forumheader3'>";
-		$text .= r_userclass("plug_handlers[".$plug_dir."][class]", $search_prefs['plug_handlers'][$plug_dir]['class'], "off", "public,guest,nobody,member,admin,classes");
+		$text .= r_userclass("plug_handlers[".$plug_dir."][class]", $search_prefs['plug_handlers'][$plug_dir]['class'], "off", "public,guest,nobody,member,admin,main,classes");
 		unset($search_info);
 		$text .= "</td>";
 		$text .= "<td style='width:10%; text-align:center' class='forumheader3'>";
@@ -339,7 +339,7 @@
 	<td style='white-space:nowrap' class='forumheader3'>Google</td>
 	<td colspan='3' class='forumheader3'>";
 	$sel = (isset($search_prefs['google']) && $search_prefs['google']) ? " checked='checked'" : "";
-	$text .= r_userclass("google", $search_prefs['google'], "off", "public,guest,nobody,member,admin,classes");
+	$text .= r_userclass("google", $search_prefs['google'], "off", "public,guest,nobody,member,admin,main,classes");
 	$text .= "</td>
 	</tr>";
 
@@ -370,7 +370,7 @@
 		$text .= "<tr>
 		<td style='width:55%; white-space:nowrap' class='forumheader3'>".$comments_title."</td>
 		<td style='width:45%' class='forumheader3'>";
-		$text .= r_userclass("comments_handlers[".$key."][class]", $search_prefs['comments_handlers'][$key]['class'], "off", "public,guest,nobody,member,admin,classes");
+		$text .= r_userclass("comments_handlers[".$key."][class]", $search_prefs['comments_handlers'][$key]['class'], "off", "public,guest,nobody,member,admin,main,classes");
 		$text .= "</td>
 		</tr>";
 		unset($comments_title);
diff -x .svn -aruN 0.7.22.src/e107_admin/sql/core_pg.php 0.7.23.src/e107_admin/sql/core_pg.php
--- 0.7.22.src/e107_admin/sql/core_pg.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/sql/core_pg.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/sql/core_pg.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/sql/core_sql.php 0.7.23.src/e107_admin/sql/core_sql.php
--- 0.7.22.src/e107_admin/sql/core_sql.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/sql/core_sql.php	2010-07-23 03:05:33.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/sql/core_sql.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11614 $
+|     $Date: 2010-07-23 03:05:57 -0500 (Fri, 23 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 header("location:../index.php");
@@ -500,6 +500,7 @@
   user_xup varchar(100) NOT NULL default '',
   PRIMARY KEY  (user_id),
   UNIQUE KEY user_name (user_name),
+  UNIQUE KEY user_loginname (user_loginname),
   KEY user_ban_index (user_ban)
 ) TYPE=MyISAM;
 # --------------------------------------------------------
diff -x .svn -aruN 0.7.22.src/e107_admin/sql/extended_country.php 0.7.23.src/e107_admin/sql/extended_country.php
--- 0.7.22.src/e107_admin/sql/extended_country.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/sql/extended_country.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/sql/extended_country.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/theme.php 0.7.23.src/e107_admin/theme.php
--- 0.7.22.src/e107_admin/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/theme.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/ugflag.php 0.7.23.src/e107_admin/ugflag.php
--- 0.7.22.src/e107_admin/ugflag.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/ugflag.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
  + ----------------------------------------------------------------------------+
  |     e107 website system
  |
- |     ©Steve Dunstan 2001-2002
+ |     Steve Dunstan 2001-2002
  |     http://e107.org
  |     jalist@e107.org
  |
@@ -11,11 +11,19 @@
  |     GNU General Public License (http://gnu.org).
  |
  |     $Source: /cvs_backup/e107_0.7/e107_admin/ugflag.php,v $
- |     $Revision: 11346 $
- |     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+ |     $Revision: 11643 $
+ |     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
  |     $Author: secretr $
  +----------------------------------------------------------------------------+
  */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once ('../class2.php');
 if(!getperms('9'))
 {
@@ -121,6 +129,7 @@
 			<tr>
 			<td colspan="2" style="text-align:center" class="forumheader">
 			<input class="button" type="submit" name="updatesettings" value="'.UGFLAN_3.'" />
+			<input type="hidden" name="e-token" value="'.e_TOKEN.'" />
 			</td>
 		</tr>
 	</table>
@@ -129,4 +138,4 @@
 ';
 
 $ns->tablerender(UGFLAN_4, $text);
-require_once ('footer.php');
+require_once(e_ADMIN.'footer.php');
diff -x .svn -aruN 0.7.22.src/e107_admin/updateadmin.php 0.7.23.src/e107_admin/updateadmin.php
--- 0.7.22.src/e107_admin/updateadmin.php	2010-05-24 14:58:19.000000000 -0500
+++ 0.7.23.src/e107_admin/updateadmin.php	2010-07-31 09:58:21.000000000 -0500
@@ -9,19 +9,23 @@
 * Admin password changing
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/updateadmin.php $
-* $Id: updateadmin.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+* $Id: updateadmin.php 11643 2010-07-31 14:58:45Z secretr $
 *
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once('../class2.php');
 $e_sub_cat = 'admin_pass';
 require_once('auth.php');
 
-if (isset($_POST['update_settings'])) {
-	if(!varset($_POST['__referer']))
-	{
-		header('location:'.e_BASE.'index.php');
-		exit;
-	}
+if (isset($_POST['update_settings']))
+{
 	if ($_POST['ac'] == md5(ADMINPWCHANGE)) {
 		if ($_POST['a_password'] != "" && $_POST['a_password2'] != "" && ($_POST['a_password'] == $_POST['a_password2'])) {
 			if (admin_update($sql -> db_Update("user", "user_password='".md5($_POST['a_password'])."', user_pwchange='".time()."' WHERE user_name='".ADMINNAME."'"), 'update', UDALAN_3." ".ADMINNAME)) {
@@ -57,7 +61,7 @@
 
 	<tr>
 	<td colspan='2' style ='text-align:center'  class='forumheader'>
-	<input type='hidden' name='__referer' value='".POST_REFERER."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />
 	<input class='button' type='submit' name='update_settings' value='".UDALAN_7."' />
 	<input type='hidden' name='ac' value='".md5(ADMINPWCHANGE)."' />
 	</td>
@@ -70,6 +74,6 @@
 	$ns->tablerender(UDALAN_8." ".ADMINNAME, $text);
 }
 
-require_once('footer.php');
+require_once(e_ADMIN.'footer.php');
 
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_admin/update_routines.php 0.7.23.src/e107_admin/update_routines.php
--- 0.7.22.src/e107_admin/update_routines.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/update_routines.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/update_routines.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/upload.php 0.7.23.src/e107_admin/upload.php
--- 0.7.22.src/e107_admin/upload.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/upload.php	2010-07-31 03:45:05.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/upload.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11641 $
+|     $Date: 2010-07-31 03:45:29 -0500 (Sat, 31 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -291,7 +291,7 @@
 	<tr>
 	<td style='width:70%' class='forumheader3'>".UPLLAN_37."<br />
 	<span class='smalltext'>".UPLLAN_38."</span></td>
-	<td style='width:30%' class='forumheader3'>".r_userclass("upload_class", $pref['upload_class'],"off","nobody,public,guest,member,admin,classes")."
+	<td style='width:30%' class='forumheader3'>".r_userclass("upload_class", $pref['upload_class'],"off","nobody,public,guest,member,admin,main,classes")."
 
 	</td>
 	</tr>
diff -x .svn -aruN 0.7.22.src/e107_admin/userclass2.php 0.7.23.src/e107_admin/userclass2.php
--- 0.7.22.src/e107_admin/userclass2.php	2010-05-24 14:58:19.000000000 -0500
+++ 0.7.23.src/e107_admin/userclass2.php	2010-07-31 09:58:21.000000000 -0500
@@ -9,15 +9,19 @@
 * Userclass management
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/userclass2.php $
-* $Id: userclass2.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+* $Id: userclass2.php 11643 2010-07-31 14:58:45Z secretr $
 *
 */
-require_once("../class2.php");
-if(count($_POST) && !varset($_POST['__referer']))
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
 {
-	header('location:'.e_BASE.'index.php');
-	exit;
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
 }
+
+require_once("../class2.php");
+
 if (!getperms("4")) {
 	header("location:".e_BASE."index.php");
 	 exit;
@@ -84,9 +88,9 @@
 	}
 }
 
-if (isset($_POST['delete']))
+if (isset($_POST['delete']) && varset($_POST['e-token']))
 {
-	if(isset($_POST['useraction']) && !varset($_POST['__referer']))
+	if(isset($_POST['useraction']))
 	{
 		header('location:'.e_BASE.'index.php');
 		exit;
@@ -200,7 +204,7 @@
 		}
 	}
 	$text .= "</select>
-		<input type='hidden' name='__referer' value='".POST_REFERER."' />
+		<input type='hidden' name='e-token' value='".e_TOKEN."' />
 		<input class='button' type='submit' name='edit' value='".LAN_EDIT."' />
 		<input class='button' type='submit' name='delete' value='".LAN_DELETE."' />
 		<input type='checkbox' name='confirm' value='1' /><span class='smalltext'> ".UCSLAN_11."</span>
@@ -252,7 +256,7 @@
 }
 
 $text .= "
-<input type='hidden' name='__referer' value='".POST_REFERER."' />
+<input type='hidden' name='e-token' value='".e_TOKEN."' />
 </td></tr></table>
 ";
 
diff -x .svn -aruN 0.7.22.src/e107_admin/userclass.php 0.7.23.src/e107_admin/userclass.php
--- 0.7.22.src/e107_admin/userclass.php	2010-02-19 14:47:09.000000000 -0600
+++ 0.7.23.src/e107_admin/userclass.php	2010-02-19 14:47:09.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/userclass.php,v $
 |     $Revision: 11349 $
-|     $Date: 2010-02-19 15:47:33 -0500 (Fri, 19 Feb 2010) $
+|     $Date: 2010-02-19 14:47:33 -0600 (Fri, 19 Feb 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/userinfo.php 0.7.23.src/e107_admin/userinfo.php
--- 0.7.22.src/e107_admin/userinfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/userinfo.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/userinfo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/users_extended.php 0.7.23.src/e107_admin/users_extended.php
--- 0.7.22.src/e107_admin/users_extended.php	2010-05-24 14:58:19.000000000 -0500
+++ 0.7.23.src/e107_admin/users_extended.php	2010-07-31 09:58:21.000000000 -0500
@@ -9,15 +9,19 @@
 * 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 11551 2010-05-24 19:58:43Z mcfly_e107 $
+* $Id: users_extended.php 11643 2010-07-31 14:58:45Z secretr $
 *
 */
-require_once("../class2.php");
-if(varset($_POST['eu_action']) && !varset($_POST['__referer']))
+
+// Experimental e-token
+if(isset($_POST['eu_action']) && !isset($_POST['e-token']))
 {
-	header('location:'.e_BASE.'index.php');
-	exit;
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
 }
+
+require_once("../class2.php");
+
 if (!getperms("4")) {
 	header("location:".e_BASE."index.php");
 	exit;
@@ -332,7 +336,7 @@
 					<td class='forumheader3' style='width:50px;text-align:center;'>
 					<form method='post' action='".e_SELF."?extended' onsubmit='return confirm(\"".EXTLAN_27."\")'>
 					<a style='text-decoration:none' href='".e_SELF."?editext.{$ext['user_extended_struct_id']}'>".ADMIN_EDIT_ICON."</a>
-					<input type='hidden' name='__referer' value='".POST_REFERER."' />
+					<input type='hidden' name='e-token' value='".e_TOKEN."' />
 					<input type='hidden' name='eu_action' value='delext' />
 					<input type='hidden' name='key' value='{$ext['user_extended_struct_id']},{$ext['user_extended_struct_name']}' />
 					<input type='image' title='".LAN_DELETE."' name='eudel' src='".ADMIN_DELETE_ICON_PATH."' />
@@ -905,7 +909,7 @@
 	}
 	$txt .= "</table></form>";
 	$ns->tablerender(EXTLAN_56, $txt);
-	require_once('footer.php');
+	require_once(e_ADMIN.'footer.php');
 	exit;
 }
 
diff -x .svn -aruN 0.7.22.src/e107_admin/users_extended_predefined.php 0.7.23.src/e107_admin/users_extended_predefined.php
--- 0.7.22.src/e107_admin/users_extended_predefined.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/users_extended_predefined.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/users_extended_predefined.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_admin/users.php 0.7.23.src/e107_admin/users.php
--- 0.7.22.src/e107_admin/users.php	2010-05-24 14:58:19.000000000 -0500
+++ 0.7.23.src/e107_admin/users.php	2010-08-01 07:40:53.000000000 -0500
@@ -9,9 +9,17 @@
 * User settings editing
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/users.php $
-* $Id: users.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+* $Id: users.php 11644 2010-08-01 12:41:17Z e107coders $
 *
 */
+
+// Experimental e-token
+if(isset($_POST['useraction']) || isset($_POST['adduser']) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	unset($_POST['e-token']);
+}
+
 require_once("../class2.php");
 
 if (!getperms("4"))
@@ -41,12 +49,6 @@
 	exit;
 }
 
-if(isset($_POST['useraction']) && !varset($_POST['__referer']))
-{
-	header('location:'.e_BASE.'index.php');
-	exit;
-}
-
 $e_sub_cat = 'users';
 $user = new users;
 require_once("auth.php");
@@ -373,23 +375,28 @@
 }
 
 // ------- Delete User --------------
-if (isset($_POST['useraction']) && $_POST['useraction'] == 'deluser') {
-	if ($_POST['confirm']) {
-		if ($sql->db_Delete("user", "user_id='".$_POST['userid']."' AND user_perms != '0' AND user_perms != '0.'")) {
+if (isset($_POST['useraction']) && $_POST['useraction'] == 'deluser') 
+{
+	if ($_POST['confirm']) 
+	{
+		if ($sql->db_Delete("user", "user_id='".$_POST['userid']."' AND user_perms != '0' AND user_perms != '0.'")) 
+		{
 		   $sql->db_Delete("user_extended", "user_extended_id='".$_POST['userid']."' ");
 		   $e_event->trigger('userdel', intval($_POST['userid']));
 			$user->show_message(USRLAN_10);
 		}
 		if(!$sub_action){ $sub_action = "user_id"; }
 		if(!$id){ $id = "DESC"; }
-  }
-  else
-  {	// Put up confirmation
-		if ($sql->db_Select("user", "*", "user_id='".$_POST['userid']."' ")) {
+	}
+	else
+	{	// Put up confirmation
+		if ($sql->db_Select("user", "*", "user_id='".$_POST['userid']."' ")) 
+		{
 			$row = $sql->db_Fetch();
 			$qry = (e_QUERY) ? "?".e_QUERY : "";
 			$text .= "<form method='post' action='".e_SELF.$qry."'><div style='text-align:center'>\n";
 			$text .= "<div>
+				<input type='hidden' name='e-token' value='".e_TOKEN."' />
 				<input type='hidden' name='useraction' value='deluser' />
 				<input type='hidden' name='userid' value='{$row['user_id']}' /></div>". USRLAN_13."
 				<br /><br /><span class='indent'>#{$row['user_id']} : {$row['user_name']}</span>
@@ -735,7 +742,7 @@
 					<form method='post' action='".e_SELF.$qry."'>
 					<div>
 
-					<input type='hidden' name='__referer' value='".POST_REFERER."'>
+					<input type='hidden' name='e-token' value='".e_TOKEN."' />
 					<input type='hidden' name='userid' value='{$user_id}' />
 					<input type='hidden' name='userip' value='{$user_ip}' />
 					<select name='useraction' onchange='this.form.submit()' class='tbox' style='width:75%'>
@@ -1086,6 +1093,7 @@
 			<tr style='vertical-align:top'>
 			<td colspan='2' style='text-align:center' class='forumheader'>
 			<input class='button' type='submit' name='adduser' value='".USRLAN_60."' />
+			<input type='hidden' name='e-token' value='".e_TOKEN."' />
 			<input type='hidden' name='ac' value='".md5(ADMINPWCHANGE)."' />
 			</td>
 			</tr>
diff -x .svn -aruN 0.7.22.src/e107_admin/ver.php 0.7.23.src/e107_admin/ver.php
--- 0.7.22.src/e107_admin/ver.php	2010-05-27 13:25:50.000000000 -0500
+++ 0.7.23.src/e107_admin/ver.php	2010-08-20 15:08:30.000000000 -0500
@@ -1,13 +1,13 @@
 <?php
 /*
-* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+* 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 11554 2010-05-27 18:26:14Z mcfly_e107 $
+* $Id: ver.php 11672 2010-08-20 20:08:54Z e107coders $
 *
 * Version file
 */
 
 if (!defined('e107_INIT')) { exit; }
 
-$e107info['e107_version'] = "0.7.22";
+$e107info['e107_version'] = "0.7.23";
 ?>
diff -x .svn -aruN 0.7.22.src/e107_admin/wmessage.php 0.7.23.src/e107_admin/wmessage.php
--- 0.7.22.src/e107_admin/wmessage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_admin/wmessage.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,11 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_admin/wmessage.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../class2.php");
 if (!getperms("M")) {
 	header("location:".e_BASE."index.php");
@@ -106,7 +114,7 @@
 		}
 
 		$text .= "</table></div>";
-		$text .= $rs->form_close();
+		$text .= "<input type='hidden' name='e-token' value='".e_TOKEN."' />".$rs->form_close();
 	} else {
 		$text .= "<div style='text-align:center'>".WMLAN_09."</div>";
 	}
@@ -156,7 +164,7 @@
 		</td>
 		</tr>
 		<tr><td class='forumheader3'>".WMLAN_03."</td>
-		<td class='forumheader3'>".r_userclass("wm_active", $row['gen_intdata'], "off", "public,guest,nobody,member,admin,classes")."</td></tr>";
+		<td class='forumheader3'>".r_userclass("wm_active", $row['gen_intdata'], "off", "public,guest,nobody,member,admin,main,classes")."</td></tr>";
 
 	$text .= "
 		<tr style='vertical-align:top'>
@@ -164,7 +172,8 @@
 
 	$text .= ($sub_action == "edit") ? "<input class='button' type='submit' name='wm_update' value='".LAN_UPDATE."' />" :
 	 "<input class='button' type='submit' name='wm_insert' value='".LAN_CREATE."' />" ;
-	$text .= "<input type='hidden' name='wm_id' value='".$id."' />";
+	$text .= "<input type='hidden' name='wm_id' value='".$id."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />";
 	$text .= "</td>
 		</tr>
 		</table>
@@ -200,6 +209,7 @@
 		<tr style='vertical-align:top'>
 		<td colspan='2'  style='text-align:center' class='forumheader'>
 		<input class='button' type='submit' name='updateoptions' value='".LAN_SAVE."' />
+		<input type='hidden' name='e-token' value='".e_TOKEN."' />
 		</td>
 		</tr>
 
diff -x .svn -aruN 0.7.22.src/e107_files/bbcode/sanitised.bb 0.7.23.src/e107_files/bbcode/sanitised.bb
--- 0.7.22.src/e107_files/bbcode/sanitised.bb	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.23.src/e107_files/bbcode/sanitised.bb	2010-08-16 11:41:11.000000000 -0500
@@ -0,0 +1,7 @@
+/* $Id: sanitised.bb 11660 2010-08-16 16:41:35Z secretr $ */
+// decode (just in case) and re-code sanitised string if debug and ADMIN
+if(defsettrue('ADMIN') && defsettrue('E107_DEBUG_LEVEL'))
+{
+	return '<span class="sanitised"> SANITISED: '.htmlentities(html_entity_decode(rawurldecode($code_text), ENT_QUOTES, CHARSET), ENT_QUOTES, CHARSET).'  SANITISED END</span>';
+}
+return '<span class="sanitised">##'.LAN_SANITISED.'##</span>';
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_files/bbcode/time.bb 0.7.23.src/e107_files/bbcode/time.bb
--- 0.7.22.src/e107_files/bbcode/time.bb	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/bbcode/time.bb	2010-07-10 16:26:59.000000000 -0500
@@ -1,2 +1,2 @@
-include_once(e_HANDLER."date_class.php");
+include_once(e_HANDLER."date_handler.php");
 return convert::convert_date($code_text, $parm); 
diff -x .svn -aruN 0.7.22.src/e107_files/bbcode/youtube.bb 0.7.23.src/e107_files/bbcode/youtube.bb
--- 0.7.22.src/e107_files/bbcode/youtube.bb	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.23.src/e107_files/bbcode/youtube.bb	2010-08-19 09:50:04.000000000 -0500
@@ -0,0 +1,71 @@
+/* $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.22.src/e107_files/def_e107_prefs.php 0.7.23.src/e107_files/def_e107_prefs.php
--- 0.7.22.src/e107_files/def_e107_prefs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/def_e107_prefs.php	2010-08-14 03:16:27.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/def_e107_prefs.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11656 $
+|     $Date: 2010-08-14 03:16:51 -0500 (Sat, 14 Aug 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -134,7 +134,7 @@
   'make_clickable' => '0',
   'track_online' => '1',
   'emotepack' => 'default',
-  'xup_enabled' => '1',
+  'xup_enabled' => '0',
   'mailer' => 'php',
   'ue_upgrade' => '1',
   'search_highlight' => '1',
@@ -144,6 +144,7 @@
   'plug_sc' => ':featurebox',
   'auth_method' => '',
   'post_html' => '254',
+  'post_script' => '254',
   'redirectsiteurl' => '0',
   'admin_alerts_uniquemenu' => '0',
   'null' => '',
diff -x .svn -aruN 0.7.22.src/e107_files/e107.js 0.7.23.src/e107_files/e107.js
--- 0.7.22.src/e107_files/e107.js	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/e107.js	2010-02-17 12:55:50.000000000 -0600
@@ -6,7 +6,7 @@
 |
 |	$Source: /cvs_backup/e107_0.7/e107_files/e107.js,v $
 |	$Revision: 11346 $
-|	$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|	$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |	$Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/import/mambo.php 0.7.23.src/e107_files/import/mambo.php
--- 0.7.22.src/e107_files/import/mambo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/import/mambo.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/import/mambo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/import/phpbb2.php 0.7.23.src/e107_files/import/phpbb2.php
--- 0.7.22.src/e107_files/import/phpbb2.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/import/phpbb2.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/import/phpbb2.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 |     31/1/2006  Changes by Albert Drent
diff -x .svn -aruN 0.7.22.src/e107_files/import/phpnuke.php 0.7.23.src/e107_files/import/phpnuke.php
--- 0.7.22.src/e107_files/import/phpnuke.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/import/phpnuke.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/import/phpnuke.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/resetcore/fixyoutube.php 0.7.23.src/e107_files/resetcore/fixyoutube.php
--- 0.7.22.src/e107_files/resetcore/fixyoutube.php	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.23.src/e107_files/resetcore/fixyoutube.php	2010-08-19 04:52:31.000000000 -0500
@@ -0,0 +1,99 @@
+<?php
+
+require_once('./../../class2.php');
+
+if (!ADMIN)
+{
+	echo 'Not allowed!';
+	exit();
+}
+
+
+echo "Youtube tag conversion<br /><br />";
+
+
+$ytChanged = FALSE;
+
+/**
+ *	Check selected fields in a table for youtube tags to convert
+ *
+ *	@param string $tableName
+ *	@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)
+{
+	global $sql, $sql2, $ytChanged;
+	echo 'Checking table: '.$tableName.'...';
+	$temp = $sql->db_Select($tableName, $idField.','.$fieldList);
+	if ($temp === FALSE)
+	{
+		echo 'not present/error.<br /><br />';
+		return;
+	}
+	elseif ($temp = 0)
+	{
+		echo 'No data found.<br /><br />';
+		return;
+	}
+	$fieldArray = explode(',', $fieldList);
+	foreach ($fieldArray as $k => $v)
+	{
+		$fieldArray[$k] = trim($v);
+	}
+	while ($row = $sql->db_Fetch(MYSQL_ASSOC))
+	{
+		$ytChanged = FALSE;
+		unset($temp);
+		
+		foreach ($fieldArray as $f)
+		{
+			$temp[$f] = preg_replace_callback('#<object(?:.*?)</object>#i', 'youtubeConvert', $row[$f]);
+		}
+		if ($ytChanged)
+		{
+			$spacer = '';
+			$new_data = '';
+			foreach ($temp as $fn => $fv)
+			{
+				$new_data .= $spacer."`{$fn}`='{$fv}'";
+				$spacer = ', ';
+			}
+			$sql2->db_Update($tableName,  $new_data." WHERE `{$idField}`='{$row[$idField]}'");
+			echo '<br />'.$tableName.": Row ID {$row[$idField]} changed";
+		}
+	}
+	echo '...Done<br />';
+}
+
+
+function youtubeConvert($matches)
+{
+	global $tp, $ytChanged;
+
+	// Need to handle some legacy formats, else the xml parser gets indigestion
+	$t = preg_replace_callback('#(\.com/v/.{7,12})(\&)#', 'quoteQuery', $matches[0]);
+	$t = str_replace('&&quot;', '&quot;', $t);
+	$t = str_replace('&quot;', '"', $t);
+	$t = str_replace('&', '&amp;', $t);
+
+	$passInfo = array(0 => '', 1 => 'youtube', 2 => '', 3 => '', 4 => $t, 5 => '');
+	$temp = $tp->checkYoutube($passInfo);		// Sufficient to fool the youtube code parser
+	if (strpos($temp, '[youtube') === 0)
+	{
+		$ytChanged = TRUE;
+		return $temp;			// Successful conversion
+	}
+	return $matches[0];			// Else don't change anything
+}
+
+
+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');
+
+echo 'Complete<br />';
+
+?>
diff -x .svn -aruN 0.7.22.src/e107_files/resetcore/resetcore.php 0.7.23.src/e107_files/resetcore/resetcore.php
--- 0.7.22.src/e107_files/resetcore/resetcore.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/resetcore/resetcore.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/resetcore/resetcore.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/resetcore.php 0.7.23.src/e107_files/resetcore.php
--- 0.7.22.src/e107_files/resetcore.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/resetcore.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/resetcore.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/bbcode_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/bbcode_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/bbcode_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/batch/bbcode_shortcodes.php	2010-08-16 11:41:11.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/bbcode_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11660 $
+|     $Date: 2010-08-16 11:41:35 -0500 (Mon, 16 Aug 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
@@ -64,6 +64,8 @@
 $bbcode['list'] = array($bbcode_func,"[list][/list]", LANHELP_36,"list.png");
 $bbcode['img'] = array($bbcode_func,"[img][/img]", LANHELP_27,"image.png");
 $bbcode['flash'] = array($bbcode_func,"[flash=width,height][/flash]", LANHELP_47,"flash.png");
+$bbcode['youtube'] = array($bbcode_func,"[youtube][/youtube]", LANHELP_48,"youtube.png");
+$bbcode['sanitised'] = array('', '', '');
 
 $bbcode['fontsize'] = array("expandit","size_selector_".$rand, LANHELP_22,"fontsize.png","Size_Select",'size_selector_'.$rand);
 $bbcode['fontcol'] = array("expandit","col_selector_".$rand, LANHELP_21,"fontcol.png","Color_Select",'col_selector_'.$rand);
@@ -81,6 +83,7 @@
 {
   foreach($register_bb as $key=>$val) // allow themes to plug in to it.
   {
+  	if($key == 'sanitised') continue; // don't allow override
 	if($val[0]=="")
 	{
     	$val[0] = $bbcode_func;
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/comment_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/comment_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/comment_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/batch/comment_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/comment_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/contact_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/contact_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/contact_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/batch/contact_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -9,7 +9,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/contact_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/download_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/download_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/download_shortcodes.php	2010-04-13 01:48:31.000000000 -0500
+++ 0.7.23.src/e107_files/shortcode/batch/download_shortcodes.php	2010-06-05 02:47:02.000000000 -0500
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/download_shortcodes.php,v $
-|     $Revision: 11473 $
-|     $Date: 2010-04-13 02:48:55 -0400 (Tue, 13 Apr 2010) $
+|     $Revision: 11573 $
+|     $Date: 2010-06-05 02:47:26 -0500 (Sat, 05 Jun 2010) $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -125,6 +125,10 @@
 
 SC_BEGIN DOWNLOAD_LIST_LINK
 global $tp,$row,$pref;
+if($parm == "view")
+{
+	return "<a href='".e_BASE."download.php?view.".$row['download_id']."'>";	
+}
 $agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc, defs"));
 	if($row['download_mirror_type']){
 		return ($pref['agree_flag'] ? "<a href='".e_BASE."download.php?mirror.".$row['download_id']."' onclick= \"return confirm('{$agreetext}');\">" : "<a href='".e_BASE."download.php?mirror.".$row['download_id']."' >");
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/news_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/news_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/news_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/batch/news_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/news_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/signup_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/signup_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/signup_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/batch/signup_shortcodes.php	2010-08-04 06:37:04.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/signup_shortcodes.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11648 $
+|     $Date: 2010-08-04 06:37:28 -0500 (Wed, 04 Aug 2010) $
 |     $Author: secretr $
 |
 | Mods to show extended field categories
@@ -37,6 +37,7 @@
 <input type='radio' name='coppa' value='1' /> ".LAN_201."<br />
 <br />
 <input class='button' type='submit' name='newver' value=\"".LAN_399."\" />
+<input type='hidden' name='e-token' value='".e_TOKEN."' />
 </div></form>
 ";
 }
@@ -44,7 +45,7 @@
 
 SC_BEGIN SIGNUP_FORM_OPEN
 global $rs;
-return $rs->form_open("post", e_SELF, "signupform");
+return $rs->form_open("post", e_SELF, "signupform")."<input type='hidden' name='e-token' value='".e_TOKEN."' />";
 SC_END
 
 SC_BEGIN SIGNUP_SIGNUP_TEXT
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/sitedown_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/sitedown_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/sitedown_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/batch/sitedown_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/sitedown_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/usersettings_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/usersettings_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/usersettings_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/batch/usersettings_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/usersettings_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/batch/user_shortcodes.php 0.7.23.src/e107_files/shortcode/batch/user_shortcodes.php
--- 0.7.22.src/e107_files/shortcode/batch/user_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/batch/user_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/batch/user_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/languagelinks.sc 0.7.23.src/e107_files/shortcode/languagelinks.sc
--- 0.7.22.src/e107_files/shortcode/languagelinks.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/languagelinks.sc	2010-06-18 13:16:43.000000000 -0500
@@ -1,4 +1,4 @@
-//<? $Id: languagelinks.sc 11346 2010-02-17 18:56:14Z secretr $
+//<? $Id: languagelinks.sc 11579 2010-06-18 18:17:07Z e107coders $
 global $pref;
 if( ! defined('LANGLINKS_SEPARATOR'))
 {
@@ -32,7 +32,7 @@
 
 	if(varset($pref['multilanguage_subdomain']))
 	{
-		$code = ($languageFolder == $pref['sitelanguage']) ? 'www.' : $code;
+		$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);
diff -x .svn -aruN 0.7.22.src/e107_files/shortcode/sitelinks_alt.sc 0.7.23.src/e107_files/shortcode/sitelinks_alt.sc
--- 0.7.22.src/e107_files/shortcode/sitelinks_alt.sc	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/shortcode/sitelinks_alt.sc	2010-02-17 12:55:50.000000000 -0600
@@ -4,7 +4,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/shortcode/sitelinks_alt.sc,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/sleight_js.php 0.7.23.src/e107_files/sleight_js.php
--- 0.7.22.src/e107_files/sleight_js.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/sleight_js.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/sleight_js.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_files/thumb.php 0.7.23.src/e107_files/thumb.php
--- 0.7.22.src/e107_files/thumb.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_files/thumb.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_files/thumb.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/admin_log_class.php 0.7.23.src/e107_handlers/admin_log_class.php
--- 0.7.22.src/e107_handlers/admin_log_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/admin_log_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/admin_log_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/arraystorage_class.php 0.7.23.src/e107_handlers/arraystorage_class.php
--- 0.7.22.src/e107_handlers/arraystorage_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/arraystorage_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/arraystorage_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/avatar_handler.php 0.7.23.src/e107_handlers/avatar_handler.php
--- 0.7.22.src/e107_handlers/avatar_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/avatar_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/avatar_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/bbcode_handler.php 0.7.23.src/e107_handlers/bbcode_handler.php
--- 0.7.22.src/e107_handlers/bbcode_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/bbcode_handler.php	2010-08-16 11:41:11.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/bbcode_handler.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11660 $
+|     $Date: 2010-08-16 11:41:35 -0500 (Mon, 16 Aug 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
@@ -34,7 +34,7 @@
 		'url', 'quote', 'left', 'right',
 		'b', 'justify', 'file', 'stream',
 		'textarea', 'list', 'php', 'time',
-		'spoiler', 'hide'
+		'spoiler', 'hide', 'youtube', 'sanitised'
 		);
 
 		foreach($core_bb as $c)
diff -x .svn -aruN 0.7.22.src/e107_handlers/cache_handler.php 0.7.23.src/e107_handlers/cache_handler.php
--- 0.7.22.src/e107_handlers/cache_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/cache_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/cache_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/comment_class.php 0.7.23.src/e107_handlers/comment_class.php
--- 0.7.22.src/e107_handlers/comment_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/comment_class.php	2010-07-31 03:26:21.000000000 -0500
@@ -4,7 +4,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -12,9 +12,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/comment_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11639 $
+|     $Date: 2010-07-31 03:26:45 -0500 (Sat, 31 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -139,7 +139,8 @@
 			$text .= $rate."<tr> \n
 			<td style='width:20%; vertical-align:top;'>".COMLAN_8.":</td>\n<td id='commentform' style='width:80%;'>\n<textarea class='tbox comment' id='comment' name='comment' cols='62' rows='7' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>$comval</textarea>\n<br />
 			".display_help('helpb',"comment")."</td></tr>\n<tr style='vertical-align:top'> \n<td style='width:20%'>".$text2."</td>\n
-			<td id='commentformbutton' style='width:80%;'>\n
+			<td id='commentformbutton' style='width:80%;'>
+			<input type='hidden' name='e-token' value='".e_TOKEN."' />\n
 			". (isset($action) && $action == "reply" ? "<input type='hidden' name='pid' value='{$id}' />" : '').(isset($eaction) && $eaction == "edit" ? "<input type='hidden' name='editpid' value='{$id}' />" : "").(isset($content_type) && $content_type ? "<input type='hidden' name='content_type' value='{$content_type}' />" : ''). "<input class='button' type='submit' name='".$action."submit' value='".(isset($eaction) && $eaction == "edit" ? COMLAN_320 : COMLAN_9)."' />\n</td>\n</tr>\n</table>\n</form></div>";
 
 			if($tablerender)
diff -x .svn -aruN 0.7.22.src/e107_handlers/date_handler.php 0.7.23.src/e107_handlers/date_handler.php
--- 0.7.22.src/e107_handlers/date_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/date_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/date_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_handlers/db_debug_class.php 0.7.23.src/e107_handlers/db_debug_class.php
--- 0.7.22.src/e107_handlers/db_debug_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/db_debug_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/db_debug_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/debug_handler.php 0.7.23.src/e107_handlers/debug_handler.php
--- 0.7.22.src/e107_handlers/debug_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/debug_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/debug_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/e107_class.php 0.7.23.src/e107_handlers/e107_class.php
--- 0.7.22.src/e107_handlers/e107_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/e107_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/e107_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/e107_Compat_handler.php 0.7.23.src/e107_handlers/e107_Compat_handler.php
--- 0.7.22.src/e107_handlers/e107_Compat_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/e107_Compat_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/e107_Compat_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/emailprint_class.php 0.7.23.src/e107_handlers/emailprint_class.php
--- 0.7.22.src/e107_handlers/emailprint_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/emailprint_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/emailprint_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/emote_filter.php 0.7.23.src/e107_handlers/emote_filter.php
--- 0.7.22.src/e107_handlers/emote_filter.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/emote_filter.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/emote_filter.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/emote.php 0.7.23.src/e107_handlers/emote.php
--- 0.7.22.src/e107_handlers/emote.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/emote.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/emote.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/encrypt_handler.php 0.7.23.src/e107_handlers/encrypt_handler.php
--- 0.7.22.src/e107_handlers/encrypt_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/encrypt_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/encrypt_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/e_parse_class.php 0.7.23.src/e107_handlers/e_parse_class.php
--- 0.7.22.src/e107_handlers/e_parse_class.php	2010-05-23 16:41:24.000000000 -0500
+++ 0.7.23.src/e107_handlers/e_parse_class.php	2010-08-19 04:52:31.000000000 -0500
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/e_parse_class.php,v $
-|     $Revision: 11549 $
-|     $Date: 2010-05-23 17:41:48 -0400 (Sun, 23 May 2010) $
+|     $Revision: 11663 $
+|     $Date: 2010-08-19 04:52:55 -0500 (Thu, 19 Aug 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -125,16 +125,26 @@
 	function toDB($data, $nostrip = false, $no_encode = false, $mod = false)
 	{
 		global $pref;
-		if (is_array($data)) {
+		if (is_array($data)) 
+		{
 			// recursively run toDB (for arrays)
-			foreach ($data as $key => $var) {
+			foreach ($data as $key => $var) 
+			{
 				$ret[$key] = $this -> toDB($var, $nostrip, $no_encode, $mod);
 			}
-		} else {
-			if (MAGIC_QUOTES_GPC == TRUE && $nostrip == false) {
+		} 
+		else 
+		{
+			if (MAGIC_QUOTES_GPC == TRUE && $nostrip == false) 
+			{
 				$data = stripslashes($data);
 			}
-			if(isset($pref['post_html']) && check_class($pref['post_html']))
+			$data = $this->preFilter($data);
+			if (!isset($pref['post_html']) || !check_class($pref['post_html']) || !isset($pref['post_script']) || !check_class($pref['post_script']))
+			{
+				$data = $this->dataFilter($data);
+			}
+			if (isset($pref['post_html']) && check_class($pref['post_html']))
 			{
 				$no_encode = TRUE;
 			}
@@ -143,7 +153,9 @@
 				$search = array('$', '"', "'", '\\', '<?');
 				$replace = array('&#036;','&quot;','&#039;', '&#092;', '&lt;?');
 				$ret = str_replace($search, $replace, $data);
-			} else {
+			} 
+			else 
+			{
 				$data = htmlspecialchars($data, ENT_QUOTES, CHARSET);
 				$data = str_replace('\\', '&#092;', $data);
 				$ret = preg_replace("/&amp;#(\d*?);/", "&#\\1;", $data);
@@ -159,6 +171,201 @@
 
 
 
+	function dataFilter($data)
+	{
+		$ans = '';
+		$vetWords = array('<applet', '<body', '<embed', '<frame', '<script', '<frameset', '<html', '<iframe', 
+					'<style', '<layer', '<link', '<ilayer', '<meta', '<object', 'javascript:', 'vbscript:');
+
+		$ret = preg_split('#(\[code.*?\[/code.*?])#mis', $data, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
+
+		foreach ($ret as $s)
+		{
+			if (strpos($s, '[code') === FALSE)
+			{
+				$vl = array();
+				$t = html_entity_decode(rawurldecode($s), ENT_QUOTES, CHARSET);
+				$t = str_replace(array("\r", "\n", "\t", "\v", "\f", "\0"), '', $t);
+				$t1 = strtolower($t);
+				foreach ($vetWords as $vw)
+				{
+					if (strpos($t1, $vw) !== FALSE)
+					{
+						$vl[] = $vw;		// Add to list of words found
+					}
+					if (substr($vw, 0, 1) == '<')
+					{
+						$vw = '</'.substr($vw, 1);
+						if (strpos($t1, $vw) !== FALSE)
+						{
+							$vl[] = $vw;		// Add to list of words found
+						}
+					}
+				}
+				// More checks here
+				if (count($vl))
+				{	// Do something
+					$s = preg_replace_callback('#('.implode('|', $vl).')#mis', array($this, 'modtag'), $t);
+				}
+			}
+			$ans .= $s;
+		}
+		return $ans;
+	}
+
+
+	function modTag($match)
+	{
+		$ans = '';
+		if (isset($match[1]))
+		{
+			$chop = intval(strlen($match[1]) / 2);
+			$ans = substr($match[1], 0, $chop).'##xss##'.substr($match[1], $chop);
+		}
+		else
+		{
+			$ans = '?????';
+		}
+		return '[sanitised]'.$ans.'[/sanitised]';
+		
+	}
+
+
+	function preFilter($data)
+	{
+		$ret = preg_replace_callback('#\[(\w+?)(?:([\=\s])(.*?)){0,1}\](.*?)\[\/\\1(.*?)\]#is', array($this, 'filtTag'), $data);
+		return $ret;
+	}
+
+
+	/**
+	 *
+	 *	@param array $matches:
+	 *		[0] - complete string
+	 *		[1] - bbcode word
+	 *		[2] - '=' or space if parameters passed in bbcode, else empty string
+	 *		[3] - parameters if passed
+	 *		[4] - text between opening and closing bbcode tags
+	 *		[5] - text after the closing tag but before the closing bracket (if any)
+	 *		[6] -
+	 */
+	function filtTag($matches)
+	{
+		switch (strtolower($matches[1]))
+		{
+			case 'youtube' :
+				return $this->checkYoutube($matches);
+			default :
+				return $matches[0];
+		}
+	}
+
+
+
+	function checkYoutube(&$matches)
+	{
+		$bbpars = array();
+		$widthString = '';
+		$matches[3] = trim($matches[3]);
+		if ($matches[3])
+		{
+			if (strpos($matches[3], '|') !== FALSE)
+			{
+				list($widthString, $matches[3]) = explode('|', $matches[3]);
+			}
+			elseif (in_array($matches[3], array('tiny', 'small', 'medium', 'big', 'huge')) || (strpos($matches[3], ',') !== FALSE))
+			{	// Assume we're just setting a width
+				$widthString = $matches[3];
+				$matches[3] = '';
+			}
+			if ($matches[3])
+			{
+				$bbpars = explode('&', $matches[3]);
+			}
+		}
+		$params = array();										// Accumulator for parameters from youtube code
+		$ok = 0;
+		if (strpos($matches[4], '<') === FALSE)
+		{	// 'Properly defined' bbcode (we hope)
+			$picRef = $matches[4];
+		}
+		else
+		{
+			//libxml_use_internal_errors(TRUE);
+			if (FALSE === ($info = simplexml_load_string($matches[4])))
+			{
+				//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 =  $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 = '['.$matches[1].'='.$widthString.']'.$picRef.'[/'.$matches[1].']';
+		return $ans;
+	}
+
+
+
+
 	function toForm($text, $single_quotes = FALSE, $convert_lt_gt = false)
 	{
 		if($text == "") { return ""; }
diff -x .svn -aruN 0.7.22.src/e107_handlers/event_class.php 0.7.23.src/e107_handlers/event_class.php
--- 0.7.22.src/e107_handlers/event_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/event_class.php	2010-08-04 20:17:45.000000000 -0500
@@ -1,55 +1,126 @@
 <?php
 /*
 + ----------------------------------------------------------------------------+
-|     e107 website system
+|	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://www.gnu.org/licenses/gpl.txt)
 |
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.7/e107_handlers/event_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|	$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 $
 +----------------------------------------------------------------------------+
 */
 	
 if (!defined('e107_INIT')) { exit; }
 
-class e107_event {
+class e107_event
+{
 	var $functions = array();
 	var $includes = array();
-	 
-	function register($eventname, $function, $include='') {
-		if ($include!='') {
-			$this->includes[$eventname][] = $include;
+	var $debug = FALSE;
+	
+
+	function e107_event()
+	{
+		// Fix for events triggered between plugins. 
+		// Events will register regardinless of the load order.  
+		
+		if(varset($_SESSION['e_EVENT_functions']))
+		{
+			$this->functions = $_SESSION['e_EVENT_functions'];					
+		}
+		if(varset($_SESSION['e_EVENT_includes']))
+		{
+			$this->includes = $_SESSION['e_EVENT_includes'];					
+		}			
+	}
+	
+	/**
+	 * Register an e107 Event
+	 * @param object $eventname
+	 * @param object $function
+	 * @param object $include [optional]
+	 * Include is required if the trigger is in a plugin that is loaded prior to the plugin that contains the function. 
+	 * @return 
+	 */
+	function register($eventname, $function, $include='')
+	{
+		// 
+		if ($include!='')
+		{
+			// $this->includes[$eventname][] = $include;
+			if(!in_array($include,$_SESSION['e_EVENT_includes'][$eventname]))
+			{
+				$_SESSION['e_EVENT_includes'][$eventname][] = $include;		
+			}			
 		}
-		$this->functions[$eventname][] = $function;
+		
+		// $this->functions[$eventname][] = $function;
+		if(!in_array($function,$_SESSION['e_EVENT_functions'][$eventname]))
+		{
+			$_SESSION['e_EVENT_functions'][$eventname][] = $function;
+		}		
 	}
-	 
-	function trigger($eventname, &$data) {
-		if (isset($this -> includes[$eventname])) {
-			foreach($this->includes[$eventname] as $evt_inc) {
-				if (file_exists($evt_inc)) {
+	
+	/**
+	 * Trigger an e107 Event
+	 * @param object $eventname
+	 * @param object $data
+	 * @return boolean
+	 */
+	function trigger($eventname, &$data)
+	{
+		if (isset($this -> includes[$eventname]))
+		{
+			foreach($this->includes[$eventname] as $evt_inc)
+			{
+				if (file_exists($evt_inc))
+				{
 					include_once($evt_inc);
 				}
 			}
 		}
-		if (isset($this -> functions[$eventname])) {
-			foreach($this->functions[$eventname] as $evt_func) {
-				if (function_exists($evt_func)) {
+		if (isset($this -> functions[$eventname]))
+		{
+			foreach($this->functions[$eventname] as $evt_func)
+			{
+				if (function_exists($evt_func))
+				{
 					$ret = $evt_func($data);
-					if ($ret!='') {
+					$this->logData($evt_func);
+					if ($ret!='')
+					{
 						break;
 					}
 				}
 			}
+			
 		}
 		return (isset($ret) ? $ret : false);
 	}
+	
+	/**
+	 * Enable the event Log for debugging. 
+	 * @return 
+	 */
+	function debug()
+	{
+		$this->debug = TRUE;
+	}
+	
+	
+	function logData($message)
+	{
+		if($this->debug == FALSE){ return; }
+		if($fp = @fopen(e_HANDLER."event.log","a+"))
+		{	
+			$contents = @fwrite($fp, date('r')." :: ".$message ." \n");
+			@fclose($fp);
+		}			
+	}
 }
 	
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_handlers/file_class.php 0.7.23.src/e107_handlers/file_class.php
--- 0.7.22.src/e107_handlers/file_class.php	2010-03-10 16:19:29.000000000 -0600
+++ 0.7.23.src/e107_handlers/file_class.php	2010-07-27 15:55:04.000000000 -0500
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/file_class.php,v $
-|     $Revision: 11410 $
-|     $Date: 2010-03-10 17:19:53 -0500 (Wed, 10 Mar 2010) $
+|     $Revision: 11631 $
+|     $Date: 2010-07-27 15:55:28 -0500 (Tue, 27 Jul 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -39,7 +39,7 @@
 		}
 		if($omit == 'standard')
 		{
-			$rejectArray = array('^\.$','^\.\.$','^\/$','^CVS$','^\.svn','thumbs\.db','.*\._$','^\.htaccess$','index\.html','null\.txt');
+			$rejectArray = array('^\.$','^\.\.$','^\/$','^CVS$','^\.svn','Thumbs\.db','thumbs\.db','.*\._$','^\.htaccess$','index\.html','null\.txt');
 		}
 		else
 		{
diff -x .svn -aruN 0.7.22.src/e107_handlers/form_handler.php 0.7.23.src/e107_handlers/form_handler.php
--- 0.7.22.src/e107_handlers/form_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/form_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/form_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/language_class.php 0.7.23.src/e107_handlers/language_class.php
--- 0.7.22.src/e107_handlers/language_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/language_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/language_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/level_handler.php 0.7.23.src/e107_handlers/level_handler.php
--- 0.7.22.src/e107_handlers/level_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/level_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/level_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/login.php 0.7.23.src/e107_handlers/login.php
--- 0.7.22.src/e107_handlers/login.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/login.php	2010-06-05 23:18:45.000000000 -0500
@@ -12,9 +12,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/login.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11574 $
+|     $Date: 2010-06-05 23:19:09 -0500 (Sat, 05 Jun 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -117,6 +117,7 @@
 				$user_id = $lode['user_id'];
 				$user_name = $lode['user_name'];
 				$user_xup = $lode['user_xup'];
+				$user_admin = $lode['user_admin'];
 
 				/* restrict more than one person logging in using same us/pw */
 				if($pref['disallowMultiLogin']) {
@@ -142,7 +143,7 @@
 						cookie($pref['cookie_name'], $cookieval);
 					}
 				}
-				$edata_li = array("user_id" => $user_id, "user_name" => $username);
+				$edata_li = array("user_id" => $user_id, "user_name" => $username, "user_admin"=> $user_admin);
 				$e_event->trigger("login", $edata_li);
 				$redir = str_replace('&amp;','&',(e_QUERY ? e_SELF."?".e_QUERY : e_SELF));
 
diff -x .svn -aruN 0.7.22.src/e107_handlers/mail.php 0.7.23.src/e107_handlers/mail.php
--- 0.7.22.src/e107_handlers/mail.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/mail.php	2010-08-07 05:45:40.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/mail.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11650 $
+|     $Date: 2010-08-07 05:46:04 -0500 (Sat, 07 Aug 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -176,11 +176,16 @@
 
 	if (isset($returnpath) && ($returnpath != ""))
 	{  // Passed parameter overrides any system default
-	$mail->Sender = $returnpath;
+		$mail->Sender = $returnpath;
 	}
-	elseif($pref['mail_bounce_email'] !=''){
+	elseif($pref['mail_bounce_email'] !='')
+	{
 		$mail->Sender = $pref['mail_bounce_email'];
     }
+	else
+	{
+		$mail->Sender = $send_from; 
+	}
 
 	if (!$mail->Send()) {
 		// echo "There has been a mail error sending to " . $row["email"] . "<br>";
diff -x .svn -aruN 0.7.22.src/e107_handlers/message_handler.php 0.7.23.src/e107_handlers/message_handler.php
--- 0.7.22.src/e107_handlers/message_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/message_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/message_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/mysql_class.php 0.7.23.src/e107_handlers/mysql_class.php
--- 0.7.22.src/e107_handlers/mysql_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/mysql_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/mysql_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_handlers/notify_class.php 0.7.23.src/e107_handlers/notify_class.php
--- 0.7.22.src/e107_handlers/notify_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/notify_class.php	2010-07-23 18:36:16.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/notify_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11619 $
+|     $Date: 2010-07-23 18:36:40 -0500 (Fri, 23 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -36,7 +36,7 @@
 		include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_notify.php');
 	}
 
-	function send($id, $subject, $message)
+	function send($id, $subject, $message) 
 	{
 		global $sql, $tp;
 		e107_require_once(e_HANDLER.'mail.php');
@@ -132,12 +132,24 @@
 
 function notify_newspost($data) {
 	global $nt, $tp;
+	
+	if(varset($data['news_userclass'][255])) // No notification when set to 'Nobody'. 
+	{
+		return;
+	}
+	
 	$message = $tp->toDB('<b>'.$data['news_title'].'</b><br /><br />'.$data['news_summary'].'<br /><br />'.$data['data'].'<br /><br />'.$data['news_extended']);
 	$nt -> send('newspost', $data['news_title'], $message);
 }
 
 function notify_newsupd($data) {
 	global $nt, $tp;
+
+	if(varset($data['news_userclass'][255])) // No notification when set to 'Nobody'. 
+	{
+		return;
+	}
+
 	$message = $tp->toDB('<b>'.$data['news_title'].'</b><br /><br />'.$data['news_summary'].'<br /><br />'.$data['data'].'<br /><br />'.$data['news_extended']);
 	$nt -> send('newsupd', NT_LAN_NU_1.': '.$data['news_title'], $message);
 }
diff -x .svn -aruN 0.7.22.src/e107_handlers/np_class.php 0.7.23.src/e107_handlers/np_class.php
--- 0.7.22.src/e107_handlers/np_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/np_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/np_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/override_class.php 0.7.23.src/e107_handlers/override_class.php
--- 0.7.22.src/e107_handlers/override_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/override_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/override_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/parser_functions.php 0.7.23.src/e107_handlers/parser_functions.php
--- 0.7.22.src/e107_handlers/parser_functions.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/parser_functions.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/parser_functions.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/parser_handler.php 0.7.23.src/e107_handlers/parser_handler.php
--- 0.7.22.src/e107_handlers/parser_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/parser_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/parser_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/phpmailer/mailout_process.php 0.7.23.src/e107_handlers/phpmailer/mailout_process.php
--- 0.7.22.src/e107_handlers/phpmailer/mailout_process.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/phpmailer/mailout_process.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/phpmailer/mailout_process.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/plugin_class.php 0.7.23.src/e107_handlers/plugin_class.php
--- 0.7.22.src/e107_handlers/plugin_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/plugin_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/plugin_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_handlers/popup_handler.php 0.7.23.src/e107_handlers/popup_handler.php
--- 0.7.22.src/e107_handlers/popup_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/popup_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_handlers/popup_handler.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/pref_class.php 0.7.23.src/e107_handlers/pref_class.php
--- 0.7.22.src/e107_handlers/pref_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/pref_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_handlers/pref_class.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/preset_class.php 0.7.23.src/e107_handlers/preset_class.php
--- 0.7.22.src/e107_handlers/preset_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/preset_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_handlers/preset_class.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/profanity_filter.php 0.7.23.src/e107_handlers/profanity_filter.php
--- 0.7.22.src/e107_handlers/profanity_filter.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/profanity_filter.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/profanity_filter.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/rate_class.php 0.7.23.src/e107_handlers/rate_class.php
--- 0.7.22.src/e107_handlers/rate_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/rate_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/rate_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/ren_help.php 0.7.23.src/e107_handlers/ren_help.php
--- 0.7.22.src/e107_handlers/ren_help.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/ren_help.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/ren_help.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/resize_handler.php 0.7.23.src/e107_handlers/resize_handler.php
--- 0.7.22.src/e107_handlers/resize_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/resize_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/resize_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 |
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/advanced_comment.php 0.7.23.src/e107_handlers/search/advanced_comment.php
--- 0.7.22.src/e107_handlers/search/advanced_comment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/advanced_comment.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_comment.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/advanced_download.php 0.7.23.src/e107_handlers/search/advanced_download.php
--- 0.7.22.src/e107_handlers/search/advanced_download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/advanced_download.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_download.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/advanced_news.php 0.7.23.src/e107_handlers/search/advanced_news.php
--- 0.7.22.src/e107_handlers/search/advanced_news.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/advanced_news.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_news.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/advanced_pages.php 0.7.23.src/e107_handlers/search/advanced_pages.php
--- 0.7.22.src/e107_handlers/search/advanced_pages.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/advanced_pages.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_pages.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/advanced_user.php 0.7.23.src/e107_handlers/search/advanced_user.php
--- 0.7.22.src/e107_handlers/search/advanced_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/advanced_user.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/advanced_user.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/comments_download.php 0.7.23.src/e107_handlers/search/comments_download.php
--- 0.7.22.src/e107_handlers/search/comments_download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/comments_download.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/comments_download.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/comments_news.php 0.7.23.src/e107_handlers/search/comments_news.php
--- 0.7.22.src/e107_handlers/search/comments_news.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/comments_news.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/comments_news.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/comments_page.php 0.7.23.src/e107_handlers/search/comments_page.php
--- 0.7.22.src/e107_handlers/search/comments_page.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/comments_page.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/comments_page.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/comments_user.php 0.7.23.src/e107_handlers/search/comments_user.php
--- 0.7.22.src/e107_handlers/search/comments_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/comments_user.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/comments_user.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/search_comment.php 0.7.23.src/e107_handlers/search/search_comment.php
--- 0.7.22.src/e107_handlers/search/search_comment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/search_comment.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_comment.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/search_download.php 0.7.23.src/e107_handlers/search/search_download.php
--- 0.7.22.src/e107_handlers/search/search_download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/search_download.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_download.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/search_event.php 0.7.23.src/e107_handlers/search/search_event.php
--- 0.7.22.src/e107_handlers/search/search_event.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/search_event.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_event.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/search_news.php 0.7.23.src/e107_handlers/search/search_news.php
--- 0.7.22.src/e107_handlers/search/search_news.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/search_news.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_news.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/search_pages.php 0.7.23.src/e107_handlers/search/search_pages.php
--- 0.7.22.src/e107_handlers/search/search_pages.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/search_pages.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_pages.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search/search_user.php 0.7.23.src/e107_handlers/search/search_user.php
--- 0.7.22.src/e107_handlers/search/search_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search/search_user.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search/search_user.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/search_class.php 0.7.23.src/e107_handlers/search_class.php
--- 0.7.22.src/e107_handlers/search_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/search_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/search_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/secure_img_handler.php 0.7.23.src/e107_handlers/secure_img_handler.php
--- 0.7.22.src/e107_handlers/secure_img_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/secure_img_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/secure_img_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/secure_img_render.php 0.7.23.src/e107_handlers/secure_img_render.php
--- 0.7.22.src/e107_handlers/secure_img_render.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/secure_img_render.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/secure_img_render.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/session_handler.php 0.7.23.src/e107_handlers/session_handler.php
--- 0.7.22.src/e107_handlers/session_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/session_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/session_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/shortcode_handler.php 0.7.23.src/e107_handlers/shortcode_handler.php
--- 0.7.22.src/e107_handlers/shortcode_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/shortcode_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 | $Source: /cvs_backup/e107_0.7/e107_handlers/shortcode_handler.php,v $
 | $Revision: 11346 $
-| $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+| $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 | $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/sitelinks_class.php 0.7.23.src/e107_handlers/sitelinks_class.php
--- 0.7.22.src/e107_handlers/sitelinks_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/sitelinks_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/sitelinks_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/theme_handler.php 0.7.23.src/e107_handlers/theme_handler.php
--- 0.7.22.src/e107_handlers/theme_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/theme_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/theme_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php 0.7.23.src/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php
--- 0.7.22.src/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php	2010-02-17 12:55:50.000000000 -0600
@@ -14,7 +14,7 @@
 //
 // $Source: /cvs_backup/e107_0.7/e107_handlers/tiny_mce/plugins/ibrowser/ibrowser.php,v $
 // $Revision: 11346 $
-// $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+// $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 // $Author: secretr $
 // +----------------------------------------------------------------------------+
 // Major Re-work by CaMer0n
diff -x .svn -aruN 0.7.22.src/e107_handlers/tiny_mce/plugins/ibrowser/langs/en_dlg.js 0.7.23.src/e107_handlers/tiny_mce/plugins/ibrowser/langs/en_dlg.js
--- 0.7.22.src/e107_handlers/tiny_mce/plugins/ibrowser/langs/en_dlg.js	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.23.src/e107_handlers/tiny_mce/plugins/ibrowser/langs/en_dlg.js	2010-07-23 17:18:26.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.addI18n('en.ibrowser_dlg',{ title:"Insert image", });
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_handlers/tiny_mce/wysiwyg.php 0.7.23.src/e107_handlers/tiny_mce/wysiwyg.php
--- 0.7.22.src/e107_handlers/tiny_mce/wysiwyg.php	2010-03-07 15:04:01.000000000 -0600
+++ 0.7.23.src/e107_handlers/tiny_mce/wysiwyg.php	2010-03-07 15:04:01.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/tiny_mce/wysiwyg.php,v $
 |     $Revision: 11387 $
-|     $Date: 2010-03-07 16:04:25 -0500 (Sun, 07 Mar 2010) $
+|     $Date: 2010-03-07 15:04:25 -0600 (Sun, 07 Mar 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/traffic_class_display.php 0.7.23.src/e107_handlers/traffic_class_display.php
--- 0.7.22.src/e107_handlers/traffic_class_display.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/traffic_class_display.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/traffic_class_display.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/traffic_class.php 0.7.23.src/e107_handlers/traffic_class.php
--- 0.7.22.src/e107_handlers/traffic_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/traffic_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/traffic_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/upload_handler.php 0.7.23.src/e107_handlers/upload_handler.php
--- 0.7.22.src/e107_handlers/upload_handler.php	2010-04-07 16:12:32.000000000 -0500
+++ 0.7.23.src/e107_handlers/upload_handler.php	2010-04-07 16:12:32.000000000 -0500
@@ -13,7 +13,7 @@
 |
 |   $Source: /cvs_backup/e107_0.7/e107_handlers/upload_handler.php,v $
 |   $Revision: 11467 $
-|   $Date: 2010-04-07 17:12:56 -0400 (Wed, 07 Apr 2010) $
+|   $Date: 2010-04-07 16:12:56 -0500 (Wed, 07 Apr 2010) $
 |   $Author: e107steved $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/userclass_class.php 0.7.23.src/e107_handlers/userclass_class.php
--- 0.7.22.src/e107_handlers/userclass_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/userclass_class.php	2010-08-20 14:16:43.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/userclass_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11671 $
+|     $Date: 2010-08-20 14:17:07 -0500 (Fri, 20 Aug 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -158,6 +158,14 @@
 		$ret .= "<label><input type='checkbox' name='{$fieldname}[".e_UC_ADMIN."]' value='1' {$c} /> ".UC_LAN_5."</label><br />";
 	}
 
+	if (strpos($optlist, "main") !== FALSE)
+	{
+		$c = (in_array(e_UC_MAINADMIN, $curArray)) ? " checked='checked' " : "";
+		$ret .= "<label><input type='checkbox' name='{$fieldname}[".e_UC_MAINADMIN."]' value='1' {$c} /> ".UC_LAN_6."</label><br />";
+	}	
+	
+	
+
 	if (!$optlist || strpos($optlist, "readonly") !== FALSE)
 	{
 		$c = (in_array(e_UC_READONLY, $curArray)) ? " checked='checked' " : "";
diff -x .svn -aruN 0.7.22.src/e107_handlers/user_extended_class.php 0.7.23.src/e107_handlers/user_extended_class.php
--- 0.7.22.src/e107_handlers/user_extended_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/user_extended_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/user_extended_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/user_func.php 0.7.23.src/e107_handlers/user_func.php
--- 0.7.22.src/e107_handlers/user_func.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/user_func.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/user_func.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/user_select_class.php 0.7.23.src/e107_handlers/user_select_class.php
--- 0.7.22.src/e107_handlers/user_select_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/user_select_class.php	2010-07-31 04:27:29.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/user_select_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11642 $
+|     $Date: 2010-07-31 04:27:53 -0500 (Sat, 31 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -182,7 +182,9 @@
 			<table style='width:100%' class='fborder'>
 			<tr>
 			<td class='forumheader3' style='text-align: center'><input type='text' name='srch' class='tbox' value='".$tp -> post_toForm($_POST['srch'])."' size='40'>
-			<input class='button' type='submit' name='dosrch' class='tbox' value='".US_LAN_6."' /></td>
+			<input class='button' type='submit' name='dosrch' class='tbox' value='".US_LAN_6."' />
+			<input type='hidden' name='e-token' value='".e_TOKEN."' />
+			</td>
 			</tr>
 			</table>
 			</form>
diff -x .svn -aruN 0.7.22.src/e107_handlers/usersession_class.php 0.7.23.src/e107_handlers/usersession_class.php
--- 0.7.22.src/e107_handlers/usersession_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/usersession_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/usersession_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_handlers/xml_class.php 0.7.23.src/e107_handlers/xml_class.php
--- 0.7.22.src/e107_handlers/xml_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_handlers/xml_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_handlers/xml_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_images/generic/bbcode/youtube.png 0.7.23.src/e107_images/generic/bbcode/youtube.png
--- 0.7.22.src/e107_images/generic/bbcode/youtube.png	1969-12-31 18:00:00.000000000 -0600
+++ 0.7.23.src/e107_images/generic/bbcode/youtube.png	2010-08-16 11:41:11.000000000 -0500
@@ -0,0 +1,7 @@
+PNG
+
+   
IHDR         j	   sBITO  PLTE¾~~||wwhhgg``^^\\}}ZZ|{|XXWW|yyVV{yzSSSSRRPPOONNlllgfg<<885544221110\\\//**''%%$$!!PMNA??jP   tRNS j8	   	pHYs    ~   tEXtSoftware Adobe Fireworks CS5q6  :IDATc`a (>a!&]F O "b::V@VP`ܙ0YER*,);bvY$fLNk%klWxx@]\d,'nI)Щ vS^}ρ7ɵr
+o^z'7-
+/<xݪ/ⷀ
+=7ubu^qj	lFPam
+򷶳A
8g\86+}JھJN].gK玞=q񽾜Pa5ᐒ (gUkeC#
+  ȇ)1%    IENDB`
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_images/thumb.php 0.7.23.src/e107_images/thumb.php
--- 0.7.22.src/e107_images/thumb.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_images/thumb.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_images/thumb.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/administrator.php 0.7.23.src/e107_languages/English/admin/help/administrator.php
--- 0.7.22.src/e107_languages/English/admin/help/administrator.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/administrator.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/administrator.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/banlist.php 0.7.23.src/e107_languages/English/admin/help/banlist.php
--- 0.7.22.src/e107_languages/English/admin/help/banlist.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/banlist.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/banlist.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/cache.php 0.7.23.src/e107_languages/English/admin/help/cache.php
--- 0.7.22.src/e107_languages/English/admin/help/cache.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/cache.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/cache.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/cpage.php 0.7.23.src/e107_languages/English/admin/help/cpage.php
--- 0.7.22.src/e107_languages/English/admin/help/cpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/cpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/cpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/db.php 0.7.23.src/e107_languages/English/admin/help/db.php
--- 0.7.22.src/e107_languages/English/admin/help/db.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/db.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/db.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/download.php 0.7.23.src/e107_languages/English/admin/help/download.php
--- 0.7.22.src/e107_languages/English/admin/help/download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/download.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/download.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/emoticon.php 0.7.23.src/e107_languages/English/admin/help/emoticon.php
--- 0.7.22.src/e107_languages/English/admin/help/emoticon.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/emoticon.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/emoticon.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/fileinspector.php 0.7.23.src/e107_languages/English/admin/help/fileinspector.php
--- 0.7.22.src/e107_languages/English/admin/help/fileinspector.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/fileinspector.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/fileinspector.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/filemanager.php 0.7.23.src/e107_languages/English/admin/help/filemanager.php
--- 0.7.22.src/e107_languages/English/admin/help/filemanager.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/filemanager.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/filemanager.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/frontpage.php 0.7.23.src/e107_languages/English/admin/help/frontpage.php
--- 0.7.22.src/e107_languages/English/admin/help/frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/frontpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/frontpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/image.php 0.7.23.src/e107_languages/English/admin/help/image.php
--- 0.7.22.src/e107_languages/English/admin/help/image.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/image.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/image.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/language.php 0.7.23.src/e107_languages/English/admin/help/language.php
--- 0.7.22.src/e107_languages/English/admin/help/language.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/language.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/language.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/links.php 0.7.23.src/e107_languages/English/admin/help/links.php
--- 0.7.22.src/e107_languages/English/admin/help/links.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/links.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/links.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/mailout.php 0.7.23.src/e107_languages/English/admin/help/mailout.php
--- 0.7.22.src/e107_languages/English/admin/help/mailout.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/mailout.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/mailout.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/menus.php 0.7.23.src/e107_languages/English/admin/help/menus.php
--- 0.7.22.src/e107_languages/English/admin/help/menus.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/menus.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/menus.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/meta.php 0.7.23.src/e107_languages/English/admin/help/meta.php
--- 0.7.22.src/e107_languages/English/admin/help/meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/meta.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/meta.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/news_category.php 0.7.23.src/e107_languages/English/admin/help/news_category.php
--- 0.7.22.src/e107_languages/English/admin/help/news_category.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/news_category.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/news_category.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/newspost.php 0.7.23.src/e107_languages/English/admin/help/newspost.php
--- 0.7.22.src/e107_languages/English/admin/help/newspost.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/newspost.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/newspost.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/notify.php 0.7.23.src/e107_languages/English/admin/help/notify.php
--- 0.7.22.src/e107_languages/English/admin/help/notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/notify.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/notify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/phpinfo.php 0.7.23.src/e107_languages/English/admin/help/phpinfo.php
--- 0.7.22.src/e107_languages/English/admin/help/phpinfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/phpinfo.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/phpinfo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/prefs.php 0.7.23.src/e107_languages/English/admin/help/prefs.php
--- 0.7.22.src/e107_languages/English/admin/help/prefs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/prefs.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/prefs.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/search.php 0.7.23.src/e107_languages/English/admin/help/search.php
--- 0.7.22.src/e107_languages/English/admin/help/search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/search.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/search.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/theme.php 0.7.23.src/e107_languages/English/admin/help/theme.php
--- 0.7.22.src/e107_languages/English/admin/help/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/theme.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/ugflag.php 0.7.23.src/e107_languages/English/admin/help/ugflag.php
--- 0.7.22.src/e107_languages/English/admin/help/ugflag.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/ugflag.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/ugflag.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/updateadmin.php 0.7.23.src/e107_languages/English/admin/help/updateadmin.php
--- 0.7.22.src/e107_languages/English/admin/help/updateadmin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/updateadmin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/updateadmin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/upload.php 0.7.23.src/e107_languages/English/admin/help/upload.php
--- 0.7.22.src/e107_languages/English/admin/help/upload.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/upload.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/upload.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/userclass2.php 0.7.23.src/e107_languages/English/admin/help/userclass2.php
--- 0.7.22.src/e107_languages/English/admin/help/userclass2.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/userclass2.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/userclass2.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/users_extended.php 0.7.23.src/e107_languages/English/admin/help/users_extended.php
--- 0.7.22.src/e107_languages/English/admin/help/users_extended.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/users_extended.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/users_extended.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/users.php 0.7.23.src/e107_languages/English/admin/help/users.php
--- 0.7.22.src/e107_languages/English/admin/help/users.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/users.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/users.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/help/wmessage.php 0.7.23.src/e107_languages/English/admin/help/wmessage.php
--- 0.7.22.src/e107_languages/English/admin/help/wmessage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/help/wmessage.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/help/wmessage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_administrator.php 0.7.23.src/e107_languages/English/admin/lan_administrator.php
--- 0.7.22.src/e107_languages/English/admin/lan_administrator.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_administrator.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_administrator.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_admin_log.php 0.7.23.src/e107_languages/English/admin/lan_admin_log.php
--- 0.7.22.src/e107_languages/English/admin/lan_admin_log.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_admin_log.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_admin_log.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: lisa_ 
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_admin.php 0.7.23.src/e107_languages/English/admin/lan_admin.php
--- 0.7.22.src/e107_languages/English/admin/lan_admin.php	2010-04-05 16:34:33.000000000 -0500
+++ 0.7.23.src/e107_languages/English/admin/lan_admin.php	2010-04-05 16:34:33.000000000 -0500
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_admin.php,v $
 |     $Revision: 11461 $
-|     $Date: 2010-04-05 17:34:57 -0400 (Mon, 05 Apr 2010) $
+|     $Date: 2010-04-05 16:34:57 -0500 (Mon, 05 Apr 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_banlist.php 0.7.23.src/e107_languages/English/admin/lan_banlist.php
--- 0.7.22.src/e107_languages/English/admin/lan_banlist.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_banlist.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_banlist.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_banner.php 0.7.23.src/e107_languages/English/admin/lan_banner.php
--- 0.7.22.src/e107_languages/English/admin/lan_banner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_banner.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_banner.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_cache.php 0.7.23.src/e107_languages/English/admin/lan_cache.php
--- 0.7.22.src/e107_languages/English/admin/lan_cache.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_cache.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_cache.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_check_user.php 0.7.23.src/e107_languages/English/admin/lan_check_user.php
--- 0.7.22.src/e107_languages/English/admin/lan_check_user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_check_user.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_check_user.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_cpage.php 0.7.23.src/e107_languages/English/admin/lan_cpage.php
--- 0.7.22.src/e107_languages/English/admin/lan_cpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_cpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_cpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_credits.php 0.7.23.src/e107_languages/English/admin/lan_credits.php
--- 0.7.22.src/e107_languages/English/admin/lan_credits.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_credits.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_credits.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_db.php 0.7.23.src/e107_languages/English/admin/lan_db.php
--- 0.7.22.src/e107_languages/English/admin/lan_db.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_db.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_db.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_db_verify.php 0.7.23.src/e107_languages/English/admin/lan_db_verify.php
--- 0.7.22.src/e107_languages/English/admin/lan_db_verify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_db_verify.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_db_verify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_download.php 0.7.23.src/e107_languages/English/admin/lan_download.php
--- 0.7.22.src/e107_languages/English/admin/lan_download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_download.php	2010-08-16 02:12:50.000000000 -0500
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_download.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11658 $
+|     $Date: 2010-08-16 02:13:14 -0500 (Mon, 16 Aug 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("DOWLAN_1", "Download added to database.");
@@ -144,4 +144,6 @@
 define("DOWLAN_158", "Show sub-sub-categories on main download page");
 define("DOWLAN_159", "Include sub-sub-category counts in subcategory counts");
 
+define("DOWLAN_160", "Prevent simultaneous downloads by individual users");
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_e107_update.php 0.7.23.src/e107_languages/English/admin/lan_e107_update.php
--- 0.7.22.src/e107_languages/English/admin/lan_e107_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_e107_update.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_e107_update.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_emoticon.php 0.7.23.src/e107_languages/English/admin/lan_emoticon.php
--- 0.7.22.src/e107_languages/English/admin/lan_emoticon.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_emoticon.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_emoticon.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_fileinspector.php 0.7.23.src/e107_languages/English/admin/lan_fileinspector.php
--- 0.7.22.src/e107_languages/English/admin/lan_fileinspector.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_fileinspector.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_fileinspector.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_filemanager.php 0.7.23.src/e107_languages/English/admin/lan_filemanager.php
--- 0.7.22.src/e107_languages/English/admin/lan_filemanager.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_filemanager.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_filemanager.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_fla.php 0.7.23.src/e107_languages/English/admin/lan_fla.php
--- 0.7.22.src/e107_languages/English/admin/lan_fla.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_fla.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_fla.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_footer.php 0.7.23.src/e107_languages/English/admin/lan_footer.php
--- 0.7.22.src/e107_languages/English/admin/lan_footer.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_footer.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_footer.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_frontpage.php 0.7.23.src/e107_languages/English/admin/lan_frontpage.php
--- 0.7.22.src/e107_languages/English/admin/lan_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_frontpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_frontpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_header.php 0.7.23.src/e107_languages/English/admin/lan_header.php
--- 0.7.22.src/e107_languages/English/admin/lan_header.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_header.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_header.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_image.php 0.7.23.src/e107_languages/English/admin/lan_image.php
--- 0.7.22.src/e107_languages/English/admin/lan_image.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_image.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_image.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_lancheck.php 0.7.23.src/e107_languages/English/admin/lan_lancheck.php
--- 0.7.22.src/e107_languages/English/admin/lan_lancheck.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_lancheck.php	2010-06-05 01:13:27.000000000 -0500
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_lancheck.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11572 $
+|     $Date: 2010-06-05 01:13:51 -0500 (Sat, 05 Jun 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LAN_CHECK_1", "Verify/Edit Language Files"); // modified in 0.7.6
@@ -25,7 +25,7 @@
 define("LAN_CHECK_13", " files are wrong...");
 define("LAN_CHECK_14", "All existing files are valid !");
 
-define("LAN_CHECK_15", "Illegal characters found before '&lt;?php'");
+define("LAN_CHECK_15", "Illegal characters or spaces found before '&lt;?php' or after '?&gt;'");
 define("LAN_CHECK_16", "Original File");
 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.");
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_language.php 0.7.23.src/e107_languages/English/admin/lan_language.php
--- 0.7.22.src/e107_languages/English/admin/lan_language.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_language.php	2010-07-22 21:53:03.000000000 -0500
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_language.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11613 $
+|     $Date: 2010-07-22 21:53:27 -0500 (Thu, 22 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -33,6 +33,9 @@
 
 define("LANG_LAN_21", "Language Tools");
 
+define("LANG_LAN_23", "Create Language-Pack (zip)");
+define("LANG_LAN_24", "Generate");
 
-
-?>
+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:");
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_links.php 0.7.23.src/e107_languages/English/admin/lan_links.php
--- 0.7.22.src/e107_languages/English/admin/lan_links.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_links.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_links.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_mailout.php 0.7.23.src/e107_languages/English/admin/lan_mailout.php
--- 0.7.22.src/e107_languages/English/admin/lan_mailout.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_mailout.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_mailout.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_menus.php 0.7.23.src/e107_languages/English/admin/lan_menus.php
--- 0.7.22.src/e107_languages/English/admin/lan_menus.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_menus.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_menus.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_message.php 0.7.23.src/e107_languages/English/admin/lan_message.php
--- 0.7.22.src/e107_languages/English/admin/lan_message.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_message.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_message.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_meta.php 0.7.23.src/e107_languages/English/admin/lan_meta.php
--- 0.7.22.src/e107_languages/English/admin/lan_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_meta.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_meta.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_modcomment.php 0.7.23.src/e107_languages/English/admin/lan_modcomment.php
--- 0.7.22.src/e107_languages/English/admin/lan_modcomment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_modcomment.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_modcomment.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_newspost.php 0.7.23.src/e107_languages/English/admin/lan_newspost.php
--- 0.7.22.src/e107_languages/English/admin/lan_newspost.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_newspost.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_newspost.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_notify.php 0.7.23.src/e107_languages/English/admin/lan_notify.php
--- 0.7.22.src/e107_languages/English/admin/lan_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_notify.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_notify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_plugin.php 0.7.23.src/e107_languages/English/admin/lan_plugin.php
--- 0.7.22.src/e107_languages/English/admin/lan_plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_prefs.php 0.7.23.src/e107_languages/English/admin/lan_prefs.php
--- 0.7.22.src/e107_languages/English/admin/lan_prefs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_prefs.php	2010-08-20 07:59:17.000000000 -0500
@@ -1,22 +1,17 @@
 <?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: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_prefs.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (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)
+ *
+ * Site preferences - language file
+ *
+ * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_prefs.php $
+ * $Id: lan_prefs.php 11670 2010-08-20 12:59:41Z e107steved $
+ */
 
 define("PRFLAN_1", "Site Information");
 define("PRFLAN_2", "Site Name");
@@ -121,8 +116,8 @@
 define("PRFLAN_111", "Wrap long words in menu text");
 define("PRFLAN_112", "On");
 define("PRFLAN_113", "Off");
-define("PRFLAN_116", "Allow HTML posting");
-define("PRFLAN_117", "This will allow users to post HTML code anywhere on the site, select the userclass to allow this.");
+define("PRFLAN_116", "Class which can post HTML");
+define("PRFLAN_117", "This will allow users to post most HTML code anywhere on the site.");
 define("PRFLAN_118", "Use Geshi for syntax highlighting");
 define("PRFLAN_119", "Geshi is an open source multi-language syntax highlighter, see http://qbnz.com/highlighter/ for more information");
 define("PRFLAN_120", "Default Geshi syntax language");
@@ -197,6 +192,10 @@
 define('PRFLAN_208', 'User class which can email links to items on site');
 define('PRFLAN_209', 'Other Features');
 define('PRFLAN_210', 'Comments/Posting');
+define('PRFLAN_215', 'Class which can post &lt;script&gt; and similar tags');
+define('PRFLAN_216', '(Requires HTML posting rights as well)');
+define('PRFLAN_217', 'Filter HTML content');
+define('PRFLAN_218', 'If \'off\', puts users at increased risk of XSS exploits posted by members of the above class, or prior to 0.7.24');
 
 
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_search.php 0.7.23.src/e107_languages/English/admin/lan_search.php
--- 0.7.22.src/e107_languages/English/admin/lan_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_search.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_search.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_ugflag.php 0.7.23.src/e107_languages/English/admin/lan_ugflag.php
--- 0.7.22.src/e107_languages/English/admin/lan_ugflag.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_ugflag.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_ugflag.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_updateadmin.php 0.7.23.src/e107_languages/English/admin/lan_updateadmin.php
--- 0.7.22.src/e107_languages/English/admin/lan_updateadmin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_updateadmin.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_updateadmin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_upload.php 0.7.23.src/e107_languages/English/admin/lan_upload.php
--- 0.7.22.src/e107_languages/English/admin/lan_upload.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_upload.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_upload.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_userclass2.php 0.7.23.src/e107_languages/English/admin/lan_userclass2.php
--- 0.7.22.src/e107_languages/English/admin/lan_userclass2.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_userclass2.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_userclass2.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_userclass.php 0.7.23.src/e107_languages/English/admin/lan_userclass.php
--- 0.7.22.src/e107_languages/English/admin/lan_userclass.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_userclass.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_userclass.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_userinfo.php 0.7.23.src/e107_languages/English/admin/lan_userinfo.php
--- 0.7.22.src/e107_languages/English/admin/lan_userinfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_userinfo.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_userinfo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_users_extended.php 0.7.23.src/e107_languages/English/admin/lan_users_extended.php
--- 0.7.22.src/e107_languages/English/admin/lan_users_extended.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_users_extended.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_users_extended.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_users.php 0.7.23.src/e107_languages/English/admin/lan_users.php
--- 0.7.22.src/e107_languages/English/admin/lan_users.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_users.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_users.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/admin/lan_wmessage.php 0.7.23.src/e107_languages/English/admin/lan_wmessage.php
--- 0.7.22.src/e107_languages/English/admin/lan_wmessage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/admin/lan_wmessage.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/admin/lan_wmessage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/English.php 0.7.23.src/e107_languages/English/English.php
--- 0.7.22.src/e107_languages/English/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/English.php	2010-08-16 11:41:11.000000000 -0500
@@ -4,8 +4,8 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11660 $
+|     $Date: 2010-08-16 11:41:35 -0500 (Mon, 16 Aug 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
@@ -55,4 +55,6 @@
 define("LAN_ANONYMOUS", "Anonymous");
 define("LAN_EMAIL_SUBS", "-email-");
 
+// 0.7.23
+define("LAN_SANITISED", "SANITISED");
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_banner.php 0.7.23.src/e107_languages/English/lan_banner.php
--- 0.7.22.src/e107_languages/English/lan_banner.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_banner.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_banner.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_comment.php 0.7.23.src/e107_languages/English/lan_comment.php
--- 0.7.22.src/e107_languages/English/lan_comment.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_comment.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_comment.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_contact.php 0.7.23.src/e107_languages/English/lan_contact.php
--- 0.7.22.src/e107_languages/English/lan_contact.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_contact.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_contact.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_date.php 0.7.23.src/e107_languages/English/lan_date.php
--- 0.7.22.src/e107_languages/English/lan_date.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_date.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_date.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_download.php 0.7.23.src/e107_languages/English/lan_download.php
--- 0.7.22.src/e107_languages/English/lan_download.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_download.php	2010-08-16 16:26:04.000000000 -0500
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_download.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11661 $
+|     $Date: 2010-08-16 16:26:28 -0500 (Mon, 16 Aug 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Downloads");
@@ -98,6 +98,12 @@
 define("LAN_dl_76", "Go to page");
 define("LAN_dl_77", "Downloads");		// Intentional duplicate - some languages need it to be different. This is for number of downloads
 
-define('LAN_dl_78', 'That download has been disabled or discontinued. Please check in the --LINK--downloads</a> area for a more recent version.'); 
+//0.7.23
+define("LAN_dl_78", "That download has been disabled or discontinued. Please check in the [downloads] area for a more recent version."); 
+define("LAN_dl_79", "Please wait a few moments before [downloading again].");
+define("LAN_dl_80", "Please enable cookies and [try again].");
+define("LAN_dl_81", "Cookies Required");
+define("LAN_dl_82", "Please Wait");
 
-?>
+
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_email.php 0.7.23.src/e107_languages/English/lan_email.php
--- 0.7.22.src/e107_languages/English/lan_email.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_email.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_email.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_error.php 0.7.23.src/e107_languages/English/lan_error.php
--- 0.7.22.src/e107_languages/English/lan_error.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_error.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_error.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_fpw.php 0.7.23.src/e107_languages/English/lan_fpw.php
--- 0.7.22.src/e107_languages/English/lan_fpw.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_fpw.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_fpw.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_login.php 0.7.23.src/e107_languages/English/lan_login.php
--- 0.7.22.src/e107_languages/English/lan_login.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_login.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_login.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_mail_handler.php 0.7.23.src/e107_languages/English/lan_mail_handler.php
--- 0.7.22.src/e107_languages/English/lan_mail_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_mail_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_mail_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_membersonly.php 0.7.23.src/e107_languages/English/lan_membersonly.php
--- 0.7.22.src/e107_languages/English/lan_membersonly.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_membersonly.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_membersonly.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_news.php 0.7.23.src/e107_languages/English/lan_news.php
--- 0.7.22.src/e107_languages/English/lan_news.php	2010-04-07 15:35:59.000000000 -0500
+++ 0.7.23.src/e107_languages/English/lan_news.php	2010-05-31 16:04:26.000000000 -0500
@@ -4,8 +4,8 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_news.php,v $
-|     $Revision: 11465 $
-|     $Date: 2010-04-07 16:36:23 -0400 (Wed, 07 Apr 2010) $
+|     $Revision: 11560 $
+|     $Date: 2010-05-31 16:04:50 -0500 (Mon, 31 May 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -38,8 +38,8 @@
 define("LAN_NEWS_462", "No news items for specified month");
 
 // Following used by alt_news
-define("LAN_99", 'Comments');
-define("LAN_100", 'On');
-define("LAN_307", 'Total posts in this category: ');
+define('LAN_NEWS_99', 'Comments');
+define('LAN_NEWS_100', 'On');
+define('LAN_NEWS_307', 'Total posts in this category: ');
 
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_notify.php 0.7.23.src/e107_languages/English/lan_notify.php
--- 0.7.22.src/e107_languages/English/lan_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_notify.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_notify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_np.php 0.7.23.src/e107_languages/English/lan_np.php
--- 0.7.22.src/e107_languages/English/lan_np.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_np.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_np.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_online.php 0.7.23.src/e107_languages/English/lan_online.php
--- 0.7.22.src/e107_languages/English/lan_online.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_online.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_online.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_page.php 0.7.23.src/e107_languages/English/lan_page.php
--- 0.7.22.src/e107_languages/English/lan_page.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_page.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_page.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_parser_functions.php 0.7.23.src/e107_languages/English/lan_parser_functions.php
--- 0.7.22.src/e107_languages/English/lan_parser_functions.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_parser_functions.php	2010-07-30 04:30:35.000000000 -0500
@@ -4,13 +4,13 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_parser_functions.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11634 $
+|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("LAN_GUEST", "Guest");
 define("LAN_WROTE", "wrote"); // as in John wrote.."  ";
 
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_prefs.php 0.7.23.src/e107_languages/English/lan_prefs.php
--- 0.7.22.src/e107_languages/English/lan_prefs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_prefs.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_prefs.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_print.php 0.7.23.src/e107_languages/English/lan_print.php
--- 0.7.22.src/e107_languages/English/lan_print.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_print.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_print.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_rate.php 0.7.23.src/e107_languages/English/lan_rate.php
--- 0.7.22.src/e107_languages/English/lan_rate.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_rate.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_rate.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_ren_help.php 0.7.23.src/e107_languages/English/lan_ren_help.php
--- 0.7.22.src/e107_languages/English/lan_ren_help.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_ren_help.php	2010-08-16 11:41:11.000000000 -0500
@@ -4,8 +4,8 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_ren_help.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11660 $
+|     $Date: 2010-08-16 11:41:35 -0500 (Mon, 16 Aug 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
@@ -63,4 +63,6 @@
 define("LANHELP_46", "* No files found in: ");
 
 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]");
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_search.php 0.7.23.src/e107_languages/English/lan_search.php
--- 0.7.22.src/e107_languages/English/lan_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_search.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_search.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_signup.php 0.7.23.src/e107_languages/English/lan_signup.php
--- 0.7.22.src/e107_languages/English/lan_signup.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_signup.php	2010-07-30 04:30:35.000000000 -0500
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_signup.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11634 $
+|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Register");
@@ -132,4 +132,4 @@
 
 
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_sitedown.php 0.7.23.src/e107_languages/English/lan_sitedown.php
--- 0.7.22.src/e107_languages/English/lan_sitedown.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_sitedown.php	2010-07-30 04:30:35.000000000 -0500
@@ -4,12 +4,12 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_sitedown.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11634 $
+|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Site temporarily closed");
 define("LAN_SITEDOWN_00", "is temporarily closed");
 define("LAN_SITEDOWN_01", "We have temporarily closed the site for some essential maintenance. This shouldn't take too long - please check back soon, apologies for the inconvenience.");
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_sitelinks.php 0.7.23.src/e107_languages/English/lan_sitelinks.php
--- 0.7.22.src/e107_languages/English/lan_sitelinks.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_sitelinks.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_sitelinks.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_submitnews.php 0.7.23.src/e107_languages/English/lan_submitnews.php
--- 0.7.22.src/e107_languages/English/lan_submitnews.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_submitnews.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_submitnews.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_top.php 0.7.23.src/e107_languages/English/lan_top.php
--- 0.7.22.src/e107_languages/English/lan_top.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_top.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_top.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_upload_handler.php 0.7.23.src/e107_languages/English/lan_upload_handler.php
--- 0.7.22.src/e107_languages/English/lan_upload_handler.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_upload_handler.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_upload_handler.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_upload.php 0.7.23.src/e107_languages/English/lan_upload.php
--- 0.7.22.src/e107_languages/English/lan_upload.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_upload.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_upload.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_userclass.php 0.7.23.src/e107_languages/English/lan_userclass.php
--- 0.7.22.src/e107_languages/English/lan_userclass.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_userclass.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_userclass.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_user_extended.php 0.7.23.src/e107_languages/English/lan_user_extended.php
--- 0.7.22.src/e107_languages/English/lan_user_extended.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_user_extended.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_user_extended.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_user.php 0.7.23.src/e107_languages/English/lan_user.php
--- 0.7.22.src/e107_languages/English/lan_user.php	2010-05-04 14:04:13.000000000 -0500
+++ 0.7.23.src/e107_languages/English/lan_user.php	2010-05-04 14:04:13.000000000 -0500
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_user.php,v $
 |     $Revision: 11520 $
-|     $Date: 2010-05-04 15:04:37 -0400 (Tue, 04 May 2010) $
+|     $Date: 2010-05-04 14:04:37 -0500 (Tue, 04 May 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_userposts.php 0.7.23.src/e107_languages/English/lan_userposts.php
--- 0.7.22.src/e107_languages/English/lan_userposts.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_userposts.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_userposts.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_user_select.php 0.7.23.src/e107_languages/English/lan_user_select.php
--- 0.7.22.src/e107_languages/English/lan_user_select.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_languages/English/lan_user_select.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_user_select.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_languages/English/lan_usersettings.php 0.7.23.src/e107_languages/English/lan_usersettings.php
--- 0.7.22.src/e107_languages/English/lan_usersettings.php	2010-05-25 14:30:10.000000000 -0500
+++ 0.7.23.src/e107_languages/English/lan_usersettings.php	2010-05-25 14:30:10.000000000 -0500
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_usersettings.php,v $
 |     $Revision: 11553 $
-|     $Date: 2010-05-25 15:30:34 -0400 (Tue, 25 May 2010) $
+|     $Date: 2010-05-25 14:30:34 -0500 (Tue, 25 May 2010) $
 |     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/admin_menu/admin_menu.php 0.7.23.src/e107_plugins/admin_menu/admin_menu.php
--- 0.7.22.src/e107_plugins/admin_menu/admin_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/admin_menu/admin_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/admin_menu/admin_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/alt_auth/alt_auth_conf.php 0.7.23.src/e107_plugins/alt_auth/alt_auth_conf.php
--- 0.7.22.src/e107_plugins/alt_auth/alt_auth_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/alt_auth/alt_auth_conf.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/alt_auth_conf.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/alt_auth/alt_auth_login_class.php 0.7.23.src/e107_plugins/alt_auth/alt_auth_login_class.php
--- 0.7.22.src/e107_plugins/alt_auth/alt_auth_login_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/alt_auth/alt_auth_login_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/alt_auth_login_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/alt_auth/alt_login_class.php 0.7.23.src/e107_plugins/alt_auth/alt_login_class.php
--- 0.7.22.src/e107_plugins/alt_auth/alt_login_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/alt_auth/alt_login_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/alt_login_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/alt_auth/ldap_auth.php 0.7.23.src/e107_plugins/alt_auth/ldap_auth.php
--- 0.7.22.src/e107_plugins/alt_auth/ldap_auth.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/alt_auth/ldap_auth.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/ldap_auth.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/alt_auth/ldap_conf.php 0.7.23.src/e107_plugins/alt_auth/ldap_conf.php
--- 0.7.22.src/e107_plugins/alt_auth/ldap_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/alt_auth/ldap_conf.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/ldap_conf.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/alt_auth/otherdb_auth.php 0.7.23.src/e107_plugins/alt_auth/otherdb_auth.php
--- 0.7.22.src/e107_plugins/alt_auth/otherdb_auth.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/alt_auth/otherdb_auth.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/otherdb_auth.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/alt_auth/plugin.php 0.7.23.src/e107_plugins/alt_auth/plugin.php
--- 0.7.22.src/e107_plugins/alt_auth/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/alt_auth/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_auth/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/alt_news/alt_news.php 0.7.23.src/e107_plugins/alt_news/alt_news.php
--- 0.7.22.src/e107_plugins/alt_news/alt_news.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/alt_news/alt_news.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/alt_news/alt_news.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/banner_menu/banner_menu.php 0.7.23.src/e107_plugins/banner_menu/banner_menu.php
--- 0.7.22.src/e107_plugins/banner_menu/banner_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/banner_menu/banner_menu.php	2010-06-01 16:55:03.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/banner_menu/banner_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11564 $
+|     $Date: 2010-06-01 16:55:27 -0500 (Tue, 01 Jun 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -53,46 +53,50 @@
 }
 else
 {
-  if (isset($menu_pref['banner_campaign']) && $menu_pref['banner_campaign'])
-  {
-	if(strstr($menu_pref['banner_campaign'], "|"))
+	if (isset($menu_pref['banner_campaign']) && $menu_pref['banner_campaign'])
 	{
-	  $campaignlist = explode("|", $menu_pref['banner_campaign']);
-	  $amount = ($menu_pref['banner_amount']<1 ? '1' : $menu_pref['banner_amount']);
-	  $amount = ($amount > count($campaignlist) ? count($campaignlist) : $amount);
-	  $keys = array_rand($campaignlist, $amount);
-	  $parms = array();
-	  foreach($keys as $k=>$v)
-	  {
-		$parms[] = $campaignlist[$v];
-	  }
+		$parms = array();
+		if(strstr($menu_pref['banner_campaign'], "|"))
+		{
+			$campaignlist = explode("|", $menu_pref['banner_campaign']);
+			$amount = ($menu_pref['banner_amount']<1 ? '1' : $menu_pref['banner_amount']);
+			$amount = ($amount > count($campaignlist) ? count($campaignlist) : $amount);
+			$keys = array_rand($campaignlist, $amount);		// If one entry, returns a single value
+			if (!is_array($keys))
+			{
+				$keys = array($keys);
+			}
+			foreach($keys as $k=>$v)
+			{
+				$parms[] = $campaignlist[$v];
+			}
+		}
+		else
+		{
+			$parms[] = $menu_pref['banner_campaign'];
+		}
 	}
-	else
+
+	$txt = $BANNER_MENU_START;
+	if (isset($parms) && is_array($parms) && count($parms))
 	{
-	  $parms[] = $menu_pref['banner_campaign'];
+		foreach($parms as $parm)
+		{
+			$bannersccode = file_get_contents(e_FILE."shortcode/banner.sc");
+			$BANNER = eval($bannersccode);
+			$txt .= preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_MENU);
+		}
 	}
-  }
-
-  $txt = $BANNER_MENU_START;
-  if (isset($parms))
-  {
-	  foreach($parms as $parm)
-	  {
-		$bannersccode = file_get_contents(e_FILE."shortcode/banner.sc");
-		$BANNER = eval($bannersccode);
-		$txt .= preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_MENU);
-	  }
-  }
-  $txt .= $BANNER_MENU_END;
+	$txt .= $BANNER_MENU_END;
 }
 
 if (isset($menu_pref['banner_rendertype']) && $menu_pref['banner_rendertype'] == 2)
 {
-  $ns->tablerender($menu_pref['banner_caption'], $txt);
+	$ns->tablerender($menu_pref['banner_caption'], $txt);
 }
 else
 {
-  echo $txt;
+	echo $txt;
 }
 
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_plugins/banner_menu/config.php 0.7.23.src/e107_plugins/banner_menu/config.php
--- 0.7.22.src/e107_plugins/banner_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/banner_menu/config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/banner_menu/config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/banner_menu/languages/English.php 0.7.23.src/e107_plugins/banner_menu/languages/English.php
--- 0.7.22.src/e107_plugins/banner_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/banner_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/banner_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/blogcalendar_menu/archive.php 0.7.23.src/e107_plugins/blogcalendar_menu/archive.php
--- 0.7.22.src/e107_plugins/blogcalendar_menu/archive.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/blogcalendar_menu/archive.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/archive.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 | Based on code by: Thomas Bouve (crahan@gmx.net)
diff -x .svn -aruN 0.7.22.src/e107_plugins/blogcalendar_menu/blogcalendar_menu.php 0.7.23.src/e107_plugins/blogcalendar_menu/blogcalendar_menu.php
--- 0.7.22.src/e107_plugins/blogcalendar_menu/blogcalendar_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/blogcalendar_menu/blogcalendar_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/blogcalendar_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 | Based on code by: Thomas Bouve (crahan@gmx.net)
diff -x .svn -aruN 0.7.22.src/e107_plugins/blogcalendar_menu/calendar.php 0.7.23.src/e107_plugins/blogcalendar_menu/calendar.php
--- 0.7.22.src/e107_plugins/blogcalendar_menu/calendar.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/blogcalendar_menu/calendar.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/calendar.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 | Based on code by: Thomas Bouve (crahan@gmx.net) and
diff -x .svn -aruN 0.7.22.src/e107_plugins/blogcalendar_menu/config.php 0.7.23.src/e107_plugins/blogcalendar_menu/config.php
--- 0.7.22.src/e107_plugins/blogcalendar_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/blogcalendar_menu/config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/blogcalendar_menu/functions.php 0.7.23.src/e107_plugins/blogcalendar_menu/functions.php
--- 0.7.22.src/e107_plugins/blogcalendar_menu/functions.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/blogcalendar_menu/functions.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/functions.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/blogcalendar_menu/styles.php 0.7.23.src/e107_plugins/blogcalendar_menu/styles.php
--- 0.7.22.src/e107_plugins/blogcalendar_menu/styles.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/blogcalendar_menu/styles.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/blogcalendar_menu/styles.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/admin_config.php 0.7.23.src/e107_plugins/calendar_menu/admin_config.php
--- 0.7.22.src/e107_plugins/calendar_menu/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | 02.11.06 - Cache clear option added
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/calendar.php 0.7.23.src/e107_plugins/calendar_menu/calendar.php
--- 0.7.22.src/e107_plugins/calendar_menu/calendar.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/calendar.php	2010-07-13 17:04:05.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/calendar.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11598 $
+|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
+|     $Author: e107steved $
 |
 | 11.11.06 - steved - mods for next CVS release
 |
@@ -25,15 +25,18 @@
 require_once(e_PLUGIN."calendar_menu/calendar_shortcodes.php");
 if (isset($_POST['viewallevents']))
 {
-    Header("Location: " . e_PLUGIN . "calendar_menu/event.php?" . $_POST['enter_new_val']);
+    header("Location: " . e_PLUGIN . "calendar_menu/event.php?" . $_POST['enter_new_val']);
+	exit;
 } 
 if (isset($_POST['doit']))
 {
-    Header("Location: " . e_PLUGIN . "calendar_menu/event.php?ne." . $_POST['enter_new_val']);
+    header("Location: " . e_PLUGIN . "calendar_menu/event.php?ne." . $_POST['enter_new_val']);
+	exit;
 }
 if (isset($_POST['subs']))
 {
-    Header("Location: " . e_PLUGIN . "calendar_menu/subscribe.php");
+    header("Location: " . e_PLUGIN . "calendar_menu/subscribe.php");
+	exit;
 } 
 
 include_lan(e_PLUGIN."calendar_menu/languages/".e_LANGUAGE.".php");
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/calendar_shortcodes.php 0.7.23.src/e107_plugins/calendar_menu/calendar_shortcodes.php
--- 0.7.22.src/e107_plugins/calendar_menu/calendar_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/calendar_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/calendar_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | 10.11.06 - mods for next CVS release
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/calendar_template.php 0.7.23.src/e107_plugins/calendar_menu/calendar_template.php
--- 0.7.22.src/e107_plugins/calendar_menu/calendar_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/calendar_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/calendar_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | 10.11.06 steved - mods for next CVS release
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/ecal_class.php 0.7.23.src/e107_plugins/calendar_menu/ecal_class.php
--- 0.7.22.src/e107_plugins/calendar_menu/ecal_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/ecal_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/ecal_class.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | Event calendar class for gradual enhancement
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/e_list.php 0.7.23.src/e107_plugins/calendar_menu/e_list.php
--- 0.7.22.src/e107_plugins/calendar_menu/e_list.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/e_list.php	2010-07-13 17:04:05.000000000 -0500
@@ -2,17 +2,14 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-	if(!$calendar_install = $sql -> db_Select("plugin", "*", "plugin_path = 'calendar_menu' AND plugin_installflag = '1' "))
-	{
-		return;
-	}
 
-	$LIST_CAPTION = $arr[0];
-	$LIST_DISPLAYSTYLE = ($arr[2] ? "" : "none");
 
 require_once('ecal_class.php');
 $ecal_class = new ecal_class;
 
+$LIST_CAPTION = $arr[0];
+$LIST_DISPLAYSTYLE = ($arr[2] ? "" : "none");
+
 $current_day	= $ecal_class->cal_date['mday'];
 $current_month	= $ecal_class->cal_date['mon'];
 $current_year	= $ecal_class->cal_date['year'];
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/e_notify.php 0.7.23.src/e107_plugins/calendar_menu/e_notify.php
--- 0.7.22.src/e107_plugins/calendar_menu/e_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/e_notify.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/e_notify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/event.php 0.7.23.src/e107_plugins/calendar_menu/event.php
--- 0.7.22.src/e107_plugins/calendar_menu/event.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/event.php	2010-07-13 17:04:05.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/event.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11598 $
+|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
+|     $Author: e107steved $
 |
 | 09.11.06 - Started next batch of mods
 +----------------------------------------------------------------------------+
@@ -23,17 +23,20 @@
 
 if (isset($_POST['viewallevents']))
 {  // Triggered from NAV_BUT_ALLEVENTS
-    Header("Location: ".e_PLUGIN."calendar_menu/calendar.php?".$_POST['enter_new_val']);
+    header("Location: ".e_PLUGIN."calendar_menu/calendar.php?".$_POST['enter_new_val']);
+	exit;
 }
 
 if (isset($_POST['doit']))
 {  // Triggered from NAV_BUT_ENTEREVENT
-    Header("Location: ".e_PLUGIN."calendar_menu/event.php?ne.".$_POST['enter_new_val']);
+    header("Location: ".e_PLUGIN."calendar_menu/event.php?ne.".$_POST['enter_new_val']);
+	exit;
 }
 
 if (isset($_POST['subs']))
 {
-    Header("Location: ".e_PLUGIN."calendar_menu/subscribe.php");
+    header("Location: ".e_PLUGIN."calendar_menu/subscribe.php");
+	exit;
 }
 
 include_lan(e_PLUGIN."calendar_menu/languages/".e_LANGUAGE.".php");
@@ -121,6 +124,7 @@
 		// Now clear cache  - just do the lot for now - get clever later
 		$e107cache->clear('nq_event_cal');
 		header("location:event.php?".$ev_start.".".$qs.$report_msg);
+		exit;
 	}
 }
 
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/languages/English.php 0.7.23.src/e107_plugins/calendar_menu/languages/English.php
--- 0.7.22.src/e107_plugins/calendar_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | Various mods by steved:
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/next_event_menu.php 0.7.23.src/e107_plugins/calendar_menu/next_event_menu.php
--- 0.7.22.src/e107_plugins/calendar_menu/next_event_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/next_event_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/next_event_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | 09.11.06 - Cache support added, templating/shortcode tweaks
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/plugin.php 0.7.23.src/e107_plugins/calendar_menu/plugin.php
--- 0.7.22.src/e107_plugins/calendar_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $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 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | 22.07.06 - Mods for V3.6 upgrade, including log directory
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/search/search_parser.php 0.7.23.src/e107_plugins/calendar_menu/search/search_parser.php
--- 0.7.22.src/e107_plugins/calendar_menu/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/search/search_parser.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/subscribe.php 0.7.23.src/e107_plugins/calendar_menu/subscribe.php
--- 0.7.22.src/e107_plugins/calendar_menu/subscribe.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/subscribe.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/subscribe.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_plugins/calendar_menu/subs_menu.php 0.7.23.src/e107_plugins/calendar_menu/subs_menu.php
--- 0.7.22.src/e107_plugins/calendar_menu/subs_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/calendar_menu/subs_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/calendar_menu/subs_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | 09.07.06 - Mods by steved:
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/admin_chatbox.php 0.7.23.src/e107_plugins/chatbox_menu/admin_chatbox.php
--- 0.7.22.src/e107_plugins/chatbox_menu/admin_chatbox.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/admin_chatbox.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/admin_chatbox.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/chatbox_menu.php 0.7.23.src/e107_plugins/chatbox_menu/chatbox_menu.php
--- 0.7.22.src/e107_plugins/chatbox_menu/chatbox_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/chatbox_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/chatbox_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/chat.php 0.7.23.src/e107_plugins/chatbox_menu/chat.php
--- 0.7.22.src/e107_plugins/chatbox_menu/chat.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/chat.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/chat.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/e_notify.php 0.7.23.src/e107_plugins/chatbox_menu/e_notify.php
--- 0.7.22.src/e107_plugins/chatbox_menu/e_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/e_notify.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/e_notify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/languages/English/English_config.php 0.7.23.src/e107_plugins/chatbox_menu/languages/English/English_config.php
--- 0.7.22.src/e107_plugins/chatbox_menu/languages/English/English_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/languages/English/English_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/languages/English/English_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |     Encoding:
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/languages/English/English.php 0.7.23.src/e107_plugins/chatbox_menu/languages/English/English.php
--- 0.7.22.src/e107_plugins/chatbox_menu/languages/English/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/languages/English/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/languages/English/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.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
--- 0.7.22.src/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/languages/English/lan_chatbox_search.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/plugin.php 0.7.23.src/e107_plugins/chatbox_menu/plugin.php
--- 0.7.22.src/e107_plugins/chatbox_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/search/search_advanced.php 0.7.23.src/e107_plugins/chatbox_menu/search/search_advanced.php
--- 0.7.22.src/e107_plugins/chatbox_menu/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/search/search_advanced.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/chatbox_menu/search/search_parser.php 0.7.23.src/e107_plugins/chatbox_menu/search/search_parser.php
--- 0.7.22.src/e107_plugins/chatbox_menu/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/chatbox_menu/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/chatbox_menu/search/search_parser.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/clock_menu/clock_menu.php 0.7.23.src/e107_plugins/clock_menu/clock_menu.php
--- 0.7.22.src/e107_plugins/clock_menu/clock_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/clock_menu/clock_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -18,7 +18,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/clock_menu/clock_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/clock_menu/config.php 0.7.23.src/e107_plugins/clock_menu/config.php
--- 0.7.22.src/e107_plugins/clock_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/clock_menu/config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/clock_menu/config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/clock_menu/languages/admin/English.php 0.7.23.src/e107_plugins/clock_menu/languages/admin/English.php
--- 0.7.22.src/e107_plugins/clock_menu/languages/admin/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/clock_menu/languages/admin/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/clock_menu/languages/admin/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/clock_menu/languages/English.php 0.7.23.src/e107_plugins/clock_menu/languages/English.php
--- 0.7.22.src/e107_plugins/clock_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/clock_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/clock_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/comment_menu/comment_menu.php 0.7.23.src/e107_plugins/comment_menu/comment_menu.php
--- 0.7.22.src/e107_plugins/comment_menu/comment_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/comment_menu/comment_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/comment_menu/comment_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/comment_menu/comment_menu_shortcodes.php 0.7.23.src/e107_plugins/comment_menu/comment_menu_shortcodes.php
--- 0.7.22.src/e107_plugins/comment_menu/comment_menu_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/comment_menu/comment_menu_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/comment_menu/comment_menu_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/comment_menu/comment_menu_template.php 0.7.23.src/e107_plugins/comment_menu/comment_menu_template.php
--- 0.7.22.src/e107_plugins/comment_menu/comment_menu_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/comment_menu/comment_menu_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/comment_menu/comment_menu_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/comment_menu/config.php 0.7.23.src/e107_plugins/comment_menu/config.php
--- 0.7.22.src/e107_plugins/comment_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/comment_menu/config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/comment_menu/config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/compliance_menu/languages/English.php 0.7.23.src/e107_plugins/compliance_menu/languages/English.php
--- 0.7.22.src/e107_plugins/compliance_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/compliance_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/compliance_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/admin_content_config.php 0.7.23.src/e107_plugins/content/admin_content_config.php
--- 0.7.22.src/e107_plugins/content/admin_content_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/admin_content_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/content/admin_content_config.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/content_manager.php 0.7.23.src/e107_plugins/content/content_manager.php
--- 0.7.22.src/e107_plugins/content/content_manager.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.23.src/e107_plugins/content/content_manager.php	2010-04-07 15:08:41.000000000 -0500
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/content/content_manager.php,v $
 |		$Revision: 11464 $
-|		$Date: 2010-04-07 16:09:05 -0400 (Wed, 07 Apr 2010) $
+|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
 |		$Author: e107steved $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/content.php 0.7.23.src/e107_plugins/content/content.php
--- 0.7.22.src/e107_plugins/content/content.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.23.src/e107_plugins/content/content.php	2010-04-07 15:08:41.000000000 -0500
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/content/content.php,v $
 |		$Revision: 11464 $
-|		$Date: 2010-04-07 16:09:05 -0400 (Wed, 07 Apr 2010) $
+|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
 |		$Author: e107steved $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/content_sql.php 0.7.23.src/e107_plugins/content/content_sql.php
--- 0.7.22.src/e107_plugins/content/content_sql.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/content_sql.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/content_sql.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/content_submit.php 0.7.23.src/e107_plugins/content/content_submit.php
--- 0.7.22.src/e107_plugins/content/content_submit.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.23.src/e107_plugins/content/content_submit.php	2010-04-07 15:08:41.000000000 -0500
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/content/content_submit.php,v $
 |		$Revision: 11464 $
-|		$Date: 2010-04-07 16:09:05 -0400 (Wed, 07 Apr 2010) $
+|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
 |		$Author: e107steved $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/content_update_check.php 0.7.23.src/e107_plugins/content/content_update_check.php
--- 0.7.22.src/e107_plugins/content/content_update_check.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/content_update_check.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/content_update_check.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/content_update.php 0.7.23.src/e107_plugins/content/content_update.php
--- 0.7.22.src/e107_plugins/content/content_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/content_update.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/content_update.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/e_emailprint.php 0.7.23.src/e107_plugins/content/e_emailprint.php
--- 0.7.22.src/e107_plugins/content/e_emailprint.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/e_emailprint.php	2010-06-20 15:04:59.000000000 -0500
@@ -1,11 +1,11 @@
 <?php
-/* $Id: e_emailprint.php 11346 2010-02-17 18:56:14Z secretr $ */
+/* $Id: e_emailprint.php 11581 2010-06-20 20:05:23Z e107steved $ */
 
 if (!defined('e107_INIT')) { exit; }
 
 function print_item($id)
 {
-		global $tp;
+		global $tp, $pref;
 		global $content_pref, $mainparent, $aa, $row, $content_image_path;
 		$con = new convert;
 
@@ -76,7 +76,7 @@
 
 
 function print_item_pdf($id){
-	global $tp, $content_shortcodes;
+	global $tp, $pref, $content_shortcodes;
 	global $CONTENT_PRINT_IMAGES, $row, $content_image_path, $content_pref, $mainparent, $eArrayStorage;
 
 	//in this section you decide what to needs to be output to the pdf file
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/e_meta.php 0.7.23.src/e107_plugins/content/e_meta.php
--- 0.7.22.src/e107_plugins/content/e_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/e_meta.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/e_meta.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/e_notify.php 0.7.23.src/e107_plugins/content/e_notify.php
--- 0.7.22.src/e107_plugins/content/e_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/e_notify.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/e_notify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/handlers/content_class.php 0.7.23.src/e107_plugins/content/handlers/content_class.php
--- 0.7.22.src/e107_plugins/content/handlers/content_class.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.23.src/e107_plugins/content/handlers/content_class.php	2010-04-07 15:08:41.000000000 -0500
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/content/handlers/content_class.php,v $
 |		$Revision: 11464 $
-|		$Date: 2010-04-07 16:09:05 -0400 (Wed, 07 Apr 2010) $
+|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
 |		$Author: e107steved $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/handlers/content_convert_class.php 0.7.23.src/e107_plugins/content/handlers/content_convert_class.php
--- 0.7.22.src/e107_plugins/content/handlers/content_convert_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/handlers/content_convert_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/content/handlers/content_convert_class.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/handlers/content_db_class.php 0.7.23.src/e107_plugins/content/handlers/content_db_class.php
--- 0.7.22.src/e107_plugins/content/handlers/content_db_class.php	2010-04-07 15:08:41.000000000 -0500
+++ 0.7.23.src/e107_plugins/content/handlers/content_db_class.php	2010-04-07 15:08:41.000000000 -0500
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/content/handlers/content_db_class.php,v $
 |		$Revision: 11464 $
-|		$Date: 2010-04-07 16:09:05 -0400 (Wed, 07 Apr 2010) $
+|		$Date: 2010-04-07 15:09:05 -0500 (Wed, 07 Apr 2010) $
 |		$Author: e107steved $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/handlers/content_form_class.php 0.7.23.src/e107_plugins/content/handlers/content_form_class.php
--- 0.7.22.src/e107_plugins/content/handlers/content_form_class.php	2010-04-13 21:44:28.000000000 -0500
+++ 0.7.23.src/e107_plugins/content/handlers/content_form_class.php	2010-04-13 21:44:28.000000000 -0500
@@ -13,7 +13,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/content/handlers/content_form_class.php,v $
 |		$Revision: 11474 $
-|		$Date: 2010-04-13 22:44:52 -0400 (Tue, 13 Apr 2010) $
+|		$Date: 2010-04-13 21:44:52 -0500 (Tue, 13 Apr 2010) $
 |		$Author: mcfly_e107 $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/languages/English/lan_content_admin.php 0.7.23.src/e107_plugins/content/languages/English/lan_content_admin.php
--- 0.7.22.src/e107_plugins/content/languages/English/lan_content_admin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/languages/English/lan_content_admin.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content_admin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/languages/English/lan_content_frontpage.php 0.7.23.src/e107_plugins/content/languages/English/lan_content_frontpage.php
--- 0.7.22.src/e107_plugins/content/languages/English/lan_content_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/languages/English/lan_content_frontpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content_frontpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/languages/English/lan_content_help.php 0.7.23.src/e107_plugins/content/languages/English/lan_content_help.php
--- 0.7.22.src/e107_plugins/content/languages/English/lan_content_help.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/languages/English/lan_content_help.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content_help.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/languages/English/lan_content.php 0.7.23.src/e107_plugins/content/languages/English/lan_content.php
--- 0.7.22.src/e107_plugins/content/languages/English/lan_content.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/languages/English/lan_content.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/languages/English/lan_content_search.php 0.7.23.src/e107_plugins/content/languages/English/lan_content_search.php
--- 0.7.22.src/e107_plugins/content/languages/English/lan_content_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/languages/English/lan_content_search.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/languages/English/lan_content_search.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/search/search_advanced.php 0.7.23.src/e107_plugins/content/search/search_advanced.php
--- 0.7.22.src/e107_plugins/content/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/search/search_advanced.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/search/search_parser.php 0.7.23.src/e107_plugins/content/search/search_parser.php
--- 0.7.22.src/e107_plugins/content/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/search/search_parser.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/content_manager_template.php 0.7.23.src/e107_plugins/content/templates/content_manager_template.php
--- 0.7.22.src/e107_plugins/content/templates/content_manager_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/content_manager_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/content_manager_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/content_submit_type_template.php 0.7.23.src/e107_plugins/content/templates/content_submit_type_template.php
--- 0.7.22.src/e107_plugins/content/templates/content_submit_type_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/content_submit_type_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/content_submit_type_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/content_type_template.php 0.7.23.src/e107_plugins/content/templates/content_type_template.php
--- 0.7.22.src/e107_plugins/content/templates/content_type_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/content_type_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/content_type_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_archive_template.php 0.7.23.src/e107_plugins/content/templates/default/content_archive_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_archive_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_archive_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_archive_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_author_template.php 0.7.23.src/e107_plugins/content/templates/default/content_author_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_author_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_author_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_author_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_cat_template.php 0.7.23.src/e107_plugins/content/templates/default/content_cat_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_cat_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_cat_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_cat_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.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
--- 0.7.22.src/e107_plugins/content/templates/default/content_content_template_bigtext.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_content_template_bigtext.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_content_template_bigtext.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.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
--- 0.7.22.src/e107_plugins/content/templates/default/content_content_template_blackonwhite.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_content_template_blackonwhite.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_content_template_blackonwhite.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_content_template.php 0.7.23.src/e107_plugins/content/templates/default/content_content_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_content_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_content_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_content_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.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
--- 0.7.22.src/e107_plugins/content/templates/default/content_content_template_whiteonblack.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_content_template_whiteonblack.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_content_template_whiteonblack.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_np_template.php 0.7.23.src/e107_plugins/content/templates/default/content_np_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_np_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_np_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_np_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_recent_template.php 0.7.23.src/e107_plugins/content/templates/default/content_recent_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_recent_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_recent_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_recent_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_score_template.php 0.7.23.src/e107_plugins/content/templates/default/content_score_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_score_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_score_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_score_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_searchresult_template.php 0.7.23.src/e107_plugins/content/templates/default/content_searchresult_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_searchresult_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_searchresult_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_searchresult_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_search_template.php 0.7.23.src/e107_plugins/content/templates/default/content_search_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_search_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_search_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_search_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/content/templates/default/content_top_template.php 0.7.23.src/e107_plugins/content/templates/default/content_top_template.php
--- 0.7.22.src/e107_plugins/content/templates/default/content_top_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/content/templates/default/content_top_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/content/templates/default/content_top_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/counter_menu/counter_menu.php 0.7.23.src/e107_plugins/counter_menu/counter_menu.php
--- 0.7.22.src/e107_plugins/counter_menu/counter_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/counter_menu/counter_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/counter_menu/counter_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/counter_menu/languages/English.php 0.7.23.src/e107_plugins/counter_menu/languages/English.php
--- 0.7.22.src/e107_plugins/counter_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/counter_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/counter_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/featurebox/admin_config.php 0.7.23.src/e107_plugins/featurebox/admin_config.php
--- 0.7.22.src/e107_plugins/featurebox/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/featurebox/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/featurebox/featurebox.php 0.7.23.src/e107_plugins/featurebox/featurebox.php
--- 0.7.22.src/e107_plugins/featurebox/featurebox.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/featurebox/featurebox.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/featurebox.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/featurebox/languages/English.php 0.7.23.src/e107_plugins/featurebox/languages/English.php
--- 0.7.22.src/e107_plugins/featurebox/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/featurebox/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/featurebox/plugin.php 0.7.23.src/e107_plugins/featurebox/plugin.php
--- 0.7.22.src/e107_plugins/featurebox/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/featurebox/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/featurebox/templates/centered.php 0.7.23.src/e107_plugins/featurebox/templates/centered.php
--- 0.7.22.src/e107_plugins/featurebox/templates/centered.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/featurebox/templates/centered.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/templates/centered.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/featurebox/templates/default.php 0.7.23.src/e107_plugins/featurebox/templates/default.php
--- 0.7.22.src/e107_plugins/featurebox/templates/default.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/featurebox/templates/default.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/featurebox/templates/default.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/e_linkgen.php 0.7.23.src/e107_plugins/forum/e_linkgen.php
--- 0.7.22.src/e107_plugins/forum/e_linkgen.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/e_linkgen.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/e_linkgen.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_admin.php 0.7.23.src/e107_plugins/forum/forum_admin.php
--- 0.7.22.src/e107_plugins/forum/forum_admin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_admin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_admin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_class.php 0.7.23.src/e107_plugins/forum/forum_class.php
--- 0.7.22.src/e107_plugins/forum/forum_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_class.php	2010-08-20 07:59:17.000000000 -0500
@@ -1,25 +1,29 @@
 <?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: /cvs_backup/e107_0.7/e107_plugins/forum/forum_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $	   ** Amended by Marj to re-order list line 818 - 851
-+----------------------------------------------------------------------------+
-*/
+ * 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)
+ *
+ * Forum plugin - thread classes
+ *
+ * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/forum_class.php $
+ * $Id: forum_class.php 11670 2010-08-20 12:59:41Z e107steved $
+ */
 if (!defined('e107_INIT')) { exit; }
 
 class e107forum
 {
+	var $filterNasties = TRUE;
+
+	
+	function e107forum()
+	{
+		global $pref;
+		if (isset($pref['filter_script']) && ($pref['filter_script'] == 0)) $this->filterNasties = FALSE;
+	}
+
 
 	function thread_postnum($thread_id)
 	{
@@ -535,7 +539,7 @@
 	function thread_get($thread_id, $start = 0, $limit = 10)
 	{
 		$thread_id = intval($thread_id);
-		global $sql;
+		global $sql, $tp;
 		$ftab = MPREFIX.'forum_t';
 		$utab = MPREFIX.'user';
 
@@ -571,6 +575,11 @@
 			$i = $array_start;
 			while ($row = $sql->db_Fetch())
 			{
+				if ($this->filterNasties)
+				{
+					$row['thread_name'] = $tp->dataFilter($row['thread_name']);
+					$row['thread_thread'] = $tp->dataFilter($row['thread_thread']);
+				}
 				$ret[$i] = $row;
 				$i++;
 			}
@@ -590,6 +599,11 @@
 			$ret['head'] = $row;
 			if (!array_key_exists(0, $ret))
 			{
+				if ($this->filterNasties)
+				{
+					$row['thread_name'] = $tp->dataFilter($row['thread_name']);
+					$row['thread_thread'] = $tp->dataFilter($row['thread_thread']);
+				}
 				$ret[0] = $row;
 			}
 		}
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_conf.php 0.7.23.src/e107_plugins/forum/forum_conf.php
--- 0.7.22.src/e107_plugins/forum/forum_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_conf.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 | $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_conf.php,v $
 | $Revision: 11346 $
-| $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+| $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 | $Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_mod.php 0.7.23.src/e107_plugins/forum/forum_mod.php
--- 0.7.22.src/e107_plugins/forum/forum_mod.php	2010-04-25 15:17:27.000000000 -0500
+++ 0.7.23.src/e107_plugins/forum/forum_mod.php	2010-04-25 15:17:27.000000000 -0500
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_mod.php,v $
 |     $Revision: 11499 $
-|     $Date: 2010-04-25 16:17:51 -0400 (Sun, 25 Apr 2010) $
+|     $Date: 2010-04-25 15:17:51 -0500 (Sun, 25 Apr 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum.php 0.7.23.src/e107_plugins/forum/forum.php
--- 0.7.22.src/e107_plugins/forum/forum.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_post.php 0.7.23.src/e107_plugins/forum/forum_post.php
--- 0.7.22.src/e107_plugins/forum/forum_post.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_post.php	2010-07-31 09:58:21.000000000 -0500
@@ -11,12 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_post.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
+// Experimental e-token
+if(isset($_POST['userlogin']) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../../class2.php");
 $e_wysiwyg = "post";
 include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_post.php');
@@ -549,7 +556,7 @@
 		<input class='button' type='submit' name='userlogin' value='".LAN_10."' />\n
 		<br />
 		<input type='checkbox' name='autologin' value='1' /> ".LAN_11."
-		<br /><br />
+		<input type='hidden' name='e-token' value='".e_TOKEN."' /><br /><br />
 		[ <a href='".e_SIGNUP."'>".LAN_174."</a> ]<br />[ <a href='".e_BASE."fpw.php'>".LAN_212."</a> ]
 		</p>
 		</form>
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_stats.php 0.7.23.src/e107_plugins/forum/forum_stats.php
--- 0.7.22.src/e107_plugins/forum/forum_stats.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_stats.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_stats.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_update_check.php 0.7.23.src/e107_plugins/forum/forum_update_check.php
--- 0.7.22.src/e107_plugins/forum/forum_update_check.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_update_check.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_update_check.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_update.php 0.7.23.src/e107_plugins/forum/forum_update.php
--- 0.7.22.src/e107_plugins/forum/forum_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_update.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_update.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_uploads.php 0.7.23.src/e107_plugins/forum/forum_uploads.php
--- 0.7.22.src/e107_plugins/forum/forum_uploads.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_uploads.php	2010-07-31 09:58:21.000000000 -0500
@@ -11,11 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_uploads.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("../../class2.php");
 
 if(!USER)
@@ -102,7 +110,9 @@
 			}
 			else
 			{
-				$txt .= "<td class='forumheader3'>".FRMUP_8." <input class='button' type='submit' name='delete[{$finfo['fname']}]' value='".FRMUP_10."' /></td>";
+				$txt .= "<td class='forumheader3'>".FRMUP_8." <input class='button' type='submit' name='delete[{$finfo['fname']}]' value='".FRMUP_10."' />
+				<input type='hidden' name='e-token' value='".e_TOKEN."' />
+				</td>";
 			}
 			$txt .= "</tr>";
 		}
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_viewforum.php 0.7.23.src/e107_plugins/forum/forum_viewforum.php
--- 0.7.22.src/e107_plugins/forum/forum_viewforum.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_viewforum.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/forum_viewforum.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/forum_viewtopic.php 0.7.23.src/e107_plugins/forum/forum_viewtopic.php
--- 0.7.22.src/e107_plugins/forum/forum_viewtopic.php	2010-02-20 09:33:29.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/forum_viewtopic.php	2010-07-11 08:35:40.000000000 -0500
@@ -11,7 +11,7 @@
 |     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 11350 2010-02-20 15:33:53Z mcfly_e107 $
+|     $Id: forum_viewtopic.php 11597 2010-07-11 13:36:04Z e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -254,7 +254,7 @@
 // get info for main thread -------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 $forum->set_crumb(TRUE); // Set $BREADCRUMB (and BACKLINK)
-$THREADNAME = $tp->toHTML($thread_info['head']['thread_name'], TRUE, 'no_hook, emotes_off');
+$THREADNAME = $tp->toHTML($thread_info['head']['thread_name'], TRUE, 'TITLE');
 $NEXTPREV = "&lt;&lt; <a href='".e_SELF."?{$thread_id}.{$forum_info['forum_id']}.prev'>".LAN_389."</a>";
 $NEXTPREV .= " | ";
 $NEXTPREV .= "<a href='".e_SELF."?{$thread_id}.{$forum_info['forum_id']}.next'>".LAN_390."</a> &gt;&gt;";
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/index.php 0.7.23.src/e107_plugins/forum/index.php
--- 0.7.22.src/e107_plugins/forum/index.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/index.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/index.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_admin.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_admin.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_admin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_admin.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_admin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_conf.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_conf.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_conf.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_conf.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_frontpage.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_frontpage.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_frontpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_frontpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_post.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_post.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_post.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_post.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_post.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_search.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_search.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_search.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_search.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_stats.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_stats.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_stats.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_stats.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_stats.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_uploads.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_uploads.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_uploads.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_uploads.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_uploads.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_viewforum.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_viewforum.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_viewforum.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_viewforum.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_viewforum.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_viewtopic.php 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_viewtopic.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_forum_viewtopic.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_forum_viewtopic.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_forum_viewtopic.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/languages/English/lan_newforumposts_menu.php 0.7.23.src/e107_plugins/forum/languages/English/lan_newforumposts_menu.php
--- 0.7.22.src/e107_plugins/forum/languages/English/lan_newforumposts_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/languages/English/lan_newforumposts_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/languages/English/lan_newforumposts_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/newforumposts_menu_config.php 0.7.23.src/e107_plugins/forum/newforumposts_menu_config.php
--- 0.7.22.src/e107_plugins/forum/newforumposts_menu_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/newforumposts_menu_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/newforumposts_menu_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/newforumposts_menu.php 0.7.23.src/e107_plugins/forum/newforumposts_menu.php
--- 0.7.22.src/e107_plugins/forum/newforumposts_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/newforumposts_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/newforumposts_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/plugin.php 0.7.23.src/e107_plugins/forum/plugin.php
--- 0.7.22.src/e107_plugins/forum/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/search/search_advanced.php 0.7.23.src/e107_plugins/forum/search/search_advanced.php
--- 0.7.22.src/e107_plugins/forum/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/search/search_advanced.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/search/search_parser.php 0.7.23.src/e107_plugins/forum/search/search_parser.php
--- 0.7.22.src/e107_plugins/forum/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/search/search_parser.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/templates/forum_icons_template.php 0.7.23.src/e107_plugins/forum/templates/forum_icons_template.php
--- 0.7.22.src/e107_plugins/forum/templates/forum_icons_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/templates/forum_icons_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_icons_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/templates/forum_post_template.php 0.7.23.src/e107_plugins/forum/templates/forum_post_template.php
--- 0.7.22.src/e107_plugins/forum/templates/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/templates/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_post_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/templates/forum_preview_template.php 0.7.23.src/e107_plugins/forum/templates/forum_preview_template.php
--- 0.7.22.src/e107_plugins/forum/templates/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/templates/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_preview_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/templates/forum_template.php 0.7.23.src/e107_plugins/forum/templates/forum_template.php
--- 0.7.22.src/e107_plugins/forum/templates/forum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/templates/forum_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/templates/forum_viewforum_template.php 0.7.23.src/e107_plugins/forum/templates/forum_viewforum_template.php
--- 0.7.22.src/e107_plugins/forum/templates/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/templates/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_viewforum_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/forum/templates/forum_viewtopic_template.php 0.7.23.src/e107_plugins/forum/templates/forum_viewtopic_template.php
--- 0.7.22.src/e107_plugins/forum/templates/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/forum/templates/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/forum/templates/forum_viewtopic_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/gsitemap/admin_config.php 0.7.23.src/e107_plugins/gsitemap/admin_config.php
--- 0.7.22.src/e107_plugins/gsitemap/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/gsitemap/admin_config.php	2010-07-23 19:24:47.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/gsitemap/admin_config.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11620 $
+|     $Date: 2010-07-23 19:25:11 -0500 (Fri, 23 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
@@ -463,14 +463,29 @@
 	function instructions()
 	{
 		global $ns, $PLUGINS_DIRECTORY;
-
+		
+		$LINK_1 = "https://www.google.com/accounts/ServiceLogin?service=sitemaps";
+		$LINK_2 = "http://www.google.com/support/webmasters/?hl=en";
+		
+		$srch[0] = "[URL]";
+		$repl[0] = "<a href='".$LINK_1."'>".$LINK_1."</a>";
+		
+		$srch[1] = "[URL2]";
+		$repl[1] = "<blockquote><b>".SITEURL."gsitemap.php</b></blockquote>";
+		
+		$srch[2] = "[";
+		$repl[2] = "<a href='".e_ADMIN."prefs.php'>";
+		
+		$srch[3] = "]";
+		$repl[3] = "</a>";		
+		
 		$text = "<b>".GSLAN_33."</b><br /><br />
 		<ul>
 		<li>".GSLAN_34."</li>
 		<li>".GSLAN_35."</li>
 		<li>".GSLAN_36."</li>
-		<li>".GSLAN_37."</li>
-		<li>".GSLAN_38."</li>
+		<li>".str_replace($srch,$repl,GSLAN_37)."</li>
+		<li>".str_replace("[URL]","<a href='".$LINK_2."'>".$LINK_2."</a>",GSLAN_38)."</li>
 		<ul>
 		";
 
diff -x .svn -aruN 0.7.22.src/e107_plugins/gsitemap/languages/gsitemap_English.php 0.7.23.src/e107_plugins/gsitemap/languages/gsitemap_English.php
--- 0.7.22.src/e107_plugins/gsitemap/languages/gsitemap_English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/gsitemap/languages/gsitemap_English.php	2010-07-23 19:24:47.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/gsitemap/languages/gsitemap_English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11620 $
+|     $Date: 2010-07-23 19:25:11 -0500 (Fri, 23 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define("GSLAN_Name", "Sitemap");
@@ -53,9 +53,10 @@
 define("GSLAN_34", "First, create the links you wish to have listed in your sitemap. You can import most of your links by clicking the 'Import' button on the right");
 define("GSLAN_35", "If you've chosen to import your links, click 'Import' and then check the links you wish to import");
 define("GSLAN_36", "You can also enter individual links manually by clicking 'Create New Entry'");
-define("GSLAN_37", "Once you have some entries, go to <a href='https://www.google.com/webmasters/sitemaps/stats'>https://www.google.com/webmasters/sitemaps/stats</a> and enter the following URL -> <b>".SITEURL."gsitemap.php</b> - if this url doesn't look right to you, please make sure your site url is correct in admin -> preferences");
-define("GSLAN_38", "For more information on Google Sitemap protocol, go to <a href='http://www.google.com/webmasters/sitemaps/docs/en/protocol.html'>http://www.google.com/webmasters/sitemaps/docs/en/protocol.html</a>.");
+define("GSLAN_37", "Once you have some entries, go to [URL] and enter the following URL: [URL2] If the above url doesn't look right to you, please make sure your site url is correct in admin -> [preferences]");
+define("GSLAN_38", "For more information on Google Sitemap protocol, go to [URL].");
 define("GSLAN_39", "No links in sitemap - import sitelinks?");
 define("GSLAN_40", "Google Sitemap Entries");
 
+
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_plugins/gsitemap/plugin.php 0.7.23.src/e107_plugins/gsitemap/plugin.php
--- 0.7.22.src/e107_plugins/gsitemap/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/gsitemap/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -11,7 +11,7 @@
 |       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 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     	$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     	$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/integrity_check/languages/English.php 0.7.23.src/e107_plugins/integrity_check/languages/English.php
--- 0.7.22.src/e107_plugins/integrity_check/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/integrity_check/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/integrity_check/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/lastseen/languages/English.php 0.7.23.src/e107_plugins/lastseen/languages/English.php
--- 0.7.22.src/e107_plugins/lastseen/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/lastseen/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/lastseen/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/lastseen/lastseen_menu.php 0.7.23.src/e107_plugins/lastseen/lastseen_menu.php
--- 0.7.22.src/e107_plugins/lastseen/lastseen_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/lastseen/lastseen_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/lastseen/lastseen_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/admin_linkspage_config.php 0.7.23.src/e107_plugins/links_page/admin_linkspage_config.php
--- 0.7.22.src/e107_plugins/links_page/admin_linkspage_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/admin_linkspage_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |    $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/admin_linkspage_config.php,v $
 |    $Revision: 11346 $
-|    $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|    $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |    $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/e_frontpage.php 0.7.23.src/e107_plugins/links_page/e_frontpage.php
--- 0.7.22.src/e107_plugins/links_page/e_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/e_frontpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/e_frontpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/e_list.php 0.7.23.src/e107_plugins/links_page/e_list.php
--- 0.7.22.src/e107_plugins/links_page/e_list.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/e_list.php	2010-07-13 17:04:05.000000000 -0500
@@ -2,9 +2,13 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-	if(!$links_install = $sql -> db_Select("plugin", "*", "plugin_path = 'links_page' AND plugin_installflag = '1' ")){
-		return;
-	}
+global $pref;
+if (!isset($pref['plug_installed']['links_page']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
+
 
 	$LIST_CAPTION = $arr[0];
 	$LIST_DISPLAYSTYLE = ($arr[2] ? "" : "none");
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/e_notify.php 0.7.23.src/e107_plugins/links_page/e_notify.php
--- 0.7.22.src/e107_plugins/links_page/e_notify.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/e_notify.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/e_notify.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/languages/English.php 0.7.23.src/e107_plugins/links_page/languages/English.php
--- 0.7.22.src/e107_plugins/links_page/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/link_class.php 0.7.23.src/e107_plugins/links_page/link_class.php
--- 0.7.22.src/e107_plugins/links_page/link_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/link_class.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |    $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/link_class.php,v $
 |    $Revision: 11346 $
-|    $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|    $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |    $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/link_defines.php 0.7.23.src/e107_plugins/links_page/link_defines.php
--- 0.7.22.src/e107_plugins/links_page/link_defines.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/link_defines.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |    $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/link_defines.php,v $
 |    $Revision: 11346 $
-|    $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|    $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |    $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/link_menu.php 0.7.23.src/e107_plugins/links_page/link_menu.php
--- 0.7.22.src/e107_plugins/links_page/link_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/link_menu.php	2010-07-13 17:04:05.000000000 -0500
@@ -1,6 +1,13 @@
 <?php
 if (!defined('e107_INIT')) { exit; }
 
+global $pref;
+if (!isset($pref['plug_installed']['links_page']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
+
 unset($text);
 require_once(e_PLUGIN.'links_page/link_class.php');
 $lc = new linkclass();
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/links_page_sql.php 0.7.23.src/e107_plugins/links_page/links_page_sql.php
--- 0.7.22.src/e107_plugins/links_page/links_page_sql.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/links_page_sql.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/links_page_sql.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/links.php 0.7.23.src/e107_plugins/links_page/links.php
--- 0.7.22.src/e107_plugins/links_page/links.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/links.php	2010-07-13 17:04:05.000000000 -0500
@@ -11,13 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/links.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11598 $
+|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once('../../class2.php');
 
+if (!isset($pref['plug_installed']['links_page']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
+
 require_once(e_HANDLER."rate_class.php");
 $rater = new rater;
 require_once(e_PLUGIN.'links_page/link_shortcodes.php');
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/links_template.php 0.7.23.src/e107_plugins/links_page/links_template.php
--- 0.7.22.src/e107_plugins/links_page/links_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/links_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/links_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/plugin.php 0.7.23.src/e107_plugins/links_page/plugin.php
--- 0.7.22.src/e107_plugins/links_page/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/search/search_advanced.php 0.7.23.src/e107_plugins/links_page/search/search_advanced.php
--- 0.7.22.src/e107_plugins/links_page/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/search/search_advanced.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/search/search_advanced.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/links_page/search/search_parser.php 0.7.23.src/e107_plugins/links_page/search/search_parser.php
--- 0.7.22.src/e107_plugins/links_page/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/links_page/search/search_parser.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/links_page/search/search_parser.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/linkwords/admin_config.php 0.7.23.src/e107_plugins/linkwords/admin_config.php
--- 0.7.22.src/e107_plugins/linkwords/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/linkwords/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/linkwords/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/linkwords/languages/English.php 0.7.23.src/e107_plugins/linkwords/languages/English.php
--- 0.7.22.src/e107_plugins/linkwords/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/linkwords/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/linkwords/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/linkwords/linkwords.php 0.7.23.src/e107_plugins/linkwords/linkwords.php
--- 0.7.22.src/e107_plugins/linkwords/linkwords.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/linkwords/linkwords.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/linkwords/linkwords.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_plugins/linkwords/plugin.php 0.7.23.src/e107_plugins/linkwords/plugin.php
--- 0.7.22.src/e107_plugins/linkwords/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/linkwords/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/linkwords/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/list_new/admin_list_config.php 0.7.23.src/e107_plugins/list_new/admin_list_config.php
--- 0.7.22.src/e107_plugins/list_new/admin_list_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/list_new/admin_list_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/admin_list_config.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/list_new/languages/English.php 0.7.23.src/e107_plugins/list_new/languages/English.php
--- 0.7.22.src/e107_plugins/list_new/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/list_new/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/list_new/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/list_new/list_class.php 0.7.23.src/e107_plugins/list_new/list_class.php
--- 0.7.22.src/e107_plugins/list_new/list_class.php	2010-04-15 14:45:32.000000000 -0500
+++ 0.7.23.src/e107_plugins/list_new/list_class.php	2010-04-15 14:45:32.000000000 -0500
@@ -12,7 +12,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/list_class.php,v $
 |		$Revision: 11478 $
-|		$Date: 2010-04-15 15:45:56 -0400 (Thu, 15 Apr 2010) $
+|		$Date: 2010-04-15 14:45:56 -0500 (Thu, 15 Apr 2010) $
 |		$Author: e107steved $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/list_new/list_new_menu.php 0.7.23.src/e107_plugins/list_new/list_new_menu.php
--- 0.7.22.src/e107_plugins/list_new/list_new_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/list_new/list_new_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/list_new_menu.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/list_new/list.php 0.7.23.src/e107_plugins/list_new/list.php
--- 0.7.22.src/e107_plugins/list_new/list.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/list_new/list.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/list.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/list_new/list_recent_menu.php 0.7.23.src/e107_plugins/list_new/list_recent_menu.php
--- 0.7.22.src/e107_plugins/list_new/list_recent_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/list_new/list_recent_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |		$Source: /cvs_backup/e107_0.7/e107_plugins/list_new/list_recent_menu.php,v $
 |		$Revision: 11346 $
-|		$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|		$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |		$Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/admin_config.php 0.7.23.src/e107_plugins/log/admin_config.php
--- 0.7.22.src/e107_plugins/log/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/consolidate.php 0.7.23.src/e107_plugins/log/consolidate.php
--- 0.7.22.src/e107_plugins/log/consolidate.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/consolidate.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/consolidate.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/e_meta.php 0.7.23.src/e107_plugins/log/e_meta.php
--- 0.7.22.src/e107_plugins/log/e_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/e_meta.php	2010-07-26 17:04:24.000000000 -0500
@@ -1,15 +1,16 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------------------------+
-|     e107 website system  : http://e107.org
-|     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/log/e_meta.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+-----------------------------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright 2001-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 access logging
+*
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/log/e_meta.php $
+* $Id: e_meta.php 11628 2010-07-26 22:04:48Z e107steved $
+*
 */
 if (!defined('e107_INIT')) { exit; }
 
@@ -52,7 +53,7 @@
 }
 var logString = 'referer=' + ref + '&colour=' + colord + '&eself=' + eself + '&res=' + res + '".$err_flag."';
 logString = rstr2b64(logString);
-document.write('<link rel=\"stylesheet\" type=\"text/css\" href=\"".e_PLUGIN_ABS."log/log.php?'+logString + '\">' );
+document.write('<link rel=\"stylesheet\" type=\"text/css\" href=\"".e_PLUGIN_ABS."log/log.php?lv='+logString + '\">' );
 //]]>
 </script>\n";
 }
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/languages/admin/English.php 0.7.23.src/e107_plugins/log/languages/admin/English.php
--- 0.7.22.src/e107_plugins/log/languages/admin/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/languages/admin/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/languages/admin/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/languages/English.php 0.7.23.src/e107_plugins/log/languages/English.php
--- 0.7.22.src/e107_plugins/log/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/loginfo.php 0.7.23.src/e107_plugins/log/loginfo.php
--- 0.7.22.src/e107_plugins/log/loginfo.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/loginfo.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/loginfo.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 | File locking added
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/log.php 0.7.23.src/e107_plugins/log/log.php
--- 0.7.22.src/e107_plugins/log/log.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/log.php	2010-07-26 17:04:24.000000000 -0500
@@ -1,22 +1,16 @@
 <?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).
-|
-| File locking, modified getip() 18.01.07
-|
-|     $Source: /cvs_backup/e107_0.7/e107_plugins/log/log.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright 2001-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 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 $
+*
 */
 
 /* File to log page accesses - called with
@@ -30,7 +24,8 @@
 */
 define('log_INIT', TRUE);
 
-$logVals = urldecode(base64_decode($_SERVER['QUERY_STRING']));
+//$logVals = urldecode(base64_decode($_SERVER['QUERY_STRING']));
+$logVals = urldecode(base64_decode($_GET['lv']));
 parse_str($logVals, $vals);
 
 
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/log_update_check.php 0.7.23.src/e107_plugins/log/log_update_check.php
--- 0.7.22.src/e107_plugins/log/log_update_check.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/log_update_check.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/log_update_check.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/log_update.php 0.7.23.src/e107_plugins/log/log_update.php
--- 0.7.22.src/e107_plugins/log/log_update.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/log_update.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/log_update.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/plugin.php 0.7.23.src/e107_plugins/log/plugin.php
--- 0.7.22.src/e107_plugins/log/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/log/stats.php 0.7.23.src/e107_plugins/log/stats.php
--- 0.7.22.src/e107_plugins/log/stats.php	2010-03-13 16:13:31.000000000 -0600
+++ 0.7.23.src/e107_plugins/log/stats.php	2010-03-13 16:13:31.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/log/stats.php,v $
 |     $Revision: 11422 $
-|     $Date: 2010-03-13 17:13:55 -0500 (Sat, 13 Mar 2010) $
+|     $Date: 2010-03-13 16:13:55 -0600 (Sat, 13 Mar 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/login_menu/config.php 0.7.23.src/e107_plugins/login_menu/config.php
--- 0.7.22.src/e107_plugins/login_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/login_menu/config.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/login_menu/config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/login_menu/languages/English.php 0.7.23.src/e107_plugins/login_menu/languages/English.php
--- 0.7.22.src/e107_plugins/login_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/login_menu/languages/English.php	2010-07-30 04:30:35.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/login_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11634 $
+|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -62,4 +62,4 @@
 define("LOGIN_MENU_L40", "Resend Activation Email");
 define("LOGIN_MENU_L41", "Login Menu Settings");
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_plugins/login_menu/login_menu_shortcodes.php 0.7.23.src/e107_plugins/login_menu/login_menu_shortcodes.php
--- 0.7.22.src/e107_plugins/login_menu/login_menu_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/login_menu/login_menu_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/login_menu/login_menu_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/login_menu/login_menu_template.php 0.7.23.src/e107_plugins/login_menu/login_menu_template.php
--- 0.7.22.src/e107_plugins/login_menu/login_menu_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/login_menu/login_menu_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/login_menu/login_menu_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newforumposts_main/admin_config.php 0.7.23.src/e107_plugins/newforumposts_main/admin_config.php
--- 0.7.22.src/e107_plugins/newforumposts_main/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newforumposts_main/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newforumposts_main/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newforumposts_main/languages/English.php 0.7.23.src/e107_plugins/newforumposts_main/languages/English.php
--- 0.7.22.src/e107_plugins/newforumposts_main/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newforumposts_main/languages/English.php	2010-07-20 11:47:20.000000000 -0500
@@ -24,6 +24,13 @@
 define("NFPM_L14", "New Forum Posts settings updated.");
 define("NFPM_L15", "Check to display latest forum posts.<br />Default is latest topics.");
 define('NFPM_L16', '[user deleted]');
-	
+define('NFPM_L17', 'New Posts on Popular Thread');
+define('NFPM_L18', 'New Posts');
+define('NFPM_L19', 'No New Posts on Popular Thread');
+define('NFPM_L20', 'No New Posts');
+define('NFPM_L21', 'Sticky Thread');
+define('NFPM_L22', 'Closed Sticky Thread');
+define('NFPM_L23', 'Announcement');
+define('NFPM_L24', 'Closed Thread');
 	
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_plugins/newforumposts_main/newforumposts_main.php 0.7.23.src/e107_plugins/newforumposts_main/newforumposts_main.php
--- 0.7.22.src/e107_plugins/newforumposts_main/newforumposts_main.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newforumposts_main/newforumposts_main.php	2010-07-20 11:47:20.000000000 -0500
@@ -11,29 +11,30 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newforumposts_main/newforumposts_main.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11608 $
+|     $Date: 2010-07-20 11:47:44 -0500 (Tue, 20 Jul 2010) $
+|     $Author: nlstart $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
 
-require_once(e_HANDLER."userclass_class.php");
-$query = ($pref['nfp_posts'] ? "thread_lastpost" : "thread_datestamp");
-include_lan(e_PLUGIN."newforumposts_main/languages/".e_LANGUAGE.".php");
+require_once(e_HANDLER.'userclass_class.php');
+$query = ($pref['nfp_posts'] ? 'thread_lastpost' : 'thread_datestamp');
+include_lan(e_PLUGIN.'newforumposts_main/languages/'.e_LANGUAGE.'.php');
 
-$path = e_PLUGIN."forum/";
+$path = e_PLUGIN.'forum/';
 global $sql, $ns;
 // get template ...
 
-if (file_exists(THEME."newforumpost.php")) {
-	require_once(THEME."newforumpost.php");
+if (file_exists(THEME.'newforumpost.php')) {
+	require_once(THEME.'newforumpost.php');
 }
 else if(!isset($NEWFORUMPOSTSTYLE_HEADER)) {
 	// no template found - use default ...
 	$NEWFORUMPOSTSTYLE_HEADER = "
 		<!-- newforumposts -->
-		<div style='text-align:center'>\n<table style='width:auto' class='fborder'>
+		<div style='text-align:center'>
+		<table style='width:auto' class='fborder'>
 		<tr>
 		<td style='width:5%' class='forumheader'>&nbsp;</td>
 		<td style='width:45%' class='forumheader'>".NFPM_LAN_1."</td>
@@ -41,7 +42,7 @@
 		<td style='width:5%; text-align:center' class='forumheader'>".NFPM_LAN_3."</td>
 		<td style='width:5%; text-align:center' class='forumheader'>".NFPM_LAN_4."</td>
 		<td style='width:25%; text-align:center' class='forumheader'>".NFPM_LAN_5."</td>
-		</tr>\n";
+		</tr>";
 
 	$NEWFORUMPOSTSTYLE_MAIN = "
 		<tr>
@@ -51,15 +52,21 @@
 		<td style='width:5%; text-align:center' class='forumheader3'>{VIEWS}</td>
 		<td style='width:5%; text-align:center' class='forumheader3'>{REPLIES}</td>
 		<td style='width:25%; text-align:center' class='forumheader3'>{LASTPOST}<br /><span class='smalltext'>{LASTPOSTDATE}&nbsp;</span></td>
-		</tr>\n";
+		</tr>";
 
-	$NEWFORUMPOSTSTYLE_FOOTER = "<tr>\n<td colspan='6' style='text-align:center' class='forumheader2'>
-		<span class='smalltext'>".NFPM_LAN_6.": <b>{TOTAL_TOPICS}</b> | ".NFPM_LAN_4.": <b>{TOTAL_REPLIES}</b> | ".NFPM_LAN_3.": <b>{TOTAL_VIEWS}</b></span>\n</td>\n</tr>\n</table>\n</div>";
+	$NEWFORUMPOSTSTYLE_FOOTER = "
+		<tr>
+		<td colspan='6' style='text-align:center' class='forumheader2'>
+		<span class='smalltext'>".NFPM_LAN_6.": <b>{TOTAL_TOPICS}</b> | ".NFPM_LAN_4.": <b>{TOTAL_REPLIES}</b> | ".NFPM_LAN_3.": <b>{TOTAL_VIEWS}</b></span>
+		</td>
+		</tr>
+		</table>
+		</div>";
 
 }
 
 $results = $sql->db_Select_gen("
-SELECT t.thread_id, t.thread_name, t.thread_datestamp, t.thread_user, t.thread_views, t.thread_lastpost, t.thread_lastuser, t.thread_total_replies, f.forum_id, f.forum_name, f.forum_class, u.user_name, fp.forum_class, lp.user_name AS lp_name
+SELECT t.thread_id, t.thread_name, t.thread_datestamp, t.thread_user, t.thread_views, t.thread_lastpost, t.thread_lastuser, t.thread_total_replies, t.thread_active, t.thread_s, f.forum_id, f.forum_name, f.forum_class, u.user_name, fp.forum_class, lp.user_name AS lp_name
 FROM #forum_t AS t
 LEFT JOIN #user AS u ON SUBSTRING_INDEX(t.thread_user,'.',1) = u.user_id
 LEFT JOIN #user AS lp ON SUBSTRING_INDEX(t.thread_lastuser,'.',1) = lp.user_id
@@ -71,10 +78,12 @@
 
 $forumArray = $sql->db_getList();
 
-if (!isset($gen) || !is_object($gen)) {
+if (!isset($gen) || !is_object($gen)) 
+{
 	$gen = new convert;
 }
 
+/* // Deprecated method to indicate new forum posts
 if (file_exists(THEME."forum/new_small.png")) 
 {
   $ICON = "<img src='".THEME."forum/new_small.png' alt='' />";
@@ -83,6 +92,7 @@
 {
   $ICON = "<img src='".e_PLUGIN_ABS."forum/images/".IMODE."/new_small.png' alt='' />";
 }
+*/
 $TOTAL_TOPICS = $sql->db_Count("forum_t", "(*)", " WHERE thread_parent='0' ");
 $TOTAL_REPLIES = $sql->db_Count("forum_t", "(*)", " WHERE thread_parent!='0' ");
 $sql->db_Select_gen("SELECT sum(thread_views) FROM ".MPREFIX."forum_t");
@@ -117,10 +127,71 @@
 	}
 	else
 	{
-		$LASTPOST = " - ";
-		$LASTPOSTDATE = "";
+		$LASTPOST = ' - ';
+		$LASTPOSTDATE = '';
 	}
 
+	$newflag = FALSE;
+	if (USER)
+	{
+		if ($forumInfo['thread_lastpost'] > USERLV && !preg_match("#\b".$forumInfo['thread_id']."\b#", USERVIEWED))
+		{
+			$newflag = TRUE;
+		}
+	}
+	
+	if ($newflag) 
+	{
+		if ($forumInfo['thread_total_replies'] >= $pref['forum_popular']) 
+		{
+			$iconfile = 'new_popular.png';
+			$iconalt = NFPM_L17;
+		}
+		else 
+		{
+			$iconfile = 'new.png';
+			$iconalt = NFPM_L18;
+		}
+	} 
+	else 
+	{
+		if ($forumInfo['thread_total_replies'] >= $pref['forum_popular']) 
+		{
+			$iconfile = 'nonew_popular.png';
+			$iconalt = NFPM_L19;
+		}
+		else 
+		{
+			$iconfile = 'nonew.png';
+			$iconalt = NFPM_L20;
+		}
+		
+		if ($forumInfo['thread_s'] == 1)
+		{
+			if ($forumInfo['thread_active']) 
+			{
+				$iconfile = 'sticky.png';
+				$iconalt = NFPM_L21;
+			}
+			else 
+			{
+				$iconfile = 'sticky_closed.png';
+				$iconalt = NFPM_L22;
+			}
+		}
+		elseif($forumInfo['thread_s'] == 2)
+		{
+			$iconfile = 'announce.png';
+			$iconalt = NFPM_L23;
+		}
+		elseif(!$forumInfo['thread_active'])
+		{
+			$iconfile = 'closed.png';
+			$iconalt = NFPM_L24;
+		}
+	}
+	
+	$ICON = "<img src='".e_PLUGIN_ABS."forum/images/".IMODE."/". $iconfile. "' alt='".$iconalt."' title='".$iconalt."' />";
 	$x = explode(chr(1), $thread_user);
 	$tmp = explode(".", $x[0], 2);
 	if($user_name)
@@ -153,7 +224,7 @@
 
 if ($results)
 {
-	$ns->tablerender($pref['nfp_caption'], $text, "nfp");
+	$ns->tablerender($pref['nfp_caption'], $text, 'nfp');
 }
 
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_plugins/newforumposts_main/plugin.php 0.7.23.src/e107_plugins/newforumposts_main/plugin.php
--- 0.7.22.src/e107_plugins/newforumposts_main/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newforumposts_main/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newforumposts_main/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/admin_config.php 0.7.23.src/e107_plugins/newsfeed/admin_config.php
--- 0.7.22.src/e107_plugins/newsfeed/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/e_help.php 0.7.23.src/e107_plugins/newsfeed/e_help.php
--- 0.7.22.src/e107_plugins/newsfeed/e_help.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/e_help.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/e_help.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/languages/English_frontpage.php 0.7.23.src/e107_plugins/newsfeed/languages/English_frontpage.php
--- 0.7.22.src/e107_plugins/newsfeed/languages/English_frontpage.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/languages/English_frontpage.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/languages/English_frontpage.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/languages/English.php 0.7.23.src/e107_plugins/newsfeed/languages/English.php
--- 0.7.22.src/e107_plugins/newsfeed/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/newsfeed_functions.php 0.7.23.src/e107_plugins/newsfeed/newsfeed_functions.php
--- 0.7.22.src/e107_plugins/newsfeed/newsfeed_functions.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/newsfeed_functions.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/newsfeed_functions.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/newsfeed_menu.php 0.7.23.src/e107_plugins/newsfeed/newsfeed_menu.php
--- 0.7.22.src/e107_plugins/newsfeed/newsfeed_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/newsfeed_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/newsfeed_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/newsfeed.php 0.7.23.src/e107_plugins/newsfeed/newsfeed.php
--- 0.7.22.src/e107_plugins/newsfeed/newsfeed.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/newsfeed.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/newsfeed.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/plugin.php 0.7.23.src/e107_plugins/newsfeed/plugin.php
--- 0.7.22.src/e107_plugins/newsfeed/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/templates/newsfeed_menu_template.php 0.7.23.src/e107_plugins/newsfeed/templates/newsfeed_menu_template.php
--- 0.7.22.src/e107_plugins/newsfeed/templates/newsfeed_menu_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/templates/newsfeed_menu_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/templates/newsfeed_menu_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsfeed/templates/newsfeed_template.php 0.7.23.src/e107_plugins/newsfeed/templates/newsfeed_template.php
--- 0.7.22.src/e107_plugins/newsfeed/templates/newsfeed_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsfeed/templates/newsfeed_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsfeed/templates/newsfeed_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsletter/admin_config.php 0.7.23.src/e107_plugins/newsletter/admin_config.php
--- 0.7.22.src/e107_plugins/newsletter/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsletter/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsletter/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsletter/languages/English.php 0.7.23.src/e107_plugins/newsletter/languages/English.php
--- 0.7.22.src/e107_plugins/newsletter/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsletter/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsletter/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsletter/newsletter_menu.php 0.7.23.src/e107_plugins/newsletter/newsletter_menu.php
--- 0.7.22.src/e107_plugins/newsletter/newsletter_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsletter/newsletter_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsletter/newsletter_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/newsletter/plugin.php 0.7.23.src/e107_plugins/newsletter/plugin.php
--- 0.7.22.src/e107_plugins/newsletter/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/newsletter/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/newsletter/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/online_extended_menu/languages/English.php 0.7.23.src/e107_plugins/online_extended_menu/languages/English.php
--- 0.7.22.src/e107_plugins/online_extended_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/online_extended_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/online_extended_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/online_extended_menu/online_extended_menu.php 0.7.23.src/e107_plugins/online_extended_menu/online_extended_menu.php
--- 0.7.22.src/e107_plugins/online_extended_menu/online_extended_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/online_extended_menu/online_extended_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/online_extended_menu/online_extended_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/online_menu/languages/English.php 0.7.23.src/e107_plugins/online_menu/languages/English.php
--- 0.7.22.src/e107_plugins/online_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/online_menu/languages/English.php	2010-07-30 04:30:35.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/online_menu/languages/English.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11634 $
+|     $Date: 2010-07-30 04:30:59 -0500 (Fri, 30 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -24,4 +24,4 @@
 define("ONLINE_L5", "Members");
 define("ONLINE_L6", "Newest");
 define("TRACKING_MESSAGE", "Online user tracking is currently disabled, please enable it [link=".e_ADMIN."users.php?options]here[/link][br]");   
-?>
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_plugins/online_menu/online_menu.php 0.7.23.src/e107_plugins/online_menu/online_menu.php
--- 0.7.22.src/e107_plugins/online_menu/online_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/online_menu/online_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/online_menu/online_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/other_news_menu/languages/English.php 0.7.23.src/e107_plugins/other_news_menu/languages/English.php
--- 0.7.22.src/e107_plugins/other_news_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/other_news_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/other_news_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/other_news_menu/other_news2_menu.php 0.7.23.src/e107_plugins/other_news_menu/other_news2_menu.php
--- 0.7.22.src/e107_plugins/other_news_menu/other_news2_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/other_news_menu/other_news2_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/other_news_menu/other_news2_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/other_news_menu/other_news_menu.php 0.7.23.src/e107_plugins/other_news_menu/other_news_menu.php
--- 0.7.22.src/e107_plugins/other_news_menu/other_news_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/other_news_menu/other_news_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/other_news_menu/other_news_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pdf/admin_pdf_config.php 0.7.23.src/e107_plugins/pdf/admin_pdf_config.php
--- 0.7.22.src/e107_plugins/pdf/admin_pdf_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pdf/admin_pdf_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |    $Source: /cvs_backup/e107_0.7/e107_plugins/pdf/admin_pdf_config.php,v $
 |    $Revision: 11346 $
-|    $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|    $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |    $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pdf/e107pdf.php 0.7.23.src/e107_plugins/pdf/e107pdf.php
--- 0.7.22.src/e107_plugins/pdf/e107pdf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pdf/e107pdf.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pdf/e107pdf.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pdf/languages/English.php 0.7.23.src/e107_plugins/pdf/languages/English.php
--- 0.7.22.src/e107_plugins/pdf/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pdf/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pdf/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +-----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pdf/pdf.php 0.7.23.src/e107_plugins/pdf/pdf.php
--- 0.7.22.src/e107_plugins/pdf/pdf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pdf/pdf.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pdf/pdf.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/plugin.php 0.7.23.src/e107_plugins/pm/plugin.php
--- 0.7.22.src/e107_plugins/pm/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pm/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/pm_class.php 0.7.23.src/e107_plugins/pm/pm_class.php
--- 0.7.22.src/e107_plugins/pm/pm_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pm/pm_class.php	2010-06-12 16:45:02.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11576 $
+|     $Date: 2010-06-12 16:45:26 -0500 (Sat, 12 Jun 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -333,18 +333,30 @@
 		}
 	}
 
+
 	function pm_getuid($var)
 	{
 		global $sql, $tp;
 		$var = trim($var);
-		if($sql->db_Select("user", "user_id, user_name, user_class, user_email", "user_name LIKE '".$sql -> escape(trim($var), TRUE)."'"))
+		$result = $sql->db_Select("user", "user_id, user_name, user_class, user_email", "user_name LIKE '".$sql -> escape($var, TRUE)."'");
+		if ($result === FALSE) return FALSE;
+		$firstRow = $sql->db_Fetch();
+		if (($result == 1) || ($firstRow['user_name'] == $var))
 		{
-			$row = $sql->db_Fetch();
-			return $row;
+			return $firstRow;		// Finished if exact match, or only one entry found
 		}
-		return FALSE;
+		while ($row = $sql->db_Fetch())
+		{
+			if ($row['user_name'] == $var)
+			{
+				return $row;		// Finished on exact match
+			}
+		}
+		
+		return $firstRow;		// Return the first record returned, for BC
 	}
 
+
 	function get_users_inclass($class)
 	{
 		global $sql, $tp;
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/pm_conf.php 0.7.23.src/e107_plugins/pm/pm_conf.php
--- 0.7.22.src/e107_plugins/pm/pm_conf.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pm/pm_conf.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_conf.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/pm_func.php 0.7.23.src/e107_plugins/pm/pm_func.php
--- 0.7.22.src/e107_plugins/pm/pm_func.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pm/pm_func.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_func.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/pm.php 0.7.23.src/e107_plugins/pm/pm.php
--- 0.7.22.src/e107_plugins/pm/pm.php	2010-04-25 02:28:35.000000000 -0500
+++ 0.7.23.src/e107_plugins/pm/pm.php	2010-07-13 17:04:05.000000000 -0500
@@ -9,7 +9,7 @@
 * Private Messenger plugin - main user interface
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/pm/pm.php $
-* $Id: pm.php 11495 2010-04-25 07:28:59Z e107steved $
+* $Id: pm.php 11598 2010-07-13 22:04:29Z e107steved $
 *
 */
 
@@ -17,14 +17,11 @@
 require_once('../../class2.php');
 
 
-
-
-
-	  if (!isset($pref['plug_installed']['pm']))
-	  {
-		header('location:'.e_BASE.'index.php');
-		exit;
-	  }
+if (!isset($pref['plug_installed']['pm']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
 
 
 require_once(e_PLUGIN.'pm/pm_class.php');
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/pm_shortcodes.php 0.7.23.src/e107_plugins/pm/pm_shortcodes.php
--- 0.7.22.src/e107_plugins/pm/pm_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pm/pm_shortcodes.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_shortcodes.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/pm_template.php 0.7.23.src/e107_plugins/pm/pm_template.php
--- 0.7.22.src/e107_plugins/pm/pm_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pm/pm_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/pm_update_check.php 0.7.23.src/e107_plugins/pm/pm_update_check.php
--- 0.7.22.src/e107_plugins/pm/pm_update_check.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pm/pm_update_check.php	2010-07-13 17:04:05.000000000 -0500
@@ -11,27 +11,37 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_update_check.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11598 $
+|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
 
 include_lan(e_PLUGIN."pm/languages/admin/".e_LANGUAGE.".php");
 $dbupdatep['pm_07'] =  LAN_UPDATE_8." .617 ".ADLAN_PM_58." ".LAN_UPDATE_9." .7 ".ADLAN_PM_58;
-function update_pm_07($type) {
+function update_pm_07($type) 
+{
 	global $sql, $mySQLdefaultdb;
-	if ($type == 'do') {
+	if ($type == 'do') 
+	{
 			include_once(e_PLUGIN.'pm/pm_update.php');
-	} else {
-		if ($sql -> db_Select("plugin", "*", "plugin_path = 'pm_menu' AND plugin_installflag='1'")) {
-			 if ($sql -> db_Count('pm_messages', '(*)')) {
+	} 
+	else 
+	{
+		if (isset($pref['plug_installed']['pm']))
+		{
+			if ($sql -> db_Count('pm_messages', '(*)')) 
+			{
 				return FALSE;
-			} else {
+			} 
+			else 
+			{
 				return TRUE;
 			}
-		} else {
+		} 
+		else 
+		{
 			return TRUE;
 		}
 	}
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/pm_update.php 0.7.23.src/e107_plugins/pm/pm_update.php
--- 0.7.22.src/e107_plugins/pm/pm_update.php	2010-04-25 15:17:27.000000000 -0500
+++ 0.7.23.src/e107_plugins/pm/pm_update.php	2010-04-25 15:17:27.000000000 -0500
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/pm_update.php,v $
 |     $Revision: 11499 $
-|     $Date: 2010-04-25 16:17:51 -0400 (Sun, 25 Apr 2010) $
+|     $Date: 2010-04-25 15:17:51 -0500 (Sun, 25 Apr 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/pm/private_msg_menu.php 0.7.23.src/e107_plugins/pm/private_msg_menu.php
--- 0.7.22.src/e107_plugins/pm/private_msg_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/pm/private_msg_menu.php	2010-07-13 17:04:05.000000000 -0500
@@ -11,14 +11,20 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/pm/private_msg_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11598 $
+|     $Date: 2010-07-13 17:04:29 -0500 (Tue, 13 Jul 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
 
 global $sysprefs, $pref, $pm_prefs;
+if (!isset($pref['plug_installed']['pm']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
+
 if(!isset($pm_prefs['perpage']))
 {
 	$pm_prefs = $sysprefs->getArray('pm_prefs');
diff -x .svn -aruN 0.7.22.src/e107_plugins/poll/admin_config.php 0.7.23.src/e107_plugins/poll/admin_config.php
--- 0.7.22.src/e107_plugins/poll/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/poll/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/poll/languages/English.php 0.7.23.src/e107_plugins/poll/languages/English.php
--- 0.7.22.src/e107_plugins/poll/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/poll/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/poll/oldpolls.php 0.7.23.src/e107_plugins/poll/oldpolls.php
--- 0.7.22.src/e107_plugins/poll/oldpolls.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/poll/oldpolls.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
  |
  |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/oldpolls.php,v $
  |     $Revision: 11346 $
- |     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+ |     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
  |     $Author: secretr $
  +----------------------------------------------------------------------------+
  */
diff -x .svn -aruN 0.7.22.src/e107_plugins/poll/plugin.php 0.7.23.src/e107_plugins/poll/plugin.php
--- 0.7.22.src/e107_plugins/poll/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/poll/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/poll/poll_class.php 0.7.23.src/e107_plugins/poll/poll_class.php
--- 0.7.22.src/e107_plugins/poll/poll_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/poll/poll_class.php	2010-07-19 04:22:15.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/poll_class.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11606 $
+|     $Date: 2010-07-19 04:22:39 -0500 (Mon, 19 Jul 2010) $
+|     $Author: nlstart $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -30,6 +30,27 @@
 	var $pollRow;
 	var $pollmode;
 
+	function remove_poll_cookies()
+	{	// Remove unused poll cookies. See: http://krijnhoetmer.nl/stuff/javascript/maximum-cookies/ Thanks Fanat1k - bugtracker #4983
+		$arr_polls_cookies = array();
+		foreach($_COOKIE as $cookie_name => $cookie_val)
+		{	// Collect poll cookies
+			list($str, $int) = explode('_', $cookie_name);
+			if (($str == 'poll') && is_numeric($int)) 
+			{	// Yes, its poll's cookie
+				$arr_polls_cookies[] = $int;
+			}
+		}
+		if (count($arr_polls_cookies) > 1) 
+		{	// Remove all except first (assumption: there is always only one active poll)
+			rsort($arr_polls_cookies);
+			for($i = 1; $i < count($arr_polls_cookies); $i++)
+			{
+				cookie("poll_{$arr_polls_cookies[$i]}", "", (time() - 2592000));
+			}
+		}
+	}
+
 	function delete_poll($existing)
 	{
 		global $sql;
diff -x .svn -aruN 0.7.22.src/e107_plugins/poll/poll_menu.php 0.7.23.src/e107_plugins/poll/poll_menu.php
--- 0.7.22.src/e107_plugins/poll/poll_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/poll/poll_menu.php	2010-07-19 04:22:15.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/poll_menu.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11606 $
+|     $Date: 2010-07-19 04:22:39 -0500 (Mon, 19 Jul 2010) $
+|     $Author: nlstart $
 +----------------------------------------------------------------------------+
 */
 
@@ -59,6 +59,7 @@
 ORDER BY p.poll_datestamp DESC LIMIT 0,1
 ";
 
-$poll->render_poll($query, $pollType, $pollMode);
+$poll->remove_poll_cookies();
 
+$poll->render_poll($query, $pollType, $pollMode);
 ?>
\ No newline at end of file
diff -x .svn -aruN 0.7.22.src/e107_plugins/poll/poll.php 0.7.23.src/e107_plugins/poll/poll.php
--- 0.7.22.src/e107_plugins/poll/poll.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/poll/poll.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/poll.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/poll/templates/poll_template.php 0.7.23.src/e107_plugins/poll/templates/poll_template.php
--- 0.7.22.src/e107_plugins/poll/templates/poll_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/poll/templates/poll_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/poll/templates/poll_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_plugins/powered_by_menu/languages/English.php 0.7.23.src/e107_plugins/powered_by_menu/languages/English.php
--- 0.7.22.src/e107_plugins/powered_by_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/powered_by_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/powered_by_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/powered_by_menu/powered_by_menu.php 0.7.23.src/e107_plugins/powered_by_menu/powered_by_menu.php
--- 0.7.22.src/e107_plugins/powered_by_menu/powered_by_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/powered_by_menu/powered_by_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/powered_by_menu/powered_by_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/rss_menu/admin_prefs.php 0.7.23.src/e107_plugins/rss_menu/admin_prefs.php
--- 0.7.22.src/e107_plugins/rss_menu/admin_prefs.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/rss_menu/admin_prefs.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/admin_prefs.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/rss_menu/e_meta.php 0.7.23.src/e107_plugins/rss_menu/e_meta.php
--- 0.7.22.src/e107_plugins/rss_menu/e_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/rss_menu/e_meta.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/e_meta.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/rss_menu/languages/English.php 0.7.23.src/e107_plugins/rss_menu/languages/English.php
--- 0.7.22.src/e107_plugins/rss_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/rss_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/rss_menu/plugin.php 0.7.23.src/e107_plugins/rss_menu/plugin.php
--- 0.7.22.src/e107_plugins/rss_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/rss_menu/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/rss_menu/rss_menu.php 0.7.23.src/e107_plugins/rss_menu/rss_menu.php
--- 0.7.22.src/e107_plugins/rss_menu/rss_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/rss_menu/rss_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/rss_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/rss_menu/rss.php 0.7.23.src/e107_plugins/rss_menu/rss.php
--- 0.7.22.src/e107_plugins/rss_menu/rss.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/rss_menu/rss.php	2010-07-01 15:03:35.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/rss_menu/rss.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11589 $
+|     $Date: 2010-07-01 15:03:59 -0500 (Thu, 01 Jul 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -369,7 +369,7 @@
 						}
 						$this -> rssItems[$k]['description'] = $row['description'];
 						if($row['enc_url']){
-							$this -> rssItems[$k]['enc_url'] = $e107->base_path.$PLUGINS_DIRECTORY.$enc_url.$row['item_id'];
+							$this -> rssItems[$k]['enc_url'] = $e107->base_path.$PLUGINS_DIRECTORY.$row['enc_url'].$row['item_id'];
 						}
 						if($row['enc_leng']){
 							$this -> rssItems[$k]['enc_leng'] = $row['enc_leng'];
@@ -392,6 +392,10 @@
 						if($row['datestamp']){
 							$this -> rssItems[$k]['pubdate'] = $row['datestamp'];
 						}
+						
+						if($row['custom']){
+							$this -> rssItems[$k]['custom'] = $row['custom'];
+						}
 					}
 				}
 			}
@@ -406,6 +410,8 @@
 		$rss_title = $tp->toRss($pref['sitename']." : ".$rss_title);
         $rss_namespace = ($this->rssNamespace) ? "xmlns:".$this->rssNamespace : "";
         $rss_custom_channel = ($this->rssCustomChannel) ? $this->rssCustomChannel : "";
+		
+	
 		$time = time();
 		switch ($this -> rssType) {
 			case 1:		// Rss 1.0
@@ -450,7 +456,7 @@
 				<link>".$pref['siteurl']."</link>
 				<description>".$tp->toRss($pref['sitedescription'])."</description>\n";
 
-				echo $tp->toRss($rss_custom_channel,TRUE)."\n";
+				echo $tp->toHtml($rss_custom_channel,FALSE)."\n"; // CDATA and toRss() must not be used for $rss_custom_channel. 
 
 				echo "<language>".CORE_LC.(defined("CORE_LC2") ? "-".CORE_LC2 : "")."</language>
 				<copyright>".preg_replace("#\<br \/\>|\n|\r#si", "", SITEDISCLAIMER)."</copyright>
@@ -525,6 +531,14 @@
 					if($link){
 						echo "<guid isPermaLink=\"true\">".$link."</guid>\n";
 					}
+					
+					if(isset($value['custom'])) // custom tags. (podcasts etc)
+					{
+						foreach($value['custom'] as $cKey => $cVal)
+						{
+							echo "<".$cKey.">".$tp->toRss($cVal)."</".$cKey.">\n";	
+						}		
+					}
 
 					echo "</item>";
 				}
@@ -670,7 +684,7 @@
 						//	<id>http://example.org/</id>
 						//	<title>Fourty-Two</title>
 						//	<updated>2003-12-13T18:30:02Z</updated>
-						//	<rights> 2005 Example, Inc.</rights>
+						//	<rights>� 2005 Example, Inc.</rights>
 						//</source>
 						//<rights type='html'>&amp;copy; 2005 John Doe</rights>
 						echo "
diff -x .svn -aruN 0.7.22.src/e107_plugins/search_menu/languages/English.php 0.7.23.src/e107_plugins/search_menu/languages/English.php
--- 0.7.22.src/e107_plugins/search_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/search_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -5,7 +5,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/search_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/search_menu/search_menu.php 0.7.23.src/e107_plugins/search_menu/search_menu.php
--- 0.7.22.src/e107_plugins/search_menu/search_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/search_menu/search_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/search_menu/search_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/sitebutton_menu/languages/English.php 0.7.23.src/e107_plugins/sitebutton_menu/languages/English.php
--- 0.7.22.src/e107_plugins/sitebutton_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/sitebutton_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/sitebutton_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/sitebutton_menu/sitebutton_menu.php 0.7.23.src/e107_plugins/sitebutton_menu/sitebutton_menu.php
--- 0.7.22.src/e107_plugins/sitebutton_menu/sitebutton_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/sitebutton_menu/sitebutton_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/sitebutton_menu/sitebutton_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/trackback/admin_config.php 0.7.23.src/e107_plugins/trackback/admin_config.php
--- 0.7.22.src/e107_plugins/trackback/admin_config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/trackback/admin_config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/admin_config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/trackback/e_meta.php 0.7.23.src/e107_plugins/trackback/e_meta.php
--- 0.7.22.src/e107_plugins/trackback/e_meta.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/trackback/e_meta.php	2010-02-17 12:55:50.000000000 -0600
@@ -7,7 +7,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/e_meta.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +-----------------------------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/trackback/languages/English.php 0.7.23.src/e107_plugins/trackback/languages/English.php
--- 0.7.22.src/e107_plugins/trackback/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/trackback/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/trackback/modtrackback.php 0.7.23.src/e107_plugins/trackback/modtrackback.php
--- 0.7.22.src/e107_plugins/trackback/modtrackback.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/trackback/modtrackback.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/modtrackback.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/trackback/plugin.php 0.7.23.src/e107_plugins/trackback/plugin.php
--- 0.7.22.src/e107_plugins/trackback/plugin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/trackback/plugin.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/plugin.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/trackback/trackbackClass.php 0.7.23.src/e107_plugins/trackback/trackbackClass.php
--- 0.7.22.src/e107_plugins/trackback/trackbackClass.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/trackback/trackbackClass.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/trackbackClass.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/trackback/trackback.php 0.7.23.src/e107_plugins/trackback/trackback.php
--- 0.7.22.src/e107_plugins/trackback/trackback.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/trackback/trackback.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/trackback/trackback.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/tree_menu/languages/English.php 0.7.23.src/e107_plugins/tree_menu/languages/English.php
--- 0.7.22.src/e107_plugins/tree_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/tree_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/tree_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/userlanguage_menu/languages/English.php 0.7.23.src/e107_plugins/userlanguage_menu/languages/English.php
--- 0.7.22.src/e107_plugins/userlanguage_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/userlanguage_menu/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/userlanguage_menu/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/userlanguage_menu/userlanguage_menu.php 0.7.23.src/e107_plugins/userlanguage_menu/userlanguage_menu.php
--- 0.7.22.src/e107_plugins/userlanguage_menu/userlanguage_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/userlanguage_menu/userlanguage_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/userlanguage_menu/userlanguage_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/usertheme_menu/config.php 0.7.23.src/e107_plugins/usertheme_menu/config.php
--- 0.7.22.src/e107_plugins/usertheme_menu/config.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/usertheme_menu/config.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/usertheme_menu/config.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_plugins/usertheme_menu/usertheme_menu.php 0.7.23.src/e107_plugins/usertheme_menu/usertheme_menu.php
--- 0.7.22.src/e107_plugins/usertheme_menu/usertheme_menu.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_plugins/usertheme_menu/usertheme_menu.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_plugins/usertheme_menu/usertheme_menu.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/crahan/languages/English.php 0.7.23.src/e107_themes/crahan/languages/English.php
--- 0.7.22.src/e107_themes/crahan/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/crahan/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/crahan/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/crahan/theme.php 0.7.23.src/e107_themes/crahan/theme.php
--- 0.7.22.src/e107_themes/crahan/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/crahan/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/crahan/theme.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/e107v4a/forum_template.php 0.7.23.src/e107_themes/e107v4a/forum_template.php
--- 0.7.22.src/e107_themes/e107v4a/forum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/e107v4a/forum_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/e107v4a/forum_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/e107v4a/languages/English.php 0.7.23.src/e107_themes/e107v4a/languages/English.php
--- 0.7.22.src/e107_themes/e107v4a/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/e107v4a/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/e107v4a/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/e107v4a/newsfeed_template.php 0.7.23.src/e107_themes/e107v4a/newsfeed_template.php
--- 0.7.22.src/e107_themes/e107v4a/newsfeed_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/e107v4a/newsfeed_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/e107v4a/newsfeed_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/e107v4a/theme.php 0.7.23.src/e107_themes/e107v4a/theme.php
--- 0.7.22.src/e107_themes/e107v4a/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/e107v4a/theme.php	2010-07-26 05:07:45.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/e107v4a/theme.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11623 $
+|     $Date: 2010-07-26 05:08:09 -0500 (Mon, 26 Jul 2010) $
+|     $Author: nlstart $
 +----------------------------------------------------------------------------+
 */
 
@@ -236,7 +236,7 @@
 <table style='width:100%'>
 <tr>
 <td colspan='2' class='alttd'>
-{SUBJECT}
+{SUBJECT}&nbsp;
 <b>
 {USERNAME}
 </b>
diff -x .svn -aruN 0.7.22.src/e107_themes/human_condition/languages/English.php 0.7.23.src/e107_themes/human_condition/languages/English.php
--- 0.7.22.src/e107_themes/human_condition/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/human_condition/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/human_condition/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/human_condition/newforumpost.php 0.7.23.src/e107_themes/human_condition/newforumpost.php
--- 0.7.22.src/e107_themes/human_condition/newforumpost.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/human_condition/newforumpost.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/human_condition/newforumpost.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/human_condition/theme.php 0.7.23.src/e107_themes/human_condition/theme.php
--- 0.7.22.src/e107_themes/human_condition/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/human_condition/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/human_condition/theme.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/interfectus/languages/English.php 0.7.23.src/e107_themes/interfectus/languages/English.php
--- 0.7.22.src/e107_themes/interfectus/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/interfectus/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/interfectus/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/interfectus/theme.php 0.7.23.src/e107_themes/interfectus/theme.php
--- 0.7.22.src/e107_themes/interfectus/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/interfectus/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/interfectus/theme.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/jayya/admin_template.php 0.7.23.src/e107_themes/jayya/admin_template.php
--- 0.7.22.src/e107_themes/jayya/admin_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/jayya/admin_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/jayya/admin_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/jayya/forum/forum_icons_template.php 0.7.23.src/e107_themes/jayya/forum/forum_icons_template.php
--- 0.7.22.src/e107_themes/jayya/forum/forum_icons_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/jayya/forum/forum_icons_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/jayya/forum/forum_icons_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/jayya/languages/English.php 0.7.23.src/e107_themes/jayya/languages/English.php
--- 0.7.22.src/e107_themes/jayya/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/jayya/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/jayya/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/jayya/theme.php 0.7.23.src/e107_themes/jayya/theme.php
--- 0.7.22.src/e107_themes/jayya/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/jayya/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/jayya/theme.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/khatru/download_template.php 0.7.23.src/e107_themes/khatru/download_template.php
--- 0.7.22.src/e107_themes/khatru/download_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/khatru/download_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/download_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/khatru/forum_posted_template.php 0.7.23.src/e107_themes/khatru/forum_posted_template.php
--- 0.7.22.src/e107_themes/khatru/forum_posted_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/khatru/forum_posted_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_posted_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/khatru/forum_post_template.php 0.7.23.src/e107_themes/khatru/forum_post_template.php
--- 0.7.22.src/e107_themes/khatru/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/khatru/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_post_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/khatru/forum_preview_template.php 0.7.23.src/e107_themes/khatru/forum_preview_template.php
--- 0.7.22.src/e107_themes/khatru/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/khatru/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_preview_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/khatru/forum_template.php 0.7.23.src/e107_themes/khatru/forum_template.php
--- 0.7.22.src/e107_themes/khatru/forum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/khatru/forum_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/khatru/forum_viewforum_template.php 0.7.23.src/e107_themes/khatru/forum_viewforum_template.php
--- 0.7.22.src/e107_themes/khatru/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/khatru/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_viewforum_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/khatru/forum_viewtopic_template.php 0.7.23.src/e107_themes/khatru/forum_viewtopic_template.php
--- 0.7.22.src/e107_themes/khatru/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/khatru/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/forum_viewtopic_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/khatru/languages/English.php 0.7.23.src/e107_themes/khatru/languages/English.php
--- 0.7.22.src/e107_themes/khatru/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/khatru/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/khatru/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/kubrick/languages/English.php 0.7.23.src/e107_themes/kubrick/languages/English.php
--- 0.7.22.src/e107_themes/kubrick/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/kubrick/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/kubrick/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/kubrick/theme.php 0.7.23.src/e107_themes/kubrick/theme.php
--- 0.7.22.src/e107_themes/kubrick/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/kubrick/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -11,7 +11,7 @@
 |	GNU General Public License (http://gnu.org).
 |
 |   $Revision: 11346 $
-|   $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|   $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |   $Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/download_template.php 0.7.23.src/e107_themes/lamb/download_template.php
--- 0.7.22.src/e107_themes/lamb/download_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/download_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/download_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/forum_posted_template.php 0.7.23.src/e107_themes/lamb/forum_posted_template.php
--- 0.7.22.src/e107_themes/lamb/forum_posted_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/forum_posted_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_posted_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/forum_post_template.php 0.7.23.src/e107_themes/lamb/forum_post_template.php
--- 0.7.22.src/e107_themes/lamb/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/forum_post_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_post_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/forum_preview_template.php 0.7.23.src/e107_themes/lamb/forum_preview_template.php
--- 0.7.22.src/e107_themes/lamb/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/forum_preview_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_preview_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/forum_template.php 0.7.23.src/e107_themes/lamb/forum_template.php
--- 0.7.22.src/e107_themes/lamb/forum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/forum_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/forum_viewforum_template.php 0.7.23.src/e107_themes/lamb/forum_viewforum_template.php
--- 0.7.22.src/e107_themes/lamb/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/forum_viewforum_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_viewforum_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/forum_viewtopic_template.php 0.7.23.src/e107_themes/lamb/forum_viewtopic_template.php
--- 0.7.22.src/e107_themes/lamb/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/forum_viewtopic_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/forum_viewtopic_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/languages/English.php 0.7.23.src/e107_themes/lamb/languages/English.php
--- 0.7.22.src/e107_themes/lamb/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/lamb/theme.php 0.7.23.src/e107_themes/lamb/theme.php
--- 0.7.22.src/e107_themes/lamb/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/lamb/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/lamb/theme.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/leaf/languages/English.php 0.7.23.src/e107_themes/leaf/languages/English.php
--- 0.7.22.src/e107_themes/leaf/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/leaf/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/leaf/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/leaf/theme.php 0.7.23.src/e107_themes/leaf/theme.php
--- 0.7.22.src/e107_themes/leaf/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/leaf/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/leaf/theme.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +---------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/newsroom/languages/English.php 0.7.23.src/e107_themes/newsroom/languages/English.php
--- 0.7.22.src/e107_themes/newsroom/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/newsroom/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/newsroom/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/reline/admin_template.php 0.7.23.src/e107_themes/reline/admin_template.php
--- 0.7.22.src/e107_themes/reline/admin_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/reline/admin_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/reline/admin_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/reline/languages/English.php 0.7.23.src/e107_themes/reline/languages/English.php
--- 0.7.22.src/e107_themes/reline/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/reline/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/reline/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/reline/theme.php 0.7.23.src/e107_themes/reline/theme.php
--- 0.7.22.src/e107_themes/reline/theme.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/reline/theme.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |	$Source: /cvs_backup/e107_0.7/e107_themes/reline/theme.php,v $
 |	$Revision: 11346 $
-|	$Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|	$Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |	$Author: secretr $
 |
 +----------------------------------------------------------------------------+
diff -x .svn -aruN 0.7.22.src/e107_themes/sebes/languages/English.php 0.7.23.src/e107_themes/sebes/languages/English.php
--- 0.7.22.src/e107_themes/sebes/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/sebes/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/sebes/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/admin_template.php 0.7.23.src/e107_themes/templates/admin_template.php
--- 0.7.22.src/e107_themes/templates/admin_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/admin_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/admin_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/bbcode_template.php 0.7.23.src/e107_themes/templates/bbcode_template.php
--- 0.7.22.src/e107_themes/templates/bbcode_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/bbcode_template.php	2010-08-17 03:18:38.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/bbcode_template.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11662 $
+|     $Date: 2010-08-17 03:19:02 -0500 (Tue, 17 Aug 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
@@ -23,7 +23,7 @@
 
 $BBCODE_TEMPLATE = "
 	{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=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}{BB=youtube}
 ";
 
 // $BBCODE_TEMPLATE .= "{BB=blank}";
@@ -35,7 +35,7 @@
 $BBCODE_TEMPLATE_SUBMITNEWS = "
 	{BB_HELP}<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=flash}
+	{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}{BB=flash}{BB=youtube}
 ";
 
 
@@ -46,7 +46,7 @@
 	{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_PREIMAGEDIR=".e_IMAGE."}
-	{BB=preimage}{BB=prefile}{BB=flash}
+	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
 ";
 
 // $BBCODE_TEMPLATE_ADMIN .= "{BB=blank}";
@@ -56,7 +56,7 @@
 	{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_PREIMAGEDIR=".e_IMAGE."newspost_images/}
-	{BB=preimage}{BB=prefile}{BB=flash}
+	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
 ";
 
 $BBCODE_TEMPLATE_CPAGE = "
@@ -65,7 +65,7 @@
 	{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_PREIMAGEDIR=".e_IMAGE."custom/}
-	{BB=preimage}{BB=prefile}{BB=flash}
+	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
 ";
 
 
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/comment_template.php 0.7.23.src/e107_themes/templates/comment_template.php
--- 0.7.22.src/e107_themes/templates/comment_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/comment_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/comment_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/contact_template.php 0.7.23.src/e107_themes/templates/contact_template.php
--- 0.7.22.src/e107_themes/templates/contact_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/contact_template.php	2010-07-30 04:28:04.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-// $Id: contact_template.php 11346 2010-02-17 18:56:14Z secretr $
+// $Id: contact_template.php 11633 2010-07-30 09:28:28Z e107coders $
 
 if (!defined('e107_INIT')) { exit; }
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:97%"); }
@@ -55,6 +55,7 @@
 	{CONTACT_IMAGECODE_INPUT}
 	<tr><td>
 	<input type='submit' name='send-contactus' value=\"".LANCONTACT_08."\" class='button' />
+	<input type='hidden' name='e-token' value=\"".e_TOKEN."\" />
 	</td></tr>
 	</table>
 	</form>";
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/download_template.php 0.7.23.src/e107_themes/templates/download_template.php
--- 0.7.22.src/e107_themes/templates/download_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/download_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/download_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/email_template.php 0.7.23.src/e107_themes/templates/email_template.php
--- 0.7.22.src/e107_themes/templates/email_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/email_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/email_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/footer_default.php 0.7.23.src/e107_themes/templates/footer_default.php
--- 0.7.22.src/e107_themes/templates/footer_default.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/footer_default.php	2010-07-26 16:46:53.000000000 -0500
@@ -1,21 +1,18 @@
 <?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: /cvs_backup/e107_0.7/e107_themes/templates/footer_default.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright 2001-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* 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 $
+*
 */
+
 if (!defined('e107_INIT')) { exit; }
 $In_e107_Footer = TRUE;	// For registered shutdown function
 
@@ -210,19 +207,26 @@
 header("ETag: {$etag}");
 
 $pref['compression_level'] = 6;
-if(strstr(varset($_SERVER["HTTP_ACCEPT_ENCODING"],""), "gzip")) {
+$browser_support = FALSE;
+$server_support = FALSE;
+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") == '' && 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']);
 	$page = gzencode($page, $level);
 	header("Content-Encoding: gzip", true);
 	header("Content-Length: ".strlen($page), true);
 	echo $page;
-} else {
+} 
+else 
+{
 	header("Content-Length: ".strlen($page), true);
 	echo $page;
 }
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/header_default.php 0.7.23.src/e107_themes/templates/header_default.php
--- 0.7.22.src/e107_themes/templates/header_default.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/header_default.php	2010-02-17 12:55:50.000000000 -0600
@@ -7,7 +7,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/header_default.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +-----------------------------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/membersonly_template.php 0.7.23.src/e107_themes/templates/membersonly_template.php
--- 0.7.22.src/e107_themes/templates/membersonly_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/membersonly_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/membersonly_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/signup_template.php 0.7.23.src/e107_themes/templates/signup_template.php
--- 0.7.22.src/e107_themes/templates/signup_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/signup_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/signup_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/sitedown_template.php 0.7.23.src/e107_themes/templates/sitedown_template.php
--- 0.7.22.src/e107_themes/templates/sitedown_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/sitedown_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/sitedown_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/userposts_template.php 0.7.23.src/e107_themes/templates/userposts_template.php
--- 0.7.22.src/e107_themes/templates/userposts_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/userposts_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/userposts_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/usersettings_template.php 0.7.23.src/e107_themes/templates/usersettings_template.php
--- 0.7.22.src/e107_themes/templates/usersettings_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/usersettings_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/usersettings_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/templates/user_template.php 0.7.23.src/e107_themes/templates/user_template.php
--- 0.7.22.src/e107_themes/templates/user_template.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/templates/user_template.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/templates/user_template.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/e107_themes/vekna_blue/languages/English.php 0.7.23.src/e107_themes/vekna_blue/languages/English.php
--- 0.7.22.src/e107_themes/vekna_blue/languages/English.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/e107_themes/vekna_blue/languages/English.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/e107_themes/vekna_blue/languages/English.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/email.php 0.7.23.src/email.php
--- 0.7.22.src/email.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/email.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,11 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/email.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if (isset($_POST['emailsubmit']) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once('class2.php');
 if (!check_class(varset($pref['email_item_class'],e_UC_MEMBER)))
 {
@@ -230,6 +238,7 @@
 	<td style='width:75%'>
 	<input class='button' type='submit' name='emailsubmit' value='".LAN_EMAIL_4."' />
 	<input type='hidden' name='referer' value='".$referrer."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />
 </td>
 	</tr>
 	</table>
diff -x .svn -aruN 0.7.22.src/error.php 0.7.23.src/error.php
--- 0.7.22.src/error.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/error.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/error.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/fpw.php 0.7.23.src/fpw.php
--- 0.7.22.src/fpw.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/fpw.php	2010-06-04 13:16:34.000000000 -0500
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/fpw.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11570 $
+|     $Date: 2010-06-04 13:16:58 -0500 (Fri, 04 Jun 2010) $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
@@ -52,7 +52,7 @@
 		} 
 		else 
 		{
-			require_once(e_BASE.$THEMES_DIRECTORY."templates/fpw_template.php");
+			require_once(e_THEME."templates/fpw_template.php");
 		}
 	}
 	$HEADER = preg_replace("/\{(.*?)\}/e", '$\1', $FPW_TABLE_HEADER);
@@ -206,7 +206,7 @@
 	} 
 	else 
 	{
-		require_once(e_BASE.$THEMES_DIRECTORY."templates/fpw_template.php");
+		require_once(e_THEME."templates/fpw_template.php");
 	}
 }
 $text = preg_replace("/\{(.*?)\}/e", '$\1', $FPW_TABLE);
diff -x .svn -aruN 0.7.22.src/gsitemap.php 0.7.23.src/gsitemap.php
--- 0.7.22.src/gsitemap.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/gsitemap.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/gsitemap.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/index.php 0.7.23.src/index.php
--- 0.7.22.src/index.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/index.php	2010-02-17 12:55:50.000000000 -0600
@@ -13,7 +13,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/index.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/login.php 0.7.23.src/login.php
--- 0.7.22.src/login.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/login.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     �Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,12 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/login.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
+// Experimental e-token
+if(isset($_POST['userlogin']) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("class2.php");
 if (USER)
 {
@@ -51,7 +58,7 @@
 	}
 	$LOGIN_TABLE_AUTOLOGIN = "<input type='checkbox' name='autologin' value='1' />";
 	$LOGIN_TABLE_AUTOLOGIN_LAN = LAN_LOGIN_8;
-	$LOGIN_TABLE_SUBMIT = "<input class='button' type='submit' name='userlogin' value=\"".LAN_LOGIN_9."\" />";
+	$LOGIN_TABLE_SUBMIT = "<input class='button' type='submit' name='userlogin' value=\"".LAN_LOGIN_9."\" /><input type='hidden' name='e-token' value='".e_TOKEN."' />";
 
 	$login_message = LAN_LOGIN_3." | ".SITENAME;
 	if (!isset($LOGIN_TABLE) || !$LOGIN_TABLE)
diff -x .svn -aruN 0.7.22.src/membersonly.php 0.7.23.src/membersonly.php
--- 0.7.22.src/membersonly.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/membersonly.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/membersonly.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/news.php 0.7.23.src/news.php
--- 0.7.22.src/news.php	2010-04-05 16:34:33.000000000 -0500
+++ 0.7.23.src/news.php	2010-07-31 03:38:55.000000000 -0500
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/news.php,v $
-|     $Revision: 11461 $
-|     $Date: 2010-04-05 17:34:57 -0400 (Mon, 05 Apr 2010) $
+|     $Revision: 11640 $
+|     $Date: 2010-07-31 03:39:19 -0500 (Sat, 31 Jul 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -362,7 +362,7 @@
 		AND n.news_render_type<2 AND n.news_datestamp > {$startdate} AND n.news_datestamp < {$enddate} 
 		ORDER BY ".$order." DESC LIMIT ".intval($newsfrom).",".ITEMVIEW;
 
-	$news_total = $sql->db_Count("news", "(*)", "WHERE n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$nobody_regexp.") 
+	$news_total = $sql->db_Count("news AS n", "(*)", "WHERE n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$nobody_regexp.") 
 		AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().") 
 		AND n.news_render_type<2 AND n.news_datestamp > {$startdate} AND n.news_datestamp < {$enddate}");
 	break;
diff -x .svn -aruN 0.7.22.src/online.php 0.7.23.src/online.php
--- 0.7.22.src/online.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/online.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/online.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/page.php 0.7.23.src/page.php
--- 0.7.22.src/page.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/page.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,13 +11,20 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/page.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 |
 +----------------------------------------------------------------------------+
 */
 
+// Experimental e-token
+if(isset($_POST['submit_page_pw']) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("class2.php");
 $page = new pageClass();
 
@@ -423,7 +430,8 @@
 		<td class='forumheader3' style='width:20%; vertical-align:middle; margin-left:auto; margin-right:auto; text-align:center;'><img src='".e_IMAGE."generic/".IMODE."/password.png' alt='' /></td>
 		</tr>
 		<tr>
-		<td class='forumheader' colspan='3' style='text-align:center;'><input class='button' type='submit' name='submit_page_pw' value='".LAN_PAGE_10."' /></td>
+		<td class='forumheader' colspan='3' style='text-align:center;'><input class='button' type='submit' name='submit_page_pw' value='".LAN_PAGE_10."' />
+		<input type='hidden' name='e-token' value='".e_TOKEN."' /></td>
 		</tr>
 		</table>
 		</form>
diff -x .svn -aruN 0.7.22.src/print.php 0.7.23.src/print.php
--- 0.7.22.src/print.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/print.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/print.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/rate.php 0.7.23.src/rate.php
--- 0.7.22.src/rate.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/rate.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/rate.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/request.php 0.7.23.src/request.php
--- 0.7.22.src/request.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/request.php	2010-08-16 16:26:04.000000000 -0500
@@ -4,22 +4,23 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Copyright (c) e107 Inc. 2008-2010
 |     http://e107.org
-|     jalist@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: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
+|     $Revision: 11661 $
+|     $Date: 2010-08-16 16:26:28 -0500 (Mon, 16 Aug 2010) $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
 // ********************************** SEE HIGHLIGHTED AND NUMBERED QUERIES *****************************
 
+
+
 require_once("class2.php");
 include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_download.php");
 
@@ -29,6 +30,41 @@
 	exit();
 }
 
+// ---------------------- Experimental ----------
+
+$req_cookie = 'e-request_'.md5($_SERVER['SERVER_ADDR']);
+
+if(isset($_COOKIE[$req_cookie]))
+{
+	require_once(HEADERF);
+	$srch = array("[", "]");
+	$repl = array("<a href='".$_SERVER['REQUEST_URI']."'>", "</a>");
+	$text = str_replace($srch,$repl,LAN_dl_79);
+	
+	$ns->tablerender(LAN_dl_82,$text);
+	require_once(FOOTERF);
+	exit();
+}
+
+if(varset($pref['download_nomultiple'])==1)
+{
+	if(!setcookie($req_cookie, 1, time() + 60, "/"))
+	{
+		require_once(HEADERF);
+		$srch = array("[", "]");
+		$repl = array("<a href='".$_SERVER['REQUEST_URI']."'>", "</a>");
+		$text = str_replace($srch,$repl,LAN_dl_80);
+		$ns->tablerender(LAN_dl_81, $text);
+		require_once(FOOTERF);
+		exit();
+	}
+}
+
+// ----------------------
+
+
+
+
 $id = FALSE;
 if (!is_numeric(e_QUERY)) 
 {
@@ -142,7 +178,11 @@
 			if ($row['download_active'] == 0)
 			{  // Inactive download - don't allow
 				require_once(HEADERF);
-				$ns -> tablerender(LAN_dl_61, "<div style='text-align:center'>".str_replace('--LINK--',"<a href='".e_HTTP.'download.php'."'>",LAN_dl_78).'</div>');
+				
+				$srch = array('--LINK--','[',']');
+				$repl = array("<a href='".e_HTTP.'download.php'."'>","<a href='".e_HTTP.'download.php'."'>","</a>");
+								
+				$ns -> tablerender(LAN_dl_61, "<div style='text-align:center'>".str_replace($srch,$repl,LAN_dl_78).'</div>');
 				require_once(FOOTERF);
 				exit();
 			}
diff -x .svn -aruN 0.7.22.src/search.php 0.7.23.src/search.php
--- 0.7.22.src/search.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/search.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/search.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/signup.php 0.7.23.src/signup.php
--- 0.7.22.src/signup.php	2010-05-19 17:00:55.000000000 -0500
+++ 0.7.23.src/signup.php	2010-08-04 06:37:04.000000000 -0500
@@ -11,10 +11,17 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/signup.php $
-|     $Id: signup.php 11541 2010-05-19 22:01:19Z secretr $
+|     $Id: signup.php 11648 2010-08-04 11:37:28Z secretr $
 +----------------------------------------------------------------------------+
 */
 
+// Experimental e-token
+if((isset($_POST['newver']) || isset($_POST['register']) || isset($_POST['submit_resend'])) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("class2.php");
 $qs = explode(".", e_QUERY);
 //@TODO what fix?
@@ -44,6 +51,7 @@
 {
 	e107_include_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_".e_PAGE);
 	e107_include_once(e_LANGUAGEDIR."English/lan_".e_PAGE);
+	$errmsg = '';
 	require_once(HEADERF);
 
     if(!$clean_email = check_email($tp -> toDB($_POST['resend_email'])))
@@ -77,8 +85,9 @@
 			}
 			else
 			{
-			   	require_once(e_HANDLER."message_handler.php");
-			   	message_handler("ALERT",LAN_SIGNUP_52); // Incorrect Password.
+			   	//require_once(e_HANDLER."message_handler.php");
+			   	//message_handler("ALERT",LAN_SIGNUP_52); // Incorrect Password.
+			   	$errmsg = LAN_SIGNUP_52;
 			}
 		}
 
@@ -117,11 +126,13 @@
             }
          }
 
-		require_once(e_HANDLER."message_handler.php");
-		message_handler("ALERT",LAN_106); // email not valid.
-		exit;
+		//require_once(e_HANDLER."message_handler.php");
+		//message_handler("ALERT",LAN_106); // email not valid.
+		//message_handler("MESSAGE",LAN_106);
+		$errmsg = LAN_106;
+		//exit;
 	}
-	elseif(!$_POST['submit_resend'])
+	if(!$_POST['submit_resend'] || $errmsg)
 	{
 
 		$text .= "<div style='text-align:center'>
@@ -149,13 +160,14 @@
 
 		$text .="<tr style='vertical-align:top'>
 		<td colspan='2' style='text-align:center' class='forumheader'>";
-		$text .= "<input class='button' type='submit' name='submit_resend' value=\"".LAN_SIGNUP_47."\" />";  // resend activation email.
+		$text .= "<input class='button' type='submit' name='submit_resend' value=\"".LAN_SIGNUP_47."\" />
+		<input type='hidden' name='e-token' value='".e_TOKEN."' />";  // resend activation email.
 		$text .= "</td>
 		</tr>
 		</table>
 		</form>
 		</div>";
-
+		if($errmsg) message_handler("MESSAGE",$errmsg);
 		$ns -> tablerender(LAN_SIGNUP_47, $text);
 		require_once(FOOTERF);
 		exit;
diff -x .svn -aruN 0.7.22.src/sitedown.php 0.7.23.src/sitedown.php
--- 0.7.22.src/sitedown.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/sitedown.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/sitedown.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/subcontent.php 0.7.23.src/subcontent.php
--- 0.7.22.src/subcontent.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/subcontent.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/subcontent.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/submitnews.php 0.7.23.src/submitnews.php
--- 0.7.22.src/submitnews.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/submitnews.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,12 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/submitnews.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("class2.php");
 $e_wysiwyg = varsettrue($pref['subnews_htmlarea']) ? "submitnews_item" : "";
 require_once(HEADERF);
@@ -241,6 +248,7 @@
       <tr>
         <td colspan='2' style='text-align:center' class='forumheader'>
           <input class='button' type='submit' name='submitnews_submit' value='".LAN_136."' />
+		  <input type='hidden' name='e-token' value='".e_TOKEN."' />
         </td>
       </tr>
     </table>
diff -x .svn -aruN 0.7.22.src/top.php 0.7.23.src/top.php
--- 0.7.22.src/top.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/top.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/top.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/upload.php 0.7.23.src/upload.php
--- 0.7.22.src/upload.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/upload.php	2010-07-31 09:58:21.000000000 -0500
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Steve Dunstan 2001-2002
+|     Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,11 +11,19 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.7/upload.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Revision: 11643 $
+|     $Date: 2010-07-31 09:58:45 -0500 (Sat, 31 Jul 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
+
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("class2.php");
 
 if (!$pref['upload_enabled'] || $pref['upload_class'] == 255) 
@@ -244,7 +252,8 @@
 	</tr>
 
 	<tr>
-	<td style='text-align:center' colspan='2' class='forumheader'><input class='button' type='submit' name='upload' value='".LAN_416."' /></td>
+	<td style='text-align:center' colspan='2' class='forumheader'><input class='button' type='submit' name='upload' value='".LAN_416."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' /></td>
 	</tr>
 	</table>
 	</form>
diff -x .svn -aruN 0.7.22.src/user.php 0.7.23.src/user.php
--- 0.7.22.src/user.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/user.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/user.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/userposts.php 0.7.23.src/userposts.php
--- 0.7.22.src/userposts.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.23.src/userposts.php	2010-02-17 12:55:50.000000000 -0600
@@ -12,7 +12,7 @@
 |
 |     $Source: /cvs_backup/e107_0.7/userposts.php,v $
 |     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
+|     $Date: 2010-02-17 12:56:14 -0600 (Wed, 17 Feb 2010) $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.22.src/usersettings.php 0.7.23.src/usersettings.php
--- 0.7.22.src/usersettings.php	2010-05-19 17:00:55.000000000 -0500
+++ 0.7.23.src/usersettings.php	2010-08-01 07:56:47.000000000 -0500
@@ -9,10 +9,17 @@
 * User settings editing
 *
 * $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/usersettings.php $
-* $Id: usersettings.php 11541 2010-05-19 22:01:19Z secretr $
+* $Id: usersettings.php 11645 2010-08-01 12:57:11Z e107coders $
 *
 */
 
+// Experimental e-token
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	// set e-token so it can be processed by class2
+	$_POST['e-token'] = '';
+}
+
 require_once("class2.php");
 require_once(e_HANDLER."ren_help.php");
 require_once(e_HANDLER."user_extended_class.php");
@@ -101,14 +108,8 @@
 //---------------------------------------------
 $error = "";
 
-if (isset($_POST['updatesettings']))
-{
-	if(!varset($_POST['__referer']))
-	{
-		header('location:'.e_BASE.'index.php');
-  		exit;
-	}
-	
+if (isset($_POST['updatesettings']) && varset($_POST['e-token']))
+{	
 	if(!varsettrue($pref['auth_method']) || $pref['auth_method'] == '>e107')
 	{
 		$pref['auth_method'] = 'e107';
@@ -176,7 +177,10 @@
 	if (isset($_POST['loginname']))
 	{  // Only check if its been edited %*|/|&nbsp;|\#|\=|\$%
 		// another option would be /[^\w\pL\.]/u (non latin words)
-		$temp_name = trim(preg_replace('#[^a-z0-9_\.]#i', "", strip_tags($_POST['loginname'])));
+	//	$temp_name = trim(preg_replace('#[^a-z0-9_\.]#i', "", strip_tags($_POST['loginname'])));
+	// The above preg_replace will break any non-latin login and should not be used. 
+	
+		$temp_name = htmlspecialchars($_POST['loginname'], ENT_QUOTES);
 		if ($temp_name != $_POST['loginname'])
 		{
 			$error .= LAN_USET_13."\\n";
@@ -641,7 +645,7 @@
 
 $text .= "
 	<input type='hidden' name='_uid' value='{$uuid}' />
-	<input type='hidden' name='__referer' value='".POST_REFERER."' />
+	<input type='hidden' name='e-token' value='".e_TOKEN."' />
 	</div>
 	</form>
 	";
