diff -x .svn -aruN 0.7.21.src/e107_admin/banlist.php 0.7.22.src/e107_admin/banlist.php
--- 0.7.21.src/e107_admin/banlist.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.22.src/e107_admin/banlist.php	2010-05-24 14:58:19.000000000 -0500
@@ -1,22 +1,23 @@
 <?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_admin/banlist.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright (C) 2008-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* User ban management
+*
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/banlist.php $
+* $Id: banlist.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+*
 */
 require_once("../class2.php");
+if(count($_POST) && !varset($_POST['__referer']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
 if (!getperms("4")) {
 	header("location:".e_BASE."index.php");
 	exit;
@@ -70,6 +71,8 @@
 
 $text .= "<div style='text-align:center'>
 	<form method='post' action='".e_SELF."'>
+	<input type='hidden' name='__referer' value='".POST_REFERER."' />
+
 	<table style='".ADMIN_WIDTH."' class='fborder'>
 
 	<tr>
@@ -89,6 +92,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."' />
 
 	</td>
 	</tr>
@@ -119,7 +123,11 @@
 			extract($row);
 			$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'>".$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>";
+				<td style='width:30%; text-align:center' class='forumheader3'>
+				<input type='hidden' name='__referer' value='".POST_REFERER."' />
+				".
+				$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>";
 			$count++;
 		}
 		$text .= "</table>\n";
diff -x .svn -aruN 0.7.21.src/e107_admin/core_image.php 0.7.22.src/e107_admin/core_image.php
--- 0.7.21.src/e107_admin/core_image.php	2010-05-23 10:42:07.000000000 -0500
+++ 0.7.22.src/e107_admin/core_image.php	2010-05-27 13:26:13.000000000 -0500
@@ -10,8 +10,8 @@
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_admin/core_image.php $
-|     $Id: core_image.php 11546 2010-05-23 15:42:31Z mcfly_e107 $
+|     $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 $
 +----------------------------------------------------------------------------+
 */
 
@@ -49,7 +49,7 @@
     'administrator.php' => 'd5ca4e8934f0f606567a2dbdb5981bc8',
     'article.php' => '7b86b603fd057a03a5e8a9fee33804c6',
     'auth.php' => '073a03fb01d40c080cb59af60ee75dea',
-    'banlist.php' => '91861753177b7a52fe9e7d1823b6abf1',
+    'banlist.php' => '9f5ed7e5947ff55daf15b0e83653f64c',
     'banner.php' => '230435a3e6a05e31554a34ccccd958b3',
     'cache.php' => 'fe8562fde538ad402714a2c862aaeb66',
     'cascade.php' => 'eaeb7cf8f771405c49d213e3f72ed87c',
@@ -60,7 +60,7 @@
     'comment.php' => 'e19cef505e9e34b173347776822fc938',
     'compact.php' => '7d2fb15144e156001a5ba509c8e9460c',
     'content.php' => '11c0b2775685a764568e56309b9f6640',
-    'core_image.php' => '91570daad7f485a2a3cbff8c817a3f5e',
+    'core_image.php' => 'ae17cae0f8c8801923991e5c185563de',
     'cpage.php' => '42db23338a2c22c6b36dba22c4a2d8c4',
     'credits.php' => '517a7fa63891e1ddf081022124b55484',
     'db.php' => '04bfff9ac83efefc421fbfc2f9e47a2f',
@@ -90,21 +90,21 @@
     'notify.php' => '4a1bd8344d67380b856154adba33c5c1',
     'phpinfo.php' => '4df5e29409b5a5b09dbca5ad581fda7b',
     'plugin.php' => '8e41c495bb1f2e9c5a8d3e48f0665776',
-    'prefs.php' => '62ce30c4e8bd73fc3fa3a951c7ea5493',
+    'prefs.php' => 'cf935336390bfb04a2ee4dad50ee6463',
     'review.php' => '5162c3c4b56fd4f969fc75f995a8c345',
     'search.php' => '1f6c001e78f4a2cb2763f9f467d94f14',
     'theme.php' => '48ed356f966bd680dc141292e1909da9',
     'ugflag.php' => 'e3ec924906d125af6a02947b8da53ca3',
     'update_routines.php' => '6de15787113bc251019d5e592f95d538',
-    'updateadmin.php' => '624b04cab4707be17d85c2bc4a9efd60',
+    'updateadmin.php' => '226df1061c04098f9290b1ed8bf1f79c',
     'upload.php' => 'd30f38af5626f7136db2de9ad161782f',
     'userclass.php' => 'eac06ad3c95825ec0622b9285016e939',
-    'userclass2.php' => '68473a4d43be8fa650127d9a3b154e7f',
+    'userclass2.php' => 'a79836ce63f75c9f111d75fe6a1f621d',
     'userinfo.php' => '85390decefb4ca067ce27a301a51507c',
-    'users.php' => '68beb8ff7b13da66a5045935adbe1b92',
-    'users_extended.php' => 'fd1606e621f53b5344024bdf697573f8',
+    'users.php' => '6bf5bc0280834b5bc4aef7a148711191',
+    'users_extended.php' => 'd2f37b278a17f39e6604eb48cc7a6097',
     'users_extended_predefined.php' => 'dfcd9bfa4780211dd5973e01d49831b0',
-    'ver.php' => 'dce7bde6d02df4d8e76f321090fd2a31',
+    'ver.php' => 'f497d5025efb617170d08b4498c3f532',
     'wmessage.php' => '351f74bf0a1a756f00b3ae5e2b84acae',
   ),
   $coredir['docs'] => 
@@ -743,7 +743,7 @@
     'debug_handler.php' => '2f44151020c12425b530e0abbbb10382',
     'e107_Compat_handler.php' => '90eda35c373c697ba7c95ceab5f43830',
     'e107_class.php' => '7d45b73804f9ee3425c76ee4abaac5dc',
-    'e_parse_class.php' => 'cd407c2fc062f9d2117260c0b513edb1',
+    'e_parse_class.php' => 'fb46649331de7256f4ac82bfa2a6bf67',
     'emailprint_class.php' => 'd9c12318267ee842882376b90c07f009',
     'emote.php' => '5cb04e55433d18a973cae4b84becb9bf',
     'emote_filter.php' => '111b2ea89469b71aaebb5c479f947c27',
@@ -760,7 +760,7 @@
     'mail_validation_class.php' => '6b27b22b839b06058bbf7da4be345f3f',
     'message_handler.php' => 'cd03f9fd76c7aca2a744ec02486dcd07',
     'mysql_class.php' => 'ff31490412a65a6923b7da0421eb9d56',
-    'news_class.php' => '489427ca479acc1c8f40d261fe1508f2',
+    'news_class.php' => '03b176867dc946a015c1e4180ce1fc98',
     'notify_class.php' => '66ff6e42bc6a626a0baa1590fc51881a',
     'np_class.php' => '7add79abecaa6cd864bb0fbcc29a4032',
     'override_class.php' => '8e1d0e650e5c6ad51b9db7889aabb4e9',
@@ -1374,7 +1374,7 @@
       'lan_user_select.php' => '1b0fbeb61e678ede80515de672fe0e1e',
       'lan_userclass.php' => '5fe7b35289182033c5e3a0cf412159a0',
       'lan_userposts.php' => 'b373e7c3f0f77163f035a2969cacaa55',
-      'lan_usersettings.php' => 'bf0c826322d8cd6201c236507f7cf3b2',
+      'lan_usersettings.php' => 'b5b677205adc5bf8a2d7be70e58da5cf',
     ),
     'index.html' => 'd41d8cd98f00b204e9800998ecf8427e',
   ),
