Changeset 374 for trunk/b2-include/b2template.functions.php

Timestamp:

09/20/2003 12:03:21 AM (21 years ago)

Author:

mikelittle

Message:

Comments should not visible on password protected post until password entered.

File:

• trunk/b2-include/b2template.functions.php (modified) (2 diffs)

trunk/b2-include/b2template.functions.php

@@ -1158 +1158 @@
 
 function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
-    global $id, $b2commentspopupfile, $b2commentsjavascript, $post, $wpdb, $tablecomments;
+    global $id, $b2commentspopupfile, $b2commentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS;
     global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
     $number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id");
@@ -1165 +1165 @@
         return;
     } else {
-        echo "<a href=\"$siteurl/";
-        if ($b2commentsjavascript) {
-            echo $b2commentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
-            echo '" onclick="b2open(this.href); return false"';
-        } else {
-            // if comments_popup_script() is not in the template, display simple comment link
-            comments_link();
-            echo '"';
-        }
-        if (!empty($CSSclass)) {
-            echo ' class="'.$CSSclass.'"';
-        }
-        echo '>';
-        comments_number($zero, $one, $more);
-        echo '</a>';
-    }
+        if (!empty($post->post_password)) { // if there's a password
+            if ($HTTP_COOKIE_VARS['wp-postpass'] != $post->post_password) {  // and it doesn't match the cookie
+                echo("Enter your password to view comments");
+                return;
+            }
+        }
+        echo "<a href=\"$siteurl/";
+        if ($b2commentsjavascript) {
+            echo $b2commentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
+            echo '" onclick="b2open(this.href); return false"';
+        } else {
+            // if comments_popup_script() is not in the template, display simple comment link
+            comments_link();
+            echo '"';
+        }
+        if (!empty($CSSclass)) {
+            echo ' class="'.$CSSclass.'"';
+        }
+        echo '>';
+        comments_number($zero, $one, $more);
+        echo '</a>';
+    }
+    
 }