Now showing: A ton of bug fixes and a complete overhaul of my admin code...

git-svn-id: file:///svn/phpbb/trunk@1402 89ea8834-ac86-4346-8a33-228a782c2dd0
author: dougk_ff7 <dougk_ff7@users.sourceforge.net> 2001-11-21 03:10:10 +0000
committer: dougk_ff7 <dougk_ff7@users.sourceforge.net> 2001-11-21 03:10:10 +0000
commit: 3c6e635bec42f408701397579cba004eaca0c960 (patch)
tree: 550541cfdcbe70a568844e6729bdeed32d4f96d1 /phpBB/admin
parent: fd9158ac750c4020251176a732972fe64002ddda (diff)
download: forums-3c6e635bec42f408701397579cba004eaca0c960.tar
forums-3c6e635bec42f408701397579cba004eaca0c960.tar.gz
forums-3c6e635bec42f408701397579cba004eaca0c960.tar.bz2
forums-3c6e635bec42f408701397579cba004eaca0c960.tar.xz
forums-3c6e635bec42f408701397579cba004eaca0c960.zip
5 files changed, 83 insertions, 76 deletions
diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php
index d74a9bc392..e19577560f 100644
--- a/phpBB/admin/admin_groups.php
+++ b/phpBB/admin/admin_groups.php
@@ -32,6 +32,7 @@ if($setmodules == 1)
 // Load default header
 //
 $phpbb_root_dir = "./../";
+$no_page_header = TRUE;
 require('pagestart.inc');
 
 if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
@@ -48,6 +49,12 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
 	//
 	// Ok they are editing a group or creating a new group
 	//
+	include('page_header_admin.' . $phpEx);
+
+	$template->set_filenames(array(
+		"body" => "admin/group_edit_body.tpl")
+	);
+
 	if ( isset($HTTP_POST_VARS['edit']) )
 	{
 		//
@@ -68,6 +75,7 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
 		$group_info = $db->sql_fetchrow($result);
 
 		$mode = "editgroup";
+		$template->assign_block_vars("group_edit", array());
 
 	}
 	else if( isset($HTTP_POST_VARS['new']) )
@@ -109,9 +117,7 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
 	$group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? "checked=\"checked\"" : "";
 	$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
 
-	$template->set_filenames(array(
-		"body" => "admin/group_edit_body.tpl")
-	);
+
 
 	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
 
@@ -119,7 +125,7 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
 		"GROUP_NAME" => $group_info['group_name'],
 		"GROUP_DESCRIPTION" => $group_info['group_description'],
 
-		"L_GROUP_TITLE" => $lang['Group'] . " " . $lang['Admin'],
+		"L_GROUP_TITLE" => $lang['Group_administration'],
 		"L_GROUP_EDIT_DELETE" => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'], 
 		"L_GROUP_NAME" => $lang['group_name'],
 		"L_GROUP_DESCRIPTION" => $lang['group_description'],
@@ -228,8 +234,14 @@ else if( isset($HTTP_POST_VARS['group_update']) )
 			{
 				message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
 			}
-
-			message_die(GENERAL_MESSAGE, $lang['Updated_group']);
+			
+			$template->assign_vars(array(
+				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_groups.$phpEx") . '">')
+			);
+	
+			$message = $lang['Updated_group'];
+			$message .= "<br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>");
+			message_die(GENERAL_MESSAGE, $message);
 		}
 		else if( $mode == "newgroup" )
 		{
@@ -250,7 +262,13 @@ else if( isset($HTTP_POST_VARS['group_update']) )
 				message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
 			}
 
-			message_die(GENERAL_MESSAGE, $lang['Added_new_group']);
+			$template->assign_vars(array(
+				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_groups.$phpEx") . '">')
+			);
+			
+			$message = $lang['Added_new_group'];
+			$message .= "<br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>");
+			message_die(GENERAL_MESSAGE, $message);
 
 		}
 		else