@@ -5843,3 +5843,4 @@
   'upgrade.php' => '5e74e594b56732d62183c0300e222f2a',
 );
 
+?>
\ No newline at end of file
diff -x .svn -aruN 0.7.21.src/e107_admin/prefs.php 0.7.22.src/e107_admin/prefs.php
--- 0.7.21.src/e107_admin/prefs.php	2010-03-06 17:48:44.000000000 -0600
+++ 0.7.22.src/e107_admin/prefs.php	2010-05-24 14:58:19.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_admin/prefs.php,v $
-|     $Revision: 11384 $
-|     $Date: 2010-03-06 18:49:08 -0500 (Sat, 06 Mar 2010) $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright (C) 2008-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* Site preferences editing
+*
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/prefs.php $
+* $Id: prefs.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+*
 */
+
 require_once("../class2.php");
 include_once(e_HANDLER."userclass_class.php");
 include_once(e_HANDLER."user_extended_class.php");
@@ -46,6 +43,12 @@
 
 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']);
@@ -157,6 +160,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."' />
 	<div id='main' style='text-align:center'>
 	<table style='width:100%' class='fborder'>
 	<colgroup>
diff -x .svn -aruN 0.7.21.src/e107_admin/updateadmin.php 0.7.22.src/e107_admin/updateadmin.php
--- 0.7.21.src/e107_admin/updateadmin.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.22.src/e107_admin/updateadmin.php	2010-05-24 14:58:19.000000000 -0500
@@ -1,26 +1,27 @@
 <?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_admin/updateadmin.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright (C) 2008-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* Admin password changing
