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

[Phpbb-checkins] CVS: phpBB2/admin admin_board.php,1.37,1.38 admin_disallow.php,1.3,1.4 admin_forums.php,1.31,1.32

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

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

Modified Files:
	admin_board.php admin_disallow.php admin_forums.php 
Log Message:
Updates for the \' issue but fix for bug #496110 in admin_forums (changed names to utilise constants)

Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** admin_board.php	2001/12/17 00:39:47	1.37
--- admin_board.php	2001/12/24 13:05:00	1.38
***************
*** 47,51 ****
  		{
  			$sql = "UPDATE " . CONFIG_TABLE . " SET
! 				config_value = '" . $new[$config_name] . "'
  				WHERE config_name = '$config_name'";
  			if( !$db->sql_query($sql) )
--- 47,51 ----
  		{
  			$sql = "UPDATE " . CONFIG_TABLE . " SET
! 				config_value = '" . str_replace("\'", "''", $new[$config_name]) . "'
  				WHERE config_name = '$config_name'";
  			if( !$db->sql_query($sql) )

Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** admin_disallow.php	2001/11/24 01:51:35	1.3
--- admin_disallow.php	2001/12/24 13:05:00	1.4
***************
*** 47,51 ****
  	{
  		$sql = "INSERT INTO " . DISALLOW_TABLE . " (disallow_username) 
! 			VALUES('" . $disallowed_user . "')";
  		$result = $db->sql_query( $sql );
  		if ( !$result )
--- 47,51 ----
  	{
  		$sql = "INSERT INTO " . DISALLOW_TABLE . " (disallow_username) 
! 			VALUES('" . str_replace("\'", "''", $disallowed_user) . "')";
  		$result = $db->sql_query( $sql );
  		if ( !$result )

Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** admin_forums.php	2001/11/29 22:45:13	1.31
--- admin_forums.php	2001/12/24 13:05:00	1.32
***************
*** 254,258 ****
  				$buttonvalue = $lang['Update'];
  
! 				$forum_id = intval($HTTP_GET_VARS['forum_id']);
  
  				$row = get_info('forum', $forum_id);
--- 254,258 ----
  				$buttonvalue = $lang['Update'];
  
! 				$forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]);
  
  				$row = get_info('forum', $forum_id);
***************
*** 306,310 ****
  			);
  
! 			$s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode .'" /><input type="hidden" name="forum_id" value="' . $forum_id . '" />';
  
  			$template->assign_vars(array(
--- 306,310 ----
  			);
  
! 			$s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode .'" /><input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '" />';
  
  			$template->assign_vars(array(
***************
*** 348,352 ****
  			$sql = "SELECT MAX(forum_order) AS max_order
  				FROM " . FORUMS_TABLE . "
! 				WHERE cat_id = " . intval($HTTP_POST_VARS['cat_id']);
  			if( !$result = $db->sql_query($sql) )
  			{
--- 348,352 ----
  			$sql = "SELECT MAX(forum_order) AS max_order
  				FROM " . FORUMS_TABLE . "
! 				WHERE cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]);
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 383,387 ****
  			// There is no problem having duplicate forum names so we won't check for it.
  			$sql = "INSERT INTO " . FORUMS_TABLE . " (forum_id, forum_name, cat_id, forum_desc, forum_order, forum_status, prune_enable" . $field_sql . ")
! 				VALUES ('" . $next_id . "', '" . $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']) . $value_sql . ")";
  			if( !$result = $db->sql_query($sql) )
  			{
--- 383,387 ----
  			// There is no problem having duplicate forum names so we won't check for it.
  			$sql = "INSERT INTO " . FORUMS_TABLE . " (forum_id, forum_name, cat_id, forum_desc, forum_order, forum_status, prune_enable" . $field_sql . ")
! 				VALUES ('" . $next_id . "', '" . str_replace("\'", "''", $HTTP_POST_VARS['forumname']) . "', " . intval($HTTP_POST_VARS[POST_CAT_URL]) . ", '" . str_replace("\'", "''", $HTTP_POST_VARS['forumdesc']) . "', $next_order, " . intval($HTTP_POST_VARS['forumstatus']) . ", " . intval($HTTP_POST_VARS['prune_enable']) . $value_sql . ")";
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 393,397 ****
  				$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']);
--- 393,397 ----
  				$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']);
***************
*** 423,428 ****
  
  			$sql = "UPDATE " . FORUMS_TABLE . "
! 				SET forum_name = '" . $HTTP_POST_VARS['forumname'] . "', cat_id = " . intval($HTTP_POST_VARS['cat_id']) . ", forum_desc = '" . $HTTP_POST_VARS['forumdesc'] . "', forum_status = " . intval($HTTP_POST_VARS['forumstatus']) . ", prune_enable = " . intval($HTTP_POST_VARS['prune_enable']) . "
! 				WHERE forum_id = " . intval($HTTP_POST_VARS['forum_id']);
  			if( !$result = $db->sql_query($sql) )
  			{
--- 423,428 ----
  
  			$sql = "UPDATE " . FORUMS_TABLE . "
! 				SET forum_name = '" . str_replace("\'", "''", $HTTP_POST_VARS['forumname']) . "', cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]) . ", forum_desc = '" . str_replace("\'", "''", $HTTP_POST_VARS['forumdesc']) . "', forum_status = " . intval($HTTP_POST_VARS['forumstatus']) . ", prune_enable = " . intval($HTTP_POST_VARS['prune_enable']) . "
! 				WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]);
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 430,436 ****
  			}
  
! 			if($HTTP_POST_VARS['prune_enable'] == 1)
  			{
! 				if($HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "")
  				{
  					message_die(GENERAL_MESSAGE, $lang['Set_prune_data']);
--- 430,436 ----
  			}
  
! 			if( $HTTP_POST_VARS['prune_enable'] == 1 )
  			{
! 				if( $HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "" )
  				{
  					message_die(GENERAL_MESSAGE, $lang['Set_prune_data']);
***************
*** 439,443 ****
  				$sql = "SELECT *
  					FROM " . PRUNE_TABLE . "
! 					WHERE forum_id = " . intval($HTTP_POST_VARS['forum_id']);
  				if( !$result = $db->sql_query($sql) )
  				{
--- 439,443 ----
  				$sql = "SELECT *
  					FROM " . PRUNE_TABLE . "
! 					WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]);
  				if( !$result = $db->sql_query($sql) )
  				{
***************
*** 449,458 ****
  					$sql = "UPDATE " . PRUNE_TABLE . "
  						SET	prune_days = " . intval($HTTP_POST_VARS['prune_days']) . ",	prune_freq = " . intval($HTTP_POST_VARS['prune_freq']) . "
! 				 		WHERE forum_id = " . intval($HTTP_POST_VARS['forum_id']);
  				}
  				else
  				{
  					$sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq)
! 						VALUES(" . intval($HTTP_POST_VARS['forum_id']) . ", " . intval($HTTP_POST_VARS['prune_days']) . ", " . intval($HTTP_POST_VARS['prune_freq']) . ")";
  				}
  
--- 449,458 ----
  					$sql = "UPDATE " . PRUNE_TABLE . "
  						SET	prune_days = " . intval($HTTP_POST_VARS['prune_days']) . ",	prune_freq = " . intval($HTTP_POST_VARS['prune_freq']) . "
! 				 		WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]);
  				}
  				else
  				{
  					$sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq)
! 						VALUES(" . intval($HTTP_POST_VARS[POST_FORUM_URL]) . ", " . intval($HTTP_POST_VARS['prune_days']) . ", " . intval($HTTP_POST_VARS['prune_freq']) . ")";
  				}
  
***************
*** 510,514 ****
  			$buttonvalue = $lang['Update'];
  
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
  
  			$row = get_info('category', $cat_id);
--- 510,514 ----
  			$buttonvalue = $lang['Update'];
  
! 			$cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]);
  
  			$row = get_info('category', $cat_id);
***************
*** 519,523 ****
  			);
  
! 			$s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" /><input type="hidden" name="cat_id" value="' . $cat_id . '" />';
  
  			$template->assign_vars(array(
--- 519,523 ----
  			);
  
! 			$s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" /><input type="hidden" name="' . POST_CAT_URL . '" value="' . $cat_id . '" />';
  
  			$template->assign_vars(array(
***************
*** 539,544 ****
  			// Modify a category in the DB
  			$sql = "UPDATE " . CATEGORIES_TABLE . "
! 				SET cat_title = '" . $HTTP_POST_VARS['cat_title'] . "'
! 				WHERE cat_id = " . intval($HTTP_POST_VARS['cat_id']);
  			if( !$result = $db->sql_query($sql) )
  			{
--- 539,544 ----
  			// Modify a category in the DB
  			$sql = "UPDATE " . CATEGORIES_TABLE . "
! 				SET cat_title = '" . str_replace("\'", "''", $HTTP_POST_VARS['cat_title']) . "'
! 				WHERE cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]);
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 554,558 ****
  		case 'deleteforum':
  			// Show form to delete a forum
! 			$forum_id = intval($HTTP_GET_VARS['forum_id']);
  
  			$select_to = '<select name="to_id">';
--- 554,558 ----
  		case 'deleteforum':
  			// Show form to delete a forum
! 			$forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]);
  
  			$select_to = '<select name="to_id">';
