Changeset 41 for trunk/lib/Email.inc.php

Timestamp:

Dec 17, 2005 9:11:26 AM (18 years ago)

Author:

scdev

Message:

${1}

File:

• trunk/lib/Email.inc.php (modified) (3 diffs)

trunk/lib/Email.inc.php

@@ -16 +16 @@
 ));
 $email->setTemplate('email_registration_confirm.ihtml');
+// $email->setString('Or you can pass your message body as a string, also with {VARIABLES}.');
 $email->replace(array(
     'site_name' => App::getParam('site_name'),
@@ -153 +154 @@
     {
         // Load file, using include_path.
-        if ('' == $string) {
+        if ('' == trim($string)) {
             App::logMsg(sprintf('Empty string provided.', null), LOG_ERR, __FILE__, __LINE__);
             $this->_template_replaced = null;
             return false;
         } else {
-            $_template = $string;
+            $this->_template = $string;
             // This could be a new template, so reset the _template_replaced.
             $this->_template_replaced = null;
@@ -244 +245 @@
         // Ensure all placeholders have been replaced. Find anything with {...} characters.
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
-            App::logMsg(sprintf('Cannot send email. Variables left unreplaced in template: %s', (isset($unreplaced_match) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Cannot send email. Variables left unreplaced in template: %s', (isset($unreplaced_match[1]) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
             return false;
         }