phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com

[Phpbb-checkins] CVS: phpBB2 config.php,1.37,NONE

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv24779

Removed Files:
	config.php 
Log Message:
To prevent stupidity (again) I'll just remove it... As long as the directory is chmoded to 777 during install, everything will be OK.  It will probably inch its way back in later.

--- config.php DELETED ---

[Phpbb-checkins] CVS: phpBB2 config.php,1.36,1.37

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv19403

Added Files:
	config.php 
Log Message:
And add it back...

[Phpbb-checkins] CVS: phpBB2 config.php,1.35,NONE

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv19017

Removed Files:
	config.php 
Log Message:
Ok, let's clean out config.php

--- config.php DELETED ---

[Phpbb-checkins] CVS: phpBB2 config.php,1.34,1.35

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv2226

Modified Files:
	config.php 
Log Message:
Okay, that was equally stupid ...

Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** config.php	2001/10/14 18:32:48	1.34
--- config.php	2001/10/14 18:37:17	1.35
***************
*** 1,4 ****
- 
- //
- // RUN install.php!
- //
--- 0 ----

[Phpbb-checkins] CVS: phpBB2 config.php,1.33,1.34

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv525

Modified Files:
	config.php 
Log Message:
Doug, whooops .... :)

Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** config.php	2001/10/14 16:11:36	1.33
--- config.php	2001/10/14 18:32:48	1.34
***************
*** 1,19 ****
- <?php
  
  //
! // phpBB 2.x auto-generated config file
! // Do not change anything in this file!
  //
- 
- $dbms = "mysql";
- 
- $dbhost = "127.0.0.1";
- $dbname = "devphpbb2";
- $dbuser = "dougk";
- $dbpasswd = "2d8o0u7g026";
- 
- $table_prefix = "phpbb_";
- 
- define('PHPBB_INSTALLED', true);
- 
- ?>
\ No newline at end of file
--- 1,4 ----
  
  //
! // RUN install.php!
  //

[Phpbb-checkins] CVS: phpBB2 login.php,1.29,1.30 index.php,1.75,1.76 install.php,1.6,1.7 memberlist.php,1.21,1.22 modcp.php,1.41,1.42 posting.php,1.78,1.79 privmsg.php,1.33,1.34 profile.php,1.118,1.119 search.php,1.19,1.20 viewforum.php,1.90,1.91 viewtopic.php,1.119,1.120

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28423

Modified Files:
	login.php index.php install.php memberlist.php modcp.php 
	posting.php privmsg.php profile.php search.php viewforum.php 
	viewtopic.php 
Log Message:
Various changes to location redirection ... please note the format and name changes

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** login.php	2001/10/14 15:49:52	1.29
--- login.php	2001/10/14 18:22:32	1.30
***************
*** 51,72 ****
  
  		$rowresult = $db->sql_fetchrow($result);
! 		if(count($rowresult))
  		{
! 	 		if((md5($password) == $rowresult['user_password']) && $rowresult['user_active'] != 0)
  			{
! 				$autologin = (isset($HTTP_POST_VARS['autologin'])) ? TRUE : FALSE;
  
  				$session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, TRUE, $autologin);
  
! 				if($session_id)
  				{
! 					if( !empty($HTTP_POST_VARS['forward_page']) )
  					{
! //						echo $HTTP_POST_VARS['forward_page'];
! 						header("Location: " . $HTTP_POST_VARS['forward_page']);
  					}
  					else
  					{
! 						header("Location: " . append_sid("index.$phpEx"));
  					}
  				}
--- 51,72 ----
  
  		$rowresult = $db->sql_fetchrow($result);
! 
! 		if( count($rowresult) )
  		{
! 	 		if( (md5($password) == $rowresult['user_password']) && $rowresult['user_active'] != 0 )
  			{
! 				$autologin = (isset($HTTP_POST_VARS['autologin'])) ? TRUE : 0;
  
  				$session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, TRUE, $autologin);
  
! 				if( $session_id )
  				{
! 					if( !empty($HTTP_POST_VARS['redirect']) )
  					{
! 						header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  					}
  					else
  					{
! 						header("Location: " . append_sid("index.$phpEx", true));
  					}
  				}
***************
*** 92,113 ****
  			session_end($userdata['session_id'], $userdata['user_id']);
  		}
! 		if( !empty($HTTP_POST_VARS['forward_page']) )
  		{
! 			header("Location: " . append_sid($HTTP_POST_VARS['forward_page']));
  		}
  		else
  		{
! 			header("Location: " . append_sid("index.$phpEx"));
  		}
  	}
  	else
  	{
! 		if( !empty($HTTP_POST_VARS['forward_page']) )
  		{
! 			header(append_sid("Location: ".$HTTP_POST_VARS['forward_page']));
  		}
  		else
  		{
! 			header("Location: " . append_sid("index.$phpEx"));
  		}
  	}
--- 92,114 ----
  			session_end($userdata['session_id'], $userdata['user_id']);
  		}
! 
! 		if( !empty($HTTP_POST_VARS['redirect']) )
  		{
! 			header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  		}
  		else
  		{
! 			header("Location: " . append_sid("index.$phpEx", true));
  		}
  	}
  	else
  	{
! 		if( !empty($HTTP_POST_VARS['redirect']) )
  		{
! 			header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  		}
  		else
  		{
! 			header("Location: " . append_sid("index.$phpEx", true));
  		}
  	}
***************
*** 121,125 ****
  	if(!$userdata['session_logged_in'])
  	{
- 		$page_title = "Log In";
  		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
--- 122,125 ----
***************
*** 128,136 ****
  		);
  
! 		if( isset($HTTP_POST_VARS['forward_page']) || isset($HTTP_GET_VARS['forward_page']) )
  		{
! 			echo $forward_to = $HTTP_SERVER_VARS['QUERY_STRING'];
  
! 			if( preg_match("/^forward_page=(.*)(&sid=[0-9]*)$|^forward_page=(.*)$/si", $forward_to, $forward_matches) )
  			{
  				$forward_to = ($forward_matches[3]) ? $forward_matches[3] : $forward_matches[1];
--- 128,136 ----
  		);
  
! 		if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) )
  		{
! 			$forward_to = $HTTP_SERVER_VARS['QUERY_STRING'];
  
! 			if( preg_match("/^redirect=(.*)$/si", $forward_to, $forward_matches) )
  			{
  				$forward_to = ($forward_matches[3]) ? $forward_matches[3] : $forward_matches[1];
***************
*** 140,153 ****
  				if(count($forward_match) > 1)
  				{
! 					$forward_page = $forward_match[0] . "?";
  
  					for($i = 1; $i < count($forward_match); $i++)
  					{
! 						$forward_page .= $forward_match[$i];
! 						if($i < count($forward_match) - 1)
  						{
! 							$forward_page .= "&";
  						}
  					}
  				}
  				else
--- 140,158 ----
  				if(count($forward_match) > 1)
  				{
! 					$forward_page = "";
  
  					for($i = 1; $i < count($forward_match); $i++)
  					{
! 						if( !ereg("sid=", $forward_match[$i]) )
  						{
! 							if( $forward_page != "" )
! 							{
! 								$forward_page .= "&";
! 							}
! 							$forward_page .= $forward_match[$i];
  						}
  					}
+ 
+ 					$forward_page = $forward_match[0] . "?" . $forward_page;
  				}
  				else
***************
*** 164,175 ****
  		$username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : "";
  
  		$template->assign_vars(array(
- 			"FORWARD_PAGE" => $forward_page,
  			"USERNAME" => $username,
  
  			"L_SEND_PASSWORD" => $lang['Forgotten_password'],
  
! 			"U_SEND_PASSWORD" => append_sid("profile.$phpEx?mode=sendpassword")
! 			)
  		);
  
--- 169,182 ----
  		$username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : "";
  
+ 		$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
+ 
  		$template->assign_vars(array(
  			"USERNAME" => $username,
  
  			"L_SEND_PASSWORD" => $lang['Forgotten_password'],
  
! 			"U_SEND_PASSWORD" => append_sid("profile.$phpEx?mode=sendpassword"), 
! 			
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields)
  		);
  

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** index.php	2001/10/10 00:00:42	1.75
--- index.php	2001/10/14 18:22:32	1.76
***************
*** 347,355 ****
  						}
  
- 						if( !($mod_count % 2) && $mod_count != 0 )
- 						{
- 							$moderators_links .= "<br />";
- 						}
- 
  						if( $forum_mods_single_user[$forum_id][$mods])
  						{
--- 347,350 ----

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** install.php	2001/10/11 12:18:37	1.6
--- install.php	2001/10/14 18:22:32	1.7
***************
*** 486,490 ****
  		$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
  		$s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />';
! 		$s_hidden_fields .= '<input type="hidden" name="forward_page" value="admin/" />';
  		$s_hidden_fields .= '<input type="hidden" name="submit" value="Login" />';
  		if ( $dbms == 'odbc' )
--- 486,490 ----
  		$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
  		$s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />';
! 		$s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/" />';
  		$s_hidden_fields .= '<input type="hidden" name="submit" value="Login" />';
  		if ( $dbms == 'odbc' )

Index: memberlist.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/memberlist.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** memberlist.php	2001/09/08 18:24:33	1.21
--- memberlist.php	2001/10/14 18:22:32	1.22
***************
*** 24,28 ****
  include($phpbb_root_path . 'common.'.$phpEx);
  
- $pagetype = "memberlist";
  $page_title = $lang['Memberlist'];
  
--- 24,27 ----

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** modcp.php	2001/10/09 19:59:43	1.41
--- modcp.php	2001/10/14 18:22:32	1.42
***************
*** 86,90 ****
  		$redirect = "index.$phpEx";
  	}
! 	header("Location: " . append_sid($redirect));
  }
  
--- 86,90 ----
  		$redirect = "index.$phpEx";
  	}
! 	header("Location: " . append_sid($redirect, true));
  }
  

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** posting.php	2001/10/14 15:49:52	1.78
--- posting.php	2001/10/14 18:22:32	1.79
***************
*** 95,113 ****
  	if($post_id != "")
  	{
! 		$redirect = "viewtopic.$phpEx?" . POST_POST_URL . "=$post_id#$post_id";
  	}
  	else if($topic_id != "")
  	{
  		$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
  	}
  	else if($forum_id != "")
  	{
  		$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
  	}
  	else
  	{
  		$redirect = "index.$phpEx";
  	}
! 	header("Location:" . append_sid($redirect));
  }
  //
--- 95,117 ----
  	if($post_id != "")
  	{
! 		$redirect = "viewtopic.$phpEx?" . POST_POST_URL . "=$post_id";
! 		$post_append = "#$post_id";
  	}
  	else if($topic_id != "")
  	{
  		$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
+ 		$post_append = "";
  	}
  	else if($forum_id != "")
  	{
  		$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
+ 		$post_append = "";
  	}
  	else
  	{
  		$redirect = "index.$phpEx";
+ 		$post_append = "";
  	}
! 	header("Location:" . append_sid($redirect) . $post_append, true);
  }
  //
***************
*** 417,421 ****
  		}
  
! 		header("Location: " . append_sid("login.$phpEx?forward_page=posting.$phpEx&" . $redirect));
  
  	}
--- 421,425 ----
  		}
  
! 		header("Location: " . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
  
  	}
***************
*** 1202,1206 ****
  			else
  			{
! 				header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"));
  			}
  		}
--- 1206,1210 ----
  			else
  			{
! 				header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
  			}
  		}

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** privmsg.php	2001/10/10 15:12:31	1.33
--- privmsg.php	2001/10/14 18:22:32	1.34
***************
*** 56,60 ****
  if( $cancel )
  {
! 	header("Location: " . append_sid("privmsg.$phpEx?folder=$folder"));
  }
  
--- 56,60 ----
  if( $cancel )
  {
! 	header("Location: " . append_sid("privmsg.$phpEx?folder=$folder", true));
  }
  
***************
*** 121,125 ****
  	if( !$userdata['session_logged_in'] )
  	{
! 		header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id"));
  	}
  
--- 121,125 ----
  	if( !$userdata['session_logged_in'] )
  	{
! 		header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true));
  	}
  
***************
*** 192,196 ****
  	if( !( $privmsg = $db->sql_fetchrow($pm_status) ) )
  	{
! 		header("Location: " . append_sid("privmsg.$phpEx?folder=$folder"));
  	}
  
--- 192,196 ----
  	if( !( $privmsg = $db->sql_fetchrow($pm_status) ) )
  	{
! 		header("Location: " . append_sid("privmsg.$phpEx?folder=$folder", true));
  	}
  
***************
*** 511,515 ****
  	if(!$userdata['session_logged_in'])
  	{
! 		header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&amp;folder=inbox"));
  	}
  
--- 511,515 ----
  	if(!$userdata['session_logged_in'])
  	{
! 		header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
  	}
  
***************
*** 653,657 ****
  	if( !$userdata['session_logged_in'] )
  	{
! 		header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=inbox"));
  	}
  
--- 653,657 ----
  	if( !$userdata['session_logged_in'] )
  	{
! 		header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
  	}
  
***************
*** 741,745 ****
  	if(!$userdata['session_logged_in'])
  	{
! 		header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&amp;folder=$folder&amp;mode=$mode"));
  	}
  
--- 741,745 ----
  	if(!$userdata['session_logged_in'])
  	{
! 		header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode", true));
  	}
  
***************
*** 1141,1145 ****
  			if(!$db->sql_numrows($pm_edit_status))
  			{
! 				header("Location: " . append_sid("privmsg.$phpEx?folder=$folder"));
  			}
  
--- 1141,1145 ----
  			if(!$db->sql_numrows($pm_edit_status))
  			{
! 				header("Location: " . append_sid("privmsg.$phpEx?folder=$folder", true));
  			}
  
***************
*** 1175,1179 ****
  			if( !$db->sql_numrows($pm_reply_status) )
  			{
! //				header("Location: " . append_sid("privmsg.$phpEx?folder=$folder"));
  			}
  			$privmsg = $db->sql_fetchrow($pm_reply_status);
--- 1175,1179 ----
  			if( !$db->sql_numrows($pm_reply_status) )
  			{
! //				header("Location: " . append_sid("privmsg.$phpEx?folder=$folder", true));
  			}
  			$privmsg = $db->sql_fetchrow($pm_reply_status);
***************
*** 1501,1505 ****
  if(!$userdata['session_logged_in'])
  {
! 	header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&amp;folder=inbox"));
  }
  
--- 1501,1505 ----
  if(!$userdata['session_logged_in'])
  {
! 	header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
  }
  

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** profile.php	2001/10/14 16:36:29	1.118
--- profile.php	2001/10/14 18:22:32	1.119
***************
*** 417,421 ****
  		if( !$userdata['session_logged_in'] && $mode == "editprofile" )
  		{
! 			header(append_sid("Location: login.$phpEx?forward_page=profile.$phpEx&mode=editprofile"));
  		}
  