***************
*** 652,656 ****
  			// Show form to delete a category
  			//
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
  
  			$buttonvalue = $lang['Move_and_Delete'];
--- 652,656 ----
  			// Show form to delete a category
  			//
! 			$cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]);
  
  			$buttonvalue = $lang['Move_and_Delete'];
***************
*** 758,762 ****
  			//
  			$move = intval($HTTP_GET_VARS['move']);
! 			$forum_id = intval($HTTP_GET_VARS['forum_id']);
  
  			$forum_info = get_info('forum', $forum_id);
--- 758,762 ----
  			//
  			$move = intval($HTTP_GET_VARS['move']);
! 			$forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]);
  
  			$forum_info = get_info('forum', $forum_id);
***************
*** 782,786 ****
  			//
  			$move = intval($HTTP_GET_VARS['move']);
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
  
  			$sql = "UPDATE " . CATEGORIES_TABLE . "
--- 782,786 ----
  			//
  			$move = intval($HTTP_GET_VARS['move']);
! 			$cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]);
  
  			$sql = "UPDATE " . CATEGORIES_TABLE . "
***************
*** 798,802 ****
  
  		case 'forum_sync':
! 			sync('forum', intval($HTTP_GET_VARS['forum_id']));
  			$show_index = TRUE;
  
--- 798,802 ----
  
  		case 'forum_sync':
! 			sync('forum', intval($HTTP_GET_VARS[POST_FORUM_URL]));
  			$show_index = TRUE;
  
***************
*** 876,884 ****
  			'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"))
  		);
  
--- 876,884 ----
  			'CAT_DESC' => $category_rows[$i]['cat_title'],
  
! 			'U_CAT_EDIT' => append_sid("admin_forums.$phpEx?mode=editcat&amp;" . POST_CAT_URL . "=$cat_id"),
! 			'U_CAT_DELETE' => append_sid("admin_forums.$phpEx?mode=deletecat&amp;" . POST_CAT_URL . "=$cat_id"),
! 			'U_CAT_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=cat_order&amp;move=-15&amp;" . POST_CAT_URL . "=$cat_id"),
! 			'U_CAT_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=cat_order&amp;move=15&amp;" . POST_CAT_URL . "=$cat_id"),
! 			'U_VIEWCAT' => append_sid($phpbb_root_path."index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
  		);
  
***************
*** 897,906 ****
  					'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"))
  				);
  
--- 897,906 ----
  					'NUM_POSTS' => $forum_rows[$j]['forum_posts'],
  
! 					'U_VIEWFORUM' => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"),
! 					'U_FORUM_EDIT' => append_sid("admin_forums.$phpEx?mode=editforum&amp;" . POST_FORUM_URL . "=$forum_id"),
! 					'U_FORUM_DELETE' => append_sid("admin_forums.$phpEx?mode=deleteforum&amp;" . POST_FORUM_URL . "=$forum_id"),
! 					'U_FORUM_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=-15&amp;" . POST_FORUM_URL . "=$forum_id"),
! 					'U_FORUM_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=15&amp;" . POST_FORUM_URL . "=$forum_id"),
! 					'U_FORUM_RESYNC' => append_sid("admin_forums.$phpEx?mode=forum_sync&amp;" . POST_FORUM_URL . "=$forum_id"))
  				);
  
***************
*** 917,919 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
--- 917,919 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin forum_edit_body.tpl,1.4,1.5

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

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

Modified Files:
	forum_edit_body.tpl 
Log Message:
Updated to match change in category name when used in forms

Index: forum_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forum_edit_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** forum_edit_body.tpl	2001/11/19 21:57:50	1.4
--- forum_edit_body.tpl	2001/12/24 13:04:16	1.5
***************
*** 19,23 ****
  	<tr> 
  	  <td class="row1">{L_CATEGORY}</td>
! 	  <td class="row2"><select name="cat_id">{S_CAT_LIST}</select></td>
  	</tr>
  	<tr> 
--- 19,23 ----
  	<tr> 
  	  <td class="row1">{L_CATEGORY}</td>
! 	  <td class="row2"><select name="c">{S_CAT_LIST}</select></td>
  	</tr>
  	<tr> 

[Phpbb-checkins] CVS: phpBB2 index.php,1.85,1.86

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

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

Modified Files:
	index.php 
Log Message:
Updated for new category name constant

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** index.php	2001/12/16 18:53:44	1.85
--- index.php	2001/12/24 13:03:44	1.86
***************
*** 34,44 ****
  //
  
! while( list($key, $value) = @each($images) )
! {
! 
! 
! }
! 
! $viewcat = (!empty($HTTP_GET_VARS['viewcat'])) ? $HTTP_GET_VARS['viewcat'] : -1;
  
  if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) )
--- 34,38 ----
  //
  
! $viewcat = (!empty($HTTP_GET_VARS[POST_CAT_URL])) ? $HTTP_GET_VARS[POST_CAT_URL] : -1;
  
  if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) )
***************
*** 281,285 ****
  						"CAT_ID" => $cat_id,
  						"CAT_DESC" => $category_rows[$i]['cat_title'],
! 						"U_VIEWCAT" => append_sid("index.$phpEx?viewcat=$cat_id"))
  					);
  					$gen_cat[$cat_id] = 1;
--- 275,279 ----
  						"CAT_ID" => $cat_id,
  						"CAT_DESC" => $category_rows[$i]['cat_title'],
! 						"U_VIEWCAT" => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
  					);
  					$gen_cat[$cat_id] = 1;
***************
*** 423,427 ****
  						"CAT_ID" => $cat_id,
  						"CAT_DESC" => $category_rows[$i]['cat_title'],
! 						"U_VIEWCAT" => append_sid("index.$phpEx?viewcat=$cat_id"))
  					);
  					$gen_cat[$cat_id] = 1;
--- 417,421 ----
  						"CAT_ID" => $cat_id,
  						"CAT_DESC" => $category_rows[$i]['cat_title'],
! 						"U_VIEWCAT" => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
  					);
  					$gen_cat[$cat_id] = 1;

[Phpbb-checkins] CVS: phpBB2/includes constants.php,1.40,1.41

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

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

Modified Files:
	constants.php 
Log Message:
Added URL constant for categories

Index: constants.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/constants.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** constants.php	2001/11/09 13:26:55	1.40
--- constants.php	2001/12/24 13:03:27	1.41
***************
*** 92,100 ****
  // URL PARAMETERS
  define(POST_TOPIC_URL, 't');
  define(POST_FORUM_URL, 'f');
  define(POST_USERS_URL, 'u');
  define(POST_POST_URL, 'p');
  define(POST_GROUPS_URL, 'g');
- 
  
  // Session parameters
--- 92,100 ----
  // URL PARAMETERS
  define(POST_TOPIC_URL, 't');
+ define(POST_CAT_URL, 'c');
  define(POST_FORUM_URL, 'f');
  define(POST_USERS_URL, 'u');
  define(POST_POST_URL, 'p');
  define(POST_GROUPS_URL, 'g');
  
  // Session parameters

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_admin.php,1.23,1.24

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

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

Modified Files:
	lang_admin.php 
Log Message:
Added DB_Username and DB_Password to install section

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** lang_admin.php	2001/12/17 10:52:03	1.23
--- lang_admin.php	2001/12/22 16:23:16	1.24
***************
*** 656,659 ****
--- 656,661 ----
  $lang['DB_Host'] = "Database Server Hostname / DSN";
  $lang['DB_Name'] = "Your Database Name";
+ $lang['DB_Username'] = "Database Username";
+ $lang['DB_Password'] = "Database Password";
  $lang['Database'] = "Your Database";
  $lang['Install_lang'] = "Choose Language for Installation";

[Phpbb-checkins] CVS: phpBB2 install.php,1.24,1.25

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

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

Modified Files:
	install.php 
Log Message:
Language updates

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** install.php	2001/12/21 15:52:14	1.24
--- install.php	2001/12/22 16:22:45	1.25
***************
*** 546,556 ****
  		"L_DB_HOST" => $lang['DB_Host'], 
  		"L_DB_NAME" => $lang['DB_Name'], 
! 		"L_DB_USER" => $lang['Database'] . ' ' . $lang['Username'], 
! 		"L_DB_PASSWORD" => $lang['Database'] . ' ' . $lang['Password'], 
  		"L_DB_PREFIX" => $lang['Table_Prefix'], 
  		"L_UPGRADE" => $lang['Install_Method'],
! 		"L_ADMIN_USERNAME" => $lang['Administrator'] . ' ' . $lang['Username'], 
! 		"L_ADMIN_PASSWORD" => $lang['Administrator'] . ' ' . $lang['Password'], 
! 		"L_ADMIN_CONFIRM_PASSWORD" => $lang['Confirm'] . ' ' . $lang['Password'], 
  		"L_SUBMIT" => $lang['Start_Install'], 
  
