From a144cb10a5ed1f502af4698fc6981c0a62b58f5d Mon Sep 17 00:00:00 2001
From: dougk_ff7 <dougk_ff7@users.sourceforge.net>
Date: Thu, 27 Jun 2002 21:26:46 +0000
Subject: [PATCH] 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


git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2648 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/admin/admin_db_utilities.php |  2 +-
 phpBB/config.php                   | 19 -------------------
 phpBB/login.php                    |  6 +++---
 phpBB/viewforum.php                |  2 +-
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php
index 3a2d424b07..6543d128b2 100644
--- a/phpBB/admin/admin_db_utilities.php
+++ b/phpBB/admin/admin_db_utilities.php
@@ -376,7 +376,7 @@ function get_table_def_mysql($table, $crlf)
 	// Ok lets grab the fields...
 	//
 	$result = $db->sql_query($field_query);
-	if(!result)
+	if(!$result)
 	{
 		message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $field_query);
 	}
diff --git a/phpBB/config.php b/phpBB/config.php
index 24fdcea851..e69de29bb2 100644
--- a/phpBB/config.php
+++ b/phpBB/config.php
@@ -1,19 +0,0 @@
-<?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
diff --git a/phpBB/login.php b/phpBB/login.php
index 2395e995a9..8be7cf5d67 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -98,7 +98,8 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
 				else
 				{
 					$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") . '">')
 					);
@@ -112,6 +113,7 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
 		else
 		{
 			$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") . '">')
@@ -176,7 +178,6 @@ else
 			if( preg_match("/^redirect=(.*)$/si", $forward_to, $forward_matches) )
 			{
 				$forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1];
-
 				$forward_match = explode('&', $forward_to);
 
 				if(count($forward_match) > 1)
@@ -194,7 +195,6 @@ else
 							$forward_page .= $forward_match[$i];
 						}
 					}
-
 					$forward_page = $forward_match[0] . '?' . $forward_page;
 				}
 				else
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 0cd475941d..055d801f8d 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -566,7 +566,7 @@ if( $total_topics )
 					else
 					{
 						$folder_image = $folder_new;
-						$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
+						$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> ';
 					}