[Phpbb-checkins] CVS: phpBB2 config.php,1.51.2.1,1.51.2.2 login.php,1.47.2.1,1.47.2.2 viewforum.php,1.139.2.5,1.139.2.6

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

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

Modified Files:
      Tag: phpBB-2_0_0
	config.php login.php viewforum.php 
Log Message:

Ok, fixing a few bugs here.... I still have more to do, but this fixes a 
funny bug in login.php where redirect won't allow more than the file and 
mode... Now it should work with posting (or any other page).  Also fixes a 
typo in admin_db_utilities.php.

P.S. James, don't commit config.php. ;) Fortunately, it didn't seem like 
you lost a password.... :D


Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.51.2.1
retrieving revision 1.51.2.2
diff -C2 -r1.51.2.1 -r1.51.2.2
*** config.php	27 Jun 2002 20:06:42 -0000	1.51.2.1
--- config.php	27 Jun 2002 21:26:46 -0000	1.51.2.2
***************
*** 1,19 ****
- <?php
- 
- //
- // phpBB 2.x auto-generated config file
- // Do not change anything in this file!
- //
- 
- $dbms = "mysql";
- 
- $dbhost = "localhost";
- $dbname = "bb";
- $dbuser = "root";
- $dbpasswd = "";
- 
- $table_prefix = "phpbb_";
- 
- define('PHPBB_INSTALLED', true);
- 
- ?>
\ No newline at end of file
--- 0 ----

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.47.2.1
retrieving revision 1.47.2.2
diff -C2 -r1.47.2.1 -r1.47.2.2
*** login.php	13 May 2002 13:18:17 -0000	1.47.2.1
--- login.php	27 Jun 2002 21:26:46 -0000	1.47.2.2
***************
*** 99,103 ****
  				{
  					$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : '';
! 
  					$template->assign_vars(array(
  						'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
--- 99,104 ----
  				{
  					$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : '';
! 					$redirect = str_replace("?", "&", $redirect);
! 					
  					$template->assign_vars(array(
  						'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
***************
*** 113,116 ****
--- 114,118 ----
  		{
  			$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "";
+ 			$redirect = str_replace("?", "&", $redirect);
  
  			$template->assign_vars(array(
***************
*** 177,181 ****
  			{
  				$forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1];
- 
  				$forward_match = explode('&', $forward_to);
  
--- 179,182 ----
***************
*** 195,199 ****
  						}
  					}
- 
  					$forward_page = $forward_match[0] . '?' . $forward_page;
  				}
--- 196,199 ----

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.139.2.5
retrieving revision 1.139.2.6
diff -C2 -r1.139.2.5 -r1.139.2.6
*** viewforum.php	17 May 2002 13:14:05 -0000	1.139.2.5
--- viewforum.php	27 Jun 2002 21:26:46 -0000	1.139.2.6
***************
*** 567,571 ****
  					{
  						$folder_image = $folder_new;
! 						$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
  
  						$newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
--- 567,571 ----
  					{
  						$folder_image = $folder_new;
! 						$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts'];
  
  						$newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';