Changeset 5134 for trunk/expressoMail1_2/index.php

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/index.php (modified) (5 diffs)

trunk/expressoMail1_2/index.php

@@ -20 +20 @@
                         <script src='../library/ckeditor/ckeditor.js' language='javascript'></script> 
                         <script src='../library/ckeditor/adapters/jquery.js' language='javascript'></script> 
-                        <script src='js/rich_text_editor.js' type='text/javascript'></script>"; 
+                <script src='js/rich_text_editor.js' type='text/javascript'></script>
+                <script src='js/base64.js' type='text/javascript'></script>";
                 //---------------------------// 
         echo '<link href="js/lert/lert.css" rel="stylesheet" type="text/css"/>';
@@ -26 +27 @@
         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 "<script src='js/QuickCatalogSearch.js' 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>";
@@ -33 +35 @@
                 <script type="text/javascript" src="../phpgwapi/js/dJSWin/dJSWin.js?'.$update_version.'"></script>';
 
+        echo '
+        <script type="text/javascript" src="../prototype/app/plugins/view/jquerymx-1.0.custom.min.js"></script>
+        <script type="text/javascript" src="../prototype/app/plugins/treeview/jquery.treeview.js"></script>
+        <script type="text/javascript" src="../prototype/app/plugins/block/jquery.blockUI.js"></script>
+
+        <link rel="stylesheet" href="../prototype/app/plugins/treeview/jquery.treeview.css" type="text/css" media="screen" />
+        <script src="../prototype/app/plugins/jqgrid/js/i18n/grid.locale-pt-br.js" type="text/javascript"></script>
+        <script src="../prototype/app/plugins/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript"></script>
+        <link rel="stylesheet" href="../prototype/app/plugins/jqgrid/css/ui.jqgrid.css" type="text/css" />      
+        <link rel="stylesheet" href="../prototype/app/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" />   
+
+        <script src="../prototype/app/plugins/countdown/jquery.countdown.min.js" type="text/javascript"></script>
+        <script src="../prototype/app/plugins/countdown/jquery.countdown-pt-BR.js" type="text/javascript"></script>     
+        ';
 
         /*
-         * TODO: implementar o controle como preferência do usuário
+         * TODO: implementar o controle como preferência do usuário 
          *
          */
         $jcarousel = false;
         if ($jcarousel) {
-                //jquery
-                echo "\n".'<script src="../library/jquery/jquery-1.6.1.min.js" type="text/javascript"></script>';
                 //jcarousel
+                echo "\n".'<link rel="stylesheet" type="text/css" href="../library/jcarousel/skins/default/skin.css" />';
                 echo "\n".'<script src="../library/jcarousel/lib/jquery.jcarousel.min.js" type="text/javascript"></script>';
-                echo "\n".'<link rel="stylesheet" type="text/css" href="../library/jcarousel/skins/default/skin.css" />';
+
                 //fancybox
+                echo "\n".'<link rel="stylesheet" type="text/css" href="../library/fancybox/jquery.fancybox-1.3.4.css" />';             
                 echo "\n".'<script src="../library/fancybox/jquery.fancybox-1.3.4.pack.js" type="text/javascript"></script>';
-                echo "\n".'<script src="../library/fancybox/jquery.easing-1.4.pack.js" type="text/javascript"></script>';
-                echo "\n".'<script src="../library/fancybox/jquery.mousewheel-3.0.4.pack.js" type="text/javascript"></script>'; 
-                echo "\n".'<link rel="stylesheet" type="text/css" href="../library/fancybox/jquery.fancybox-1.3.4.css" />';             
-        }
+        }
+
+        echo "<div id='overlay' style='background-color: #AAAAAAA; opacity: .50; filter:Alpha(Opacity=50); height: 100%; width: 100%; position: absolute; top: 0; left: 0; visibility: hidden; z-index: 30000000000000000000000'></div>";
 
         
@@ -83 +98 @@
     $current_config = $c->config_data;    
 
+        //Carrega Configuração global do expressoMail 
+        $_SESSION['phpgw_info']['expresso']['expressoMail'] =  $current_config; 
+    
         $_SESSION['phpgw_info']['expressomail']['email_server'] = $boemailadmin->getProfile($emailadmin_profile[0]['profileID']);
 //      $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];
@@ -114 +132 @@
         $_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_attachment_size'] = $current_config['expressoMail_Max_attachment_size'] ? $current_config['expressoMail_Max_attachment_size']."M" : '';
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_msg_size'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_msg_size'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_msg_size'] : "0";
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['imap_max_folders'] = $current_config['expressoMail_imap_max_folders'];