aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-11-19 19:06:35 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-11-19 19:06:35 +0000
commit348fc5805f08e3d3a7e2a69496c2229720327a84 (patch)
tree969132efb5e731b1fb557054f01dd59aaa365d88 /phpBB/admin
parent19c25b38e9aee55960dc178a241e9714e6edfdfa (diff)
downloadforums-348fc5805f08e3d3a7e2a69496c2229720327a84.tar
forums-348fc5805f08e3d3a7e2a69496c2229720327a84.tar.gz
forums-348fc5805f08e3d3a7e2a69496c2229720327a84.tar.bz2
forums-348fc5805f08e3d3a7e2a69496c2229720327a84.tar.xz
forums-348fc5805f08e3d3a7e2a69496c2229720327a84.zip
Various admin lang and other fixes ... this will break other things I'm sure, only submit bug reports for recently commited files
git-svn-id: file:///svn/phpbb/trunk@1373 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin')
-rw-r--r--phpBB/admin/admin_board.php38
-rw-r--r--phpBB/admin/admin_forumauth.php12
-rw-r--r--phpBB/admin/admin_groupauth.php61
-rw-r--r--phpBB/admin/admin_mass_email.php113
-rw-r--r--phpBB/admin/admin_user_ban.php666
-rw-r--r--phpBB/admin/admin_userauth.php53
-rw-r--r--phpBB/admin/index.php2
7 files changed, 488 insertions, 457 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php
index 86f0edceac..bd423be05d 100644
--- a/phpBB/admin/admin_board.php
+++ b/phpBB/admin/admin_board.php
@@ -55,20 +55,24 @@ else
}
}
- if($HTTP_POST_VARS['submit'])
+ if( isset($HTTP_POST_VARS['submit']) )
{
- message_die(GENERAL_MESSAGE, $lang['Config_updated']);
+ $message = $lang['Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_config'], "<a href=\"" . append_sid("admin_board.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+
+ message_die(GENERAL_MESSAGE, $message);
}
}
$style_select = style_select($new['default_style'], 'default_style', "../templates");
-
-$admin_style_select = style_select($new['default_admin_style'], 'default_admin_style', "../templates");
-
$lang_select = language_select($new['default_lang'], 'default_lang', "../language");
-
$timezone_select = tz_select($new['board_timezone'], 'board_timezone');
+$disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : "";
+$disable_board_no = ( !$new['board_disable'] ) ? "checked=\"checked\"" : "";
+
+$cookie_secure_yes = ( $new['cookie_secure'] ) ? "checked=\"checked\"" : "";
+$cookie_secure_no = ( !$new['cookie_secure'] ) ? "checked=\"checked\"" : "";
+
$html_tags = $new['allow_html_tags'];
$override_user_style_yes = ( $new['override_user_style'] ) ? "checked=\"checked\"" : "";
@@ -129,7 +133,16 @@ $template->assign_vars(array(
"L_GENERAL_SETTINGS" => $lang['General_settings'],
"L_SITE_NAME" => $lang['Site_name'],
"L_SITE_DESCRIPTION" => $lang['Site_desc'],
+ "L_DISABLE_BOARD" => $lang['Board_disable'],
+ "L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'],
"L_ACCT_ACTIVATION" => $lang['Acct_activation'],
+ "L_COOKIE_SETTINGS" => $lang['Cookie_settings'],
+ "L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'],
+ "L_COOKIE_NAME" => $lang['Cookie_name'],
+ "L_COOKIE_DOMAIN" => $lang['Cookie_domain'],
+ "L_COOKIE_PATH" => $lang['Cookie_path'],
+ "L_SESSION_LENGTH" => $lang['Session_length'],
+ "L_COOKIE_SECURE" => $lang['Cookie_secure'],
"L_PRIVATE_MESSAGING" => $lang['Private_Messaging'],
"L_INBOX_LIMIT" => $lang['Inbox_limits'],
"L_SENTBOX_LIMIT" => $lang['Sentbox_limits'],
@@ -189,9 +202,12 @@ $template->assign_vars(array(
"L_USE_SMTP_EXPLAIN" => $lang['Use_SMTP_explain'],
"L_SMTP_SERVER" => $lang['SMTP_server'],
"L_SUBMIT" => $lang['Submit'],
+ "L_RESET" => $lang['Reset'],
"SITENAME" => $new['sitename'],
- "SITE_DESCRIPTION" => $new['site_desc'],
+ "SITE_DESCRIPTION" => $new['site_desc'],
+ "S_DISABLE_BOARD_YES" => $disable_board_yes,
+ "S_DISABLE_BOARD_NO" => $disable_board_no,
"ACTIVATION_NONE" => USER_ACTIVATION_NONE,
"ACTIVATION_NONE_CHECKED" => $activation_none,
"ACTIVATION_USER" => USER_ACTIVATION_SELF,
@@ -216,6 +232,12 @@ $template->assign_vars(array(
"INBOX_LIMIT" => $new['max_inbox_privmsgs'],
"SENTBOX_LIMIT" => $new['max_sentbox_privmsgs'],
"SAVEBOX_LIMIT" => $new['max_savebox_privmsgs'],
+ "COOKIE_NAME" => $new['cookie_name'],
+ "COOKIE_DOMAIN" => $new['cookie_domain'],
+ "COOKIE_PATH" => $new['cookie_path'],
+ "SESSION_LENGTH" => $new['session_length'],
+ "S_COOKIE_SECURE_ENABLED" => $cookie_secure_yes,
+ "S_COOKIE_SECURE_DISABLED" => $cookie_secure_no,
"GZIP_YES" => $gzip_yes,
"GZIP_NO" => $gzip_no,
"PRUNE_YES" => $prune_yes,
@@ -262,4 +284,4 @@ $template->pparse("body");
include('page_footer_admin.'.$phpEx);
-?>
+?> \ No newline at end of file
diff --git a/phpBB/admin/admin_forumauth.php b/phpBB/admin/admin_forumauth.php
index 6ea86354fb..619eac6ec7 100644
--- a/phpBB/admin/admin_forumauth.php
+++ b/phpBB/admin/admin_forumauth.php
@@ -201,10 +201,10 @@ if( empty($forum_id) )
$select_list .= "</select>";
$template->assign_vars(array(
- "L_AUTH_TITLE" => $lang['Forum'] . " " . $lang['Auth_Control'],
+ "L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
- "L_AUTH_SELECT" => $lang['Select_a'] . " " . $lang['Forum'],
- "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Forum'],
+ "L_AUTH_SELECT" => $lang['Select_a_Forum'],
+ "L_LOOK_UP" => $lang['Look_up_Forum'],
"S_AUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
"S_AUTH_SELECT" => $select_list)
@@ -328,10 +328,10 @@ else
$template->assign_vars(array(
"FORUM_NAME" => $forum_name,
- "L_AUTH_TITLE" => $lang['Forum'] . " " . $lang['Auth_Control'],
+ "L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
- "L_SUBMIT_CHANGES" => $lang['Submit_changes'],
- "L_RESET_CHANGES" => $lang['Reset_changes'],
+ "L_SUBMIT" => $lang['Submit'],
+ "L_RESET" => $lang['Reset'],
"U_FORUMAUTH_ACTION" => append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id"),
"U_SWITCH_MODE" => $u_switch_mode,
diff --git a/phpBB/admin/admin_groupauth.php b/phpBB/admin/admin_groupauth.php
index 4d4355fb03..68e198775e 100644
--- a/phpBB/admin/admin_groupauth.php
+++ b/phpBB/admin/admin_groupauth.php
@@ -455,48 +455,52 @@ if( isset($HTTP_POST_VARS['submit']) && ( !empty($HTTP_POST_VARS[POST_GROUPS_URL
//
// Any warnings?
//
- $warning_list = "";
+ $warning_list_mod = "";
while( list($forum_id, $user_ary) = each($warning_mod_userid) )
{
for($i = 0; $i < count($user_ary); $i++)
{
- if(!empty($valid_auth_mod_sql[$forum_id]))
+ echo $user_ary[$i];
+ if( !empty($valid_auth_mod_sql[$forum_id]) )
{
- $warning_list .= "<b><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_mod_username[$forum_id][$i] . "</a></b> " . $lang['has_moderator_status'] . " <b>" . $warning_mod_frmname[$forum_id][$i] . "</b><br />";
+ $warning_list_mod .= "<br /><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_mod_username[$forum_id][$i] . "</a> -> " . $warning_mod_frmname[$forum_id][$i];
}
}
}
+ $warning_list_acl = "";
while( list($forum_id, $user_ary) = each($warning_prv_userid) )
{
for($i = 0; $i < count($user_ary); $i++)
{
- if(!empty($valid_auth_prv_sql[$forum_id]))
+ if( !empty($valid_auth_prv_sql[$forum_id]) )
{
- $warning_list .= "<b><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_prv_username[$forum_id][$i] . "</a></b> " . $lang['has_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b><br />";
+ $warning_list_acl .= "<br /><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_prv_username[$forum_id][$i] . "</a> -> " . $warning_prv_frmname[$forum_id][$i];
}
}
}
- if($warning_list != "")
+ $warning_list = "";
+ if( $warning_list_mod != "" )
{
- $warning_list = "<br />" . $lang['Conflict_message_groupauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] ." <a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">" . $lang['HERE'] . "</a> " . $lang['return_group_auth_admin'] . "<br />";
-
- include('page_header_admin.'.$phpEx);
+ $warning_list .= $lang['Conflict_mod_groupauth'] . "<br />" . $warning_list_mod;
+ }
+ if( $warning_list_acl != "" )
+ {
+ $warning_list .= $lang['Conflict_access_groupauth'] . "<br />" . $warning_list_acl;
+ }
- $template->set_filenames(array(
- "body" => "admin/admin_message_body.tpl")
- );
+ if( $warning_list != "" )
+ {
+ $message = $warning_list . "<br /><br />" . sprintf($lang['Click_return_groupauth'], "<a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
- $template->assign_vars(array(
- "MESSAGE_TITLE" => $lang['Conflict_warning'],
- "MESSAGE_TEXT" => $warning_list)
- );
+ message_die(GENERAL_MESSAGE, $message);
}
else
{
+ $message = $lang['Auth_updated'] . "<br /><br />" . sprintf($lang['Click_return_groupauth'], "<a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
- header("Location: " . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id", true));
+ message_die(GENERAL_MESSAGE, $message);
}
}
@@ -733,10 +737,10 @@ else if( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_
$optionlist_mod .= "</select>";
$row_class = ( !($i%2) ) ? "row2" : "row1";
- $row_color = "#" . ( ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'] );
+ $row_color = ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'];
$template->assign_block_vars("forums", array(
- "ROW_COLOR" => $row_color,
+ "ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"FORUM_NAME" => $forum_access[$i]['forum_name'],
@@ -818,18 +822,19 @@ else if( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_
$switch_mode_text = ( !$adv ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
$u_switch_mode = '<a href="' . append_sid($switch_mode) . '">' . $switch_mode_text . '</a>';
+ $template->assign_block_vars("switch_group_auth", array());
+
$template->assign_vars(array(
"USERNAME" => $t_groupname,
- "USER_GROUP_MEMBERSHIPS" => $lang['Group_has_members'] . ": " . $t_usergroup_list,
-
+ "GROUP_MEMBERSHIP" => $lang['Usergroup_members'] . ": " . $t_usergroup_list,
"L_USER_OR_GROUPNAME" => $lang['Group_name'],
- "L_AUTH_TITLE" => $lang['Group'] . " " . $lang['Auth_Control'],
- "L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
+ "L_AUTH_TITLE" => $lang['Auth_Control_Group'],
+ "L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"L_PERMISSIONS" => $lang['Permissions'],
- "L_SUBMIT_CHANGES" => $lang['Submit_changes'],
- "L_RESET_CHANGES" => $lang['Reset_changes'],
+ "L_SUBMIT" => $lang['Submit'],
+ "L_RESET" => $lang['Reset'],
"U_USER_OR_GROUP" => append_sid("admin_groupauth.$phpEx"),
"U_SWITCH_MODE" => $u_switch_mode,
@@ -867,10 +872,10 @@ else
);
$template->assign_vars(array(
- "L_AUTH_TITLE" => $lang['Group'] . " " . $lang['Auth_Control'],
+ "L_AUTH_TITLE" => $lang['Auth_Control_Group'],
"L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
- "L_AUTH_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
- "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
+ "L_AUTH_SELECT" => $lang['Select_a_Group'],
+ "L_LOOK_UP" => $lang['Look_up_Group'],
"S_AUTH_ACTION" => append_sid("admin_groupauth.$phpEx"),
"S_AUTH_SELECT" => $select_list)
diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php
index 17fbdc4245..593bf62e14 100644
--- a/phpBB/admin/admin_mass_email.php
+++ b/phpBB/admin/admin_mass_email.php
@@ -39,24 +39,11 @@ $phpbb_root_dir = "./../";
$no_page_header = TRUE;
require('pagestart.inc');
-
-//
-// Set VERBOSE to 1 for debugging info..
-//
-if(DEBUG)
-{
- define("VERBOSE", 1);
-}
-else
-{
- define("VERBOSE", 0);
-}
-
//
// Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't
// allowed.
//
-@set_time_limit(600);
+@set_time_limit(1200);
//
// Set form names
@@ -64,68 +51,111 @@ else
$f_title = 'e_title';
$f_msg = 'e_msg';
-if(isset($HTTP_POST_VARS['submit']))
+if( isset($HTTP_POST_VARS['submit']) )
{
- $group_id = $HTTP_POST_VARS[POST_GROUPS_URL];
- if($group_id != -1)
+ $group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]);
+
+ if( $group_id != -1 )
{
- $sql = 'SELECT u.user_email
- FROM '.USERS_TABLE.' u, '.USER_GROUP_TABLE.' g
- WHERE u.user_id = g.user_id AND g.group_id = '.$group_id;
+ $sql = "SELECT u.user_email
+ FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " g
+ WHERE u.user_id = g.user_id
+ AND g.group_id = $group_id";
}
else
{
- $sql = 'SELECT user_email FROM '.USERS_TABLE;
+ $sql = "SELECT user_email
+ FROM " . USERS_TABLE;
}
- if(!$g_result = $db->sql_query($sql))
+
+ if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
}
- $g_list = $db->sql_fetchrowset($g_result);
+ $email_list = $db->sql_fetchrowset($g_result);
- $email_headers = "From: " . $board_config['board_email'] . "\r\n";
- $msg = stripslashes($HTTP_POST_VARS["$f_msg"]);
+ $subject = stripslashes($HTTP_POST_VARS["$f_title"]);
+ $message = stripslashes($HTTP_POST_VARS["$f_msg"]);
- $email_headers .= 'bcc: ';
- for($i = 0;$i < count($g_list); $i++)
+ include($phpbb_root_path . 'includes/emailer.'.$phpEx);
+ $emailer = new emailer($board_config['smtp_delivery']);
+
+ $email_headers = "From: " . $board_config['board_email'] . "\n";
+
+ $bcc_list = "";
+ for($i = 0; $i < count($email_list); $i++)
{
- if($i != 0)
+ if( $bcc_list != "" )
{
- $email_headers.= ' ,';
+ $bcc_list .= ", ";
}
- $email_headers .= $g_list[$i]['user_email'];
+ $bcc_list .= $email_list[$i]['user_email'];
}
+ $email_headers .= "Bcc: $bcc_list\n";
- mail($board_config['board_email'],$HTTP_POST_VARS["$f_title"],$HTTP_POST_VARS["$f_msg"],$email_headers);
- $notice = $lang['Messages'].' '.$lang['Sent'].'!';
+ $email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
+ $email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
+ $email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
+ $email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
+ $email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
+
+ $emailer->use_template("admin_send_email");
+ $emailer->email_address($board_config['board_email']);
+ $emailer->set_subject($subject);
+ $emailer->extra_headers($email_headers);
+
+ $emailer->assign_vars(array(
+ "SITENAME" => $board_config['sitename'],
+ "BOARD_EMAIL" => $board_config['board_email'],
+ "MESSAGE" => $message)
+ );
+ $emailer->send();
+ $emailer->reset();
+
+ $template->assign_vars(array(
+ "META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
+ );
+
+ $message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+
+ message_die(GENERAL_MESSAGE, $message);
+
}
-//Else, or if they already sent a message
-$sql = "SELECT group_id, group_name FROM ".GROUPS_TABLE.' WHERE group_single_user <> 1';
+//
+// Initial selection
+//
+
+$sql = "SELECT group_id, group_name
+ FROM ".GROUPS_TABLE . "
+ WHERE group_single_user <> 1";
$g_result = $db->sql_query($sql);
$group_list = $db->sql_fetchrowset($g_result);
-$select_list = '<SELECT name = "'.POST_GROUPS_URL.'">';
-$select_list .= '<OPTION value = "-1">'.$lang['All'].'</OPTION>';
+$select_list = '<select name = "' . POST_GROUPS_URL . '">';
+$select_list .= '<option value = "-1">' . $lang['All_users'] . '</option>';
for($i = 0;$i < count($group_list); $i++)
{
- $select_list .= "<OPTION value = \"".$group_list[$i]['group_id'];
- $select_list .= "\">".$group_list[$i]['group_name']."</OPTION>";
+ $select_list .= "<option value = \"" . $group_list[$i]['group_id'];
+ $select_list .= "\">" . $group_list[$i]['group_name'] . "</option>";
}
-$select_list .= "</SELECT>";
+$select_list .= "</select>";
+//
+// Generate page
+//
include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
- "body" => "admin/user_email.tpl")
+ "body" => "admin/user_email_body.tpl")
);
$template->assign_vars(array(
"L_EMAIL_TITLE" => $lang['Email'],
"L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
"L_COMPOSE" => $lang['Compose'],
- "L_GROUP_SELECT" => $lang['Group'],
+ "L_RECIPIENTS" => $lang['Recipients'],
"L_EMAIL_SUBJECT" => $lang['Subject'],
"L_EMAIL_MSG" => $lang['Message'],
"L_EMAIL" => $lang['Email'],
@@ -140,4 +170,5 @@ $template->assign_vars(array(
$template->pparse('body');
include('page_footer_admin.'.$phpEx);
+
?> \ No newline at end of file
diff --git a/phpBB/admin/admin_user_ban.php b/phpBB/admin/admin_user_ban.php
index 3ffef0ec03..e247e69bb4 100644
--- a/phpBB/admin/admin_user_ban.php
+++ b/phpBB/admin/admin_user_ban.php
@@ -23,8 +23,7 @@
if($setmodules == 1)
{
$filename = basename(__FILE__);
- $module['Users']['Ban'] = $filename . "?mode=ban";
- $module['Users']['Un-ban'] = $filename . "?mode=unban";
+ $module['Users']['Ban_Management'] = $filename;
return;
}
@@ -35,475 +34,442 @@ if($setmodules == 1)
$phpbb_root_dir = "./../";
require('pagestart.inc');
-if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
-{
- $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
-}
-else
-{
- $mode = "unban";
-}
-
//
// Start program
//
-if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
+if( isset($HTTP_POST_VARS['submit']) )
{
- if($HTTP_POST_VARS['bancontrol'] == "ban")
+ $user_bansql = "";
+ $email_bansql = "";
+ $ip_bansql = "";
+
+ $user_list = array();
+ if(isset($HTTP_POST_VARS['ban_user']))
{
- $user_bansql = "";
- $email_bansql = "";
- $ip_bansql = "";
+ $user_list_temp = $HTTP_POST_VARS['ban_user'];
- $user_list = array();
- if(isset($HTTP_POST_VARS['user']))
+ for($i = 0; $i < count($user_list_temp); $i++)
{
- $user_list_temp = $HTTP_POST_VARS['user'];
-
- for($i = 0; $i < count($user_list_temp); $i++)
- {
- $user_list[] = trim($user_list_temp[$i]);
- }
+ $user_list[] = trim($user_list_temp[$i]);
}
+ }
- $ip_list = array();
- if(isset($HTTP_POST_VARS['ip']))
- {
- $ip_list_temp = explode(",", $HTTP_POST_VARS['ip']);
+ $ip_list = array();
+ if(isset($HTTP_POST_VARS['ban_ip']))
+ {
+ $ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
- for($i = 0; $i < count($ip_list_temp); $i++)
+ for($i = 0; $i < count($ip_list_temp); $i++)
+ {
+ if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
{
- if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
+ //
+ // Don't ask about all this, just don't ask ... !
+ //
+ $ip_1_counter = $ip_range_explode[1];
+ $ip_1_end = $ip_range_explode[5];
+
+ while($ip_1_counter <= $ip_1_end)
{
- //
- // Don't ask about all this, just don't ask ... !
- //
- $ip_1_counter = $ip_range_explode[1];
- $ip_1_end = $ip_range_explode[5];
+ $ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
+ $ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
+
+ if($ip_2_counter == 0 && $ip_2_end == 254)
+ {
+ $ip_2_counter = 255;
+ $ip_2_fragment = 255;
+
+ $ip_list[] = encode_ip("$ip_1_counter.255.255.255");
+ }
- while($ip_1_counter <= $ip_1_end)
+ while($ip_2_counter <= $ip_2_end)
{
- $ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
- $ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
+ $ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
+ $ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
- if($ip_2_counter == 0 && $ip_2_end == 254)
+ if($ip_3_counter == 0 && $ip_3_end == 254 )
{
- $ip_2_counter = 255;
- $ip_2_fragment = 255;
+ $ip_3_counter = 255;
+ $ip_3_fragment = 255;
- $ip_list[] = encode_ip("$ip_1_counter.255.255.255");
+ $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.255.255");
}
- while($ip_2_counter <= $ip_2_end)
+ while($ip_3_counter <= $ip_3_end)
{
- $ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
- $ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
+ $ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
+ $ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
- if($ip_3_counter == 0 && $ip_3_end == 254 )
+ if($ip_4_counter == 0 && $ip_4_end == 254)
{
- $ip_3_counter = 255;
- $ip_3_fragment = 255;
+ $ip_4_counter = 255;
+ $ip_4_fragment = 255;
- $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.255.255");
+ $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.255");
}
- while($ip_3_counter <= $ip_3_end)
+ while($ip_4_counter <= $ip_4_end)
{
- $ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
- $ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
-
- if($ip_4_counter == 0 && $ip_4_end == 254)
- {
- $ip_4_counter = 255;
- $ip_4_fragment = 255;
-
- $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.255");
- }
-
- while($ip_4_counter <= $ip_4_end)
- {
- $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
- $ip_4_counter++;
- }
- $ip_3_counter++;
+ $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
+ $ip_4_counter++;
}
- $ip_2_counter++;
+ $ip_3_counter++;
}
- $ip_1_counter++;
+ $ip_2_counter++;
}
+ $ip_1_counter++;
}
- else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
- {
- $ip = gethostbynamel(trim($ip_list_temp[$i]));
+ }
+ else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
+ {
+ $ip = gethostbynamel(trim($ip_list_temp[$i]));
- for($j = 0; $j < count($ip); $j++)
+ for($j = 0; $j < count($ip); $j++)
+ {
+ if( !empty($ip[$j]) )
{
- if( !empty($ip[$j]) )
- {
- $ip_list[] = encode_ip($ip[$j]);
- }
+ $ip_list[] = encode_ip($ip[$j]);
}
}
- else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
- {
- $ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
- }
+ }
+ else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
+ {
+ $ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
}
}
+ }
- $email_list = array();
- if(isset($HTTP_POST_VARS['email']))
- {
- $email_list_temp = explode(",", $HTTP_POST_VARS['email']);
+ $email_list = array();
+ if(isset($HTTP_POST_VARS['ban_mail']))
+ {
+ $email_list_temp = explode(",", $HTTP_POST_VARS['ban_mail']);
- for($i = 0; $i < count($email_list_temp); $i++)
+ for($i = 0; $i < count($email_list_temp); $i++)
+ {
+ //
+ // This ereg match is based on one by php@unreelpro.com
+ // contained in the annotated php manual at php.com (ereg
+ // section)
+ //
+ if( eregi("^(([[:alnum:]]+([-_.][[:alnum:]]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
{
- //
- // This ereg match is based on one by php@unreelpro.com
- // contained in the annotated php manual at php.com (ereg
- // section)
- //
- if( eregi("^(([[:alnum:]]+([-_.][[:alnum:]]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
- {
- $email_list[] = trim($email_list_temp[$i]);
- }
+ $email_list[] = trim($email_list_temp[$i]);
}
}
+ }
- $sql = "SELECT *
- FROM " . BANLIST_TABLE;
- if( !$result = $db->sql_query($sql) )
- {
- message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
- }
+ $sql = "SELECT *
+ FROM " . BANLIST_TABLE;
+ if( !$result = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
+ }
- $current_banlist = $db->sql_fetchrowset($result);
+ $current_banlist = $db->sql_fetchrowset($result);
- $kill_session_sql = "";
- for($i = 0; $i < count($user_list); $i++)
+ $kill_session_sql = "";
+ for($i = 0; $i < count($user_list); $i++)
+ {
+ $in_banlist = false;
+ for($j = 0; $j < count($current_banlist); $j++)
{
- $in_banlist = false;
- for($j = 0; $j < count($current_banlist); $j++)
+ if($user_list[$i] == $current_banlist[$j]['ban_userid'])
{
- if($user_list[$i] == $current_banlist[$j]['ban_userid'])
- {
- $in_banlist = true;
- }
+ $in_banlist = true;
}
+ }
- if(!$in_banlist)
- {
- $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
+ if(!$in_banlist)
+ {
+ $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
- $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
- VALUES ('" . $user_list[$i] . "')";
- if( !$result = $db->sql_query($sql) )
- {
- message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
- }
+ $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
+ VALUES ('" . $user_list[$i] . "')";
+ if( !$result = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
}
}
+ }
- for($i = 0; $i < count($ip_list); $i++)
+ for($i = 0; $i < count($ip_list); $i++)
+ {
+ $in_banlist = false;
+ for($j = 0; $j < count($current_banlist); $j++)
{
- $in_banlist = false;
- for($j = 0; $j < count($current_banlist); $j++)
+ if($ip_list[$i] == $current_banlist[$j]['ban_ip'])
{
- if($ip_list[$i] == $current_banlist[$j]['ban_ip'])
- {
- $in_banlist = true;
- }
+ $in_banlist = true;
}
+ }
- if(!$in_banlist)
+ if(!$in_banlist)
+ {
+ if( preg_match("/(ff\.)|(\.ff)/is", chunk_split($ip_list[$i], 2, ".")) )
{
- if( preg_match("/(ff\.)|(\.ff)/is", chunk_split($ip_list[$i], 2, ".")) )
- {
- $kill_ip_sql = "session_ip LIKE '" . str_replace(".", "", preg_replace("/(ff\.)|(\.ff)/is", "%", chunk_split($ip_list[$i], 2, "."))) . "'";
- }
- else
- {
- $kill_ip_sql = "session_ip = '" . $ip_list[$i] . "'";
- }
+ $kill_ip_sql = "session_ip LIKE '" . str_replace(".", "", preg_replace("/(ff\.)|(\.ff)/is", "%", chunk_split($ip_list[$i], 2, "."))) . "'";
+ }
+ else
+ {
+ $kill_ip_sql = "session_ip = '" . $ip_list[$i] . "'";
+ }
- $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
+ $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
- $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
- VALUES ('" . $ip_list[$i] . "')";
- if( !$result = $db->sql_query($sql) )
- {
- message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
- }
+ $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
+ VALUES ('" . $ip_list[$i] . "')";
+ if( !$result = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
}
}
+ }
- //
- // Now we'll delete all entries from the
- // session table with any of the banned
- // user or IP info just entered into the
- // ban table ... this will force a session
- // initialisation resulting in an instant
- // ban
- //
- if($kill_session_sql != "")
+ //
+ // Now we'll delete all entries from the
+ // session table with any of the banned
+ // user or IP info just entered into the
+ // ban table ... this will force a session
+ // initialisation resulting in an instant
+ // ban
+ //
+ if($kill_session_sql != "")
+ {
+ $sql = "DELETE FROM " . SESSIONS_TABLE . "
+ WHERE $kill_session_sql";
+ if( !$result = $db->sql_query($sql) )
{
- $sql = "DELETE FROM " . SESSIONS_TABLE . "
- WHERE $kill_session_sql";
- if( !$result = $db->sql_query($sql) )
- {
- message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
- }
+ message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
}
+ }
- for($i = 0; $i < count($email_list); $i++)
+ for($i = 0; $i < count($email_list); $i++)
+ {
+ $in_banlist = false;
+ for($j = 0; $j < count($current_banlist); $j++)
{
- $in_banlist = false;
- for($j = 0; $j < count($current_banlist); $j++)
+ if($email_list[$i] == $current_banlist[$j]['ban_email'])
{
- if($email_list[$i] == $current_banlist[$j]['ban_email'])
- {
- $in_banlist = true;
- }
+ $in_banlist = true;
}
+ }
- if(!$in_banlist)
+ if(!$in_banlist)
+ {
+ $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
+ VALUES ('" . $email_list[$i] . "')";
+ if( !$result = $db->sql_query($sql) )
{
- $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
- VALUES ('" . $email_list[$i] . "')";
- if( !$result = $db->sql_query($sql) )
- {
- message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
- }
+ message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
}
}
}
- else if($HTTP_POST_VARS['bancontrol'] == "unban")
- {
- $where_sql = "";
+ $where_sql = "";
- if(isset($HTTP_POST_VARS['user']))
- {
- $user_list = $HTTP_POST_VARS['user'];
+ if(isset($HTTP_POST_VARS['unban_user']))
+ {
+ $user_list = $HTTP_POST_VARS['unban_user'];
- for($i = 0; $i < count($user_list); $i++)
+ for($i = 0; $i < count($user_list); $i++)
+ {
+ if($user_list[$i] != -1)
{
- if($user_list[$i] != -1)
+ if($where_sql != "")
{
- if($where_sql != "")
- {
- $where_sql .= " OR ";
- }
- $where_sql .= "ban_id = " . $user_list[$i];
+ $where_sql .= " OR ";
}
+ $where_sql .= "ban_id = " . $user_list[$i];
}
}
+ }
- if(isset($HTTP_POST_VARS['ip']))
- {
- $ip_list = $HTTP_POST_VARS['ip'];
+ if(isset($HTTP_POST_VARS['unban_ip']))
+ {
+ $ip_list = $HTTP_POST_VARS['unban_ip'];
- for($i = 0; $i < count($ip_list); $i++)
+ for($i = 0; $i < count($ip_list); $i++)
+ {
+ if($ip_list[$i] != -1)
{
- if($ip_list[$i] != -1)
+ if($where_sql != "")
{
- if($where_sql != "")
- {
- $where_sql .= " OR ";
- }
- $where_sql .= "ban_id = " . $ip_list[$i];
+ $where_sql .= " OR ";
}
+ $where_sql .= "ban_id = " . $ip_list[$i];
}
}
+ }
- if(isset($HTTP_POST_VARS['email']))
- {
- $email_list = $HTTP_POST_VARS['email'];
+ if(isset($HTTP_POST_VARS['unban_email']))
+ {
+ $email_list = $HTTP_POST_VARS['unban_email'];
- for($i = 0; $i < count($email_list); $i++)
+ for($i = 0; $i < count($email_list); $i++)
+ {
+ if($email_list[$i] != -1)
{
- if($email_list[$i] != -1)
+ if($where_sql != "")
{
- if($where_sql != "")
- {
- $where_sql .= " OR ";
- }
- $where_sql .= "ban_id = " . $email_list[$i];
+ $where_sql .= " OR ";
}
+ $where_sql .= "ban_id = " . $email_list[$i];
}
}
+ }
- if($where_sql != "")
+ if($where_sql != "")
+ {
+ $sql = "DELETE FROM " . BANLIST_TABLE . "
+ WHERE $where_sql";
+ if( !$result = $db->sql_query($sql) )
{
- $sql = "DELETE FROM " . BANLIST_TABLE . "
- WHERE $where_sql";
- if( !$result = $db->sql_query($sql) )
- {
- message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
- }
+ message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
}
}
message_die(GENERAL_MESSAGE, $lang['Ban_update_sucessful']);
+
}
else
{
- if( $mode == "ban" )
- {
- $userban_count = 0;
- $sql = "SELECT user_id, username
- FROM " . USERS_TABLE . "
- WHERE user_id <> " . ANONYMOUS . "
- ORDER BY username ASC";
- $u_result = $db->sql_query($sql);
- $user_list = $db->sql_fetchrowset($u_result);
-
- $select_userlist = "<option value=\"0\">Select a Username</option>";
- for($i = 0; $i < count($user_list); $i++)
- {
- $select_userlist .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
- $userban_count++;
- }
- $select_userlist = "<select name=\"user[]\"" . ( ($userban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" : ">" ) . $select_userlist . "</select>";
-
- $template->set_filenames(array(
- "body" => "admin/user_ban_body.tpl")
- );
-
- $s_hidden_fields = "<input type=\"hidden\" name=\"bancontrol\" value=\"ban\" />";
-
- $template->assign_vars(array(
- "L_BAN_TITLE" => $lang['Ban_control'],
- "L_BAN_EXPLAIN" => $lang['Ban_explain'],
- "L_BAN_EXPLAIN_WARN" => $lang['Ban_explain_warn'],
- "L_BAN_USER" => $lang['Ban_username'],
- "L_BAN_USER_EXPLAIN" => $lang['Ban_username_explain'],
- "L_BAN_IP" => $lang['Ban_IP'],
- "L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
- "L_BAN_IP_EXPLAIN" => $lang['Ban_IP_explain'],
- "L_BAN_EMAIL" => $lang['Ban_email'],
- "L_EMAIL_ADDRESS" => $lang['Email_address'],
- "L_BAN_EMAIL_EXPLAIN" => $lang['Ban_email_explain'],
- "L_SUBMIT" => $lang['Submit'],
- "L_RESET" => $lang['Reset'],
-
- "S_USERLIST_SELECT" => $select_userlist,
- "S_HIDDEN_FIELDS" => $s_hidden_fields,
- "S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
- );
+ $template->set_filenames(array(
+ "body" => "admin/user_ban_body.tpl")
+ );
+
+ $template->assign_vars(array(
+ "L_BAN_TITLE" => $lang['Ban_control'],
+ "L_BAN_EXPLAIN" => $lang['Ban_explain'],
+ "L_BAN_EXPLAIN_WARN" => $lang['Ban_explain_warn'],
+ "L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
+ "L_EMAIL_ADDRESS" => $lang['Email_address'],
+ "L_SUBMIT" => $lang['Submit'],
+ "L_RESET" => $lang['Reset'],
+
+ "S_BANLIST_ACTION" => append_sid("admin_user_ban.$phpEx"))
+ );
+
+ $userban_count = 0;
+
+ $sql = "SELECT user_id, username
+ FROM " . USERS_TABLE . "
+ WHERE user_id <> " . ANONYMOUS . "
+ ORDER BY username ASC";
+ $u_result = $db->sql_query($sql);
+ $user_list = $db->sql_fetchrowset($u_result);
+
+ $select_userlist = "";
+ for($i = 0; $i < count($user_list); $i++)
+ {
+ $select_userlist .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
+ $userban_count++;
}
- else if( $mode == "unban" )
+ $select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist . "</select>";
+
+ $template->assign_vars(array(
+ "L_BAN_USER" => $lang['Ban_username'],
+ "L_BAN_USER_EXPLAIN" => $lang['Ban_username_explain'],
+ "L_BAN_IP" => $lang['Ban_IP'],
+ "L_BAN_IP_EXPLAIN" => $lang['Ban_IP_explain'],
+ "L_BAN_EMAIL" => $lang['Ban_email'],
+ "L_BAN_EMAIL_EXPLAIN" => $lang['Ban_email_explain'],
+
+ "S_BAN_USERLIST_SELECT" => $select_userlist)
+ );
+
+ $userban_count = 0;
+ $ipban_count = 0;
+ $emailban_count = 0;
+
+ $sql = "SELECT b.ban_id, u.user_id, u.username
+ FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
+ WHERE u.user_id = b.ban_userid
+ AND b.ban_userid <> 0
+ AND u.user_id <> " . ANONYMOUS . "
+ ORDER BY u.user_id ASC";
+ $u_result = $db->sql_query($sql);
+ $user_list = $db->sql_fetchrowset($u_result);
+
+ $select_userlist = "";
+ for($i = 0; $i < count($user_list); $i++)
{
- $userban_count = 0;
- $ipban_count = 0;
- $emailban_count = 0;
-
- $sql = "SELECT b.ban_id, u.user_id, u.username
- FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
- WHERE u.user_id = b.ban_userid
- AND b.ban_userid <> 0
- AND u.user_id <> " . ANONYMOUS . "
- ORDER BY u.user_id ASC";
- $u_result = $db->sql_query($sql);
- $user_list = $db->sql_fetchrowset($u_result);
-
- $select_userlist = "";
- for($i = 0; $i < count($user_list); $i++)
- {
- $select_userlist .= "<option value=\"" . $user_list[$i]['ban_id'] . "\">" . $user_list[$i]['username'] . "</option>";
- $userban_count++;
- }
-
- if($select_userlist == "")
- {
- $select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
- }
- else if($userban_count == 1)
- {
- $select_userlist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_userlist;
- }
+ $select_userlist .= "<option value=\"" . $user_list[$i]['ban_id'] . "\">" . $user_list[$i]['username'] . "</option>";
+ $userban_count++;
+ }
- $select_userlist = "<select name=\"user[]\"" . ( ($userban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" : ">" ) . $select_userlist;
- $select_userlist .= "</select>";
+ if($select_userlist == "")
+ {
+ $select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
+ }
+ else if($userban_count == 1)
+ {
+ $select_userlist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_userlist;
+ }
- $sql = "SELECT ban_id, ban_ip, ban_email
- FROM " . BANLIST_TABLE;
- $b_result = $db->sql_query($sql);
- $banlist = $db->sql_fetchrowset($b_result);
+ $select_userlist = "<select name=\"unban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist;
+ $select_userlist .= "</select>";
- $select_iplist = "";
- $select_emaillist = "";
+ $sql = "SELECT ban_id, ban_ip, ban_email
+ FROM " . BANLIST_TABLE;
+ $b_result = $db->sql_query($sql);
+ $banlist = $db->sql_fetchrowset($b_result);
- for($i = 0; $i < $db->sql_numrows($b_result); $i++)
- {
- $ban_id = $banlist[$i]['ban_id'];
+ $select_iplist = "";
+ $select_emaillist = "";
- if( !empty($banlist[$i]['ban_ip']) )
- {
- $ban_ip = str_replace("255", "*", decode_ip($banlist[$i]['ban_ip']));
- $select_iplist .= "<option value=\"$ban_id\">$ban_ip</option>";
- $ipban_count++;
- }
- else if( !empty($banlist[$i]['ban_email']) )
- {
- $ban_email = $banlist[$i]['ban_email'];
- $select_emaillist .= "<option value=\"$ban_id\">$ban_email</option>";
- $emailban_count++;
- }
- }
-
- if($select_iplist == "")
- {
- $select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
- }
- else if($ipban_count == 1)
- {
- $select_iplist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_iplist;
- }
+ for($i = 0; $i < $db->sql_numrows($b_result); $i++)
+ {
+ $ban_id = $banlist[$i]['ban_id'];
- if($select_emaillist == "")
+ if( !empty($banlist[$i]['ban_ip']) )
{
- $select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
+ $ban_ip = str_replace("255", "*", decode_ip($banlist[$i]['ban_ip']));
+ $select_iplist .= "<option value=\"$ban_id\">$ban_ip</option>";
+ $ipban_count++;
}
- else if($emailban_count == 1)
+ else if( !empty($banlist[$i]['ban_email']) )
{
- $select_emaillist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_emaillist;
+ $ban_email = $banlist[$i]['ban_email'];
+ $select_emaillist .= "<option value=\"$ban_id\">$ban_email</option>";
+ $emailban_count++;
}
+ }
- $select_iplist = "<select name=\"ip[]\"" . ( ($ipban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $ipban_count) . "\">" : ">" ) . $select_iplist . "</select>";
- $select_emaillist = "<select name=\"email[]\"" . ( ($emailban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $emailban_count) . "\">" : ">" ) . $select_emaillist . "</select>";
-
- $template->set_filenames(array(
- "body" => "admin/user_unban_body.tpl")
- );
-
- $s_hidden_fields = "<input type=\"hidden\" name=\"bancontrol\" value=\"unban\" />";
-
- $template->assign_vars(array(
- "L_BAN_TITLE" => $lang['Ban_control'],
- "L_BAN_EXPLAIN" => $lang['Ban_explain'],
- "L_BAN_USER" => $lang['Unban_username'],
- "L_BAN_USER_EXPLAIN" => $lang['Unban_username_explain'],
- "L_BAN_IP" => $lang['Unban_IP'],
- "L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
- "L_BAN_IP_EXPLAIN" => $lang['Unban_IP_explain'],
- "L_BAN_EMAIL" => $lang['Unban_email'],
- "L_EMAIL_ADDRESS" => $lang['Email_address'],
- "L_BAN_EMAIL_EXPLAIN" => $lang['Unban_email_explain'],
- "L_SUBMIT" => $lang['Submit'],
- "L_RESET" => $lang['Reset'],
-
- "S_USERLIST_SELECT" => $select_userlist,
- "S_IPLIST_SELECT" => $select_iplist,
- "S_EMAILLIST_SELECT" => $select_emaillist,
- "S_HIDDEN_FIELDS" => $s_hidden_fields,
- "S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
- );
-
+ if($select_iplist == "")
+ {
+ $select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
+ }
+ else if($ipban_count == 1)
+ {
+ $select_iplist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_iplist;
+ }
+ if($select_emaillist == "")
+ {
+ $select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
+ }
+ else if($emailban_count == 1)
+ {
+ $select_emaillist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_emaillist;
}
+ $select_iplist = "<select name=\"unban_ip[]\" multiple=\"multiple\" size=\"" . min(5, $ipban_count) . "\">" . $select_iplist . "</select>";
+ $select_emaillist = "<select name=\"unban_email[]\" multiple=\"multiple\" size=\"" . min(5, $emailban_count) . "\">" . $select_emaillist . "</select>";
+
+ $template->assign_vars(array(
+ "L_UNBAN_USER" => $lang['Unban_username'],
+ "L_UNBAN_USER_EXPLAIN" => $lang['Unban_username_explain'],
+ "L_UNBAN_IP" => $lang['Unban_IP'],
+ "L_UNBAN_IP_EXPLAIN" => $lang['Unban_IP_explain'],
+ "L_UNBAN_EMAIL" => $lang['Unban_email'],
+ "L_UNBAN_EMAIL_EXPLAIN" => $lang['Unban_email_explain'],
+
+ "S_UNBAN_USERLIST_SELECT" => $select_userlist,
+ "S_UNBAN_IPLIST_SELECT" => $select_iplist,
+ "S_UNBAN_EMAILLIST_SELECT" => $select_emaillist,
+ "S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
+ );
}
$template->pparse("body");
diff --git a/phpBB/admin/admin_userauth.php b/phpBB/admin/admin_userauth.php
index 20f060e725..27b84d2f3a 100644
--- a/phpBB/admin/admin_userauth.php
+++ b/phpBB/admin/admin_userauth.php
@@ -531,47 +531,51 @@ if( isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL])
//
// Any warnings?
//
- $warning_list = "";
+ $warning_list_mod = "";
while( list($forum_id, $group_ary) = each($warning_mod_grpid) )
{
for($i = 0; $i < count($group_ary); $i++)
{
if(!empty($valid_auth_mod_sql[$forum_id]))
{
- $warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_mod_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_moderator_status'] . " <b>" . $warning_mod_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
+ $warning_list_mod .= "<br /><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_mod_grpname[$forum_id][$i] . "</a> -> " . $warning_mod_frmname[$forum_id][$i];
}
}
}
+ $warning_list_acl = "";
while( list($forum_id, $group_ary) = each($warning_prv_grpid) )
{
for($i = 0; $i < count($group_ary); $i++)
{
if( !empty($valid_auth_prv_sql[$forum_id]) )
{
- $warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
+ $warning_list_acl .= "<br /><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a> -> " . $warning_prv_frmname[$forum_id][$i];
}
}
}
- if( $warning_list != "" )
+ $warning_list = "";
+ if( $warning_list_mod != "" )
{
- $warning_list = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />";
-
- include('page_header_admin.'.$phpEx);
+ $warning_list .= $lang['Conflict_mod_groupauth'] . "<br />" . $warning_list_mod;
+ }
+ if( $warning_list_acl != "" )
+ {
+ $warning_list .= $lang['Conflict_access_groupauth'] . "<br />" . $warning_list_acl;
+ }
- $template->set_filenames(array(
- "body" => "admin/admin_message_body.tpl")
- );
+ if( $warning_list != "" )
+ {
+ $message = $warning_list . "<br /><br />" . sprintf($lang['Click_return_userauth'], "<a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
- $template->assign_vars(array(
- "MESSAGE_TITLE" => $lang['Conflict_warning'],
- "MESSAGE_TEXT" => $warning_list)
- );
+ message_die(GENERAL_MESSAGE, $message);
}
else
{
- header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
+ $message = $lang['Auth_updated'] . "<br /><br />" . sprintf($lang['Click_return_userauth'], "<a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+
+ message_die(GENERAL_MESSAGE, $message);
}
}
}
@@ -849,7 +853,7 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
@reset($auth_user);
$t_username .= $userinf[0]['username'];
- $s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected=\"selected\">' . $lang['Administrator'] . '</option><option value="user">' . $lang['User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Administrator'] . '</option><option value="user" selected=\"selected\">' . $lang['User'] . '</option></select>';
+ $s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected=\"selected\">' . $lang['Auth_Admin'] . '</option><option value="user">' . $lang['Auth_User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Auth_Admin'] . '</option><option value="user" selected=\"selected\">' . $lang['Auth_User'] . '</option></select>';
for($i = 0; $i < count($userinf); $i++)
{
@@ -906,19 +910,22 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
$u_switch_mode = '<a href="' . $switch_mode . '">' . $switch_mode_text . '</a>';
+ $template->assign_block_vars("switch_user_auth", array());
+
$template->assign_vars(array(
"USERNAME" => $t_username,
- "USER_GROUP_MEMBERSHIPS" => $lang['This_user_is'] . " " . $s_user_type . " " . $lang['and_belongs_groups'] . ": " . $t_usergroup_list,
+ "USER_LEVEL" => $lang['User_Level'] . " : " . $s_user_type,
+ "USER_GROUP_MEMBERSHIPS" => $lang['Group_memberships'] . " : " . $t_usergroup_list,
"L_USER_OR_GROUPNAME" => $lang['Username'],
"L_USER_OR_GROUP" => $lang['User'],
- "L_AUTH_TITLE" => $lang['User'] . " " . $lang['Auth_Control'],
+ "L_AUTH_TITLE" => $lang['Auth_Control_User'],
"L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"L_PERMISSIONS" => $lang['Permissions'],
- "L_SUBMIT_CHANGES" => $lang['Submit_changes'],
- "L_RESET_CHANGES" => $lang['Reset_changes'],
+ "L_SUBMIT" => $lang['Submit'],
+ "L_RESET" => $lang['Reset'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"U_USER_OR_GROUP" => append_sid("admin_userauth.$phpEx"),
@@ -958,10 +965,10 @@ else
);
$template->assign_vars(array(
- "L_USER_TITLE" => $lang['User'] . " " . $lang['Auth_Control'],
+ "L_USER_TITLE" => $lang['Auth_Control_User'],
"L_USER_EXPLAIN" => $lang['User_auth_explain'],
- "L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
- "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['User'],
+ "L_USER_SELECT" => $lang['Select_a_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 23a07e55c4..381e377253 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -57,7 +57,7 @@ if( $HTTP_GET_VARS['pane'] == 'left' )
"U_FORUM_INDEX" => append_sid("../index.$phpEx"),
"U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"),
- "L_FORUM_INDEX" => $lang['Forum_Index'],
+ "L_FORUM_INDEX" => $lang['Main_index'],
"L_ADMIN_INDEX" => $lang['Admin_Index'],
"L_PREVIEW_FORUM" => $lang['Preview_forum'])
);