diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-20 14:18:53 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-20 14:18:53 +0000 |
| commit | ab410e2c19283568c469cbf9efd2c690282305a0 (patch) | |
| tree | 7372640d19b803839cb4d906525e22c901b6f667 /phpBB | |
| parent | 60ce0c9bb3611bb4cd95ae660a5fde8dc4027b00 (diff) | |
| download | forums-ab410e2c19283568c469cbf9efd2c690282305a0.tar forums-ab410e2c19283568c469cbf9efd2c690282305a0.tar.gz forums-ab410e2c19283568c469cbf9efd2c690282305a0.tar.bz2 forums-ab410e2c19283568c469cbf9efd2c690282305a0.tar.xz forums-ab410e2c19283568c469cbf9efd2c690282305a0.zip | |
Updates for changes to filelist()
git-svn-id: file:///svn/phpbb/trunk@4289 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/admin_attachments.php | 9 | ||||
| -rw-r--r-- | phpBB/adm/admin_icons.php | 31 | ||||
| -rw-r--r-- | phpBB/adm/admin_ranks.php | 29 |
3 files changed, 39 insertions, 30 deletions
diff --git a/phpBB/adm/admin_attachments.php b/phpBB/adm/admin_attachments.php index 72980e58f6..2def31433f 100644 --- a/phpBB/adm/admin_attachments.php +++ b/phpBB/adm/admin_attachments.php @@ -660,10 +660,13 @@ if ($mode == 'ext_groups') $imglist = filelist($phpbb_root_path . $img_path, ''); $filename_list = ''; - foreach ($imglist as $img) + foreach ($imglist as $path => $img_ary) { - $img = substr($img['path'], 1) . (($img['path'] != '') ? '/' : '') . $img['file']; - $filename_list .= '<option value="' . htmlspecialchars($img) . '">' . $img . '</option>'; + foreach ($img_ary as $img) + { + $img = substr($path, 1) . (($path != '') ? '/' : '') . $img; + $filename_list .= '<option value="' . htmlspecialchars($img) . '">' . $img . '</option>'; + } } $size = isset($_REQUEST['size']) ? intval($_REQUEST['size']) : 0; diff --git a/phpBB/adm/admin_icons.php b/phpBB/adm/admin_icons.php index 49ba521563..f09173dd29 100644 --- a/phpBB/adm/admin_icons.php +++ b/phpBB/adm/admin_icons.php @@ -165,24 +165,27 @@ switch ($action) $imglist = filelist($phpbb_root_path . $img_path, ''); $filename_list = ''; - foreach ($imglist as $img) + foreach ($imglist as $path => $img_ary) { - $img = substr($img['path'], 1) . (($img['path'] != '') ? '/' : '') . $img['file']; - - if (!in_array($img, $existing_imgs) || $action == 'edit') + foreach ($img_ary as $img) { - if ((isset($data) && $img == $data[$fields . '_url']) || - (!isset($data) && !isset($edit_img))) - { - $selected = ' selected="selected"'; - $edit_img = $img; - } - else + $img = substr($path, 1) . (($path != '') ? '/' : '') . $img; + + if (!in_array($img, $existing_imgs) || $action == 'edit') { - $selected = ''; - } + if ((isset($data) && $img == $data[$fields . '_url']) || + (!isset($data) && !isset($edit_img))) + { + $selected = ' selected="selected"'; + $edit_img = $img; + } + else + { + $selected = ''; + } - $filename_list .= '<option value="' . $img . '"' . htmlspecialchars($img) . $selected . '>' . $img . '</option>'; + $filename_list .= '<option value="' . $img . '"' . htmlspecialchars($img) . $selected . '>' . $img . '</option>'; + } } } unset($existing_imgs); diff --git a/phpBB/adm/admin_ranks.php b/phpBB/adm/admin_ranks.php index 2064818aac..7869ec1600 100644 --- a/phpBB/adm/admin_ranks.php +++ b/phpBB/adm/admin_ranks.php @@ -94,23 +94,26 @@ switch ($mode) $imglist = filelist($phpbb_root_path . $config['ranks_path'], ''); $edit_img = $filename_list = ''; - foreach ($imglist as $img) + foreach ($imglist as $path => $img_ary) { - $img = substr($img['path'], 1) . (($img['path'] != '') ? '/' : '') . $img['file']; - - if (!in_array($img, $existing_imgs) || $mode == 'edit') + foreach ($img_ary as $img) { - if ($ranks && $img == $ranks['rank_image']) - { - $selected = ' selected="selected"'; - $edit_img = $img; - } - else + $img = substr($path, 1) . (($path != '') ? '/' : '') . $img; + + if (!in_array($img, $existing_imgs) || $mode == 'edit') { - $selected = ''; + if ($ranks && $img == $ranks['rank_image']) + { + $selected = ' selected="selected"'; + $edit_img = $img; + } + else + { + $selected = ''; + } + + $filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>'; } - - $filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>'; } } $filename_list = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>----------</option>' . $filename_list; |