mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-05 04:49:44 +01:00
fixed not shown images, if eGW is installed in the document root, with webserver_url empty
This commit is contained in:
parent
478c9ab8e2
commit
208a375928
@ -876,11 +876,17 @@ class html
|
|||||||
{
|
{
|
||||||
$url = $name; // name may already contain absolut path
|
$url = $name; // name may already contain absolut path
|
||||||
}
|
}
|
||||||
if(!$GLOBALS['egw_info']['server']['webserver_url'])
|
if($GLOBALS['egw_info']['server']['webserver_url'])
|
||||||
{
|
{
|
||||||
$base_path = "./";
|
list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'],$url);
|
||||||
|
$path = EGW_SERVER_ROOT.$path;
|
||||||
}
|
}
|
||||||
if (!@is_readable($base_path . str_replace($GLOBALS['egw_info']['server']['webserver_url'],PHPGW_SERVER_ROOT,$url)))
|
else
|
||||||
|
{
|
||||||
|
$path = EGW_SERVER_ROOT.$url;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!@is_readable($path))
|
||||||
{
|
{
|
||||||
// if the image-name is a percentage, use a progressbar
|
// if the image-name is a percentage, use a progressbar
|
||||||
if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))
|
if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))
|
||||||
|
Loading…
Reference in New Issue
Block a user