Changeset 1305

Timestamp:

03/13/10 11:22:58 (3 years ago)

Author:

nick_ramsay

Message:

[Trunk] Hotaru 1.1.2

Location:

trunk

Files:

• . (modified) (1 prop)
• Hotaru.php (modified) (2 diffs)
• content/admin_language.php (modified) (1 diff)
• content/admin_themes/admin_default/css/style.css (modified) (1 diff)
• content/plugins (modified) (1 prop)
• content/plugins/admin_email/admin_email.php (modified) (2 diffs)
• content/plugins/comments/comments.php (modified) (3 diffs)
• content/plugins/comments/readme.txt (modified) (1 diff)
• content/plugins/rss_show/readme.txt (modified) (1 diff)
• content/plugins/rss_show/rss_show.php (modified) (4 diffs)
• content/plugins/sb_base/libs/SbBaseFunctions.php (modified) (7 diffs)
• content/plugins/user_rankings/user_rankings.php (modified) (1 diff)
• content/plugins/users/libs/UserFunctions.php (modified) (1 diff)
• content/plugins/vote/vote.php (modified) (1 diff)
• content/themes/default/css/style.css (modified) (1 diff)
• hotaru_settings_default.php (modified) (1 diff)
• install/install_tables.php (modified) (1 diff)
• install/upgrade.php (modified) (1 diff)
• libs/AdminPages.php (modified) (2 diffs)
• libs/EmailFunctions.php (modified) (3 diffs)
• libs/Feeds.php (modified) (2 diffs)
• libs/InspektExtras.php (modified) (1 diff)
• libs/extensions/ezSQL/mysql/ez_sql_mysql.php (modified) (2 diffs)

trunk/Hotaru.php

@@ -43 +43 @@
     protected $includes;                        // for CSS/JavaScript includes
     protected $debug;                           // Debug object
+    protected $email;                           // Email object
     
     // page info
@@ -2063 +2064 @@
     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();
+        if (!is_object($this->email)) { 
+            require_once(LIBS . 'EmailFunctions.php');
+            $this->email = new EmailFunctions();
+        }
+        
+        $this->email->to = $to;
+        $this->email->subject = $subject;
+        $this->email->body = $body;
+        $this->email->headers = $headers;
+        $this->email->type = $type;
+        
+        return $this->email->doEmail();
     }
 }

trunk/content/admin_language.php

@@ -120 +120 @@
 
 /* Settings */
-$lang['admin_settings_update_success'] = "Updated successfully.";
+$lang['admin_settings_update_success'] = "Updated successfully";
+$lang['admin_settings_update_failure'] = "Error saving settings";
 $lang["admin_settings_theme_activate_success"] = "Theme was activated successfully.";
 $lang["admin_theme_settings"] = "Settings";

trunk/content/admin_themes/admin_default/css/style.css

@@ -149 +149 @@
 .green {
         background-color: #99FF66 !important;
+}
+
+.yellow {
+        background-color: #fbe760 !important;
 }
 

trunk/content/plugins/admin_email/admin_email.php

@@ -154 +154 @@
         echo "<meta http-equiv='Refresh' content='0; URL=" . $url . "' />";
         echo $h->lang["admin_email_redirecting"];
-        ob_flush();
+        @ob_flush();
         flush();
         exit;
@@ -214 +214 @@
             $from = SITE_EMAIL; // Send_From_Email is admin
             $to = $recipient->user_email;  
-            $headers = "From: " . $from . "\r\nReply-To: " . $from . "\r\nX-Priority: 3\r\n";
             
             if ($send_self && ($h->currentUser->id == $recipient->user_id)) {
                 echo $h->lang["admin_email_sent_to"] . "<i>" . $to . "</i><br />\n";
-                @mail($to, $subject, $message, $headers);   // This sends an email to the requesting admin
+                $h->email($to, $subject, $message);   // This sends an email to the requesting admin
             } elseif ($simulation) {
                 echo $h->lang["admin_email_fake_sending"] . $to . "<br />\n";
             } else {
                 echo $h->lang["admin_email_sent_to"] . $to . "<br />\n";
-                @mail($to, $subject, $message, $headers);   // This does the actual sending!
-            }
-            ob_flush();
+                $h->email($to, $subject, $message);   // This does the actual sending!
+            }
+            @ob_flush();
             flush();
             sleep(1); // one second pause between sending emails