--- 417,421 ----
  		if( !$userdata['session_logged_in'] && $mode == "editprofile" )
  		{
! 			header("Location: " . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=editprofile", true));
  		}
  

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** search.php	2001/09/26 22:35:08	1.19
--- search.php	2001/10/14 18:22:32	1.20
***************
*** 20,24 ****
--- 20,826 ----
   *
   ***************************************************************************/
+ /*
  
+ /* ====================================================================
+  * Copyright (c) 2000 Steven Haryanto.  All rights reserved.
+  *
+  * KwIndex
+  *   A PHP module to do full text indexing with MySQL database
+  * 
+  * This module is released under the GNU General Public License. See:
+  *   http://www.gnu.org/copyleft/gpl.html
+  * 
+  * Version
+  *   0.04, Sat Dec  2 14:54:41 2000
+  *   based on DBIx::KwIndex 0.03
+  *
+  * For documentation, support and latest version, visit:
+  *   http://steven.haryan.to/php/KwIndex.html
+  * 
+  * ====================================================================
+  *
+  */
+ /*
+ 
+ class KwIndex {
+ 
+ 	# CONSTRUCTOR
+ 	#############
+ 
+ 	function KwIndex($args) {
+ 		# check for argument type
+ 		if (!is_array(&$args))
+ 			die("KwIndex: constructor: syntax: KwIndex(array \$args)");
+ 
+ 		# check for unknown arguments
+ 		$known_arguments = array_flip(array(
+ 			"linkid", "db_name", "hostname", "username", "password", 
+ 			"index_name", "wordlist_cardinality", "doclist_cardinality", 
+ 			"stoplist_cardinality", "vectorlist_cardinality",
+ 			"max_word_length", "use_persistent_connection"));
+ 		while(list($k,$v) = each($args))
+ 			if (!isset($known_arguments[$k]))
+ 				die("KwIndex: constructor: unknown argument `$k'");
+ 
+ 		# required for required arguments
+ 		if (!isset($args["db_name"]))
+ 			die("KwIndex: constructor: You must specify 'db_name'");
+ 		if (!isset($args["linkid"]) &&
+ 		    (!isset($args["hostname"]) || !isset($args["username"]) || 
+ 		     !isset($args["password"])))
+ 			die("KwIndex: constructor: You must either specify 'linkid' or ".
+ 			    "arguments to mysql_connect ('hostname', 'username', and ".
+ 				   "'password')");
+ 
+ 		# supply default values for optional arguments
+ 		if (!isset($args["index_name"]))
+ 			$args["index_name"] = "kwindex";
+ 		if (!isset($args["wordlist_cardinality"]))
+ 			$args["wordlist_cardinality"] = 100000;
+ 		if (!isset($args["stoplist_cardinality"]))
+ 			$args["stoplist_cardinality"] = 10000;
+ 		if (!isset($args["vectorlist_cardinality"]))
+ 			$args["vectorlist_cardinality"] = 100000000;
+ 		if (!isset($args["doclist_cardinality"]))
+ 			$args["doclist_cardinality"] = 1000000;
+ 		if (!isset($args["max_word_length"]))
+ 			$args["max_word_length"] = 32;
+ 		if (!isset($args["use_persistent_connection"]))
+ 			$args["use_persistent_connection"] = 1;
+ 
+ 		# set object attributes
+ 		$this->db_name = $args["db_name"];
+ 		$this->index_name = $args["index_name"];
+ 		$this->wordlist_cardinality = $args["wordlist_cardinality"];
+ 		$this->stoplist_cardinality = $args["stoplist_cardinality"];
+ 		$this->vectorlist_cardinality = $args["vectorlist_cardinality"];
+ 		$this->doclist_cardinality = $args["doclist_cardinality"];
+ 		$this->max_word_length = $args["max_word_length"];
+ 
+ 		if (!isset($args["linkid"])) {
+ 			if ($args["use_persistent_connection"]) {
+ 				$linkid = mysql_pconnect($args["hostname"], $args["username"],
+ 				                         $args["password"]);
+ 			} else {
+ 				$linkid = mysql_connect($args["hostname"], $args["username"],
+ 				                        $args["password"]);
+ 			}
+ 			if (!$linkid)
+ 				die("KwIndex: constructor: Can't connect to database: ".
+ 				    mysql_error());
+ 		} else {
+ 			$linkid = $args["linkid"];
+ 		}
+ 
+ 		$this->linkid = $linkid;
+ 		$idx = $this->index_name;
+ 
+ 		if (!mysql_select_db($this->db_name, $linkid)) 
+ 			die("KwIndex: constructor: Can't select DB: ".
+ 			    mysql_error($linkid));
+ 
+ 		if (!$this->_index_exists()) $this->_create_index();
+ 
+ 		# load stoplist as keys of array
+ 		$this->stoplist = array();
+ 		if (!($res = mysql_query("SELECT word FROM ${idx}_stoplist",
+ 		                         $linkid)))
+ 			die("KwIndex: constructor: Can't load stoplist: ".
+ 			    mysql_error($linkid));
+ 		while($row = mysql_fetch_row($res)) {
+ 			$this->stoplist[ strtolower($row[0]) ] = 1;
+ 		}
+ 	} // constructor
+ 
+ 
+ 	# PUBLIC METHODS
+ 	################
+ 
+ 	function &document_sub($doc_ids) {
+ 		die("KwIndex: document_sub: this method must be overriden");
+ 	}
+ 
+ 	function add_document($doc_ids) {
+ 		if (!is_array(&$doc_ids))
+ 			die("KwIndex: syntax: add_document(array \$doc_ids)");
+ 
+ 		if (!sizeof(&$doc_ids)) return 1;
+ 
+ 		$wordlist = array();
+ 			# structure: ( 'word1' => [ [doc_id,freq], ... ], ... )
+ 		$doclist = array();
+ 			# format: ( doc_id => n, ... ); # n = number of words in document
+ 
+ 		# retrieve documents
+ 		####################
+ 		$docs = $this->document_sub(&$doc_ids);
+ 
+ 		if(!is_array(&$docs))
+ 			die("KwIndex: add_document: ".
+ 			    "'document_sub' does not return an array");
+ 		if (sizeof(&$doc_ids) < sizeof(&$docs))
+ 			die("KwIndex: add_document: ".
+ 			    "'document_sub' does not return enough documents");
+ 		if (sizeof(&$doc_ids) > sizeof(&$docs))
+ 			die("KwIndex: add_document: ".
+ 			    "'document_sub' returns too many documents");
+     
+ 		# split documents into words
+ 		############################
+ 		while(list($id, $doc) = each($docs)) {
+ 			if (!isset($doc) || !strlen($doc)) continue;
+     	
+ 			$words = $this->_split_to_words($doc);
+ 			$num_of_words = sizeof(&$words);
+ 				# note: this means that numbers, etc are counted
+ 			$doclist[$id] = $num_of_words;
+ 
+ 			# filter non-qualifying words: 1-char length, numbers, words
+ 			# that are too long
+ 
+ 			$w2 = array();
+ 			while(list($k, $v) = each($words)) {
+ 				$len = strlen($v);
+ 				$lower_v = strtolower($v);
+ 				if ($len > 1 &&
+ 				    $len <= $this->max_word_length && 
+ 				    preg_match("/[a-z]/", $lower_v) &&
+ 				    !isset($this->stoplist[$lower_v])) ++$w2[ $lower_v ];
+ 			}
+ 
+ 			while(list($k, $v) = each($w2)) {
+ 				$lower_k = strtolower($k); 
+ 				if (!isset($wordlist[$lower_k]))
+ 					$wordlist[$lower_k] = array();
+ 				array_push($wordlist[$lower_k], array($id, $v/$num_of_words));
+ 			}
+ 		}
+ 
+ #_debug("wordlist: ", Dumper($wordlist));
+ 
+ 		# submit to database
+ 		####################
+ 		$linkid = $this->linkid;
+ 		$idx = $this->index_name;
+ 
+ 		# lock the tables in case some other process remove a certain word
+ 		# between step 0 and 1 and 2 and 3
+ 		if(!mysql_query("LOCK TABLES ${idx}_doclist WRITE, ".
+ 		                            "${idx}_vectorlist WRITE, ".
+ 		                            "${idx}_wordlist WRITE",
+ 		                $linkid)) {
+ 			$this->ERROR = "Can't lock tables when adding documents: ".
+ 			                mysql_error($linkid);
+ 			return;
+ 		}
+ 
+ 		# 0
+ 		# add the docs first
+ #_debug( "doclist = ", Dumper($doclist));
+ 		while(list($k,$v) = each($doclist)) {
+ 			if(!mysql_query("REPLACE INTO ${idx}_doclist (id,n) VALUES (".
+ 			                   "'".(addslashes($k))."'".
+ 			                   ",".
+ 			                   "'".(addslashes($v))."'".
+ 			                   ")",
+ 		                    $linkid)) {
+ 				$this->ERROR = "Can't add doc id=`$_' to doclist: ".
+ 				               mysql_error($linkid);
+ 				mysql_query("UNLOCK TABLES", $linkid);
+ 				return;
+ 			}
+ 		}
+ 
+ 		# 1
+ 		# and then add the words 
+ 		while(list($k,$v) = each($wordlist)) {
+ 			if(!mysql_query("INSERT IGNORE INTO ${idx}_wordlist (word) ".
+ 			                        "VALUES (".
+ 			                           "'".(addslashes($k))."'".
+ 			                        ")",
+ 		                    $linkid)) {
+ 				$this->ERROR = "Can't add word `$k' to wordlist: ".
+ 				               mysql_error($linkid);
+ 				mysql_query("UNLOCK TABLES", $linkid);
+ 				return;
+ 			}
+ 		}
+ 
+ 		# 2
+ 		# get the resulting word ids
+ 		$word_ids = array();
+ 		$e_wordlist = array();
+ 		reset($wordlist);
+ 		while(list($k,$v) = each($wordlist))
+ 			array_push($e_wordlist, "'".addslashes($k)."'");
+ 
+ 		if (sizeof(&$wordlist)) {
+ 			if(!($res = mysql_query("SELECT id,word FROM ${idx}_wordlist ".
+ 			                           "WHERE word IN (".
+ 			                              join(',', $e_wordlist).
+ 			                           ")",
+ 			                        $linkid))) {
+ 				$this->ERROR = "Can't get data from wordlist: ".
+ 				               mysql_error($linkid);
+ 				mysql_query('UNLOCK TABLES', $linkid);
+ 				return;
+ 			}
+ 			while($row = mysql_fetch_row($res)) {
+ #echo "row = ", Dumper($row), "<br>\n";
+ 				$word_ids[ $row[1] ] = $row[0];
+ 			}
+ 		}
+ 
+ 		# 3
+ 		# now add the vectors
+ #_debug("word_ids = ", Dumper($word_ids));
+ 		reset($wordlist);
+ 		while (list($word, $hitlist) = each($wordlist)) {
+ 			while(list($i, $hit) = each($hitlist)) {
+ #echo "adding word=$word, hit = ($hit[0], $hit[1])<br>\n";
+ 				if(!mysql_query("INSERT INTO ${idx}_vectorlist (wid,did,f)".
+ 				                  "VALUES (".
+ 				                     ("'".addslashes($word_ids[$word]))."',".
+ 				                     ("'".addslashes($hit[0]))."',".
+ 				                     ("'".addslashes($hit[1]))."')",
+ 				                $linkid)) {
+ 					$this->ERROR = "Can't add to vectorlist: ".
+ 					               mysql_error($linkid);
+ 					mysql_query('UNLOCK TABLES', $linkid);
+ 					return;
+ 				}
+ 			}
+ 		}
+ 
+ 		# if all goes well, return TRUE
+ 		mysql_query('UNLOCK TABLES', $linkid);
+ 		return 1;
+ 	}
+ 
+ 
+ 	function remove_document($doc_ids) {
+ 		if (!is_array(&$doc_ids))
+ 			die("KwIndex: syntax: remove_document(array \$doc_ids)");
+ 
+ 		if (!sizeof(&$doc_ids)) return 1;
+ 
+ 		$linkid = $this->linkid;
+ 		$idx = $this->index_name;
+ 
+ 		if(!mysql_query("LOCK TABLES ${idx}_doclist WRITE, ".
+ 		                            "${idx}_vectorlist WRITE",
+ 		                $linkid)) {
+ 			$this->ERROR = "Can't lock tables when removing documents: ".
+ 			                mysql_error($linkid);
+ 			return;
+ 		}
+ 
+ 		if(!mysql_query("DELETE FROM ${idx}_doclist WHERE id IN (".
+ 		                   join(',', $doc_ids).")",
+ 		                $linkid)) {
+ 			$this->ERROR = "Can't delete from doclist: ".
+ 			               mysql_error($linkid);
+ 			mysql_query('UNLOCK TABLES', $linkid);
+ 			return;
+ 		}
+ 
+ 		if(!mysql_query("DELETE FROM ${idx}_vectorlist WHERE did IN (".
+ 		                   join(',', $doc_ids).")",
+ 		                $linkid)) {
+ 			$this->ERROR = "Can't delete from vectorlist: ".
+ 			               mysql_error($linkid);
+ 			mysql_query('UNLOCK TABLES', $linkid);
+ 			return;
+ 		}
+ 
+ 		# if all goes well, return TRUE
+ 		mysql_query("UNLOCK TABLES", $linkid);
+ 		return 1;
+ 	}
+ 
+ 
+ 	function update_document($doc_ids) {
+ 		if (!is_array(&$doc_ids))
+ 			die("KwIndex: syntax: update_document(array \$doc_ids)");
+ 
+ 		if (!sizeof(&$doc_ids)) return 1;
+ 
+ 		return $this->remove_document(&$doc_ids) && 
+ 		       $this->add_document(&$doc_ids);
+ 	}
+ 
+ 
+ 	# find all words that are contained in at least $k % of all documents
+ 
+ 	function &common_word($k = 80) {
+ 		$linkid = $this->linkid;
+ 		$idx = $this->index_name;
+ 
+ 		# first select the number of documents
+ 		$num = $this->document_count();
+ 		if ($num == -1) {
+ 			$this->ERROR = "Can't retrieve the number of documents: ".
+ 			               mysql_error($linkid);
+ 			return;
+ 		}
+ 
+ 		# get the statistics from vectorlist
+ 		if(!($res1 = mysql_query("SELECT wid,COUNT(*)/$num as k FROM
+ 		                             ${idx}_vectorlist GROUP BY wid HAVING k>=".
+ 		                             ($k/100),
+ 		                         $linkid))) {
+ 			$this->ERROR = "Can't retrieve common words: ".
+ 			               mysql_error($linkid);
+ 			return;
+ 		}
+ 		$wids = array();
+ 		while($row = mysql_fetch_row($res1)) array_push($wids, $row[0]);
+ 
+ 		# convert it to word by consulting the wordlist table
+ 		$words = array();
+ 		if (sizeof(&$wids)) {
+ 			if (!($res2 = mysql_query("SELECT word FROM ${idx}_wordlist ".
+ 			                             "WHERE id IN (".join(',', $wids).
+ 			                              ")",
+ 			                          $linkid))) {
+ 				$this->ERROR = "Can't retrieve common words: ".
+ 				               mysql_error($linkid);
+ 				return;
+ 			}
+ 
+ 			while($row = mysql_fetch_row($res2))
+ 				array_push($words, $row[0]);
+ 		}
+ 
+ 		return $words;
+ 	}
+ 
+ 
+ 	# find all words that are not contained in all documents (vectorlist)
+ 	# XXX not yet written
+ 
+ 	function &orphan_word() {
+ 		return array();
+ 	}
+ 
+ 
+ 	# remove words from index
+ 
+ 	function remove_word($words) {
+ 		if (!is_array(&$words))
+ 			die("KwIndex: syntax: remove_word(array \$words)");
+ 
+ 		$linkid = $this->linkid;
+ 		$idx = $this->index_name;
+ 	
+ 		if(!mysql_query("LOCK TABLES ${idx}_wordlist WRITE, ".
+ 		                            "${idx}_vectorlist WRITE",
+ 		                $linkid)) {
+ 			$this->ERROR = "Can't lock tables when removing words: ".
+ 			                mysql_error($linkid);
+ 			return;
+ 		}
+ 
+ 		$e_words = array();
+ 		while(list($k,$v) = each($words))
+ 			array_push($e_words, "'".addslashes(strtolower($v))."'");
+ 
+ 		# retrieve word ids
+ 		if(!($res0 = mysql_query("SELECT id FROM ${idx}_wordlist WHERE ".
+ 		                            "word IN (".join(',', $e_words).")",
+ 		                         $linkid))) {
+ 			$this->ERROR = "Can't delete from wordlist: ".
+ 			               mysql_error($linkid);
+ 			mysql_query('UNLOCK TABLES', $linkid);
+ 			return;
+ 		}
+ 		
+ 		$word_ids = array();
+ 		while($row = mysql_fetch_row($res0))
+ 			array_push($word_ids, $row[0]);
+ 		$word_ids = join(',', $word_ids); # we'll make it a string
+ 
+ 		if (!strlen($word_ids)) return 1;
+ 	
+ 		# delete from wordlist
+ 		if(!mysql_query("DELETE FROM ${idx}_wordlist WHERE id IN ".
+ 		                   "($word_ids)",
+ 		                $linkid)) {
+ 			$this->ERROR = "Can't delete from wordlist: ".
+ 			               mysql_error($linkid);
+ 			mysql_query("UNLOCK TABLES", $linkid);
+ 			return;
+ 		}
+ 		if(!mysql_query("DELETE FROM ${idx}_vectorlist WHERE wid IN ".
+ 		                   "($word_ids)", $linkid)) {
+ 			$this->ERROR = "Can't delete from vectorlist: ".
+ 			               mysql_error($linkid);
+ 			mysql_query("UNLOCK TABLES", $linkid);
+ 			return;
+ 		}
+ 
+ 		return 1;
+ 	}
+ 
+ 	# add stop words. note: you must manually delete previously indexed
+ 	# words with delete_word()
+ 
+ 	function add_stop_word($words) {
+ 		if (!is_array(&$words))
+ 			die("KwIndex: syntax: add_stop_word(array words)");
+ 			
+ 		if (!sizeof(&$words)) return 1;
+ 		
+ 		$linkid = $this->linkid;
+ 		$idx = $this->index_name;
+ 	
+ 		while(list($k, $v) = each($words)) {
+ 			$lv = strtolower($v);
+ 			if(!mysql_query("REPLACE INTO ${idx}_stoplist (word) VALUES (".
+ 			                   ("'".addslashes($lv)."'").
+ 			                   ")", $linkid)) {
+ 				$this->ERROR = "Can't add to stoplist: ".
+ 				               mysql_error($linkid);
+ 				return;
+ 			}
+ 			$this->stoplist[ $lv ] = 1;
+ 		}
+ 
+ 		return 1;
+ 	}
+ 
+ 	# remove stop words from index
+ 
+ 	function remove_stop_word($words) {
+ 		if (!is_array(&$words))
+ 			die("KwIndex: syntax: remove_stop_word(array words)");
+ 
+ 		if (!sizeof(&$words)) return 1;
+ 		
+ 		$linkid = $this->linkid;
+ 		$idx = $this->index_name;
+ 
+ 		$e_words = array();
+ 		while(list($k,$v) = each($words))
+ 			array_push($e_words, "'".addslashes(strtolower($v))."'");
+ 		 
+ 		if(!mysql_query("DELETE FROM ${idx}_stoplist WHERE word IN (".
+ 		                   join(',', $e_words).")",
+ 		                $linkid)) {
+ 			$this->ERROR = "Can't delete from stoplist: ".
+ 			               mysql_error($linkid);
+ 			return;
+ 		}
+ 
+ 		while(list($k,$v) = each($words))
+ 			unset($this->stoplist[ strtolower($v) ]);
+ 		
+ 		return 1;
+ 	}
+ 
+ 	function is_stop_word($word) {
+ 		return isset($this->stoplist[ strtolower($word) ]);
+ 	}
+ 
+ 	function &_search_or_match_count($is_count, &$args) {
+ 		if (!isset($args["words"]))
+ 			die("KwIndex: search: option 'words' must be defined");
+ 
+ 		$linkid = $this->linkid;
+ 		$idx = $this->index_name;
+ 
+ 		# split the words if we are offered a single string/not array
+ 		# (assume it's a phrase)
+ 
+ 		$words = array();
+ 		if (is_array(&$args["words"])) {
+ 			$words = $args["words"];
+ 		} else {
+ 			$words = $this->_split_to_words($args["words"]);
+ 		}
+ 
+ 		# delete duplicate words, convert them all to lowercase
+ 		$hashwords = array();
+ 		while(list($k,$v) = each($words)) $hashwords[ strtolower($v) ] = 1;
+ 		$words = array_keys(&$hashwords);
+ 		
+ 		if (!sizeof(&$words)) {
+ 			if ($is_count) {
+ 				return 0;
+ 			} else {
+ 				return array();
+ 			}
+ 		}
+ 
+ 		# first we retrieve the word ids
+ 		$op = $args["re"] ? 'REGEXP':'LIKE';
+ 		$bool = isset($args['boolean']) && $args['boolean'] &&
+ 		        strtoupper($args['boolean']) == 'AND' ? 'AND':'OR';
+ 		
+ 		$op_phrases = array();
+ 		while(list($k,$v) = each($words))
+ 			array_push($op_phrases, "word $op '".addslashes($v)."'");
+ 		
+ 		if (!($res0 = mysql_query("SELECT id FROM ${idx}_wordlist WHERE ".
+ 		                             join(' OR ', $op_phrases),
+ 		                          $linkid))) {
+ 			$this->ERROR = "Can't retrieve word ids: ".mysql_error($linkid);
+ 			return;
+ 		}
+ 		$word_ids = array();
+ 		while($row = mysql_fetch_row($res0)) array_push($word_ids, $row[0]);
+ 		
+ 		if (!sizeof(&$word_ids) || 
+ 		    ($bool == 'AND' && sizeof(&$word_ids) < sizeof(&$words))) {
+ 			if ($is_count) {
+ 				return 0;
+ 			} else {
+ 				return array();
+ 			}
+ 		}
+ 
+ 		# and then we search the vectorlist
+ 		$can_optimize=0;
+ 		$stmt = '';
+ 
+ 		if ($is_count) {
+ 
+ 			if ($bool == 'AND' && !$args['re']) {
+ 				$stmt = 'SELECT did,count(wid) as c '.
+ 			    	    "FROM ${idx}_vectorlist WHERE wid IN (".
+ 				           join(',',$word_ids).
+ 				         ") ".
+ 				        "GROUP BY did ".
+ 				        "HAVING c >= ".sizeof(&$word_ids);
+ 			} else {
+ 				$can_optimize=1;
+ 				$stmt = "SELECT COUNT(DISTINCT did) ".
+ 				        "FROM ${idx}_vectorlist WHERE wid IN (".
+ 				           join(',',$word_ids).
+ 				        ")";
+ 			}
+ 
+ 		} else { // ! $is_count
+ 
+ 			$stmt = "SELECT did, count(wid) as c, avg(f) as a, ".
+ 			               "count(wid)*count(wid)*count(wid)*avg(f) as ca ".
+ 
+ 			        "FROM ${idx}_vectorlist WHERE wid IN (".
+ 			            join(',',$word_ids).
+ 			        ") ".
+ 
+ 			        "GROUP BY did ".
+ 			        ($bool == 'AND' && !$args['re'] ? 
+ 			        "HAVING c >= ".sizeof(&$word_ids):'').
+ 			        " ORDER BY ca DESC ".
+ 			        (isset($args['num']) ? "LIMIT " . (isset($args['start']) ?
+ 			        (($args['start'] - 1).",".$args['num']) : $args['num'])
+ 			        :'');
+ 
+ 		}
+ 
+ _debug("search SQL: ", $stmt);
+ 
+ 		if(!($res = mysql_query($stmt, $linkid))) {
+ 			$this->ERROR = "Can't search vectorlist: ".mysql_error($linkid);
+ 			return;
+ 		}
+ 
+ 		if ($is_count) {
+ 
+ 			if ($can_optimize) {
+ 				$row = mysql_fetch_row($res);
+ 				return $row[0];
+ 			} else {
+ 				return mysql_num_rows($res);
+ 			}
+ 	
+ 		} else { // ! $is_count
+ 
+ 			$doc_ids = array();
+ 			while($row = mysql_fetch_row($res)) array_push($doc_ids, $row[0]);
+ 			return $doc_ids;
+ 		}
+ 	}
+ 
+ 	function &search($args) {
+ 		return $this->_search_or_match_count(0, &$args);
+ 	}
+ 
+ 	function &match_count($args) {
+ 		return $this->_search_or_match_count(1, &$args);
+ 	}
+ 
+ 	function remove_index() {
+ 		$linkid = $this->linkid;
+     	$idx = $this->index_name;
+ 
+ 		if(!mysql_query("DROP TABLE IF EXISTS ${idx}_wordlist", $linkid)) {
+ 			$this->ERROR = "Can't remove table ${idx}_wordlist: ".
+ 			               mysql_error($linkid);
+ 			return;
+ 		}
+ 		if(!mysql_query("DROP TABLE IF EXISTS ${idx}_doclist", $linkid)) {
+ 			$this->ERROR = "Can't remove table ${idx}_doclist: ".
+ 			               mysql_error($linkid);
+ 			return;
+ 		}
+ 		if(!mysql_query("DROP TABLE IF EXISTS ${idx}_vectorlist", $linkid)) {
+ 			$this->ERROR = "Can't remove table ${idx}_vectorlist: ".
+ 			               mysql_error($linkid);
+ 			return;
+ 		}
+ 		if(!mysql_query("DROP TABLE IF EXISTS ${idx}_stoplist", $linkid)) {
+ 			$this->ERROR = "Can't remove table ${idx}_stoplist: ".
+ 			               mysql_error($linkid);
+ 			return;
+ 		}
+ 		
+ 		return 1;
+ 	}
+ 
+ 	function empty_index() {
+ 		return $this->remove_index() && $this->_create_index();
+ 	}
+ 
+ 	# number of documents in the collection
+ 	function document_count() {
+ 		$linkid = $this->linkid;
+     	$idx = $this->index_name;
+ 	    
+    		if (!($res = mysql_query("SELECT COUNT(*) FROM ${idx}_doclist", 
+    		                         $linkid))) return;
+    		$row = mysql_fetch_row($res);
+    		return $row[0];
+ 	}
+ 
+ 	# number of unique words 
+ 	function word_count() {
+ 		$linkid = $this->linkid;
+ 		$idx = $this->index_name;
+ 	    
+ 		if (!($res = mysql_query("SELECT COUNT(*) FROM ${idx}_wordlist", 
+ 		                         $linkid))) return;
+ 		$row = mysql_fetch_row($res);
+ 		return $row[0];
+ 	}
+ 
+ 
+ 	# PRIVATE METHODS
+ 	#################
+ 
+ 	function &_split_to_words($str) {
+ 		preg_match_all("/\b(\w[\w']*\w+|\w+)\b/", $str, $matches);
+ 		return $matches[1];
+ 	}
+ 
+ 	function _create_index() {
+ 		$linkid = $this->linkid;
+     	$idx = $this->index_name;
+ 
+ 		$stmt = '';
+ 
+ 		# drop previous tables, if they exist
+ 		if (!$this->remove_index()) return;
+ 
+ 		# create doclist table
+ 		$stmt = "CREATE TABLE ${idx}_doclist " . 
+ 		        '(id ' . $this->_int_column_type($this->doclist_cardinality).
+ 		        ' AUTO_INCREMENT PRIMARY KEY, ' .
+ 		        ' n ' . $this->_int_column_type($this->wordlist_cardinality).
+ 		        ' NOT NULL'.
+ 		        ')';
+ 		if (!mysql_query($stmt, $linkid))
+ 			die("KwIndex: Can't create table ${idx}_doclist: ".
+ 			    mysql_error($linkid));
+ 		
+ 		# create wordlist table
+ 		$stmt = "CREATE TABLE ${idx}_wordlist " . 
+ 		        '(id ' . $this->_int_column_type($this->wordlist_cardinality) .
+ 		        ' AUTO_INCREMENT PRIMARY KEY, ' .
+ 		        " word VARCHAR($this->max_word_length)" .
+ 		        ' BINARY NOT NULL, ' .
+ 		        "UNIQUE (word) " .
+ 		        ')';
+ 		if(!mysql_query($stmt, $linkid))
+ 			die("KwIndex: Can't create table ${idx}_wordlist: ".
+ 			    mysql_error($linkid));
+ 
+ 		# create stoplist table
+ 		$stmt = "CREATE TABLE ${idx}_stoplist " .
+ 		        '(id ' . $this->_int_column_type($this->wordlist_cardinality).
+ 		        ' AUTO_INCREMENT PRIMARY KEY, ' .
+ 		        " word VARCHAR($this->max_word_length)" .
+ 		        ' BINARY NOT NULL, ' .
+ 		        "UNIQUE (word) " .
+ 		        ')';
+ 		if (!mysql_query($stmt, $linkid)) 
+ 			die("KwIndex: Can't create table ${idx}_stoplist: ".
+ 			    mysql_error($linkid));
+ 
+ 		# create vectorlist table
+ 		$stmt = "CREATE TABLE ${idx}_vectorlist " .
+ 		        '(wid '. $this->_int_column_type($this->wordlist_cardinality). 
+ 		        ' NOT NULL, ' .
+ 		        'did '. $this->_int_column_type($this->doclist_cardinality). 
+ 		        ' NOT NULL, '.
+ 		        'UNIQUE (wid,did), '.
+ 		        'f FLOAT(10,4) NOT NULL'.
+ 		        ')';
+ 		if (!mysql_query($stmt, $linkid)) {
+ 			die("KwIndex: Can't create table ${idx}_stoplist: ".
+ 			    mysql_error($linkid));
+     	}
+     	
+ 		$this->stoplist = array();
+ 
+ 		return 1;
+ 	}
+ 
+ 	function _int_column_type($cardinality) {
+ 		if ($cardinality >= 16*1024*1024) return 'INT UNSIGNED';
+ 		if ($cardinality >= 64*1024) return 'MEDIUMINT UNSIGNED';
+ 		if ($cardinality >= 256) return 'SMALLINT UNSIGNED';
+ 		return 'TINYINT UNSIGNED';
+ 	}
+ 
+ 	function &_index_tables() {
+ 		$idx = $this->index_name;
+ 
+ 		$tables = array(
+ 			"${idx}_doclist",
+ 			"${idx}_wordlist",
+ 			"${idx}_vectorlist",
+ 			"${idx}_stoplist");
+ 
+ 		return $tables;
+ 	}
+ 
+ 	function _index_exists() {
+ 		$linkid = $this->linkid;
+     	$idx = $this->index_name;
+ 
+ 		if (!($res = mysql_list_tables($this->db_name, $linkid)))
+ 			die("Can't list table: ".mysql_error($linkid));
+ 		
+ 		$existing_tables = array();
+ 		$i = 0;
+ 		while ($i < mysql_num_rows($res)) {
+ 			$existing_tables[ mysql_tablename($res, $i) ] = 1;
+ 			$i++;
+ 		}
+ 
+ 		$index_tables = $this->_index_tables();
+ 		while(list($k,$v) = each($index_tables)) {
+ 			if (!isset($existing_tables[$v])) return 0;
+ 		}
+ 		
+ 		return 1;
+ 	}
+ 
+ } // class
+ 
+ */
+ 
  //
  // Massive overhaul for phpBB2, originally based on search code
***************
*** 280,283 ****
--- 1082,1094 ----
  // Define initial vars
  //
+ if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
+ {
+ 	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+ }
+ else
+ {
+ 	$mode = "";
+ }
+ 
  if( isset($HTTP_POST_VARS['search_keywords']) || isset($HTTP_GET_VARS['search_keywords']) )
  {
***************
*** 650,654 ****
  		else
  		{
! 			header("Location: " . append_sid("search.$phpEx"));
  		}
  	}
--- 1461,1465 ----
  		else
  		{
! 			header("Location: " . append_sid("search.$phpEx", true));
  		}
  	}

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -r1.119 -r1.120
*** viewtopic.php	2001/10/14 15:49:52	1.119
--- viewtopic.php	2001/10/14 18:22:32	1.120
***************
*** 80,89 ****
  			{
  				$post_id = $row['post_id'];
! 				header("Location: viewtopic.$phpEx?" . POST_POST_URL . "=$post_id#$post_id");
  			}
  		}
  		else
  		{
! 			header("Location: viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
  		}
  	}
--- 80,89 ----
  			{
  				$post_id = $row['post_id'];
! 				header("Location: " . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id#$post_id", true));
  			}
  		}
  		else
  		{
! 			header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
  		}
  	}
***************
*** 298,302 ****
  		if( $HTTP_GET_VARS['unwatch'] == "topic" )
  		{
! 			header("Location: " . append_sid("login.$phpEx?forward_page=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic"));
  		}
  	}
--- 298,302 ----
  		if( $HTTP_GET_VARS['unwatch'] == "topic" )
  		{
! 			header("Location: " . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true));
  		}
  	}

[Phpbb-checkins] CVS: phpBB2/templates/subSilver login_body.tpl,1.3,1.4 index_body.tpl,1.4,1.5

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv28423/templates/subSilver

Modified Files:
	login_body.tpl index_body.tpl 
Log Message:
Various changes to location redirection ... please note the format and name changes

Index: login_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/login_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** login_body.tpl	2001/10/14 16:11:36	1.3
--- login_body.tpl	2001/10/14 18:22:32	1.4
***************
*** 35,43 ****
  		  </tr>
  		  <tr align="center"> 
! 			<td colspan="2"> 
! 			  <input type="hidden" name="forward_page" value="{FORWARD_PAGE}" />
! 			  <input type="hidden" name="login" value="login" />
! 			  <input type="submit" name="submit" class="mainoption" value="{L_LOGIN}" />
! 			</td>
  		  </tr>
  		  <tr align="center"> 
--- 35,39 ----
  		  </tr>
  		  <tr align="center"> 
! 			<td colspan="2">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="mainoption" value="{L_LOGIN}" /></td>
  		  </tr>
  		  <tr align="center"> 

Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/index_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** index_body.tpl	2001/10/09 13:37:21	1.4
--- index_body.tpl	2001/10/14 18:22:32	1.5
***************
*** 56,60 ****
    </tr>
  </table>
! <!-- BEGIN loginbox -->
  <form method="post" action="{S_LOGIN_ACTION}">
    <table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
--- 56,61 ----
    </tr>
  </table>
! 
! <!-- BEGIN user_logged_out -->
  <form method="post" action="{S_LOGIN_ACTION}">
    <table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
***************
*** 70,80 ****
  		<input class="text" type="checkbox" name="autologin" />
  		&nbsp;&nbsp;&nbsp; 
! 		<input type="submit" class="mainoption" name="submit" value="{L_LOGIN}" />
  		</span> </td>
  	</tr>
    </table>
  </form>
  
- 		<!-- END loginbox -->
  <br />&nbsp;
  <table cellspacing="3" border="0" align="center" cellpadding="0">
--- 71,81 ----
  		<input class="text" type="checkbox" name="autologin" />
  		&nbsp;&nbsp;&nbsp; 
! 		<input type="submit" class="mainoption" name="login" value="{L_LOGIN}" />
  		</span> </td>
  	</tr>
    </table>
  </form>
+ <!-- END user_logged_out -->
  
  <br />&nbsp;
  <table cellspacing="3" border="0" align="center" cellpadding="0">

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.33,1.34

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv28423/includes

Modified Files:
	sessions.php 
Log Message:
Various changes to location redirection ... please note the format and name changes

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** sessions.php	2001/10/14 15:48:18	1.33
--- sessions.php	2001/10/14 18:22:32	1.34
***************
*** 417,421 ****
  // code you must include this routine, even if it's empty.
  //
