[php-blog-cvs] serendipity index.php,1.50,1.51 serendipity_functions.inc.php,1.432,1.433

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18261

Modified Files:
	index.php serendipity_functions.inc.php 
Log Message:
* Do not use RBLs by default
* Do not perform IP-restriction by default
* Jump to notification area after comment submission
* If moderation is performed, we should display that to the user



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -d -r1.432 -r1.433
--- serendipity_functions.inc.php	23 Sep 2004 12:31:57 -0000	1.432
+++ serendipity_functions.inc.php	27 Sep 2004 12:14:38 -0000	1.433
@@ -216,7 +216,7 @@
 ?>
 <div class="serendipityCommentForm">
     <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_CommentForm"></a>
-    <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>" method="post">
+    <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>#feedback" method="post">
     <div><input type="hidden" name="serendipity[entry_id]" value="<?php echo $id; ?>" /></div>
     <table border="0" width="100%" cellpadding="3">
         <tr>
@@ -1377,7 +1377,9 @@
                           $serendipity['POST']['replyTo']
                         );
                     }
-
+?>
+            <a id="feedback"></a>
+<?php
                     if (isset($serendipity['messagestack']['comments'])) {
                         foreach ((array)$serendipity['messagestack']['comments'] as $message ) {
 ?>
@@ -1391,6 +1393,11 @@
             <br />
             <div class="serendipity_center serendipity_msg_notice"><?php echo COMMENT_ADDED; ?></div>
 <?php
+                    } elseif (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'moderate') {
+?>
+            <br />
+            <div class="serendipity_center serendipity_msg_notice"><?php echo COMMENT_ADDED . '<br />' . THIS_COMMENT_NEEDS_REVIEW; ?></div>
+<?php
                     } elseif (!serendipity_db_bool($entry['allow_comments'])) {
 ?>
             <br />

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- index.php	14 Sep 2004 12:56:08 -0000	1.50
+++ index.php	27 Sep 2004 12:14:38 -0000	1.51
@@ -104,7 +104,7 @@
         $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
-                header('Location: ' . $_SERVER['REQUEST_URI'] . (strstr($_SERVER['REQUEST_URI'], '?') ? '&' : '?') . 'serendipity[csuccess]=true');
+                header('Location: ' . $_SERVER['REQUEST_URI'] . (strstr($_SERVER['REQUEST_URI'], '?') ? '&' : '?') . 'serendipity[csuccess]=' . $serendipity['csuccess']);
                 exit;
             } else {
                 $serendipity['messagestack']['comments'][] = COMMENT_NOT_ADDED;