[wp-cvs]
wordpress wp-comments.php, 1.19, 1.20 wp-comments-reply.php,
1.4, NONE
Matthew Mullenweg
saxmatt at users.sourceforge.net
Thu Jun 10 03:41:00 CDT 2004
Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23396
Modified Files:
wp-comments.php
Removed Files:
wp-comments-reply.php
Log Message:
More comments and comment template improvements. TODO: popup comment template
--- wp-comments-reply.php DELETED ---
Index: wp-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-comments.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wp-comments.php 10 Jun 2004 07:42:48 -0000 1.19
--- wp-comments.php 10 Jun 2004 08:40:58 -0000 1.20
***************
*** 1,22 ****
- <?php // Do not delete these lines
- if ('wp-comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
- die ('Please do not load this page directly. Thanks!');
- $req = get_settings('require_name_email');
- if (($withcomments) or ($single)) {
-
- 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><?php _e("Enter your password to view comments."); ?><p>
<?php
- return;
- }
- }
! $comment_author = (isset($_COOKIE['comment_author_'.$cookiehash])) ? trim($_COOKIE['comment_author_'.$cookiehash]) : '';
! $comment_author_email = (isset($_COOKIE['comment_author_email_'.$cookiehash])) ? trim($_COOKIE['comment_author_email_'.$cookiehash]) : '';
! $comment_author_url = (isset($_COOKIE['comment_author_url_'.$cookiehash])) ? trim($_COOKIE['comment_author_url_'.$cookiehash]) : '';
! $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
?>
--- 1,13 ----
<?php
! if ('wp-comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
! die ('Please do not load this page directly. Thanks!');
! if ( !empty($post->post_password) && $_COOKIE['wp-postpass_'.$cookiehash] != $post->post_password) :
! ?>
! <p><?php _e('Enter your password to view comments.'); ?><p>
! <?php
! return;
! endif;
?>
***************
*** 24,88 ****
<h2 id="comments"><?php comments_number(__("Comments"), __("1 Comment"), __("% Comments")); ?>
! <?php if ('open' == $post->comment_status) { ?>
! <a href="#postcomment" title="<?php _e("Leave a comment"); ?>">»</a>
! <?php } ?>
</h2>
- <?php if ('open' == $post->ping_status) { ?>
- <p><?php _e("The <acronym title=\"Uniform Resource Identifier\">URI</acronym> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
- <?php } ?>
-
-
- <?php if ($comments) { ;?>
<ol id="commentlist">
! <?php foreach ($comments as $comment) { ?>
<li id="comment-<?php comment_ID() ?>">
<?php comment_text() ?>
! <p><cite><?php comment_type(); ?> <?php _e("by"); ?> <?php comment_author_link() ?> — <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
</li>
! <?php } // end for each comment ?>
</ol>
! <?php } else { // this is displayed if there are no comments so far ?>
! <p><?php _e("No comments yet."); ?></p>
! <?php } ?>
! <p><?php comments_rss_link(__("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post.")); ?></p>
! <h2 id="postcomment"><?php _e("Leave a comment"); ?></h2>
! <?php if ('open' == $post->comment_status) { ?>
! <p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
<p>
<input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
! <label for="author"><?php _e("Name"); ?></label> <?php if ($req) _e('(required)'); ?>
! <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
! <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]); ?>" />
</p>
<p>
<input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
! <label for="email"><?php _e("E-mail"); ?></label> <?php if ($req) _e('(required)'); ?>
</p>
<p>
<input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
! <label for="url"><?php _e("<acronym title=\"Uniform Resource Identifier\">URI</acronym>"); ?></label>
</p>
<p>
! <label for="comment"><?php _e("Your Comment"); ?></label>
<br />
! <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
</p>
<p>
! <input name="submit" type="submit" tabindex="5" value="<?php _e("Say It!"); ?>" />
</p>
</form>
- <?php } else { // comments are closed ?>
- <p><?php _e("Sorry, the comment form is closed at this time."); ?></p>
- <?php } ?>
! <?php // if you delete this the sky will fall on your head
! }
! ?>
--- 15,81 ----
<h2 id="comments"><?php comments_number(__("Comments"), __("1 Comment"), __("% Comments")); ?>
! <?php if ( comments_open() ) : ?>
! <a href="#postcomment" title="<?php _e("Leave a comment"); ?>">»</a>
! <?php endif; ?>
</h2>
+ <?php if ( $comments ) : ?>
<ol id="commentlist">
!
! <?php foreach ($comments as $comment) : ?>
<li id="comment-<?php comment_ID() ?>">
<?php comment_text() ?>
! <p><cite><?php comment_type(); ?> <?php _e('by'); ?> <?php comment_author_link() ?> — <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
</li>
! <?php endforeach; ?>
!
</ol>
!
! <?php else : ?>
! <p><?php _e('No comments yet.'); ?></p>
! <?php endif; ?>
!
! <p><?php comments_rss_link(__('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.')); ?>
! <?php if ( pings_open() ) : ?>
! <a href="<?php trackback_url() ?>"><?php _e('TrackBack <abbr title="Uniform Resource Identifier">URI</abbr>'); ?></a>
! <?php endif; ?>
! </p>
!
! <?php if ( comments_open() ) : ?>
! <h2 id="postcomment"><?php _e('Leave a comment'); ?></h2>
!
! <p><?php _e('Line and paragraph breaks automatic. E-mail address never displayed. <abbr title="HyperText Markup Language">HTML</abbr> allowed:'); ?> <code><?php echo allowed_tags(); ?></code></p>
<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
<p>
<input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
! <label for="author"><?php _e('Name'); ?></label> <?php if ($req) _e('(required)'); ?>
! <input type="hidden" name="comment_post_ID" value="<?php echo $post->ID; ?>" />
! <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($_SERVER['REQUEST_URI']); ?>" />
</p>
<p>
<input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
! <label for="email"><?php _e('E-mail'); ?></label> <?php if ($req) _e('(required)'); ?>
</p>
<p>
<input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
! <label for="url"><?php _e('<acronym title="Uniform Resource Identifier">URI</acronym>'); ?></label>
</p>
<p>
! <label for="comment"><?php _e('Your Comment'); ?></label>
<br />
! <textarea name="comment" id="comment" cols="60" rows="4" tabindex="4"></textarea>
</p>
<p>
! <input name="submit" id="submit" type="submit" tabindex="5" value="<?php _e('Say It!'); ?>" />
</p>
</form>
! <?php else : // Comments are closed ?>
! <p><?php _e('Sorry, the comment form is closed at this time.'); ?></p>
! <?php endif; ?>
\ No newline at end of file
More information about the cvs
mailing list