mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Category and module lang name changes + show ban information when selecting entries to unban

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3367 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2003-01-27 18:16:22 +00:00
parent 47cc239b1d
commit 0c26de16eb
19 changed files with 328 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
phpBB/admin/admin_ban.php
View File

@@ -29,9 +29,9 @@ if (!empty($setmodules))
}
$filename = basename(__FILE__);
$module['Users']['Ban_users'] = $filename . "$SID&mode=user";
$module['Users']['Ban_emails'] = $filename . "$SID&mode=email";
$module['Users']['Ban_ips'] = $filename . "$SID&mode=ip";
$module['USER']['BAN_USERS'] = $filename . "$SID&mode=user";
$module['USER']['BAN_EMAILS'] = $filename . "$SID&mode=email";
$module['USER']['BAN_IPS'] = $filename . "$SID&mode=ip";
return;
}
@@ -302,7 +302,7 @@ if (isset($_POST['bansubmit']) || isset($_GET['bansubmit']))
add_admin_log($log_entry . $mode, $ban_reason, $ban_list_log);
}
trigger_error($user->lang['Ban_update_sucessful']);
trigger_error($user->lang['BAN_UPDATE_SUCESSFUL']);
}
else if (isset($_POST['unbansubmit']))
@@ -322,7 +322,7 @@ else if (isset($_POST['unbansubmit']))
add_admin_log('log_unban_' . $mode, sizeof($_POST['unban']));
}
trigger_error($user->lang['Ban_update_sucessful']);
trigger_error($user->lang['BAN_UPDATE_SUCESSFUL']);
}
//
@@ -340,7 +340,7 @@ $db->sql_query($sql);
//
// Ban length options
//
$ban_end_text = array(0 => $user->lang['Permanent'], 30 => $user->lang['30_Mins'], 60 => $user->lang['1_Hour'], 360 => $user->lang['6_Hours'], 1440 => $user->lang['1_Day'], 10080 => $user->lang['7_Days'], 20160 => $user->lang['2_Weeks'], 40320 => $user->lang['1_Month'], -1 => $user->lang['Other']);
$ban_end_text = array(0 => $user->lang['PERMANENT'], 30 => $user->lang['30_MINS'], 60 => $user->lang['1_HOUR'], 360 => $user->lang['6_HOURS'], 1440 => $user->lang['1_DAY'], 10080 => $user->lang['7_DAYS'], 20160 => $user->lang['2_WEEKS'], 40320 => $user->lang['1_MONTH'], -1 => $user->lang['OTHER'] . ' -> ');
$ban_end_options = '';
foreach ($ban_end_text as $length => $text)
@@ -354,13 +354,13 @@ foreach ($ban_end_text as $length => $text)
switch ($mode)
{
case 'user':
$l_title = $user->lang['Ban_users'];
$l_title = $user->lang['BAN_USERS'];
break;
case 'email':
$l_title = $user->lang['Ban_emails'];
$l_title = $user->lang['BAN_EMAILS'];
break;
case 'ip':
$l_title = $user->lang['Ban_ips'];
$l_title = $user->lang['BAN_IPS'];
break;
}
@@ -371,13 +371,24 @@ page_header($l_title);
?>
<p><?php echo $user->lang['Ban_explain']; ?></p>
<p><?php echo $user->lang['BAN_EXPLAIN']; ?></p>
<?php
switch ($mode)
{
case 'user':
$field = 'username';
$l_ban_title = $user->lang['BAN_USERS'];
$l_ban_explain = $user->lang['BAN_USERNAME_EXPLAIN'];
$l_ban_exclude_explain = $user->lang['BAN_USER_EXCLUDE_EXPLAIN'];
$l_unban_title = $user->lang['UNBAN_USERNAME'];
$l_unban_explain = $user->lang['UNBAN_USERNAME_EXPLAIN'];
$l_ban_cell = $user->lang['USERNAME'];
$l_no_ban_cell = $user->lang['NO_BANNED_USERS'];
$s_submit_extra = '<input type="submit" name="usersubmit" value="' . $user->lang['Find_username'] . '" class="liteoption" onClick="window.open(\'../memberlist.' . $phpEx . $SID . '&amp;mode=searchuser&amp;field=ban\', \'_phpbbsearch\', \'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740\');return false;" />';
$sql = "SELECT b.*, u.user_id, u.username
FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
WHERE (b.ban_end >= " . time() . "
@@ -386,105 +397,65 @@ switch ($mode)
AND b.ban_userid <> 0
AND u.user_id <> " . ANONYMOUS . "
ORDER BY u.user_id ASC";
$result = $db->sql_query($sql);
$banned_options = '';
$banned_length = '';
$banned_options = '';
if ($row = $db->sql_fetchrow($result))
{
do
{
$banned_options .= '<option' . (($row['ban_exclude']) ? ' style="color:red"' : '') . ' value="' . $row['ban_id'] . '">' . $row['username'] . '</option>';
$banned_length .= (($banned_length != '') ? ', ' : '') . '\'' . ($ban_end_text[(($row['ban_end'] - $row['ban_start']) / 60)]) . '\'';
$banned_reasons .= (($banned_reasons != '') ? ', ' : '') . '\'' . addslashes($row['ban_reason']) . '\'';
}
while ($row = $db->sql_fetchrow($result));
}
$db->sql_freeresult($result);
$l_ban_title = $user->lang['Ban_users'];
$l_ban_explain = $user->lang['Ban_username_explain'];
$l_ban_exclude_explain = $user->lang['BAN_USER_EXCLUDE_EXPLAIN'];
$l_unban_title = $user->lang['Unban_username'];
$l_unban_explain = $user->lang['Unban_username_explain'];
$l_ban_cell = $user->lang['USERNAME'];
$l_no_ban_cell = $user->lang['No_banned_users'];
$s_submit_extra = '<input type="submit" name="usersubmit" value="' . $user->lang['Find_username'] . '" class="liteoption" onClick="window.open(\'../memberlist.' . $phpEx . $SID . '&amp;mode=searchuser&amp;field=ban\', \'_phpbbsearch\', \'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740\');return false;" />';
break;
case 'ip':
$field = 'ban_ip';
$l_ban_title = $user->lang['BAN_IPS'];
$l_ban_explain = $user->lang['BAN_IP_EXPLAIN'];
$l_ban_exclude_explain = $user->lang['BAN_IP_EXCLUDE_EXPLAIN'];
$l_unban_title = $user->lang['UNBAN_IP'];
$l_unban_explain = $user->lang['UNBAN_IP_EXPLAIN'];
$l_ban_cell = $user->lang['IP_HOSTNAME'];
$l_no_ban_cell = $user->lang['NO_BANNED_IP'];
$s_submit_extra = '';
$sql = "SELECT *
FROM " . BANLIST_TABLE . "
WHERE (ban_end >= " . time() . "
OR ban_end = 0)
AND ban_ip <> ''";
$result = $db->sql_query($sql);
$banned_reasons = '';
$banned_length = '';
$banned_options = '';
if ($row = $db->sql_fetchrow($result))
{
do
{
$banned_options .= '<option value="' . $row['ban_id'] . '">' . $row['ban_ip'] . '</option>';
$banned_length .= (($banned_length != '') ? ', ' : '') . '\'' . ($ban_end_text[(($row['ban_end'] - $row['ban_start']) / 60)]) . '\'';
$banned_reasons .= (($banned_reasons != '') ? ', ' : '') . '\'' . addslashes($row['ban_reason']) . '\'';
}
while ($row = $db->sql_fetchrow($result));
}
$db->sql_freeresult($result);
$l_ban_title = $user->lang['Ban_ips'];
$l_ban_explain = $user->lang['Ban_IP_explain'];
$l_ban_exclude_explain = $user->lang['BAN_IP_EXCLUDE_EXPLAIN'];
$l_unban_title = $user->lang['Unban_IP'];
$l_unban_explain = $user->lang['Unban_IP_explain'];
$l_ban_cell = $user->lang['IP_hostname'];
$l_no_ban_cell = $user->lang['No_banned_ip'];
$s_submit_extra = '';
break;
case 'email':
$field = 'ban_email';
$l_ban_title = $user->lang['BAN_EMAILS'];
$l_ban_explain = $user->lang['BAN_EMAIL_EXPLAIN'];
$l_ban_exclude_explain = $user->lang['BAN_EMAIL_EXCLUDE_EXPLAIN'];
$l_unban_title = $user->lang['UNBAN_EMAIL'];
$l_unban_explain = $user->lang['UNBAN_EMAIL_EXPLAIN'];
$l_ban_cell = $user->lang['EMAIL_ADDRESS'];
$l_no_ban_cell = $user->lang['NO_BANNED_EMAIL'];
$s_submit_extra = '';
$sql = "SELECT *
FROM " . BANLIST_TABLE . "
WHERE (ban_end >= " . time() . "
OR ban_end = 0)
AND ban_email <> ''";
$result = $db->sql_query($sql);
$banned_options = '';
$banned_length = '';
$banned_options = '';
if ($row = $db->sql_fetchrow($result))
{
do
{
$banned_options .= '<option value="' . $row['ban_id'] . '">' . $row['ban_email'] . '</option>';
$banned_length .= (($banned_length != '') ? ', ' : '') . '\'' . ($ban_end_text[(($row['ban_end'] - $row['ban_start']) / 60)]) . '\'';
$banned_reasons .= (($banned_reasons != '') ? ', ' : '') . '\'' . addslashes($row['ban_reason']) . '\'';
}
while ($row = $db->sql_fetchrow($result));
}
$db->sql_freeresult($result);
$l_ban_title = $user->lang['Ban_emails'];
$l_ban_explain = $user->lang['Ban_email_explain'];
$l_ban_exclude_explain = $user->lang['BAN_EMAIL_EXCLUDE_EXPLAIN'];
$l_unban_title = $user->lang['Unban_email'];
$l_unban_explain = $user->lang['Unban_email_explain'];
$l_ban_cell = $user->lang['EMAIL_ADDRESS'];
$l_no_ban_cell = $user->lang['No_banned_email'];
$s_submit_extra = '';
break;
}
$result = $db->sql_query($sql);
$banned_options = '';
$ban_length = $ban_reasons = array();
if ($row = $db->sql_fetchrow($result))
{
do
{
$banned_options .= '<option' . (($row['ban_exclude']) ? ' class="sep"' : '') . ' value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
$time_length = (!empty($row['ban_end'])) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0;
$ban_length[$row['ban_id']] = (!empty($ban_end_text[$time_length])) ? $ban_end_text[$time_length] : $user->lang['OTHER'] . ' -> ' . gmdate('Y-m-d', $row['ban_end']);
$ban_reasons[$row['ban_id']] = addslashes($row['ban_reason']);
}
while ($row = $db->sql_fetchrow($result));
}
$db->sql_freeresult($result);
?>
@@ -494,8 +465,38 @@ switch ($mode)
<script language="Javascript" type="text/javascript">
<!--
var ban_length = new Array(<?php echo $banned_length; ?>);
var ban_reasons = new Array(<?php echo $banned_reasons; ?>);
var ban_length = new Array();
<?php
if (sizeof($ban_length))
{
foreach ($ban_length as $ban_id => $length)
{
echo "ban_length['$ban_id'] = \"$length\";\n";
}
}
?>
var ban_reason = new Array();
<?php
if (sizeof($ban_reasons))
{
foreach ($ban_reasons as $ban_id => $reason)
{
echo "ban_reason['$ban_id'] = \"$reason\";\n";
}
}
?>
function display_details(option)
{
document.forms[0].unbanreason.value = ban_reason[option];
document.forms[0].unbanlength.value = ban_length[option];
}
//-->
</script>
@@ -508,7 +509,7 @@ switch ($mode)
<td class="row1"><textarea cols="40" rows="3" name="ban"></textarea></td>
</tr>
<tr>
<td class="row2" width="45%"><?php echo $user->lang['Ban_length']; ?>:</td>
<td class="row2" width="45%"><?php echo $user->lang['BAN_LENGTH']; ?>:</td>
<td class="row1"><select name="banlength"><?php echo $ban_end_options; ?></select>&nbsp; <input type="text" name="banlengthother" maxlength="10" size="10" /></td>
</tr>
<tr>
@@ -516,11 +517,11 @@ switch ($mode)
<td class="row1"><input type="radio" name="banexclude" value="1" /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="banexclude" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
</tr>
<tr>
<td class="row2" width="45%"><?php echo $user->lang['Ban_reason']; ?>:</td>
<td class="row2" width="45%"><?php echo $user->lang['BAN_REASON']; ?>:</td>
<td class="row1"><input type="text" name="banreason" maxlength="255" size="40" /></td>
</tr>
<tr>
<td class="cat" colspan="2" align="center"> <input type="submit" name="bansubmit" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" />&nbsp; <input type="reset" value="<?php echo $user->lang['Reset']; ?>" class="liteoption" />&nbsp; <?php echo $s_submit_extra; ?></td>
<td class="cat" colspan="2" align="center"> <input type="submit" name="bansubmit" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" />&nbsp; <input type="RESET" value="<?php echo $user->lang['RESET']; ?>" class="liteoption" />&nbsp; <?php echo $s_submit_extra; ?></td>
</tr>
</table>
@@ -532,15 +533,24 @@ switch ($mode)
<tr>
<th colspan="2"><?php echo $l_unban_title; ?></th>
</tr>
<tr>
<?php
if ($banned_options != '')
{
?>
<td class="row1" width="45%"><?php echo $l_ban_cell; ?>: <br /></td>
<td class="row1"> <select name="unban[]" multiple="multiple" size="5"><?php echo $banned_options; ?></select></td>
<tr>
<td class="row2" width="45%"><?php echo $l_ban_cell; ?>: <br /></td>
<td class="row1"> <select name="unban[]" multiple="multiple" size="5" onchange="display_details(this.options[this.selectedIndex].value)"><?php echo $banned_options; ?></select></td>
</tr>
<tr>
<td class="row2" width="45%"><?php echo $user->lang['BAN_REASON']; ?>:</td>
<td class="row1"><input type="text" name="unbanreason" size="40" /></td>
</tr>
<tr>
<td class="row2" width="45%"><?php echo $user->lang['BAN_LENGTH']; ?>:</td>
<td class="row1"><input type="text" name="unbanlength" size="40" /></td>
</tr>
<?php
}
@@ -548,13 +558,14 @@ switch ($mode)
{
?>
<tr>
<td class="row1" colspan="2" align="center"><?php echo $l_no_ban_cell; ?></td>
</tr>
<?php
}
?>
</tr>
<tr>
<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" /></td>
</tr>

14
phpBB/admin/admin_board.php
View File

@@ -22,13 +22,13 @@
if (!empty($setmodules))
{
$file = basename(__FILE__);
$module['General']['Cookie_settings'] = ($auth->acl_get('a_cookies')) ? "$file$SID&amp;mode=cookie" : '';
$module['General']['Board_defaults'] = ($auth->acl_get('a_defaults')) ? "$file$SID&amp;mode=default" : '';
$module['General']['Board_settings'] = ($auth->acl_get('a_board')) ? "$file$SID&amp;mode=setting" : '';
$module['General']['Avatar_settings'] = ($auth->acl_get('a_board')) ? "$file$SID&amp;mode=avatar" : '';
$module['General']['Email_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&amp;mode=email" : '';
$module['General']['Server_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&amp;mode=server" : '';
$module['General']['Auth_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&amp;mode=auth" : '';
$module['GENERAL']['Cookie_settings'] = ($auth->acl_get('a_cookies')) ? "$file$SID&amp;mode=cookie" : '';
$module['GENERAL']['Board_defaults'] = ($auth->acl_get('a_defaults')) ? "$file$SID&amp;mode=default" : '';
$module['GENERAL']['Board_settings'] = ($auth->acl_get('a_board')) ? "$file$SID&amp;mode=setting" : '';
$module['GENERAL']['Avatar_settings'] = ($auth->acl_get('a_board')) ? "$file$SID&amp;mode=avatar" : '';
$module['GENERAL']['Email_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&amp;mode=email" : '';
$module['GENERAL']['Server_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&amp;mode=server" : '';
$module['GENERAL']['Auth_settings'] = ($auth->acl_get('a_server')) ? "$file$SID&amp;mode=auth" : '';
return;
}

4
phpBB/admin/admin_database.php
View File

@@ -22,12 +22,12 @@
if (!empty($setmodules))
{
$filename = basename(__FILE__);
$module['DB']['DB_Backup'] = ($auth->acl_get('a_backup')) ? $filename . "$SID&amp;mode=backup" : '';
$module['DB']['DB_BACKUP'] = ($auth->acl_get('a_backup')) ? $filename . "$SID&amp;mode=backup" : '';
$file_uploads = @ini_get('file_uploads');
if (!empty($file_uploads) && $file_uploads !== 0 && strtolower($file_uploads) != 'off' && @phpversion() != '4.0.4pl1' && $auth->acl_get('a_restore'))
{
$module['DB']['DB_Restore'] = $filename . "$SID&amp;mode=restore";
$module['DB']['DB_RESTORE'] = $filename . "$SID&amp;mode=restore";
}
return;

4
phpBB/admin/admin_disallow.php
View File

@@ -21,14 +21,14 @@
define('IN_PHPBB', 1);
if(!empty($setmodules))
if (!empty($setmodules))
{
if (!$auth->acl_get('a_names'))
{
return;
}
$module['Users']['Disallow'] = basename(__FILE__) . $SID;
$module['USER']['DISALLOW'] = basename(__FILE__) . $SID;
return;
}

2
phpBB/admin/admin_email.php
View File

@@ -26,7 +26,7 @@ if (!empty($setmodules))
return;
}
$module['General']['Mass_Email'] = basename(__FILE__) . $SID;
$module['GENERAL']['MASS_EMAIL'] = basename(__FILE__) . $SID;
return;
}

2
phpBB/admin/admin_forums.php
View File

@@ -26,7 +26,7 @@ if (!empty($setmodules))
return;
}
$module['Forums']['Manage'] = basename(__FILE__) . $SID;
$module['FORUM']['MANAGE'] = basename(__FILE__) . $SID;
return;
}

5
phpBB/admin/admin_groups.php
View File

@@ -27,9 +27,8 @@ if( !empty($setmodules) )
}
$filename = basename(__FILE__);
$module['Groups']['Create'] = $filename . "$SID&amp;mode=create";
$module['Groups']['Delete'] = $filename . "$SID&amp;mode=delete";
$module['Groups']['Manage'] = $filename . "$SID&amp;mode=manage";
$module['GROUP']['CREATE'] = $filename . "$SID&amp;mode=create";
$module['GROUP']['MANAGE'] = $filename . "$SID&amp;mode=manage";
return;
}

29
phpBB/admin/admin_permissions.php
View File

@@ -22,12 +22,12 @@
if (!empty($setmodules))
{
$filename = basename(__FILE__);
$module['Forums']['PERMISSIONS'] = ($auth->acl_get('a_auth')) ? $filename . $SID . '&amp;mode=forums' : '';
$module['Forums']['MODERATORS'] = ($auth->acl_get('a_authmods')) ? $filename . $SID . '&amp;mode=moderators' : '';
$module['Forums']['SUPER_MODERATORS'] = ($auth->acl_get('a_authmods')) ? $filename . $SID . '&amp;mode=supermoderators' : '';
$module['General']['ADMINISTRATORS'] = ($auth->acl_get('a_authadmins')) ? $filename . $SID . '&amp;mode=administrators' : '';
$module['Users']['PERMISSIONS'] = ($auth->acl_get('a_authusers')) ? $filename . $SID . '&amp;mode=users' : '';
$module['Groups']['PERMISSIONS'] = ($auth->acl_get('a_authgroups')) ? $filename . $SID . '&amp;mode=groups' : '';
$module['FORUM']['PERMISSIONS'] = ($auth->acl_get('a_auth')) ? $filename . $SID . '&amp;mode=forums' : '';
$module['FORUM']['MODERATORS'] = ($auth->acl_get('a_authmods')) ? $filename . $SID . '&amp;mode=moderators' : '';
$module['FORUM']['SUPER_MODERATORS'] = ($auth->acl_get('a_authmods')) ? $filename . $SID . '&amp;mode=supermoderators' : '';
$module['GENERAL']['ADMINISTRATORS'] = ($auth->acl_get('a_authadmins')) ? $filename . $SID . '&amp;mode=administrators' : '';
$module['USER']['PERMISSIONS'] = ($auth->acl_get('a_authusers')) ? $filename . $SID . '&amp;mode=users' : '';
$module['GROUP']['PERMISSIONS'] = ($auth->acl_get('a_authgroups')) ? $filename . $SID . '&amp;mode=groups' : '';
return;
}
@@ -333,6 +333,9 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
if (!empty($entries))
{
// Founder only operations ... these operations can
// only be altered by someone with founder status
$founder_sql = (!$userdata['user_founder']) ? ' AND founder_only <> 1' : '';
@@ -362,6 +365,9 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
$where_sql .= (($where_sql != '') ? ', ' : '') . (($_POST['type'] == 'user' && !empty($_POST['new'])) ? '\'' . $value . '\'' : intval($value));
}
$ug = '';;
$ug_hidden = '';
$auth_values = array();
@@ -659,6 +665,10 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
}
}
if ($auth->acl_gets('a_events', 'a_cron'))
{
$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
@@ -692,6 +702,10 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
}
?>
<tr>
<td class="cat" colspan="4" align="center"><input class="mainoption" type="submit" name="update" value="<?php echo $user->lang['Update']; ?>" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="cancel" value="<?php echo $user->lang['CANCEL']; ?>" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /><input type="hidden" name="type" value="<?php echo $_POST['type']; ?>" /><?php echo $ug_hidden; ?></td>
@@ -738,6 +752,8 @@ if (!empty($forum_id) || !empty($group_id) || !empty($username) ||
?>
<p><?php echo $l_title_explain; ?></p>
@@ -904,6 +920,7 @@ switch ($mode)
break;
case 'groups':
// Generate list of groups
$sql = "SELECT group_id, group_name
FROM " . GROUPS_TABLE . "
ORDER BY group_type DESC";

2
phpBB/admin/admin_prune.php
View File

@@ -26,7 +26,7 @@ if (!empty($setmodules))
return;
}
$module['Forums']['Prune'] = basename(__FILE__) . $SID . '&amp;mode=forums';
$module['FORUM']['PRUNE'] = basename(__FILE__) . $SID . '&amp;mode=forums';
return;
}

