[Vtigercrm-commits] [vtiger-commits] r6433 - in /vtigercrm/trunk/modules/Webmails: Save.php body.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Thu May 25 11:42:05 2006
New Revision: 6433

Log:
more ssl fixes

Modified:
    vtigercrm/trunk/modules/Webmails/Save.php
    vtigercrm/trunk/modules/Webmails/body.php

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Thu May 25 11:42:05 2006
@@ -43,7 +43,8 @@
 global $mbox;
 if($ssltype == "") {$ssltype = "notls";}
 if($sslmeth == "") {$sslmeth = "novalidate-cert";}
-$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey);
+if(!preg_match("/windows/i",php_uname()))
+	$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey);
 
 if(!$mbox)
         $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/}".$mailbox, $login_username, $secretkey) or die("Connection to server failed ".imap_last_error());
@@ -144,12 +145,12 @@
 
 
 if(isset($_REQUEST["send_mail"]) && $_REQUEST["send_mail"] == "true") {
-	require_once("sendmail.php");
 	global $adb;
 	$sql = "select email1, first_name,last_name from users where id='".$current_user->id."'";
 	$res = $adb->query($sql);
 	$emailaddr = $adb->query_result($res,0,'email1');
 	$who = $adb->query_result($res,0,'first_name')." ".$adb->query_result($res,0,'last_name');
+	require_once("sendmail.php");
 	sendmail($to_address,$cc_address,$bcc_address,$emailaddr,$who,$subject,$msgData);
 	header("Location: index.php?action=$return_action&module=$return_module");
 } else {

Modified: vtigercrm/trunk/modules/Webmails/body.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/body.php (original)
+++ vtigercrm/trunk/modules/Webmails/body.php Thu May 25 11:42:05 2006
@@ -23,7 +23,8 @@
 global $mbox;
 if($ssltype == "") {$ssltype = "notls";}
 if($sslmeth == "") {$sslmeth = "novalidate-cert";}
-$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey);
+if(!preg_match("/windows/i",php_uname()))
+	$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey);
 
 if(!$mbox)
         $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/}".$mailbox, $login_username, $secretkey) or die("Connection to server failed ".imap_last_error());