From 2a777b536e2e2b8c38196c5c867518e24c7953c9 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Wed, 16 Jul 2003 12:08:59 +0000 Subject: [PATCH] mainoption/liteoption -> btnmain/btnlite git-svn-id: file:///svn/phpbb/trunk@4271 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/admin_attachments.php | 12 ++++++------ phpBB/adm/admin_ban.php | 6 +++--- phpBB/adm/admin_board.php | 2 +- phpBB/adm/admin_database.php | 4 ++-- phpBB/adm/admin_disallow.php | 21 +++++++++++---------- phpBB/adm/admin_email.php | 2 +- phpBB/adm/admin_forums.php | 8 ++++---- phpBB/adm/admin_groups.php | 23 ++++++++++++----------- phpBB/adm/admin_icons.php | 6 +++--- phpBB/adm/admin_permissions.php | 18 +++++++++--------- phpBB/adm/admin_prune.php | 4 ++-- phpBB/adm/admin_prune_users.php | 4 ++-- phpBB/adm/admin_ranks.php | 4 ++-- phpBB/adm/admin_search.php | 2 +- phpBB/adm/admin_users.php | 2 +- phpBB/adm/admin_viewlogs.php | 6 +++--- phpBB/adm/admin_words.php | 4 ++-- phpBB/adm/index.php | 8 ++++---- phpBB/adm/swatch.php | 2 +- 19 files changed, 70 insertions(+), 68 deletions(-) diff --git a/phpBB/adm/admin_attachments.php b/phpBB/adm/admin_attachments.php index bc0f5593d8..72980e58f6 100644 --- a/phpBB/adm/admin_attachments.php +++ b/phpBB/adm/admin_attachments.php @@ -568,7 +568,7 @@ if ($mode == 'manage') /> lang['YES']; ?>   /> lang['NO']; ?> -    +    x -      +      @@ -742,7 +742,7 @@ if ($mode == 'ext_groups') - +  lang['EXTENSION_GROUP']; ?>  @@ -832,7 +832,7 @@ if ($mode == 'ext_groups') } ?> -    +    - +  lang['COMMENT']; ?>  @@ -891,7 +891,7 @@ if ($mode == 'extensions') } ?> -    +    lang['UNBAN_USERNAME_EXPLAIN']; $l_ban_cell = $user->lang['USERNAME']; $l_no_ban_cell = $user->lang['NO_BANNED_USERS']; - $s_submit_extra = ''; + $s_submit_extra = ''; $sql = "SELECT b.*, u.user_id, u.username FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u @@ -563,7 +563,7 @@ function display_details(option) -     +     @@ -594,7 +594,7 @@ function display_details(option) -   +   -    +    diff --git a/phpBB/adm/admin_database.php b/phpBB/adm/admin_database.php index e2e999f36f..4647311760 100644 --- a/phpBB/adm/admin_database.php +++ b/phpBB/adm/admin_database.php @@ -142,7 +142,7 @@ switch($mode) ?> - + @@ -416,7 +416,7 @@ switch($mode) - + diff --git a/phpBB/adm/admin_disallow.php b/phpBB/adm/admin_disallow.php index f8f92a699e..7b8e9e6ca3 100644 --- a/phpBB/adm/admin_disallow.php +++ b/phpBB/adm/admin_disallow.php @@ -36,6 +36,7 @@ define('IN_PHPBB', 1); $phpbb_root_path = '../'; require($phpbb_root_path . 'extension.inc'); require('pagestart.' . $phpEx); +require($phpbb_root_path . 'includes/functions_user.'.$phpEx); // Check permissions if (!$auth->acl_get('a_names')) @@ -45,7 +46,7 @@ if (!$auth->acl_get('a_names')) if (isset($_POST['disallow'])) { - $disallowed_user = (isset($_REQUEST['disallowed_user'])) ? $_REQUEST['disallowed_user'] : ''; + $disallowed_user = (isset($_REQUEST['disallowed_user'])) ? htmlspecialchars($_REQUEST['disallowed_user']) : ''; $disallowed_user = str_replace('*', '%', $disallowed_user); if (validate_username($disallowed_user)) @@ -54,8 +55,8 @@ if (isset($_POST['disallow'])) } else { - $sql = "INSERT INTO " . DISALLOW_TABLE . " (disallow_username) - VALUES('" . str_replace("\'", "''", $disallowed_user) . "')"; + $sql = 'INSERT INTO ' . DISALLOW_TABLE . " (disallow_username) + VALUES('" . $db->sql_escape(stripslashes($disallowed_user)) . "')"; $result = $db->sql_query($sql); $message = $user->lang['Disallow_successful']; @@ -74,7 +75,7 @@ else if (isset($_POST['allow'])) trigger_error($user->lang['No_user_selected']); } - $sql = "DELETE FROM " . DISALLOW_TABLE . " + $sql = 'DELETE FROM ' . DISALLOW_TABLE . " WHERE disallow_id = $disallowed_id"; $db->sql_query($sql); @@ -84,8 +85,8 @@ else if (isset($_POST['allow'])) } // Grab the current list of disallowed usernames... -$sql = "SELECT * - FROM " . DISALLOW_TABLE; +$sql = 'SELECT * + FROM ' . DISALLOW_TABLE; $result = $db->sql_query($sql); $disallow_select = ''; @@ -113,10 +114,10 @@ adm_page_header($user->lang['DISALLOW']); lang['USERNAME']; ?>
lang['Add_disallow_explain']; ?> -   +   -    +    @@ -136,10 +137,10 @@ adm_page_header($user->lang['DISALLOW']); ?> lang['USERNAME']; ?> - + -    +    lang['MASS_EMAIL']); - + diff --git a/phpBB/adm/admin_forums.php b/phpBB/adm/admin_forums.php index 57b4d545ed..ba06d56830 100644 --- a/phpBB/adm/admin_forums.php +++ b/phpBB/adm/admin_forums.php @@ -531,7 +531,7 @@ switch ($mode) ?> -   +   @@ -775,7 +775,7 @@ switch ($mode) ?> - + sql_fetchrow($result)) ?> - +
- +
lang['SELECT_FORUM']; ?>: lang['SELECT_FORUM']; ?>:
  -   +   @@ -360,7 +361,7 @@ function swatch() lang['DISABLED']; ?>   lang['ENABLED']; ?>   lang['USER_DEFAULT']; ?> -   +   @@ -583,7 +584,7 @@ function swatch() ?> - + lang['ADD_USERS']; ?> @@ -592,7 +593,7 @@ function swatch() -   &mode=searchuser&form=mod&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> +   &mode=searchuser&form=mod&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> @@ -661,7 +662,7 @@ function swatch() ?> - + lang['ADD_USERS']; ?> @@ -670,7 +671,7 @@ function swatch() -   &mode=searchuser&form=pend&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> +   &mode=searchuser&form=pend&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> @@ -749,7 +750,7 @@ function swatch() ?> - + lang['ADD_USERS']; ?> @@ -758,7 +759,7 @@ function swatch()