8
phpBB/admin/admin_prune_users.php
View File

@@ -26,7 +26,7 @@ if (!empty($setmodules))
return;
}
$module['Users']['Prune_users'] = basename(__FILE__) . $SID;
$module['USER']['PRUNE_USERS'] = basename(__FILE__) . $SID;
return;
}
@@ -66,13 +66,13 @@ if (isset($_POST['prune']))
?>
<h1><?php echo $user->lang['Prune_users']; ?></h1>
<h1><?php echo $user->lang['PRUNE_USERS']; ?></h1>
<p><?php echo $user->lang['Prune_users_explain']; ?></p>
<p><?php echo $user->lang['PRUNE_USERS_EXPLAIN']; ?></p>
<?php
page_message($user->lang['Confirm'], $l_message, false);
page_message($user->lang['CONFIRM'], $l_message, false);
page_footer();
}

2
phpBB/admin/admin_ranks.php
View File

@@ -26,7 +26,7 @@ if (!empty($setmodules))
return;
}
$module['Users']['Ranks'] = basename(__FILE__) . $SID;
$module['USER']['RANKS'] = basename(__FILE__) . $SID;
return;
}

34
phpBB/admin/admin_search.php
View File

@@ -26,7 +26,7 @@ if (!empty($setmodules))
return;
}
$module['DB']['Search_indexing'] = basename(__FILE__) . $SID;
$module['DB']['SEARCH_INDEX'] = basename(__FILE__) . $SID;
return;
}
@@ -64,8 +64,7 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
if ($load > 3)
{
header("Location: admin_search.$phpEx$SID&batchstart=$batchstart&batchcount=$batch_count");
exit;
redirect("admin_search.$phpEx$SID&batchstart=$batchstart&batchcount=$batch_count");
}
}
}
@@ -99,22 +98,16 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
if (!isset($_GET['batchstart']))
{
//
// Take board offline
//
set_config('board_disable', 1);
//
// Empty existing tables
//
$db->sql_query("TRUNCATE " . SEARCH_TABLE);
$db->sql_query("TRUNCATE " . SEARCH_WORD_TABLE);
$db->sql_query("TRUNCATE " . SEARCH_MATCH_TABLE);
}
//
// Fetch a batch of posts_text entries
//
$sql = "SELECT COUNT(*) AS total, MAX(post_id) AS max_post_id, MIN(post_id) AS min_post_id
FROM " . POSTS_TEXT_TABLE;
$result = $db->sql_query($sql);
@@ -271,19 +264,18 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
if (($batchstart + $batchsize) < $max_post_id)
{
header("Location: admin_search.$phpEx$SID&batchstart=" . ($batchstart + $batchsize) . "&batchcount=$batch_count");
exit;
redirect("Location: admin_search.$phpEx$SID&batchstart=" . ($batchstart + $batchsize) . "&batchcount=$batch_count");
}
else
{
set_config('board_disable', 0);
page_header($user->lang['Search_indexing']);
page_header($user->lang['SEARCH_INDEX']);
?>
<h1><?php echo $user->lang['Search_indexing']; ?></h1>
<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
<p><?php echo $user->lang['Search_indexing_complete']; ?></p>
<p><?php echo $user->lang['SEARCH_INDEX_COMPLETE']; ?></p>
<?php
@@ -297,13 +289,13 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
else if (isset($_POST['cancel']))
{
set_config('board_disable', 0);
page_header($user->lang['Search_indexing']);
page_header($user->lang['SEARCH_INDEX']);
?>
<h1><?php echo $user->lang['Search_indexing']; ?></h1>
<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
<p><?php echo $user->lang['Search_indexing_cancel']; ?></p>
<p><?php echo $user->lang['SEARCH_INDEX_CANCEL']; ?></p>
<?php
@@ -312,17 +304,17 @@ else if (isset($_POST['cancel']))
}
else
{
page_header($user->lang['Search_indexing']);
page_header($user->lang['Search_index']);
?>
<h1><?php echo $user->lang['Search_indexing']; ?></h1>
<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
<p><?php echo $user->lang['Search_indexing_explain']; ?></p>
<p><?php echo $user->lang['SEARCH_INDEX_EXPLAIN']; ?></p>
<form method="post" action="<?php echo "admin_search.$phpEx$SID"; ?>"><table cellspacing="1" cellpadding="4" border="0" align="center" bgcolor="#98AAB1">
<tr>
<td class="cat" height="28" align="center">&nbsp;<input type="submit" name="start" value="<?php echo $user->lang['Start']; ?>" class="mainoption" /> &nbsp; <input type="submit" name="cancel" value="<?php echo $user->lang['Cancel']; ?>" class="mainoption" />&nbsp;</td>
<td class="cat" height="28" align="center">&nbsp;<input type="submit" name="start" value="<?php echo $user->lang['START']; ?>" class="mainoption" /> &nbsp; <input type="submit" name="cancel" value="<?php echo $user->lang['CANCEL']; ?>" class="mainoption" />&nbsp;</td>
</tr>
</table></form>

4
phpBB/admin/admin_smilies.php
View File

@@ -27,8 +27,8 @@ if (!empty($setmodules))
}
$filename = basename(__FILE__);
$module['Posts']['Emoticons'] = $filename . $SID . '&amp;type=emoticons';
$module['Posts']['Topic_icons'] = $filename . $SID . '&amp;type=icons';
$module['POST']['EMOTICONS'] = $filename . $SID . '&amp;type=emoticons';
$module['POST']['TOPIC_ICONS'] = $filename . $SID . '&amp;type=icons';
return;
}