--- 546,556 ----
  		"L_DB_HOST" => $lang['DB_Host'], 
  		"L_DB_NAME" => $lang['DB_Name'], 
! 		"L_DB_USER" => $lang['DB_Username'], 
! 		"L_DB_PASSWORD" => $lang['DB_Password'], 
  		"L_DB_PREFIX" => $lang['Table_Prefix'], 
  		"L_UPGRADE" => $lang['Install_Method'],
! 		"L_ADMIN_USERNAME" => $lang['Admin_Username'], 
! 		"L_ADMIN_PASSWORD" => $lang['Admin_Password'], 
! 		"L_ADMIN_CONFIRM_PASSWORD" => $lang['Admin_Password_confirm'], 
  		"L_SUBMIT" => $lang['Start_Install'], 
  

[Phpbb-checkins] CVS: phpBB2 faq.php,1.10,1.11

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

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

Modified Files:
	faq.php 
Log Message:
Add Back_to_top lang string to template vars

Index: faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/faq.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** faq.php	2001/12/17 00:24:06	1.10
--- faq.php	2001/12/22 15:52:11	1.11
***************
*** 112,116 ****
  
  $template->assign_vars(array(
! 	"L_FAQ_TITLE" => $l_title)
  );
  
--- 112,117 ----
  
  $template->assign_vars(array(
! 	"L_FAQ_TITLE" => $l_title, 
! 	"L_BACK_TO_TOP" => $lang['Back_to_top'])
  );
  

[Phpbb-checkins] CVS: phpBB2/templates/subSilver faq_body.tpl,1.8,1.9

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

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

Modified Files:
	faq_body.tpl 
Log Message:
Remove hard coded language string

Index: faq_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/faq_body.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** faq_body.tpl	2001/12/21 12:46:47	1.8
--- faq_body.tpl	2001/12/22 15:51:48	1.9
***************
*** 32,36 ****
  	<!-- BEGIN faq_row -->  
  	<tr> 
! 		<td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b></span><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER} <a href="#Top" class="postlink">Top</a></span></td>
  	</tr>
  	<tr>
--- 32,36 ----
  	<!-- BEGIN faq_row -->  
  	<tr> 
! 		<td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b></span><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER}<br /><a href="#Top" class="postlink">{L_BACK_TO_TOP}</a></span></td>
  	</tr>
  	<tr>

[Phpbb-checkins] CVS: phpBB2 profile.php,1.158,1.159

[Bart v. B. <ba...@us...>]

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

Modified Files:
	profile.php 
Log Message:
Recycle signature_bbcode_uid

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -r1.158 -r1.159
*** profile.php	2001/12/21 20:39:10	1.158
--- profile.php	2001/12/22 12:54:59	1.159
***************
*** 668,672 ****
  				}
  
! 				$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
  				$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
  
--- 668,676 ----
  				}
  
! 				// Only create a new bbcode_uid when there was no uid yet.
! 				if($signature_bbcode_uid == '')
! 				{
! 					$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
! 				}
  				$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
  
***************
*** 2051,2053 ****
  }
  
! ?>
\ No newline at end of file
--- 2055,2057 ----
  }
  
! ?>

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.98,1.99

[Bart v. B. <ba...@us...>]

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

Modified Files:
	functions.php 
Log Message:
Sigh

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -r1.98 -r1.99
*** functions.php	2001/12/22 11:17:09	1.98
--- functions.php	2001/12/22 11:18:08	1.99
***************
*** 305,309 ****
  	
  			$images[$key] = ( file_exists($new_value) ) ? $new_value : str_replace("_lang", "_english", $value);
- 			print $new_value;
  		}
  	}
--- 305,308 ----

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.97,1.98

[Bart v. B. <ba...@us...>]

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

Modified Files:
	functions.php 
Log Message:
Fixed small problem with translation of imgs

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -r1.97 -r1.98
*** functions.php	2001/12/21 16:00:41	1.97
--- functions.php	2001/12/22 11:17:09	1.98
***************
*** 304,308 ****
  			$new_value = str_replace("_lang", "_" . $board_config['default_lang'], $value);
  	
! 			$images[$key] = ( !file_exists($new_value) ) ? $new_value : str_replace("_lang", "_english", $value);
  		}
  	}
--- 304,309 ----
  			$new_value = str_replace("_lang", "_" . $board_config['default_lang'], $value);
  	
! 			$images[$key] = ( file_exists($new_value) ) ? $new_value : str_replace("_lang", "_english", $value);
! 			print $new_value;
  		}
  	}
***************
*** 1202,1204 ****
  }
  
! ?>
\ No newline at end of file
--- 1203,1205 ----
  }
  
! ?>

[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.66,1.67

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

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

Modified Files:
	privmsg.php 
Log Message:
Yep, you guessed it another \' ...

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** privmsg.php	2001/12/18 20:35:17	1.66
--- privmsg.php	2001/12/21 22:59:21	1.67
***************
*** 309,313 ****
  		//
  		$sql = "INSERT $sql_priority INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig)
! 			VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . addslashes($privmsg['privmsgs_subject']) . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "', " . $privmsg['privmsgs_enable_html'] . ", " . $privmsg['privmsgs_enable_bbcode'] . ", " . $privmsg['privmsgs_enable_smilies'] . ", " .  $privmsg['privmsgs_attach_sig'] . ")";
  		if( !$pm_sent_status = $db->sql_query($sql) )
  		{
--- 309,313 ----
  		//
  		$sql = "INSERT $sql_priority INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig)
! 			VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . addslashes(str_replace("\'", "''", $privmsg['privmsgs_subject'])) . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "', " . $privmsg['privmsgs_enable_html'] . ", " . $privmsg['privmsgs_enable_bbcode'] . ", " . $privmsg['privmsgs_enable_smilies'] . ", " .  $privmsg['privmsgs_attach_sig'] . ")";
  		if( !$pm_sent_status = $db->sql_query($sql) )
  		{
***************
*** 319,323 ****
  
  			$sql = "INSERT $sql_priority INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text)
! 				VALUES ($privmsg_sent_id, '" . $privmsg['privmsgs_bbcode_uid'] . "', '" . addslashes($privmsg['privmsgs_text']) . "')";
  			if(!$pm_sent_text_status = $db->sql_query($sql))
  			{
--- 319,323 ----
  
  			$sql = "INSERT $sql_priority INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text)
! 				VALUES ($privmsg_sent_id, '" . $privmsg['privmsgs_bbcode_uid'] . "', '" . addslashes(str_replace("\'", "''", $privmsg['privmsgs_text'])) . "')";
  			if(!$pm_sent_text_status = $db->sql_query($sql))
  			{
***************
*** 889,893 ****
  			$sql = "SELECT user_id, user_notify_pm, user_email, user_lang 
  				FROM " . USERS_TABLE . "
! 				WHERE username = '" . $to_username . "'
  					AND user_id <> " . ANONYMOUS;
  			if(!$result = $db->sql_query($sql))
--- 889,893 ----
  			$sql = "SELECT user_id, user_notify_pm, user_email, user_lang 
  				FROM " . USERS_TABLE . "
! 				WHERE username = '" . str_replace("\'", "''", $to_username) . "'
  					AND user_id <> " . ANONYMOUS;
  			if(!$result = $db->sql_query($sql))
***************
*** 1002,1011 ****
  
  			$sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig)
! 				VALUES (" . PRIVMSGS_NEW_MAIL . ", '$privmsg_subject', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip', $html_on, $bbcode_on, $smilies_on, $attach_sig)";
  		}
  		else
  		{
  			$sql_info = "UPDATE " . PRIVMSGS_TABLE . "
! 				SET privmsgs_type = " . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '$privmsg_subject', privmsgs_from_userid = " . $userdata['user_id'] . ", privmsgs_to_userid = " . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '$user_ip', privmsgs_enable_html = $html_on, privmsgs_enable_bbcode = $bbcode_on, privmsgs_enable_smilies = $smilies_on, privmsgs_attach_sig = $attach_sig 
  				WHERE privmsgs_id = $privmsg_id";
  		}
--- 1002,1011 ----
  
  			$sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig)
! 				VALUES (" . PRIVMSGS_NEW_MAIL . ", '" . str_replace("\'", "''", $privmsg_subject) . "', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip', $html_on, $bbcode_on, $smilies_on, $attach_sig)";
  		}
  		else
  		{
  			$sql_info = "UPDATE " . PRIVMSGS_TABLE . "
! 				SET privmsgs_type = " . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '" . str_replace("\'", "''", $privmsg_subject) . "', privmsgs_from_userid = " . $userdata['user_id'] . ", privmsgs_to_userid = " . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '$user_ip', privmsgs_enable_html = $html_on, privmsgs_enable_bbcode = $bbcode_on, privmsgs_enable_smilies = $smilies_on, privmsgs_attach_sig = $attach_sig 
  				WHERE privmsgs_id = $privmsg_id";
  		}
***************
*** 1022,1031 ****
  
  				$sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text)
! 					VALUES ($privmsg_sent_id, '" . $bbcode_uid . "', '$privmsg_message')";
  			}
  			else
  			{
  				$sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . "
! 					SET privmsgs_text = '$privmsg_message', privmsgs_bbcode_uid = '$bbcode_uid' 
  					WHERE privmsgs_text_id = $privmsg_id";
  			}
--- 1022,1031 ----
  
  				$sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text)