trunk/content/plugins/comments/comments.php

@@ -3 +3 @@
  * name: Comments
  * description: Enables logged-in users to comment on posts
- * version: 1.6
+ * version: 1.7
  * folder: comments
  * class: Comments
@@ -148 +148 @@
         }
         
-        if ($h->pageName == 'comments') {
+        if ($h->pageName == 'comments')
+        {
+            // set current comment and responses to pending:
+            if ($h->cage->get->getAlpha('action') == 'setpending') { 
+            
+                // before setting pending, we need to be certain this user has permission:
+                if ($h->currentUser->loggedIn && $h->currentUser->getPermission('can_set_comments_pending') == 'yes') {
+                    $cid = $h->cage->get->testInt('cid'); // comment id
+                    $comment = $h->comment->getComment($h, $cid);
+                    $h->comment->readComment($h, $comment); // read comment
+                    $h->comment->status = 'pending'; // set to pending
+                    $h->comment->editComment($h);  // update this comment
+
+                    $h->comment->postId = $h->cage->get->testInt('pid');  // post id
+                    $h->comment->setPendingCommentTree($h,$cid);   // set all responses to 'pending', too.
+                    
+                    // redirect back to thread:
+                    $h->post = new Post();
+                    $h->readPost($h->comment->postId);
+                    header("Location: " . $h->url(array('page'=>$h->post->id)));    // Go to the post
+                    die();
+                }
+            }
+            
+            // delete current comment and responses:
+            if ($h->cage->get->getAlpha('action') == 'delete') { 
+            
+                // before deleting a comment, we need to be certain this user has permission:
+                if ($h->currentUser->loggedIn && $h->currentUser->getPermission('can_delete_comments') == 'yes') {
+                    $cid = $h->cage->get->testInt('cid'); // comment id
+                    $comment = $h->comment->getComment($h, $cid);
+                    $h->comment->readComment($h, $comment); // read comment
+                    
+                    $h->pluginHook('comments_delete_comment');
+                    
+                    $h->comment->deleteComment($h, $cid); // delete this comment
+                    $h->comment->deleteCommentTree($h, $cid);   // delete all responses, too.
+                    
+                    $h->clearCache('html_cache', false); // clear HTML cache to refresh Comments and Activity widgets
+                    
+                    $h->comment->postId = $h->cage->get->testInt('pid');  // post id
+                    
+                    // redirect back to thread:
+                    $h->readPost($h->comment->postId);
+                    header("Location: " . $h->url(array('page'=>$h->comment->postId)));    // Go to the post
+                    die();
+                }
+            }
+            
+            // FOR THE COMMENTS PAGE:
             $h->pageTitle = $h->lang['comments'];
             if ($h->cage->get->keyExists('user')) {
@@ -257 +306 @@
                     
                 }
-                
-                // set current comment and responses to pending:
-                if ($h->cage->get->getAlpha('action') == 'setpending') { 
-                
-                    // before setting pending, we need to be certain this user has permission:
-                    if ($h->currentUser->getPermission('can_set_comments_pending') == 'yes') {
-                        $cid = $h->cage->get->testInt('cid'); // comment id
-                        $comment = $h->comment->getComment($h, $cid);
-                        $h->comment->readComment($h, $comment); // read comment
-                        $h->comment->status = 'pending'; // set to pending
-                        $h->comment->editComment($h);  // update this comment
-    
-                        $h->comment->postId = $h->cage->get->testInt('pid');  // post id
-                        $h->comment->setPendingCommentTree($h,$cid);   // set all responses to 'pending', too.
-                        
-                        // redirect back to thread:
-                        $h->post = new Post();
-                        $h->readPost($h->comment->postId);
-                        header("Location: " . $h->url(array('page'=>$h->post->id)));    // Go to the post
-                        die();
-                    }
-                }
-                
-                // delete current comment and responses:
-                if ($h->cage->get->getAlpha('action') == 'delete') { 
-                
-                    // before deleting a comment, we need to be certain this user has permission:
-                    if ($h->currentUser->getPermission('can_delete_comments') == 'yes') {
-                        $cid = $h->cage->get->testInt('cid'); // comment id
-                        $comment = $h->comment->getComment($h, $cid);
-                        $h->comment->readComment($h, $comment); // read comment
-                        
-                        $h->pluginHook('comments_delete_comment');
-                        
-                        $h->comment->deleteComment($h, $cid); // delete this comment
-                        $h->comment->deleteCommentTree($h, $cid);   // delete all responses, too.
-                        
-                        $h->clearCache('html_cache', false); // clear HTML cache to refresh Comments and Activity widgets
-                        
-                        $h->comment->postId = $h->cage->get->testInt('pid');  // post id
-                        
-                        // redirect back to thread:
-                        $h->readPost($h->comment->postId);
-                        header("Location: " . $h->url(array('page'=>$h->comment->postId)));    // Go to the post
-                        die();
-                    }
-                }
-    
             }
             

trunk/content/plugins/comments/readme.txt

@@ -15 +15 @@
 Changelog
 ---------
+v.1.7 2010/03/11 - Nick - Fix for a previous change that broke the set pending and delete links within comments.
 v.1.6 2010/02/26 - Nick - Adds link to profile navigation; Email changed to go through Hotaru's "email" function 
 v.1.5 2010/02/23 - Nick - Shows messages for moderated comments: "Awaiting approval", "Exceeded Daily Limit", etc.

trunk/content/plugins/rss_show/readme.txt

@@ -32 +32 @@
 Changelog
 ---------
+v.0.8 2010/03/11 - Nick - Added some sanitation to feed output
 v.0.7 2010/01/04 - Nick - Updates for compatibility with Hotaru 1.0
 v.0.6 2009/11/04 - Nick - Updated install function for easier upgrading

trunk/content/plugins/rss_show/rss_show.php

@@ -3 +3 @@
  * name: RSS Show
  * description: Adds links in a widget block to the latest posts from a specified RSS feed.
- * version: 0.7
+ * version: 0.8
  * folder: rss_show
  * class: RssShow
@@ -87 +87 @@
                             $output .= "<li class='rss_show_feed_item'>";
                             $output .= "<span class='rss_show_title'>";
-                            $output .= "<a href='" . $item->get_permalink() . "'>" . $item->get_title() . "</a></span>\n";
+                            $output .= "<a href='" . $item->get_permalink() . "'>" . sanitize($item->get_title(), 'tags') . "</a></span>\n";
                             
                             // AUTHOR / DATE
@@ -95 +95 @@
                                     $output .= " by ";
                                         foreach ($item->get_authors() as $author)  {
-                                    $output .= $author->get_name(); 
+                                    $output .= sanitize($author->get_name(), 'ents'); 
                                 }
                             }
