Rename log file
This commit is contained in:
1 parent
b754374b79
commit
346cbd5ca3
3 files changed
+43
-41
No files matched your search
@@ -1,4 +1,6 @@
|
||||
/log.html
|
||||
/app.log
|
||||
/globalsettings.php
|
||||
inc/log.html
|
||||
inc/app.log
|
||||
/vendor/
|
||||
+1
-1
@@ -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
|
||||
|
||||
+40
-40
@@ -1,56 +1,56 @@
|
||||
<?php
|
||||
|
||||
<?php
|
||||
|
||||
ini_set('default_charset', 'UTF-8');
|
||||
header('Content-Type: text/html; charset='.'UTF-8');
|
||||
mb_internal_encoding('UTF-8');
|
||||
mb_http_output('UTF-8');
|
||||
mb_http_input('UTF-8');
|
||||
mb_language('uni');
|
||||
mb_regex_encoding('UTF-8');
|
||||
|
||||
//Main
|
||||
$sApiKey = isset($_POST['api_key'])?$_POST['api_key']:'';
|
||||
$sApp = isset($_POST['app'])?$_POST['app']:'lutran.fr';
|
||||
$sFromName = isset($_POST['from_name'])?$_POST['from_name']:'';
|
||||
$sFromEmail = isset($_POST['from_email'])?$_POST['from_email']:'www-data@lutran.fr';
|
||||
$sSubject = isset($_POST['subject'])?$_POST['subject']:'';
|
||||
$sMsg = isset($_POST['msg'])?$_POST['msg']:'';
|
||||
$sToEmail = isset($_POST['to_email'])?$_POST['to_email']:'';
|
||||
$asCc = isset($_POST['cc_email'])?json_decode($_POST['cc_email'], true):'';
|
||||
mb_regex_encoding('UTF-8');
|
||||
|
||||
//Main
|
||||
$sApiKey = isset($_POST['api_key'])?$_POST['api_key']:'';
|
||||
$sApp = isset($_POST['app'])?$_POST['app']:'lutran.fr';
|
||||
$sFromName = isset($_POST['from_name'])?$_POST['from_name']:'';
|
||||
$sFromEmail = isset($_POST['from_email'])?$_POST['from_email']:'www-data@lutran.fr';
|
||||
$sSubject = isset($_POST['subject'])?$_POST['subject']:'';
|
||||
$sMsg = isset($_POST['msg'])?$_POST['msg']:'';
|
||||
$sToEmail = isset($_POST['to_email'])?$_POST['to_email']:'';
|
||||
$asCc = isset($_POST['cc_email'])?json_decode($_POST['cc_email'], true):'';
|
||||
$bSelfMail = isset($_POST['self'])?$_POST['self']:true;
|
||||
|
||||
$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
|
||||
|
||||
$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."<br />".
|
||||
'Email: '.$sFromEmail."<br /><br />".
|
||||
'Subject: '.$sSubject."<br />".
|
||||
'Message: <br /><br />';
|
||||
$sFromName = $sApp;
|
||||
'Message: <br /><br />';
|
||||
$sFromName = $sApp;
|
||||
$sSubject = $sApp.' - Contact';
|
||||
}
|
||||
$sHtmlMessage .= str_replace("\n", '<br />', $sMsg);
|
||||
$sPlainMessage = strip_tags(str_replace('<br />', "\n", $sHtmlMessage));
|
||||
}
|
||||
$sHtmlMessage .= str_replace("\n", '<br />', $sMsg);
|
||||
$sPlainMessage = strip_tags(str_replace('<br />', "\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.' <www-data@lutran.fr>'."\r\n".
|
||||
'Reply-To: '.$sFromName.' <www-data@lutran.fr>'."\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', '<br />----<br /><br />'.$sHtmlMessage, FILE_APPEND);
|
||||
//@file_put_contents('app.log', '<br />----<br /><br />'.$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);
|
||||
}
|
||||
}
|
||||
?>
|
||||
Reference in new issue
Block a user