Merge branch 'master' of git@github.com:ktgit/knowledgetree

Megan
2 parents 83e5e4f1 2fd91819
Showing 3 changed files with 6 additions and 10 deletions
lib/alert/delivery/EmailAlert.inc
plugins/ktstandard/KTEmail.php
resources/js/kt-utility.js
@@ -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;
@@ -138,7 +138,7 @@ function sendManualEmails($aEmailAddresses, &amp;$aUserEmails, &amp;$aEmailErrors) {
 function sendExternalEmails($aEmailAddresses, $iDocumentID, $sDocumentName, $sComment, &$aEmailErrors){
     global $default;
     $oSendingUser = User::get($_SESSION['userID']);
-
+    
     // Create email content
 /*
     $sMessage = '<font face="arial" size="2">';
@@ -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;
@@ -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);