@@ -106 +106 @@
                         // SUMMARY
                         if ($settings['content'] == 'summaries') {
-                            $output .= "<p class='rss_show_content'>" . substr(strip_tags($item->get_content()), 0, 300);
+                            $output .= "<p class='rss_show_content'>" . substr(sanitize($item->get_content(), 'tags'), 0, 300);
                             $output .= "... ";
-                            $output .= "<small><a href='" . $item->get_permalink() . "' title='" . $item->get_title() . "'>" . $h->lang["rss_show_read_more"] . "</a>";
+                            $output .= "<small><a href='" . $item->get_permalink() . "' title='" . sanitize($item->get_title(), 'tags') . "'>" . $h->lang["rss_show_read_more"] . "</a>";
                             $output .= "</small></p>";
                         }

trunk/content/plugins/sb_base/libs/SbBaseFunctions.php

@@ -129 +129 @@
             $end = date('YmdHis', strtotime($upcoming_duration)); // should be negative
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
-            $h->vars['orderby'] = "post_votes_up DESC";
+            $h->vars['orderby'] = "post_votes_up DESC, post_date DESC";
         } 
         elseif ($type == 'top-24-hours')
@@ -138 +138 @@
             $end = date('YmdHis', strtotime("-1 day"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
-            $h->vars['orderby'] = "post_votes_up DESC";
+            $h->vars['orderby'] = "post_votes_up DESC, post_date DESC";
         } 
         elseif ($type == 'top-48-hours') 
@@ -147 +147 @@
             $end = date('YmdHis', strtotime("-2 days"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
-            $h->vars['orderby'] = "post_votes_up DESC";
+            $h->vars['orderby'] = "post_votes_up DESC, post_date DESC";
         } 
         elseif ($type == 'top-7-days')
@@ -156 +156 @@
             $end = date('YmdHis', strtotime("-7 days"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
-            $h->vars['orderby'] = "post_votes_up DESC";
+            $h->vars['orderby'] = "post_votes_up DESC, post_date DESC";
         } 
         elseif ($type == 'top-30-days')
@@ -165 +165 @@
             $end = date('YmdHis', strtotime("-30 days"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
-            $h->vars['orderby'] = "post_votes_up DESC";
+            $h->vars['orderby'] = "post_votes_up DESC, post_date DESC";
         } 
         elseif ($type == 'top-365-days')
@@ -174 +174 @@
             $end = date('YmdHis', strtotime("-365 days"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
-            $h->vars['orderby'] = "post_votes_up DESC";
+            $h->vars['orderby'] = "post_votes_up DESC, post_date DESC";
         } 
         elseif ($type == 'top-all-time')
@@ -180 +180 @@
             // Filters page to "top" stories in order of votes
             $h->vars['filter']['post_status = %s'] = 'top'; 
-            $h->vars['orderby'] = "post_votes_up DESC";
+            $h->vars['orderby'] = "post_votes_up DESC, post_date DESC";
         } 
         elseif ($type == 'top')

trunk/content/plugins/user_rankings/user_rankings.php

@@ -177 +177 @@
                 $output .= "<a class='user_rankings_" . $css . "_name' href='" . $h->url(array('user' => $user->name)) . "'>" . $user->name . "</a> \n";
             }
+            
+            $h->vars['user_rankings_output'] = "";
+            $h->pluginHook('user_rankings_item', '', array('points' => $points, 'css' => $css));
+            $output .= $h->vars['user_rankings_output'];
             
             $output .= "<div class='user_rankings_" . $css . "_points'>" . $points . "</div>\n";

trunk/content/plugins/users/libs/UserFunctions.php

@@ -114 +114 @@
             $body .= $h->lang['userfunctions_notifymods_body_user_role'] . $user->role . $next_line;
             $body .= $h->lang['userfunctions_notifymods_body_user_email'] . $user->email . $next_line;
-            $body .= $h->lang['userfunctions_notifymods_body_user_account'] . $h->url(array('page'=>'account', 'user'=>$user->name)) . $next_line;
+            $body .= $h->lang['userfunctions_notifymods_body_user_account'] . BASEURL . "index.php?page=account&user=" . $user->name . $next_line;
             $body .= $h->lang['userfunctions_notifymods_body_user_management'] . BASEURL . "admin_index.php?search_value=" . $user->name . "&plugin=user_manager&page=plugin_settings&type=search";
             

trunk/content/plugins/vote/vote.php

@@ -206 +206 @@
                     } else {
                         $h->changePostStatus('buried');
+                        $h->clearCache('html_cache', false);
                         $h->pluginHook('vote_post_status_buried'); // Akismet hooks in here to report the post as spam
                     }

trunk/content/themes/default/css/style.css

@@ -78 +78 @@
 
 .green    { background-color: #99FF66; }
+.yellow   { background-color: #fbe760; }
 .red      { background-color: #FF6A55; color: #ffffff; }
 .bold_red { color: red; font-weight: bold; }

trunk/hotaru_settings_default.php

@@ -41 +41 @@
 // Paths
 define('BASEURL', "http://www.mysite.com/");    // e.g. http://www.mysite.com/
-
                                                 // Needs trailing slash (/)
 

trunk/install/install_tables.php

@@ -371 +371 @@
         $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
         $db->query($db->prepare($sql, 'DEBUG', 'false', 'false', ''));
+        
+        // SMTP on
+        $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $db->query($db->prepare($sql, 'SMTP_ON', 'false', 'false', 'Email auth'));
+        
+        // SMTP host
+        $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $db->query($db->prepare($sql, 'SMTP_HOST', 'mail.example.com', 'mail.example.com', ''));
+        
+        // SMTP port
+        $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $db->query($db->prepare($sql, 'SMTP_PORT', '25', '25', ''));
+        
+        // SMTP username
+        $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $db->query($db->prepare($sql, 'SMTP_USERNAME', '', '', ''));
+        
+        // SMTP password
+        $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $db->query($db->prepare($sql, 'SMTP_PASSWORD', '', '', ''));
     }
     

trunk/install/upgrade.php

@@ -346 +346 @@
     
     // 1.1 to 1.1.2
-    if ($old_version == "1.1.1") { $old_version = "1.1.2"; } // update "old version" for next set of upgrades
+    if ($old_version == "1.1.1") { 
+    
+        // SMTP on
+        $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $h->db->query($h->db->prepare($sql, 'SMTP_ON', 'false', 'false', 'Email auth'));
+        
+        // SMTP host
+        $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $h->db->query($h->db->prepare($sql, 'SMTP_HOST', 'mail.example.com', 'mail.example.com', ''));
+        
+        // SMTP port
+        $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $h->db->query($h->db->prepare($sql, 'SMTP_PORT', '25', '25', ''));
+        
+        // SMTP username
+        $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $h->db->query($h->db->prepare($sql, 'SMTP_USERNAME', '', '', ''));
+        
+        // SMTP password
+        $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
+        $h->db->query($h->db->prepare($sql, 'SMTP_PASSWORD', '', '', ''));
+        
+        // update "old version" for next set of upgrades
+        $old_version = "1.1.2"; 
+    }
     
     // Update Hotaru version number to the database (referred to when upgrading)

trunk/libs/AdminPages.php

@@ -134 +134 @@
             foreach ($loaded_settings as $setting_name) {
                 if ($h->cage->post->keyExists($setting_name->settings_name)) {
-                    $setting_value = $h->cage->post->noTags($setting_name->settings_name);
+                    $setting_value = $h->cage->post->getRaw($setting_name->settings_name);
                     if (!$error && $setting_value && $setting_value != $setting_name->settings_value) {
                         $this->adminSettingUpdate($h, $setting_name->settings_name, $setting_value);
@@ -141 +141 @@
                         if (!$setting_value) {
                             // empty value 
-                            $error = 1; 
-                        } else { 
-                            // No change to the value
-                            $error = 0; 
+                            $error = 1;
                         }
                     }
                 } else {
-                    // error, setting empty.
-                    $error = 1;
+                    // values that are allowed to be empty:
+                    $exempt = array('SMTP_USERNAME', 'SMTP_PASSWORD');
+                    if (!in_array($setting_name->settings_name, $exempt)) { 
+                        // otherwise flag as an error:
+                        $error = 1;
+                    } 
                 }
             }

trunk/libs/EmailFunctions.php

@@ -28 +28 @@
 {
     protected $to           = '';
-    protected $subject      = '';
+    protected $from         = '';
+    protected $subject      = 'No Subject';
     protected $body         = '';
     protected $headers      = '';
-    protected $type         = '';
+    protected $type         = 'email';
+    private $smtp   = NULL;
     
     /**
@@ -50 +52 @@
         return $this->$var;
     }
-    
+
     
     /**
-     * Constructor
-     *
-     * @param string $to - defaults to SITE_EMAIL
-     * @param string $subject - defaults to "No Subject";
-     * @param string $body - returns false if empty
-     * @param string $headers e.g. "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" the content
-     * @return array - only if $type = "return"
-     */
-    public function __construct($to = '', $subject = '', $body = '', $headers = '', $type = 'email')
-    {
-        $this->to = $to;
-        $this->subject = $subject;
-        $this->body = $body;
-        $this->headers = $headers;
-        $this->type = $type;
-        
-        if (!$this->to) { $this->to = SITE_EMAIL; }
-        if (!$this->subject) { $this->subject = "No Subject"; }
-        if (!$this->body) { return false; }
-        if (!$this->headers) { $this->headers = "From: " . SITE_EMAIL . "\r\nReply-To: " . SITE_EMAIL . "\r\nX-Priority: 3\r\n"; }
-    }
-    
-    /**
-     * 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 - only if $type = "return"
+     * Send emails - Note: properties must be set before calling this function
      */
     public function doEmail()
-    {
-        // OVERRIDE THE TYPE HERE BY UNCOMMENTING THE LINE BELOW - Very handy when developing offline with WampServer, etc.
-        // $this->type = 'log'; // this will write all emails to email_log.txt in the cache folder INSTEAD of sending them.
+    {        
+        if (!$this->body) { return false; }
+        
+        if (!$this->to) { $this->to = SITE_NAME . ' <' . SITE_EMAIL . '>'; }
+        if (!$this->from) { $this->from = SITE_NAME . ' <' . SITE_EMAIL . '>'; }
+        
+        if (SMTP_ON == 'true') {
+            // note: this overwrites headers passed to this function:
+            $this->headers = array ('From' => $this->from, 'To' => $this->to, 'Subject' => $this->subject);
+        } else {
+            // if not using SMTP and no headers passed to this function, use default
+            if (!$this->headers) { 
+                $this->headers = "From: " . $this->from . "\r\nReply-To: " . SITE_EMAIL . "\r\nX-Priority: 3\r\n";
+            }
+        }
         
         switch ($this->type)
@@ -113 +96 @@
                 break;
             default:
-                $return_path = "-f " . SITE_EMAIL;
-                mail($this->to, $this->subject, $this->body, $this->headers, $return_path);
+                if (SMTP_ON == 'true') {
+                    $this->doSmtpEmail();
+                } else {
+                    $return_path = "-f " . SITE_EMAIL;
+                    mail($this->to, $this->subject, $this->body, $this->headers, $return_path);
+                }
         }
+    }
+    
+    
+    /**
+     * Send email using SMTP authentication and SSL Encryption
+     */
+    public function doSmtpEmail()
+    {
+        //  Only create a new smtp object if we don't already have one:
+        if (!is_object($this->smtp))
+        {
+            $smtp_array = array (
+                'host' => SMTP_HOST, 
+                'port' => SMTP_PORT,
+                'auth' => true, 
+                'username' => SMTP_USERNAME, 
+                'password' => SMTP_PASSWORD
+            );
+
+            require_once "Mail.php";
+            $this->smtp = Mail::factory('smtp', $smtp_array);
+        }
+
+        $mail = $this->smtp->send($this->to, $this->headers, $this->body);
+
+        
+        if (PEAR::isError($mail)) {
+            echo("<p>" . $mail->getMessage() . "</p>");
+            exit;
+        } 
     }
 }

trunk/libs/Feeds.php

@@ -79 +79 @@
                 
                 // Title
-                $output .= "<a href='" . $item->get_permalink() . "'>" . $item->get_title() . "</a><br />";
+                $output .= "<a href='" . $item->get_permalink() . "'>" . sanitize($item->get_title(), 'tags') . "</a><br />";
                 
                 if ($item_count < $items_with_content)
@@ -96 +96 @@
                     
                     // Content
-                    $output .= substr(strip_tags($item->get_content()), 0, $max_chars);
+                    $output .= substr(sanitize($item->get_content(), 'tags'), 0, $max_chars);
                     $output .= "... ";
                     
                     // Read more
-                    $output .= "<small><a href='" . $item->get_permalink() . "' title='" . $item->get_title() . "'>[" . $lang["admin_news_read_more"] . "]</a>";
+                    $output .= "<small><a href='" . $item->get_permalink() . "' title='" . sanitize($item->get_title(), 'tags') . "'>[" . $lang["admin_news_read_more"] . "]</a>";
                     $output .= "</small>";
                 }

trunk/libs/InspektExtras.php

@@ -163 +163 @@
     protected function inspekt($text)
     {
-        $config = array('safe' => 1);
+        /*  make_tag_strict is OFF because we don't want to convert <u>, etc. to css 
+            otherwise the strip_tags won't be able to allow them when requested in sanitize(). */
+        $config = array('safe' => 1, 'make_tag_strict' => 0);
         
         // Allow plugins to alter the value of $config/

trunk/libs/extensions/ezSQL/mysql/ez_sql_mysql.php

@@ -226 +226 @@
             {
                 if (defined(DEBUG) && (DEBUG == 'true')) {
-                    $headers = "From: " . SITE_EMAIL . "\r\nReply-To: " . SITE_EMAIL . "\r\nX-Priority: 3\r\n";
                     $subject = SITE_NAME . " Database Error";
                     $body = SITE_NAME . " Database Error\r\n\r\n";
@@ -248 +247 @@
                     // 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 = new EmailFunctions();
+                    $emailFunctions->subject = $subject;
+                    $emailFunctions->body = $body;
                     $emailFunctions->doEmail();
                 }