[Web-erp-svn] SF.net SVN: web-erp:[5888] trunk/includes/MiscFunctions.php

[<ex...@us...>]

Revision: 5888
          http://sourceforge.net/p/web-erp/reponame/5888
Author:   exsonqu
Date:     2013-05-02 14:55:30 +0000 (Thu, 02 May 2013)
Log Message:
-----------
2/5/2013 Exson: Fixed strpos error and make the smtp server name more generic when user not use a email address.

Modified Paths:
--------------
    trunk/includes/MiscFunctions.php

Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php	2013-05-02 10:37:58 UTC (rev 5887)
+++ trunk/includes/MiscFunctions.php	2013-05-02 14:55:30 UTC (rev 5888)
@@ -401,22 +401,24 @@
 		return $IntegerNumber. $DecimalValue;
 	}
 }
-
 function SendMailBySmtp(&$mail,$To) {
-
 	if(IsEmailAddress($_SESSION['SMTPSettings']['username'])){//user has set the fully mail address as user name
 		$SendFrom = $_SESSION['SMTPSettings']['username'];
-	} else {//user only set it's name instead of fully mail address
-		if(strpos('smtp',$_SESSION['SMTPSettings']['host'])){
-			$HostDomain = substr($_SESSION['SMTPSettings']['host'],4);
+	}else{//user only set it's name instead of fully mail address
+		if(strpos($_SESSION['SMTPSettings']['host'],'mail') !== false){
+			$SubStr = 'mail';
+		
+		}elseif(strpos($_SESSION['SMTPSettings']['host'],'smtp') !== false){
+			$SubStr = 'smtp';
 		}
-		if(!strpos('@',$_SESSION['SMTPSettings']['username'])){
-			$SendFrom = $_SESSION['SMTPSettings']['username'] . $HostDomain;
-		}
+
+			$Domain = substr($_SESSION['SMTPSettings']['host'],strpos($_SESSION['SMTPSettings']['host'],$SubStr)+5);
+			$SendFrom = $_SESSION['SMTPSettings']['username'].'@'.$Domain;
 	}
 	$mail->setFrom($SendFrom);
 	$result = $mail->send($To,'smtp');
 	return $result;
 }
 
+
 ?>