! 					VALUES ($privmsg_sent_id, '" . $bbcode_uid . "', '" . str_replace("\'", "''", $privmsg_message) . "')";
  			}
  			else
  			{
  				$sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . "
! 					SET privmsgs_text = '" . str_replace("\'", "''", $privmsg_message) . "', privmsgs_bbcode_uid = '$bbcode_uid' 
  					WHERE privmsgs_text_id = $privmsg_id";
  			}
***************
*** 2010,2012 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 2010,2012 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images icon_aim.gif,1.1,NONE icon_edit.gif,1.1,NONE icon_email.gif,1.1,NONE icon_icq_add.gif,1.1,NONE icon_ip.gif,1.1,NONE icon_msnm.gif,1.1,NONE icon_pm.gif,1.1,NONE icon_profile.gif,1.1,NONE icon_quote.gif,1.1,NONE icon_search.gif,1.1,NONE icon_www.gif,1.1,NONE icon_yim.gif,1.1,NONE post.gif,1.1,NONE reply-locked.gif,1.1,NONE reply.gif,1.1,NONE

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

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

Removed Files:
	icon_aim.gif icon_edit.gif icon_email.gif icon_icq_add.gif 
	icon_ip.gif icon_msnm.gif icon_pm.gif icon_profile.gif 
	icon_quote.gif icon_search.gif icon_www.gif icon_yim.gif 
	post.gif reply-locked.gif reply.gif 
Log Message:
Removed non-lang images

--- icon_aim.gif DELETED ---

--- icon_edit.gif DELETED ---

--- icon_email.gif DELETED ---

--- icon_icq_add.gif DELETED ---

--- icon_ip.gif DELETED ---

--- icon_msnm.gif DELETED ---

--- icon_pm.gif DELETED ---

--- icon_profile.gif DELETED ---

--- icon_quote.gif DELETED ---

--- icon_search.gif DELETED ---

--- icon_www.gif DELETED ---

--- icon_yim.gif DELETED ---

--- post.gif DELETED ---

--- reply-locked.gif DELETED ---

--- reply.gif DELETED ---

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.51,1.52

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

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

Modified Files:
	modcp.php 
Log Message:
Another \' update ...

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** modcp.php	2001/12/18 21:28:21	1.51
--- modcp.php	2001/12/21 22:39:23	1.52
***************
*** 524,528 ****
  						// Insert topic in the old forum that indicates that the forum has moved.
  						$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_last_post_id, topic_moved_id)
! 							VALUES ($old_forum_id, '" . addslashes($row[$i]['topic_title']) . "', '" . $row[$i]['topic_poster'] . "', " . $row[$i]['topic_time'] . ", " . TOPIC_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)";
  						if( !$result = $db->sql_query($sql) )
  						{
--- 524,528 ----
  						// Insert topic in the old forum that indicates that the forum has moved.
  						$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_last_post_id, topic_moved_id)
! 							VALUES ($old_forum_id, '" . addslashes(str_replace("\'", "''", $row[$i]['topic_title'])) . "', '" . str_replace("\'", "''", $row[$i]['topic_poster']) . "', " . $row[$i]['topic_time'] . ", " . TOPIC_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)";
  						if( !$result = $db->sql_query($sql) )
  						{
***************
*** 726,730 ****
  
  			$post_rowset = $db->sql_fetchrow($result);
! 			$first_poster = $post_rowset['poster_id'];
  			$topic_id = $post_rowset['topic_id'];
  			$post_time = $post_rowset['post_time'];
--- 726,730 ----
  
  			$post_rowset = $db->sql_fetchrow($result);
! 			$first_poster = str_replace("\'", "''", $post_rowset['poster_id']);
  			$topic_id = $post_rowset['topic_id'];
  			$post_time = $post_rowset['post_time'];
***************
*** 741,745 ****
  			$sql  = "INSERT INTO " . TOPICS_TABLE . "
  				(topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type)
! 				VALUES ('$post_subject', $first_poster, " . $topic_time . ", $new_forum_id, " . TOPIC_UNLOCKED . ", " . POST_NORMAL . ")";
  			if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION))
  			{
--- 741,745 ----
  			$sql  = "INSERT INTO " . TOPICS_TABLE . "
  				(topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type)
! 				VALUES ('" . str_replace("\'", "''", $post_subject) . "', $first_poster, " . $topic_time . ", $new_forum_id, " . TOPIC_UNLOCKED . ", " . POST_NORMAL . ")";
  			if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION))
  			{
***************
*** 1175,1177 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 1175,1177 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 profile.php,1.157,1.158

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

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

Modified Files:
	profile.php 
Log Message:
Fix bug #490164

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -r1.157 -r1.158
*** profile.php	2001/12/21 18:42:31	1.157
--- profile.php	2001/12/21 20:39:10	1.158
***************
*** 967,971 ****
  				}
  
! 				if( preg_match("#^http:\/\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+\/.*?\.(gif|jpg|png)$#is", $user_avatar_remoteurl) )
  				{
  					$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", $user_avatar_remoteurl) . "', user_avatar_type = " . USER_AVATAR_REMOTE;
--- 967,971 ----
  				}
  
! 				if( preg_match("#^(http:\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)*[a-z]+\/.*?\.(gif|jpg|png)$)#is", $user_avatar_remoteurl) )
  				{
  					$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", $user_avatar_remoteurl) . "', user_avatar_type = " . USER_AVATAR_REMOTE;

[Phpbb-checkins] CVS: phpBB2 profile.php,1.156,1.157

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

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

Modified Files:
	profile.php 
Log Message:
More \' updates + fix bug #490842 by changing " into " when jumping to gallery

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -r1.156 -r1.157
*** profile.php	2001/12/21 02:22:07	1.156
--- profile.php	2001/12/21 18:42:31	1.157
***************
*** 69,73 ****
  			$sql = "SELECT user_email
  				FROM " . USERS_TABLE . "
! 				WHERE user_email = '" . $email . "'";
  			if(!$result = $db->sql_query($sql))
  			{
--- 69,73 ----
  			$sql = "SELECT user_email
  				FROM " . USERS_TABLE . "
! 				WHERE user_email = '" . str_replace("\'", "''", $email) . "'";
  			if(!$result = $db->sql_query($sql))
  			{
***************
*** 613,617 ****
  					{
  						$password = md5($password);
! 						$passwd_sql = "user_password = '$password', ";
  					}
  				}
--- 613,617 ----
  					{
  						$password = md5($password);
! 						$passwd_sql = "user_password = '" . str_replace("\'", "''", $password) . "', ";
  					}
  				}
***************
*** 655,659 ****
  					else
  					{
! 						$username_sql = "username = '$username', ";
  					}
  				}
--- 655,659 ----
  					else
  					{
! 						$username_sql = "username = '" . str_replace("\'", "''", $username) . "', ";
  					}
  				}
***************
*** 969,973 ****
  				if( preg_match("#^http:\/\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+\/.*?\.(gif|jpg|png)$#is", $user_avatar_remoteurl) )
  				{
! 					$avatar_sql = ", user_avatar = '$user_avatar_remoteurl', user_avatar_type = " . USER_AVATAR_REMOTE;
  				}
  				else
--- 969,973 ----
  				if( preg_match("#^http:\/\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+\/.*?\.(gif|jpg|png)$#is", $user_avatar_remoteurl) )
  				{
! 					$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", $user_avatar_remoteurl) . "', user_avatar_type = " . USER_AVATAR_REMOTE;
  				}
  				else
***************
*** 979,983 ****
  			else if( $user_avatar_local != "" && $board_config['allow_avatar_local'] && $avatar_sql == "" && !$error )
  			{
! 				$avatar_sql = ", user_avatar = '$user_avatar_local', user_avatar_type = " . USER_AVATAR_GALLERY;
  			}
  
--- 979,983 ----
  			else if( $user_avatar_local != "" && $board_config['allow_avatar_local'] && $avatar_sql == "" && !$error )
  			{
! 				$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", $user_avatar_local) . "', user_avatar_type = " . USER_AVATAR_GALLERY;
  			}
  
***************
*** 1007,1013 ****
  
  					$sql = "UPDATE " . USERS_TABLE . "
! 						SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_lang = '$user_lang', user_style = $user_style, user_active = $user_active, user_actkey = '$user_actkey'" . $avatar_sql . "
  						WHERE user_id = $user_id";
