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

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 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

@@ -1264 +1264 @@
                         $tpl->set_var('app_css', $app_css);
 
-                        // search for app specific css file
-                        if(@isset($GLOBALS['phpgw_info']['flags']['currentapp']))
-                        {
-                                $appname = $GLOBALS['phpgw_info']['flags']['currentapp'];
-
-                                if(file_exists(PHPGW_SERVER_ROOT . SEP . $appname . SEP
-                                        . 'templates' . SEP . $GLOBALS['phpgw_info']['server']['template_set']
-                                        . SEP . 'app.css')
-                                )
-                                {
-                                        $tpl->set_var('css_file', '<LINK href="'.$GLOBALS['phpgw_info']['server']['webserver_url']
-                                                . "/$appname/templates/".$GLOBALS['phpgw_info']['server']['template_set']
-                                                . "/app.css".'" type=text/css rel=StyleSheet>');
-                                }
-                                elseif(file_exists(PHPGW_SERVER_ROOT . SEP . $appname . SEP
-                                        . 'templates' . SEP . 'default'
-                                        . SEP . 'app.css')
-                                )
-                                {
-                                        $tpl->set_var('css_file', '<LINK href="'.$GLOBALS['phpgw_info']['server']['webserver_url']
-                                        ."/$appname/templates/default/app.css".'" type=text/css rel=StyleSheet>');
-                                }
-                        }
-
-                        return $tpl->subst('css');
+                        // search for app specific css filie
+                        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 ); 
+                        } 
+
+                        return $tpl -> subst('css'); 
+
                 }