Changeset 8800

Timestamp:

09/03/2008 07:54:14 PM (16 years ago)

Author:

ryan

Message:

post_password_required(). fixes #7679

Location:

trunk

Files:

• wp-content/themes/classic/comments-popup.php (modified) (1 diff)
• wp-content/themes/classic/comments.php (modified) (1 diff)
• wp-content/themes/default/comments-popup.php (modified) (1 diff)
• wp-content/themes/default/comments.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/feed.php (modified) (2 diffs)
• wp-includes/post-template.php (modified) (3 diffs)

trunk/wp-content/themes/classic/comments-popup.php

@@ -34 +34 @@
 $comments = get_approved_comments($id);
 $commentstatus = get_post($id);
-if (!empty($commentstatus->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH] != $commentstatus->post_password) {  // and it doesn't match the cookie
+if ( post_password_required($commentstatus) ) {  // and it doesn't match the cookie
     echo(get_the_password_form());
 } else { ?>

trunk/wp-content/themes/classic/comments.php

@@ -1 @@
-<?php if ( !empty($post->post_password) && $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) : ?>
+<?php if ( post_password_required() ) : ?>
 <p><?php _e('Enter your password to view comments.'); ?></p>
 <?php return; endif; ?>

trunk/wp-content/themes/default/comments-popup.php

@@ -34 +34 @@
 $comments = get_approved_comments($id);
 $post = get_post($id);
-if (!empty($post->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
+if ( post_password_required($post) ) {  // and it doesn't match the cookie
     echo(get_the_password_form());
 } else { ?>

trunk/wp-content/themes/default/comments.php

@@ -3 +3 @@
         die ('Please do not load this page directly. Thanks!');
 
-    if (!empty($post->post_password)) { // if there's a password
-        if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
-            ?>
-
-            <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
-
-            <?php
-            return;
-        }
+    if ( post_password_required() ) { ?>
+        <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
+    <?php
+        return;
     }
 

trunk/wp-includes/comment-template.php

@@ -803 +803 @@
     }
 
-    if ( !empty($post->post_password) ) { // if there's a password
-        if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) || $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password ) {  // and it doesn't match the cookie
-            echo __('Enter your password to view comments');
-            return;
-        }
+    if ( post_password_required() ) {
+        echo __('Enter your password to view comments');
+        return;
     }
 

trunk/wp-includes/feed.php

@@ -395 +395 @@
  */
 function rss_enclosure() {
-    global $post;
-    if ( !empty($post->post_password) && (!isset($_COOKIE['wp-postpass_'.COOKIEHASH]) || $_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) )
+    if ( post_password_required() )
         return;
 
@@ -427 +426 @@
  */
 function atom_enclosure() {
-    global $post;
-    if ( !empty($post->post_password) && ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) )
+    if ( post_password_required() )
         return;
 

trunk/wp-includes/post-template.php

@@ -91 +91 @@
     $output = '';
 
-    if ( !empty($post->post_password) ) { // if there's a password
-        if ( !isset($_COOKIE['wp-postpass_'.COOKIEHASH]) || stripslashes($_COOKIE['wp-postpass_'.COOKIEHASH]) != $post->post_password ) {   // and it doesn't match the cookie
-            $output = get_the_password_form();
-            return $output;
-        }
+    if ( post_password_required($post) ) {  // If post password required and it doesn't match the cookie
+        $output = get_the_password_form();
+        return $output;
     }
 
@@ -146 +144 @@
     $output = '';
     $output = $post->post_excerpt;
-    if ( !empty($post->post_password) ) { // if there's a password
-        if ( !isset($_COOKIE['wp-postpass_'.COOKIEHASH]) || $_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password ) {  // and it doesn't match the cookie
-            $output = __('There is no excerpt because this is a protected post.');
-            return $output;
-        }
+    if ( post_password_required($post) ) {
+        $output = __('There is no excerpt because this is a protected post.');
+        return $output;
     }
 
@@ -226 +222 @@
 
     return apply_filters('post_class', $classes, $class, $post_id);
+}
+
+/**
+ * Determines if post requires a password and if the correct password has been provided
+ *
+ * {@internal Missing Long Description}}
+ *
+ * @package WordPress
+ * @subpackage Post
+ * @since 2.7
+ *
+ * @param int|object $post An optional post.  Global $post used if not provided.
+ * @return bool false if a password is not required or the correct password cookie is present, true otherwise
+ */
+function post_password_required( $post = null ) {
+    $post = get_post($post);
+
+    if ( empty($post->post_password) )
+        return false;
+
+    if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) )
+        return true;
+
+    if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password )
+        return true;
+
+    return false;
 }