diff --git a/lib/alert/delivery/EmailAlert.inc b/lib/alert/delivery/EmailAlert.inc index 88af1c2..6dc0328 100644 --- a/lib/alert/delivery/EmailAlert.inc +++ b/lib/alert/delivery/EmailAlert.inc @@ -67,10 +67,6 @@ class EmailAlert { function send() { global $default; - $content = file_get_contents("maillog.txt"); - file_put_contents("maillog.txt",$content."\n\n============ Mail Log ===============\nEmail:".$this->sAddress."\n". - "sSubject:".$this->sSubject."\nBody:".$this->sContent."\n"); - if ($this->oEmail->send($this->sAddress, $this->sSubject, $this->sContent)) { $default->log->debug("EmailAlert::EmailAlert successfully sent email to $this->sAddress"); return true; diff --git a/plugins/ktstandard/KTEmail.php b/plugins/ktstandard/KTEmail.php index 8b9a358..7bb3c7d 100644 --- a/plugins/ktstandard/KTEmail.php +++ b/plugins/ktstandard/KTEmail.php @@ -138,7 +138,7 @@ function sendManualEmails($aEmailAddresses, &$aUserEmails, &$aEmailErrors) { function sendExternalEmails($aEmailAddresses, $iDocumentID, $sDocumentName, $sComment, &$aEmailErrors){ global $default; $oSendingUser = User::get($_SESSION['userID']); - + // Create email content /* $sMessage = ''; @@ -176,10 +176,10 @@ function sendExternalEmails($aEmailAddresses, $iDocumentID, $sDocumentName, $sCo $sEmail = $oSendingUser->getEmail(); $sEmailFrom = $oSendingUser->getName(); } - $oEmail = new Email($sEmail, $sEmailFrom); $iCounter = 0; foreach ($aEmailAddresses as $sAddress){ + $oEmail = new Email($sEmail, $sEmailFrom); if(validateEmailAddress($sAddress)){ // Add to list of addresses $sDestEmails .= (empty($sDestEmails)) ? $sAddress : ', '.$sAddress; diff --git a/resources/js/kt-utility.js b/resources/js/kt-utility.js index 212a831..b916900 100644 --- a/resources/js/kt-utility.js +++ b/resources/js/kt-utility.js @@ -24,10 +24,10 @@ function getTarget() { function confirmDelete(e) { - var - target = getTarget(), - msg = target.getAttribute('kt:deleteMessage'); - + var target = getTarget(); + if(!isUndefinedOrNull(target)) { + var msg = target.getAttribute('kt:deleteMessage'); + } if(!isUndefinedOrNull(msg)) { var v = confirm(msg);