Changeset 1214

Timestamp:

02/22/10 15:30:59 (3 years ago)

Author:

nick_ramsay

Message:

[Branch 1.2] New EmailFunctions class which channels all mail operations through one output. A flick of the switch and you can write email content to a log file or the screen instead of sending it (great for developers). Note that this feature won't get any use until plugins are updated to use it.

Location:

branches/1.2

Files:

• Hotaru.php (modified) (4 diffs)
• libs/Debug.php (modified) (3 diffs)
• libs/EmailFunctions.php (added)
• libs/extensions/ezSQL/mysql/ez_sql_mysql.php (modified) (1 diff)

branches/1.2/Hotaru.php

@@ -1192 +1192 @@
     public function openLog($type = 'debug', $mode = 'a+')
     {
-        $this->debug->openLog($this, $type, $mode);
+        $this->debug->openLog($type, $mode);
     }
     
@@ -1203 +1203 @@
     public function writeLog($type = 'error', $string = '')
     {
-        $this->debug->writeLog($this, $type, $string);
+        $this->debug->writeLog($type, $string);
     }
     
@@ -1214 +1214 @@
     public function closeLog($type = 'error')
     {
-        $this->debug->closeLog($this, $type);
+        $this->debug->closeLog($type);
     }
     
@@ -2029 +2029 @@
         return $widget->getPluginFromFunction($this, $function);
     }
+    
+    
+/* *************************************************************
+ *
+ *  EMAIL FUNCTIONS
+ *
+ * *********************************************************** */
+ 
+    /**
+     * Send emails
+     *
+     * @param string $to - defaults to SITE_EMAIL
+     * @param string $subject - defaults to "No Subject";
+     * @param string $body - returns false if empty
+     * @param string $headers default is "From: " . SITE_EMAIL . "\r\nReply-To: " . SITE_EMAIL . "\r\nX-Priority: 3\r\n";
+     * @param string $type - default is "email", but you can write to a "log" file, print to "screen" or "return" an array of the content
+     * @return array|false - only if $type = "return"
+     */
+    public function email($to = '', $subject = '', $body = '', $headers = '', $type = 'email')
+    {
+        require_once(LIBS . 'EmailFunctions.php');
+        $emailFunctions = new EmailFunctions($to, $subject, $body, $headers, $type);
+        $emailFunctions->type = $type;
+        return $emailFunctions->doEmail();
+    }
 }
 ?>

branches/1.2/libs/Debug.php

@@ -57 +57 @@
      * @link http://php.net/manual/en/function.fopen.php
      */
-    public function openLog($h, $type = 'debug', $mode = 'a+')
+    public function openLog($type = 'debug', $mode = 'a+')
     {
         $this->log[$type] = CACHE . "debug_logs/" . $type . ".txt";
@@ -78 +78 @@
      * @param string $type "error", "speed", etc.
      */
-    public function writeLog($h, $type = 'debug', $string = '')
+    public function writeLog($type = 'debug', $string = '')
     {
         if ($string) {
@@ -92 +92 @@
      * @param string $type "speed", "error", etc.
      */
-    public function closeLog($h, $type = 'debug')
+    public function closeLog($type = 'debug')
     {
         if (isset($this->fh[$type])) { fclose($this->fh[$type]); }

branches/1.2/libs/extensions/ezSQL/mysql/ez_sql_mysql.php

@@ -245 +245 @@
                     
                     $body .= "If you need help, visit the forums at http://hotarucms.org\r\n";
-                    mail(SITE_EMAIL, $subject, $body, $headers);
+                    
+                    // we can avoid using the $h object (which we might not have) by calling EmailFunctions directly.
+                    require_once(LIBS . 'EmailFunctions.php');
+                    $emailFunctions = new EmailFunctions(SITE_EMAIL, $subject, $body, $headers);
+                    $emailFunctions->doEmail();
                 }