@@ -261,6 +279,8 @@ else if( isset($HTTP_POST_VARS['group_update']) )
 }
 else
 {
+	include('page_header_admin.' . $phpEx);
+	
 	$sql = "SELECT group_id, group_name
 		FROM " . GROUPS_TABLE . "
 		WHERE group_single_user <> " . TRUE . "
@@ -280,10 +300,10 @@ else
 	);
 
 	$template->assign_vars(array(
-		"L_GROUP_TITLE" => $lang['Group'] . " " . $lang['Admin'],
+		"L_GROUP_TITLE" => $lang['Group_administration'],
 		"L_GROUP_EXPLAIN" => $lang['Group_admin_explain'],
-		"L_GROUP_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
-		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
+		"L_GROUP_SELECT" => $lang['Select_group'],
+		"L_LOOK_UP" => $lang['Look_up_group'],
 		"L_CREATE_NEW_GROUP" => $lang['New_group'],
 
 		"S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php
index 497cbd98f3..9b3c824798 100644
--- a/phpBB/admin/admin_ranks.php
+++ b/phpBB/admin/admin_ranks.php
@@ -31,6 +31,7 @@ if($setmodules == 1)
 // Let's set the root dir for phpBB
 //
 $phpbb_root_dir = "./../";
+$no_page_header = TRUE;
 require('pagestart.inc');
 
 
@@ -65,6 +66,7 @@ if( $mode != "" )
 		//
 		// They want to add a new rank, show the form.
 		//
+		include('page_header_admin.' . $phpEx);
 		
 		$rank_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0;
 		
@@ -193,7 +195,7 @@ if( $mode != "" )
 		$template->assign_vars(array(
 			"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
 		);
-		$message .= "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_ranks.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['return_rank_admin'];
+		$message .= "<br />" . sprintf($lang['return_rank_admin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>");
 		message_die(GENERAL_MESSAGE, $message);
 
 	}
@@ -225,7 +227,8 @@ if( $mode != "" )
 			$template->assign_vars(array(
 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
 			);
-			$message = $lang['Rank_removed'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_ranks.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['return_rank_admin'];
+			$message = $lang['Rank_removed'];
+			$message .= "<br />" . sprintf($lang['return_rank_admin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>");
 			message_die(GENERAL_MESSAGE, $message);
 
 		}
@@ -242,7 +245,8 @@ if( $mode != "" )
 		//
 		// They didn't feel like giving us any information. Oh, too bad, we'll just display the
 		// list then...
-		
+		include('page_header_admin.' . $phpEx);		
+	
 		$template->set_filenames(array(
 			"body" => "admin/ranks_list_body.tpl")
 		);
@@ -309,7 +313,8 @@ else
 	//
 	// Show the default page
 	//
-	
+	include('page_header_admin.' . $phpEx);
+		
 	$template->set_filenames(array(
 		"body" => "admin/ranks_list_body.tpl")
 	);
diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php
index 4cb1f18024..995038e6ba 100644
--- a/phpBB/admin/admin_users.php
+++ b/phpBB/admin/admin_users.php
@@ -30,8 +30,12 @@ if($setmodules == 1)
 
 //
 // Load default header
+// We need to tell the pagestart file not to load page headers
+// because of the use of META tags.
 //
+
 $phpbb_root_dir = "./../";
+$no_page_header = TRUE;
 require('pagestart.inc');
 include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
 include($phpbb_root_dir . 'includes/post.'.$phpEx);
@@ -132,6 +136,7 @@ if( $mode == "searchuser" )
 }
 else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) ) )
 {
+	include('page_header_admin.' . $phpEx);
 	//
 	// Let's find out a little about them...
 	//
@@ -186,9 +191,9 @@ else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_
 	
 	$COPPA = false;
 
-	$html_status =   ($board_config['allow_html']) ? $lang['ON'] : $lang['OFF'];
-	$bbcode_status =  ($board_config['allow_bbcode']) ? $lang['ON'] : $lang['OFF'];
-	$smilies_status =  ($board_config['allow_smilies']) ? $lang['ON'] : $lang['OFF'];
+	$html_status =  ($userdata['user_allowhtml']) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
+	$bbcode_status = ($userdata['user_allowbbcode']) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
+	$smilies_status = ($userdata['user_allowsmile']) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
 
 	$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
 	$s_hidden_fields .= '<input type="hidden" name="id" value="' . $this_userdata['user_id'] . '" />';
@@ -231,12 +236,12 @@ else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_
 		$rank = $rank_rows[$i]['rank_title'];
 		$rank_id = $rank_rows[$i]['rank_id'];
 		
-		$selected = ( $this_userdata['user_rank'] == $i + 1 ) ? "selected=\"selected\"" : "";
-		$rank_select_box .= "<option value=\"" . $rank_id . "\"$selected>" . $rank . "</option>";
+		$selected = ( $this_userdata['user_rank'] == $rank_id ) ? "selected=\"selected\"" : "";
+		$rank_select_box .= "<option value=\"" . $rank_id . "\" " . $selected . ">" . $rank . "</option>";
 	}
 
 	$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
-
+	
 	$template->set_filenames(array(
 		"body" => "admin/user_edit_body.tpl")
 	);
@@ -275,9 +280,6 @@ else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_
 		"TIMEZONE_SELECT" => tz_select($user_timezone),
 		"STYLE_SELECT" => style_select($user_style, 'style'),
 		"DATE_FORMAT" => $user_dateformat,
-		"HTML_STATUS" => $html_status,
-		"BBCODE_STATUS" => $bbcode_status,
-		"SMILIES_STATUS" => $smilies_status,
 		"ALLOW_PM_YES" => ($user_allowpm) ? "checked=\"checked\"" : "",
 		"ALLOW_PM_NO" => (!$user_allowpm) ? "checked=\"checked\"" : "",
 		"ALLOW_AVATAR_YES" => ($user_allowavatar) ? "checked=\"checked\"" : "",
@@ -323,7 +325,7 @@ else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_
 		"L_CURRENT_IMAGE" => $lang['Current_Image'],
 
 		"L_SIGNATURE" => $lang['Signature'],
-		"L_SIGNATURE_EXPLAIN" => $lang['Signature_explain'],
+		"L_SIGNATURE_EXPLAIN" => sprintf($lang['Signature_explain'], $board_config['max_sig_chars']),
 		"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'],
 		"L_PREFERENCES" => $lang['Preferences'],
 		"L_PUBLIC_VIEW_EMAIL" => $lang['Public_view_email'],
@@ -334,9 +336,9 @@ else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_
 		"L_CONFIRM" => $lang['Confirm'],
 		"L_EMAIL_ADDRESS" => $lang['Email_address'],
 
-		"L_HTML_IS" => $lang['HTML'] . " " . $lang['is'],
-		"L_BBCODE_IS" => $lang['BBCode'] . " " . $lang['is'],
-		"L_SMILIES_ARE" => $lang['Smilies'] . " " . $lang['are'],
+		"HTML_STATUS" => $html_status,
+		"BBCODE_STATUS" => $bbcode_status,
+		"SMILIES_STATUS" => $smilies_status,
 
 		"L_DELETE_USER" => $lang['User_delete'],
 		"L_DELETE_USER_EXPLAIN" => $lang['User_delete_explain'],
@@ -353,6 +355,12 @@ else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
 	//
 	// Ok, the profile has been modified and submitted, let's update
 	//
+	
+	//
+	// First let's declare our "Return Address"
+	//
+	$return_address = append_sid("admin_users." . $phpEx);
+	
 	$user_id = intval($HTTP_POST_VARS['id']);
 
 	$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
@@ -399,6 +407,11 @@ else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
 		$error = FALSE;
 		$passwd_sql = "";
 	}
+	else
+	{
+		$error = TRUE;
+		$passwd_sql = "";
+	}
 
 	if(!empty($password) && !empty($password_confirm))
 	{
@@ -406,7 +419,7 @@ else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
 		if($password != $password_confirm)
 		{
 			$error = TRUE;
-			$error_msg = $lang['Password_mismatch'];
+			$error_msg .= $lang['Password_mismatch'];
 		}
 		else
 		{
@@ -417,12 +430,12 @@ else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
 	else if($password && !$password_confirm)
 	{
 		$error = TRUE;
-		$error_msg = $lang['Password_mismatch'];
+		$error_msg .= $lang['Password_mismatch'];
 	}
 	else if(!$password && $password_confirm)
 	{
 		$error = TRUE;
-		$error_msg = $lang['Password_mismatch'];
+		$error_msg .= $lang['Password_mismatch'];
 	}
 
 	if( $signature != "" )
@@ -465,15 +478,7 @@ else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
 							WHERE user_id = $user_id";
 						$result = @$db->sql_query($sql);
 
-						$template->set_filenames(array(
-							"body" => "admin/admin_message_body.tpl")
-						);
-
-						$template->assign_vars(array(
-							"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
-							"MESSAGE_TEXT" => $lang['User_deleted'])
-						);
-						$template->pparse("body");
+						$message = $lang['User_deleted'];
 					}
 					else
 					{
@@ -492,15 +497,7 @@ else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
 
 			if( $error == TRUE )
 			{
-					$template->set_filenames(array(
-						"body" => "admin/admin_message_body.tpl")
-					);
-					
-					$template->assign_vars(array(
-						"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
-						"MESSAGE_TEXT" => "Could not update user table")
-					);
-					$template->pparse("body");
+				$error_msg .= $lang['Admin_user_fail'];
 			}
 		}
 		else
@@ -510,45 +507,30 @@ else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
 				WHERE user_id = $user_id";
 			if( $result = $db->sql_query($sql) )
 			{
-				$template->set_filenames(array(
-					"body" => "admin/admin_message_body.tpl")
-				);
-
-				$template->assign_vars(array(
-					"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
-					"MESSAGE_TEXT" => $lang['Profile_updated'])
-				);
-				$template->pparse("body");
+				$message .= $lang['Admin_user_updated'];
 			}
 			else
 			{
-				$template->set_filenames(array(
-					"body" => "admin/admin_message_body.tpl")
-				);
-
-				$template->assign_vars(array(
-					"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
-					"MESSAGE_TEXT" => "Error updating user profile")
-				);
-				$template->pparse("body");
+				$error = TRUE;
+				$error_msg .= $lang['Admin_user_fail'];
 			}
 		}
+		$template->assign_vars(array(
+			"META" => '<meta http-equiv="refresh" content="3;url=' . $return_address . '">')
+		);
+		message_die(GENERAL_MESSAGE, $message . "<br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . $return_address . "\">", "</a>"), $lang['User_admin']);
 	}
 	else
 	{
-		$template->set_filenames(array(
-			"body" => "admin/admin_message_body.tpl")
-		);
-
 		$template->assign_vars(array(
-			"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
-			"MESSAGE_TEXT" => $error_msg)
+			"META" => '<meta http-equiv="refresh" content="3;url=' . $return_address . '">')
 		);
