Changeset 2517

Timestamp:

04/14/10 10:58:33 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Viabilizando o não reload do ExpressoMail?.

Location:

trunk/expressoMail1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (1 diff)
• inc/load_lang.php (modified) (1 diff)
• index.php (modified) (6 diffs)
• js/DropDownContacts.js (deleted)
• js/InfoContact.js (deleted)
• js/InfoQuota.js (deleted)
• js/QuickCatalogSearch.js (deleted)
• js/QuickSearchUser.js (deleted)
• js/TreeS.js (deleted)
• js/TreeShow.js (deleted)
• js/abas.js (deleted)
• js/ccQuickAdd.js (deleted)
• js/color_palette.js (deleted)
• js/common_functions.js (deleted)
• js/doiMenuData.js (deleted)
• js/drag_area.js (deleted)
• js/draw_api.js (deleted)
• js/filter.js (deleted)
• js/filters.js (deleted)
• js/gears_init.js (deleted)
• js/globals.js (deleted)
• js/html2xhtml.js (deleted)
• js/jscode (added)
• js/jscode/DropDownContacts.js (added)
• js/jscode/InfoContact.js (added)
• js/jscode/InfoQuota.js (added)
• js/jscode/QuickCatalogSearch.js (added)
• js/jscode/QuickSearchUser.js (added)
• js/jscode/TreeS.js (added)
• js/jscode/TreeShow.js (added)
• js/jscode/abas.js (added)
• js/jscode/ccQuickAdd.js (added)
• js/jscode/color_palette.js (added)
• js/jscode/common_functions.js (added)
• js/jscode/doiMenuData.js (added)
• js/jscode/drag_area.js (added)
• js/jscode/draw_api.js (added)
• js/jscode/filter.js (added)
• js/jscode/filters.js (added)
• js/jscode/gears_init.js (added)
• js/jscode/globals.js (added)
• js/jscode/html2xhtml.js (added)
• js/jscode/local_messages.js (added)
• js/jscode/mail_sync.js (added)
• js/jscode/main.js (added)
• js/jscode/manifest (added)
• js/jscode/md5.js (added)
• js/jscode/messages_controller.js (added)
• js/jscode/offline_access.js (added)
• js/jscode/preferences.js (added)
• js/jscode/rich_text_editor.js (added)
• js/jscode/search.js (added)
• js/jscode/sharemailbox.js (added)
• js/jscode/shortcut.js (added)
• js/jscode/sniff_browser.js (added)
• js/jscode/wfolders.js (added)
• js/local_messages.js (deleted)
• js/mail_sync.js (deleted)
• js/main.js (deleted)
• js/md5.js (deleted)
• js/messages_controller.js (deleted)
• js/offline_access.js (deleted)
• js/preferences.js (deleted)
• js/rich_text_editor.js (deleted)
• js/search.js (deleted)
• js/sharemailbox.js (deleted)
• js/shortcut.js (deleted)
• js/sniff_browser.js (deleted)
• js/wfolders.js (deleted)

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -351 +351 @@
                                                 '<font color=blue>' .
                                                 '<span name="mail">' . $contacts_result['mail'] . '</span></a></font>'.
-                                                '<img src="templates/default/images/user_card.png" style="cursor: pointer;" title="'.$this->functions->getLang("Add Contact").'" onclick="javascript:connector.loadScript(\'ccQuickAdd\');ccQuickAddOne.showList(\''.$fn.','.$fn.','.$sn.','.$contacts_result["mail"].'\')">'.
+                                                '<img src="templates/default/images/user_card.png" style="cursor: pointer;" title="'.$this->functions->getLang("Add Contact").'" onclick="javascript:connector.loadScript(\'jscode/ccQuickAdd\');ccQuickAddOne.showList(\''.$fn.','.$fn.','.$sn.','.$contacts_result["mail"].'\')">'.
                                         '<br>' .
                                         $phoneUser .

trunk/expressoMail1_2/inc/load_lang.php

@@ -31 +31 @@
         foreach($_SESSION['phpgw_info']['expressomail']['lang'] as $key => $value)
                 $script .= "array_lang['".str_replace("'","\'",strtolower($key))."'] = '".str_replace("'","\'",$value)."';\n";
-        echo "<script type='text/javascript'>$script</script>";
+        echo "<script type='text/javascript'>var array_lang = new Array();$script</script>";
 ?>

trunk/expressoMail1_2/index.php

