Changeset 2645 for trunk/phpgwapi/inc/class.common.inc.php

Timestamp:

04/28/10 08:47:18 (14 years ago)

Author:

amuller

Message:

Ticket #1044 - Adicionando suporte no expressoMail

File:

• trunk/phpgwapi/inc/class.common.inc.php (modified) (1 diff)

trunk/phpgwapi/inc/class.common.inc.php

@@ -1327 +1327 @@
                         if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) )
                         {               
-                                require_once('class.css.inc.php');
-                                $cssObj = new css();
+                                $path = ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] ) ) ? 
+                                        $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] : '/'; 
+
+                                if ( strpos( $path, '/' ) != ( strlen( $path ) - 1 ) ) 
+                                        $path .= '/'; 
 
                                 $template = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ];
 
-                                $cssObj->validate_file( "phpgwapi/templates/".$template."/css/base.css");
-                                $cssObj->validate_file( "phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");
-                                $cssObj->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");
-                                $cssObj->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css");
+                                $GLOBALS['phpgw']->css->validate_file( $path."phpgwapi/templates/".$template."/css/base.css");
+                                $GLOBALS['phpgw']->css->validate_file( $path."phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");
+                                $GLOBALS['phpgw']->css->validate_file( $path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");
+                                $GLOBALS['phpgw']->css->validate_file( $path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css");
                                 
-                                $tpl -> set_var( 'css_file',  $cssObj->get_css() );
+                                $tpl -> set_var( 'css_file',  $GLOBALS['phpgw']->css->get_css() );
                         }