Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_groups.php,1.14,1.15 admin_ranks.php,1.3,1.4 admin_users.php,1.30,1.31 index.php,1.24,1.25 page_footer_admin.php,1.5,1.6
|
From: Doug K. <dou...@us...> - 2001-11-21 03:10:12
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv22754/admin
Modified Files:
admin_groups.php admin_ranks.php admin_users.php index.php
page_footer_admin.php
Log Message:
Now showing: A ton of bug fixes and a complete overhaul of my admin code...
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** admin_groups.php 2001/11/09 08:57:37 1.14
--- admin_groups.php 2001/11/21 03:10:09 1.15
***************
*** 33,36 ****
--- 33,37 ----
//
$phpbb_root_dir = "./../";
+ $no_page_header = TRUE;
require('pagestart.inc');
***************
*** 49,52 ****
--- 50,59 ----
// 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']) )
{
***************
*** 69,72 ****
--- 76,80 ----
$mode = "editgroup";
+ $template->assign_block_vars("group_edit", array());
}
***************
*** 110,117 ****
$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 . '" />';
--- 118,123 ----
$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
+
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
***************
*** 120,124 ****
"GROUP_DESCRIPTION" => $group_info['group_description'],
! "L_GROUP_TITLE" => $lang['Group'] . " " . $lang['Admin'],
"L_GROUP_EDIT_DELETE" => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'],
"L_GROUP_NAME" => $lang['group_name'],
--- 126,130 ----
"GROUP_DESCRIPTION" => $group_info['group_description'],
! "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'],
***************
*** 229,234 ****
message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
!
! message_die(GENERAL_MESSAGE, $lang['Updated_group']);
}
else if( $mode == "newgroup" )
--- 235,246 ----
message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
!
! $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" )
***************
*** 251,255 ****
}
! message_die(GENERAL_MESSAGE, $lang['Added_new_group']);
}
--- 263,273 ----
}
! $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);
}
***************
*** 262,265 ****
--- 280,285 ----
else
{
+ include('page_header_admin.' . $phpEx);
+
$sql = "SELECT group_id, group_name
FROM " . GROUPS_TABLE . "
***************
*** 281,288 ****
$template->assign_vars(array(
! "L_GROUP_TITLE" => $lang['Group'] . " " . $lang['Admin'],
"L_GROUP_EXPLAIN" => $lang['Group_admin_explain'],
! "L_GROUP_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
! "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
"L_CREATE_NEW_GROUP" => $lang['New_group'],
--- 301,308 ----
$template->assign_vars(array(
! "L_GROUP_TITLE" => $lang['Group_administration'],
"L_GROUP_EXPLAIN" => $lang['Group_admin_explain'],
! "L_GROUP_SELECT" => $lang['Select_group'],
! "L_LOOK_UP" => $lang['Look_up_group'],
"L_CREATE_NEW_GROUP" => $lang['New_group'],
Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** admin_ranks.php 2001/10/19 23:17:15 1.3
--- admin_ranks.php 2001/11/21 03:10:10 1.4
***************
*** 32,35 ****
--- 32,36 ----
//
$phpbb_root_dir = "./../";
+ $no_page_header = TRUE;
require('pagestart.inc');
***************
*** 66,69 ****
--- 67,71 ----
// 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;
***************
*** 194,198 ****
"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_die(GENERAL_MESSAGE, $message);
--- 196,200 ----
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
);
! $message .= "<br />" . sprintf($lang['return_rank_admin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
***************
*** 226,230 ****
"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_die(GENERAL_MESSAGE, $message);
--- 228,233 ----
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
);
! $message = $lang['Rank_removed'];
! $message .= "<br />" . sprintf($lang['return_rank_admin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
***************
*** 243,247 ****
// They didn't feel like giving us any information. Oh, too bad, we'll just display the
// list then...
!
$template->set_filenames(array(
"body" => "admin/ranks_list_body.tpl")
--- 246,251 ----
// 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")
***************
*** 310,314 ****
// Show the default page
//
!
$template->set_filenames(array(
"body" => "admin/ranks_list_body.tpl")
--- 314,319 ----
// Show the default page
//
! include('page_header_admin.' . $phpEx);
!
$template->set_filenames(array(
"body" => "admin/ranks_list_body.tpl")
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** admin_users.php 2001/10/16 15:44:26 1.30
--- admin_users.php 2001/11/21 03:10:10 1.31
***************
*** 31,36 ****
--- 31,40 ----
//
// 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);
***************
*** 133,136 ****
--- 137,141 ----
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...
***************
*** 187,193 ****
$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'];
$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
--- 192,198 ----
$COPPA = false;
! $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 . '" />';
***************
*** 232,241 ****
$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>";
}
$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
!
$template->set_filenames(array(
"body" => "admin/user_edit_body.tpl")
--- 237,246 ----
$rank_id = $rank_rows[$i]['rank_id'];
! $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")
***************
*** 276,282 ****
"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\"" : "",
--- 281,284 ----
***************
*** 324,328 ****
"L_SIGNATURE" => $lang['Signature'],
! "L_SIGNATURE_EXPLAIN" => $lang['Signature_explain'],
"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'],
"L_PREFERENCES" => $lang['Preferences'],
--- 326,330 ----
"L_SIGNATURE" => $lang['Signature'],
! "L_SIGNATURE_EXPLAIN" => sprintf($lang['Signature_explain'], $board_config['max_sig_chars']),
"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'],
"L_PREFERENCES" => $lang['Preferences'],
***************
*** 335,341 ****
"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'],
"L_DELETE_USER" => $lang['User_delete'],
--- 337,343 ----
"L_EMAIL_ADDRESS" => $lang['Email_address'],
! "HTML_STATUS" => $html_status,
! "BBCODE_STATUS" => $bbcode_status,
! "SMILIES_STATUS" => $smilies_status,
"L_DELETE_USER" => $lang['User_delete'],
***************
*** 354,357 ****
--- 356,365 ----
// 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']);
***************
*** 400,403 ****
--- 408,416 ----
$passwd_sql = "";
}
+ else
+ {
+ $error = TRUE;
+ $passwd_sql = "";
+ }
if(!empty($password) && !empty($password_confirm))
***************
*** 407,411 ****
{
$error = TRUE;
! $error_msg = $lang['Password_mismatch'];
}
else
--- 420,424 ----
{
$error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
}
else
***************
*** 418,427 ****
{
$error = TRUE;
! $error_msg = $lang['Password_mismatch'];
}
else if(!$password && $password_confirm)
{
$error = TRUE;
! $error_msg = $lang['Password_mismatch'];
}
--- 431,440 ----
{
$error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
}
else if(!$password && $password_confirm)
{
$error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
}
***************
*** 466,478 ****
$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");
}
else
--- 479,483 ----
$result = @$db->sql_query($sql);
! $message = $lang['User_deleted'];
}
else
***************
*** 493,505 ****
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");
}
}
--- 498,502 ----
if( $error == TRUE )
{
! $error_msg .= $lang['Admin_user_fail'];
}
}
***************
*** 511,553 ****
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");
}
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");
}
}
}
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)
);
! $template->pparse("body");
}
}
else
{
//
// Default user selection box
--- 508,535 ----
if( $result = $db->sql_query($sql) )
{
! $message .= $lang['Admin_user_updated'];
}
else
{
! $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->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . $return_address . '">')
);
! 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
***************
*** 577,581 ****
"L_USER_EXPLAIN" => $lang['User_admin_explain'],
"L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
! "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['User'],
"L_FIND_USERNAME" => $lang['Find_username'],
--- 559,563 ----
"L_USER_EXPLAIN" => $lang['User_admin_explain'],
"L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
! "L_LOOK_UP" => $lang['Look_up_user'],
"L_FIND_USERNAME" => $lang['Find_username'],
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** index.php 2001/11/19 19:06:01 1.24
--- index.php 2001/11/21 03:10:10 1.25
***************
*** 399,403 ****
"LOCATION" => $location,
"IP_ADDRESS" => $ip_address,
! "U_USER_PROFILE" => append_sid("admin_users.$phpEx?" . POST_USERS_URL . "=" . $onlinerow[$i]['user_id']))
);
}
--- 399,403 ----
"LOCATION" => $location,
"IP_ADDRESS" => $ip_address,
! "U_USER_PROFILE" => append_sid("admin_users.$phpEx?" . POST_USERS_URL . "=" . $onlinerow[$i]['user_id'] . "&mode=edit"))
);
}
Index: page_footer_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_footer_admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** page_footer_admin.php 2001/10/14 15:46:53 1.5
--- page_footer_admin.php 2001/11/21 03:10:10 1.6
***************
*** 31,35 ****
$template->assign_vars(array(
! "PHPBB_VERSION" => "2.0 beta-1")
);
--- 31,35 ----
$template->assign_vars(array(
! "PHPBB_VERSION" => "2.0 CVS")
);
|
