Changeset 1210

Timestamp:

02/22/10 05:41:34 (3 years ago)

Author:

nick_ramsay

Message:

[Trunk] SB Base 0.3, Stop Spam 0.3, Related Posts 0.4 - upgrade those plugins. Note the new changes in the sb_list.php template.

Location:

trunk/content/plugins

Files:

• . (modified) (1 prop)
• related_posts/readme.txt (modified) (1 diff)
• related_posts/related_posts.php (modified) (4 diffs)
• sb_base/languages/sb_base_language.php (modified) (1 diff)
• sb_base/libs/SbBaseFunctions.php (modified) (1 diff)
• sb_base/readme.txt (modified) (1 diff)
• sb_base/sb_base.php (modified) (4 diffs)
• sb_base/templates/sb_list.php (modified) (2 diffs)
• sb_base/templates/sb_no_posts.php (copied) (copied from branches/1.2/content/plugins/sb_base/templates/sb_no_posts.php)
• stop_spam/libs/StopSpam.php (modified) (1 diff)
• stop_spam/readme.txt (modified) (1 diff)
• stop_spam/stop_spam.php (modified) (1 diff)
• submit/libs/SubmitFunctions.php (modified) (1 diff)

trunk/content/plugins/related_posts/readme.txt

@@ -15 +15 @@
 Changelog
 ---------
+v.0.4 2010/02/22 - Nick - Caches the HTML results until the tags table is updated
 v.0.3 2010/02/20 - Nick - Fix for SQL warning when no tags present
 v.0.2 2009/12/31 - Nick - Compatibility with Hotaru 1.0

trunk/content/plugins/related_posts/related_posts.php

@@ -3 +3 @@
  * name: Related Posts
  * description: Show a list of related posts
- * version: 0.3
+ * version: 0.4
  * folder: related_posts
  * class: relatedPosts
@@ -165 +165 @@
         $search_terms = $tags;
         
+        $need_cache = false;
+        
+        // check for a cached version and use it if no recent update:
+        $output = $h->smartCache('html', 'tags', 60, '', 'related_posts_' . $original_id);
+        if ($output) {
+            echo $output; // cached HTML
+            return true;
+        } else {
+            $need_cache = true;
+        }
+        
+        // get the results and generate HTML:
         $output = $this->showRelatedPosts($h, $search_terms, $num_posts);
+        
+        // write them to the cache
+        if ($need_cache) {
+            $h->smartCache('html', 'tags', 60, $output, 'related_posts_' . $original_id); // make or rewrite the cache file
+        }
+        
         echo $output;
         
@@ -213 +231 @@
     
     /**
-     * Message when no related posts found, or no tags present
+     * Message when no related posts found, or no tags present on submit step 3
      *
      * @param string $output
@@ -220 +238 @@
     public function noRelatedPosts($h, $output = '')
     {
-        // Commented this out because I doubt anyone will want to see a "No related posts found" message. Handy for testing, though!
-        /*
-        $output .= "<div id='related_posts_none'>\n";
-        $output .= $h->lang['related_links_no_results'];
-        $output .= "</div>\n";
-        */
+        if ($h->isPage('submit3')) { 
+            $output .= "<div id='related_posts_none'>\n";
+            $output .= $h->lang['related_links_no_results'];
+            $output .= "</div>\n";
+        }
         
         return $output;

trunk/content/plugins/sb_base/languages/sb_base_language.php

@@ -40 +40 @@
 $lang["sb_base_top_365_days"] = "Top Posts (last 365 Days)";
 $lang["sb_base_top_all_time"] = "Top Posts (All-Time)";
+$lang["sb_base_no_posts"] = "No posts found.";
 
 /* Post */

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

@@ -327 +327 @@
         // When a user clicks a parent category, we need to show posts from all child categories, too.
         // This only works for one level of sub-categories.