@@ -12 +12 @@
                 
         $GLOBALS['phpgw_info']['flags'] = array(
-                'noheader' => False,
-                'nonavbar' => False,
+                //'noheader' => False,
+                //'nonavbar' => False,
                 'currentapp' => 'expressoMail1_2',
                 'update_version'        => '1.235',
                 'enable_nextmatchs_class' => True
         );
-        
+
         require_once('../header.inc.php');
-        $update_version = $GLOBALS['phpgw_info']['flags']['update_version'];
+
+        include("inc/load_lang.php");
+
         $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];
-        echo '<link rel="stylesheet" type="text/css" href="templates/'.$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set'].'/main.css">';
-        echo '<link rel="stylesheet" type="text/css" href="../phpgwapi/js/dftree/dftree.css">';
-        echo "<script type='text/javascript'>var template = '".$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set']."';</script>";
-        echo "<script src='js/modal/modal.js'></script>";
-        echo "<script src='js/globals.js?".$update_version."' type='text/javascript'></script>";
-        echo "<script src='js/sniff_browser.js?".$update_version."' type='text/javascript'></script>";
-        echo "<style type='text/css'>@import url(../phpgwapi/js/jscalendar/calendar-win2k-1.css);</style>";
-        echo "<script src='../phpgwapi/js/jscalendar/calendar.js?".$update_version."' type='text/javascript'></script>";
-        echo "<script src='../phpgwapi/js/jscalendar/calendar-setup.js?".$update_version."' type='text/javascript'></script>";
-        echo "<script src='../phpgwapi/js/jscalendar/lang/calendar-br.js?".$update_version."' type='text/javascript'></script>";
-        echo '<script type="text/javascript" src="../phpgwapi/js/wz_dragdrop/wz_dragdrop.js?'.$update_version.'"></script>
-                <script type="text/javascript" src="../phpgwapi/js/dJSWin/dJSWin.js?'.$update_version.'"></script>';
-        
+
         //Enable/Disable VoIP Service -> Voip Server Config
         $voip_enabled = false;
@@ -87 +77 @@
     $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] : "0";
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['keep_after_auto_archiving'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_after_auto_archiving'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_after_auto_archiving'] : "0";
-
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_attachment_size'] = $current_config['expressoMail_Max_attachment_size'] ? $current_config['expressoMail_Max_attachment_size']."M" : ini_get('upload_max_filesize'); 
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] : "50";
+
         $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
         $template->set_var("txt_loading",lang("Loading"));
@@ -103 +93 @@
         $template->set_var("msg_number",$_GET['msgball']['msgnum'] ? $_GET['msgball']['msgnum'] : $_GET['to']);
         $template->set_var("user_email",$_SESSION['phpgw_info']['expressomail']['user']['email']);
+
         $acc = CreateObject('phpgwapi.accounts');
+
         $template->set_var("user_organization", $acc->get_organization($GLOBALS['phpgw_info']['user']['account_dn']));
         $template->set_var("cyrus_delimiter",$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter']); 
+
         // Fix problem with cyrus delimiter changes in preferences.
         // Dots in names: enabled/disabled.
@@ -116 +109 @@
         $template->set_block('expressoMail','list');
         $template->pfp('out','list');
+
         $GLOBALS['phpgw']->common->phpgw_footer();
-    
+
     $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_enable_log_messages'] = $current_config['expressoMail_enable_log_messages'];
-        
+
     // Begin Set Anti-Spam options.
     $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_ham'] = $current_config['expressoMail_command_for_ham'];
     $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_spam'] = $current_config['expressoMail_command_for_spam'];
     $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_use_spam_filter'] = $current_config['expressoMail_use_spam_filter'];   
-    echo '<script> var use_spam_filter = \''.$current_config['expressoMail_use_spam_filter'].'\' </script>';
+    echo '<script> var use_spam_filter = "' . $current_config['expressoMail_use_spam_filter'] . '"</script>';
         // End Set Anti-Spam options.
 
@@ -147 +141 @@
     }
 