! function append_sid($url)
  {
  	global $SID;
--- 417,421 ----
  // code you must include this routine, even if it's empty.
  //
! function append_sid($url, $non_html_amp = false)
  {
  	global $SID;
***************
*** 423,428 ****
  	if(!empty($SID) && !eregi("sid=", $url))
  	{
! //		$url = ereg_replace("[&?]+$", "", $url);
! 		$url .= ( (strpos($url, "?") != false) ?  "&" : "?" ) . $SID;
  	}
  
--- 423,427 ----
  	if(!empty($SID) && !eregi("sid=", $url))
  	{
! 		$url .= ( (strpos($url, "?") != false) ?  ( ( $non_html_amp ) ? "&" : "&" ) : "?" ) . $SID;
  	}
  

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.53,1.54

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv27811/includes

Modified Files:
	page_header.php 
Log Message:
Changed logged in block to a logged in and logged out block

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** page_header.php	2001/09/08 18:24:34	1.53
--- page_header.php	2001/10/14 18:20:40	1.54
***************
*** 66,70 ****
  if($userdata['session_logged_in'])
  {
! 	$u_login_logout = "login.$phpEx?submit=logout";
  	$l_login_logout = $lang['Logout'] . " : " . $userdata["username"] . "";
  }
--- 66,70 ----
  if($userdata['session_logged_in'])
  {
! 	$u_login_logout = "login.$phpEx?logout=true";
  	$l_login_logout = $lang['Logout'] . " : " . $userdata["username"] . "";
  }
***************
*** 97,105 ****
  $guests_online = 0;
  
! while($row = $db->sql_fetchrow($result))
  {
! 	if($row['session_logged_in'])
  	{
! 		if($row['user_allow_viewonline'])
  		{
  			$userlist_ary[] = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
--- 97,105 ----
  $guests_online = 0;
  
! while( $row = $db->sql_fetchrow($result) )
  {
! 	if( $row['session_logged_in'] )
  	{
! 		if( $row['user_allow_viewonline'] )
  		{
  			$userlist_ary[] = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
***************
*** 145,165 ****
  // if user is logged in
  //
! if($userdata['session_logged_in'])
  {
  	$sql = "SELECT COUNT(privmsgs_type) AS new_messages
  		FROM " . PRIVMSGS_TABLE . "
! 		WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
  			AND privmsgs_to_userid = " . $userdata['user_id'];
! 	$result_pm = $db->sql_query($sql);
! 	if(!$result_pm)
  	{
  		message_die(GENERAL_MESSAGE, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
  	}
! 	if($pm_result = $db->sql_fetchrow($result_pm))
  	{
! 		$new_messages = $pm_result['new_messages'];
  
! 		$l_message_new = ($new_messages == 1) ? $lang['message'] : $lang['messages'];
! 		$l_privmsgs_text = $lang['You_have'] . " $new_messages " . $lang['new'] . " $l_message_new";
  	}
  	else
--- 145,165 ----
  // if user is logged in
  //
! if( $userdata['session_logged_in'] )
  {
  	$sql = "SELECT COUNT(privmsgs_type) AS new_messages
  		FROM " . PRIVMSGS_TABLE . "
! 		WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
  			AND privmsgs_to_userid = " . $userdata['user_id'];
! 	if( !$result_pm = $db->sql_query($sql) )
  	{
  		message_die(GENERAL_MESSAGE, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
  	}
! 
! 	if( $pm_result = $db->sql_fetchrow($result_pm) )
  	{
! 		$new_pm_messages = $pm_result['new_messages'];
  
! 		$l_message_new = ( $new_pm_messages == 1 ) ? $lang['message'] : $lang['messages'];
! 		$l_privmsgs_text = $lang['You_have'] . " $new_pm_messages " . $lang['new'] . " $l_message_new";
  	}
  	else
***************
*** 181,188 ****
  	"SITENAME" => $board_config['sitename'],
  	"PAGE_TITLE" => $page_title,
- 	"META_INFO" => $meta_tags,
  	"TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s ". $lang['and'] . " $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'],
  	"LOGGED_IN_USER_LIST" => $online_userlist,
  	"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
  	"LAST_VISIT_DATE" => $s_last_visit,
  
--- 181,188 ----
  	"SITENAME" => $board_config['sitename'],
  	"PAGE_TITLE" => $page_title,
  	"TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s ". $lang['and'] . " $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'],
  	"LOGGED_IN_USER_LIST" => $online_userlist,
  	"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
+ 	"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session, 
  	"LAST_VISIT_DATE" => $s_last_visit,
  
***************
*** 236,240 ****
  	"S_TIMEZONE" => $lang['All_times'] . " " . $lang[$board_config['board_timezone']],
  	"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
- 	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"),
  	"S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
  
--- 236,239 ----
***************
*** 282,288 ****
  // Login box?
  //
! if(!$userdata['session_logged_in'])
  {
! 	$template->assign_block_vars("loginbox", array());
  }
  
--- 281,291 ----
  // Login box?
  //
! if( !$userdata['session_logged_in'] )
! {
! 	$template->assign_block_vars("user_logged_out", array());
! }
! else
  {
! 	$template->assign_block_vars("user_logged_in", array());
  }
  

[Phpbb-checkins] CVS: phpBB2 profile.php,1.117,1.118

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv26155

Modified Files:
	profile.php 
Log Message:
Lang var incorrect for PM

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -r1.117 -r1.118
*** profile.php	2001/10/14 16:30:41	1.117
--- profile.php	2001/10/14 16:36:29	1.118
***************
*** 392,396 ****
  			"L_EMAIL_ADDRESS" => $lang['Email_address'],
  			"L_EMAIL" => $lang['Email'],
! 			"L_SEND_PM" => $lang['Send_private_message'],
  			"L_ICQ_NUMBER" => $lang['ICQ'],
  			"L_YAHOO" => $lang['YIM'],
--- 392,396 ----
  			"L_EMAIL_ADDRESS" => $lang['Email_address'],
  			"L_EMAIL" => $lang['Email'],
! 			"L_PM" => $lang['Private_Message'],
  			"L_ICQ_NUMBER" => $lang['ICQ'],
  			"L_YAHOO" => $lang['YIM'],

[Phpbb-checkins] CVS: phpBB2 profile.php,1.116,1.117

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv24118

Modified Files:
	profile.php 
Log Message:
Fixed bug #471044 and problem with coppa support upon registration when using avatar gallery

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -r1.116 -r1.117
*** profile.php	2001/10/11 22:22:28	1.116
--- profile.php	2001/10/14 16:30:41	1.117
***************
*** 202,206 ****
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  		}
! 		$profiledata = get_userdata_from_id($HTTP_GET_VARS[POST_USERS_URL]);
  
  		$sql = "SELECT *
--- 202,206 ----
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  		}
! 		$profiledata = get_userdata_from_id(intval($HTTP_GET_VARS[POST_USERS_URL]));
  
  		$sql = "SELECT *
***************
*** 348,352 ****
  		$msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "&nbsp;";
  
! 		$yim_img = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&amp;.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "&nbsp;";
  
  		$search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
--- 348,352 ----
  		$msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "&nbsp;";
  
! 		$yim_img = ( $profiledata['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&amp;.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "&nbsp;";
  
  		$search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
***************
*** 392,396 ****
  			"L_EMAIL_ADDRESS" => $lang['Email_address'],
  			"L_EMAIL" => $lang['Email'],
! 			"L_PM" => $lang['Private_message'],
  			"L_ICQ_NUMBER" => $lang['ICQ'],
  			"L_YAHOO" => $lang['YIM'],
--- 392,396 ----
  			"L_EMAIL_ADDRESS" => $lang['Email_address'],
  			"L_EMAIL" => $lang['Email'],
! 			"L_SEND_PM" => $lang['Send_private_message'],
  			"L_ICQ_NUMBER" => $lang['ICQ'],
  			"L_YAHOO" => $lang['YIM'],
***************
*** 466,470 ****
  			if( $mode == "editprofile" )
  			{
! 				$user_id = $HTTP_POST_VARS['user_id'];
  				$current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email'])));
  			}
--- 466,470 ----
  			if( $mode == "editprofile" )
  			{
! 				$user_id = intval($HTTP_POST_VARS['user_id']);
  				$current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email'])));
  			}
***************
*** 1328,1333 ****
  				}
  
! 				$s_hidden_fields = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
! 				$s_hidden_vars = '<input type="hidden" name="user_id" value="' . $user_id . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="username" value="' . addslashes($username) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="email" value="' . addslashes($email) . '" />';
--- 1328,1335 ----
  				}
  
! 				$coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == "register") ? 0 : TRUE;
! 
! 				$s_hidden_vars = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="user_id" value="' . $user_id . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="username" value="' . addslashes($username) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="email" value="' . addslashes($email) . '" />';

[Phpbb-checkins] CVS: phpBB2/templates/subSilver profile_view_body.tpl,1.3,1.4

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv24118/templates/subSilver

Modified Files:
	profile_view_body.tpl 
Log Message:
Fixed bug #471044 and problem with coppa support upon registration when using avatar gallery

Index: profile_view_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/profile_view_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** profile_view_body.tpl	2001/10/09 13:37:21	1.3
--- profile_view_body.tpl	2001/10/14 16:30:41	1.4
***************
*** 64,80 ****
  		</tr>
  		<tr> 
! 		  <td valign="middle" align="right"><span class="gen">{L_MESSENGER}:</span></td>
  		  <td class="row1" valign="middle"><span class="gen">{MSN_IMG}</span></td>
  		</tr>
  		<tr> 
! 		  <td valign="middle" align="right"><span class="gen">{L_YAHOO}:</span></td>
  		  <td class="row1" valign="middle"><span class="gen">{YIM_IMG}</span></td>
  		</tr>
  		<tr> 
! 		  <td valign="middle" align="right"><span class="gen">{L_AIM}:</span></td>
  		  <td class="row1" valign="middle"><span class="gen">{AIM_IMG}</span></td>
  		</tr>
  		<tr> 
! 		  <td valign="middle" align="right"><span class="gen">{L_ICQ_NUMBER}:</span></td>
  		  <td class="row1" valign="middle"><span class="gen">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</span></td>
  		</tr>
--- 64,80 ----
  		</tr>
  		<tr> 
! 		  <td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_MESSENGER}:</span></td>
  		  <td class="row1" valign="middle"><span class="gen">{MSN_IMG}</span></td>
  		</tr>
  		<tr> 
! 		  <td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_YAHOO}:</span></td>
  		  <td class="row1" valign="middle"><span class="gen">{YIM_IMG}</span></td>
  		</tr>
  		<tr> 
! 		  <td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_AIM}:</span></td>
  		  <td class="row1" valign="middle"><span class="gen">{AIM_IMG}</span></td>
  		</tr>
  		<tr> 
! 		  <td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_ICQ_NUMBER}:</span></td>
  		  <td class="row1" valign="middle"><span class="gen">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</span></td>
  		</tr>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver login_body.tpl,1.2,1.3

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv19324/templates/subSilver

Modified Files:
	login_body.tpl 
Log Message:
Fixes that little login bug.


Index: login_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/login_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** login_body.tpl	2001/10/01 23:22:18	1.2
--- login_body.tpl	2001/10/14 16:11:36	1.3
***************
*** 37,40 ****
--- 37,41 ----
  			<td colspan="2"> 
  			  <input type="hidden" name="forward_page" value="{FORWARD_PAGE}" />
+ 			  <input type="hidden" name="login" value="login" />
  			  <input type="submit" name="submit" class="mainoption" value="{L_LOGIN}" />
  			</td>

[Phpbb-checkins] CVS: phpBB2/templates/PSO login_body.tpl,1.4,1.5

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/PSO
In directory usw-pr-cvs1:/tmp/cvs-serv19324/templates/PSO

Modified Files:
	login_body.tpl 
Log Message:
Fixes that little login bug.


Index: login_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/login_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** login_body.tpl	2001/05/31 20:27:34	1.4
--- login_body.tpl	2001/10/14 16:11:36	1.5
***************
*** 23,27 ****
  					</tr>
  					<tr>
! 						<td align="center"><input type="hidden" name="forward_page" value="{FORWARD_PAGE}"><input type="submit" name="submit" value="{L_LOGIN}"></td>
  					</tr>
  					<tr>
--- 23,27 ----
  					</tr>
  					<tr>
! 						<td align="center"><input type="hidden" name="login" value="login"><input type="hidden" name="forward_page" value="{FORWARD_PAGE}"><input type="submit" name="submit" value="{L_LOGIN}"></td>
  					</tr>
  					<tr>
***************
*** 36,38 ****
  <div align="center"><table align="center" border="0" width="60%">
  		<td align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
! </table>
\ No newline at end of file
--- 36,38 ----
  <div align="center"><table align="center" border="0" width="60%">
  		<td align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
! </table>

[Phpbb-checkins] CVS: phpBB2 config.php,1.32,1.33

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv19324

Modified Files:
	config.php 
Log Message:
Fixes that little login bug.


Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** config.php	2001/10/09 23:28:31	1.32
--- config.php	2001/10/14 16:11:36	1.33
***************
*** 0 ****
--- 1,19 ----
+ <?php
+ 
+ //
+ // phpBB 2.x auto-generated config file
+ // Do not change anything in this file!
+ //
+ 
+ $dbms = "mysql";
+ 
+ $dbhost = "127.0.0.1";
+ $dbname = "devphpbb2";
+ $dbuser = "dougk";
+ $dbpasswd = "2d8o0u7g026";
+ 
+ $table_prefix = "phpbb_";
+ 
+ define('PHPBB_INSTALLED', true);
+ 
+ ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin board_config_body.tpl,NONE,1.1 forum_admin_body.tpl,NONE,1.1 admin_message_body.tpl,1.2,1.3 auth_forum_body.tpl,1.2,1.3 auth_select_body.tpl,1.2,1.3 auth_ug_body.tpl,1.2,1.3 db_utils_backup_body.tpl,1.2,1.3 db_utils_restore_body.tpl,1.2,1.3 forum_delete_body.tpl,1.2,1.3 forum_edit_body.tpl,1.2,1.3 forum_prune_body.tpl,1.2,1.3 forum_prune_result_body.tpl,1.2,1.3 forum_prune_select_body.tpl,1.2,1.3 forums_body.tpl,1.2,1.3 group_edit_body.tpl,1.3,1.4 group_select_body.tpl,1.2,1.3 index_body.tpl,1.2,1.3 index_frameset.tpl,1.1,1.2 index_navigate.tpl,1.2,1.3 page_footer.tpl,1.2,1.3 page_header.tpl,1.2,1.3 ranks_edit_body.tpl,1.1,1.2 ranks_list_body.tpl,1.1,1.2 smile_edit_body.tpl,1.1,1.2 smile_list_body.tpl,1.2,1.3 user_ban_body.tpl,1.2,1.3 user_edit_body.tpl,1.2,1.3 user_email.tpl,1.2,1.3 user_select_body.tpl,1.2,1.3 user_unban_body.tpl,1.2,1.3 words_edit_body.tpl,1.2,1.3 words_list_body.tpl,1.2,1.3

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv16274

Modified Files:
	admin_message_body.tpl auth_forum_body.tpl 
	auth_select_body.tpl auth_ug_body.tpl db_utils_backup_body.tpl 
	db_utils_restore_body.tpl forum_delete_body.tpl 
	forum_edit_body.tpl forum_prune_body.tpl 
	forum_prune_result_body.tpl forum_prune_select_body.tpl 
	forums_body.tpl group_edit_body.tpl group_select_body.tpl 
	index_body.tpl index_frameset.tpl index_navigate.tpl 
	page_footer.tpl page_header.tpl ranks_edit_body.tpl 
	ranks_list_body.tpl smile_edit_body.tpl smile_list_body.tpl 
	user_ban_body.tpl user_edit_body.tpl user_email.tpl 
	user_select_body.tpl user_unban_body.tpl words_edit_body.tpl 
	words_list_body.tpl 
Added Files:
	board_config_body.tpl forum_admin_body.tpl 
Log Message:
Various updates to bring style in-line with main board ... Tom, feel free to do whatever else is necessary

--- NEW FILE ---

<h1>{L_CONFIGURATION_TITLE}</h1>

<p>{L_CONFIGURATION_EXPLAIN}</p>

<form action="{S_CONFIG_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline">
	<tr>
	  <th class="thHead" colspan="2">{L_GENERAL_SETTINGS}</th>
	</tr>
	<tr>
		<td class="row1">{L_SITE_NAME}:</td>
		<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
	</tr>
	<tr>
		<td class="row1">{L_ACCT_ACTIVATION}:</td>
		<td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td>
	</tr>
	<tr>
		<td class="row1">Flood Interval: <br /><span class="gensmall">Number of seconds a user must wait between posts</span></td>
		<td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td>
	</tr>
	<tr>
		<td class="row1">Topics Per Page</td>
		<td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td>
	</tr>
	<tr>
		<td class="row1">Posts Per Page</td>
		<td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td>
	</tr>
	<tr>
		<td class="row1">Hot Threshold</td>
		<td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}"></td>
	</tr>
	<tr>
		<td class="row1">Default Style:</td>
		<td class="row2">{STYLE_SELECT}</td>
	</tr>
	<tr>
		<td class="row1">Override user style:<br /><span class="gensmall">Replaces users style with the default</span></td>
		<td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Default Language:</td>
		<td class="row2">{LANG_SELECT}</td>
	</tr>
	<tr>
		<td class="row1">Date Format:<br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
		<td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}"></td>
	</tr>
	<tr>
		<td class="row1">System Timezone:</td>
		<td class="row2">{TIMEZONE_SELECT}</td>
	</tr>
	<tr>
		<td class="row1">Enable GZip Compression:</td>
		<td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="gzip_compress" value="0" {GZIP_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Enable Forum Pruning:</td>
		<td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="prune_enable" value="0" {PRUNE_NO}> {L_NO}</td>
	</tr>
	<tr>
	  <th class="thHead" colspan="2">User/Forum Ability Settings</th>
	</tr>
	<tr>
		<td class="row1">Allow HTML</td>
		<td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Allowed HTML tags<br /><span class="gensmall">Seperate tags with commas</span></td>
		<td class="row2"><input type="text" size="30" maxlength="255" name="allow_html_tags" value="{HTML_TAGS}"></td>
	</tr>
	<tr>
		<td class="row1">Allow BBCode</td>
		<td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Allow Smilies</td>
		<td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_smilies" value="0" {SMILE_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Smilies Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td>
		<td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}"></td>
	</tr>
	<tr>
		<td class="row1">Allow Signatures</td>
		<td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_sig" value="0" {SIG_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Maximum signature length<br /><span class="gensmall">Number of characters allowed</span></td>
		<td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}"></td>
	</tr>
	<tr>
		<td class="row1">Allow Name Change</td>
		<td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> {L_NO}</td>
	</tr>
	<tr>
	  <th class="thHead" colspan="2">Avatar Settings</th>
	</tr>
	<tr>
		<td class="row1">Allow local gallery avatars</td>
		<td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Allow remote avatars <br /><span class="gensmall">Avatars linked from another website</span></td>
		<td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Allow avatar uploading</td>
		<td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO}> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">Max. Avatar File Size<br /><span class="gensmall">For uploaded avatar files</span></td>
		<td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td>
	</tr>
	<tr>
		<td class="row1">Max. Avatar Size <br />
			<span class="gensmall">(height x width)</span>
		</td>
		<td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td>
	</tr>
	<tr>
		<td class="row1">Avatar Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td>
		<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}" /></td>
	</tr>
	<tr>
		<td class="row1">Avatar Gallery Path <br /><span class="gensmall">Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery</span></td>
		<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_gallery_path" value="{AVATAR_GALLERY_PATH}" /></td>
	</tr>
	<tr>
	  <th class="thHead" colspan="2">Email Settings</th>
	</tr>
	<tr>
		<td class="row1">Admin Email Address</td>
		<td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}" /></td>
	</tr>
	<tr>
		<td class="row1">Email Signature<br /><span class="gensmall">This text will be attached to all emails the board sends</span></td>
		<td class="row2"><textarea name="board_email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td>
	</tr>
	<tr>
		<td class="row1">Use SMTP for delivery<br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td>
		<td class="row2"><input type="radio" name="smtp_delivery" value="1" {SMTP_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="smtp_delivery" value="0" {SMTP_NO} /> {L_NO}</td>
	</tr>
	<tr>
		<td class="row1">SMTP Server</td>
		<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50" /></td>
	</tr>
	<tr>
		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings" class="mainoption" />
		</td>
	</tr>
</table></form>

<br clear="all">

--- NEW FILE ---

<h1>{L_FORUM_TITLE}</h1>

<p>{L_FORUM_EXPLAIN}</p>

<form method="post" action="{S_FORUM_ACTION}"><table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
	<tr>
		<th class="thHead" colspan="7">{L_FORUM_TITLE}</th>
	</tr>
	<!-- BEGIN catrow -->
	<tr>
		<td class="cat" colspan="3"><span class="cattitle"><b><a href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></b></span></td>
		<td class="cat" align="center" valign="middle"><span class="gen"><a href="{catrow.U_CAT_EDIT}">{L_EDIT}</a></span></td>
		<td class="cat" align="center" valign="middle"><span class="gen"><a href="{catrow.U_CAT_DELETE}">{L_DELETE}</a></span></td>
		<td class="cat" align="center" valign="middle" nowrap="nowrap"><span class="gen"><a href="{catrow.U_CAT_MOVE_UP}">{L_MOVE_UP}</a> <a href="{catrow.U_CAT_MOVE_DOWN}">{L_MOVE_DOWN}</a></span></td>
		<td class="cat" align="center" valign="middle"><span class="gen">&nbsp</span></td>
	</tr>
	<!-- BEGIN forumrow -->
	<tr> 
		<td class="row2"><span class="gen"><a href="{catrow.forumrow.U_VIEWFORUM}" target="_new">{catrow.forumrow.FORUM_NAME}</a></span><br /><span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td>
		<td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_TOPICS}</span></td>
		<td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_POSTS}</span></td>
		<td class="row1" align="center" valign="middle"><span class="gen"><a href="{catrow.forumrow.U_FORUM_EDIT}">{L_EDIT}</a></span></td>
		<td class="row2" align="center" valign="middle"><span class="gen"><a href="{catrow.forumrow.U_FORUM_DELETE}">{L_DELETE}</a></span></td>
		<td class="row1" align="center" valign="middle"><span class="gen"><a href="{catrow.forumrow.U_FORUM_MOVE_UP}">{L_MOVE_UP}</a> <br /> <a href="{catrow.forumrow.U_FORUM_MOVE_DOWN}">{L_MOVE_DOWN}</a></span></td>
		<td class="row2" align="center" valign="middle"><span class="gen"><a href="{catrow.forumrow.U_FORUM_RESYNC}">{L_RESYNC}</a></span></td>
	</tr>
	<!-- END forumrow -->
	<tr>
		<td colspan="7" class="row2"><input type="text" name="{catrow.S_ADD_FORUM_NAME}" /> <input type="submit" class="liteoption"  name="{catrow.S_ADD_FORUM_SUBMIT}" value="{L_CREATE_FORUM}" /></td>
	</tr>
	<tr>
		<td colspan="7" height="1" class="spaceRow"><img src="../templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td>
	</tr>
	<!-- END catrow -->
	<tr>
		<td colspan="7" class="cat"><input type="text" name="categoryname" /> <input type="submit" class="liteoption"  name="addcategory" value="{L_CREATE_CATEGORY}" /></td>
	</tr>
</table></form>

Index: admin_message_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/admin_message_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_message_body.tpl	2001/10/09 13:37:48	1.2
--- admin_message_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 3,13 ****
  
  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
! 			<tr>
! 				<th class="thHead" align="center">{MESSAGE_TITLE}</th>
! 			</tr>
! 			<tr>
! 				<td class="row1" width="100%" align="center"><span class="gen">{MESSAGE_TEXT}</span></td>
! 			</tr>
! 		</table>
  
  <br />
--- 3,13 ----
  
  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
! 	<tr>
! 		<th class="thHead" align="center">{MESSAGE_TITLE}</th>
! 	</tr>
! 	<tr>
! 		<td class="row1" width="100%" align="center"><span class="gen">{MESSAGE_TEXT}</span></td>
! 	</tr>
! </table>
  
  <br />

Index: auth_forum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/auth_forum_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** auth_forum_body.tpl	2001/10/09 13:37:48	1.2
--- auth_forum_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
  
- <br />
- 
  <h1>{L_AUTH_TITLE}</h1>
  
--- 1,3 ----
***************
*** 7,10 ****
--- 5,9 ----
  
  <h2>{L_FORUM}: {FORUM_NAME}</h2>
+ 
  <form method="post" action="{S_FORUMAUTH_ACTION}">
    <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
***************
*** 31,33 ****
    </table>
  </form>
- <br />
--- 30,31 ----

Index: auth_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/auth_select_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** auth_select_body.tpl	2001/10/09 13:37:48	1.2
--- auth_select_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,18 ****
  
- <br />
- 
  <h1>{L_AUTH_TITLE}</h1>
  
  <p>{L_AUTH_EXPLAIN}</p>
  
! <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		
  	<th class="thHead" align="center">{L_AUTH_SELECT}</th>
  	</tr>
! 	<tr><form method="get" action="{S_AUTH_ACTION}">
  		<td class="row1" align="center">{S_AUTH_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}" class="mainoption" />&nbsp;</td>
! 	</form></tr>
! </table>
! 
! <br />
--- 1,14 ----
  
  <h1>{L_AUTH_TITLE}</h1>
  
  <p>{L_AUTH_EXPLAIN}</p>
  
! <form method="post" action="{S_AUTH_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		
  	<th class="thHead" align="center">{L_AUTH_SELECT}</th>
  	</tr>
! 	<tr>
  		<td class="row1" align="center">{S_AUTH_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}" class="mainoption" />&nbsp;</td>
! 	</tr>
! </table></form>

Index: auth_ug_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/auth_ug_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** auth_ug_body.tpl	2001/10/09 13:37:48	1.2
--- auth_ug_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
  
- <br />
- 
  <h1>{L_AUTH_TITLE}</h1>
  
--- 1,3 ----

Index: db_utils_backup_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/db_utils_backup_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** db_utils_backup_body.tpl	2001/10/09 13:37:48	1.2
--- db_utils_backup_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
  
- <br />
- 
  <h1>{L_DATABASE_BACKUP}</h1>
  
--- 1,3 ----

Index: db_utils_restore_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/db_utils_restore_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** db_utils_restore_body.tpl	2001/10/09 13:37:48	1.2
--- db_utils_restore_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,16 ****
  
- <br />
- 
  <h1>{L_DATABASE_RESTORE}</h1>
  
  <P>{L_RESTORE_EXPLAIN}</p>
  
! <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		<th class="thHead">{L_SELECT_FILE}</th>
  	</tr>
! 	<tr><form enctype="multipart/form-data" method="post" action="{S_DBUTILS_ACTION}">
  		<td class="row1" align="center">&nbsp;<input type="file" name="backup_file">&nbsp;&nbsp;{S_HIDDEN_FIELDS}<input type="submit" name="restore_start" value="{L_START_RESTORE}" class="mainoption" />&nbsp;</td>
! 	</form></tr>
! </table>
! <br />
--- 1,13 ----
  
  <h1>{L_DATABASE_RESTORE}</h1>
  
  <P>{L_RESTORE_EXPLAIN}</p>
  
! <form enctype="multipart/form-data" method="post" action="{S_DBUTILS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		<th class="thHead">{L_SELECT_FILE}</th>
  	</tr>
! 	<tr>
  		<td class="row1" align="center">&nbsp;<input type="file" name="backup_file">&nbsp;&nbsp;{S_HIDDEN_FIELDS}<input type="submit" name="restore_start" value="{L_START_RESTORE}" class="mainoption" />&nbsp;</td>
! 	</tr>
! </table></form>

Index: forum_delete_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forum_delete_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** forum_delete_body.tpl	2001/10/09 13:37:48	1.2
--- forum_delete_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,3 ****
- <br />
  
  <h1>Delete</h1>
--- 1,2 ----
***************
*** 27,30 ****
    </table>
  </form>
- 		
- <br clear="all">
--- 26,27 ----

Index: forum_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forum_edit_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** forum_edit_body.tpl	2001/10/09 13:37:48	1.2
--- forum_edit_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,7 ****
- <br />
  
! <h1>Edit Forum</h1>
  
! <p>The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.</p>
  
  <form action="{S_FORUM_ACTION}" method="POST">
--- 1,6 ----
  
! <h1>{L_FORUM_TITLE}</h1>
  
! <p>{L_FORUM_EXPLAIN}</p>
  
  <form action="{S_FORUM_ACTION}" method="POST">
***************
*** 19,23 ****
  	  <td class="row1">Description:</td>
  	  <td class="row2">
! 		<textarea rows="5" cols="45" wrap="VIRTUAL" name="forumdesc" class="post">{DESCRIPTION}</textarea>
  	  </td>
  	</tr>
--- 18,22 ----
  	  <td class="row1">Description:</td>
  	  <td class="row2">
! 		<textarea rows="5" cols="45" wrap="virtual" name="forumdesc" class="post">{DESCRIPTION}</textarea>
  	  </td>
  	</tr>
***************
*** 41,45 ****
  			<td align="right" valign="middle">{L_ENABLED}</td>
  			<td align="left" valign="middle">
! 			  <input type="checkbox" name="prune_enable" value="1" {S_PRUNE_EN} />
  			</td>
  		  </tr>
--- 40,44 ----
  			<td align="right" valign="middle">{L_ENABLED}</td>
  			<td align="left" valign="middle">
! 			  <input type="checkbox" name="prune_enable" value="1" {S_PRUNE_ENABLED} />
  			</td>
  		  </tr>

Index: forum_prune_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forum_prune_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** forum_prune_body.tpl	2001/10/09 13:37:48	1.2
--- forum_prune_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
  
- <br />
- 
  <h1>{L_FORUM_PRUNE}</h1>
  
--- 1,3 ----

Index: forum_prune_result_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forum_prune_result_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** forum_prune_result_body.tpl	2001/10/09 13:37:48	1.2
--- forum_prune_result_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
  
- <br />
- 
  <h1>{L_FORUM_PRUNE}</h1>
  
--- 1,3 ----

Index: forum_prune_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forum_prune_select_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** forum_prune_select_body.tpl	2001/10/09 13:37:48	1.2
--- forum_prune_select_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,8 ****
  
- <br />
- 
  <h1>{L_FORUM_PRUNE}</h1>
  
! <form method="get" action="{S_FORUMPRUNE_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		
--- 1,6 ----
  
  <h1>{L_FORUM_PRUNE}</h1>
  
! <form method="post" action="{S_FORUMPRUNE_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		
***************
*** 13,16 ****
  	</tr>
  </table></form>
- 
- <br />
--- 11,12 ----

Index: forums_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forums_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** forums_body.tpl	2001/10/09 13:37:48	1.2
--- forums_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,14 ****
- <br />
- <h1>Bulletin Board Management</h1>
  
! <p>Use this page to manage your forums and categories</p>
  
  
! {S_FORMSTART}
! <div align="center">
!   <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
  	<!-- BEGIN catrow -->
  	<tr> 
! 	  <td class="cat" colspan="4"><span class="cattitle"><b><a href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></b></span>{catrow.S_ADDCAT}</td>
  	  <td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_EDIT}</span></td>
  	  <td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_DELETE}</span></td>
--- 1,11 ----
  
! <h1>{L_FORUM_TITLE}</h1>
  
+ <p>{L_FORUM_EXPLAIN}</p>
  
! <form method="post" action="{S_FORUM_ACTION}"><table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
  	<!-- BEGIN catrow -->
  	<tr> 
! 	  <td class="cat" colspan="3"><span class="cattitle"><b><a href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></b></span>{catrow.S_ADDCAT}</td>
  	  <td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_EDIT}</span></td>
  	  <td class="cat" align="center" valign="middle"><span class="gen">{catrow.CAT_DELETE}</span></td>
***************
*** 17,32 ****
  	  <td class="cat" align="center" valign="middle"><span class="gen">&nbsp</span></td>
  	</tr>
! 	{catrow.S_ADDCAT_ENDFORM} 
  	<!-- BEGIN forumrow -->
  	<tr> 
! 	  <td class="row1" align="center" valign="middle">{catrow.forumrow.FOLDER}</td>
! 	  <td class="row2"><span class="gen">{catrow.forumrow.S_ADDFORUM}{catrow.forumrow.S_NEWFORUM}<a href="{catrow.forumrow.U_VIEWFORUM}" target="_new">{catrow.forumrow.FORUM_NAME}</a></span><br />
  		<span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td>
! 	  {catrow.forumrow.S_ADDFORUM_ENDFORM} 
  	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_TOPICS}</span></td>
  	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_POSTS}</span></td>
  	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_EDIT}</span></td>
  	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_DELETE}</span></td>
! 	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_UP} 
  		{catrow.forumrow.FORUM_DOWN}</span></td>
  	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_SYNC}</span></td>
--- 14,28 ----
  	  <td class="cat" align="center" valign="middle"><span class="gen">&nbsp</span></td>
  	</tr>
! 	{catrow.S_ADDCAT_END_FORM} 
  	<!-- BEGIN forumrow -->
  	<tr> 
! 	  <td class="row2"><span class="gen">{catrow.forumrow.S_ADD_FORUM}{catrow.forumrow.S_NEW_FORUM}<a href="{catrow.forumrow.U_VIEWFORUM}" target="_new">{catrow.forumrow.FORUM_NAME}</a></span><br />
  		<span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td>
! 	  {catrow.forumrow.S_ADD_FORUM_END_FORM} 
  	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_TOPICS}</span></td>
  	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_POSTS}</span></td>
  	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_EDIT}</span></td>
  	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_DELETE}</span></td>
! 	  <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_UP} <br />
  		{catrow.forumrow.FORUM_DOWN}</span></td>
  	  <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.FORUM_SYNC}</span></td>
***************
*** 34,37 ****
  	<!-- END forumrow -->
  	<!-- END catrow -->
!   </table>
! </div>
--- 30,32 ----
  	<!-- END forumrow -->
  	<!-- END catrow -->
! </table></form>

Index: group_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/group_edit_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** group_edit_body.tpl	2001/10/10 18:06:28	1.3
--- group_edit_body.tpl	2001/10/14 15:55:50	1.4
***************
*** 1,10 ****
  
! <h1><br />
!   {L_GROUP_INFO} </h1>
!  <br />
! <form action="{S_GROUP_ACTION}" method="post">
!   <table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center">
  	<tr> 
! 	  <th class="thHead" colspan="2">{L_GROUP_INFO}</th>
  	</tr>
  	<tr>
--- 1,8 ----
  
! <h1>{L_GROUP_TITLE}</h1>
! 
! <form action="{S_GROUP_ACTION}" method="post"><table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center">
  	<tr> 
! 	  <th class="thHead" colspan="2">{L_GROUP_EDIT_DELETE}</th>
  	</tr>
  	<tr>
***************
*** 14,18 ****
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td>
  	  <td class="row2" width="62%"> 
! 		<input type="text" name="group_name" size="35" maxlength="40" value="{S_GROUP_NAME}" />
  	  </td>
  	</tr>
--- 12,16 ----
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td>
  	  <td class="row2" width="62%"> 
! 		<input type="text" name="group_name" size="35" maxlength="40" value="{GROUP_NAME}" />
  	  </td>
  	</tr>
***************
*** 20,29 ****
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td>
  	  <td class="row2" width="62%"> 
! 		<textarea name="group_description" rows=5 cols=51>{S_GROUP_DESCRIPTION}</textarea>
  	  </td>
  	</tr>
  	<tr> 
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
! 	  <td class="row2" width="62%">{S_GROUP_MODERATOR}</td>
  	</tr>
  	<tr> 
--- 18,27 ----
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td>
  	  <td class="row2" width="62%"> 
! 		<textarea name="group_description" rows=5 cols=51>{GROUP_DESCRIPTION}</textarea>
  	  </td>
  	</tr>
  	<tr> 
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
! 	  <td class="row2" width="62%">{S_SELECT_MODERATORS}</td>
  	</tr>
  	<tr> 
***************
*** 38,54 ****
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
  	  <td class="row2" width="62%"> 