- 
  					if( $result = $db->sql_query($sql) )
  					{
--- 1007,1012 ----
  
  					$sql = "UPDATE " . USERS_TABLE . "
! 						SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) ."', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", $aim) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_active = $user_active, user_actkey = '" . str_replace("\'", "''", $user_actkey) . "'" . $avatar_sql . "
  						WHERE user_id = $user_id";
  					if( $result = $db->sql_query($sql) )
  					{
***************
*** 1092,1101 ****
  					//
  					$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! 						VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
  
  					if( $board_config['require_activation'] ==USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa == 1)
  					{
  						$user_actkey = generate_activation_key();
! 						$sql .= "0, '$user_actkey')";
  					}
  					else
--- 1091,1100 ----
  					//
  					$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! 						VALUES ($new_user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', '" . str_replace("\'", "''", $avatar_filename) . "', $viewemail, '" . str_replace("\'", "''", $aim) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
  
  					if( $board_config['require_activation'] ==USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa == 1)
  					{
  						$user_actkey = generate_activation_key();
! 						$sql .= "0, '" . str_replace("\'", "''", $user_actkey) . "')";
  					}
  					else
***************
*** 1276,1281 ****
  			$occupation = $userdata['user_occ'];
  			$interests = $userdata['user_interests'];
- 			$signature = $userdata['user_sig'];
  			$signature_bbcode_uid = $userdata['user_sig_bbcode_uid'];
  
  			$viewemail = $userdata['user_viewemail'];
--- 1275,1280 ----
  			$occupation = $userdata['user_occ'];
  			$interests = $userdata['user_interests'];
  			$signature_bbcode_uid = $userdata['user_sig_bbcode_uid'];
+ 			$signature = ( $signature_bbcode_uid != "" ) ? preg_replace("/\:(([a-z0-9]:)?)$signature_bbcode_uid/si", "", $userdata['user_sig']) : $userdata['user_sig'];
  
  			$viewemail = $userdata['user_viewemail'];
***************
*** 1354,1361 ****
  						}
  					}
- 					else
- 					{
- 
- 					}
  				}
  		
--- 1353,1356 ----
***************
*** 1404,1419 ****
  
  				$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="' . $username . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="email" value="' . $email . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="icq" value="' . $icq . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="aim" value="' . $aim . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="msn" value="' . $msn . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="yim" value="' . $yim . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="website" value="' . $website . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="location" value="' . $location . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="occupation" value="' . $occupation . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="interests" value="' . $interests . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="signature" value="' . $signature . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="viewemail" value="' . $viewemail . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="notifypm" value="' . $notifypm . '" />';
--- 1399,1414 ----
  
  				$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="' . str_replace("\"", "&quot;", $user_id) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="username" value="' . str_replace("\"", "&quot;", $username) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="email" value="' . str_replace("\"", "&quot;", $email) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="icq" value="' . str_replace("\"", "&quot;", $icq) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="aim" value="' . str_replace("\"", "&quot;", $aim) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="msn" value="' . str_replace("\"", "&quot;", $msn) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="yim" value="' . str_replace("\"", "&quot;", $yim) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="website" value="' . str_replace("\"", "&quot;", $website) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="location" value="' . str_replace("\"", "&quot;", $location) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="occupation" value="' . str_replace("\"", "&quot;", $occupation) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="interests" value="' . str_replace("\"", "&quot;", $interests) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="signature" value="' . str_replace("\"", "&quot;", $signature) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="viewemail" value="' . $viewemail . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="notifypm" value="' . $notifypm . '" />';
