[php-blog-cvs] serendipity index.php,1.49.2.3,1.49.2.4 serendipity_functions.inc.php,1.419.2.34,1.419.2.35

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

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

Modified Files:
      Tag: branch-smarty
	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.419.2.34
retrieving revision 1.419.2.35
diff -u -d -r1.419.2.34 -r1.419.2.35
--- serendipity_functions.inc.php	26 Sep 2004 20:42:18 -0000	1.419.2.34
+++ serendipity_functions.inc.php	27 Sep 2004 12:13:49 -0000	1.419.2.35
@@ -1040,6 +1040,7 @@
                         'is_cview_linear'       => ($serendipity['GET']['cview'] == VIEWMODE_LINEAR ? true : false),
                         'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : false),
                         'is_comment_added'      => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true' ? true: false),
+                        'is_comment_moderate'   => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'moderate' ? true: false),
                         'is_comment_closed'     => (!serendipity_db_bool($entry['allow_comments']) ? true : false)
                     )
                 );

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.3
retrieving revision 1.49.2.4
diff -u -d -r1.49.2.3 -r1.49.2.4
--- index.php	19 Sep 2004 00:31:24 -0000	1.49.2.3
+++ index.php	27 Sep 2004 12:13:49 -0000	1.49.2.4
@@ -114,7 +114,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;