aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin/admin_smilies.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-11-09 00:04:18 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-11-09 00:04:18 +0000
commit1405e47fc10bf75fb325e3e8e2978cc06ba1c261 (patch)
tree2c62e5b19b8bdf5522f1596ef68e59760a8820e6 /phpBB/admin/admin_smilies.php
parent1c5f838a2daa80916a7a894bf3cddd2e964cbd89 (diff)
downloadforums-1405e47fc10bf75fb325e3e8e2978cc06ba1c261.tar
forums-1405e47fc10bf75fb325e3e8e2978cc06ba1c261.tar.gz
forums-1405e47fc10bf75fb325e3e8e2978cc06ba1c261.tar.bz2
forums-1405e47fc10bf75fb325e3e8e2978cc06ba1c261.tar.xz
forums-1405e47fc10bf75fb325e3e8e2978cc06ba1c261.zip
Mainly updates for additional/altered admin permission options ... note, you MUST empty your current auth_options table and insert the list from the mysql_basic, you will also need to empty the auth_user/auth_group tables and re-assign permissions, and you should clear the $acl_options array in config_cache
git-svn-id: file:///svn/phpbb/trunk@3020 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin/admin_smilies.php')
-rw-r--r--phpBB/admin/admin_smilies.php34
1 files changed, 7 insertions, 27 deletions
diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index 0aa6d7a9c1..b3fdb8071b 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -19,9 +19,9 @@
*
***************************************************************************/
-if ( !empty($setmodules) )
+if (!empty($setmodules))
{
- if ( !$auth->acl_get('a_general') )
+ if (!$auth->acl_get('a_icons'))
{
return;
}
@@ -34,42 +34,22 @@ if ( !empty($setmodules) )
}
define('IN_PHPBB', 1);
-//
// Include files
-//
$phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
-//
// Do we have general permissions?
-//
-if (!$auth->acl_get('a_general'))
+if (!$auth->acl_get('a_icons'))
{
message_die(MESSAGE, $user->lang['No_admin']);
}
-//
// Check to see what mode we should operate in.
-//
-if (isset($_POST['type']) || isset($_GET['type']))
-{
- $type = (!empty($_POST['type'])) ? $_POST['type'] : $_GET['type'];
-}
-else
-{
- $type = '';
-}
-
-if (isset($_POST['mode']) || isset($_GET['mode']))
-{
- $mode = (!empty($_POST['mode'])) ? $_POST['mode'] : $_GET['mode'];
-}
-else
-{
- $mode = '';
-}
+$type = (!empty($_REQUEST['type'])) ? $_REQUEST['type'] : '';
+$mode = (!empty($_REQUEST['mode'])) ? $_REQUEST['mode'] : '';
+// What are we doing?
switch ($type)
{
case 'emoticons':
@@ -603,7 +583,7 @@ function update_smile_dimensions()
</tr>
<?php
}
- $row_class = ( $row_class != 'row1' ) ? 'row1' : 'row2';
+ $row_class = ($row_class != 'row1') ? 'row1' : 'row2';
?>
<tr>
<?php