-    echo '<script> var special_folders = new Array(4);
-        special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';
-    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"] = \'Drafts\';
-    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"] = \'Spam\';
-    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"] = \'Sent\';
-    var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'";
-    var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'";
-    var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";
-    var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";
-    var token_param = "'.$var_tokens.'";
-    var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";
-    </script>';
-
-    // End Set Imap Folder names options
-        //User info
-        echo "<script language='javascript'> var account_id = ".$GLOBALS['phpgw_info']['user']['account_id'].";var expresso_offline = false;</script>";
-
-        $obj = createobject("expressoMail1_2.functions");
-        // este arquivo deve ser carregado antes que
-        // os demais pois nele contem a função get_lang
-        // que é utilizada em diversas partes
-        echo $obj -> getFilesJs("js/common_functions.js");
-        include("inc/load_lang.php"); 
-
-        echo $GLOBALS['phpgw']->common->get_java_script();
-        // INCLUDE these JS Files: 
+        $GLOBALS['phpgw']->js->validate_file( 'dJSWin', 'dJSWin' );
+        $GLOBALS['phpgw']->js->validate_file( 'dftree', 'dftree' );
+
+        $GLOBALS['phpgw']->js->validate_file( 'modal', 'modal', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscalendar', 'calendar', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscalendar', 'calendar-setup', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscalendar', 'lang/calendar-br', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'globals', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'sniff_browser', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'common_functions', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'abas', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'doiMenuData', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'drag_area', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'draw_api', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'DropDownContacts', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'InfoContact', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'main', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'local_messages', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'messages_controller', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'rich_text_editor', 'expressoMail1_2' );
+        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'wfolders', 'expressoMail1_2' );
+
+        if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'])
+                $GLOBALS['phpgw']->js->validate_file( 'jscode', 'shortcut', 'expressoMail1_2' );
+
         if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'])
-                echo "<script src='js/gears_init.js'></script>";
-        echo $obj -> getFilesJs("js/abas.js," .
-                                                        "js/doiMenuData.js," .
-                                                        "js/drag_area.js," .
-                                                        "js/draw_api.js," .
-                                                        "js/DropDownContacts.js," .
-                                                        "js/InfoContact.js," .
-                                                        "js/main.js," .
-                                                        "js/local_messages.js," .
-                                                        "js/messages_controller.js," .
-                                                        "js/rich_text_editor.js," .
-//                                                      "js/mail_sync.js," .
-                                                        "js/wfolders.js,",
-                                                        $GLOBALS['phpgw_info']['flags']['update_version']);
-
-        if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'])
-        {
-                echo $obj -> getFilesJs("js/shortcut.js", $GLOBALS['phpgw_info']['flags']['update_version']);
-        }
+                $GLOBALS['phpgw']->js->validate_file( 'jscode', 'gears_init', 'expressoMail1_2' );
+
+
+        $expressoMail_url = $GLOBALS[ 'phpgw' ] -> link( '/expressoMail1_2' );
+        $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">';
+        $script .= '<style type="text/css">@import url(' . $phpgwapi_url . '/js/jscalendar/calendar-win2k-1.css);</style>';
+        $script .= '<script type="text/javascript">var template = "' . $GLOBALS['phpgw_info']['server']['template_set'] . '";';
+        $script .= 'var special_folders = new Array(4);';
+        $script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';';
+        $script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"] = \'Drafts\';';
+        $script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"] = \'Spam\';';
+        $script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"] = \'Sent\';';
+        $script .= 'var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'";';
+        $script .= 'var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'";';
+        $script .= 'var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";';
+        $script .= 'var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";';
+        $script .= 'var token_param = "'.$var_tokens.'";';
+        $script .= 'var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";';
+        $script .= 'var account_id = ' . $GLOBALS['phpgw_info']['user']['account_id'] . ';var expresso_offline = false;</script>';
+        $script .= '</script>';
+
+        $update_version = $GLOBALS['phpgw_info']['flags']['update_version'];
+
+        echo $script
+                . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( )
+                . '<script language="Javascript">expresso.connector.updateVersion = "'. $update_version . '";init();</script>';
 
         // Get Preferences or redirect to preferences page.
@@ -198 +201 @@
         //print_r($_SESSION['phpgw_info']['user']['preferences']['expressoMail']);
 ?>
-
-<html>
-<head>
-<title>ExpressoMail</title>
-</head>
-<body scroll="no" style="overflow:hidden">
-</body>
-</html>
-<script src="../phpgwapi/js/dftree/dftree.js?<?=$update_version?>" type="text/javascript"></script>
-<script language="Javascript">expresso.connector.updateVersion = "<?php echo $update_version ?>";init();</script>
 <!-----Expresso Mail - Version Updated:<?=$update_version?>-------->