! 		<input type="checkbox" name="deletegroup" value="1">
  		{L_GROUP_DELETE_CHECK}</td>
  	</tr>
  	<tr> 
  	  <td class="catBottom" colspan="2" align="center"><span class="cattitle"> 
! 		<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
  		&nbsp;&nbsp; 
  		<input type="reset" value="{L_RESET}" name="reset" class="liteoption" />
  		</span></td>
  	</tr>
!   </table>
!   <input type="hidden" name="mode" value="{S_GROUP_MODE}" />
!   <input type="hidden" name="updategroup" value="update" />
!   <input type="hidden" name="group_id" value="{GROUP_ID}" />
! </form>
\ No newline at end of file
--- 36,48 ----
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
  	  <td class="row2" width="62%"> 
! 		<input type="checkbox" name="group_delete" value="1">
  		{L_GROUP_DELETE_CHECK}</td>
  	</tr>
  	<tr> 
  	  <td class="catBottom" colspan="2" align="center"><span class="cattitle"> 
! 		<input type="submit" name="group_update" value="{L_SUBMIT}" class="mainoption" />
  		&nbsp;&nbsp; 
  		<input type="reset" value="{L_RESET}" name="reset" class="liteoption" />
  		</span></td>
  	</tr>
! </table>{S_HIDDEN_FIELDS}</form>

Index: group_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/group_select_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_select_body.tpl	2001/10/09 13:37:48	1.2
--- group_select_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,21 ****
  
- <br />
- 
  <h1>{L_GROUP_TITLE}</h1>
  
  <p>{L_GROUP_EXPLAIN}</p>
  
! <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		
  	<th class="thHead" align="center">{L_GROUP_SELECT}</th>
  	</tr>
- 	<tr><form method="post" action="{S_GROUP_ACTION}"><input type="hidden" name="mode" value="editgroup">
- 		<td class="row1" align="center">{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}" class="mainoption" />&nbsp;</td>
- 	</form></tr>
  	<tr>
! 		<td class="catBottom" align="center"><a href="admin_groups.php?mode=newgroup">{L_GROUP_NEW}</a></td>
  	</tr>
! </table>
! 
! <br />
--- 1,17 ----
  
  <h1>{L_GROUP_TITLE}</h1>
  
  <p>{L_GROUP_EXPLAIN}</p>
  
! <form method="post" action="{S_GROUP_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		
  	<th class="thHead" align="center">{L_GROUP_SELECT}</th>
  	</tr>
  	<tr>
! 		<td class="row1" align="center">{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" name="edit" value="{L_LOOK_UP}" class="mainoption" />&nbsp;</td>
  	</tr>
! 	<tr>
! 		<td class="catBottom" align="center"><input type="submit" class="liteoption" name="new" value="{L_CREATE_NEW_GROUP}" /></td>
! 	</tr>
! </table></form>

Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/index_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** index_body.tpl	2001/10/09 13:37:48	1.2
--- index_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
  
- <br />
- 
  <h1>{L_WELCOME}</h1>
  
--- 1,3 ----
***************
*** 42,47 ****
  	<td class="row1" nowrap="nowrap">{L_DB_SIZE}:</td>
  	<td class="row2"><b>{DB_SIZE}</b></td>
! 	<td class="row1" nowrap="nowrap">&nbsp;</td>
! 	<td class="row2">&nbsp;</td>
    </tr>
  </table>
--- 40,45 ----
  	<td class="row1" nowrap="nowrap">{L_DB_SIZE}:</td>
  	<td class="row2"><b>{DB_SIZE}</b></td>
! 	<td class="row1" nowrap="nowrap">{L_GZIP_COMPRESSION}:</td>
! 	<td class="row2"><b>{GZIP_COMPRESSION}</b></td>
    </tr>
  </table>
***************
*** 64,66 ****
--- 62,65 ----
    <!-- END userrow -->
  </table>
+ 
  <br />

Index: index_frameset.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/index_frameset.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** index_frameset.tpl	2001/09/25 18:12:02	1.1
--- index_frameset.tpl	2001/10/14 15:55:50	1.2
***************
*** 4,8 ****
  </head>
  
! <frameset cols="150,*" scrolling="no" border="0">
  	<frame src="{S_FRAME_NAV}" name="nav">
  	<frame src="{S_FRAME_MAIN}" name="main">
--- 4,8 ----
  </head>
  
! <frameset cols="170,*" scrolling="no" border="0">
  	<frame src="{S_FRAME_NAV}" name="nav">
  	<frame src="{S_FRAME_MAIN}" name="main">

Index: index_navigate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/index_navigate.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** index_navigate.tpl	2001/10/09 13:37:48	1.2
--- index_navigate.tpl	2001/10/14 15:55:50	1.3
***************
*** 2,6 ****
  <table width="100%" cellpadding="4" cellspacing="0" border="0" align="center">
    <tr> 
! 	<td align="center" ><a href="{U_BOARD_INDEX}" target="_top"><img src="../templates/subSilver/images/logo_phpBB_med.gif" border="0" /></a></td>
    </tr>
    <tr> 
--- 2,6 ----
  <table width="100%" cellpadding="4" cellspacing="0" border="0" align="center">
    <tr> 
! 	<td align="center" ><a href="{U_FORUM_INDEX}" target="_top"><img src="../templates/subSilver/images/logo_phpBB_med.gif" border="0" /></a></td>
    </tr>
    <tr> 
***************
*** 8,12 ****
  	  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
  		<tr> 
! 		  <th height="25" class="thHead"><b>Forum Configuration</b></th>
  		</tr>
  		<tr> 
--- 8,12 ----
  	  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
  		<tr> 
! 		  <th height="25" class="thHead"><b>{L_ADMIN}</b></th>
  		</tr>
  		<tr> 
***************
*** 14,34 ****
  		</tr>
  		<tr> 
! 		  <td class="row1"><span class="genmed"><a href="{U_BOARD_INDEX}" target="_top" class="genmed">Forum 
! 			Home</a></span></td>
  		</tr>
  		<tr> 
! 		  <td class="row1"><span class="genmed"><a href="{U_BOARD_INDEX}" target="main" class="genmed">Preview 
! 			Forum</a></span></td>
  		</tr>
  		<!-- BEGIN catrow -->
  		<tr> 
! 		  <td height="28" class="catSides"><span class="cattitle">{catrow.CATNAME}</span></td>
  		</tr>
! 		<!-- BEGIN actionrow -->
  		<tr> 
! 		  <td class="row1"><span class="genmed"><a href="{catrow.actionrow.FILE}"  target="main" class="genmed">{catrow.actionrow.ACTIONNAME}</a></span> 
  		  </td>
  		</tr>
! 		<!-- END actionrow -->
  		<!-- END catrow -->
  	  </table>
--- 14,32 ----
  		</tr>
  		<tr> 
! 		  <td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="_top" class="genmed">{L_FORUM_INDEX}</a></span></td>
  		</tr>
  		<tr> 
! 		  <td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="main" class="genmed">{L_PREVIEW_FORUM}</a></span></td>
  		</tr>
  		<!-- BEGIN catrow -->
  		<tr> 
! 		  <td height="28" class="catSides"><span class="cattitle">{catrow.ADMIN_CATEGORY}</span></td>
  		</tr>
! 		<!-- BEGIN modulerow -->
  		<tr> 
! 		  <td class="row1"><span class="genmed"><a href="{catrow.modulerow.U_ADMIN_MODULE}"  target="main" class="genmed">{catrow.modulerow.ADMIN_MODULE}</a></span> 
  		  </td>
  		</tr>
! 		<!-- END modulerow -->
  		<!-- END catrow -->
  	  </table>
***************
*** 38,41 ****
  
  <br />
- </body>
- </html>
\ No newline at end of file
--- 36,37 ----

Index: page_footer.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/page_footer.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** page_footer.tpl	2001/10/09 13:37:48	1.2
--- page_footer.tpl	2001/10/14 15:55:50	1.3
***************
*** 16,24 ****
  
  //-->
- <div align="center">
- <span class="copyright">Powered By <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB {PHPBB_VERSION}</a> &copy; 2001 phpBB Group</span>
- </div>
  
! <br />
  
  </body>
--- 16,21 ----
  
  //-->
  
! <div align="center"><span class="copyright">Powered by phpBB {PHPBB_VERSION} &copy; 2001 <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Group</a></span></div>
  
  </body>

Index: page_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/page_header.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** page_header.tpl	2001/10/09 13:37:48	1.2
--- page_header.tpl	2001/10/14 15:55:50	1.3
***************
*** 5,11 ****
  {META}
  <link rel="stylesheet" href="../templates/subSilver/admin_styles.css" type="text/css">
! 
! <title>phpBB - {SITENAME}</title>
! 
  </head>
! <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
--- 5,11 ----
  {META}
  <link rel="stylesheet" href="../templates/subSilver/admin_styles.css" type="text/css">
! <title>{SITENAME} - {L_PHPBB_ADMIN}</title>
  </head>
! <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}">
! 
! <a name="top"></a>

Index: ranks_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/ranks_edit_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ranks_edit_body.tpl	2001/10/14 14:33:54	1.1
--- ranks_edit_body.tpl	2001/10/14 15:55:50	1.2
***************
*** 1,38 ****
  
! <form action="{S_RANK_ACTION}" method="post">
  
! <table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
  	<tr>
! 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
! 			<tr>
! 				<td class="cat" colspan="2"><span class="cattitle"><b>{L_RANKS_TITLE}</b></span><br /><span class="gensmall">{L_RANKS_TEXT}</span></td>
! 			</tr>
! 			<tr>
! 				<td class="row1" width="38%"><span class="gen">{L_RANK_TITLE}:</span></td>
! 				<td class="row2"><input type="text" name="title" size="35" maxlength="40" value="{RANK}" /></td>
! 			</tr>
! 			<tr>
! 				<td class="row1"><span class="gen">{L_RANK_SPECIAL}</span></td>
! 				<td class="row2"><input type="radio" name="special_rank" value="1" {SPECIAL_RANK} />{L_YES} &nbsp;&nbsp;<input type="radio" name="special_rank" value="0" {NOT_SPECIAL_RANK} /> {L_NO}</td>
! 			</tr>
! 			<tr>
! 				<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
! 				<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
! 			</tr>
! 			<tr>
! 				<td class="row1" width="38%"><span class="gen">{L_RANK_MINIMUM}:</span></td>
! 				<td class="row2"><input type="text" name="min_posts" size="5" maxlength="10" value="{MINIMUM}" /></td>
! 			</tr>
! 			<tr>
! 				<td class="row1" width="38%"><span class="gen">{L_RANK_IMAGE}:</span><br />
! 				<span class="gensmall">{L_RANK_IMAGE_EXPLAIN}</span></td>
! 				<td class="row2"><input type="text" name="rank_image" size="40" maxlength="255" value="{IMAGE}" /><br />{IMAGE_DISPLAY}</td>
! 			</tr>
! 			<tr>
! 				<td class="cat" colspan="2" align="center"><span class="cattitle"><input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></span></td>
! 			</tr>
! 		</table></td>
  	</tr>
! 
! {S_HIDDEN_FIELDS}
! </table></form>
\ No newline at end of file
--- 1,35 ----
  
! <h1>{L_RANKS_TITLE}</h1>
  
! <p>{L_RANKS_TEXT}</p>
! 
! <form action="{S_RANK_ACTION}" method="post"><table class="forumline" cellpadding="4" cellspacing="1" border="0" align="center">
  	<tr>
! 		<th class="thTop" colspan="2">{L_RANKS_TITLE}</th>
  	</tr>
! 	<tr>
! 		<td class="row1" width="38%"><span class="gen">{L_RANK_TITLE}:</span></td>
! 		<td class="row2"><input type="text" name="title" size="35" maxlength="40" value="{RANK}" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1"><span class="gen">{L_RANK_SPECIAL}</span></td>
! 		<td class="row2"><input type="radio" name="special_rank" value="1" {SPECIAL_RANK} />{L_YES} &nbsp;&nbsp;<input type="radio" name="special_rank" value="0" {NOT_SPECIAL_RANK} /> {L_NO}</td>
! 	</tr>
! 	<tr>
! 		<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
! 		<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" width="38%"><span class="gen">{L_RANK_MINIMUM}:</span></td>
! 		<td class="row2"><input type="text" name="min_posts" size="5" maxlength="10" value="{MINIMUM}" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" width="38%"><span class="gen">{L_RANK_IMAGE}:</span><br />
! 		<span class="gensmall">{L_RANK_IMAGE_EXPLAIN}</span></td>
! 		<td class="row2"><input type="text" name="rank_image" size="40" maxlength="255" value="{IMAGE}" /><br />{IMAGE_DISPLAY}</td>
! 	</tr>
! 	<tr>
! 		<td class="catBottom" colspan="2" align="center"><input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
! 	</tr>
! </table>
! {S_HIDDEN_FIELDS}</form>

Index: ranks_list_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/ranks_list_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ranks_list_body.tpl	2001/10/14 14:33:54	1.1
--- ranks_list_body.tpl	2001/10/14 15:55:50	1.2
***************
*** 1,3 ****
- <br clear="all" />
  
  <h1>{L_RANKS_TITLE}</h1>
--- 1,2 ----
***************
*** 5,27 ****
  <p>{L_RANKS_TEXT}</p>
  
! <table cellspacing="1" cellpadding="4" border="0" align="center">
  	<tr>
! 		<td class="cat" align="center"><span class="cattitle"><b>{L_RANK}</b></span></td>
! 		<td class="cat" align="center"><span class="cattitle"><b>{L_SPECIAL_RANK}</b></span></td>
! 		<td class="cat" align="center"><span class="cattitle"><b>{L_EDIT}</b></span></td>
! 		<td class="cat" align="center"><span class="cattitle"><b>{L_DELETE}</b></span></td>
  	</tr>
  	<!-- BEGIN ranks -->
  	<tr>
! 		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};">{ranks.RANK}</td>
! 		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};">{ranks.SPECIAL_RANK}</td>
! 		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
! 		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td>
  	</tr>
  	<!-- END ranks -->			
  	<tr>
! 		<td class="row2" align="center" colspan="4"><a href="admin_ranks.php?mode=add">{L_ADD_RANK}</a></td>
  	</tr>
! </table>
! 
! <br clear="all" />
\ No newline at end of file
--- 4,24 ----
  <p>{L_RANKS_TEXT}</p>
  
! <form method="post" action="{S_RANKS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
! 		<th class="thCornerL">{L_RANK}</th>
! 		<th class="thTop">{L_SPECIAL_RANK}</th>
! 		<th class="thTop">{L_EDIT}</th>
! 		<th class="thCornerR">{L_DELETE}</th>
  	</tr>
  	<!-- BEGIN ranks -->
  	<tr>
! 		<td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK}</td>
! 		<td class="{ranks.ROW_CLASS}" align="center">{ranks.SPECIAL_RANK}</td>
! 		<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
! 		<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td>
  	</tr>
  	<!-- END ranks -->			
  	<tr>
! 		<td class="catBottom" align="center" colspan="4"><input type="submit" class="mainoption" name="add" value="{L_ADD_RANK}" /></td>
  	</tr>
! </table></form>

Index: smile_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/smile_edit_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** smile_edit_body.tpl	2001/09/25 18:12:02	1.1
--- smile_edit_body.tpl	2001/10/14 15:55:50	1.2
***************
*** 1,5 ****
  
- <br clear="all" />
- 
  <h1>{L_SMILEY_TITLE}</h1>
  
--- 1,3 ----
***************
*** 8,23 ****
  <script language="javascript" type="text/javascript">
  <!--
- 
  function update_smiley(newimage)
  {
  	document.smiley_image.src = "{S_SMILEY_BASEDIR}/" + newimage;
  }
! 
! // -->
  </script>
  
! <form method="post" action="{S_SMILEY_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
  	<tr>
! 		<th colspan="2">{L_SMILEY_CONFIG}</th>
  	</tr>
  	<tr>
--- 6,19 ----
  <script language="javascript" type="text/javascript">
  <!--
  function update_smiley(newimage)
  {
  	document.smiley_image.src = "{S_SMILEY_BASEDIR}/" + newimage;
  }
! //-->
  </script>
  
! <form method="post" action="{S_SMILEY_ACTION}"><table class="forumline" cellspacing="1" cellpadding="4" border="0" align="center">
  	<tr>
! 		<th class="thHead" colspan="2">{L_SMILEY_CONFIG}</th>
  	</tr>
  	<tr>
***************
*** 34,38 ****
  	</tr>
  	<tr>
! 		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SUBMIT}" /></td>
  	</tr>
  </table></form>
--- 30,34 ----
  	</tr>
  	<tr>
! 		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td>
  	</tr>
  </table></form>

Index: smile_list_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/smile_list_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** smile_list_body.tpl	2001/10/09 13:37:48	1.2
--- smile_list_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
  
- <br />
- 
  <h1>{L_SMILEY_TITLE}</h1>
  
--- 1,3 ----

Index: user_ban_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_ban_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_ban_body.tpl	2001/10/09 13:37:48	1.2
--- user_ban_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,20 ****
!  <br />
  <h1>{L_BAN_TITLE}</h1>
  <p>{L_BAN_EXPLAIN}</p>
! <form method="post" action="{S_BAN_ACTION}">
!   <table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr> 
  	  <th class="thHead" colspan="2">{L_BAN_USER}</th>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_USERNAME}:&nbsp;<br />
  		<span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
  	  <td class="row2">{S_USERLIST_SELECT}</td>
  	</tr>
  	<tr> 
! 	  <td class="catSides" colspan="2" align="center"><span class="cattitle">{L_BAN_IP}</span></td>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_IP_OR_HOSTNAME}:&nbsp;<br />
  		<span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
  	  <td class="row2">
--- 1,21 ----
! 
  <h1>{L_BAN_TITLE}</h1>
+ 
  <p>{L_BAN_EXPLAIN}</p>
! 
! <form method="post" action="{S_BAN_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr> 
  	  <th class="thHead" colspan="2">{L_BAN_USER}</th>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_USERNAME}: <br />
  		<span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
  	  <td class="row2">{S_USERLIST_SELECT}</td>
  	</tr>
  	<tr> 
! 	  <th class="thHead" colspan="2">{L_BAN_IP}</th>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_IP_OR_HOSTNAME}: <br />
  		<span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
  	  <td class="row2">
***************
*** 23,30 ****
  	</tr>
  	<tr> 
! 	  <td class="catSides" colspan="2" align="center"><span class="cattitle">{L_BAN_EMAIL}</span></td>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_EMAIL_ADDRESS}:&nbsp;<br />
  		<span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
  	  <td class="row2">
--- 24,31 ----
  	</tr>
  	<tr> 
! 	  <th class="thHead" colspan="2">{L_BAN_EMAIL}</th>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_EMAIL_ADDRESS}: <br />
  		<span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
  	  <td class="row2">
***************
*** 39,44 ****
  	  </td>
  	</tr>
!   </table>
! </form>
  <p>{L_BAN_EXPLAIN_WARN}</p>
- <br	clear="all" />
--- 40,44 ----
  	  </td>
  	</tr>
! </table></form>
! 
  <p>{L_BAN_EXPLAIN_WARN}</p>

Index: user_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_edit_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_edit_body.tpl	2001/10/09 13:37:48	1.2
--- user_edit_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,7 ****
! <br />
  <h1>{L_USER_TITLE}</h1>
  <p>{L_USER_EXPLAIN}</p>
! <form action="{S_PROFILE_ACTION}" method="post">
!   <table width="98%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr> 
  	  <th class="thHead" colspan="2">{L_REGISTRATION_INFO}</th>
--- 1,8 ----
! 
  <h1>{L_USER_TITLE}</h1>
+ 
  <p>{L_USER_EXPLAIN}</p>
! 
! <form action="{S_PROFILE_ACTION}" method="post"><table width="98%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr> 
  	  <th class="thHead" colspan="2">{L_REGISTRATION_INFO}</th>
***************
*** 250,253 ****
  	  </td>
  	</tr>
!   </table>
! </form>
--- 251,253 ----
  	  </td>
  	</tr>
! </table></form>

Index: user_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_email.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_email.tpl	2001/10/09 13:37:48	1.2
--- user_email.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,11 ****
- <br />
- <b>{L_NOTICE}</b>
- <br />
  
  <h1>{L_EMAIL_TITLE}</h1>
  
  <p>{L_EMAIL_EXPLAIN}</p>
! <form method="post" action="{S_USER_ACTION}">
!   <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr> 
  	  <th class="thHead" colspan="2">{L_COMPOSE}</th>
--- 1,8 ----
  
  <h1>{L_EMAIL_TITLE}</h1>
  
  <p>{L_EMAIL_EXPLAIN}</p>
! 
! <form method="post" action="{S_USER_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr> 
  	  <th class="thHead" colspan="2">{L_COMPOSE}</th>
***************
*** 17,36 ****
  	<tr> 
  	  <td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
! 	  <td class="row2"><span class="gen"> 
! 		<input type="text" name="{S_EMAIL_SUBJECT}{S_EMAIL_SUBJECT}" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" />
! 		</span></td>
  	</tr>
  	<tr> 
  	  <td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span> 
! 	  <td class="row2"><span class="gen"> 
! 		<textarea name="{S_EMAIL_MSG}" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post"></textarea>
! 		</span> 
  	</tr>
  	<tr> 
! 	  <td class="catBottom" align="center" colspan="2"> 
! 		<input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" />
! 		&nbsp;</td>
  	</tr>
!   </table>
! </form>
! <br />
--- 14,25 ----
  	<tr> 
  	  <td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
! 	  <td class="row2"><span class="gen"><input type="text" name="{S_EMAIL_SUBJECT}{S_EMAIL_SUBJECT}" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" /></span></td>
  	</tr>
  	<tr> 
  	  <td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span> 
! 	  <td class="row2"><span class="gen"> <textarea name="{S_EMAIL_MSG}" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post"></textarea></span> 
  	</tr>
  	<tr> 
! 	  <td class="catBottom" align="center" colspan="2"><input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" /></td>
  	</tr>
! </table></form>

Index: user_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_select_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_select_body.tpl	2001/10/09 13:37:48	1.2
--- user_select_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,18 ****
  
- <br />
- 
  <h1>{L_USER_TITLE}</h1>
  
  <p>{L_USER_EXPLAIN}</p>
! <form method="get" action="{S_USER_ACTION}">
! <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
! 		
! 	<th class="thHead" align="center">{L_USER_SELECT}</th>
  	</tr>
  	<tr>
! 		<td class="row1" align="center">{S_USER_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}" name="submit" class="mainoption" />&nbsp;</td>
  	</tr>
! </table>
! </form>
! <br />
--- 1,13 ----
  
  <h1>{L_USER_TITLE}</h1>
  
  <p>{L_USER_EXPLAIN}</p>
! 
! <form method="post" name="post" action="{S_USER_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
! 		<th class="thHead" align="center">{L_USER_SELECT}</th>
  	</tr>
  	<tr>
! 		<td class="row1" align="center"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="submit" name="submit" value="{L_LOOK_UP}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
  	</tr>
! </table></form>

Index: user_unban_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_unban_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_unban_body.tpl	2001/10/09 13:37:48	1.2
--- user_unban_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
!  <br />
  <h1>{L_BAN_TITLE}</h1>
  <p>{L_BAN_EXPLAIN}</p>
  <form method="post" action="{S_BAN_ACTION}">
    <table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
--- 1,7 ----
! 
  <h1>{L_BAN_TITLE}</h1>
+ 
  <p>{L_BAN_EXPLAIN}</p>
+ 
  <form method="post" action="{S_BAN_ACTION}">
    <table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
***************
*** 8,28 ****
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_USERNAME}:&nbsp;<br />
  		<span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
  	  <td class="row2">{S_USERLIST_SELECT}</td>
  	</tr>
  	<tr> 
! 	  <td class="catSides" colspan="2" align="center"><span class="cattitle">{L_BAN_IP}</span></td>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_IP_OR_HOSTNAME}:&nbsp;<br />
  		<span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
  	  <td class="row2">{S_IPLIST_SELECT}</td>
  	</tr>
  	<tr> 
! 	  <td class="catSides" colspan="2" align="center"><span class="cattitle">{L_BAN_EMAIL}</span></td>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_EMAIL_ADDRESS}:&nbsp;<br />
  		<span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
  	  <td class="row2">{S_EMAILLIST_SELECT}</td>
--- 10,30 ----
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_USERNAME}: <br />
  		<span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
  	  <td class="row2">{S_USERLIST_SELECT}</td>
  	</tr>
  	<tr> 
! 	  <th class="thHead" colspan="2">{L_BAN_IP}</th>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_IP_OR_HOSTNAME}: <br />
  		<span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
  	  <td class="row2">{S_IPLIST_SELECT}</td>
  	</tr>
  	<tr> 
! 	  <th class="thHead" colspan="2">{L_BAN_EMAIL}</th>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_EMAIL_ADDRESS}: <br />
  		<span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
  	  <td class="row2">{S_EMAILLIST_SELECT}</td>
***************
*** 37,39 ****
    </table>
  </form>
- <br	clear="all" />
--- 39,40 ----

Index: words_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/words_edit_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** words_edit_body.tpl	2001/10/09 13:37:48	1.2
--- words_edit_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,5 ****
  
- <br />
- 
  <h1>{L_WORDS_TITLE}</h1>
  
--- 1,3 ----

Index: words_list_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/words_list_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** words_list_body.tpl	2001/10/09 13:37:48	1.2
--- words_list_body.tpl	2001/10/14 15:55:50	1.3
***************
*** 1,10 ****
  
- <br />
- 
  <h1>{L_WORDS_TITLE}</h1>
  
  <P>{L_WORDS_TEXT}</p>
  
! <form method="POST" action="{S_WORDS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		<th class="thCornerL">{L_WORD}</th>
--- 1,8 ----
  
  <h1>{L_WORDS_TITLE}</h1>
  
  <P>{L_WORDS_TEXT}</p>
  
! <form method="post" action="{S_WORDS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr>
  		<th class="thCornerL">{L_WORD}</th>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin smile_action.tpl,1.2,NONE smile_edit.tpl,1.2,NONE smile_result_body.tpl,1.2,NONE

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv16203

Removed Files:
	smile_action.tpl smile_edit.tpl smile_result_body.tpl 
Log Message:
Renamed or not needed

--- smile_action.tpl DELETED ---

--- smile_edit.tpl DELETED ---

--- smile_result_body.tpl DELETED ---

[Phpbb-checkins] CVS: phpBB2 posting.php,1.77,1.78 viewtopic.php,1.118,1.119 login.php,1.28,1.29

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv14869

Modified Files:
	posting.php viewtopic.php login.php 
Log Message:
Various updates mainly URI session related ... login still having problem with full URI sessions

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** posting.php	2001/10/10 14:57:52	1.77
--- posting.php	2001/10/14 15:49:52	1.78
***************
*** 849,853 ****
  							//
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_POST_URL . '=' . $new_post_id .'#' . $new_post_id . '">')
  							);
  
--- 849,853 ----
  							//
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id") . '#' . $new_post_id . '">')
  							);
  
***************
*** 989,993 ****
  									{
  										$template->assign_vars(array(
! 											"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_TOPIC_URL . '=' . $topic_id . '">')
  										);
  
--- 989,993 ----
  									{
  										$template->assign_vars(array(
! 											"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
  										);
  
***************
*** 1164,1168 ****
  									{
  										$template->assign_vars(array(
! 											"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_TOPIC_URL . '=' . $topic_id . '">')
  										);
  
--- 1164,1168 ----
  									{
  										$template->assign_vars(array(
! 											"META" => '<meta http-equiv="refresh" content="3;url= ' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
  										);
  
***************
*** 1172,1176 ****
  									{
  										$template->assign_vars(array(
! 											"META" => '<meta http-equiv="refresh" content="3;url=viewforum.' . $phpEx . '?' . POST_FORUM_URL . '=' . $forum_id . '">')
  										);
  									}
--- 1172,1176 ----
  									{
  										$template->assign_vars(array(
! 											"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
  										);
  									}
***************
*** 1374,1378 ****
  							//
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_POST_URL . '=' . $post_id . '#' . $post_id . '">')
  							);
  
--- 1374,1378 ----
  							//
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id") . '#' . $post_id . '">')
  							);
  
***************
*** 1399,1403 ****
  						//
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_POST_URL . '=' . $post_id . '#' . $post_id . '">')
  						);
  
--- 1399,1403 ----
  						//
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id") . '#' . $post_id . '">')
  						);
  
***************
*** 1445,1449 ****
  				{
  					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_TOPIC_URL . '=' . $topic_id . '">')
  					);
  
--- 1445,1449 ----
  				{
  					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "= $topic_id") . '">')
  					);
  
***************
*** 1480,1484 ****
  
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_TOPIC_URL . '=' . $topic_id . '">')
  							);
  
--- 1480,1484 ----
  
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
  							);
  
***************
*** 1509,1513 ****
  				{
  					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_TOPIC_URL . '=' . $topic_id . '">')
  					);
  
