Changeset 2645

Timestamp:

04/28/10 08:47:18 (14 years ago)

Author:

amuller

Message:

Ticket #1044 - Adicionando suporte no expressoMail

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/jscode/globals.js (modified) (1 diff)
• expressoMail1_2/js/jscode/main.js (modified) (4 diffs)
• expressoMail1_2/templates/default (modified) (1 prop)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)
• phpgwapi/inc/class.css.inc.php (modified) (3 diffs)
• phpgwapi/inc/functions.inc.php (modified) (1 diff)
• phpgwapi/js/dftree (modified) (1 prop)

trunk/expressoMail1_2/index.php

@@ -173 +173 @@
 $phpgwapi_url = $GLOBALS[ 'phpgw' ] -> link( '/phpgwapi' );
 
-$script = '<link rel="stylesheet" type="text/css" href="' . $expressoMail_url . '/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/main.css">';
-$script .= '<link rel="stylesheet" type="text/css" href="' . $phpgwapi_url . '/js/dftree/dftree.css">';
+$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');
+$script .= $GLOBALS['phpgw']->css->get_css();
 $script .= '<style type="text/css">@import url(' . $phpgwapi_url . '/js/jscalendar/calendar-win2k-1.css);</style>';
 $script .= '<script type="text/javascript">';

trunk/expressoMail1_2/js/jscode/globals.js

@@ -63 +63 @@
 var _connector = new XConnector( {
         "path" : URL_SERVER,
-        "controller" : "/controller.php?action="
+        "controller" : "controller.php?action="
 } );
 

trunk/expressoMail1_2/js/jscode/main.js

@@ -27 +27 @@
         {
                 preferences = expresso.connector.unserialize( data );
+                _connector.cache();
                 _connector.go( {
                         "access" : "expressoMail1_2.imap_functions.get_range_msgs2&folder=INBOX&msg_range_begin=1&msg_range_end="
@@ -76 +77 @@
         // Fim da inserção da applet
 
+                _connector.cache();
                 _connector.go( { //Save contacts needs preferences.
                         "access" : "expressoMail1_2.db_functions.get_dropdown_contacts",
@@ -81 +83 @@
                         "handler" : save_contacts
                 } );
+                _connector.cache();
                 _connector.go( {
                         "access" : "expressoMail1_2.imap_functions.get_folders_list&onload=true",
@@ -101 +104 @@
         if ( Element('divAppboxHeader') )
                 Element('divAppboxHeader').innerHTML = title_app;
-        
+        _connector.cache();
         _connector.go( {
                 "access" : "expressoMail1_2.functions.get_preferences",

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

@@ -1327 +1327 @@
                         if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) )
                         {               
-                                require_once('class.css.inc.php');
-                                $cssObj = new css();
+                                $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' ];
 
-                                $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");
+                                $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");
                                 
-                                $tpl -> set_var( 'css_file',  $cssObj->get_css() );
+                                $tpl -> set_var( 'css_file',  $GLOBALS['phpgw']->css->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)
@@ -52 +46 @@
                                           if (!file_exists(PHPGW_SERVER_ROOT.SEP.$cssFile."pack.css"))
                                                 $this->create_pack($cssFile);
-                                          $out .= "\n\t\t<link href='".$path.$cssFile."pack.css' type='text/css' rel='StyleSheet'>";
+                                          $out .= "\n\t\t<link href='".$cssFile."pack.css' type='text/css' rel='StyleSheet'>";
                                           
                                   }
                           else
                                   foreach($this->files as $cssFile)
-                                          $out .= "\n\t\t<link href='".$path.$cssFile."' type='text/css' rel='StyleSheet'>";
+                                          $out .= "\n\t\t<link href='".$cssFile."' type='text/css' rel='StyleSheet'>";
                           return $out;
                 }
@@ -63 +57 @@
                 function validate_file($file, $stack = false )
                 {
-                        if (file_exists(PHPGW_SERVER_ROOT . '/' . $file))
+                        if (file_exists(PHPGW_SERVER_ROOT . SEP . $file))
                                 $this->files[] = $file;
                 }

trunk/phpgwapi/inc/functions.inc.php

@@ -235 +235 @@
         $GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications');
         $GLOBALS['phpgw']->js           = CreateObject('phpgwapi.javascript');
+        $GLOBALS['phpgw']->css          = CreateObject('phpgwapi.css');
+
         print_debug('main class loaded', 'messageonly','api');
         if (! isset($GLOBALS['phpgw_info']['flags']['included_classes']['error']) ||

trunk/phpgwapi/js/dftree

@@ -1 @@
-*.jspack.js
+*pack.*s

@@ -1 @@
-*.jspack.js
+*pack.*s

@@ -1 @@
-*.jspack.js
+*pack.*s