Changeset 2644

Timestamp:

04/27/10 18:28:15 (14 years ago)

Author:

rodsouza

Message:

Ticket #1044 - Corrigindo problema com caminho.

Location:

trunk/phpgwapi/inc

Files:

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

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

@@ -1330 +1330 @@
                                 $cssObj = new css();
 
-                                $path = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ];
                                 $template = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ];
 
-                                $cssObj->validate_file($path."phpgwapi/templates/".$template."/css/base.css");
-                                $cssObj->validate_file($path."phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");
-                                $cssObj->validate_file($path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");
-                                $cssObj->validate_file($path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css");
+                                $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");
                                 
                                 $tpl -> set_var( 'css_file',  $cssObj->get_css() );

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

@@ -41 +41 @@
                 function get_css()
                 {
+                        $path = ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] ) ) ?
+                                $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] : '/';
+
+                        if ( strpos( $path, '/' ) != ( strlen( $path ) - 1 ) )
+                                $path .= '/';
+
                         if ($GLOBALS['phpgw_info']['server']['csspacker'] == "True")
                                   foreach($this->files as $cssFile)
@@ -46 +52 @@
                                           if (!file_exists(PHPGW_SERVER_ROOT.SEP.$cssFile."pack.css"))
                                                 $this->create_pack($cssFile);
-                                          $out .= "\n\t\t<link href='".$cssFile."pack.css' type='text/css' rel='StyleSheet'>";
+                                          $out .= "\n\t\t<link href='".$path.$cssFile."pack.css' type='text/css' rel='StyleSheet'>";
                                           
                                   }
                           else
                                   foreach($this->files as $cssFile)
-                                          $out .= "\n\t\t<link href='".$cssFile."' type='text/css' rel='StyleSheet'>";
+                                          $out .= "\n\t\t<link href='".$path.$cssFile."' type='text/css' rel='StyleSheet'>";
                           return $out;
                 }
@@ -57 +63 @@
                 function validate_file($file, $stack = false )
                 {
-                        if (file_exists(PHPGW_SERVER_ROOT ."/". $file))
+                        if (file_exists(PHPGW_SERVER_ROOT . '/' . $file))
                                 $this->files[] = $file;
                 }