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

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Sun May 28 07:55:26 2006
New Revision: 6626

Log:
fixes for AJAX check_mail

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

Modified: vtigercrm/trunk/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/ListView.php (original)
+++ vtigercrm/trunk/modules/Webmails/ListView.php Sun May 28 07:55:26 2006
@@ -43,7 +43,6 @@
 ?>
 <script language="JavaScript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/scriptaculous/scriptaculous.js?load=effects,builder"></script>
-<script language="JavaScript" type="text/javascript" src="modules/Webmails/webmails.js"></script>
 
 <script type="text/javascript">
 <?php if($degraded_service == 'true') { echo 'var degraded_service="true";';}else{echo 'var degraded_service="false";';};?>
@@ -60,6 +59,7 @@
 	}
 );
 </script>
+<script language="JavaScript" type="text/javascript" src="modules/Webmails/webmails.js"></script>
 <?
 
 global $mbox,$displayed_msgs;

Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (original)
+++ vtigercrm/trunk/modules/Webmails/WebmailsAjax.php Sun May 28 07:55:26 2006
@@ -22,17 +22,16 @@
 }
 
 $temprow = $adb->fetch_array($mailInfo);
+
 $imapServerAddress=$temprow["mail_servername"];
-$box_refresh=$temprow["box_refresh"];
-$mails_per_page=$temprow["mails_per_page"];
-$account_name=$temprow["account_name"];
-$show_hidden=$_REQUEST["show_hidden"];
+
+$mailbox = $_REQUEST["mailbox"];
 
 if($_REQUEST["command"] == "check_mbox") {
 	$mbox = getImapMbox($mailbox,$temprow);
 
 	$search = imap_search($mbox, "NEW ALL");
-	if($search === false) {echo "";flush();exit();}
+	if($search === false) {echo "failed";flush();exit();}
 
 	$data = imap_fetch_overview($mbox,implode(',',$search));
 	$num=sizeof($data);

Modified: vtigercrm/trunk/modules/Webmails/webmails.js
==============================================================================
--- vtigercrm/trunk/modules/Webmails/webmails.js (original)
+++ vtigercrm/trunk/modules/Webmails/webmails.js Sun May 28 07:55:26 2006
@@ -122,6 +122,7 @@
                         method: 'post',
                         postBody: 'module=Webmails&action=WebmailsAjax&mailbox='+mbox+'&command=check_mbox&ajax=true',
                         onComplete: function(t) {
+			//alert(t.responseText);
                             try {
                                 var data = eval('(' + t.responseText + ')');
 				var read  = parseInt($(mailbox+"_read").innerHTML);