8
phpBB/admin/admin_styles.php
View File

@@ -8,10 +8,10 @@ if ( !empty($setmodules) )
}
$filename = basename(__FILE__);
$module['Styles']['Edit_Style'] = $filename . "$SID&amp;mode=newstyle";
$module['Styles']['Edit_Template'] = $filename . "$SID&amp;mode=edittemplate";
$module['Styles']['Edit_Theme'] = $filename . "$SID&amp;mode=edittheme";
$module['Styles']['Edit_Imageset'] = $filename . "$SID&amp;mode=editimageset";
$module['STYLE']['EDIT_STYLE'] = $filename . "$SID&amp;mode=newstyle";
$module['STYLE']['EDIT_TEMPLATE'] = $filename . "$SID&amp;mode=edittemplate";
$module['STYLE']['EDIT_THEME'] = $filename . "$SID&amp;mode=edittheme";
$module['STYLE']['EDIT_IMAGESET'] = $filename . "$SID&amp;mode=editimageset";
return;
}

2
phpBB/admin/admin_users.php
View File

@@ -26,7 +26,7 @@ if (!empty($setmodules))
return;
}
$module['Users']['Manage'] = basename(__FILE__) . $SID;
$module['USER']['MANAGE'] = basename(__FILE__) . $SID;
return;
}

