aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-08-01 15:38:09 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-08-01 15:38:09 +0000
commit0cea5122b908d92740581b64f8fa85cb6a2e6adf (patch)
tree92fd01102da68def95c2bcb22bac4624ea00e09b /phpBB
parent0873f243cae32e0dc639fe6e3413dd2b7f820ee0 (diff)
downloadforums-0cea5122b908d92740581b64f8fa85cb6a2e6adf.tar
forums-0cea5122b908d92740581b64f8fa85cb6a2e6adf.tar.gz
forums-0cea5122b908d92740581b64f8fa85cb6a2e6adf.tar.bz2
forums-0cea5122b908d92740581b64f8fa85cb6a2e6adf.tar.xz
forums-0cea5122b908d92740581b64f8fa85cb6a2e6adf.zip
Log string re-arrangements
git-svn-id: file:///svn/phpbb/trunk@2802 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/admin/admin_ban.php2
-rw-r--r--phpBB/admin/admin_prune_users.php6
-rw-r--r--phpBB/admin/admin_viewlogs.php16
-rw-r--r--phpBB/admin/subSilver.css9
-rw-r--r--phpBB/language/lang_english/lang_admin.php104
5 files changed, 49 insertions, 88 deletions
diff --git a/phpBB/admin/admin_ban.php b/phpBB/admin/admin_ban.php
index 4accc8b811..7123d3db20 100644
--- a/phpBB/admin/admin_ban.php
+++ b/phpBB/admin/admin_ban.php
@@ -305,7 +305,7 @@ if ( isset($HTTP_POST_VARS['bansubmit']) )
//
// Update log
//
- add_admin_log('log_ban_' . $mode, $ban_list_log, $ban_reason);
+ add_admin_log('log_ban_' . $mode, $ban_reason, $ban_list_log);
}
$message = $lang['Ban_update_sucessful'] . '<br /><br />' . sprintf($lang['Click_return_banadmin'], '<a href="' . "admin_ban.$phpEx$SID&amp;mode=$mode" . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . "index.$phpEx$SID&amp;pane=right" . '">', '</a>');
diff --git a/phpBB/admin/admin_prune_users.php b/phpBB/admin/admin_prune_users.php
index 41435503f0..211288083b 100644
--- a/phpBB/admin/admin_prune_users.php
+++ b/phpBB/admin/admin_prune_users.php
@@ -157,7 +157,7 @@ if ( isset($HTTP_POST_VARS['prune']) )
{
if ( !empty($HTTP_POST_VARS['deleteposts']) )
{
- $l_admin_log = $lang['log_prune_user_del_del'];
+ $l_admin_log = 'log_prune_user_del_del';
//
// Call unified post deletion routine?
@@ -165,7 +165,7 @@ if ( isset($HTTP_POST_VARS['prune']) )
}
else
{
- $l_admin_log = $lang['log_prune_user_del_anon'];
+ $l_admin_log = 'log_prune_user_del_anon';
for($i = 0; $i < sizeof($user_ids); $i++)
{
@@ -180,7 +180,7 @@ if ( isset($HTTP_POST_VARS['prune']) )
}
else if ( !empty($HTTP_POST_VARS['deactivate']) )
{
- $l_admin_log = $lang['log_prune_user_deac'];
+ $l_admin_log = 'log_prune_user_deac';
$sql = "UPDATE " . USERS_TABLE . " SET user_active = 0";
}
diff --git a/phpBB/admin/admin_viewlogs.php b/phpBB/admin/admin_viewlogs.php
index 6e317d2d90..a5da66092c 100644
--- a/phpBB/admin/admin_viewlogs.php
+++ b/phpBB/admin/admin_viewlogs.php
@@ -145,11 +145,11 @@ $db->sql_freeresult($result);
$total_entries = $row['total_entries'];
$pagination = generate_pagination("admin_viewlogs.$phpEx$SID&amp;mode=$mode&amp;order=$sort_order", $total_entries, $board_config['topics_per_page'], $start). '&nbsp;';
-page_header($lang['General']);
+page_header($lang['Admin_logs']);
?>
-<h1><?php echo $lang['Admin_log']; ?></h1>
+<h1><?php echo $lang['Admin_logs']; ?></h1>
<p><?php echo $lang['Admin_log_explain']; ?></p>
@@ -172,15 +172,15 @@ if ( sizeof($log_data) )
{
for($i = 0; $i < sizeof($log_data); $i++)
{
- $cell_bg = ( $cell_bg == 'row1' ) ? 'row2' : 'row1';
+ $row_class = ( $row_class == 'row1' ) ? 'row2' : 'row1';
?>
<tr>
- <td class="<?php echo $cell_bg; ?>" nowrap="nowrap"><?php echo $log_data[$i]['username']; ?></td>
- <td class="<?php echo $cell_bg; ?>" align="center" nowrap="nowrap"><?php echo $log_data[$i]['ip']; ?></td>
- <td class="<?php echo $cell_bg; ?>" align="center" nowrap="nowrap"><?php echo create_date($board_config['default_dateformat'], $log_data[$i]['time'], $board_config['board_timezone']); ?></td>
- <td class="<?php echo $cell_bg; ?>"><?php echo $log_data[$i]['action']; ?></td>
- <td class="<?php echo $cell_bg; ?>" align="center" nowrap="nowrap"><input type="checkbox" name="mark[]" value="<?php echo $log_data[$i]['id']; ?>" /></td>
+ <td class="<?php echo $row_class; ?>" nowrap="nowrap"><?php echo $log_data[$i]['username']; ?></td>
+ <td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><?php echo $log_data[$i]['ip']; ?></td>
+ <td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><?php echo create_date($board_config['default_dateformat'], $log_data[$i]['time'], $board_config['board_timezone']); ?></td>
+ <td class="<?php echo $row_class; ?>"><?php echo $log_data[$i]['action']; ?></td>
+ <td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><input type="checkbox" name="mark[]" value="<?php echo $log_data[$i]['id']; ?>" /></td>
</tr>
<?php
diff --git a/phpBB/admin/subSilver.css b/phpBB/admin/subSilver.css
index 59818273af..1c4385d30a 100644
--- a/phpBB/admin/subSilver.css
+++ b/phpBB/admin/subSilver.css
@@ -82,17 +82,14 @@ a.copyright:hover {
/*
Non-tag specific
*/
-.gen, .genmed, .gensmall {
+.gen, .gensmall {
color: black;
}
.gen {
- font-size: 12px;
-}
-.genmed {
- font-size: 11px;
+ font-size: 8pt;
}
.gensmall {
- font-size: 10px;
+ font-size: 7pt;
}
.nav {
color: black;
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index 2530dc0559..4de278e5e6 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -62,7 +62,7 @@ $lang['DB_Backup'] = 'DB Backup';
$lang['DB_Restore'] = 'DB Restore';
$lang['Basic_Config'] = 'Basic Configuration';
$lang['Administrators'] = 'Administrators';
-$lang['View_admin_log'] = 'Admin log';
+$lang['Admin_logs'] = 'Admin Log';
$lang['Users'] = 'Users';
$lang['Groups'] = 'Groups';
@@ -70,48 +70,48 @@ $lang['Groups'] = 'Groups';
//
// Logging
//
-$lang['log_index_activate'] = 'Activated <b>%s</b> inactive users from admin index';
-$lang['log_index_delete'] = 'Deleted <b>%s</b> inactive users from admin index';
-$lang['log_index_remind'] = 'Sent reminder email to <b>%s</b> inactive users from admin index';
+$lang['log_index_activate'] = '<b>Activated inactive users</b> => %s users';
+$lang['log_index_delete'] = '<b>Deleted inactive users</b> => %s';
+$lang['log_index_remind'] = '<b>Sent reminder emails to inactive users</b> => %s users';
-$lang['log_mass_email'] = 'Sent mass email to <b>%s</b>';
-$lang['log_delete_word'] = 'Deleted word censor';
-$lang['log_edit_word'] = 'Edited word censor <b>%s</b>';
-$lang['log_add_word'] = 'Added word censor <b>%s</b>';
+$lang['log_mass_email'] = '<b>Sent mass email</b> => %s';
+$lang['log_delete_word'] = '<b>Deleted word censor</b>';
+$lang['log_edit_word'] = '<b>Edited word censor</b> => %s';
+$lang['log_add_word'] = '<b>Added word censor</b> => %s';
-$lang['log_template_edit'] = 'Edited template <b>%s</b> from template set <b>%s</b>';
-$lang['log_imageset_edit'] = 'Edited imageset <b>%s</b>';
-$lang['log_style_edit'] = 'Edited style <b>%s</b>';
-$lang['log_theme_edit'] = 'Edited theme <b>%s</b>';
+$lang['log_template_edit'] = '<b>Edited template</b> => %s / %s';
+$lang['log_imageset_edit'] = '<b>Edited imageset</b> => %s';
+$lang['log_style_edit'] = '<b>Edited style</b> => %s';
+$lang['log_theme_edit'] = '<b>Edited theme</b> => %s';
-$lang['log_db_backup'] = 'Database backup';
-$lang['log_db_restore'] = 'Database restore';
-$lang['log_search_index'] = 'Re-indexed search system [ <b>%s</b> ]';
+$lang['log_db_backup'] = '<b>Database backup</b>';
+$lang['log_db_restore'] = '<b>Database restore</b>';
+$lang['log_search_index'] = '<b>Re-indexed search system</b> => %s';
-$lang['log_disallow_add'] = 'Added disallowed username <b>%s</b>';
-$lang['log_disallow_delete'] = 'Deleted disallowed username';
+$lang['log_disallow_add'] = '<b>Added disallowed username</b> => %s';
+$lang['log_disallow_delete'] = '<b>Deleted disallowed username</b>';
-$lang['log_prune'] = 'Pruned forum <b>%s</b>';
+$lang['log_prune'] = '<b>Pruned forum</b> => %s';
-$lang['log_admin_clear'] = 'Cleared admin log';
+$lang['log_admin_clear'] = '<b>Cleared admin log</b>';
-$lang['log_ban'] = 'Banned : <b>%s</b> [ %s ]';
-$lang['log_ban_ip'] = 'Banned ip : <b>%s</b> [ %s ]';
-$lang['log_ban_email'] = 'Banned email : <b>%s</b> [ %s ]';
-$lang['log_unban_user'] = 'Unbanned username [ %s total ]';
-$lang['log_unban_ip'] = 'Unbanned ip [ %s total ]';
-$lang['log_unban_email'] = 'Unbanned email [ %s total ]';
+$lang['log_ban_user'] = '<b>Banned User</b> [ %s ] => %s ';
+$lang['log_ban_ip'] = '<b>Banned ip</b> [ %s ] => %s';
+$lang['log_ban_email'] = '<b>Banned email</b> [ %s ] => %s';
+$lang['log_unban_user'] = '<b>Unbanned username</b> => %s total';
+$lang['log_unban_ip'] = '<b>Unbanned ip</b> => %s total';
+$lang['log_unban_email'] = '<b>Unbanned email</b> => %s total';
-$lang['log_server_config'] = 'Altered server settings';
-$lang['log_default_config'] = 'Altered board defaults';
-$lang['log_setting_config'] = 'Altered board settings';
-$lang['log_cookie_config'] = 'Altered cookie settings';
-$lang['log_email_config'] = 'Altered email settings';
-$lang['log_avatar_config'] = 'Altered avatar settings';
+$lang['log_server_config'] = '<b>Altered server settings</b>';
+$lang['log_default_config'] = '<b>Altered board defaults</b>';
+$lang['log_setting_config'] = '<b>Altered board settings</b>';
+$lang['log_cookie_config'] = '<b>Altered cookie settings</b>';
+$lang['log_email_config'] = '<b>Altered email settings</b>';
+$lang['log_avatar_config'] = '<b>Altered avatar settings</b>';
-$lang['log_prune_user_deac'] = 'Users Deactivated => %s';
-$lang['log_prune_user_del_del'] = 'Users Pruned and Posts Deleted => %s';
-$lang['log_prune_user_del_anon'] = 'Users Pruned and Posts Retained => %s';
+$lang['log_prune_user_deac'] = '<b>Users Deactivated</b> => %s';
+$lang['log_prune_user_del_del'] = '<b>Users Pruned and Posts Deleted</b> => %s';
+$lang['log_prune_user_del_anon'] = '<b>Users Pruned and Posts Retained</b> => %s';
//
// View log
@@ -280,42 +280,6 @@ $lang['acl_forum_print'] = 'Print topics';
$lang['acl_forum_ignoreflood'] = 'Ignore flood limit';
$lang['acl_forum_ignorequeue'] = 'Ignore mod queue';
-
-$lang['Select_a_User'] = 'Select a User';
-$lang['Select_a_Group'] = 'Select a Group';
-$lang['Select_a_Forum'] = 'Select a Forum';
-$lang['Auth_Control_User'] = 'User Permissions Control';
-$lang['Auth_Control_Group'] = 'Group Permissions Control';
-$lang['Auth_Control_Forum'] = 'Forum Permissions Control';
-$lang['Look_up_User'] = 'Look up User';
-$lang['Look_up_Group'] = 'Look up Group';
-$lang['Look_up_Forum'] = 'Look up Forum';
-
-$lang['Group_auth_explain'] = 'Here you can alter the permissions and moderator status assigned to each user group. Do not forget when changing group permissions that individual user permissions may still allow the user entry to forums, etc. You will be warned if this is the case.';
-$lang['User_auth_explain'] = 'Here you can alter the permissions and moderator status assigned to each individual user. Do not forget when changing user permissions that group permissions may still allow the user entry to forums, etc. You will be warned if this is the case.';
-$lang['Forum_auth_explain'] = 'Here you can alter the authorisation levels of each forum. You will have both a simple and advanced method for doing this, advanced offers greater control of each forum operation. Remember that changing the permission level of forums will affect which users can carry out the various operations within them.';
-
-$lang['Simple_mode'] = 'Simple Mode';
-$lang['Advanced_mode'] = 'Advanced Mode';
-
-$lang['Conflict_warning'] = 'Authorisation Conflict Warning';
-$lang['Conflict_access_userauth'] = 'This user still has access rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having access rights. The groups granting rights (and the forums involved) are noted below.';
-$lang['Conflict_mod_userauth'] = 'This user still has moderator rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having moderator rights. The groups granting rights (and the forums involved) are noted below.';
-
-$lang['Conflict_access_groupauth'] = 'The following user (or users) still have access rights to this forum via their user permission settings. You may want to alter the user permissions to fully prevent them having access rights. The users granted rights (and the forums involved) are noted below.';
-$lang['Conflict_mod_groupauth'] = 'The following user (or users) still have moderator rights to this forum via their user permissions settings. You may want to alter the user permissions to fully prevent them having moderator rights. The users granted rights (and the forums involved) are noted below.';
-
-$lang['View'] = 'View';
-$lang['Read'] = 'Read';
-$lang['Post'] = 'Post';
-$lang['Reply'] = 'Reply';
-$lang['Edit'] = 'Edit';
-$lang['Delete'] = 'Delete';
-$lang['Sticky'] = 'Sticky';
-$lang['Announce'] = 'Announce';
-$lang['Vote'] = 'Vote';
-$lang['Pollcreate'] = 'Poll create';
-
$lang['Auth_updated'] = 'Permissions have been updated';
//