+*
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/updateadmin.php $
+* $Id: updateadmin.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+*
 */
 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 ($_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)) {
@@ -56,6 +57,7 @@
 
 	<tr>
 	<td colspan='2' style ='text-align:center'  class='forumheader'>
+	<input type='hidden' name='__referer' value='".POST_REFERER."' />
 	<input class='button' type='submit' name='update_settings' value='".UDALAN_7."' />
 	<input type='hidden' name='ac' value='".md5(ADMINPWCHANGE)."' />
 	</td>
diff -x .svn -aruN 0.7.21.src/e107_admin/userclass2.php 0.7.22.src/e107_admin/userclass2.php
--- 0.7.21.src/e107_admin/userclass2.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.22.src/e107_admin/userclass2.php	2010-05-24 14:58:19.000000000 -0500
@@ -1,22 +1,23 @@
 <?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_admin/userclass2.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright (C) 2008-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* Userclass management
+*
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/userclass2.php $
+* $Id: userclass2.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+*
 */
 require_once("../class2.php");
+if(count($_POST) && !varset($_POST['__referer']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
 if (!getperms("4")) {
 	header("location:".e_BASE."index.php");
 	 exit;
@@ -85,9 +86,14 @@
 
 if (isset($_POST['delete']))
 {
+	if(isset($_POST['useraction']) && !varset($_POST['__referer']))
+	{
+		header('location:'.e_BASE.'index.php');
+		exit;
+	}
 	$class_id = intval($_POST['existing']);
 	check_allowed($class_id);
-	if ($_POST['confirm']) 
+	if ($_POST['confirm'])
 	{
 		$sql->db_Delete('userclass_classes', "userclass_id=".$class_id);
 		if ($sql->db_Select('user', 'user_id, user_class', "user_class = '{$class_id}' OR user_class REGEXP('^{$class_id},') OR user_class REGEXP(',{$class_id},') OR user_class REGEXP(',{$class_id}$')"))
@@ -139,7 +145,7 @@
 		$_POST['userclass_description'] = $tp->toDB($_POST['userclass_description']);
 
 		$editclass = intval(varset($_POST['userclass_editclass'], 0));
-		if ($editclass && (getperms('0') || check_class($editclass))) 
+		if ($editclass && (getperms('0') || check_class($editclass)))
 		{
 			$i = 1;
 			while ($sql->db_Select('userclass_classes', '*', "userclass_id='".$i."' ") && $i < 255)
@@ -194,6 +200,7 @@
 		}
 	}
 	$text .= "</select>
+		<input type='hidden' name='__referer' value='".POST_REFERER."' />
 		<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>
@@ -244,7 +251,10 @@
 	";
 }
 
-$text .= "</td></tr></table>";
+$text .= "
+<input type='hidden' name='__referer' value='".POST_REFERER."' />
+</td></tr></table>
+";
 
 if(isset($_POST['edit']))
 {
@@ -330,7 +340,7 @@
 	<td class='fcaption'>".UCSLAN_13."</td>
 	</tr>
 	";
-	
+
 if ($class_total == "0")
 {
 	$text .= "<tr><td colspan='3'>".UCSLAN_7."</td></tr>";
diff -x .svn -aruN 0.7.21.src/e107_admin/users_extended.php 0.7.22.src/e107_admin/users_extended.php
--- 0.7.21.src/e107_admin/users_extended.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.22.src/e107_admin/users_extended.php	2010-05-24 14:58:19.000000000 -0500
@@ -1,22 +1,23 @@
 <?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_admin/users_extended.php,v $
-|     $Revision: 11346 $
-|     $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright (C) 2008-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* Extended user field management
+*
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/users_extended.php $
+* $Id: users_extended.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+*
 */
 require_once("../class2.php");
+if(varset($_POST['eu_action']) && !varset($_POST['__referer']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
 if (!getperms("4")) {
 	header("location:".e_BASE."index.php");
 	exit;
@@ -109,7 +110,7 @@
 	}
 	$new_values = make_delimited($_POST['user_values']);
 	$new_parms = $tp->toDB($_POST['user_include']."^,^".$_POST['user_regex']."^,^".$_POST['user_regexfail']."^,^".$_POST['user_hide']);
-	
+
 // Check to see if its a reserved field name before adding to database
 	if($ue->user_extended_reserved($ue_field_name))
 	{  // Reserved field name
@@ -131,7 +132,7 @@
 }
 
 
-if (isset($_POST['update_field'])) 
+if (isset($_POST['update_field']))
 {
 	if($_POST['user_type']==4){
     	$_POST['user_values'] = array($_POST['table_db'],$_POST['field_id'],$_POST['field_value'],$_POST['field_order']);
@@ -299,7 +300,7 @@
 		  $i=0;
 		  if(count($extendedList))
 		  {	//	Show current extended fields
-			foreach($extendedList[$cn] as $ext)	
+			foreach($extendedList[$cn] as $ext)
 			{
 			  $fname = "user_".$ext['user_extended_struct_name'];
 			  $uVal = str_replace(chr(1), "", $ext['user_extended_struct_default']);		// Is this right?
@@ -331,6 +332,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='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."' />
@@ -792,9 +794,9 @@
 	}
 
 
-	function show_options($action) 
+	function show_options($action)
 	{
-		if ($action == "") 
+		if ($action == "")
 		{
 			$action = "main";
 		}
diff -x .svn -aruN 0.7.21.src/e107_admin/users.php 0.7.22.src/e107_admin/users.php
--- 0.7.21.src/e107_admin/users.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.22.src/e107_admin/users.php	2010-05-24 14:58:19.000000000 -0500
@@ -1,18 +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).
-|
-|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_admin/users.php $
-|     $Id: users.php 11346 2010-02-17 18:56:14Z secretr $
-+----------------------------------------------------------------------------+
+* e107 website system
+*
+* Copyright (C) 2008-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* User settings editing
+*
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/users.php $
+* $Id: users.php 11551 2010-05-24 19:58:43Z mcfly_e107 $
+*
 */
 require_once("../class2.php");
 
@@ -43,6 +41,11 @@
 	exit;
 }
 
+if(isset($_POST['useraction']) && !varset($_POST['__referer']))
+{
+	header('location:'.e_BASE.'index.php');
+	exit;
+}
 
 $e_sub_cat = 'users';
 $user = new users;
@@ -369,9 +372,6 @@
 	}
 }
 
-
-
-
 // ------- Delete User --------------
 if (isset($_POST['useraction']) && $_POST['useraction'] == 'deluser') {
 	if ($_POST['confirm']) {
@@ -531,7 +531,7 @@
 
 	function show_existing_users($action, $sub_action, $id, $from, $amount)
 	{
-		global $sql, $rs, $ns, $tp, $mySQLdefaultdb,$pref,$unverified;
+		global $sql, $rs, $ns, $tp, $mySQLdefaultdb,$pref,$unverified, $currentUser;
 		// save the display choices.
 		if(isset($_POST['searchdisp']))
 		{
@@ -735,6 +735,7 @@
 					<form method='post' action='".e_SELF.$qry."'>
 					<div>
 
+					<input type='hidden' name='__referer' value='".POST_REFERER."'>
 					<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%'>
diff -x .svn -aruN 0.7.21.src/e107_admin/ver.php 0.7.22.src/e107_admin/ver.php
--- 0.7.21.src/e107_admin/ver.php	2010-05-23 10:41:46.000000000 -0500
+++ 0.7.22.src/e107_admin/ver.php	2010-05-27 13:25:50.000000000 -0500
@@ -1,13 +1,13 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_admin/ver.php $
-* $Id: ver.php 11545 2010-05-23 15:42:10Z mcfly_e107 $
+* $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 $
 *
 * Version file
 */
 
 if (!defined('e107_INIT')) { exit; }
 
-$e107info['e107_version'] = "0.7.21";
+$e107info['e107_version'] = "0.7.22";
 ?>
diff -x .svn -aruN 0.7.21.src/e107_handlers/e_parse_class.php 0.7.22.src/e107_handlers/e_parse_class.php
--- 0.7.21.src/e107_handlers/e_parse_class.php	2010-05-20 15:37:42.000000000 -0500
+++ 0.7.22.src/e107_handlers/e_parse_class.php	2010-05-23 16:41:24.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: 11543 $
-|     $Date: 2010-05-20 16:38:06 -0400 (Thu, 20 May 2010) $
+|     $Revision: 11549 $
+|     $Date: 2010-05-23 17:41:48 -0400 (Sun, 23 May 2010) $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -181,14 +181,15 @@
 
 	function post_toForm($text) 
 	{
+		global $pref;
 		if (defined("MAGIC_QUOTES_GPC") && (MAGIC_QUOTES_GPC == TRUE)) 
 		{
 			$text = stripslashes($text);
 		}
 		//If user is not allowed to use [php] change to entities
-		if(!check_class($pref['php_bbcode']))
+		if ((!defined('USERCLASS')) ||(!check_class($pref['php_bbcode'])))
 		{
-			$ret = preg_replace("#\[(php)#i", "&#91;\\1", $ret);
+			$text = preg_replace("#\[(php)#i", "&#91;\\1", $text);
 		}
 		// ensure apostrophes are properly converted, or else the form item could break
 		return str_replace(array( "'", '"'), array("&#039;", "&quot;"), $text);
diff -x .svn -aruN 0.7.21.src/e107_handlers/news_class.php 0.7.22.src/e107_handlers/news_class.php
--- 0.7.21.src/e107_handlers/news_class.php	2010-02-17 12:55:50.000000000 -0600
+++ 0.7.22.src/e107_handlers/news_class.php	2010-05-25 13:14:05.000000000 -0500
@@ -1,21 +1,16 @@
 <?php
 /*
-+---------------------------------------------------------------+
-| e107 website system
-| /classes/news_class.php
-|
-| Steve Dunstan 2001-2002
-| http://jalist.com
-| stevedunstan@jalist.com
-|
-| Released under the terms and conditions of the
-| GNU General Public License (http://gnu.org).
-|
-| $Source: /cvs_backup/e107_0.7/e107_handlers/news_class.php,v $
-| $Revision: 11346 $
-| $Date: 2010-02-17 13:56:14 -0500 (Wed, 17 Feb 2010) $
-| $Author: secretr $
-+---------------------------------------------------------------+
+* e107 website system
+*
+* Copyright (C) 2008-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* News handler
+*
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_handlers/news_class.php $
+* $Id: news_class.php 11552 2010-05-25 18:14:29Z mcfly_e107 $
+*
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -34,7 +29,8 @@
 		$news['news_userid'] = ($news['news_userid']) ? $news['news_userid'] : USERID;
 		if(!isset($news['news_sticky'])) {$news['news_sticky'] = 0;}
 		$author_insert = ($news['news_author'] == 0) ? "news_author = '".USERID."'," : "";
-        $news['news_author'] = ($news['news_author']) ? $news['news_author'] : USERID;
+		$news['news_author'] = ($news['news_author']) ? $news['news_author'] : USERID;
+		$news['news_class'] = (varset($news['news_class'], '255'));
 
 		if ($news['news_id']) {
 			$vals = "news_datestamp = '".intval($news['news_datestamp'])."', ".$author_insert." news_title='".$news['news_title']."', news_body='".$news['news_body']."', news_extended='".$news['news_extended']."', news_category='".intval($news['cat_id'])."', news_allow_comments='".intval($news['news_allow_comments'])."', news_start='".intval($news['news_start'])."', news_end='".intval($news['news_end'])."', news_class='".$tp->toDB($news['news_class'])."', news_render_type='".intval($news['news_rendertype'])."' , news_summary='".$news['news_summary']."', news_thumbnail='".$tp->toDB($news['news_thumbnail'])."', news_sticky='".intval($news['news_sticky'])."' WHERE news_id='".intval($news['news_id'])."' ";
@@ -129,7 +125,7 @@
 			$news['comment_total'] = 0;
 		}
 
-		if (!$param) 
+		if (!$param)
 		{
 			$param['caticon'] = ICONSTYLE;
 			$param['commentoffstring'] = COMMENTOFFSTRING;
@@ -152,10 +148,10 @@
 		  }
 		  $param['image_nonew_small'] = IMAGE_nonew_small;
 		}
-		
+
 		if (!isset($param['image_new_small']))
 		{
-		  if (!defined("IMAGE_new_small"))	
+		  if (!defined("IMAGE_new_small"))
 		  {
 			define("IMAGE_new_small", (file_exists(THEME."images/new_comments.png") ? "<img src='".THEME_ABS."images/new_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."generic/".IMODE."/new_comments.png' alt=''  /> "));
 		  }
diff -x .svn -aruN 0.7.21.src/e107_languages/English/admin/lan_theme.php 0.7.22.src/e107_languages/English/admin/lan_theme.php
--- 0.7.21.src/e107_languages/English/admin/lan_theme.php	2010-05-01 15:58:57.000000000 -0500
+++ 0.7.22.src/e107_languages/English/admin/lan_theme.php	2010-05-01 15:58:57.000000000 -0500
@@ -8,7 +8,7 @@
 *
 * Language file - Theme manager admin
 *
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_languages/English/admin/lan_theme.php $
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_languages/English/admin/lan_theme.php $
 * $Id: lan_theme.php 11512 2010-05-01 20:59:21Z e107steved $
 *
 */define("TPVLAN_1", "You are looking at a preview of the <b>'".PREVIEWTHEMENAME."'</b> theme. It has not been set as the main theme for your site, it has been activated to provide a preview of how the theme looks.<br />To set this theme as your site theme, <a href='".e_ADMIN."theme.php'>return to your theme manager</a> and select 'Set As Site Theme'.<br />To preview more themes please <a href='".e_ADMIN."theme.php'>click here</a>");
diff -x .svn -aruN 0.7.21.src/e107_languages/English/lan_usersettings.php 0.7.22.src/e107_languages/English/lan_usersettings.php
--- 0.7.21.src/e107_languages/English/lan_usersettings.php	2010-05-04 14:04:13.000000000 -0500
+++ 0.7.22.src/e107_languages/English/lan_usersettings.php	2010-05-25 14:30:10.000000000 -0500
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.7/e107_languages/English/lan_usersettings.php,v $
-|     $Revision: 11520 $
-|     $Date: 2010-05-04 15:04:37 -0400 (Tue, 04 May 2010) $
-|     $Author: e107steved $
+|     $Revision: 11553 $
+|     $Date: 2010-05-25 15:30:34 -0400 (Tue, 25 May 2010) $
+|     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "User Settings");
@@ -28,9 +28,9 @@
 //define("LAN_117", "MSN Messenger: ");
 //define("LAN_118", "Birthday: ");
 //define("LAN_119", "Location: ");
-//define("LAN_120", "Signature: ");
+define("LAN_120", "Signature: ");
 //define("LAN_121", "Avatar: ");
-//define("LAN_122", "Timezone:");
+define("LAN_122", "Timezone:");
 //define("LAN_144", "Website URL: ");
 define("LAN_150", "Settings updated and saved into database.");
 define("LAN_151", "OK");
diff -x .svn -aruN 0.7.21.src/e107_plugins/calendar_menu/calendar_menu.php 0.7.22.src/e107_plugins/calendar_menu/calendar_menu.php
--- 0.7.21.src/e107_plugins/calendar_menu/calendar_menu.php	2010-05-05 15:04:19.000000000 -0500
+++ 0.7.22.src/e107_plugins/calendar_menu/calendar_menu.php	2010-05-05 15:04:19.000000000 -0500
@@ -8,7 +8,7 @@
 *
 * Event calendar plugin - calendar menu display
 *
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_plugins/calendar_menu/calendar_menu.php $
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/calendar_menu/calendar_menu.php $
 * $Id: calendar_menu.php 11523 2010-05-05 20:04:43Z e107steved $
 *
 */
diff -x .svn -aruN 0.7.21.src/e107_plugins/forum/e_list.php 0.7.22.src/e107_plugins/forum/e_list.php
--- 0.7.21.src/e107_plugins/forum/e_list.php	2010-04-15 21:35:32.000000000 -0500
+++ 0.7.22.src/e107_plugins/forum/e_list.php	2010-04-15 21:35:32.000000000 -0500
@@ -6,7 +6,7 @@
 * Released under the terms and conditions of the
 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
 *
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_plugins/forum/e_list.php $
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/forum/e_list.php $
 * $Id: e_list.php 11479 2010-04-16 02:35:56Z mcfly_e107 $
 *
 */
diff -x .svn -aruN 0.7.21.src/e107_plugins/forum/forum_viewtopic.php 0.7.22.src/e107_plugins/forum/forum_viewtopic.php
--- 0.7.21.src/e107_plugins/forum/forum_viewtopic.php	2010-02-20 09:33:29.000000000 -0600
+++ 0.7.22.src/e107_plugins/forum/forum_viewtopic.php	2010-02-20 09:33:29.000000000 -0600
@@ -10,7 +10,7 @@
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_plugins/forum/forum_viewtopic.php $
+|     $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 $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.21.src/e107_plugins/login_menu/login_menu.php 0.7.22.src/e107_plugins/login_menu/login_menu.php
--- 0.7.21.src/e107_plugins/login_menu/login_menu.php	2010-04-16 21:16:27.000000000 -0500
+++ 0.7.22.src/e107_plugins/login_menu/login_menu.php	2010-04-16 21:16:27.000000000 -0500
@@ -6,7 +6,7 @@
 * Released under the terms and conditions of the
 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
 *
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_plugins/login_menu/login_menu.php $
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/login_menu/login_menu.php $
 * $Id: login_menu.php 11483 2010-04-17 02:16:51Z mcfly_e107 $
 *
 */
diff -x .svn -aruN 0.7.21.src/e107_plugins/pm/pm.php 0.7.22.src/e107_plugins/pm/pm.php
--- 0.7.21.src/e107_plugins/pm/pm.php	2010-04-25 02:28:35.000000000 -0500
+++ 0.7.22.src/e107_plugins/pm/pm.php	2010-04-25 02:28:35.000000000 -0500
@@ -8,7 +8,7 @@
 *
 * Private Messenger plugin - main user interface
 *
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_plugins/pm/pm.php $
+* $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 $
 *
 */
diff -x .svn -aruN 0.7.21.src/e107_plugins/tree_menu/config.php 0.7.22.src/e107_plugins/tree_menu/config.php
--- 0.7.21.src/e107_plugins/tree_menu/config.php	2010-05-01 15:45:42.000000000 -0500
+++ 0.7.22.src/e107_plugins/tree_menu/config.php	2010-05-01 15:45:42.000000000 -0500
@@ -8,7 +8,7 @@
 *
 * Tree menu configuration
 *
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_plugins/tree_menu/config.php $
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/tree_menu/config.php $
 * $Id: config.php 11510 2010-05-01 20:46:06Z e107steved $
 *
 */
diff -x .svn -aruN 0.7.21.src/e107_plugins/tree_menu/tree_menu.php 0.7.22.src/e107_plugins/tree_menu/tree_menu.php
--- 0.7.21.src/e107_plugins/tree_menu/tree_menu.php	2010-05-01 15:45:42.000000000 -0500
+++ 0.7.22.src/e107_plugins/tree_menu/tree_menu.php	2010-05-01 15:45:42.000000000 -0500
@@ -8,7 +8,7 @@
 *
 * Tree menu
 *
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/e107_plugins/tree_menu/tree_menu.php $
+* $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_plugins/tree_menu/tree_menu.php $
 * $Id: tree_menu.php 11510 2010-05-01 20:46:06Z e107steved $
 *
 */
diff -x .svn -aruN 0.7.21.src/signup.php 0.7.22.src/signup.php
--- 0.7.21.src/signup.php	2010-05-19 17:00:55.000000000 -0500
+++ 0.7.22.src/signup.php	2010-05-19 17:00:55.000000000 -0500
@@ -10,7 +10,7 @@
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
-|     $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/signup.php $
+|     $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 $
 +----------------------------------------------------------------------------+
 */
diff -x .svn -aruN 0.7.21.src/usersettings.php 0.7.22.src/usersettings.php
--- 0.7.21.src/usersettings.php	2010-05-19 17:00:55.000000000 -0500
+++ 0.7.22.src/usersettings.php	2010-05-19 17:00:55.000000000 -0500
@@ -8,7 +8,7 @@
 *
 * User settings editing
 *
-* $URL: https://e107.svn.sourceforge.net/svnroot/e107/tags/e107_v07_21_release/usersettings.php $
+* $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 $
 *
 */
