Changeset 2646 for trunk/phpgwapi

Timestamp:

04/28/10 11:35:47 (14 years ago)

Author:

amuller

Message:

Ticket #1044 - Arruma caminhos relativos e absolutos

Location:

trunk/phpgwapi/inc

Files:

• class.common.inc.php (modified) (1 diff)
• class.css.inc.php (modified) (1 diff)

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

@@ -1327 +1327 @@
                         if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) )
                         {               
-                                $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' ];
-
-                                $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");
+                                $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() );

trunk/phpgwapi/inc/class.css.inc.php

@@ -57 +57 @@
                 function validate_file($file, $stack = false )
                 {
-                        if (file_exists(PHPGW_SERVER_ROOT . SEP . $file))
+                        $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' ];
+
+                        if (file_exists(PHPGW_SERVER_ROOT . SEP . $path . $file))
                                 $this->files[] = $file;
                 }