Peter M. Groen / knowledgetree

Commit 48c32a490896610e03e3ab2a6d256e036d639800

Authored by Megan
2 parents 83e5e4f1 2fd91819

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

Inline Side-by-side
Showing 3 changed files with 6 additions and 10 deletions
lib/alert/delivery/EmailAlert.inc
  View file @48c32a4
... ... @@ -67,10 +67,6 @@ class EmailAlert {
67 67 function send() {
68 68 global $default;
69 69  
70   - $content = file_get_contents("maillog.txt");
71   - file_put_contents("maillog.txt",$content."\n\n============ Mail Log ===============\nEmail:".$this->sAddress."\n".
72   - "sSubject:".$this->sSubject."\nBody:".$this->sContent."\n");
73   -
74 70 if ($this->oEmail->send($this->sAddress, $this->sSubject, $this->sContent)) {
75 71 $default->log->debug("EmailAlert::EmailAlert successfully sent email to $this->sAddress");
76 72 return true;
... ...
plugins/ktstandard/KTEmail.php
  View file @48c32a4
... ... @@ -138,7 +138,7 @@ function sendManualEmails($aEmailAddresses, &$aUserEmails, &$aEmailErrors) {
138 138 function sendExternalEmails($aEmailAddresses, $iDocumentID, $sDocumentName, $sComment, &$aEmailErrors){
139 139 global $default;
140 140 $oSendingUser = User::get($_SESSION['userID']);
141   -
  141 +
142 142 // Create email content
143 143 /*
144 144 $sMessage = '<font face="arial" size="2">';
... ... @@ -176,10 +176,10 @@ function sendExternalEmails($aEmailAddresses, $iDocumentID, $sDocumentName, $sCo
176 176 $sEmail = $oSendingUser->getEmail();
177 177 $sEmailFrom = $oSendingUser->getName();
178 178 }
179   - $oEmail = new Email($sEmail, $sEmailFrom);
180 179  
181 180 $iCounter = 0;
182 181 foreach ($aEmailAddresses as $sAddress){
  182 + $oEmail = new Email($sEmail, $sEmailFrom);
183 183 if(validateEmailAddress($sAddress)){
184 184 // Add to list of addresses
185 185 $sDestEmails .= (empty($sDestEmails)) ? $sAddress : ', '.$sAddress;
... ...
resources/js/kt-utility.js
  View file @48c32a4
... ... @@ -24,10 +24,10 @@ function getTarget() {
24 24  
25 25  
26 26 function confirmDelete(e) {
27   - var
28   - target = getTarget(),
29   - msg = target.getAttribute('kt:deleteMessage');
30   -
  27 + var target = getTarget();
  28 + if(!isUndefinedOrNull(target)) {
  29 + var msg = target.getAttribute('kt:deleteMessage');
  30 + }
31 31  
32 32 if(!isUndefinedOrNull(msg)) {
33 33 var v = confirm(msg);
... ...