Changeset 6754 for branches/2.4/expressoMail1_2/index.php

Timestamp:

07/11/12 11:45:10 (12 years ago)

Author:

niltonneto

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.1.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/index.php (modified) (8 diffs)

branches/2.4/expressoMail1_2/index.php

@@ -38 +38 @@
                 <script src="../prototype/plugins/farbtastic/farbtastic.js" language="javascript"></script>
                 <script src="../prototype/api/datalayer.js" language="javascript"></script>                                     
+                <script src="../prototype/api/rest.js" language="javascript"></script>                                  
                 <script type="text/javascript" src="../prototype/plugins/scrollto/jquery.scrollTo.js"></script>
-                <script language="javascript">DataLayer.dispatchPath = "../prototype/";</script>                                        
+                <script language="javascript">
+                        DataLayer.dispatchPath = "../prototype/";
+                        REST.dispatchPath = "../prototype/";
+                        REST.load("");
+                </script>                                       
                 <script src="../library/ckeditor/ckeditor.js" language="javascript" charset="utf-8"></script> 
                 <script src="../library/ckeditor/adapters/jquery.js" language="javascript"></script> 
@@ -56 +61 @@
                 <script type="text/javascript" src="../prototype/plugins/datejs/sugarpak.js"></script>
                 <script type="text/javascript" src="../prototype/plugins/datejs/parser.js"></script>
+                <script type="text/javascript" src="../prototype/plugins/jq-raty/js/jquery.raty.min.js"></script>
 
                 <script type="text/javascript" src="../prototype/plugins/watermark/jquery.watermarkinput.js"></script>
@@ -71 +77 @@
                 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.date.js"></script>
                 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.codecs.js"></script>
-                
+                <link rel="stylesheet" type="text/css" href="../prototype/plugins/freeow/style/freeow/freeow.css" >
+                <script type="text/javascript" src="../prototype/plugins/freeow/jquery.freeow.min.js"></script>
+                <script type="text/javascript" src="../prototype/plugins/freeow/jquery.freeow.js"></script>
+
 
                 <script src="js/rich_text_editor.js" type="text/javascript"></script>
@@ -194 +203 @@
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['telephone_number'] = $GLOBALS['phpgw_info']['user']['telephonenumber'];
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_cache'] = $current_config['expressoMail_enable_cache'];
+        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['expressoMail_ldap_identifier_recipient'] = $current_config['expressoMail_ldap_identifier_recipient'];
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_x_origin'] = $current_config['expressoMail_use_x_origin'];
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'] = $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0";
@@ -215 +225 @@
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] : "0";
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['return_recipient_deafault'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['return_recipient_deafault'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['return_recipient_deafault'] : "0";
-
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] : 1;
         //      ACL for block edit Personal Data.
@@ -274 +283 @@
     $_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'].'\'
-           var sieve_forward_domains = \''.$current_config['expressoMail_sieve_forward_domains'].'\' </script>';
+           var sieve_forward_domains = \''.$current_config['expressoMail_sieve_forward_domains'].'\' 
+                  </script>';
         // End Set Anti-Spam options.
 
@@ -352 +362 @@
                                 "js/main.js," .
                                 "js/draw_api.js,";
-
-        if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts']) 
-        { 
-                //echo $obj -> getFilesJs("js/shortcut.js", $update_version);  
-                $scripts .= "js/shortcut.js,"; 
-        } 
-
+        
+        if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'])
+        {
+                //echo $obj -> getFilesJs("js/shortcut.js", $update_version); 
+                $scripts .= "js/shortcut.js,";
+        }
+                                
         if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'])
                 $scripts .= "js/local_messages.js,";
@@ -364 +374 @@
                                 "js/DropDownContacts.js," .
                                 "js/doiMenuData.js," .
-                                "js/connector.js";
+                                "js/connector.js";              
         echo $obj -> getFilesJs($scripts, $update_version);
         echo '