[Vtigercrm-commits] [vtiger-commits] r6571 - in /vtigercrm/trunk/modules/Webmails: MailParse.php WebmailsAjax.php webmails.js

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Sat May 27 20:51:33 2006
New Revision: 6571

Log:
misc cleanups

Modified:
    vtigercrm/trunk/modules/Webmails/MailParse.php
    vtigercrm/trunk/modules/Webmails/WebmailsAjax.php
    vtigercrm/trunk/modules/Webmails/webmails.js

Modified: vtigercrm/trunk/modules/Webmails/MailParse.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/MailParse.php (original)
+++ vtigercrm/trunk/modules/Webmails/MailParse.php Sat May 27 20:51:33 2006
@@ -17,21 +17,17 @@
 	return $out;
 }
 function isBase64($iVal){
-	//$_tmp=preg_replace("/[^A-Z0-9\+\/\=]/i","",$iVal);
-	return (strlen($iVal) % 4 == 0 ) ? "y" : "n";
+	$_tmp=preg_replace("/[^A-Z0-9\+\/\=]/i","",$iVal);
+	return (strlen($_tmp) % 4 == 0 ) ? "y" : "n";
 }
 function getImapMbox($mailbox,$temprow) {
 	 global $mbox; 
 	 $login_username= $temprow["mail_username"]; 
 	 $secretkey=$temprow["mail_password"]; 
 	 $imapServerAddress=$temprow["mail_servername"]; 
-	 $box_refresh=$temprow["box_refresh"]; 
-	 $mails_per_page=$temprow["mails_per_page"]; 
 	 $mail_protocol=$temprow["mail_protocol"]; 
 	 $ssltype=$temprow["ssltype"]; 
 	 $sslmeth=$temprow["sslmeth"]; 
-	 $account_name=$temprow["account_name"]; 
-	 $show_hidden=$_REQUEST["show_hidden"]; 
 	 	 
 	 	 
 	 // first we will try a regular old IMAP connection: 

Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (original)
+++ vtigercrm/trunk/modules/Webmails/WebmailsAjax.php Sat May 27 20:51:33 2006
@@ -58,7 +58,7 @@
 			$ret .= '"date":"'.substr($data[$i]->date,0,30).'",';
 			$ret .= '"from":"'.substr($data[$i]->from,0,20).'",';
 			$ret .= '"to":"'.$data[$i]->to.'",';
-			if(getAttachmentDetails($data[$i]->msgno,$mbox) || getInlineAttachments($data[$i]->msgno,$mbox))
+			if(getAttachments($data[$i]->msgno,$mbox))
 				$ret .= '"attachments":"1"}';
 			else
 				$ret .= '"attachments":"0"}';

Modified: vtigercrm/trunk/modules/Webmails/webmails.js
==============================================================================
--- vtigercrm/trunk/modules/Webmails/webmails.js (original)
+++ vtigercrm/trunk/modules/Webmails/webmails.js Sat May 27 20:51:33 2006
@@ -207,6 +207,7 @@
         timer = window.setTimeout("periodic_event()",box_refresh);
 }
 function show_hidden() {
+        $("status").style.display="block";
         var els = document.getElementsByClassName("deletedRow");
         for(var i=0;i<els.length;i++) {
                 if(els[i].style.display == "none")
@@ -214,8 +215,10 @@
                 else
                         new Effect.Fade(els[i],{queue: {position: 'end', scope: 'command'}, duration: 0.3});
         }
+        $("status").style.display="none";
 }
 function move_messages() {
+        $("status").style.display="block";
         var els = document.getElementsByTagName("INPUT");
         var cnt = (els.length-1);
         for(var i=cnt;i>0;i--) {
@@ -237,6 +240,7 @@
                 }
         }
         runEmailCommand('expunge','');
+        $("status").style.display="none";
 }
 function search_emails() {
         var search_query = $("search_input").value;