diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-06 15:47:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-06 15:47:50 +0000 |
| commit | daeef71d813b68524e0630e2aadbf0870bb06800 (patch) | |
| tree | a2412ef750f51184f94e5e3c2cedf2cfcad732ba /phpBB/includes/acp/acp_icons.php | |
| parent | cb505ce4b08d3ec1de1184474a673886dfdb212b (diff) | |
| download | forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.gz forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.bz2 forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.xz forums-daeef71d813b68524e0630e2aadbf0870bb06800.zip | |
some updater changes as well as tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@6714 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_icons.php')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 4636b067c2..f5e09582e4 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -308,6 +308,29 @@ class acp_icons { $order = 0; + if (!($pak_ary = @file($phpbb_root_path . $img_path . '/' . $pak))) + { + trigger_error($user->lang['PAK_FILE_NOT_READABLE'] . adm_back_link($this->u_action), E_USER_WARNING); + } + + // Make sure the pak_ary is valid + foreach ($pak_ary as $pak_entry) + { + if (preg_match_all("#'(.*?)', #", $pak_entry, $data)) + { + if ((sizeof($data[1]) != 4 && $mode == 'icons') || + (sizeof($data[1]) != 6 && $mode == 'smilies')) + { + trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING); + } + } + else + { + trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING); + } + } + + // The user has already selected a smilies_pak file if ($current == 'delete') { @@ -343,11 +366,6 @@ class acp_icons $db->sql_freeresult($result); } - if (!($pak_ary = @file($phpbb_root_path . $img_path . '/' . $pak))) - { - trigger_error($user->lang['PAK_FILE_NOT_READABLE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - foreach ($pak_ary as $pak_entry) { $data = array(); |