1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
#11259
#11291
#11335
#11457
#11473
#11475
#11511
#11523
#11527


git-svn-id: file:///svn/phpbb/trunk@7663 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2007-05-22 21:32:26 +00:00
parent 648399cff3
commit 3899e337e6
17 changed files with 56 additions and 30 deletions

View File

@@ -1355,19 +1355,17 @@ parse_css_file = {PARSE_CSS_FILE}
{
$dp2 = @opendir("$dir/$imgnamelang");
if (!$dp2)
if ($dp2)
{
continue;
}
while (($file2 = readdir($dp2)) !== false)
{
if (preg_match('#\.(?:gif|jpg|png)$#', $file2))
while (($file2 = readdir($dp2)) !== false)
{
$imagesetlist['lang'][] = "$imgnamelang/$file2";
if (preg_match('#\.(?:gif|jpg|png)$#', $file2))
{
$imagesetlist['lang'][] = "$imgnamelang/$file2";
}
}
closedir($dp2);
}
closedir($dp2);
}
closedir($dp);
}
@@ -1408,7 +1406,8 @@ parse_css_file = {PARSE_CSS_FILE}
sort($imagesetlist['lang']);
sort($imagesetlist['nolang']);
$imagesetlist_options = '';
$image_found = false;
$img_val = '';
foreach ($imagesetlist as $type => $img_ary)
{
if ($type !== 'lang' || $sql_extra)
@@ -1424,7 +1423,8 @@ parse_css_file = {PARSE_CSS_FILE}
$selected = (!empty($imgname) && strpos($image_filename, $imgtext) !== false);
if ($selected)
{
$template->assign_var('IMAGE_SELECT', true);
$image_found = true;
$img_val = htmlspecialchars($img);
}
$template->assign_block_vars('imagesetlist.images', array(
'SELECTED' => $selected,
@@ -1442,13 +1442,14 @@ parse_css_file = {PARSE_CSS_FILE}
'L_TITLE' => $user->lang[$this->page_title],
'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'],
'IMAGE_OPTIONS' => $img_options,
'IMAGELIST_OPTIONS' => $imagesetlist_options,
'IMAGE_SIZE' => $imgsize_bool,
'IMAGE_REQUEST' => $image_request,
'U_ACTION' => $this->u_action . "&action=edit&id=$imageset_id",
'U_BACK' => $this->u_action,
'NAME' => $imageset_name,
'ERROR' => !$valid_name
'ERROR' => !$valid_name,
'IMG_SRC' => ($image_found) ? '../styles/' . $imageset_path . '/imageset/' . $img_val : 'images/no_image.png',
'IMAGE_SELECT' => $image_found
));
}