--- 1509,1513 ----
  				{
  					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
  					);
  
***************
*** 2107,2110 ****
--- 2107,2112 ----
  	"L_NOTIFY_ON_REPLY" => $lang['Notify'], 
  	"L_DELETE_POST" => $lang['Delete_post'],
+ 
+ 	"U_TOPIC_REVIEW" => ( $mode == "reply" ) ? append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc") : "", 
  
  	"S_HTML_CHECKED" => (!$html_on) ? "checked=\"checked\"" : "", 

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** viewtopic.php	2001/10/11 22:01:10	1.118
--- viewtopic.php	2001/10/14 15:49:52	1.119
***************
*** 236,243 ****
  			
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_TOPIC_URL . '=' . $topic_id . '&amp;start=' . $start .'">')
  			);
  
! 			$message = $lang['No_longer_watching']. "<br /><br />" . $lang['Click'] . " <a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start\">" . $lang['HERE'] . "</a> " . $lang['to_return_topic'];
  			message_die(GENERAL_MESSAGE, $message);
  		}
--- 236,243 ----
  			
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start") . '">')
  			);
  
! 			$message = $lang['No_longer_watching']. "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
  			message_die(GENERAL_MESSAGE, $message);
  		}
***************
*** 280,287 ****
  
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=viewtopic.' . $phpEx . '?' . POST_TOPIC_URL . '=' . $topic_id . '&amp;start=' . $start .'">')
  			);
  
! 			$message = $lang['You_are_watching']. "<br /><br />" . $lang['Click'] . " <a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start\">" . $lang['HERE'] . "</a> " . $lang['to_return_topic'];
  			message_die(GENERAL_MESSAGE, $message);
  		}
--- 280,287 ----
  
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start") . '">')
  			);
  
! 			$message = $lang['You_are_watching']. "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
  			message_die(GENERAL_MESSAGE, $message);
  		}
***************
*** 298,302 ****
  		if( $HTTP_GET_VARS['unwatch'] == "topic" )
  		{
! 			header("Location: login.$phpEx?forward_page=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&amp;unwatch=topic");
  		}
  	}
--- 298,302 ----
  		if( $HTTP_GET_VARS['unwatch'] == "topic" )
  		{
! 			header("Location: " . append_sid("login.$phpEx?forward_page=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic"));
  		}
  	}

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** login.php	2001/10/10 20:28:45	1.28
--- login.php	2001/10/14 15:49:52	1.29
***************
*** 34,45 ****
  //
  
