Changeset 890

Timestamp:

05/21/09 15:40:31 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #475 - Corrigido caminho das figuras navbar.png.

File:

• trunk/phpgwapi/templates/default/head.inc.php (modified) (1 diff)

trunk/phpgwapi/templates/default/head.inc.php

@@ -72 +72 @@
         $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
 
+        $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
+        $webserver_url = ( !empty($webserver_url) ) ? $webserver_url : '/';
+        
+        if(strrpos($webserver_url,'/') === false || strrpos($webserver_url,'/') != (strlen($webserver_url)-1))
+                $webserver_url .= '/';
+        
+        if( is_null($_SESSION['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']]['user']))
+                $tmpDefault = "default";
+        else
+                $tmpDefault = $_SESSION['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']]['user']['preferences']['common']['template_set'];
+
         $var = Array(
-                'img_icon'      => '/'.$currentapp . '/templates/'.$_SESSION['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']]['user']['preferences']['common']['template_set'].'/images/navbar.png',
-                'img_shortcut'  => '/'.$currentapp . '/templates/'.$_SESSION['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']]['user']['preferences']['common']['template_set'].'/images/navbar.png',
+                'img_icon'      => $webserver_url . $currentapp . '/templates/'.$tmpDefault.'/images/navbar.png',
+                'img_shortcut'  => $webserver_url . $currentapp . '/templates/'.$tmpDefault.'/images/navbar.png',
                 'pngfix'        => $pngfix,
                 'slider_effects'=> $slider_effects,