Changeset 1354 for branches/1.2

Timestamp:

03/20/10 04:35:02 (3 years ago)

Author:

nick_ramsay

Message:

[Branch 1.2] Custom iconv function, plus more SMTP email fixes

Location:

branches/1.2

Files:

• content/plugins/messaging/libs/MessagingFuncs.php (modified) (1 diff)
• content/plugins/submit/libs/SubmitFunctions.php (modified) (1 diff)
• content/plugins/user_signin/readme.txt (modified) (1 diff)
• content/plugins/user_signin/user_signin.php (modified) (3 diffs)
• content/plugins/users/libs/UserFunctions.php (modified) (1 diff)
• functions/funcs.strings.php (modified) (2 diffs)
• libs/EmailFunctions.php (modified) (1 diff)

branches/1.2/content/plugins/messaging/libs/MessagingFuncs.php

@@ -195 +195 @@
         
         // Hi username...
-        $email_message = "Hi " . $this->to . "," . $skip_line;
+        $email_message = $h->lang['messaging_email_greeting'] . $this->to . "," . $skip_line;
         
         // You've been sent a private message from...

branches/1.2/content/plugins/submit/libs/SubmitFunctions.php

@@ -703 +703 @@
             $encoding=trim($matches[1]);
 
-            //you need iconv to encode to utf-8
-            if (function_exists("iconv"))
-            {
-                if (strcasecmp($encoding, 'utf-8') != 0) {
-                    //convert the html code into utf-8 whatever encoding it is using
-                    $string=iconv($encoding, 'UTF-8//IGNORE', $string);
-                }
+            //you need iconv to encode to utf-8 (if not, use custom iconv in funcs.strings.php)
+            if (strcasecmp($encoding, 'utf-8') != 0) {
+                //convert the html code into utf-8 whatever encoding it is using
+                $string=iconv($encoding, 'UTF-8//IGNORE', $string);
             }
         }

branches/1.2/content/plugins/user_signin/readme.txt

@@ -15 +15 @@
 Changelog
 ---------
+v.0.4 2010/03/20 - Nick - Fix for emails when using SMTP email authentication
 v.0.3 2010/02/26 - Nick - New plugin hook in the registration form; mail sent through Hotaru's email function
 v.0.2 2010/02/23 - Nick - Throws out killspammed, banned or suspended users when checking the cookie

branches/1.2/content/plugins/user_signin/user_signin.php

@@ -3 +3 @@
  * name: User Signin
  * description: Provides user registration and login
- * version: 0.3
+ * version: 0.4
  * folder: user_signin
  * type: signin
@@ -589 +589 @@
         $body .= $h->lang['user_signin_register_emailconf_body_sign'];
         $to = $user->email;
-        $headers = "From: " . SITE_EMAIL . "\r\nReply-To: " . SITE_EMAIL . "\r\nX-Priority: 3\r\n";
         
         /*
@@ -598 +597 @@
         */
 
-        $h->email($to, $subject, $body, $headers);    
+        $h->email($to, $subject, $body);    
     }
     

branches/1.2/content/plugins/users/libs/UserFunctions.php

@@ -123 +123 @@
             $to = $mod['email'];
             
-            if (SMTP == 'true') {
-                $recipients['To'] = $to;
-                $h->email($recipients, $subject, $body);
-            } else {
-                $h->email($to, $subject, $body);
-            }
+            $h->email($to, $subject, $body);
         }
         

branches/1.2/functions/funcs.strings.php

@@ -558 +558 @@
 
 
+if(!function_exists("iconv"))
+{
+    /**
+     * Convert string to requested character encoding if iconv library not installed
+     *
+     * @param string $from
+     * @param string $to
+     * @param string $string
+     * @return string
+     * @link http://www.jpfox.fr/?post/2007/07/25/165-alternative-a-la-fonction-php-iconv
+     */
+    function iconv($from, $to, $string)
+    {
+        $converted = htmlentities($string, ENT_NOQUOTES, $from); 
+        $converted = html_entity_decode($converted, ENT_NOQUOTES, $to);
+        return $converted;
+    }
+}
+
+
+/**
+ * Count urls within a block of text
+ *
+ * @return int 
+ * @link http://www.liamdelahunty.com/tips/php_url_count_check_for_comment_spam.php
+ */
+function countUrls($text = '')
+{
+    //$http = substr_count($text, "http");
+    $href = substr_count($text, "href");
+    $url = substr_count($text, "[url");
+    
+    return $href + $url;
+}
+
+
 /**
  * Strip foreign characters from latin1/utf8 database yuckiness
@@ -573 +609 @@
     return $str;
 }
-
-
-/**
- * Count urls within a block of text
- *
- * @return int 
- * @link http://www.liamdelahunty.com/tips/php_url_count_check_for_comment_spam.php
- */
-function countUrls($text = '')
-{
-    //$http = substr_count($text, "http");
-    $href = substr_count($text, "href");
-    $url = substr_count($text, "[url");
-    
-    return $href + $url;
-}
 ?>

branches/1.2/libs/EmailFunctions.php

@@ -66 +66 @@
         if (SMTP == 'true') {
             // note: this overwrites headers passed to this function:
-            $this->headers = array ('From' => $this->from, 'To' => $this->to['To'], 'Subject' => $this->subject);
+            if (is_array($this->to)) { $to = $this->to['To']; } else { $to = $this->to; }
+            $this->headers = array ('From' => $this->from, 'To' => $to, 'Subject' => $this->subject);
         } else {
             // if not using SMTP and no headers passed to this function, use default