***************
*** 1428,1432 ****
  				$s_hidden_vars .= '<input type="hidden" name="language" value="' . $user_lang . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="timezone" value="' . $user_timezone . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="dateformat" value="' . $user_dateformat . '" />';
  
  				$template->assign_vars(array(
--- 1423,1427 ----
  				$s_hidden_vars .= '<input type="hidden" name="language" value="' . $user_lang . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="timezone" value="' . $user_timezone . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="dateformat" value="' . str_replace("\"", "&quot;", $user_dateformat) . '" />';
  
  				$template->assign_vars(array(
***************
*** 1579,1583 ****
  				"DATE_FORMAT" => $user_dateformat,
  				"HTML_STATUS" => $html_status,
! 				"BBCODE_STATUS" => $bbcode_status,
  				"SMILIES_STATUS" => $smilies_status,
  
--- 1574,1578 ----
  				"DATE_FORMAT" => $user_dateformat,
  				"HTML_STATUS" => $html_status,
! 				"BBCODE_STATUS" => sprintf($bbcode_status, '<a href="' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 
  				"SMILIES_STATUS" => $smilies_status,
  
***************
*** 1681,1686 ****
  			$sql = "SELECT user_id, username, user_email, user_active
  				FROM " . USERS_TABLE . " 
! 				WHERE user_email = '$email' 
! 					AND username = '$username'";
  			if( $result = $db->sql_query($sql) )
  			{
--- 1676,1681 ----
  			$sql = "SELECT user_id, username, user_email, user_active
  				FROM " . USERS_TABLE . " 
! 				WHERE user_email = '" . str_replace("\'", "''", $email) . "' 
! 					AND username = '" . str_replace("\'", "''", $username) . "'";
  			if( $result = $db->sql_query($sql) )
  			{
***************
*** 1805,1809 ****
  		$sql = "SELECT user_id, user_email, user_newpasswd 
  			FROM " . USERS_TABLE . "
! 			WHERE user_actkey = '" . $HTTP_GET_VARS['act_key'] . "'";
  			if( $result = $db->sql_query($sql) )
  			{
--- 1800,1804 ----
  		$sql = "SELECT user_id, user_email, user_newpasswd 
  			FROM " . USERS_TABLE . "
! 			WHERE user_actkey = '" . str_replace("\'", "''", $HTTP_GET_VARS['act_key']) . "'";
  			if( $result = $db->sql_query($sql) )
  			{
***************
*** 1812,1816 ****
  					if( $row['user_newpasswd'] != "" )
  					{
! 						$sql_update_pass = ", user_password = '" . $row['user_newpasswd'] . "', user_newpasswd = ''";
  					}
  					else
--- 1807,1811 ----
  					if( $row['user_newpasswd'] != "" )
  					{
! 						$sql_update_pass = ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''";
  					}
  					else
***************
*** 2056,2058 ****
  }
  
! ?>
--- 2051,2053 ----
  }
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/admin admin_user_ban.php,1.13,1.14

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

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

Modified Files:
	admin_user_ban.php 
Log Message:
Fix bug #495736

Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** admin_user_ban.php	2001/12/03 00:56:48	1.13
--- admin_user_ban.php	2001/12/21 16:58:47	1.14
***************
*** 234,238 ****
  	// ban
  	//
! 	if($kill_session_sql != "")
  	{
  		$sql = "DELETE FROM " . SESSIONS_TABLE . "
--- 234,238 ----
  	// ban
  	//
! 	if( $kill_session_sql != "" )
  	{
  		$sql = "DELETE FROM " . SESSIONS_TABLE . "
***************
*** 249,253 ****
  		for($j = 0; $j < count($current_banlist); $j++)
  		{
! 			if($email_list[$i] == $current_banlist[$j]['ban_email'])
  			{
  				$in_banlist = true;
--- 249,253 ----
  		for($j = 0; $j < count($current_banlist); $j++)
  		{
! 			if( $email_list[$i] == $current_banlist[$j]['ban_email'] )
  			{
  				$in_banlist = true;
***************
*** 255,262 ****
  		}
  
! 		if(!$in_banlist)
  		{
  			$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
! 				VALUES ('" . $email_list[$i] . "')";
  			if( !$result = $db->sql_query($sql) )
  			{
--- 255,262 ----
  		}
  
! 		if( !$in_banlist )
  		{
  			$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
! 				VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')";
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 278,289 ****
  				if($where_sql != "")
  				{
! 					$where_sql .= " OR ";
  				}
! 				$where_sql .= "ban_id = " . $user_list[$i];
  			}
  		}
  	}
  
! 	if(isset($HTTP_POST_VARS['unban_ip']))
  	{
  		$ip_list = $HTTP_POST_VARS['unban_ip'];
--- 278,289 ----
  				if($where_sql != "")
  				{
! 					$where_sql .= ", ";
  				}
! 				$where_sql .= $user_list[$i];
  			}
  		}
  	}
  
! 	if( isset($HTTP_POST_VARS['unban_ip']) )
  	{
  		$ip_list = $HTTP_POST_VARS['unban_ip'];
***************
*** 295,306 ****
  				if($where_sql != "")
  				{
! 					$where_sql .= " OR ";
  				}
! 				$where_sql .= "ban_id = " . $ip_list[$i];
  			}
  		}
  	}
  
! 	if(isset($HTTP_POST_VARS['unban_email']))
  	{
  		$email_list = $HTTP_POST_VARS['unban_email'];
--- 295,306 ----
  				if($where_sql != "")
  				{
! 					$where_sql .= ", ";
  				}
! 				$where_sql .= $ip_list[$i];
  			}
  		}
  	}
  
! 	if( isset($HTTP_POST_VARS['unban_email']) )
  	{
  		$email_list = $HTTP_POST_VARS['unban_email'];
***************
*** 312,326 ****
  				if($where_sql != "")
  				{
! 					$where_sql .= " OR ";
  				}
! 				$where_sql .= "ban_id = " . $email_list[$i];
  			}
  		}
  	}
  
! 	if($where_sql != "")
  	{
  		$sql = "DELETE FROM " . BANLIST_TABLE . "
! 			WHERE $where_sql";
  		if( !$result = $db->sql_query($sql) )
  		{
--- 312,326 ----
  				if($where_sql != "")
  				{
! 					$where_sql .= ", ";
  				}
! 				$where_sql .= $email_list[$i];
  			}
  		}
  	}
  
! 	if( $where_sql != "" )
  	{
  		$sql = "DELETE FROM " . BANLIST_TABLE . "
! 			WHERE ban_id IN ($where_sql)";
  		if( !$result = $db->sql_query($sql) )
  		{
***************
*** 368,372 ****
  		$userban_count++;
  	}
- 	$select_size = ( $userban_count < 5 || $userban_c) ? 5 : 
  	$select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist . "</select>";
  
--- 368,371 ----

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.46,1.47

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

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

Modified Files:
	sessions.php 
Log Message:
Yep, more \' stuff

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** sessions.php	2001/12/15 17:26:37	1.46
--- sessions.php	2001/12/21 16:02:15	1.47
***************
*** 134,139 ****
  	if( $user_id != ANONYMOUS )
  	{
! 		$sql .= " OR ban_email LIKE '" . $row['user_email'] . "' 
! 			OR ban_email LIKE '" . substr($row['user_email'], strpos($row['user_email'], "@")) . "'";
  	}
  	$result = $db->sql_query($sql);
--- 134,139 ----
  	if( $user_id != ANONYMOUS )
  	{
! 		$sql .= " OR ban_email LIKE '" . str_replace("\'", "''", $row['user_email']) . "' 
! 			OR ban_email LIKE '" . substr(str_replace("\'", "''", $row['user_email']), strpos(str_replace("\'", "''", $row['user_email']), "@")) . "'";
  	}
  	$result = $db->sql_query($sql);

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.96,1.97

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

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

Modified Files:
	functions.php 
Log Message:
More \' updates

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** functions.php	2001/12/19 16:07:31	1.96
--- functions.php	2001/12/21 16:00:41	1.97
***************
*** 100,104 ****
  	$sql = "SELECT *
  		FROM " . USERS_TABLE . "
! 		WHERE username = '$username'
  			AND user_id <> " . ANONYMOUS;
  	if(!$result = $db->sql_query($sql))
--- 100,104 ----
  	$sql = "SELECT *
  		FROM " . USERS_TABLE . "
! 		WHERE username = '" . str_replace("\'", "''", $username) . "'
  			AND user_id <> " . ANONYMOUS;
  	if(!$result = $db->sql_query($sql))
***************
*** 331,335 ****
  	$template_name = $row['template_name'] ;
  
! 	$template = new Template($phpbb_root_path . $template_path . $template_name, $db);
  
  	if( $template )
--- 331,335 ----
  	$template_name = $row['template_name'] ;
  
! 	$template = new Template($phpbb_root_path . $template_path . $template_name, $board_config, $db);
  
  	if( $template )
***************
*** 391,403 ****
  
  //
- // Create a GMT timestamp
- //
- function get_gmt_ts()
- {
- 	$time = @time();
- 	return($time);
- }
- 
- //
  // Pagination routine, generates
  // page number sequence
--- 391,394 ----
***************
*** 516,524 ****
  				WHERE ug.user_id = u.user_id
  					AND g.group_id = ug.group_id
! 					AND	( LOWER(u.username) = '" . strtolower($username) . "'
! 						OR LOWER(g.group_name) = '" . strtolower($username) . "' )";
  			$sql_disallow = "SELECT disallow_username
  				FROM " . DISALLOW_TABLE . "
! 				WHERE '$username' LIKE disallow_username";
  			if($result = $db->sql_query($sql_users))
  			{
--- 507,515 ----
  				WHERE ug.user_id = u.user_id
  					AND g.group_id = ug.group_id
! 					AND	( LOWER(u.username) = '" . strtolower(str_replace("\'", "''", $username)) . "'
! 						OR LOWER(g.group_name) = '" . strtolower(str_replace("\'", "''", $username)) . "' )";
  			$sql_disallow = "SELECT disallow_username
  				FROM " . DISALLOW_TABLE . "
! 				WHERE '" . str_replace("\'", "''", $username) . "' LIKE disallow_username";
  			if($result = $db->sql_query($sql_users))
  			{
***************
*** 542,551 ****
  				WHERE ug.user_id = u.user_id
  					AND g.group_id = ug.group_id
! 					AND	( LOWER(u.username) = '" . strtolower($username) . "'
! 						OR LOWER(g.group_name) = '" . strtolower($username) . "' )
  				UNION
  				SELECT disallow_username, NULL
  					FROM " . DISALLOW_TABLE . "
! 					WHERE '$username' LIKE disallow_username";
  			if($result = $db->sql_query($sql))
  			{
--- 533,542 ----
  				WHERE ug.user_id = u.user_id
  					AND g.group_id = ug.group_id
! 					AND	( LOWER(u.username) = '" . strtolower(str_replace("\'", "''", $username)) . "'
! 						OR LOWER(g.group_name) = '" . strtolower(str_replace("\'", "''", $username)) . "' )
  				UNION
  				SELECT disallow_username, NULL
  					FROM " . DISALLOW_TABLE . "
! 					WHERE '" . str_replace("\'", "''", $username) . "' LIKE disallow_username";
  			if($result = $db->sql_query($sql))
  			{
***************
*** 929,933 ****
  		$sql = "SELECT username 
  			FROM " . USERS_TABLE . " 
! 			WHERE username LIKE '$username_search' 
  			ORDER BY username";
  		if( !$result = $db->sql_query($sql) )
--- 920,924 ----
  		$sql = "SELECT username 
  			FROM " . USERS_TABLE . " 
! 			WHERE username LIKE '" . str_replace("\'", "''", $username_search) . "' 
  			ORDER BY username";
  		if( !$result = $db->sql_query($sql) )
***************
*** 1211,1213 ****
  }
  
! ?>
--- 1202,1204 ----
  }
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 install.php,1.23,1.24

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

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

Modified Files:
	install.php 
Log Message:
More \' to '' changes

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** install.php	2001/12/20 19:24:30	1.23
--- install.php	2001/12/21 15:52:14	1.24
***************
*** 368,377 ****
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
  
- 	$template->assign_block_vars("switch_ftp_file", array());
- 	$template->assign_block_vars("switch_common_install", array());
  	if( $upgrade == 1 )
  	{
  		$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
  	}
  	$template->assign_vars(array(
  		"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
--- 368,379 ----
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
  
  	if( $upgrade == 1 )
  	{
  		$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
  	}
+ 
+ 	$template->assign_block_vars("switch_ftp_file", array());
+ 	$template->assign_block_vars("switch_common_install", array());
+ 
  	$template->assign_vars(array(
  		"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
***************
*** 713,717 ****
  
  			$sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) 
! 				VALUES ('default_lang', '$language')";
  			$result = $db->sql_query($sql);
  			if( !$result )
--- 715,719 ----
  
  			$sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) 
! 				VALUES ('default_lang', '" . str_replace("\'", "''", $language) . "')";
  			$result = $db->sql_query($sql);
  			if( !$result )
***************
*** 723,727 ****
  
  			$sql = "UPDATE " . $table_prefix . "users 
! 				SET username = '$admin_name', user_password='$admin_pass_md5', user_lang = '" . $language . "' 
  				WHERE username = 'Admin'";
  			$result = $db->sql_query($sql);
--- 725,729 ----
  
  			$sql = "UPDATE " . $table_prefix . "users 
! 				SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "' 
  				WHERE username = 'Admin'";
  			$result = $db->sql_query($sql);
***************
*** 907,909 ****
  }
  
! ?>
--- 909,911 ----
  }
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.33,1.34 login.php,1.36,1.37 posting.php,1.130,1.131 search.php,1.50,1.51

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

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

Modified Files:
	groupcp.php login.php posting.php search.php 
Log Message:
Hopefully this addresses the \' and '' problems with MSSQL, etc. ... I'd like opinions on the security of doing this.

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** groupcp.php	2001/12/16 02:06:14	1.33
--- groupcp.php	2001/12/21 15:51:31	1.34
***************
*** 317,321 ****
  			$sql = "SELECT user_id, user_email 
  				FROM " . USERS_TABLE . " 
! 				WHERE username = '$username'";
  			if( !$result = $db->sql_query($sql) )
  			{
--- 317,321 ----
  			$sql = "SELECT user_id, user_email 
  				FROM " . USERS_TABLE . " 
! 				WHERE username = '" . str_replace("\'", "''", $username) . "'";
  			if( !$result = $db->sql_query($sql) )
  			{

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** login.php	2001/12/05 00:20:52	1.36
--- login.php	2001/12/21 15:51:31	1.37
***************
*** 50,54 ****
  		$sql = "SELECT user_id, username, user_password, user_active, user_level 
  			FROM ".USERS_TABLE."
! 			WHERE username = '$username'";
  		$result = $db->sql_query($sql);
  		if(!$result)
--- 50,54 ----
  		$sql = "SELECT user_id, username, user_password, user_active, user_level 
  			FROM ".USERS_TABLE."
! 			WHERE username = '" . str_replace("\'", "''", $username) . "'";
  		$result = $db->sql_query($sql);
  		if(!$result)

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -r1.130 -r1.131
*** posting.php	2001/12/19 16:59:44	1.130
--- posting.php	2001/12/21 15:51:31	1.131
***************
*** 281,285 ****
  	$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
  
- 	// 0.3s
  	$search_text = clean_words($post_text, $stopword_array, $synonym_array);
  	$search_matches = split_words($search_text);
--- 281,284 ----
***************
*** 372,385 ****
  	}
  
- /*
- 	$mtime = explode(" ",microtime());
- 	$starttime = $mtime[1] + $mtime[0];
- 
- 	$mtime = explode(" ", microtime());
- 	$endtime = $mtime[1] + $mtime[0];
- 	echo "<BR><BR> TIMING1 >>>>>>>>> " .  ($endtime - $starttime) . "<BR><BR>\n";
- 
- */
- 
  	remove_common(0.15, $word_id_list);
  
--- 371,374 ----
***************
*** 1205,1209 ****
  		{
  			$sql  = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote)
! 				VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)";
  
  			if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
--- 1194,1198 ----
  		{
  			$sql  = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote)
! 				VALUES ('" . str_replace("\'", "''", $post_subject) . "', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)";
  
  			if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
***************
*** 1222,1226 ****
  			{
  				$sql = "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) 
! 					VALUES ($new_topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")";
  				if( $result = $db->sql_query($sql) )
  				{
--- 1211,1215 ----
  			{
  				$sql = "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) 
! 					VALUES ($new_topic_id, '" . str_replace("\'", "''", $poll_title) . "', $current_time, " . ( $poll_length * 86400 ) . ")";
  				if( $result = $db->sql_query($sql) )
  				{
***************
*** 1231,1235 ****
  					{
  						$sql = "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result)
! 							VALUES ($new_vote_id, $poll_option_id, '$option_text', 0)";
  						if( !$result = $db->sql_query($sql) )
  						{
--- 1220,1224 ----
  					{
  						$sql = "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result)
! 							VALUES ($new_vote_id, $poll_option_id, '" . str_replace("\'", "''", $option_text) . "', 0)";
  						if( !$result = $db->sql_query($sql) )
  						{
***************
*** 1268,1272 ****
  
  		$sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig)
! 			VALUES ($new_topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)";
  		$result = ($mode == "reply") ? $db->sql_query($sql, BEGIN_TRANSACTION) : $db->sql_query($sql);
  
--- 1257,1261 ----
  
  		$sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig)
! 			VALUES ($new_topic_id, $forum_id, " . $userdata['user_id'] . ", '" . str_replace("\'", "''", $post_username) . "', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)";
  		$result = ($mode == "reply") ? $db->sql_query($sql, BEGIN_TRANSACTION) : $db->sql_query($sql);
  
***************
*** 1276,1280 ****
  
  			$sql = "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text)
! 				VALUES ($new_post_id, '$post_subject', '$bbcode_uid', '$post_message')";
  
  			if( $db->sql_query($sql) )
--- 1265,1269 ----
  
  			$sql = "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text)
! 				VALUES ($new_post_id, '" . str_replace("\'", "''", $post_subject) . "', '$bbcode_uid', '" . str_replace("\'", "''", $post_message) . "')";
  
  			if( $db->sql_query($sql) )
***************
*** 1905,1909 ****
  			{
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
! 					SET post_text = '$post_message',  bbcode_uid = '$bbcode_uid', post_subject = '$post_subject'
  					WHERE post_id = $post_id"; 
  
--- 1894,1898 ----
  			{
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
! 					SET post_text = '" . str_replace("\'", "''", $post_message) . "',  bbcode_uid = '$bbcode_uid', post_subject = '" . str_replace("\'", "''", $post_subject) . "'
  					WHERE post_id = $post_id"; 
  
***************
*** 1919,1923 ****
  						//
  						$sql = "UPDATE " . TOPICS_TABLE . "
! 							SET topic_title = '$post_subject', topic_type = $topic_type" . $sql_topic_vote_edit . " 
  							WHERE topic_id = $topic_id";
  						if($db->sql_query($sql, END_TRANSACTION))
--- 1908,1912 ----
  						//
  						$sql = "UPDATE " . TOPICS_TABLE . "
! 							SET topic_title = '" . str_replace("\'", "''", $post_subject) . "', topic_type = $topic_type" . $sql_topic_vote_edit . " 
  							WHERE topic_id = $topic_id";
  						if($db->sql_query($sql, END_TRANSACTION))
***************
*** 1951,1955 ****
  										//
  										$sql = "UPDATE " . VOTE_DESC_TABLE . " 
! 											SET vote_text = '$poll_title', vote_length = " . ( $poll_length * 86400 ) . " 
  											WHERE topic_id = $topic_id";
  										if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
--- 1940,1944 ----
  										//
  										$sql = "UPDATE " . VOTE_DESC_TABLE . " 
! 											SET vote_text = '" . str_replace("\'", "''", $poll_title) . "', vote_length = " . ( $poll_length * 86400 ) . " 
  											WHERE topic_id = $topic_id";
  										if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
***************
*** 1965,1969 ****
  
  													$sql = "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result)
! 														VALUES ($vote_id, $poll_option_id, '$option_text', $vote_result)";
  													if( !$result = $db->sql_query($sql) )
  													{
--- 1954,1958 ----
  
  													$sql = "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result)
! 														VALUES ($vote_id, $poll_option_id, '" . str_replace("\'", "''", $option_text) . "', $vote_result)";
  													if( !$result = $db->sql_query($sql) )
  													{
***************
*** 1990,1994 ****
  									//
  									$sql = "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) 
! 										VALUES ($topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")";
  									if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
  									{
--- 1979,1983 ----
  									//
  									$sql = "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) 
! 										VALUES ($topic_id, '" . str_replace("\'", "''", $poll_title) . "', $current_time, " . ( $poll_length * 86400 ) . ")";
  									if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
  									{
***************
*** 1999,2003 ****
  										{
  											$sql = "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result)
! 												VALUES ($new_vote_id, $poll_option_id, '$option_text', 0)";
  											if( !$result = $db->sql_query($sql) )
  											{
--- 1988,1992 ----
  										{
  											$sql = "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result)
! 												VALUES ($new_vote_id, $poll_option_id, '" . str_replace("\'", "''", $option_text) . "', 0)";
  											if( !$result = $db->sql_query($sql) )
  											{

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** search.php	2001/12/20 01:25:00	1.50
--- search.php	2001/12/21 15:51:31	1.51
***************
*** 295,299 ****
  			$sql = "SELECT user_id
  				FROM ".USERS_TABLE."
! 				WHERE username LIKE '$query_author'";
  			$result = $db->sql_query($sql);
  			if( !$result )
--- 295,299 ----
  			$sql = "SELECT user_id
  				FROM ".USERS_TABLE."
! 				WHERE username LIKE '" . str_replace("\'", "''", $query_author) . "'";
  			$result = $db->sql_query($sql);
  			if( !$result )
***************
*** 508,512 ****
  		if( $query_author != "" )
  		{
! 			$query_author = str_replace("*", "%", trim($query_author));
  		}
  
--- 508,512 ----
  		if( $query_author != "" )
  		{
! 			$query_author = str_replace("*", "%", trim(str_replace("\'", "''", $query_author)));
  		}
  
***************
*** 735,739 ****
  			{
  				$sql = "INSERT INTO " . SEARCH_TABLE . " (search_id, session_id, search_array) 
! 					VALUES($search_id, '" . $userdata['session_id'] . "', '$result_array')";
  				if( !$result = $db->sql_query($sql) )
  				{
--- 735,739 ----
  			{
  				$sql = "INSERT INTO " . SEARCH_TABLE . " (search_id, session_id, search_array) 
! 					VALUES($search_id, '" . $userdata['session_id'] . "', '" . str_replace("\'", "''", $result_array) . "')";
  				if( !$result = $db->sql_query($sql) )
  				{

[Phpbb-checkins] CVS: phpBB2/templates/subSilver overall_header.tpl,1.15,1.16

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

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

Modified Files:
	overall_header.tpl 
Log Message:
Fixed bug #495815

Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/overall_header.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** overall_header.tpl	2001/12/15 17:35:52	1.15
--- overall_header.tpl	2001/12/21 15:10:21	1.16
***************
*** 52,56 ****
  			  
  			
! 		<td> <a href="{U_INDEX}"><img src="templates/subSilver/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></a> 
  		</td>
  			  
--- 52,56 ----
  			  
  			
! 		<td> <a href="{U_INDEX}"><img src="templates/subSilver/images/logo_phpBB.gif" border="0" alt="{L_INDEX}" vspace="1" /></a> 
  		</td>
  			  

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images logo_phpBB.gif,1.1,1.2

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

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

Modified Files:
	logo_phpBB.gif 
Log Message:
Updated for distribution

Index: logo_phpBB.gif
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/images/logo_phpBB.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsHlP5Cj and /tmp/cvswo560s differ

[Phpbb-checkins] CVS: phpBB2/templates/subSilver faq_body.tpl,1.7,1.8

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

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

Modified Files:
	faq_body.tpl 
Log Message:
Various updates by Tom

Index: faq_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/faq_body.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** faq_body.tpl	2001/12/17 00:24:05	1.7
--- faq_body.tpl	2001/12/21 12:46:47	1.8
***************
*** 2,6 ****
  <table width="100%" cellspacing="2" cellpadding="2" border="0">
    <tr> 
! 	<td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
    </tr>
  </table>
--- 2,6 ----
  <table width="100%" cellspacing="2" cellpadding="2" border="0">
    <tr> 
! 	<td align="left" valign="bottom" nowrap><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
    </tr>
  </table>
***************
*** 10,35 ****
  		<th class="thHead">{L_FAQ_TITLE}</th>
  	</tr>
! 	<tr>
! 		<td align="left" valign="top" class="row1"><table cellspacing="3" cellpadding="0" border="0">
! 			<tr> 
! 				<td><br /></td>
! 			</tr>
! 			<!-- BEGIN faq_block_link -->
! 			<tr>
! 				<td><span class="gen"><b>{faq_block_link.BLOCK_TITLE}</b></span></td>
! 			</tr>
! 			<!-- BEGIN faq_row_link -->  
! 			<tr>
! 				<td><span class="gen"><a href="{faq_block_link.faq_row_link.U_FAQ_LINK}">{faq_block_link.faq_row_link.FAQ_LINK}</a></span></td>
! 			</tr>
! 			<!-- END faq_row_link -->
! 			<tr> 
! 				<td><br /></td>
! 			</tr>
! 			<!-- END faq_block_link -->
! 		</table></td>
! 	</tr>
! 	<tr> 
! 		<td height="28" class="cat">&nbsp;</td>
  	</tr>
  </table>
--- 10,23 ----
  		<th class="thHead">{L_FAQ_TITLE}</th>
  	</tr>
! 	<tr><td class="row1">
! <!-- BEGIN faq_block_link -->
! <span class="gen"><b>{faq_block_link.BLOCK_TITLE}</b><br /> </span>
! <!-- BEGIN faq_row_link -->  
! <span class="gen"><a href="{faq_block_link.faq_row_link.U_FAQ_LINK}" class="postlink">{faq_block_link.faq_row_link.FAQ_LINK}</a></span><br />
! <!-- END faq_row_link -->
! <br />
! <!-- END faq_block_link -->
! </td><tr>
! <td height="28" class="catBottom">&nbsp;</td>
  	</tr>
  </table>
***************
*** 40,48 ****
  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
  	<tr> 
! 		<td height="28" class="cat" align="center"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td>
  	</tr>
  	<!-- BEGIN faq_row -->  
  	<tr> 
! 		<td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER}</span></td>
  	</tr>
  	<tr>
--- 28,36 ----
  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
  	<tr> 
! 		<td height="28" class="catHead" align="center"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td>
  	</tr>
  	<!-- BEGIN faq_row -->  
  	<tr> 
! 		<td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b></span><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER} <a href="#Top" class="postlink">Top</a></span></td>
  	</tr>
  	<tr>
***************
*** 57,61 ****
  <table width="100%" cellspacing="2" border="0" align="center">
    <tr> 
! 	  <td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><br />{JUMPBOX}</td> 
    </tr>
  </table>
--- 45,49 ----
  <table width="100%" cellspacing="2" border="0" align="center">
    <tr> 
! 	  <td align="right" valign="middle" nowrap><span class="gensmall">{S_TIMEZONE}</span><br /><br />{JUMPBOX}</td> 
    </tr>
  </table>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver subSilver.cfg,1.7,1.8

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

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

Modified Files:
	subSilver.cfg 
Log Message:
Lang update

Index: subSilver.cfg
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/subSilver.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** subSilver.cfg	2001/12/10 16:52:16	1.7
--- subSilver.cfg	2001/12/21 12:46:25	1.8
***************
*** 26,42 ****
  $smilies_url = "images/smiles";
  
! $images['icon_quote'] = "$current_template_images/icon_quote.gif";
! $images['icon_edit'] = "$current_template_images/icon_edit.gif";
! $images['icon_search'] = "$current_template_images/icon_search.gif";
! $images['icon_profile'] = "$current_template_images/icon_profile.gif";
! $images['icon_pm'] = "$current_template_images/icon_pm.gif";
! $images['icon_email'] = "$current_template_images/icon_email.gif";
  $images['icon_delpost'] = "$current_template_images/icon_delete.gif";
! $images['icon_ip'] = "$current_template_images/icon_ip.gif";
! $images['icon_www'] = "$current_template_images/icon_www.gif";
! $images['icon_icq'] = "$current_template_images/icon_icq_add.gif";
! $images['icon_aim'] = "$current_template_images/icon_aim.gif";
! $images['icon_yim'] = "$current_template_images/icon_yim.gif";
! $images['icon_msnm'] = "$current_template_images/icon_msnm.gif";
  $images['icon_minipost'] = "$current_template_images/icon_minipost.gif";
  $images['icon_gotopost'] = "$current_template_images/icon_minipost.gif";
--- 26,42 ----
  $smilies_url = "images/smiles";
  
! $images['icon_quote'] = "$current_template_images/icon_quote_lang.gif";
! $images['icon_edit'] = "$current_template_images/icon_edit_lang.gif";
! $images['icon_search'] = "$current_template_images/icon_search_lang.gif";
! $images['icon_profile'] = "$current_template_images/icon_profile_lang.gif";
! $images['icon_pm'] = "$current_template_images/icon_pm_lang.gif";
! $images['icon_email'] = "$current_template_images/icon_email_lang.gif";
  $images['icon_delpost'] = "$current_template_images/icon_delete.gif";
! $images['icon_ip'] = "$current_template_images/icon_ip_lang.gif";
! $images['icon_www'] = "$current_template_images/icon_www_lang.gif";
! $images['icon_icq'] = "$current_template_images/icon_icq_add_lang.gif";
! $images['icon_aim'] = "$current_template_images/icon_aim_lang.gif";
! $images['icon_yim'] = "$current_template_images/icon_yim_lang.gif";
! $images['icon_msnm'] = "$current_template_images/icon_msnm_lang.gif";
  $images['icon_minipost'] = "$current_template_images/icon_minipost.gif";
  $images['icon_gotopost'] = "$current_template_images/icon_minipost.gif";
***************
*** 60,67 ****
  $images['folder_announce_new'] = "$current_template_images/folder_announce_new.gif";
  
! $images['post_new'] = "$current_template_images/post.gif";
! $images['post_locked'] = "$current_template_images/reply-locked.gif";
! $images['reply_new'] = "$current_template_images/reply.gif";
! $images['reply_locked'] = "$current_template_images/reply-locked.gif";
  
  $images['pm_inbox'] = "$current_template_images/msg_inbox.gif";
--- 60,67 ----
  $images['folder_announce_new'] = "$current_template_images/folder_announce_new.gif";
  
! $images['post_new'] = "$current_template_images/post_lang.gif";
! $images['post_locked'] = "$current_template_images/reply-locked_lang.gif";
! $images['reply_new'] = "$current_template_images/reply_lang.gif";
! $images['reply_locked'] = "$current_template_images/reply-locked_lang.gif";
  
  $images['pm_inbox'] = "$current_template_images/msg_inbox.gif";
***************
*** 71,78 ****
  $images['pm_readmsg'] = "$current_template_images/folder.gif";
  $images['pm_unreadmsg'] = "$current_template_images/folder_new.gif";
! $images['pm_replymsg'] = "$current_template_images/reply.gif";
  $images['pm_postmsg'] = "$current_template_images/msg_newpost.gif";
! $images['pm_quotemsg'] = "$current_template_images/icon_quote.gif";
! $images['pm_editmsg'] = "$current_template_images/icon_edit.gif";
  $images['pm_new_msg'] = "";
  $images['pm_no_new_msg'] = "";
--- 71,78 ----
  $images['pm_readmsg'] = "$current_template_images/folder.gif";
  $images['pm_unreadmsg'] = "$current_template_images/folder_new.gif";
! $images['pm_replymsg'] = "$current_template_images/reply_lang.gif";
  $images['pm_postmsg'] = "$current_template_images/msg_newpost.gif";
! $images['pm_quotemsg'] = "$current_template_images/icon_quote_lang.gif";
! $images['pm_editmsg'] = "$current_template_images/icon_edit_lang.gif";
  $images['pm_new_msg'] = "";
  $images['pm_no_new_msg'] = "";
***************
*** 111,113 ****
  $board_config['privmsg_graphic_length'] = 175;
  
! ?>
--- 111,113 ----
  $board_config['privmsg_graphic_length'] = 175;
  
! ?>
\ No newline at end of file