You guessed it ... minor change to emailer, db checks, sid updates for utils

git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3126 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/admin/admin_db_utilities.php

@@ -34,16 +34,10 @@ if( !empty($setmodules) )
 {
 	$filename = basename(__FILE__);
 	$module['General']['Backup_DB'] = $filename . "?perform=backup";
-	if(@phpversion() >= '4.0.0')
-	{	
-		$file_uploads = @ini_get('file_uploads');
-	}
-	else
-	{
-		$file_uploads = @get_cfg_var('file_uploads');
-	}
 
-	if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
+	$file_uploads = (@phpversion() >= '4.0.0') ? @ini_get('file_uploads') : @get_cfg_var('file_uploads');
+
+	if( (empty($file_uploads) || $file_uploads != 0) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
 	{
 		$module['General']['Restore_DB'] = $filename . "?perform=restore";
 	}
@@ -672,7 +666,6 @@ function output_table_content($content)
 //
 // Begin program proper
 //
-
 if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 {
 	$perform = (isset($HTTP_POST_VARS['perform'])) ? $HTTP_POST_VARS['perform'] : $HTTP_GET_VARS['perform'];
@@ -681,21 +674,26 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 	{
 		case 'backup':
 
-			if( SQL_LAYER == 'oracle' || SQL_LAYER == 'odbc' || SQL_LAYER == 'mssql' )
+			$error = false;
+			switch(SQL_LAYER)
 			{
-				switch(SQL_LAYER)
+				case 'oracle':
-				{
+					$error = true;
-					case 'oracle':
+					break;
-						$db_type = "Oracle";
+				case 'db2':
-						break;
+					$error = true;
-					case 'odbc':
+					break;
-						$db_type = "ODBC";
+				case 'msaccess':
-						break;
+					$error = true;
-					case 'mssql':
+					break;
-						$db_type = "MSSQL";
+				case 'mssql':
-						break;
+				case 'mssql-odbc':
-				}
+					$error = true;
+					break;
+			}
 
+			if ($error)
+			{
 				include('./page_header_admin.'.$phpEx);
 
 				$template->set_filenames(array(
@@ -709,12 +707,11 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 
 				$template->pparse("body");
 
-				break;
+				include('./page_footer_admin.'.$phpEx);
 			}
 
 			$tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words');
 
-
 			$additional_tables = (isset($HTTP_POST_VARS['additional_tables'])) ? $HTTP_POST_VARS['additional_tables'] : ( (isset($HTTP_GET_VARS['additional_tables'])) ? $HTTP_GET_VARS['additional_tables'] : "" );
 
 			$backup_type = (isset($HTTP_POST_VARS['backup_type'])) ? $HTTP_POST_VARS['backup_type'] : ( (isset($HTTP_GET_VARS['backup_type'])) ? $HTTP_GET_VARS['backup_type'] : "" );
@@ -780,7 +777,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 				);
 
 				$template->assign_vars(array(
-					"META" => "<meta http-equiv=\"refresh\" content=\"2;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&amp;backupstart=1&gzipcompress=$gzipcompress&startdownload=1\">",
+					"META" => '<meta http-equiv="refresh" content="2;url=' . append_sid("admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&amp;backupstart=1&gzipcompress=$gzipcompress&startdownload=1") . '">',
 
 					"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
 					"MESSAGE_TEXT" => $lang['Backup_download'])

phpBB/docs/CHANGELOG.html

@@ -103,6 +103,13 @@ h3 {font-size:12pt;color:blue}
 <li>Fixed non-check of permissions when deleting a topic via Moderator Control Panel</li>
 <li>Fixed non-update of banlist upon user deletion</li>
 <li>Check approved users boxes by default in usergroup approve form</li>
+<li>Fixed non-appending of sid to backup meta refresh</li>
+<li>Fixed non-notification of no support for certain databases in backup/restore</li>
+<li>Added $images var to message die global declaration</li>
+<li>Fixed wrong string, Private_message in Private Messaging</li>
+<li>Add mail send result to error output</li>
+<li>Fixed non-appending of sid to Mozilla nav bar menu items</li>
+<li>Fixed incorrect profile linking from MSNM url in private messaging</li>
 <li></li>
 <li></li>
 <li></li>

phpBB/includes/emailer.php

@@ -197,7 +197,7 @@ class emailer
 
 		if ( !$result )
 		{
-			message_die(GENERAL_ERROR, 'Failed sending email', '', __LINE__, __FILE__);
+			message_die(GENERAL_ERROR, 'Failed sending email :: ' . $result, '', __LINE__, __FILE__);
 		}
 
 		return true;