Changeset 492853

Timestamp:

01/20/2012 11:11:27 PM (14 years ago)

Author:

Beer

Message:

add ttl to admin, add before/after features

File:

• ipb-comments-for-wordpress/trunk/class.ipbcomments.php (modified) (16 diffs)

ipb-comments-for-wordpress/trunk/class.ipbcomments.php

@@ -6 +6 @@
 
 class WP_IPBComments {
-
-    public $ttl = 180;                    // cache values will expire every 3 minutes or 180 seconds
 
     public $crosspost_edits = false;      // don't change this yet
@@ -49 +47 @@
             'manage_options',                         // capability required to use this menu option
             'ipb-comments',                           // slug to refer to this menu item
-            array($this,'show_options_page')  // optional callback function
+            array($this,'show_options_page')          // optional callback function
             );
 
@@ -60 +58 @@
     function register_comments() {
 
+        // where to put the link + link text
         switch ( $this->options['ipb_custom_link_filter'] ) {
 
             case 'before_comments':
+                add_filter( 'comments_array', array($this,'show_link_text') );
+                break;
+
             case 'after_comments':
-                add_filter( 'comments_array', array($this,'show_link_text') );
+                add_action( 'comment_form_before', array($this,'show_link_text') );
                 break;
 
@@ -71 +73 @@
                 add_filter( 'the_content', array($this,'show_link_text') );
                 break;
-
-            default:
-
         }
 
@@ -177 +176 @@
                         'topic_id' => intval($topicData['tid']),    // forum topic id 
                         'replies' => array(),                       // last X replies in topic
-                        'ttl' => $this->ttl,                        // time to live for cached replies
                         'timestamp' => time()                       // current timestamp of this update
                         ) );
@@ -193 +191 @@
 
     /**
-     * get the last 5 replies for IPB topic_id
+     * get the last X replies for IPB topic_id
      */
     function get_replies( $topic_id ) {
@@ -226 +224 @@
         $registry->init();
 
+        // build the select statement, skip the original post, we just want the replies
         $registry->DB()->build( array( 'select' => 'author_name,post_date,post', 
                             'from'  => 'posts',
                             'where' => 'topic_id = '.intval($topic_id),
-                            'order' => 'post_date DESC',
-                            'limit' => array(0,$this->options['ipb_field_show_comments'])
+                            'order' => 'post_date',
+                            'limit' => array(1,$this->options['ipb_field_show_comments'])
                             ) 
                         );
@@ -253 +252 @@
         }
 
-        return $replies;
+        // return the comments in reverse chronological order
+        return array_reverse($replies);
     }
 
@@ -369 +369 @@
     
             <li>
+            <label for="ttl">Cache TTL:</label>
+            <input type="text" size="3" name="ipb_comments_options[ipb_field_ttl]" 
+                value="<?php echo $this->options['ipb_field_ttl']; ?>" />
+                <em>180 (seconds to cache the forum replies)</em>
+            </li>
+
+            <li>
             <label for="member_id">Member ID:</label>
             <input type="text" size="5" name="ipb_comments_options[ipb_field_member_id]" 
@@ -473 +480 @@
         $topic_link_text = $this->options['ipb_field_link_text_wp'];
 
-        $link = sprintf( '<p class="ipb_discussion"><a href="%s">%s</a></p>', $topic_link, $topic_link_text );
+        $link_text = sprintf( '<p class="ipb_discussion"><a href="%s">%s</a></p>', $topic_link, $topic_link_text );
 
         // add it to the content/comments
@@ -479 +486 @@
 
             case 'before_comments':
+            case 'after_comments':
+                echo $this->get_forum_comments();
+                echo $link_text;
+                return $content;
+
             case 'before_content':
-                return $link.$content;
-
-            case 'after_comments':
+                return $this->get_forum_comments() . $link_text . $content;
+
             case 'after_content':
-                return $content.$link;
-
-            default:
+                return $content . $this->get_forum_comments() . $link_text;
+
+            default: 
                 return $content;
         }
@@ -500 +511 @@
      */
     
-    function show_forum_comments ( $comments ) {
-    
+    function get_forum_comments () {
+
         if ( ! is_single() ) return $comments;
         
@@ -522 +533 @@
         $meta = get_post_meta($post_ID,'forum_topic_meta');
         extract($meta[0]);
-    
+
         /**
          * check if cache has expired using timestamp and ttl against current time()
@@ -529 +540 @@
         $t = time();
 
-        if ( empty($meta) OR ($t - $timestamp > $ttl) OR empty($replies) ) {
+        $update_cache = (empty($meta) OR empty($replies) OR ($t - $timestamp > intval($this->options['ipb_field_ttl'])));
+
+        if ( $update_cache ) {
     
             $replies = $this->get_replies($topic_id);
@@ -568 +581 @@
          * Show our forum comments just above our post comments
          */
+        ob_start();
         ?>
         <div id="ipb_comments">
         <p class="ipb_discussion"><a href="<?php echo $topic_link; ?>"><?php echo $this->topic_text; ?></a></p>
-        <h4>Most recent comments:</h4>
+        <h4>Most recent forum comments:</h4>
             <ul>
                 <?php echo $reply_content; ?>
@@ -578 +592 @@
         <?php
 
-        return $comments;
+        return ob_get_clean();
     }