Changeset 3052 for branches/2.2/phpgwapi/inc/class.common.inc.php

Timestamp:

07/14/10 17:19:29 (14 years ago)

Author:

amuller

Message:

Ticket #1044 - Aplica o compactador do css no branches 2.2

File:

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

branches/2.2/phpgwapi/inc/class.common.inc.php

@@ -1267 +1267 @@
                         if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) ) 
                         { 
-                                $css = "/%s/templates/%s/%s.css"; 
-
-                                global $path, $link, $template; 
-
-                                $path = PHPGW_SERVER_ROOT . str_replace( '/', SEP, $css ); 
-
-                                $link = '<LINK href="%s" type="text/css" rel="StyleSheet">'; 
-                                $link = sprintf( $link, 
-                                        "{$GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ]}{$css}" 
-                                ); 
-
-                                $template = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ]; 
-
-                                function _css( $module, $css ) 
-                                { 
-                                        global $link, $path, $template; 
-
-                                        if ( file_exists( sprintf( $path, $module, $template, str_replace( '/', SEP, $css ) ) ) ) 
-                                                return sprintf( $link, $module, $template, $css ); 
-
-                                        if ( file_exists( sprintf( $path, $module, 'default', str_replace( '/', SEP, $css ) ) ) ) 
-                                                return sprintf( $link, $module, 'default', $css ); 
-
-                                        return ''; 
-                                } 
-
-                                $css = _css( 'phpgwapi', 'css/base' ); 
-                                $css .= _css( 'phpgwapi', "css/{$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ]}" ); 
-                                $css .= _css( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ], "css/{$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ]}" ); 
-                                $css .= _css( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ], 'app' ); 
-
-                                if ( $css ) 
-                                        $tpl -> set_var( 'css_file', $css ); 
+                                $template = $GLOBALS['phpgw_info']['server']['template_set'];
+                                $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/base.css"); 
+                                $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 
+                                $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 
+                                $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css"); 
+
+                                $tpl -> set_var( 'css_file',  $GLOBALS['phpgw']->css->get_css() ); 
+
                         }