holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

priority between gif and png first search in chosen template dir

Browse Source
This commit is contained in:
alpeb 2004-02-13 15:09:22 +00:00
parent faeb3a6a2f
commit 894ed06c06
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpgwapi/inc/class.common.inc.php
View File

@ -888,11 +888,12 @@
function find_image($appname,$image) function find_image($appname,$image)
{ {
$imagedir = '/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images';
if (!@is_array($this->found_files[$appname])) if (!@is_array($this->found_files[$appname]))
{ {
$imagedir_olddefault = '/'.$appname.'/images'; $imagedir_olddefault = '/'.$appname.'/images';
$imagedir_default = '/'.$appname.'/templates/default/images'; $imagedir_default = '/'.$appname.'/templates/default/images';
$imagedir = '/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images';
if (@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault)) if (@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault))
{ {
@ -945,7 +946,21 @@
$img_type=array('.png','.jpg','.gif'); $img_type=array('.png','.jpg','.gif');
} }
if(isset($this->found_files[$appname][$image.$img_type[0]])) // first look in the selected template dir
if(@$this->found_files[$appname][$image.$img_type[0]]==$imagedir)
{
$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0];
}
elseif(@$this->found_files[$appname][$image.$img_type[1]]==$imagedir)
{
$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[1]].'/'.$image.$img_type[1];
}
elseif(@$this->found_files[$appname][$image.$img_type[2]]==$imagedir)
{
$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[2]].'/'.$image.$img_type[2];
}
// then look everywhere else
elseif(isset($this->found_files[$appname][$image.$img_type[0]]))
{ {
$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0]; $imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0];
} }