! if(isset($HTTP_POST_VARS['submit']) || isset($HTTP_GET_VARS['submit']))
  {
! 	if($HTTP_POST_VARS['submit'] == "Login" && !$userdata['session_logged_in'])
  	{
  
- 		$username = $HTTP_POST_VARS['username'];
- 		$password = $HTTP_POST_VARS['password'];
- 
  		$sql = "SELECT user_id, username, user_password, user_active
  			FROM ".USERS_TABLE."
--- 34,44 ----
  //
  
! if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) )
  {
! 	if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
  	{
+ 		$username = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : "";
+ 		$password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : "";
  
  		$sql = "SELECT user_id, username, user_password, user_active
  			FROM ".USERS_TABLE."
***************
*** 62,68 ****
  				if($session_id)
  				{
! 					if(!empty($HTTP_POST_VARS['forward_page']))
  					{
! 						header("Location: " . append_sid($HTTP_POST_VARS['forward_page']));
  					}
  					else
--- 61,68 ----
  				if($session_id)
  				{
! 					if( !empty($HTTP_POST_VARS['forward_page']) )
  					{
! //						echo $HTTP_POST_VARS['forward_page'];
! 						header("Location: " . $HTTP_POST_VARS['forward_page']);
  					}
  					else
***************
*** 86,96 ****
  		}
  	}
! 	else if($HTTP_GET_VARS['submit'] == "logout" && $userdata['session_logged_in'])
  	{
! 		if($userdata['session_logged_in'])
  		{
  			session_end($userdata['session_id'], $userdata['user_id']);
  		}
! 		if(!empty($HTTP_POST_VARS['forward_page']))
  		{
  			header("Location: " . append_sid($HTTP_POST_VARS['forward_page']));
--- 86,96 ----
  		}
  	}
! 	else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] )
  	{
! 		if( $userdata['session_logged_in'] )
  		{
  			session_end($userdata['session_id'], $userdata['user_id']);
  		}
! 		if( !empty($HTTP_POST_VARS['forward_page']) )
  		{
  			header("Location: " . append_sid($HTTP_POST_VARS['forward_page']));
***************
*** 103,107 ****
  	else
  	{
! 		if(!empty($HTTP_POST_VARS['forward_page']))
  		{
  			header(append_sid("Location: ".$HTTP_POST_VARS['forward_page']));
--- 103,107 ----
  	else
  	{
! 		if( !empty($HTTP_POST_VARS['forward_page']) )
  		{
  			header(append_sid("Location: ".$HTTP_POST_VARS['forward_page']));
***************
*** 128,136 ****
  		);
  
! 		if(isset($HTTP_POST_VARS['forward_page']) || isset($HTTP_GET_VARS['forward_page']))
  		{
! 			$forward_to = $HTTP_SERVER_VARS['QUERY_STRING'];
  
! 			if(preg_match("/^forward_page=(.*)(&sid=[0-9]*)$|^forward_page=(.*)$/si", $forward_to, $forward_matches))
  			{
  				$forward_to = ($forward_matches[3]) ? $forward_matches[3] : $forward_matches[1];
--- 128,136 ----
  		);
  
! 		if( isset($HTTP_POST_VARS['forward_page']) || isset($HTTP_GET_VARS['forward_page']) )
  		{
! 			echo $forward_to = $HTTP_SERVER_VARS['QUERY_STRING'];
  
! 			if( preg_match("/^forward_page=(.*)(&sid=[0-9]*)$|^forward_page=(.*)$/si", $forward_to, $forward_matches) )
  			{
  				$forward_to = ($forward_matches[3]) ? $forward_matches[3] : $forward_matches[1];

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.73,1.74

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv14671/includes

Modified Files:
	functions.php 
Log Message:
Various updates mainly to message die for admin compatibility

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** functions.php	2001/10/11 12:17:15	1.73
--- functions.php	2001/10/14 15:48:38	1.74
***************
*** 120,124 ****
  function make_jumpbox($match_forum_id = 0)
  {
! 	global $lang, $db;
  
  	$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
--- 120,124 ----
  function make_jumpbox($match_forum_id = 0)
  {
! 	global $lang, $db, $SID;
  
  	$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
***************
*** 177,180 ****
--- 177,185 ----
  	}
  
+ 	if( isset($SID) )
+ 	{
+ //		$boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
+ 	}
+ 
  	return($boxstring);
  }
***************
*** 1166,1172 ****
  		}
  
! 		$template->set_filenames(array(
! 			"message_body" => "message_body.tpl")
! 		);
  		$template->assign_vars(array(
  			"MESSAGE_TITLE" => $msg_title,
--- 1171,1187 ----
  		}
  
! 		if( !defined("IN_ADMIN") )
! 		{
! 			$template->set_filenames(array(
! 				"message_body" => "message_body.tpl")
! 			);
! 		}
! 		else
! 		{
! 			$template->set_filenames(array(
! 				"message_body" => "admin/admin_message_body.tpl")
! 			);
! 		}
! 
  		$template->assign_vars(array(
  			"MESSAGE_TITLE" => $msg_title,

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.32,1.33

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv14587/includes

Modified Files:
	sessions.php 
Log Message:
Session code update to support temporary cookies only

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** sessions.php	2001/09/13 23:19:25	1.32
--- sessions.php	2001/10/14 15:48:18	1.33
***************
*** 38,45 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename]) )
  	{
! 		$sessiondata = unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename]));
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
--- 38,45 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
! 		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename]) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
***************
*** 47,51 ****
  	else
  	{
! 		$session_id = (isset($HTTP_GET_VARS['sid'])) ? $HTTP_GET_VARS['sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_GET;
--- 47,51 ----
  	else
  	{
! 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_GET;
***************
*** 177,184 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if(isset($HTTP_COOKIE_VARS[$cookiename]))
  	{
! 		$sessiondata = unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename]));
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
--- 177,185 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
! 		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
! 
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
***************
*** 186,189 ****
--- 187,191 ----
  	{
  		$session_id = (isset($HTTP_GET_VARS['sid'])) ? $HTTP_GET_VARS['sid'] : "";
+ 
  		$sessionmethod = SESSION_METHOD_GET;
  	}
***************
*** 214,218 ****
  		$sql = "SELECT u.*, s.*
  			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
! 			WHERE s.session_id = '" . addslashes($session_id) . "'
  				AND s.session_ip = '$user_ip'
  				AND u.user_id = s.session_user_id";
--- 216,220 ----
  		$sql = "SELECT u.*, s.*
  			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
! 			WHERE s.session_id = '$session_id'
  				AND s.session_ip = '$user_ip'
  				AND u.user_id = s.session_user_id";
***************
*** 228,232 ****
  		// Did the session exist in the DB?
  		//
! 		if(isset($userdata['user_id']))
  		{
  			$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
--- 230,234 ----
  		// Did the session exist in the DB?
  		//
! 		if( isset($userdata['user_id']) )
  		{
  			$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
***************
*** 356,363 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if(isset($HTTP_COOKIE_VARS[$cookiename]))
  	{
! 		$sessiondata = unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename]));
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
--- 358,365 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
! 		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
***************
*** 365,369 ****
  	else
  	{
! 		$session_id = (isset($HTTP_GET_VARS['sid'])) ? $HTTP_GET_VARS['sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_GET;
--- 367,371 ----
  	else
  	{
! 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_GET;
***************
*** 382,386 ****
  	}
  
! 	if($sessiondata['autologinid'])
  	{
  		$sql = "UPDATE " . USERS_TABLE . "
--- 384,388 ----
  	}
  
! 	if( isset($sessiondata['autologinid']) )
  	{
  		$sql = "UPDATE " . USERS_TABLE . "

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.3,1.4

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv14374/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
Updates related to current changes

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** lang_main.php	2001/10/14 14:27:07	1.3
--- lang_main.php	2001/10/14 15:47:23	1.4
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                               lang_english.php
   *                              -------------------
   *     begin                : Sat Dec 16 2000
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                            lang_main.php [English]
   *                              -------------------
   *     begin                : Sat Dec 16 2000
***************
*** 20,37 ****
   ***************************************************************************/
  
  //
! // The future format of this file will be:
  //
  // ---> $lang['message'] = "text";
  //
! // message should be a GOOD representation of text, including capitalisation
  // and underscoring for spacing. Remember different languages often interpret
  // consecutive words in different ways, so if you're building a sentence then
! // try and indicate what 'words' follow
  //
! // The number of phrases should be kept to a minimum so we should try and reuse
! // as much as possible.
  //
  
  //
  // Common, these terms are used
--- 20,41 ----
   ***************************************************************************/
  
+ // -------------------------------------------------------------------------
+ //                            NOTE THE FOLLOWING
+ // -------------------------------------------------------------------------
  //
! // The format of this file is:
  //
  // ---> $lang['message'] = "text";
  //
! // 'message' should be a GOOD representation of text, including capitalisation
  // and underscoring for spacing. Remember different languages often interpret
  // consecutive words in different ways, so if you're building a sentence then
! // try and indicate what 'words' follow if applicable
  //
! // The number of phrases should be kept to a minimum so try and reuse as much
! // as possible.
  //
  
+ 
  //
  // Common, these terms are used
***************
*** 124,127 ****
--- 128,132 ----
  $lang['Success'] = "Success";
  
+ 
  //
  // Global Header strings
***************
*** 151,154 ****
--- 156,160 ----
  $lang['Mark_all_forums'] = "Mark all forums read";
  
+ 
  //
  // Stats block text
***************
*** 171,174 ****
--- 177,181 ----
  $lang['Joined'] = "Joined";
  
+ 
  //
  // Login
***************
*** 181,184 ****
--- 188,192 ----
  $lang['Log_me_in'] = "Log me on automatically each visit";
  
+ 
  //
  // Index page
***************
*** 188,191 ****
--- 196,200 ----
  $lang['No_forums'] = "This board has no forums";
  
+ $lang['Private_Message'] = "Private Message";
  $lang['Private_Messages'] = "Private Messages";
  $lang['Who_is_Online'] = "Who is Online";
***************
*** 193,196 ****
--- 202,206 ----
  $lang['Forums_marked_read'] = "All forums have been marked read";
  
+ 
  //
  // Viewforum
***************
*** 211,214 ****
--- 221,225 ----
  $lang['Topics_marked_read'] = "The topics for this forum have now been marked read";
  
+ 
  //
  // Viewtopic
***************
*** 259,262 ****
--- 270,274 ----
  $lang['You_are_watching'] = "You are now watching this topic";
  
+ 
  //
  // Posting/Replying (Not private messaging!)
***************
*** 338,341 ****
--- 350,354 ----
  $lang['Topic_reply_notification'] = "Topic Reply Notification";
  
+ 
  //
  // Private Messaging
***************
*** 399,402 ****
--- 412,416 ----
  $lang['full'] = "full";
  
+ 
  //
  // Profiles/Registration
***************
*** 416,420 ****
  $lang['Email_address'] = "Email address";
  $lang['Email'] = "Email";
! $lang['Private_message'] = "Send Private Message";
  $lang['Hidden_email'] = "[ Hidden ]";
  $lang['Search_user_posts'] = "Search for posts by this user";
--- 430,434 ----
  $lang['Email_address'] = "Email address";
  $lang['Email'] = "Email";
! $lang['Send_private_message'] = "Send private message";
  $lang['Hidden_email'] = "[ Hidden ]";
  $lang['Search_user_posts'] = "Search for posts by this user";
***************
*** 518,521 ****
--- 532,536 ----
  $lang['Password_activated'] = "Your account has been re-activated. To logon please use the password supplied in the email you received";
  
+ 
  //
  // Memberslist
***************
*** 528,531 ****
--- 543,547 ----
  $lang['Order'] = "Order";
  
+ 
  //
  // Group control panel
***************
*** 539,542 ****
--- 555,561 ----
  $lang['Group_description'] = "Group description";
  $lang['Group_membership'] = "Group membership";
+ $lang['Group_Members'] = "Group Members";
+ $lang['Group_Moderator'] = "Group Moderator";
+ $lang['Pending_members'] = "Pending Members";
  
  $lang['Current_memberships'] = "Current memberships";
***************
*** 546,561 ****
  $lang['Join_group'] = "Join Group";
  $lang['No_group_members'] = "This group has no members";
! 
! $lang["Group_joined"] = "You have successfully subscribed to this group, you will be notifed when your subscription is approved by the group moderator.";
  $lang['Group_request'] = "A request to join your group has been made";
  $lang['Group_approved'] = "Your request has been approved";
! $lang['Group_added'] = "You have been added!";
  
! $lang['Could_not_add_user'] = "Could not add the selected user. Please go back and make sure you typed the correct username.";
  
  $lang['Confirm_unsub'] = "Are you sure you want to unsubscribe from this group?";
! $lang['Confirm_unsub_pending'] = "Are you sure you want to unsubscribe from this group? You subscription has not yet been approved or denied!";
  
! $lang['Usub_success'] = "You have been successfully unsubscribed from this group.";
  
  $lang['Approve_selected'] = "Approve Selected";
--- 565,580 ----
  $lang['Join_group'] = "Join Group";
  $lang['No_group_members'] = "This group has no members";
! $lang['No_pending_group_members'] = "This group has no pending members";
! $lang["Group_joined"] = "You have successfully subscribed to this group<br />You will be notifed when your subscription is approved by the group moderator";
  $lang['Group_request'] = "A request to join your group has been made";
  $lang['Group_approved'] = "Your request has been approved";
! $lang['Group_added'] = "You have been added to this usergroup";
  
! $lang['Could_not_add_user'] = "The user you selected does not exist";
  
  $lang['Confirm_unsub'] = "Are you sure you want to unsubscribe from this group?";
! $lang['Confirm_unsub_pending'] = "Your subscription to this group has not yet been approved, are you sure you want to unsubscribe?";
  
! $lang['Unsub_success'] = "You have been unsubscribed from this group.";
  
  $lang['Approve_selected'] = "Approve Selected";
***************
*** 569,572 ****
--- 588,592 ----
  $lang['This_closed_group'] = "This is a closed group, no more users accepted";
  $lang['Member_this_group'] = "You are a member of this group";
+ $lang['Pending_this_group'] = "Your membership of this group is pending";
  $lang['Are_group_moderator'] = "You are the group moderator";
  $lang['None'] = "None";
***************
*** 601,608 ****
  $lang['matches'] = "Matches";
  $lang['Search_new'] = "View posts since last visit";
- //
- // Topic Admin <= Should be blank for now
- //
  
  //
  // Auth related entries
--- 621,626 ----
  $lang['matches'] = "Matches";
  $lang['Search_new'] = "View posts since last visit";
  
+ 
  //
  // Auth related entries
***************
*** 626,629 ****
--- 644,648 ----
  $lang['this_forum'] = " this forum";
  
+ 
  //
  // Viewonline
***************
*** 645,648 ****
--- 664,668 ----
  $lang['Viewing_FAQ'] = "Viewing FAQ";
  
+ 
  //
  // Errors (not related to a
***************
*** 666,669 ****
--- 686,690 ----
  $lang['Not_Authorised'] = "Not Authorised";
  
+ 
  //
  // Moderator Control Panel
***************
*** 702,705 ****
--- 723,727 ----
  $lang['Lookup_IP'] = "Look up IP";
  
+ 
  //
  // Timezones ... for display on each page
***************
*** 738,746 ****
  $lang['12'] = "GMT + 12" . " " . $lang['Hours'];
  
! //
  // Main Admin section/s
! //
  
  // Index
  $lang['Admin'] = "Administration";
  $lang['Not_admin'] = "You are not authorised to administer this board";
--- 760,771 ----
  $lang['12'] = "GMT + 12" . " " . $lang['Hours'];
  
! 
! // --------------------
  // Main Admin section/s
! // --------------------
  
+ //
  // Index
+ //
  $lang['Admin'] = "Administration";
  $lang['Not_admin'] = "You are not authorised to administer this board";
***************
*** 748,751 ****
--- 773,778 ----
  $lang['Admin_intro'] = "Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. You can get back to this page by clicking on the <u>Admin Index</u> link in the left pane. To return to the index of your board, click the phpBB logo also in the left pane. The other links on the left hand side of this screen will allow you to control every aspect of your forum experience, each screen will have instructions on how to use the tools.";
  $lang['Forum_stats'] = "Forum Statistics";
+ $lang['Admin_Index'] = "Admin Index";
+ $lang['Preview_forum'] = "Preview Forum";
  
  $lang['Statistic'] = "Statistic";
***************
*** 760,766 ****
--- 787,797 ----
  $lang['Avatar_dir_size'] = "Avatar directory size";
  $lang['Database_size'] = "Database size";
+ $lang['Gzip_compression'] ="Gzip compression";
  $lang['Not_available'] = "Not available";
  
+ 
+ //
  // DB Utils
+ //
  $lang['Database_Utilities'] = "Database Utilities";
  $lang['Restore'] = "Restore";
***************
*** 786,790 ****
--- 817,824 ----
  $lang['Restore_Error_no_file'] = "No file was uploaded";
  
+ 
+ //
  // Auth pages
+ //
  $lang['Administrator'] = "Administrator";
  $lang['User'] = "User";
***************
*** 846,854 ****
--- 880,894 ----
  $lang['Group_has_members'] = "This group has the following members";
  
+ $lang['Forum_auth_updated'] = "Forum permissions updated";
+ $lang['User_auth_updated'] = "User permissions updated";
+ $lang['Group_auth_updated'] = "Group permissions updated";
+ $lang['return_forum_auth_admin'] = "to return to the forum permissions panel";
  $lang['return_group_auth_admin'] = "to return to the group permissions panel";
  $lang['return_user_auth_admin'] = "to return to the user permissions panel";
  
  
+ //
  // Banning
+ //
  $lang['Ban_control'] = "Ban Control";
  $lang['Ban_explain'] = "Here you can control the banning of users. You can achieve this by banning either or both of a specific user or an individual or range of IP addresses or hostnames. These methods prevent a user from even reaching the index page of your board. To prevent a user from registering under a different username you can also specify a banned email address. Please note that banning an email address alone will not prevent that user from being able to logon or post to your board, you should use one of the first two methods to achieve this.";
***************
*** 878,882 ****
--- 918,924 ----
  
  
+ //
  // Configuration
+ //
  $lang['General_Config'] = "General Configuration";
  $lang['Config_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.";
***************
*** 885,913 ****
  $lang['Acct_activation'] = "Enable account activation";
  
- 
- $lang['Config_updated'] = "Forum Configuration Updated Sucessfully";
  
! 
  // Forum Management
  $lang['Remove'] = "Remove";
  $lang['Action'] = "Action";
  $lang['Update_order'] = "Update Order";
! 
  
  // Smiley Management
! $lang['smile_remove_err'] = "Error Deleting Smiley!";
  $lang['smiley_return'] = "Return to smiley listing";
! $lang['smiley_del_success'] = "The smiley was successfully removed!";
! $lang['smile_edit_err'] = "Error processing smiley edits";
  $lang['smiley_title'] = "Smiles Editing Utility";
  $lang['smiley_code'] = "Smiley Code";
  $lang['smiley_url'] = "Smiley Image File";
  $lang['smiley_emot'] = "Smiley Emotion";
! $lang['smiley_add_success'] = "The smiley was successfully added!";
! $lang['smiley_edit_success'] = "The smiley was successfully updated!";
! $lang['smile_load_err'] = "There was an error retrieving the smilies!";
  $lang['smile_add'] = "Add a new Smiley";
! $lang['smile_desc'] = "Some wonderful text describing the smiley administration here :)";
! $lang['smile_instr'] = "There should be some text here with instructions on what the admin should fill in for the smiley fields when editing or adding a smiley.";
  $lang['smiley_config'] = "Smiley Configuration";
  $lang['Code'] = "Code";
--- 927,964 ----
  $lang['Acct_activation'] = "Enable account activation";
  
  
! //
  // Forum Management
+ //
+ $lang['Forum_admin'] = "Forum Administration";
+ $lang['Forum_admin_explain'] = "From this panel you can add, delete, edit, re-order and re-synchronise categories and forums";
+ $lang['Edit_forum'] = "Edit forum";
+ $lang['Create_forum'] = "Create new forum";
+ $lang['Create_category'] = "Create new category";
  $lang['Remove'] = "Remove";
  $lang['Action'] = "Action";
  $lang['Update_order'] = "Update Order";
! $lang['Config_updated'] = "Forum Configuration Updated Sucessfully";
! $lang['Edit'] = "Edit";
! $lang['Delete'] = "Delete";
! $lang['Move_up'] = "Move up";
! $lang['Move_down'] = "Move down";
! $lang['Resync'] = "Resync";
! $lang['No_mode'] = "No mode was set";
! $lang['Forum_edit_delete_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side";
  
+ //
  // Smiley Management
! //
  $lang['smiley_return'] = "Return to smiley listing";
! $lang['smiley_del_success'] = "The smiley was successfully removed";
  $lang['smiley_title'] = "Smiles Editing Utility";
  $lang['smiley_code'] = "Smiley Code";
  $lang['smiley_url'] = "Smiley Image File";
  $lang['smiley_emot'] = "Smiley Emotion";
! $lang['smiley_add_success'] = "The smiley was successfully added";
! $lang['smiley_edit_success'] = "The smiley was successfully updated";
  $lang['smile_add'] = "Add a new Smiley";
! $lang['smile_desc'] = "From this page you can add, remove and edit the emoticons or smileys your users can use in their posts and private messages.";
  $lang['smiley_config'] = "Smiley Configuration";
  $lang['Code'] = "Code";
***************
*** 915,919 ****
--- 966,973 ----
  $lang['Emotion'] = "Emotion";
  
+ 
+ //
  // User Management
+ //
  $lang['User_admin'] = "Administration";
  $lang['User_admin_explain'] = "Here you can change your user's information and certain specific options. To modify the users permissions please use the user and group permissions system.";
***************
*** 928,937 ****
  $lang['User_special_explain'] = "These fields are not able to be modified by the users.  Here you can set their status and other options that are not given to users.";
  
  // Group Management
! $lang['Group_admin_explain'] = "Here you can administer all your groups, including deleting, adding, as well as editing groups.  You may choose moderators, toggle open/closed group status, and set the name and description.";
! $lang['Error_updating_groups'] = "There was an error while updating the groups.";
! $lang['Success_updating_groups'] = "The group was updated/added successfully.";
! $lang['Group_mode_not_selected'] = "You did not select a mode. Please go back and try again.";
! $lang['Group_edit_explain'] = "Edit group:";
  $lang['group_name'] = "Group name";
  $lang['group_description'] = "Group description";
--- 982,996 ----
  $lang['User_special_explain'] = "These fields are not able to be modified by the users.  Here you can set their status and other options that are not given to users.";
  
+ 
+ //
  // Group Management
! //
! $lang['Group_admin_explain'] = "From this panel you can administer all your usergroups, you can; delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description";
! $lang['Error_updating_groups'] = "There was an error while updating the groups";
! $lang['Updated_group'] = "The group was successfully updated";
! $lang['Added_new_group'] = "The new group was successfully created";
! $lang['Deleted_group'] = "The group was successfully deleted";
! $lang['New_group'] = "Create new group";
! $lang['Edit_group'] = "Edit group";
  $lang['group_name'] = "Group name";
  $lang['group_description'] = "Group description";
***************
*** 940,948 ****
  $lang['group_open'] = "Open group";
  $lang['group_closed'] = "Closed group";
- $lang['New_group'] = "Click here to create a new group.";
  $lang['group_delete'] = "Delete group";
! $lang['group_delete_check'] = "Click here to delete this group.";
  $lang['submit_group_changes'] = "Submit Changes";
  $lang['reset_group_changes'] = "Reset Changes";
  
  //
--- 999,1010 ----
  $lang['group_open'] = "Open group";
  $lang['group_closed'] = "Closed group";
  $lang['group_delete'] = "Delete group";
! $lang['group_delete_check'] = "Delete this group";
  $lang['submit_group_changes'] = "Submit Changes";
  $lang['reset_group_changes'] = "Reset Changes";
+ $lang['No_group_name'] = "You must specify a name for this group";
+ $lang['No_group_moderator'] = "You must specify a moderator for this group";
+ $lang['No_group_mode'] = "You must specify a mode for this group, open or closed";
+ 
  
  //
***************
*** 960,963 ****
--- 1022,1027 ----
  $lang['Posts_pruned'] = "Posts pruned";
  $lang['Prune_success'] = "Pruning of forums was successful";
+ 
+ 
  //
  // Word censor
***************
*** 976,985 ****
  $lang['Word_removed'] = "The selected word censor has been successfully removed";
  
  //
! //Mass Email
  //
  $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients.  If you are emailing a large group of people, please be patient after submiting and DO NOT stop the page halfway through.  It is normal for amass emailing to take a long time.";
  $lang['Compose'] = "Compose";
  
  //
  // Install Process
--- 1040,1051 ----
  $lang['Word_removed'] = "The selected word censor has been successfully removed";
  
+ 
  //
! // Mass Email
  //
  $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients.  If you are emailing a large group of people, please be patient after submiting and DO NOT stop the page halfway through.  It is normal for amass emailing to take a long time.";
  $lang['Compose'] = "Compose";
  
+ 
  //
  // Install Process
***************
*** 1009,1012 ****
--- 1075,1079 ----
  $lang['Download_config'] = "Download Config";
  
+ 
  //
  // Ranks admin
***************
*** 1014,1031 ****
  $lang['Must_select_rank'] = "Sorry, you didn't select a rank.  Please go back and try again.";
  $lang['Ranks_title'] = "Rank Administration";
! $lang['Ranks_explain'] = "Here you can add, edit, view, and delete ranks. This is also a place to create custom ranks.";
  $lang['Rank_title'] = "Rank Title";
! $lang['Rank_special'] = "Special rank?";
  $lang['Rank_minimum'] = "Minimum Posts";
  $lang['Rank_maximum'] = "Maximum Posts";
! $lang['Rank_updated'] = "The rank was successfully updated.";
! $lang['Rank_added'] = "The rank was successfully added.";
! $lang['Rank_removed'] = "The rank was successfully deleted.";
  $lang['Add_new_rank'] = "Add new rank";
  $lang['Rank_image'] = "Rank Image";
! $lang['Rank_image_explain'] = "This is the place to set a custom image for everyone in the rank. Please enter a URL, beginning with http://";
  
  //
! // End
  // -------------------------------------------------
  
--- 1081,1099 ----
  $lang['Must_select_rank'] = "Sorry, you didn't select a rank.  Please go back and try again.";
  $lang['Ranks_title'] = "Rank Administration";
! $lang['Ranks_explain'] = "Here you can add, edit, view, and delete ranks. This is also a place to create custom ranks";
  $lang['Rank_title'] = "Rank Title";
! $lang['Rank_special'] = "Is special rank";
  $lang['Rank_minimum'] = "Minimum Posts";
  $lang['Rank_maximum'] = "Maximum Posts";
! $lang['Rank_updated'] = "The rank was successfully updated";
! $lang['Rank_added'] = "The rank was successfully added";
! $lang['Rank_removed'] = "The rank was successfully deleted";
  $lang['Add_new_rank'] = "Add new rank";
  $lang['Rank_image'] = "Rank Image";
! $lang['Rank_image_explain'] = "This is the place to set a custom image for everyone in the rank. You can specify either a relative or absolute path to the image";
! $lang['return_rank_admin'] = "to return to rank admin";
  
  //
! // That's all Folks!
  // -------------------------------------------------
  

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,NONE,1.1 admin_board.php,1.27,1.28 admin_db_utilities.php,1.25,1.26 admin_forumauth.php,1.12,1.13 admin_forum_prune.php,1.8,1.9 admin_forums.php,1.22,1.23 admin_groupauth.php,1.18,1.19 admin_groups.php,1.9,1.10 admin_mass_email.php,1.5,1.6 admin_ranks.php,1.1,1.2 admin_smilies.php,1.8,1.9 admin_userauth.php,1.19,1.20 admin_user_ban.php,1.9,1.10 admin_users.php,1.23,1.24 admin_words.php,1.4,1.5 index.php,1.20,1.21 page_footer_admin.php,1.4,1.5 page_header_admin.php,1.7,1.8 pagestart.inc,1.6,1.7

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv14210

Modified Files:
	admin_board.php admin_db_utilities.php admin_forumauth.php 
	admin_forum_prune.php admin_forums.php admin_groupauth.php 
	admin_groups.php admin_mass_email.php admin_ranks.php 
	admin_smilies.php admin_userauth.php admin_user_ban.php 
	admin_users.php admin_words.php index.php 
	page_footer_admin.php page_header_admin.php pagestart.inc 
Added Files:
	admin_styles.php 
Log Message:
Various updates, cleanups and support for URI based sessions ... more to come at some point

--- NEW FILE ---
<?php
/***************************************************************************
 *                              admin_words.php
 *                            -------------------
 *   begin                : Thursday, Jul 12, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : su...@ph...
 *
 *   $Id: admin_styles.php,v 1.1 2001/10/14 15:46:53 psotfx Exp $
 *
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

if($setmodules == 1)
{
	$file = basename(__FILE__);
	$module['Styles']['Add_new'] = "$file?mode=addnew";
	$module['Styles']['Create_new'] = "$file?mode=addnew";
	$module['Styles']['Manage'] = "$file";
	return;
}

//
// Load default header
//
$phpbb_root_dir = "./../";
require('pagestart.inc');

if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
{
	$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
}
else 
{
	$mode = "";
}

include('page_footer_admin.'.$phpEx);

?>
Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** admin_board.php	2001/10/11 22:01:11	1.27
--- admin_board.php	2001/10/14 15:46:53	1.28
***************
*** 23,32 ****
  //
  $phpbb_root_dir = "./../";
  
  //
- // Include required files, get $phpEx and check permissions
  //
! require('pagestart.inc');
! 
  $sql = "SELECT *
  	FROM " . CONFIG_TABLE;
--- 23,31 ----
  //
  $phpbb_root_dir = "./../";
+ require('pagestart.inc');
  
  //
  //
! //
  $sql = "SELECT *
  	FROM " . CONFIG_TABLE;
***************
*** 98,102 ****
  
  $template->set_filenames(array(
! 	"body" => "admin/admin_config_body.tpl")
  );
  
--- 97,101 ----
  
  $template->set_filenames(array(
! 	"body" => "admin/board_config_body.tpl")
  );
  

Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** admin_db_utilities.php	2001/09/25 00:48:12	1.25
--- admin_db_utilities.php	2001/10/14 15:46:53	1.26
***************
*** 38,64 ****
  }
  
- $phpbb_root_path = "./../";
- include($phpbb_root_path . 'extension.inc');
- include($phpbb_root_path . 'common.'.$phpEx);
  //
! // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
! init_userprefs($userdata);
! //
! // End session management
! //
! 
! //
! // Is user logged in? If yes are they an admin?
! //
! if( !$userdata['session_logged_in'] )
! {
! 	header("Location: ../login.$phpEx?forward_page=admin/");
! }
! else if( $userdata['user_level'] != ADMIN )
! {
! 	message_die(GENERAL_MESSAGE, $lang['Not_admin']);
! }
  
  //
--- 38,48 ----
  }
  
  //
! // Load default header
  //
! $phpbb_root_dir = "./../";
! $no_page_header = TRUE;
! require('pagestart.inc');
! include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
  
  //
***************
*** 73,86 ****
  @set_time_limit(1200);
  
! //
! // Pull in the functions for splitting an sql file into individual statements
! //
! 
! include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
! 
! //
  // The following functions are adapted from phpMyAdmin and upgrade_20.php
  //
- 
  //
  // This function is used for grabbing the sequences for postgres...
--- 57,63 ----
  @set_time_limit(1200);
  
! // -----------------------
  // The following functions are adapted from phpMyAdmin and upgrade_20.php
  //
  //
  // This function is used for grabbing the sequences for postgres...

Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** admin_forumauth.php	2001/09/06 00:29:07	1.12
--- admin_forumauth.php	2001/10/14 15:46:53	1.13
***************
*** 21,24 ****
--- 21,26 ----
   ***************************************************************************/
  
+ define("IN_ADMIN", true);
+ 
  if($setmodules == 1)
  {
***************
*** 30,37 ****
  
  //
! // Include required files, get $phpEx and check permissions
  //
  require('pagestart.inc');
  
  //
  // Start program - define vars
--- 32,42 ----
  
  //
! // Load default header
  //
+ $phpbb_root_dir = "./../";
+ $no_page_header = TRUE;
  require('pagestart.inc');
  
+ 
  //
  // Start program - define vars
***************
*** 68,72 ****
  if(isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]))
  {
! 	$forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? $HTTP_POST_VARS[POST_FORUM_URL] : $HTTP_GET_VARS[POST_FORUM_URL];
  	$forum_sql = "AND forum_id = $forum_id";
  }
--- 73,77 ----
  if(isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]))
  {
! 	$forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? intval($HTTP_POST_VARS[POST_FORUM_URL]) : intval($HTTP_GET_VARS[POST_FORUM_URL]);
  	$forum_sql = "AND forum_id = $forum_id";
  }
***************
*** 79,83 ****
  if( isset($HTTP_GET_VARS['adv']) )
  {
! 	$adv = $HTTP_GET_VARS['adv'];
  }
  else
--- 84,88 ----
  if( isset($HTTP_GET_VARS['adv']) )
  {
! 	$adv = intval($HTTP_GET_VARS['adv']);
  }
  else
***************
*** 89,93 ****
  // Start program proper
  //
! if(isset($HTTP_POST_VARS['submit']))
  {
  	$sql = "";
--- 94,98 ----
  // Start program proper
  //
! if( isset($HTTP_POST_VARS['submit']) )
  {
  	$sql = "";
***************
*** 125,128 ****
--- 130,142 ----
  					}
  				}
+ 
+ 				if($forum_auth_fields[$i] == 'auth_vote')
+ 				{
+ 					if( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL )
+ 					{
+ 						$value = AUTH_REG;
+ 					}
+ 				}
+ 
  				$sql .= $forum_auth_fields[$i] . " = " . $value;
  				if($i < count($forum_auth_fields) - 1)
***************
*** 144,152 ****
  		}
  
- 		unset($forum_id);
  		$forum_sql = "";
  		$adv = 0;
- 
  	}
  }
  
--- 158,171 ----
  		}
  
  		$forum_sql = "";
  		$adv = 0;
  	}
+ 
+ 	$template->assign_vars(array(
+ 		"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
+ 	);
+ 	$message = $lang['Forum_auth_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">" . $lang['Here'] . "</a> " . $lang['return_forum_auth_admin'];
+ 	message_die(GENERAL_MESSAGE, $message);
+ 
  }
  
***************
*** 165,169 ****
  $forum_rows = $db->sql_fetchrowset($f_result);
  
! if(empty($forum_id))
  {
  	//
--- 184,188 ----
  $forum_rows = $db->sql_fetchrowset($f_result);
  
! if( empty($forum_id) )
  {
  	//
***************
*** 235,239 ****
  	if( empty($adv) )
  	{
! 		$simple_auth = "&nbsp;<select name=\"simpleauth\">";
  
  		for($j = 0; $j < count($simple_auth_types); $j++)
--- 254,258 ----
  	if( empty($adv) )
  	{
! 		$simple_auth = "<select name=\"simpleauth\">";
  
  		for($j = 0; $j < count($simple_auth_types); $j++)
***************
*** 251,255 ****
  		}
  
! 		$simple_auth .= "</select>&nbsp;";
  
  		$template->assign_block_vars("forum_auth_titles", array(
--- 270,274 ----
  		}
  
! 		$simple_auth .= "</select>";
  
  		$template->assign_block_vars("forum_auth_titles", array(
***************
*** 300,304 ****
  	}
  
! 	$switch_mode = "admin_forumauth.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&adv=";
  	$switch_mode .= ( empty($adv) ) ? "1" : "0";
  	$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
--- 319,323 ----
  	}
  
! 	$switch_mode = append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&adv=");
  	$switch_mode .= ( empty($adv) ) ? "1" : "0";
  	$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
***************
*** 323,326 ****
--- 342,347 ----
  
  }
+ 
+ include('page_header_admin.'.$phpEx);
  
  $template->pparse("body");

Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_forum_prune.php	2001/09/06 00:44:46	1.8
--- admin_forum_prune.php	2001/10/14 15:46:53	1.9
***************
*** 42,47 ****
  
  //
! // Include required files, get $phpEx and check permissions
  //
  require('pagestart.inc');
  include($phpbb_root_path . 'includes/prune.php');
--- 42,48 ----
  
  //
! // Load default header
  //
+ $phpbb_root_dir = "./../";
  require('pagestart.inc');
  include($phpbb_root_path . 'includes/prune.php');

Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** admin_forums.php	2001/09/11 04:03:00	1.22
--- admin_forums.php	2001/10/14 15:46:53	1.23
***************
*** 23,31 ****
  if($setmodules==1)
  {
!         $file = basename(__FILE__);
!         $module['Forums']['Manage'] = $file;
!         return;
  }
  
  // ------------------
  // Begin function block
--- 23,46 ----
  if($setmodules==1)
  {
! 	$file = basename(__FILE__);
! 	$module['Forums']['Manage'] = $file;
! 	return;
  }
  
+ //
+ // Load default header
+ //
+ $phpbb_root_dir = "./../";
+ require('pagestart.inc');
+ 
+ if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
+ {
+ 	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+ }
+ else
+ {
+ 	$mode = "";
+ }
+ 
  // ------------------
  // Begin function block
***************
*** 190,211 ****
  
  //
! // Include required files, get $phpEx and check permissions
  //
! require('pagestart.inc');
! 
! if (isset($HTTP_POST_VARS['mode']))
  {
! 	$mode = $HTTP_POST_VARS['mode'];
! }
! elseif (isset($HTTP_GET_VARS['mode']))
! {
! 	$mode = $HTTP_GET_VARS['mode'];
! }
! else
! {
! 	unset($mode);
  }
  
! if(isset($mode))  // Are we supposed to do something?
  {
  	switch($mode)
--- 205,222 ----
  
  //
! // Begin program proper
  //
! if( isset($HTTP_POST_VARS['addforum']) || isset($HTTP_POST_VARS['addcategory']) )
  {
! 	$mode = ( isset($HTTP_POST_VARS['addforum']) ) ? "addforum" : "addcat";
! 
! 	if( $mode == "addforum" )
! 	{
! 		list($cat_id) = each($HTTP_POST_VARS['addforum']);
! 		$forumname = $HTTP_POST_VARS['forumname'][$cat_id];
! 	}
  }
  
! if( !empty($mode) ) 
  {
  	switch($mode)
***************
*** 213,282 ****
  		case 'addforum':
  		case 'editforum':
  			// Show form to create/modify a forum
  			if ($mode == 'editforum')
  			{
  				// $newmode determines if we are going to INSERT or UPDATE after posting?
  				$newmode = 'modforum';
! 				$buttonvalue = 'Change';
  
! 				$forum_id = $HTTP_GET_VARS['forum_id'];
  
  				$row = get_info('forum', $forum_id);
! 				$forumname = $row['forum_name'];
  				$cat_id = $row['cat_id'];
  				$forumdesc = $row['forum_desc'];
  				$forumstatus = $row['forum_status'];
  				//
  				// start forum prune stuff.
  				//
! 				if( $row['prune_enable'] == 1 )
  				{
  					$prune_enabled = "checked=\"checked\"";
  					$sql = "SELECT *
!                 			FROM " . PRUNE_TABLE . "
!                 			WHERE forum_id = $forum_id";
  					if(!$pr_result = $db->sql_query($sql))
  					{
  						 message_die(GENERAL_ERROR, "Auto-Prune: Couldn't read auto_prune table.", __LINE__, __FILE__);
          			}
  					$pr_row = $db->sql_fetchrow($pr_result);
  				}
  			}
  			else
  			{
  				$newmode = 'createforum';
! 				$buttonvalue = 'Create';
  
- 				$forumname = stripslashes($HTTP_POST_VARS['forumname']);
- 				$cat_id = $HTTP_POST_VARS['cat_id'];
  				$forumdesc = '';
  				$forumstatus = FORUM_UNLOCKED;
! 				$forum_id = '';
  			}
  
  			$catlist = get_list('category', $cat_id, TRUE);
  
! 			$forumstatus == FORUM_LOCKED ? $forumlocked = "selected=\"selected\"" : $forumunlocked = "selected=\"selected\"";
! 			$statuslist = "<option value=\"".FORUM_UNLOCKED."\" $forumunlocked>Unlocked</option>\n";
! 			$statuslist .= "<option value=\"".FORUM_LOCKED."\" $forumlocked>Locked</option>\n";
  
  			$template->set_filenames(array(
  				"body" => "admin/forum_edit_body.tpl")
  			);
  			$template->assign_vars(array(
! 				'FORUMNAME' => $forumname,
! 				'DESCRIPTION' => $forumdesc,
! 				'S_FORUM_ACTION' => $PHP_SELF,
  				'S_CATLIST' => $catlist,
  				'S_STATUSLIST' => $statuslist,
  				'S_FORUMID' => $forum_id,
  				'S_NEWMODE' => $newmode,
! 				'S_PRUNE_EN' => $prune_enabled,
! 				'S_PRUNE_DAYS' => $pr_row['prune_days'],
! 				'S_PRUNE_FREQ' => $pr_row['prune_freq'],
  				'L_ENABLED' => $lang['Enabled'],
  				'L_PRUNE_DAYS' => $lang['prune_days'],
  				'L_PRUNE_FREQ' => $lang['prune_freq'],
  				'L_DAYS' => $lang['days'],
  				'BUTTONVALUE' => $buttonvalue)
  			);
--- 224,309 ----
  		case 'addforum':
  		case 'editforum':
+ 			//
  			// Show form to create/modify a forum
+ 			//
  			if ($mode == 'editforum')
  			{
  				// $newmode determines if we are going to INSERT or UPDATE after posting?
+ 
+ 				$l_title = $lang['Edit_forum'];
  				$newmode = 'modforum';
! 				$buttonvalue = $lang['Update'];
  
! 				$forum_id = intval($HTTP_GET_VARS['forum_id']);
  
  				$row = get_info('forum', $forum_id);
! 
  				$cat_id = $row['cat_id'];
+ 				$forumname = $row['forum_name'];
  				$forumdesc = $row['forum_desc'];
  				$forumstatus = $row['forum_status'];
+ 
  				//
  				// start forum prune stuff.
  				//
! 				if( $row['prune_enable'] )
  				{
  					$prune_enabled = "checked=\"checked\"";
  					$sql = "SELECT *
!                			FROM " . PRUNE_TABLE . "
!                			WHERE forum_id = $forum_id";
  					if(!$pr_result = $db->sql_query($sql))
  					{
  						 message_die(GENERAL_ERROR, "Auto-Prune: Couldn't read auto_prune table.", __LINE__, __FILE__);
          			}
+ 
  					$pr_row = $db->sql_fetchrow($pr_result);
  				}
+ 				else
+ 				{
+ 					$prune_enabled = '';
+ 				}
  			}
  			else
  			{
+ 				$l_title = $lang['Create_forum'];
  				$newmode = 'createforum';
! 				$buttonvalue = $lang['Create_forum'];
  
  				$forumdesc = '';
  				$forumstatus = FORUM_UNLOCKED;
! 				$forum_id = ''; 
! 				$prune_enabled = '';
  			}
  
  			$catlist = get_list('category', $cat_id, TRUE);
  
! 			$forumstatus == ( FORUM_LOCKED ) ? $forumlocked = "selected=\"selected\"" : $forumunlocked = "selected=\"selected\"";
! 			$statuslist = "<option value=\"" . FORUM_UNLOCKED . "\" $forumunlocked>Unlocked</option>\n";
! 			$statuslist .= "<option value=\"" . FORUM_LOCKED . "\" $forumlocked>Locked</option>\n";
  
  			$template->set_filenames(array(
  				"body" => "admin/forum_edit_body.tpl")
  			);
+ 
  			$template->assign_vars(array(
! 				'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
  				'S_CATLIST' => $catlist,
  				'S_STATUSLIST' => $statuslist,
  				'S_FORUMID' => $forum_id,
  				'S_NEWMODE' => $newmode,
! 				'S_PRUNE_ENABLED' => $prune_enabled,
! 				'S_PRUNE_DAYS' => ( isset($pr_row['prune_days']) ) ? $pr_row['prune_days'] : 7,
! 				'S_PRUNE_FREQ' => ( isset($pr_row['prune_freq']) ) ? $pr_row['prune_freq'] : 1,
! 
! 				"L_FORUM_TITLE" => $l_title, 
! 				"L_FORUM_EXPLAIN" => $lang['Forum_edit_delete_explain'], 
  				'L_ENABLED' => $lang['Enabled'],
  				'L_PRUNE_DAYS' => $lang['prune_days'],
  				'L_PRUNE_FREQ' => $lang['prune_freq'],
  				'L_DAYS' => $lang['days'],
+ 
+ 				'FORUMNAME' => $forumname,
+ 				'DESCRIPTION' => $forumdesc,
  				'BUTTONVALUE' => $buttonvalue)
  			);
***************
*** 285,293 ****
  
  		case 'createforum':
  			// Create a forum in the DB
! 			if( trim($HTTP_POST_VARS['forumname']) == '')
  			{
  				message_die(GENERAL_ERROR, "Can't create a forum without a name");
  			}
  			$sql = "SELECT MAX(forum_order) AS max_order
  				FROM " . FORUMS_TABLE . "
--- 312,323 ----
  
  		case 'createforum':
+ 			//
  			// Create a forum in the DB
! 			//
! 			if( trim($HTTP_POST_VARS['forumname']) == "" )
  			{
  				message_die(GENERAL_ERROR, "Can't create a forum without a name");
  			}
+ 
  			$sql = "SELECT MAX(forum_order) AS max_order
  				FROM " . FORUMS_TABLE . "
***************
*** 303,308 ****
  
  			// There is no problem having duplicate forum names so we won't check for it.
! 			$sql = "INSERT INTO " . FORUMS_TABLE . " (forum_name, cat_id, forum_desc, forum_order, forum_status)
! 				VALUES ('" . $HTTP_POST_VARS['forumname'] . "', " . $HTTP_POST_VARS['cat_id'] . ", '" . $HTTP_POST_VARS['forumdesc'] . "', $next_order, " . $HTTP_POST_VARS['forumstatus'] . ")";
  			if( !$result = $db->sql_query($sql) )
  			{
--- 333,338 ----
  
  			// There is no problem having duplicate forum names so we won't check for it.
! 			$sql = "INSERT INTO " . FORUMS_TABLE . " (forum_name, cat_id, forum_desc, forum_order, forum_status, prune_enable)
! 				VALUES ('" . $HTTP_POST_VARS['forumname'] . "', " . intval($HTTP_POST_VARS['cat_id']) . ", '" . $HTTP_POST_VARS['forumdesc'] . "', $next_order, " . intval($HTTP_POST_VARS['forumstatus']) . ", " . intval($HTTP_POST_VARS['prune_enable']) . ")";
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 310,323 ****
  			}
  
! 			if( $HTTP_POST_VARS['prune_enable'] == TRUE )
  			{
  				$new_forum_id = $db->sql_nextid();
  				if($HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "")
  				{
! 					message_die(GENERAL_ERROR, $lang['Set_prune_data'], $lang['Error']);
  				}
  
  				$sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq)
! 					VALUES($new_forum_id, " . $HTTP_POST_VARS['prune_days'] . ", " . $HTTP_POST_VARS['prune_freq'] . ")";
  				if( !$result = $db->sql_query($sql) )
  				{
--- 340,354 ----
  			}
  
! 			if( $HTTP_POST_VARS['prune_enable'] )
  			{
  				$new_forum_id = $db->sql_nextid();
+ 
  				if($HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "")
  				{
! 					message_die(GENERAL_MESSAGE, $lang['Set_prune_data']);
  				}
  
  				$sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq)
! 					VALUES($new_forum_id, " . intval($HTTP_POST_VARS['prune_days']) . ", " . intval($HTTP_POST_VARS['prune_freq']) . ")";
  				if( !$result = $db->sql_query($sql) )
  				{
***************
*** 335,338 ****
--- 366,370 ----
  				$HTTP_POST_VARS['prune_enable'] = 0;
  			}
+ 
  			$sql = "UPDATE " . FORUMS_TABLE . "
  				SET forum_name = '" . $HTTP_POST_VARS['forumname'] . "', cat_id = " . $HTTP_POST_VARS['cat_id'] . ", forum_desc = '" . $HTTP_POST_VARS['forumdesc'] . "', forum_status = " . $HTTP_POST_VARS['forumstatus'] . ", prune_enable = " . $HTTP_POST_VARS['prune_enable'] . "
***************
*** 347,351 ****
  				if($HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "")
  				{
! 					message_die(GENERAL_ERROR, $lang['Set_prune_data'], $lang['Error']);
  				}
  
--- 379,383 ----
  				if($HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "")
  				{
! 					message_die(GENERAL_MESSAGE, $lang['Set_prune_data']);
  				}
  
***************
*** 380,387 ****
  		case 'addcat':
  			// Create a category in the DB
! 			if( trim($HTTP_POST_VARS['catname']) == '')
  			{
  				message_die(GENERAL_ERROR, "Can't create a category without a name");
  			}
  			$sql = "SELECT MAX(cat_order) AS max_order
  				FROM " . CATEGORIES_TABLE;
--- 412,420 ----
  		case 'addcat':
  			// Create a category in the DB
! 			if( trim($HTTP_POST_VARS['categoryname']) == '')
  			{
  				message_die(GENERAL_ERROR, "Can't create a category without a name");
  			}
+ 
  			$sql = "SELECT MAX(cat_order) AS max_order
  				FROM " . CATEGORIES_TABLE;
***************
*** 399,403 ****
  			//
  			$sql = "INSERT INTO " . CATEGORIES_TABLE . " (cat_title, cat_order)
! 				VALUES ('" . $HTTP_POST_VARS['catname'] . "', $next_order)";
  			if( !$result = $db->sql_query($sql) )
  			{
--- 432,436 ----
  			//
  			$sql = "INSERT INTO " . CATEGORIES_TABLE . " (cat_title, cat_order)
! 				VALUES ('" . $HTTP_POST_VARS['categoryname'] . "', $next_order)";
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 468,475 ****
  
  		case 'movedelforum':
  			// Move or delete a forum in the DB
! 			$from_id = $HTTP_POST_VARS['from_id'];
! 			$to_id = $HTTP_POST_VARS['to_id'];
! 			$delete_old = $HTTP_POST_VARS['delete_old'];
  
  
--- 501,510 ----
  
  		case 'movedelforum':
+ 			//
  			// Move or delete a forum in the DB
! 			//
! 			$from_id = intval($HTTP_POST_VARS['from_id']);
! 			$to_id = intval($HTTP_POST_VARS['to_id']);
! 			$delete_old = intval($HTTP_POST_VARS['delete_old']);
  
  
***************
*** 518,526 ****
  
  			$show_index = TRUE;
  			break;
  			
  		case 'deletecat':
  			// Show form to delete a category
! 			$cat_id = $HTTP_GET_VARS['cat_id'];
  			$buttonvalue = "Move&Delete";
  			$newmode = 'movedelcat';
--- 553,565 ----
  
  			$show_index = TRUE;
+ 
  			break;
  			
  		case 'deletecat':
+ 			//
  			// Show form to delete a category
! 			//
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
! 
  			$buttonvalue = "Move&Delete";
  			$newmode = 'movedelcat';
***************
*** 538,542 ****
  				$count = $db->sql_fetchrow($result);
  				$count = $count['total'];
! 				print "count = $count";
  				if ($count > 0)
  				{
--- 577,581 ----
  				$count = $db->sql_fetchrow($result);
  				$count = $count['total'];
! 
  				if ($count > 0)
  				{
***************
*** 560,564 ****
  			$template->assign_vars(array(
  				'NAME' => $name,
! 				'S_FORUM_ACTION' => $PHP_SELF,
  				'S_FROM_ID' => $cat_id,
  				'S_SELECT_TO' => $select_to,
--- 599,603 ----
  			$template->assign_vars(array(
  				'NAME' => $name,
! 				'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), 
  				'S_FROM_ID' => $cat_id,
  				'S_SELECT_TO' => $select_to,
***************
*** 570,576 ****
  
  		case 'movedelcat':
  			// Move or delete a category in the DB
! 			$from_id = $HTTP_POST_VARS['from_id'];
! 			$to_id = $HTTP_POST_VARS['to_id'];
  
  			if (isset($to_id))
--- 609,617 ----
  
  		case 'movedelcat':
+ 			//
  			// Move or delete a category in the DB
! 			//
! 			$from_id = intval($HTTP_POST_VARS['from_id']);
! 			$to_id = intval($HTTP_POST_VARS['to_id']);
  
  			if (isset($to_id))
***************
*** 605,615 ****
  
  			$show_index = TRUE;
  			break;
  
  		case 'forum_order':
  			// Change order of forums in the DB
! 			$move = $HTTP_GET_VARS['move'];
! 			$forum_id = $HTTP_GET_VARS['forum_id'];
  			$forum_info = get_info('forum', $forum_id);
  			$cat_id = $forum_info['cat_id'];
  
--- 646,661 ----
  
  			$show_index = TRUE;
+ 
  			break;
  
  		case 'forum_order':
+ 			//
  			// Change order of forums in the DB
! 			//
! 			$move = intval($HTTP_GET_VARS['move']);
! 			$forum_id = intval($HTTP_GET_VARS['forum_id']);
! 
  			$forum_info = get_info('forum', $forum_id);
+ 
  			$cat_id = $forum_info['cat_id'];
  
***************
*** 621,632 ****
  				message_die(GENERAL_ERROR, "Couldn't change category order", "", __LINE__, __FILE__, $sql);
  			}
  			renumber_order('forum', $forum_info['cat_id']);
  			$show_index = TRUE;
  			break;
  			
  		case 'cat_order':
  			// Change order of categories in the DB
! 			$move = $HTTP_GET_VARS['move'];
! 			$cat_id = $HTTP_GET_VARS['cat_id'];
  
  			$sql = "UPDATE " . CATEGORIES_TABLE . "
--- 667,682 ----
  				message_die(GENERAL_ERROR, "Couldn't change category order", "", __LINE__, __FILE__, $sql);
  			}
+ 
  			renumber_order('forum', $forum_info['cat_id']);
  			$show_index = TRUE;
+ 
  			break;
  			
  		case 'cat_order':
+ 			//
  			// Change order of categories in the DB
! 			//
! 			$move = intval($HTTP_GET_VARS['move']);
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
  
  			$sql = "UPDATE " . CATEGORIES_TABLE . "
***************
*** 637,651 ****
  				message_die(GENERAL_ERROR, "Couldn't change category order", "", __LINE__, __FILE__, $sql);
  			}
  			renumber_order('category');
  			$show_index = TRUE;
  			break;
  
  		case 'forum_sync':
! 			sync('forum', $HTTP_GET_VARS['forum_id']);
  			$show_index = TRUE;
  			break;
  
  		default:
! 			message_die(GENERAL_ERROR, "Oops! Wrong mode..");
  			break;
  	}
--- 687,704 ----
  				message_die(GENERAL_ERROR, "Couldn't change category order", "", __LINE__, __FILE__, $sql);
  			}
+ 
  			renumber_order('category');
  			$show_index = TRUE;
+ 
  			break;
  
  		case 'forum_sync':
! 			sync('forum', intval($HTTP_GET_VARS['forum_id']));
  			$show_index = TRUE;
+ 
  			break;
  
  		default:
! 			message_die(GENERAL_MESSAGE, $lang['No_mode']);
  			break;
  	}
***************
*** 661,665 ****
  //
  $template->set_filenames(array(
! 	"body" => "admin/forums_body.tpl")
  );
  
--- 714,730 ----
  //
  $template->set_filenames(array(
! 	"body" => "admin/forum_admin_body.tpl")
! );
! 
! $template->assign_vars(array(
! 	"L_FORUM_TITLE" => $lang['Forum_admin'], 
! 	"L_FORUM_EXPLAIN" => $lang['Forum_admin_explain'], 
! 	"L_CREATE_FORUM" => $lang['Create_forum'], 
! 	"L_CREATE_CATEGORY" => $lang['Create_category'], 
! 	"L_EDIT" => $lang['Edit'], 
! 	"L_DELETE" => $lang['Delete'], 
! 	"L_MOVE_UP" => $lang['Move_up'], 
! 	"L_MOVE_DOWN" => $lang['Move_down'], 
! 	"L_RESYNC" => $lang['Resync'])
  );
  
***************
*** 667,676 ****
  	FROM " . CATEGORIES_TABLE . "
  	ORDER BY cat_order";
! if(!$q_categories = $db->sql_query($sql))
  {
  	message_die(GENERAL_ERROR, "Could not query categories list", "", __LINE__, __FILE__, $sql);
  }
  
! if($total_categories = $db->sql_numrows($q_categories))
  {
  	$category_rows = $db->sql_fetchrowset($q_categories);
--- 732,741 ----
  	FROM " . CATEGORIES_TABLE . "
  	ORDER BY cat_order";
! if( !$q_categories = $db->sql_query($sql) )
  {
  	message_die(GENERAL_ERROR, "Could not query categories list", "", __LINE__, __FILE__, $sql);
  }
  
! if( $total_categories = $db->sql_numrows($q_categories) )
  {
  	$category_rows = $db->sql_fetchrowset($q_categories);
***************
*** 686,692 ****
  	if( !$total_forums = $db->sql_numrows($q_forums) )
  	{
! 		// We don't have any forums
! 		
  	}
  	$forum_rows = $db->sql_fetchrowset($q_forums);
  
--- 751,760 ----
  	if( !$total_forums = $db->sql_numrows($q_forums) )
  	{
! 		$lang['No_forums'];
! 
! 		$template->assign_block_vars("no_forums", array());
! 	
  	}
+ 
  	$forum_rows = $db->sql_fetchrowset($q_forums);
  
***************
*** 696,714 ****
  	$gen_cat = array();
  
- 
  	for($i = 0; $i < $total_categories; $i++)
  	{
  		$cat_id = $category_rows[$i]['cat_id'];
! 				$template->assign_block_vars("catrow", array(
! 					"CAT_ID" => $cat_id,
! 					"CAT_DESC" => stripslashes($category_rows[$i]['cat_title']),
! 					"CAT_EDIT" => "<a href='".append_sid("$PHP_SELF?mode=editcat&cat_id=$cat_id")."'>Edit</a>",
! 					"CAT_DELETE" => "<a href='".append_sid("$PHP_SELF?mode=deletecat&cat_id=$cat_id")."'>Delete</a>",
! 					"CAT_UP" => "<a href='".append_sid("$PHP_SELF?mode=cat_order&move=-15&cat_id=$cat_id")."'>Move up</a>",
! 					"CAT_DOWN" => "<a href='".append_sid("$PHP_SELF?mode=cat_order&move=15&cat_id=$cat_id")."'>Move down</a>",
! 					"U_VIEWCAT" => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id"),
! 					"U_ADDFORUM" => append_sid("$PHP_SELF?mode=addforum&cat_id=$cat_id"),
! 					"ADDFORUM" => "Add Forum")
! 				);
  
  		for($j = 0; $j < $total_forums; $j++)
--- 764,784 ----
  	$gen_cat = array();
  
  	for($i = 0; $i < $total_categories; $i++)
  	{
  		$cat_id = $category_rows[$i]['cat_id'];
! 
! 		$template->assign_block_vars("catrow", array( 
! 			"S_ADD_FORUM_SUBMIT" => "addforum[$cat_id]", 
! 			"S_ADD_FORUM_NAME" => "forumname[$cat_id]", 
! 
! 			"CAT_ID" => $cat_id,
! 			"CAT_DESC" => $category_rows[$i]['cat_title'],
! 
! 			"U_CAT_EDIT" => append_sid("admin_forums.$phpEx?mode=editcat&amp;cat_id=$cat_id"),
! 			"U_CAT_DELETE" => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"),
! 			"U_CAT_MOVE_UP" => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"),
! 			"U_CAT_MOVE_DOWN" => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"),
! 			"U_VIEWCAT" => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id"))
! 		);
  
  		for($j = 0; $j < $total_forums; $j++)
***************
*** 716,770 ****
  			$forum_id = $forum_rows[$j]['forum_id'];
  			
- 			// Don't display this forum unless it's in this category..
  			if ($forum_rows[$j]['cat_id'] == $cat_id)
  			{
! 				//
! 				// This should end up in the template using IF...ELSE...ENDIF
! 				//
! 				$row_color == "#DDDDDD" ?	$row_color = "#CCCCCC" : $row_color = "#DDDDDD";
! 	
  				$template->assign_block_vars("catrow.forumrow",	array(
! 					"FORUM_NAME" => stripslashes($forum_rows[$j]['forum_name']),
! 					"FORUM_DESC" => stripslashes($forum_rows[$j]['forum_desc']),
  					"ROW_COLOR" => $row_color,
  					"NUM_TOPICS" => $forum_rows[$j]['forum_topics'],
  					"NUM_POSTS" => $forum_rows[$j]['forum_posts'],
! 					"U_VIEWFORUM" => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts']),
! 					"FORUM_EDIT" => "<a href='".append_sid("$PHP_SELF?mode=editforum&forum_id=$forum_id")."'>Edit</a>",
! 					"FORUM_DELETE" => "<a href='".append_sid("$PHP_SELF?mode=deleteforum&forum_id=$forum_id")."'>Delete</a>",
! 					"FORUM_UP" => "<a href='".append_sid("$PHP_SELF?mode=forum_order&move=-15&forum_id=$forum_id")."'>Move up</a>",
! 					"FORUM_DOWN" => "<a href='".append_sid("$PHP_SELF?mode=forum_order&move=15&forum_id=$forum_id")."'>Move down</a>",
! 					"FORUM_SYNC" => "<a href='".append_sid("$PHP_SELF?mode=forum_sync&forum_id=$forum_id")."'>Sync</a>")
  				);
  			}// if ... forumid == catid
  			
  		} // for ... forums
! 		$template->assign_block_vars("catrow.forumrow", array(
! 			"S_ADDFORUM" => '<FORM METHOD="POST" ACTION="'.append_sid($PHP_SELF).'">
! 					<INPUT TYPE="text" NAME="forumname">
! 					<INPUT TYPE="hidden" NAME="cat_id" VALUE="'.$cat_id.'">
! 					<INPUT TYPE="hidden" NAME="mode" VALUE="addforum">
! 					<INPUT TYPE="submit" NAME="submit" VALUE="Create new Forum">',
! 			"S_ADDFORUM_ENDFORM" => "</FORM>")
! 		);
  	} // for ... categories
- }// if ... total_categories
- $template->assign_block_vars("catrow", array(
- 	"S_ADDCAT" => '<FORM METHOD="POST" ACTION="'.append_sid($PHP_SELF).'">
- 			<INPUT TYPE="text" NAME="catname">
- 			<INPUT TYPE="hidden" NAME="mode" VALUE="addcat">
- 			<INPUT TYPE="submit" NAME="submit" VALUE="Create new category">',
- 	"S_ADDCAT_ENDFORM" => "</FORM>")
- );
  
  
- //
- // Generate the page
- //
  $template->pparse("body");
  
- //
- // Page Footer
- //
  include('page_footer_admin.'.$phpEx);
  ?>
--- 786,818 ----
  			$forum_id = $forum_rows[$j]['forum_id'];
  			
  			if ($forum_rows[$j]['cat_id'] == $cat_id)
  			{
! 
  				$template->assign_block_vars("catrow.forumrow",	array(
! 					"FORUM_NAME" => $forum_rows[$j]['forum_name'],
! 					"FORUM_DESC" => $forum_rows[$j]['forum_desc'],
  					"ROW_COLOR" => $row_color,
  					"NUM_TOPICS" => $forum_rows[$j]['forum_topics'],
  					"NUM_POSTS" => $forum_rows[$j]['forum_posts'],
! 
! 					"U_VIEWFORUM" => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;" . $forum_rows[$j]['forum_posts']),
! 					"U_FORUM_EDIT" => append_sid("admin_forums.$phpEx?mode=editforum&amp;forum_id=$forum_id"),
! 					"U_FORUM_DELETE" => append_sid("admin_forums.$phpEx?mode=deleteforum&amp;forum_id=$forum_id"),
! 					"U_FORUM_MOVE_UP" => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=-15&forum_id=$forum_id"),
! 					"U_FORUM_MOVE_DOWN" => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=15&forum_id=$forum_id"),
! 					"U_FORUM_RESYNC" => append_sid("admin_forums.$phpEx?mode=forum_sync&amp;forum_id=$forum_id"))
  				);
+ 
  			}// if ... forumid == catid
  			
  		} // for ... forums
! 
  	} // for ... categories
  
+ }// if ... total_categories
  
  $template->pparse("body");
  
  include('page_footer_admin.'.$phpEx);
+ 
  ?>

Index: admin_groupauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groupauth.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** admin_groupauth.php	2001/09/06 00:29:07	1.18
--- admin_groupauth.php	2001/10/14 15:46:53	1.19
***************
*** 29,56 ****
  }
  
- $phpbb_root_path = "./../";
- include($phpbb_root_path . 'extension.inc');
- include($phpbb_root_path . 'common.'.$phpEx);
- 
- //
- // Start session management
- //
- $userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
- init_userprefs($userdata);
- //
- // End session management
- //
- 
  //
! // Is user logged in? If yes are they an admin?
  //
! if( !$userdata['session_logged_in'] )
! {
! 	header("Location: ../login.$phpEx?forward_page=admin/");
! }
! else if( $userdata['user_level'] != ADMIN )
! {
! 	message_die(GENERAL_MESSAGE, $lang['Not_admin']);
! }
  
  //
--- 29,38 ----
  }
  
  //
! // Load default header
  //
! $phpbb_root_dir = "./../";
! $no_page_header = TRUE;
! require('pagestart.inc');
  
  //
***************
*** 127,134 ****
  
  
! if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_GROUPS_URL]))
  {
! 	$group_id = $HTTP_POST_VARS[POST_GROUPS_URL];
! 	$adv = (isset($HTTP_POST_VARS['adv'])) ? TRUE : FALSE;
  
  	//
--- 109,119 ----
  
  
! if( isset($HTTP_POST_VARS['submit']) && ( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_GROUPS_URL]) ) )
  {
! 	//
! 	// Front end
! 	//
! 	$group_id = ( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
! 	$adv = ( isset($HTTP_POST_VARS['adv']) ) ? TRUE : 0;
  
  	//
***************
*** 164,175 ****
  			AND g2.group_id = ug2.group_id
  			AND aa2.group_id = g2.group_id";
- /*
- 	$sql = "SELECT aa.*, g.group_single_user, g.group_id, g.group_name
- 		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g
- 		WHERE g.group_id = $group_id
- 			AND aa.group_id = g.group_id";*/
  	$ag_result = $db->sql_query($sql);
  
! 	if($num_g_access = $db->sql_numrows($ag_result))
  	{
  		$g_access = $db->sql_fetchrowset($ag_result);
--- 149,155 ----
  			AND g2.group_id = ug2.group_id
  			AND aa2.group_id = g2.group_id";
  	$ag_result = $db->sql_query($sql);
  
! 	if( $num_g_access = $db->sql_numrows($ag_result) )
  	{
  		$g_access = $db->sql_fetchrowset($ag_result);
***************
*** 520,575 ****
  
  }
! else if(empty($HTTP_GET_VARS[POST_GROUPS_URL]))
  {
  	//
- 	// Default user selection box
- 	//
- 	// This should be altered on the final system
- 	//
- 
- 	$sql = "SELECT group_id, group_name
- 		FROM " . GROUPS_TABLE . "
- 		WHERE group_single_user <> " . TRUE;
- 	$g_result = $db->sql_query($sql);
- 	$group_list = $db->sql_fetchrowset($g_result);
- 
- 	$select_list = "<select name=\"" . POST_GROUPS_URL . "\">";
- 	for($i = 0; $i < count($group_list); $i++)
- 	{
- 		$select_list .= "<option value=\"" . $group_list[$i]['group_id'] . "\">" . $group_list[$i]['group_name'] . "</option>";
- 	}
- 	$select_list .= "</select>";
- 
- 	include('page_header_admin.'.$phpEx);
- 
- 	$template->set_filenames(array(
- 		"body" => "admin/auth_select_body.tpl")
- 	);
- 
- 	$template->assign_vars(array(
- 		"L_AUTH_TITLE" => $lang['Group'] . " " . $lang['Auth_Control'],
- 		"L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
- 		"L_AUTH_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
- 		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
- 
- 		"S_AUTH_ACTION" => append_sid("admin_groupauth.$phpEx"),
- 		"S_AUTH_SELECT" => $select_list)
- 	);
- 
- }
- else
- {
- 	//
  	// Front end
  	//
! 	$group_id = $HTTP_GET_VARS[POST_GROUPS_URL];
! 	if( isset($HTTP_GET_VARS['adv']) )
! 	{
! 		$adv = $HTTP_GET_VARS['adv'];
! 	}
! 	else
! 	{
! 		$adv = FALSE;
! 	}
  
  	include('page_header_admin.'.$phpEx);
--- 500,510 ----
  
  }
! else if( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_GROUPS_URL])  )
  {
  	//
  	// Front end
  	//
! 	$group_id = ( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
! 	$adv = ( isset($HTTP_GET_VARS['adv']) ) ? $HTTP_GET_VARS['adv'] : 0;
  
  	include('page_header_admin.'.$phpEx);
***************
*** 903,907 ****
--- 838,878 ----
  		"S_HIDDEN_FIELDS" => $s_hidden_fields)
  	);
+ }
+ else
+ {
+ 	//
+ 	// Default user selection box
+ 	//
+ 	// This should be altered on the final system
+ 	//
  
+ 	$sql = "SELECT group_id, group_name
+ 		FROM " . GROUPS_TABLE . "
+ 		WHERE group_single_user <> " . TRUE;
+ 	$g_result = $db->sql_query($sql);
+ 	$group_list = $db->sql_fetchrowset($g_result);
+ 
+ 	$select_list = "<select name=\"" . POST_GROUPS_URL . "\">";
+ 	for($i = 0; $i < count($group_list); $i++)
+ 	{
+ 		$select_list .= "<option value=\"" . $group_list[$i]['group_id'] . "\">" . $group_list[$i]['group_name'] . "</option>";
+ 	}
+ 	$select_list .= "</select>";
+ 
+ 	include('page_header_admin.'.$phpEx);
+ 
+ 	$template->set_filenames(array(
+ 		"body" => "admin/auth_group_select_body.tpl")
+ 	);
+ 
+ 	$template->assign_vars(array(
+ 		"L_AUTH_TITLE" => $lang['Group'] . " " . $lang['Auth_Control'],
+ 		"L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
+ 		"L_AUTH_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
+ 		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
+ 
+ 		"S_AUTH_ACTION" => append_sid("admin_groupauth.$phpEx"),
+ 		"S_AUTH_SELECT" => $select_list)
+ 	);
  }
  

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** admin_groups.php	2001/10/10 18:06:27	1.9
--- admin_groups.php	2001/10/14 15:46:53	1.10
***************
*** 30,66 ****
  
  //
! // Include required files, get $phpEx and check permissions
  //
! $phpbb_root_path = "./../";
! include($phpbb_root_path . 'extension.inc');
! include($phpbb_root_path . 'common.'.$phpEx);
  
! //
! // Start session management
! //
! $userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
! init_userprefs($userdata);
! //
! // End session management
! //
! if( !$userdata['session_logged_in'] )
  {
! 	header("Location: ../login.$phpEx?forward_page=admin/");
  }
! else if( $userdata['user_level'] != ADMIN )
  {
! 	message_die(GENERAL_MESSAGE, $lang['Not_admin']);
  }
  
- $mode = isset($HTTP_POST_VARS['mode']) ? $HTTP_POST_VARS['mode'] : ((isset($HTTP_GET_VARS['mode'])) ? $HTTP_GET_VARS['mode'] : "");
  
! if($mode && empty($HTTP_POST_VARS['updategroup']))
  {
- 
  	//
  	// Ok they are editing a group or creating a new group
  	//
! 	include("page_header_admin." . $phpEx);
! 	if ( $mode == "editgroup" )
  	{
  		//
--- 30,54 ----
  
  //
! // Load default header
  //
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
  
! if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
  {
! 	$group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? $HTTP_POST_VARS[POST_GROUPS_URL] : $HTTP_GET_VARS[POST_GROUPS_URL];
  }
! else
  {
! 	$group_id = "";
  }
  
  
! if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
  {
  	//
  	// Ok they are editing a group or creating a new group
  	//
! 	if ( isset($HTTP_POST_VARS['edit']) )
  	{
  		//
***************
*** 70,74 ****
  			FROM " . GROUPS_TABLE . "
  			WHERE group_single_user <> " . TRUE . "
! 			AND group_id = " . $g;
  		if(!$result = $db->sql_query($sql))
  		{
--- 58,62 ----
  			FROM " . GROUPS_TABLE . "
  			WHERE group_single_user <> " . TRUE . "
! 			AND group_id = $group_id";
  		if(!$result = $db->sql_query($sql))
  		{
***************
*** 80,85 ****
  		}
  		$group_info = $db->sql_fetchrow($result);
  	}
! 	else if ($mode == "newgroup")
  	{
  		$group_info = array (
--- 68,76 ----
  		}
  		$group_info = $db->sql_fetchrow($result);
+ 
+ 		$mode = "editgroup";
+ 
  	}
! 	else if( isset($HTTP_POST_VARS['new']) )
  	{
  		$group_info = array (
***************
*** 90,93 ****
--- 81,87 ----
  		);
  		$group_open = "checked=\"checked\"";
+ 
+ 		$mode = "newgroup";
+ 
  	}
  	//
***************
*** 99,102 ****
--- 93,101 ----
  		ORDER BY username";
  	$u_result = $db->sql_query($sql);
+ 	if( !$u_result )
+ 	{
+ 		message_die(GENERAL_ERROR, "Couldn't obtain user info for moderator list", "", __LINE__, __FILE__, $sql);
+ 	}
+ 
  	$user_list = $db->sql_fetchrowset($u_result);
  
***************
*** 104,130 ****
  	for($i = 0; $i < count($user_list); $i++)
  	{
! 		if( $user_list[$i]['user_id'] == $group_info['group_moderator'] )
! 		{
! 			$select_list .= "<option selected value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
! 		}
! 		else
! 		{
! 			$select_list .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
! 		}
  	}
  	$select_list .= "</select>";
  	$template->set_filenames(array(
  		"body" => "admin/group_edit_body.tpl")
  	);
! 	if( !empty($group_info['group_type']) )
! 	{
! 		$group_open = "checked=\"checked\"";
! 	}
! 	else
! 	{
! 		$group_closed = "checked=\"checked\"";
! 	}
  	$template->assign_vars(array(
! 		"L_GROUP_INFO" => $lang['Group_edit_explain'],
  		"L_GROUP_NAME" => $lang['group_name'],
  		"L_GROUP_DESCRIPTION" => $lang['group_description'],
--- 103,126 ----
  	for($i = 0; $i < count($user_list); $i++)
  	{
! 		$selected = ( $user_list[$i]['user_id'] == $group_info['group_moderator'] ) ? "selected=\"selected\"" : "";
! 		$select_list .= "<option value=\"" . $user_list[$i]['user_id'] . "\"$selected>" . $user_list[$i]['username'] . "</option>";
  	}
  	$select_list .= "</select>";
+ 
+ 	$group_open = ( !empty($group_info['group_type']) ) ? "checked=\"checked\"" : "";
+ 	$group_closed = ( empty($group_info['group_type']) ) ? "checked=\"checked\"" : "";
+ 
  	$template->set_filenames(array(
  		"body" => "admin/group_edit_body.tpl")
  	);
! 
! 	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
! 
  	$template->assign_vars(array(
! 		"GROUP_NAME" => $group_info['group_name'],
! 		"GROUP_DESCRIPTION" => $group_info['group_description'],
! 
! 		"L_GROUP_TITLE" => $lang['Group'] . " " . $lang['Admin'],
! 		"L_GROUP_EDIT_DELETE" => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'], 
  		"L_GROUP_NAME" => $lang['group_name'],
  		"L_GROUP_DESCRIPTION" => $lang['group_description'],
***************
*** 138,161 ****
  		"L_RESET" => $lang['reset_group_changes'],
  
! 		"S_GROUP_NAME" => $group_info['group_name'],
! 		"S_GROUP_DESCRIPTION" => $group_info['group_description'],
! 		"S_GROUP_MODERATOR" => $select_list,
  		"S_GROUP_OPEN_CHECKED" => $group_open,
  		"S_GROUP_CLOSED_CHECKED" => $group_closed,
  		"S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
! 		"S_GROUP_MODE" => $mode,
! 		"GROUP_ID" => $g)
  	);
  	$template->pparse('body');
  }
! else if($mode && $HTTP_POST_VARS['updategroup'] == "update" )
  {
  	//
  	// Ok, they are submitting a group, let's save the data based on if it's new or editing
  	//
! 	if( isset($HTTP_POST_VARS['deletegroup']) )
  	{
  		$sql = "DELETE FROM " . GROUPS_TABLE . "
  			WHERE group_id = " . $group_id;
  	}
  	else
--- 134,162 ----
  		"L_RESET" => $lang['reset_group_changes'],
  
! 		"S_SELECT_MODERATORS" => $select_list,
  		"S_GROUP_OPEN_CHECKED" => $group_open,
  		"S_GROUP_CLOSED_CHECKED" => $group_closed,
  		"S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
! 		"S_HIDDEN_FIELDS" => $s_hidden_fields)
  	);
+ 
  	$template->pparse('body');
+ 
  }
! else if( isset($HTTP_POST_VARS['group_update']) )
  {
  	//
  	// Ok, they are submitting a group, let's save the data based on if it's new or editing
  	//
! 	if( isset($HTTP_POST_VARS['group_delete']) )
  	{
  		$sql = "DELETE FROM " . GROUPS_TABLE . "
  			WHERE group_id = " . $group_id;
+ 		if ( !$result = $db->sql_query($sql) )
+ 		{
+ 			message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
+ 		}
+ 
+ 		message_die(GENERAL_MESSAGE, $lang['Deleted_group']);
  	}
  	else
***************
*** 164,243 ****
  		$group_name = isset($HTTP_POST_VARS['group_name']) ? $HTTP_POST_VARS['group_name'] : "";
  		$group_description = isset($HTTP_POST_VARS['group_description']) ? $HTTP_POST_VARS['group_description'] : "";
! 		$group_moderator = isset($HTTP_POST_VARS['group_moderator']) ? $HTTP_POST_VARS['group_moderator'] : "";
! 		$group_id = isset($HTTP_POST_VARS['group_id']) ? $HTTP_POST_VARS['group_id'] : "";
  		
! 		switch($mode)
  		{
! 			case 'editgroup':
! 				$sql = "UPDATE " . GROUPS_TABLE . "
! 					SET group_type = '" . $group_type . "',
! 					group_name = '" . $group_name . "',
! 					group_description = '" . $group_description . "',
! 					group_moderator = '" . $group_moderator . "'
! 					WHERE group_id = '" . $group_id . "'";
! 				break;
! 
! 			case 'newgroup':
! 				$sql = "INSERT INTO " . GROUPS_TABLE . "
! 					(
! 						group_type,
! 						group_name,
! 						group_description,
! 						group_moderator,
! 						group_single_user
! 					)
! 					VALUES
! 					(
! 						'" . $group_type . "',
! 						'" . $group_name . "',
! 						'" . $group_description . "',
! 						'" . $group_moderator . "',
! 						'0'
! 					)";
! 			break;
! 
! 			case 'default':
! 				message_die(GENERAL_ERROR, $lang['Group_mode_not_selected']);
! 			break;
! 		}
! 	}
! 	if ( !$result = $db->sql_query($sql) )
! 	{
! 		$error = TRUE;
! 	}
! 	if ( $mode == "newgroup" )
! 	{
! 		$new_group_id = $db->sql_nextid($result);
! 
! 		$sql = "INSERT INTO " . USER_GROUP_TABLE . "
! 			(
! 				group_id,
! 				user_id,
! 				user_pending
! 			)
! 			VALUES
! 			(
! 				'" . $new_group_id . "',
! 				'" . $group_moderator . "',
! 				'0'
! 			)";
! 		if ( !$result = $db->sql_query($sql) )
  		{
! 			$error = TRUE;
  		}
! 	}
! 	if ( isset($error) )
! 	{
! 		message_die(GENERAL_ERROR, $lang['Error_updating_groups'], $lang['Error'], __LINE__, __FILE__, $sql);
! 	}
! 	else
! 	{
! 		message_die(GENERAL_MESSAGE, $lang['Success_updating_groups'], $lang['Success']);
  	}
  }
  else
  {
- 	include("page_header_admin." . $phpEx);
- 
  	$sql = "SELECT group_id, group_name
  		FROM " . GROUPS_TABLE . "
--- 165,226 ----
  		$group_name = isset($HTTP_POST_VARS['group_name']) ? $HTTP_POST_VARS['group_name'] : "";
  		$group_description = isset($HTTP_POST_VARS['group_description']) ? $HTTP_POST_VARS['group_description'] : "";
! 		$group_moderator = isset($HTTP_POST_VARS['group_moderator']) ? intval($HTTP_POST_VARS['group_moderator']) : "";
! 
! 		if( $group_name == "" )
! 		{
! 			message_die(GENERAL_MESSAGE, $lang['No_group_name']);
! 		}
! 		else if( $group_moderator == "" )
! 		{
! 			message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
! 		}
! 		else if( $group_type == "" )
! 		{
! 			message_die(GENERAL_MESSAGE, $lang['No_group_mode']);
! 		}
  		
! 		if( $mode == "editgroup" )
  		{
! 
! 			echo $sql = "UPDATE " . GROUPS_TABLE . "
! 				SET group_type = $group_type, group_name = '" . $group_name . "', group_description = '" . $group_description . "', group_moderator = $group_moderator 
! 				WHERE group_id = $group_id";
! 			if ( !$result = $db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
! 			}
! 
! 			message_die(GENERAL_MESSAGE, $lang['Updated_group']);
! 		}
! 		else if( $mode == "newgroup" )
  		{
! 
! 			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) 
! 				VALUES ($group_type, '" . $group_name . "', '" . $group_description . "', $group_moderator,	'0')";
! 			if ( !$result = $db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
! 			}
! 
! 			$new_group_id = $db->sql_nextid($result);
! 
! 			$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
! 				VALUES ($new_group_id, $group_moderator, 0)";
! 			if ( !$result = $db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
! 			}
! 
! 			message_die(GENERAL_MESSAGE, $lang['Added_new_group']);
! 
  		}
! 		else
! 		{
! 			message_die(GENERAL_MESSAGE, $lang['Group_mode_not_selected']);
! 		}
  	}
  }
  else
  {
  	$sql = "SELECT group_id, group_name
  		FROM " . GROUPS_TABLE . "
***************
*** 263,267 ****
  		"L_GROUP_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
  		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
! 		"L_GROUP_NEW" => $lang['New_group'],
  
  		"S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
--- 246,250 ----
  		"L_GROUP_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
  		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
! 		"L_CREATE_NEW_GROUP" => $lang['New_group'],
  
  		"S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
***************
*** 271,274 ****
--- 254,258 ----
  	$template->pparse('body');
  }
+ 
  include('page_footer_admin.'.$phpEx);
  

Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** admin_mass_email.php	2001/09/09 12:40:42	1.5
--- admin_mass_email.php	2001/10/14 15:46:53	1.6
***************
*** 33,60 ****
  }
  
