diff --git a/.gitignore b/.gitignore index c0a9a42..a749b52 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ /log.html +/app.log /globalsettings.php inc/log.html +inc/app.log /vendor/ \ No newline at end of file diff --git a/inc/PhpObject.php b/inc/PhpObject.php index 51a9627..3394a46 100644 --- a/inc/PhpObject.php +++ b/inc/PhpObject.php @@ -11,7 +11,7 @@ use \Settings; class PhpObject { //Log file name - const LOG_FILENAME = 'log.html'; + const LOG_FILENAME = 'app.log'; private $sLogPath; //Message types diff --git a/standalone/send_mail.php b/standalone/send_mail.php index 9936f63..45a5e11 100644 --- a/standalone/send_mail.php +++ b/standalone/send_mail.php @@ -1,56 +1,56 @@ -'8D98B36BB558BC6771324AEFB9E37'); -if(array_key_exists($sApp, $asAuthorizedApi) && $sApiKey = $asAuthorizedApi[$sApp]) -{ - $sResult = sendEmail($sApp, $sFromName, $sFromEmail, $sSubject, $sMsg, $sToEmail, $asCc, $bSelfMail); -} -else $sResult = 1; - -echo $sResult; - -//Functions + +$asAuthorizedApi = array('Wedding'=>'8D98B36BB558BC6771324AEFB9E37'); +if(array_key_exists($sApp, $asAuthorizedApi) && $sApiKey = $asAuthorizedApi[$sApp]) +{ + $sResult = sendEmail($sApp, $sFromName, $sFromEmail, $sSubject, $sMsg, $sToEmail, $asCc, $bSelfMail); +} +else $sResult = 1; + +echo $sResult; + +//Functions function sendEmail($sApp, $sFromName, $sFromEmail, $sSubject, $sMsg, $sToEmail, $asCc, $bSelfMail) { $sResult = 0; if($sFromName!='' && $sFromEmail!='' && $sSubject!='' && $sMsg!='' && $sToEmail!='') { - //Message - $sHtmlMessage = ''; - if($bSelfMail) + //Message + $sHtmlMessage = ''; + if($bSelfMail) { $sHtmlMessage = 'From: '.$sFromName."
". 'Email: '.$sFromEmail."

". 'Subject: '.$sSubject."
". - 'Message:

'; - $sFromName = $sApp; + 'Message:

'; + $sFromName = $sApp; $sSubject = $sApp.' - Contact'; - } - $sHtmlMessage .= str_replace("\n", '
', $sMsg); - $sPlainMessage = strip_tags(str_replace('
', "\n", $sHtmlMessage)); + } + $sHtmlMessage .= str_replace("\n", '
', $sMsg); + $sPlainMessage = strip_tags(str_replace('
', "\n", $sHtmlMessage)); //Email - $iBoundary = uniqid("HTMLEMAIL"); - $sCc = empty($asCc)?'':('Cc: '.implodeAll($asCc, ' <', "\r\n, ", '', '>')."\r\n"); + $iBoundary = uniqid("HTMLEMAIL"); + $sCc = empty($asCc)?'':('Cc: '.implodeAll($asCc, ' <', "\r\n, ", '', '>')."\r\n"); $sHeaders = 'From: '.$sFromName.' '."\r\n". 'Reply-To: '.$sFromName.' '."\r\n". $sCc. @@ -68,9 +68,9 @@ function sendEmail($sApp, $sFromName, $sFromEmail, $sSubject, $sMsg, $sToEmail, chunk_split(base64_encode($sHtmlMessage)); //Store in case email fails - //@file_put_contents('log.html', '
----

'.$sHtmlMessage, FILE_APPEND); + //@file_put_contents('app.log', '
----

'.$sHtmlMessage, FILE_APPEND); - //Send + //Send if(mail($sToEmail, $sSubject, '', $sHeaders)) { $sResult = 2; @@ -84,9 +84,9 @@ function sendEmail($sApp, $sFromName, $sFromEmail, $sSubject, $sMsg, $sToEmail, { $sResult = 4; } - return $sResult; -} - + return $sResult; +} + function implodeAll($asText, $asKeyValueSeparator='', $sRowSeparator='', $sKeyPre='', $sValuePost=false) { if($sValuePost===false) @@ -106,5 +106,5 @@ function implodeAll($asText, $asKeyValueSeparator='', $sRowSeparator='', $sKeyP $asCombinedText[] = $sKeyPre.$sKey.$asKeyValueSeparator[$sKey].(is_array($sValue)?implode($sValue):$sValue).$sValuePost; } return implode($sRowSeparator, $asCombinedText); -} +} ?> \ No newline at end of file