-		$template->pparse("body");
+		message_die(GENERAL_ERROR, $error_msg . "<br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . $return_address . "\">", "</a>"), $lang['User_admin']);
 	}
 }
 else
 {
+	include('page_header_admin.' . $phpEx);
 	//
 	// Default user selection box
 	//
@@ -576,7 +558,7 @@ else
 		"L_USER_TITLE" => $lang['User'] . " " . $lang['User_admin'],
 		"L_USER_EXPLAIN" => $lang['User_admin_explain'],
 		"L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
-		"L_LOOK_UP" => $lang['Look_up'] . " " . $lang['User'],
+		"L_LOOK_UP" => $lang['Look_up_user'],
 		"L_FIND_USERNAME" => $lang['Find_username'],
 
 		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 
diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index 381e377253..7abeebfcee 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -398,7 +398,7 @@ elseif( $HTTP_GET_VARS['pane'] == 'right' )
 				"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow[$i]['session_time'], $board_config['board_timezone']),
 				"LOCATION" => $location,
 				"IP_ADDRESS" => $ip_address,
-				"U_USER_PROFILE" => append_sid("admin_users.$phpEx?" . POST_USERS_URL . "=" . $onlinerow[$i]['user_id']))
+				"U_USER_PROFILE" => append_sid("admin_users.$phpEx?" . POST_USERS_URL . "=" . $onlinerow[$i]['user_id'] . "&mode=edit"))
 			);
 		}
 	}
