mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Updates for changes to filelist()
git-svn-id: file:///svn/phpbb/trunk@4289 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
60ce0c9bb3
commit
ab410e2c19
3 changed files with 41 additions and 32 deletions
|
@ -660,11 +660,14 @@ 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'];
|
||||
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;
|
||||
|
||||
|
|
|
@ -165,9 +165,11 @@ 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'];
|
||||
foreach ($img_ary as $img)
|
||||
{
|
||||
$img = substr($path, 1) . (($path != '') ? '/' : '') . $img;
|
||||
|
||||
if (!in_array($img, $existing_imgs) || $action == 'edit')
|
||||
{
|
||||
|
@ -185,6 +187,7 @@ switch ($action)
|
|||
$filename_list .= '<option value="' . $img . '"' . htmlspecialchars($img) . $selected . '>' . $img . '</option>';
|
||||
}
|
||||
}
|
||||
}
|
||||
unset($existing_imgs);
|
||||
unset($imglist);
|
||||
|
||||
|
|
|
@ -94,9 +94,11 @@ 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'];
|
||||
foreach ($img_ary as $img)
|
||||
{
|
||||
$img = substr($path, 1) . (($path != '') ? '/' : '') . $img;
|
||||
|
||||
if (!in_array($img, $existing_imgs) || $mode == 'edit')
|
||||
{
|
||||
|
@ -113,6 +115,7 @@ switch ($mode)
|
|||
$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>';
|
||||
}
|
||||
}
|
||||
}
|
||||
$filename_list = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>----------</option>' . $filename_list;
|
||||
unset($existing_imgs);
|
||||
unset($imglist);
|
||||
|
|
Loading…
Add table
Reference in a new issue