- $phpbb_root_path = "./../";
- include($phpbb_root_path . 'extension.inc');
- include($phpbb_root_path . 'common.'.$phpEx);
- 
- //
- // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
! init_userprefs($userdata);
  //
! // End session management
! //
  
- //
- // Is user logged in? If yes are they an admin?
- //
- if( !$userdata['session_logged_in'] )
- {
-         header("Location: ../login.$phpEx?forward_page=admin/");
- }
- else if( $userdata['user_level'] != ADMIN )
- {
-         message_die(GENERAL_MESSAGE, $lang['Not_admin']);
- }
  
  //
--- 33,43 ----
  }
  
  //
! // Load default header
  //
! $phpbb_root_dir = "./../";
! $no_page_header = TRUE;
! require('pagestart.inc');
  
  
  //
***************
*** 68,72 ****
  //
  @set_time_limit(600);
! //Set form names
  $f_title = 'e_title';
  $f_msg = 'e_msg';
--- 51,58 ----
  //
  @set_time_limit(600);
! 
! //
! // Set form names
! //
  $f_title = 'e_title';
  $f_msg = 'e_msg';

Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** admin_ranks.php	2001/10/14 14:33:54	1.1
--- admin_ranks.php	2001/10/14 15:46:53	1.2
***************
*** 32,41 ****
  //
  $phpbb_root_dir = "./../";
