Changeset 4644 for sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/index.php

Timestamp:

06/30/11 19:00:36 (13 years ago)

Author:

fernando-alberto

Message:

Ticket #1269 - Mergiando revisoes do brach22 de rev4447 ate rev4643

File:

• sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/index.php (modified) (4 diffs)

sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/index.php

@@ -24 +24 @@
         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>';
-
-
 
         
@@ -57 +55 @@
     $c->read_repository();
     $current_config = $c->config_data;    
+    
 
         $_SESSION['phpgw_info']['expressomail']['email_server'] = $boemailadmin->getProfile($emailadmin_profile[0]['profileID']);
@@ -138 +137 @@
     $_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'].'\'
-           var sieve_forward_domains = \''.$current_config['expressoMail_sieve_forward_domains'].'\' </script>';
-        // End Set Anti-Spam options.
+    
+    echo '<script> var use_spam_filter = "'.$current_config['expressoMail_use_spam_filter'].'"</script>'; 
+    echo '<script> var sieve_forward_domains = "'.$current_config['expressoMail_sieve_forward_domains'].'"</script>';
+    // End Set Anti-Spam options.
+    
+    // Begin Search Users characteres shared folders.
+    
+    if( isset($current_config['expressoMail_min_num_characters'] ) )
+        echo '<script> var sharedFolders_min_num_characters = "'.$current_config['expressoMail_min_num_characters'].'"</script>';
+    else
+        echo '<script> var sharedFolders_min_num_characters = "" </script>';
+    
+    if( isset($current_config['expressoMail_users_auto_search']) )
+        echo '<script> var sharedFolders_users_auto_search  = "'.$current_config['expressoMail_users_auto_search'].'" </script>';
+    else
+        echo '<script> var sharedFolders_users_auto_search  = "true" </script>';
+    
+    // End Search Users characteres shared folders.
+    
 
     // Set Imap Folder names options
@@ -195 +210 @@
                 echo "<script src='js/gears_init.js?".$update_version."'></script>";
         echo '<script src="../phpgwapi/js/dftree/dftree.js?'.$update_version.'"></script>';
+        echo '<script src="js/drag_area.js?'.$GLOBALS['phpgw_info']['apps']['expressoMail1_2']['version'].'"></script>';
         $scripts = "js/abas.js," .
                                 "js/main.js," .
-                                "js/drag_area.js," .
                                 "js/draw_api.js,";
         if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'])