-        if ($category) {
+        if ($category && $cat_id) {
             $filter_string = '(post_category = %d';
             $values = array($cat_id);

trunk/content/plugins/sb_base/readme.txt

@@ -14 +14 @@
 Changelog
 ---------
+v.0.3 2010/02/21 - Nick - Bug fixes, cleaner list template and new "sb_no_posts" template
 v.0.2 2010/02/18 - Nick - Code changes for pagination
 v.0.1 2009/12/16 - Nick - Released first version

trunk/content/plugins/sb_base/sb_base.php

@@ -3 +3 @@
  * name: SB Base
  * description: Social Bookmarking base - provides "list" and "post" templates. 
- * version: 0.2
+ * version: 0.3
  * folder: sb_base
  * class: SbBase
@@ -123 +123 @@
         // get settings
         $h->vars['sb_base_settings'] = $h->getSerializedSettings('sb_base');
-        $h->vars['posts_per_page'] = $h->vars['sb_base_settings']['posts_per_page'];
+        $posts_per_page = $h->vars['sb_base_settings']['posts_per_page'];
         
         // if a list, get the posts:
@@ -129 +129 @@
         {
             case 'list':
-                $h->vars['post_count'] = $sb_funcs->prepareList($h, '', 'count');   // get the number of posts
-                $h->vars['post_query'] = $sb_funcs->prepareList($h, '', 'query');   // and the SQL query used
+                $post_count = $sb_funcs->prepareList($h, '', 'count');   // get the number of posts
+                $post_query = $sb_funcs->prepareList($h, '', 'query');   // and the SQL query used
+                $h->vars['pagedResults'] = $h->pagination($post_query, $post_count, $posts_per_page, 'posts');
                 break;
             case 'post':
@@ -289 +290 @@
                 
             case 'list':
-                
-                $h->displayTemplate('sb_list');
+                if (isset($h->vars['pagedResults']->items)) {
+                    $h->displayTemplate('sb_list');
+                    echo $h->pageBar($h->vars['pagedResults']);
+                } else {
+                    $h->displayTemplate('sb_no_posts');
+                } 
                 return true;
         }

trunk/content/plugins/sb_base/templates/sb_list.php

@@ -25 +25 @@
  */
 
-?>
-<?php 
-if ($h->vars['post_count']) {
-    
-    $pagedResults = $h->pagination($h->vars['post_query'], $h->vars['post_count'], $h->vars['posts_per_page'], 'posts');
-    foreach ($pagedResults->items as $post) {
-        $h->readPost(0, $post);
-        $user = new UserBase();
-        $user->getUserBasic($h, $h->post->author);
+foreach ($h->vars['pagedResults']->items as $post) {
+    $h->readPost(0, $post);
+    $user = new UserBase();
+    $user->getUserBasic($h, $h->post->author);
 ?>
 
@@ -97 +92 @@
     <!-- END POST --> 
 
-<?php    
-    }
-    echo $h->pageBar($pagedResults);
-}
-?>
+<?php } ?>

trunk/content/plugins/stop_spam/libs/StopSpam.php

@@ -100 +100 @@
         $url .= "&api_key=" . $apikey;
         
-        /*
-        // Old method:
         require_once(EXTENSIONS . 'SWCMS/class.httprequest.php');
         $r = new HTTPRequest($url);
         $error = $r->DownloadToString();
-        if (!$error) { echo "Success"; } else { echo $error; }
-        */
-        
-        // New method:
-        // http://www.phpfour.com/blog/2008/01/php-http-class/
-        require_once(EXTENSIONS . 'http/class.http.php');
-        $http = new Http();
-        $http->execute($url);
-        //if (!$http->error) { echo "Success"; } else { echo $http->error; }
+        //if (!$error) { echo "Success"; } else { echo $error; }
     }
 }

trunk/content/plugins/stop_spam/readme.txt

@@ -27 +27 @@
 Changelog
 ---------
+v.0.3 2010/02/22 - Nick - Reverted to SWCMS httprequest class to avoid CURL warnings
 v.0.2 2010/01/04 - Nick - Updates for compatibility with Hotaru 1.0
 v.0.1 2009/11/23 - Nick - Released first version

trunk/content/plugins/stop_spam/stop_spam.php

@@ -3 +3 @@
  * name: StopSpam
  * description: Checks new users against the StopForumSpam.com blacklist
- * version: 0.2
+ * version: 0.3
  * folder: stop_spam
  * class: StopSpam

trunk/content/plugins/submit/libs/SubmitFunctions.php

@@ -692 +692 @@
     {
         require_once(EXTENSIONS . 'SWCMS/class.httprequest.php');
-        //require_once(EXTENSIONS . 'http/class.http.php');
         
         if ($url != 'http://' && $url != ''){
             $r = new HTTPRequest($url);
             $string = $r->DownloadToString();
-            //$http = new Http();
-            //$http->execute($url);
-            //$string = $http->result;
         } else {
             $string = '';