- 
- //
- // Include required files, get $phpEx and check permissions
- //
  require('pagestart.inc');
  
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
--- 32,38 ----
  //
  $phpbb_root_dir = "./../";
  require('pagestart.inc');
  
+ 
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
***************
*** 70,115 ****
  		//
  		
! 		$rank_id = ( isset($HTTP_GET_VARS['id']) ) ? $HTTP_GET_VARS['id'] : 0;
  		
! 		$template->set_filenames(array(
! 			"body" => "admin/ranks_edit_body.tpl")
! 		);
! 		
! 		$s_hidden_fields = '';
  		
  		if( $mode == "edit" )
  		{
! 			if(	$rank_id )
  			{
! 				$sql = "SELECT * FROM " . RANKS_TABLE . "
! 					WHERE rank_id = $rank_id";
! 				if(!$result = $db->sql_query($sql))
! 				{
! 				
! 					$template->set_filenames(array(
! 						"body" => "admin/admin_message_body.tpl")
! 					);
! 						
! 					$template->assign_vars(array(
! 						"MESSAGE_TITLE" => $lang['Error'],
! 						"MESSAGE_TEXT" => "Error querying ranks table")
! 					);
! 				}
! 				
! 				$rank_info = $db->sql_fetchrow($result);
! 				$s_hidden_fields .= '<input type="hidden" name="id" value="' . $rank_id . '" />';
  			}
! 			else
  			{
! 				$template->set_filenames(array(
! 					"body" => "admin/admin_message_body.tpl")
! 				);
! 				
! 				$template->assign_vars(array(
! 					"MESSAGE_TITLE" => $lang['Error'],
! 					"MESSAGE_TEXT" => $lang['Must_select_rank'])
! 				);
! 					
  			}
  		}
  		else
--- 67,91 ----
  		//
  		
! 		$rank_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0;
  		
! 		$s_hidden_fields = "";
  		
  		if( $mode == "edit" )
  		{
! 			if( empty($rank_id) )
  			{
! 				message_die(GENERAL_MESSAGE, $lang['Must_select_rank']);
  			}
! 
! 			$sql = "SELECT * FROM " . RANKS_TABLE . "
! 				WHERE rank_id = $rank_id";
! 			if(!$result = $db->sql_query($sql))
  			{
! 				message_die(GENERAL_ERROR, "Couldn't obtain rank data", "", __LINE__, __FILE__, $sql);
  			}
+ 			
+ 			$rank_info = $db->sql_fetchrow($result);
+ 			$s_hidden_fields .= '<input type="hidden" name="id" value="' . $rank_id . '" />';
+ 
  		}
  		else
***************
*** 117,124 ****
  			$rank_info['rank_special'] = 0;
  		}
  		$s_hidden_fields .= '<input type="hidden" name="mode" value="save" />';
! 		$rank_is_special = ( $rank_info['rank_special'] == 1 ) ? "checked=\"checked\"" : "";
! 		$rank_is_not_special = ( !($rank_info['rank_special'] == 1) ) ? "checked=\"checked\"" : "";
  		
  		$template->assign_vars(array(
  			"RANK" => $rank_info['rank_title'],
--- 93,106 ----
  			$rank_info['rank_special'] = 0;
  		}
+ 
  		$s_hidden_fields .= '<input type="hidden" name="mode" value="save" />';
! 
! 		$rank_is_special = ( $rank_info['rank_special'] ) ? "checked=\"checked\"" : "";
! 		$rank_is_not_special = ( !$rank_info['rank_special'] ) ? "checked=\"checked\"" : "";
  		
+ 		$template->set_filenames(array(
+ 			"body" => "admin/ranks_edit_body.tpl")
+ 		);
+ 
  		$template->assign_vars(array(
  			"RANK" => $rank_info['rank_title'],
***************
*** 127,132 ****
  			"MINIMUM" => $rank_info['rank_min'],
  			"MAXIMUM" => $rank_info['rank_max'],
! 			"IMAGE" => ( $rank_info['rank_image'] != "" ) ? $rank_info['rank_image'] : "http://",
! 			"IMAGE_DISPLAY" => ( $rank_info['rank_image'] != "" ) ? '<img src="'.$rank_info['rank_image'].'" />' : "",
  			
  			"L_RANKS_TITLE" => $lang['Ranks_title'],
--- 109,114 ----
  			"MINIMUM" => $rank_info['rank_min'],
  			"MAXIMUM" => $rank_info['rank_max'],
! 			"IMAGE" => ( $rank_info['rank_image'] != "" ) ? $rank_info['rank_image'] : "",
! 			"IMAGE_DISPLAY" => ( $rank_info['rank_image'] != "" ) ? '<img src="' . $rank_info['rank_image'] . '" />' : "",
  			
  			"L_RANKS_TITLE" => $lang['Ranks_title'],
***************
*** 154,174 ****
  		//
  		
! 		$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : 0;
  		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? $HTTP_POST_VARS['title'] : "";
! 		$special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? 1 : 0;
! 		$max_posts = ( isset($HTTP_POST_VARS['max_posts']) ) ? $HTTP_POST_VARS['max_posts'] : -1;
! 		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? $HTTP_POST_VARS['min_posts'] : -1;
  		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) || $HTTP_POST_VARS['rank_image'] != "http://" ) ? $HTTP_POST_VARS['rank_image'] : "";
  		if( $rank_title == "" )
  		{
! 				$template->set_filenames(array(
! 					"body" => "admin/admin_message_body.tpl")
! 				);
! 				
! 				$template->assign_vars(array(
! 					"MESSAGE_TITLE" => $lang['Error'],
! 					"MESSAGE_TEXT" => $lang['Must_select_rank'])
! 				);
  		}
  		if( $special_rank == 1 )
  		{
--- 136,151 ----
  		//
  		
! 		$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0;
  		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? $HTTP_POST_VARS['title'] : "";
! 		$special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? TRUE : 0;
! 		$max_posts = ( isset($HTTP_POST_VARS['max_posts']) ) ? intval($HTTP_POST_VARS['max_posts']) : -1;
! 		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1;
  		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) || $HTTP_POST_VARS['rank_image'] != "http://" ) ? $HTTP_POST_VARS['rank_image'] : "";
+ 
  		if( $rank_title == "" )
  		{
! 			message_die(GENERAML_MESSAGE, $lang['Must_select_rank']);
  		}
+ 
  		if( $special_rank == 1 )
  		{
***************
*** 176,193 ****
  			$min_posts = -1;
  		}
! 		// The rank image has to start with http://, followed by something with length at least 3 that
! 		// contains at least one dot.
  		if($rank_image != "")
  		{
! 			if( !ereg("^http\:\/\/", $rank_image) )
! 			{
! 				$rank_image = "http://" . $rank_image;
! 			}
! 	
! 			if (!preg_match("#^http\\:\\/\\/[a-z0-9\-]+\.[a-z0-9\-]+#i", $rank_image))
  			{
  				$rank_image = "";
  			}
  		}
  		if( $rank_id )
  		{
--- 153,168 ----
  			$min_posts = -1;
  		}
! 
! 		//
! 		// The rank image has to be a jpg, gif or png
! 		//
  		if($rank_image != "")
  		{
! 			if ( !preg_match("/(\.gif|\.png|\.jpg)$/is", $rank_image))
  			{
  				$rank_image = "";
  			}
  		}
+ 
  		if( $rank_id )
  		{
***************
*** 200,204 ****
  					rank_image = '$rank_image'
  				WHERE rank_id = $rank_id";
! 			$message_success = $lang['Rank_updated'];
  		}
  		else
--- 175,179 ----
  					rank_image = '$rank_image'
  				WHERE rank_id = $rank_id";
! 			$message = $lang['Rank_updated'];
  		}
  		else
***************
*** 208,236 ****
  				VALUES
  					('$rank_title', '$special_rank', '$max_posts', '$min_posts', '$rank_image')";
! 			$message_success = $lang['Rank_added'];
  		}
  		
! 		if(!$result = $db->sql_query($sql))
! 		{
! 				$template->set_filenames(array(
! 					"body" => "admin/admin_message_body.tpl")
! 				);
! 				
! 				$template->assign_vars(array(
! 					"MESSAGE_TITLE" => $lang['Error'],
! 					"MESSAGE_TEXT" => "Couldn't update ranks table<br>SQL: ".$sql)
! 				);
! 		}
! 		else
  		{
! 				$template->set_filenames(array(
! 					"body" => "admin/admin_message_body.tpl")
! 				);
! 				
! 				$template->assign_vars(array(
! 					"MESSAGE_TITLE" => $lang['Success'],
! 					"MESSAGE_TEXT" => $message_success)
! 				);
  		}
  	}
  	else if( $mode == "delete" )
--- 183,200 ----
  				VALUES
  					('$rank_title', '$special_rank', '$max_posts', '$min_posts', '$rank_image')";
! 			$message = $lang['Rank_added'];
  		}
  		
! 		if( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, "Couldn't update/insert into ranks table", "", __LINE__, __FILE__, $sql);
  		}
+ 
+ 		$template->assign_vars(array(
+ 			"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
+ 		);
+ 		$message .= "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_ranks.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['return_rank_admin'];
+ 		message_die(GENERAL_MESSAGE, $message);
+ 
  	}
  	else if( $mode == "delete" )
***************
*** 242,246 ****
  		if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) )
  		{
! 			$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
  		}
  		else
--- 206,210 ----
  		if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) )
  		{
! 			$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : intval($HTTP_GET_VARS['id']);
  		}
  		else
***************
*** 256,290 ****
  			if( !$result = $db->sql_query...
 
[truncated message content]

[Phpbb-checkins] CVS: phpBB2/templates/PSO/admin ranks_edit_body.tpl,NONE,1.1 ranks_list_body.tpl,NONE,1.1

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/PSO/admin
In directory usw-pr-cvs1:/tmp/cvs-serv29875/templates/PSO/admin

Added Files:
	ranks_edit_body.tpl ranks_list_body.tpl 
Log Message:
Ok, first I did the lang files, now for the real stuff in ranks admin.

--- NEW FILE ---

<form action="{S_RANK_ACTION}" method="post">

<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
	<tr>
		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
			<tr>
				<td class="cat" colspan="2"><span class="cattitle"><b>{L_RANKS_TITLE}</b></span><br /><span class="gensmall">{L_RANKS_TEXT}</span></td>
			</tr>
			<tr>
				<td class="row1" width="38%"><span class="gen">{L_RANK_TITLE}:</span></td>
				<td class="row2"><input type="text" name="title" size="35" maxlength="40" value="{RANK}" /></td>
			</tr>
			<tr>
				<td class="row1"><span class="gen">{L_RANK_SPECIAL}</span></td>
				<td class="row2"><input type="radio" name="special_rank" value="1" {SPECIAL_RANK} />{L_YES} &nbsp;&nbsp;<input type="radio" name="special_rank" value="0" {NOT_SPECIAL_RANK} /> {L_NO}</td>
			</tr>
			<tr>
				<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
				<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
			</tr>
			<tr>
				<td class="row1" width="38%"><span class="gen">{L_RANK_MINIMUM}:</span></td>
				<td class="row2"><input type="text" name="min_posts" size="5" maxlength="10" value="{MINIMUM}" /></td>
			</tr>
			<tr>
				<td class="row1" width="38%"><span class="gen">{L_RANK_IMAGE}:</span><br />
				<span class="gensmall">{L_RANK_IMAGE_EXPLAIN}</span></td>
				<td class="row2"><input type="text" name="rank_image" size="40" maxlength="255" value="{IMAGE}" /><br />{IMAGE_DISPLAY}</td>
			</tr>
			<tr>
				<td class="cat" colspan="2" align="center"><span class="cattitle"><input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></span></td>
			</tr>
		</table></td>
	</tr>

{S_HIDDEN_FIELDS}
</table></form>
--- NEW FILE ---
<br clear="all" />

<h1>{L_RANKS_TITLE}</h1>

<p>{L_RANKS_TEXT}</p>

<table cellspacing="1" cellpadding="4" border="0" align="center">
	<tr>
		<td class="cat" align="center"><span class="cattitle"><b>{L_RANK}</b></span></td>
		<td class="cat" align="center"><span class="cattitle"><b>{L_SPECIAL_RANK}</b></span></td>
		<td class="cat" align="center"><span class="cattitle"><b>{L_EDIT}</b></span></td>
		<td class="cat" align="center"><span class="cattitle"><b>{L_DELETE}</b></span></td>
	</tr>
	<!-- BEGIN ranks -->
	<tr>
		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};">{ranks.RANK}</td>
		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};">{ranks.SPECIAL_RANK}</td>
		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td>
	</tr>
	<!-- END ranks -->			
	<tr>
		<td class="row2" align="center" colspan="4"><a href="admin_ranks.php?mode=add">{L_ADD_RANK}</a></td>
	</tr>
</table>

<br clear="all" />

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin ranks_edit_body.tpl,NONE,1.1 ranks_list_body.tpl,NONE,1.1

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv29875/templates/subSilver/admin

Added Files:
	ranks_edit_body.tpl ranks_list_body.tpl 
Log Message:
Ok, first I did the lang files, now for the real stuff in ranks admin.

--- NEW FILE ---

<form action="{S_RANK_ACTION}" method="post">

<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
	<tr>
		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
			<tr>
				<td class="cat" colspan="2"><span class="cattitle"><b>{L_RANKS_TITLE}</b></span><br /><span class="gensmall">{L_RANKS_TEXT}</span></td>
			</tr>
			<tr>
				<td class="row1" width="38%"><span class="gen">{L_RANK_TITLE}:</span></td>
				<td class="row2"><input type="text" name="title" size="35" maxlength="40" value="{RANK}" /></td>
			</tr>
			<tr>
				<td class="row1"><span class="gen">{L_RANK_SPECIAL}</span></td>
				<td class="row2"><input type="radio" name="special_rank" value="1" {SPECIAL_RANK} />{L_YES} &nbsp;&nbsp;<input type="radio" name="special_rank" value="0" {NOT_SPECIAL_RANK} /> {L_NO}</td>
			</tr>
			<tr>
				<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
				<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
			</tr>
			<tr>
				<td class="row1" width="38%"><span class="gen">{L_RANK_MINIMUM}:</span></td>
				<td class="row2"><input type="text" name="min_posts" size="5" maxlength="10" value="{MINIMUM}" /></td>
			</tr>
			<tr>
				<td class="row1" width="38%"><span class="gen">{L_RANK_IMAGE}:</span><br />
				<span class="gensmall">{L_RANK_IMAGE_EXPLAIN}</span></td>
				<td class="row2"><input type="text" name="rank_image" size="40" maxlength="255" value="{IMAGE}" /><br />{IMAGE_DISPLAY}</td>
			</tr>
			<tr>
				<td class="cat" colspan="2" align="center"><span class="cattitle"><input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></span></td>
			</tr>
		</table></td>
	</tr>

{S_HIDDEN_FIELDS}
</table></form>
--- NEW FILE ---
<br clear="all" />

<h1>{L_RANKS_TITLE}</h1>

<p>{L_RANKS_TEXT}</p>

<table cellspacing="1" cellpadding="4" border="0" align="center">
	<tr>
		<td class="cat" align="center"><span class="cattitle"><b>{L_RANK}</b></span></td>
		<td class="cat" align="center"><span class="cattitle"><b>{L_SPECIAL_RANK}</b></span></td>
		<td class="cat" align="center"><span class="cattitle"><b>{L_EDIT}</b></span></td>
		<td class="cat" align="center"><span class="cattitle"><b>{L_DELETE}</b></span></td>
	</tr>
	<!-- BEGIN ranks -->
	<tr>
		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};">{ranks.RANK}</td>
		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};">{ranks.SPECIAL_RANK}</td>
		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
		<td class="{ranks.ROW_CLASS}" align="center" style="bgcolor: {ranks.ROW_COLOR};"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td>
	</tr>
	<!-- END ranks -->			
	<tr>
		<td class="row2" align="center" colspan="4"><a href="admin_ranks.php?mode=add">{L_ADD_RANK}</a></td>
	</tr>
</table>

<br clear="all" />

[Phpbb-checkins] CVS: phpBB2/admin admin_ranks.php,NONE,1.1

[Doug K. <dou...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv29875/admin

Added Files:
	admin_ranks.php 
Log Message:
Ok, first I did the lang files, now for the real stuff in ranks admin.

--- NEW FILE ---
<?php
/***************************************************************************
 *                              admin_ranks.php
 *                            -------------------
 *   begin                : Thursday, Jul 12, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : su...@ph...
 *
 *   $Id: admin_ranks.php,v 1.1 2001/10/14 14:33:54 dougk_ff7 Exp $
 *
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

if($setmodules == 1)
{
	$file = basename(__FILE__);
	$module['Users']['Ranks'] = "$file";
	return;
}

//
// Let's set the root dir for phpBB
//
$phpbb_root_dir = "./../";

//
// Include required files, get $phpEx and check permissions
//
require('pagestart.inc');

if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
{
	$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
}
else 
{
	//
	// These could be entered via a form button
	//
	if( isset($HTTP_POST_VARS['add']) )
	{
		$mode = "add";
	}
	else if( isset($HTTP_POST_VARS['save']) )
	{
		$mode = "save";
	}
	else
	{
		$mode = "";
	}
}


if( $mode != "" )
{
	if( $mode == "edit" || $mode == "add" )
	{
		//
		// They want to add a new rank, show the form.
		//
		
		$rank_id = ( isset($HTTP_GET_VARS['id']) ) ? $HTTP_GET_VARS['id'] : 0;
		
		$template->set_filenames(array(
			"body" => "admin/ranks_edit_body.tpl")
		);
		
		$s_hidden_fields = '';
		
		if( $mode == "edit" )
		{
			if(	$rank_id )
			{
				$sql = "SELECT * FROM " . RANKS_TABLE . "
					WHERE rank_id = $rank_id";
				if(!$result = $db->sql_query($sql))
				{
				
					$template->set_filenames(array(
						"body" => "admin/admin_message_body.tpl")
					);
						
					$template->assign_vars(array(
						"MESSAGE_TITLE" => $lang['Error'],
						"MESSAGE_TEXT" => "Error querying ranks table")
					);
				}
				
				$rank_info = $db->sql_fetchrow($result);
				$s_hidden_fields .= '<input type="hidden" name="id" value="' . $rank_id . '" />';
			}
			else
			{
				$template->set_filenames(array(
					"body" => "admin/admin_message_body.tpl")
				);
				
				$template->assign_vars(array(
					"MESSAGE_TITLE" => $lang['Error'],
					"MESSAGE_TEXT" => $lang['Must_select_rank'])
				);
					
			}
		}
		else
		{
			$rank_info['rank_special'] = 0;
		}
		$s_hidden_fields .= '<input type="hidden" name="mode" value="save" />';
		$rank_is_special = ( $rank_info['rank_special'] == 1 ) ? "checked=\"checked\"" : "";
		$rank_is_not_special = ( !($rank_info['rank_special'] == 1) ) ? "checked=\"checked\"" : "";
		
		$template->assign_vars(array(
			"RANK" => $rank_info['rank_title'],
			"SPECIAL_RANK" => $rank_is_special,
			"NOT_SPECIAL_RANK" => $rank_is_not_special,
			"MINIMUM" => $rank_info['rank_min'],
			"MAXIMUM" => $rank_info['rank_max'],
			"IMAGE" => ( $rank_info['rank_image'] != "" ) ? $rank_info['rank_image'] : "http://",
			"IMAGE_DISPLAY" => ( $rank_info['rank_image'] != "" ) ? '<img src="'.$rank_info['rank_image'].'" />' : "",
			
			"L_RANKS_TITLE" => $lang['Ranks_title'],
			"L_RANKS_TEXT" => $lang['Ranks_explain'],
			"L_RANK_TITLE" => $lang['Rank_title'],
			"L_RANK_SPECIAL" => $lang['Rank_special'],
			"L_RANK_MINIMUM" => $lang['Rank_minimum'],
			"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
			"L_RANK_IMAGE" => $lang['Rank_image'],
			"L_RANK_IMAGE_EXPLAIN" => $lang['Rank_image_explain'],
			"L_SUBMIT" => $lang['Submit'],
			"L_RESET" => $lang['Reset'],
			"L_YES" => $lang['Yes'],
			"L_NO" => $lang['No'],
			
			"S_RANK_ACTION" => append_sid("admin_ranks.$phpEx"),
			"S_HIDDEN_FIELDS" => $s_hidden_fields)
		);
		
	}
	else if( $mode == "save" )
	{
		//
		// Ok, they sent us our info, let's update it.
		//
		
		$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : 0;
		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? $HTTP_POST_VARS['title'] : "";
		$special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? 1 : 0;
		$max_posts = ( isset($HTTP_POST_VARS['max_posts']) ) ? $HTTP_POST_VARS['max_posts'] : -1;
		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? $HTTP_POST_VARS['min_posts'] : -1;
		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) || $HTTP_POST_VARS['rank_image'] != "http://" ) ? $HTTP_POST_VARS['rank_image'] : "";
		if( $rank_title == "" )
		{
				$template->set_filenames(array(
					"body" => "admin/admin_message_body.tpl")
				);
				
				$template->assign_vars(array(
					"MESSAGE_TITLE" => $lang['Error'],
					"MESSAGE_TEXT" => $lang['Must_select_rank'])
				);
		}
		if( $special_rank == 1 )
		{
			$max_posts = -1;
			$min_posts = -1;
		}
		// The rank image has to start with http://, followed by something with length at least 3 that
		// contains at least one dot.
		if($rank_image != "")
		{
			if( !ereg("^http\:\/\/", $rank_image) )
			{
				$rank_image = "http://" . $rank_image;
			}
	
			if (!preg_match("#^http\\:\\/\\/[a-z0-9\-]+\.[a-z0-9\-]+#i", $rank_image))
			{
				$rank_image = "";
			}
		}
		if( $rank_id )
		{
			$sql = "UPDATE " . RANKS_TABLE . "
				SET 
					rank_title = '$rank_title', 
					rank_special = '$special_rank',
					rank_max = '$max_posts',
					rank_min = '$min_posts',
					rank_image = '$rank_image'
				WHERE rank_id = $rank_id";
			$message_success = $lang['Rank_updated'];
		}
		else
		{
			$sql = "INSERT INTO " . RANKS_TABLE . "
					(rank_title, rank_special, rank_max, rank_min, rank_image)
				VALUES
					('$rank_title', '$special_rank', '$max_posts', '$min_posts', '$rank_image')";
			$message_success = $lang['Rank_added'];
		}
		
		if(!$result = $db->sql_query($sql))
		{
				$template->set_filenames(array(
					"body" => "admin/admin_message_body.tpl")
				);
				
				$template->assign_vars(array(
					"MESSAGE_TITLE" => $lang['Error'],
					"MESSAGE_TEXT" => "Couldn't update ranks table<br>SQL: ".$sql)
				);
		}
		else
		{
				$template->set_filenames(array(
					"body" => "admin/admin_message_body.tpl")
				);
				
				$template->assign_vars(array(
					"MESSAGE_TITLE" => $lang['Success'],
					"MESSAGE_TEXT" => $message_success)
				);
		}
	}
	else if( $mode == "delete" )
	{
		//
		// Ok, they want to delete their rank
		//
		
		if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) )
		{
			$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
		}
		else
		{
			$rank_id = 0;
		}
		
		if( $rank_id )
		{
			$sql = "DELETE FROM " . RANKS_TABLE . "
				WHERE rank_id = $rank_id";
			
			if( !$result = $db->sql_query($sql))
			{
				$template->set_filenames(array(
					"body" => "admin/admin_message_body.tpl")
				);
				
				$template->assign_vars(array(
					"MESSAGE_TITLE" => $lang['Error'],
					"MESSAGE_TEXT" => "Could not remove data from ranks table.")
				);
			}
			else
			{
				$template->set_filenames(array(
					"body" => "admin/admin_message_body.tpl")
				);
				
				$template->assign_vars(array(
					"MESSAGE_TITLE" => $lang['Success'],
					"MESSAGE_TEXT" => $lang['Rank_removed'])
				);
			}
		}
		else
		{
			$template->set_filenames(array(
				"body" => "admin/admin_message_body.tpl")
			);
			
			$template->assign_vars(array(
				"MESSAGE_TITLE" => $lang['Error'],
				"MESSAGE_TEXT" => $lang['Must_select_rank'])
			);
		}
	}
	else
	{
		//
		// They didn't feel like giving us any information. Oh, too bad, we'll just display the
		// list then...
		
		$template->set_filenames(array(
			"body" => "admin/ranks_list_body.tpl")
		);
		
		$sql = "SELECT * FROM " . RANKS_TABLE . "
			ORDER BY rank_title";
		if( !$result = $db->sql_query($sql) )
		{
			$template->set_filenames(array(
				"body" => "admin/admin_message_body.tpl")
			);
			
			$template->assign_vars(array(
				"MESSAGE_TITLE" => $lang['Error'],
				"MESSAGE_TEXT" => "Could not query ranks table")
			);
		}
		
		$rank_rows = $db->sql_fetchrowset($result);
		$rank_count = count($rank_rows);
		
		$template->assign_vars(array(
			"L_RANKS_TITLE" => $lang['Ranks_title'],
			"L_RANKS_TEXT" => $lang['Ranks_explain'],
			"L_RANK" => $lang['Rank'],
			"L_SPECIAL_RANK" => $lang['Special_rank'],
			"L_EDIT" => $lang['Edit'],
			"L_DELETE" => $lang['Delete'],
			"L_ADD_RANK" => $lang['Add_new_rank'],
			"L_ACTION" => $lang['Action'],
			
			"S_RANKS_ACTION" => append_sid("admin_ranks.$phpEx"))
		);
		
		for( $i = 0; $i < $rank_count; $i++)
		{
			$rank = $rank_rows[$i]['rank_title'];
			$special_rank = $rank_rows[$i]['rank_special'];
			$rank_id = $rank_rows[$i]['rank_id'];
			
			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
			$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
	
			$template->assign_block_vars("ranks", array(
				"ROW_COLOR" => "#" . $row_color,
				"ROW_CLASS" => $row_class,
				"RANK" => $rank,
				"SPECIAL_RANK" => ( $special_rank == 1 ) ? "Yes" : "No",
				"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&id=$rank_id"),
				"U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&id=$rank_id"))
			);
		}
	}
}
else
{
	//
	// Show the default page
	//
	
	$template->set_filenames(array(
		"body" => "admin/ranks_list_body.tpl")
	);
	
	$sql = "SELECT * FROM " . RANKS_TABLE . "
		ORDER BY rank_title";
	if( !$result = $db->sql_query($sql) )
	{
		$template->set_filenames(array(
			"body" => "admin/admin_message_body.tpl")
		);
		
		$template->assign_vars(array(
			"MESSAGE_TITLE" => $lang['Error'],
			"MESSAGE_TEXT" => "Could not query ranks table.")
		);
	}

	$rank_rows = $db->sql_fetchrowset($result);
	$rank_count = count($rank_rows);
	
	$template->assign_vars(array(
		"L_RANKS_TITLE" => $lang['Ranks_title'],
		"L_RANKS_TEXT" => $lang['Ranks_explain'],
		"L_RANK" => $lang['Rank_title'],
		"L_SPECIAL_RANK" => $lang['Rank_special'],
		"L_EDIT" => $lang['Edit'],
		"L_DELETE" => $lang['Delete'],
		"L_ADD_RANK" => $lang['Add_new_rank'],
		"L_ACTION" => $lang['Action'],
		
		"S_RANKS_ACTION" => append_sid("admin_ranks.$phpEx"))
	);
	
	for($i = 0; $i < $rank_count; $i++)
	{
		$rank = $rank_rows[$i]['rank_title'];
		$special_rank = $rank_rows[$i]['rank_special'];
		$rank_id = $rank_rows[$i]['rank_id'];
		
		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
		$rank_is_special = ( $special_rank == 1 ) ? "Yes" : "No";
		
		$template->assign_block_vars("ranks", array(
			"ROW_COLOR" => "#" . $row_color,
			"ROW_CLASS" => $row_class,
			"RANK" => $rank,
			"SPECIAL_RANK" => $rank_is_special,
			"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&id=$rank_id"),
			"U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&id=$rank_id"))
		);
	}
}

$template->pparse("body");

include('page_footer_admin.'.$phpEx);

?>