Changeset 2648

Timestamp:

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

Author:

amuller

Message:

Ticket #1044 - Resolução do problema de caminho relativo e absoluto

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (1 diff)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)
• phpgwapi/inc/class.css.inc.php (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -173 +173 @@
 $phpgwapi_url = $GLOBALS[ 'phpgw' ] -> link( '/phpgwapi' );
 
-$GLOBALS['phpgw']->css->validate_file($expressoMail_url . '/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/main.css');
-$GLOBALS['phpgw']->css->validate_file($phpgwapi_url . '/js/dftree/dftree.css');
+$GLOBALS['phpgw']->css->validate_file('expressoMail1_2/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/main.css');
+$GLOBALS['phpgw']->css->validate_file('phpgwapi/js/dftree/dftree.css');
 $script .= $GLOBALS['phpgw']->css->get_css();
 $script .= '<style type="text/css">@import url(' . $phpgwapi_url . '/js/jscalendar/calendar-win2k-1.css);</style>';

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

@@ -1326 +1326 @@
                         // search for app specific css file
                         if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) )
-                        {               
+                        {
+                                $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");

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

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