aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-08-13 16:56:01 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-08-13 16:56:01 +0000
commitc0551af8517463858948c52a8c602a25b58ab9ce (patch)
tree72738e2782d34c9d029e683930098d8e046f8c44 /phpBB/adm
parente46f4cb50550bd00ad9dfd64090884c764877737 (diff)
downloadforums-c0551af8517463858948c52a8c602a25b58ab9ce.tar
forums-c0551af8517463858948c52a8c602a25b58ab9ce.tar.gz
forums-c0551af8517463858948c52a8c602a25b58ab9ce.tar.bz2
forums-c0551af8517463858948c52a8c602a25b58ab9ce.tar.xz
forums-c0551af8517463858948c52a8c602a25b58ab9ce.zip
bye bye forbidden extensions... we have a deny,allow rule for extensions, forbidden extensions are therefore a little bit redundant.
git-svn-id: file:///svn/phpbb/trunk@4400 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
-rw-r--r--phpBB/adm/admin_attachments.php23
1 files changed, 8 insertions, 15 deletions
diff --git a/phpBB/adm/admin_attachments.php b/phpBB/adm/admin_attachments.php
index 2def31433f..9719cd9b76 100644
--- a/phpBB/adm/admin_attachments.php
+++ b/phpBB/adm/admin_attachments.php
@@ -250,23 +250,16 @@ if ($submit && $mode == 'extensions')
{
if (!count($error))
{
- $extension_check = array(EXTENSIONS_TABLE => 'EXTENSION_EXIST', FORBIDDEN_EXTENSIONS_TABLE => 'CANNOT_ADD_FORBIDDEN_EXTENSION');
-
- foreach ($extension_check as $table => $error_msg)
- {
- $sql = "SELECT extension
- FROM $table";
- $result = $db->sql_query($sql);
+ $sql = 'SELECT extension_id
+ FROM ' . EXTENSIONS_TABLE . "
+ WHERE extension = '$add_extension'";
+ $result = $db->sql_query($sql);
- while ($row = $db->sql_fetchrow($result))
- {
- if ($row['extension'] == $add_extension)
- {
- $error[] = sprintf($user->lang[$error_msg], $add_extension);
- }
- }
- $db->sql_freeresult($result);
+ if ($row = $db->sql_fetchrow($result))
+ {
+ $error[] = sprintf($user->lang['EXTENSION_EXIST'], $add_extension);
}
+ $db->sql_freeresult($result);
if (!count($error))
{