4
phpBB/admin/admin_viewlogs.php
View File

@@ -27,8 +27,8 @@ if (!empty($setmodules))
}
$filename = basename(__FILE__);
$module['Log']['Admin_logs'] = $filename . "$SID&amp;mode=admin";
$module['Log']['Mod_logs'] = $filename . "$SID&amp;mode=mod";
$module['LOG']['ADMIN_LOGS'] = $filename . "$SID&amp;mode=admin";
$module['LOG']['MOD_LOGS'] = $filename . "$SID&amp;mode=mod";
return;
}

2
phpBB/admin/admin_words.php
View File

@@ -26,7 +26,7 @@ if (!empty($setmodules))
return;
}
$module['Posts']['Word_Censor'] = basename(__FILE__) . $SID;
$module['POST']['WORD_CENSOR'] = basename(__FILE__) . $SID;
return;
}

8
phpBB/admin/index.php
View File

@@ -82,13 +82,13 @@ else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
<tr>
<td width="100%"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr>
<th class="menu" height="25">&#0187; <?php echo $user->lang['Return_to']; ?></th>
<th class="menu" height="25">&#0187; <?php echo $user->lang['RETURN_TO']; ?></th>
</tr>
<tr>
<td class="row1"><a class="genmed" href="index.<?php echo $phpEx . $SID; ?>&amp;pane=right" target="main"><?php echo $user->lang['Admin_Index']; ?></a></td>
<td class="row1"><a class="genmed" href="index.<?php echo $phpEx . $SID; ?>&amp;pane=right" target="main"><?php echo $user->lang['ADMIN_INDEX']; ?></a></td>
</tr>
<tr>
<td class="row2"><a class="genmed" href="../index.<?php echo $phpEx . $SID; ?>" target="_top"><?php echo $user->lang['Forum_index']; ?></a></td>
<td class="row2"><a class="genmed" href="../index.<?php echo $phpEx . $SID; ?>" target="_top"><?php echo $user->lang['FORUM_INDEX']; ?></a></td>
</tr>
<?php
@@ -97,7 +97,7 @@ else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
@ksort($module);
foreach ($module as $cat => $action_ary)
{
$cat = (empty($user->lang[$cat . '_cat'])) ? $user->lang[$cat . '_cat'] : preg_replace('/_/', ' ', $cat);
$cat = (!empty($user->lang[$cat . '_CAT'])) ? $user->lang[$cat . '_CAT'] : preg_replace('#_#', ' ', $cat);
?>
<tr>