lang['USER_GETS_GROUP_SET']; ?> lang['YES']; ?>   lang['NO']; ?> -   &mode=searchuser&form=list&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> +   &mode=searchuser&form=list&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> @@ -814,7 +815,7 @@ function swatch() ?> - + @@ -861,7 +862,7 @@ function swatch() ?> -   +   +?> lang['KEEP_ALL'] ?>    lang['REPLACE_MATCHES'] ?>    lang['DELETE_ALL'] ?>  - + - + diff --git a/phpBB/adm/admin_permissions.php b/phpBB/adm/admin_permissions.php index de5da65bef..92581923df 100644 --- a/phpBB/adm/admin_permissions.php +++ b/phpBB/adm/admin_permissions.php @@ -456,7 +456,7 @@ if (in_array($mode, array('user', 'group', 'forum', 'mod')) && empty($submit)) ?>  -   +      -     &mode=searchuser&form=2&field=entries', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> +     &mode=searchuser&form=2&field=entries', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" />   -   +   -   +   @@ -598,7 +598,7 @@ if ((in_array($submit, array('usergroups', 'delete', 'cancel'))) || (!strstr($su ?> -   +   @@ -613,7 +613,7 @@ if ((in_array($submit, array('usergroups', 'delete', 'cancel'))) || (!strstr($su -     &mode=searchuser&form=2&field=entries', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> +     &mode=searchuser&form=2&field=entries', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> @@ -639,7 +639,7 @@ if ((in_array($submit, array('usergroups', 'delete', 'cancel'))) || (!strstr($su ?> -   +   @@ -1262,7 +1262,7 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset ?> -   " align="center">   -   +   diff --git a/phpBB/adm/admin_prune.php b/phpBB/adm/admin_prune.php index dc8c27b580..0c19d6a7d9 100644 --- a/phpBB/adm/admin_prune.php +++ b/phpBB/adm/admin_prune.php @@ -163,7 +163,7 @@ if (!$forum_id) -   +   @@ -220,7 +220,7 @@ else lang['YES']; ?>   lang['NO']; ?> - + diff --git a/phpBB/adm/admin_prune_users.php b/phpBB/adm/admin_prune_users.php index d7b6bc3235..1681738aca 100644 --- a/phpBB/adm/admin_prune_users.php +++ b/phpBB/adm/admin_prune_users.php @@ -53,7 +53,7 @@ if (isset($_POST['prune'])) { $values = array('prune', 'deactivate', 'delete', 'users', 'username', 'email', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'deleteposts'); - $l_message = '
' . $user->lang['Confirm_prune_users'] . '

  '; + $l_message = '' . $user->lang['Confirm_prune_users'] . '

  '; foreach ($values as $field) { @@ -249,7 +249,7 @@ adm_page_header($user->lang['Prune_users']); lang['Yes']; ?>    lang['No']; ?> -     ', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=650');return false;" /> +     ', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=650');return false;" />
diff --git a/phpBB/adm/admin_ranks.php b/phpBB/adm/admin_ranks.php index 7899e3bd27..2064818aac 100644 --- a/phpBB/adm/admin_ranks.php +++ b/phpBB/adm/admin_ranks.php @@ -175,7 +175,7 @@ function update_image_dimensions() -    +    @@ -316,7 +316,7 @@ function update_image_dimensions() ?> - + diff --git a/phpBB/adm/admin_search.php b/phpBB/adm/admin_search.php index 32cabc8dcd..0d565c3517 100644 --- a/phpBB/adm/admin_search.php +++ b/phpBB/adm/admin_search.php @@ -319,7 +319,7 @@ else
"> - +
          
diff --git a/phpBB/adm/admin_users.php b/phpBB/adm/admin_users.php index c1ae355ae2..3cf40c5d1a 100644 --- a/phpBB/adm/admin_users.php +++ b/phpBB/adm/admin_users.php @@ -303,7 +303,7 @@ adm_page_header($user->lang['Manage']); lang['Select_a_User']; ?> - ', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> + ', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> diff --git a/phpBB/adm/admin_viewlogs.php b/phpBB/adm/admin_viewlogs.php index 5e8abd5239..97adfb852d 100644 --- a/phpBB/adm/admin_viewlogs.php +++ b/phpBB/adm/admin_viewlogs.php @@ -120,7 +120,7 @@ if ($mode == 'mod') ?> - +
lang['SELECT_FORUM']; ?>: lang['SELECT_FORUM']; ?>:
- lang['DISPLAY_LOG']; ?>:   lang['SORT_BY']; ?>:   + lang['DISPLAY_LOG']; ?>:   lang['SORT_BY']; ?>:   lang['USERNAME']; ?> @@ -172,7 +172,7 @@ if ($log_count) ?> -     +     - + @@ -216,7 +216,7 @@ else ?> - + diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 4067008b74..a3ae78db85 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -479,7 +479,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right') lang['ON'] : $user->lang['OFF']; ?> -      +      @@ -557,16 +557,16 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right') ?> -           +?>  ']..value=color; + opener.document.forms['']..value = '#' + color; } //-->