소스 검색

Emails

Register email does no failed handling.
Nathaniel van Diepen 10 년 전
부모
커밋
e6f006be97
3개의 변경된 파일10개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      install/api.php
  2. 8 2
      php/emails.php
  3. 1 0
      php/include.php

+ 1 - 1
install/api.php

@@ -125,7 +125,7 @@
 							$sql_query = remove_comments($sql_query);
 							$sql_query = remove_remarks($sql_query);
 							$sql_query = split_sql_file($sql_query, ';');
-							file_put_contents('../config.default.json',"{\"host\":\"{$dbhost}\",\"user\":\"{$dbuser}\",\"password\":\"{$dbpass}\",\"database\":\"{$dbname}\",\"timeout\":216000,\"email\":\"{$email}\""}");
+							file_put_contents('../config.default.json',"{\"host\":\"{$dbhost}\",\"user\":\"{$dbuser}\",\"password\":\"{$dbpass}\",\"database\":\"{$dbname}\",\"timeout\":216000,\"email\":\"{$email}\"}");
 							require_once('../php/database.php');
 							foreach($sql_query as $sql){
 								query($sql) or die('error in query');

+ 8 - 2
php/emails.php

@@ -3,10 +3,16 @@
 	require_once(PATH_PHP.'database.php');
 	require_once(PATH_PHP.'security.php');
 	require_once(PATH_PHP.'user.php');
-	function sendMail($template,$to=get('email'),$from=get('email'),$context=Array()){
+	function sendMail($template,$to=null,$from=null,$context=Array()){
+		if(is_null($to)){
+			$to = get('email');
+		}
+		if(is_null($from)){
+			$from = get('email');
+		}
 		if(file_exists(PATH_DATA."/emails/{$template}.template")){
 			$message = vsprintf(file_get_contents(PATH_DATA."/emails/{$template}.template"),$context);
-			return mail($to,$subject,$message,"From: {$from}\r\nMIME-Version: 1.0\r\nContent-type: text/html; charset=iso-8859-1\r\n");
+			return @mail($to,$subject,$message,"From: {$from}\r\nMIME-Version: 1.0\r\nContent-type: text/html; charset=iso-8859-1\r\n");
 		}else{
 			return false;
 		}

+ 1 - 0
php/include.php

@@ -10,5 +10,6 @@
 	require_once(PATH_PHP.'functions.php');
 	require_once(PATH_PHP.'security.php');
 	require_once(PATH_PHP.'user.php');
+	require_once(PATH_PHP.'emails.php');
 	authenticate();
 ?>