diff --git a/phpBB/admin/page_footer_admin.php b/phpBB/admin/page_footer_admin.php
index 3bca8b0abe..2ab8e6031e 100644
--- a/phpBB/admin/page_footer_admin.php
+++ b/phpBB/admin/page_footer_admin.php
@@ -30,7 +30,7 @@ $template->set_filenames(array(
 );
 
 $template->assign_vars(array(
-	"PHPBB_VERSION" => "2.0 beta-1")
+	"PHPBB_VERSION" => "2.0 CVS")
 );
 
 $template->pparse("page_footer");
author	dougk_ff7 <dougk_ff7@users.sourceforge.net>	2001-11-21 03:10:10 +0000
committer	dougk_ff7 <dougk_ff7@users.sourceforge.net>	2001-11-21 03:10:10 +0000
commit	3c6e635bec42f408701397579cba004eaca0c960 (patch)
tree	550541cfdcbe70a568844e6729bdeed32d4f96d1 /phpBB/admin
parent	fd9158ac750c4020251176a732972fe64002ddda (diff)
download	forums-3c6e635bec42f408701397579cba004eaca0c960.tar forums-3c6e635bec42f408701397579cba004eaca0c960.tar.gz forums-3c6e635bec42f408701397579cba004eaca0c960.tar.bz2 forums-3c6e635bec42f408701397579cba004eaca0c960.tar.xz forums-3c6e635bec42f408701397579cba004eaca0c960.zip