From f26b8fcb1be0a37ddcd6d931b871cafb3e94bb25 Mon Sep 17 00:00:00 2001
From: low012 <low012@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sat, 10 Jan 2009 12:58:35 +0000
Subject: [PATCH] *) comment mode is 'moderated' instead of 'activated' by
 default now (to avoid spam being visible)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5465 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/Blog.html                     | 2 ++
 htroot/Blog.java                     | 6 +++---
 source/de/anomic/data/blogBoard.java | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htroot/Blog.html b/htroot/Blog.html
index 34093a7ba..99c34b5e8 100644
--- a/htroot/Blog.html
+++ b/htroot/Blog.html
@@ -48,6 +48,7 @@
     </p>
     ::
     <!-- 1: edit -->
+    <h2>Edit</h2>
     <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
       <fieldset>
         <dl>
@@ -115,6 +116,7 @@
             <select name="commentMode" id="commentMode">
               <option value="0" #(commentMode)#selected="selected"::#(/commentMode)#>deactivated</option>
               <option value="1" #(commentMode)#::selected="selected"#(/commentMode)#>activated</option>
+              <option value="2" #(commentMode)#::::selected="selected"#(/commentMode)#>moderated</option>
             </select>
           </dd>
         </dl>
diff --git a/htroot/Blog.java b/htroot/Blog.java
index 32f808eea..845dffe59 100644
--- a/htroot/Blog.java
+++ b/htroot/Blog.java
@@ -7,7 +7,7 @@
 //
 // This File is contributed by Jan Sandbrink
 // Contains contributions from Marc Nause [MN]
-// last change: 06.05.2006
+// last change: 10.01.2009
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -153,7 +153,7 @@ public class Blog {
                 comments = page.getComments();
                 date = page.getDate();
             }
-            final String commentMode = post.get("commentMode", "1");
+            final String commentMode = post.get("commentMode", "2");
             final String StrSubject = post.get("subject", "");
             byte[] subject;
             try {
@@ -194,7 +194,7 @@ public class Blog {
             //preview the page
             if(hasRights) {
                 prop.put("mode", "2");//preview
-                prop.put("mode_commentMode", post.getInt("commentMode", 1));
+                prop.put("mode_commentMode", post.getInt("commentMode", 2));
                 prop.putHTML("mode_pageid", pagename);
                 try {
                     prop.putHTML("mode_author", new String(author, "UTF-8"));
diff --git a/source/de/anomic/data/blogBoard.java b/source/de/anomic/data/blogBoard.java
index 3b11ec711..8f4edea17 100644
--- a/source/de/anomic/data/blogBoard.java
+++ b/source/de/anomic/data/blogBoard.java
@@ -360,7 +360,7 @@ public class blogBoard {
             this.key = key;
             this.record = record;
             if (this.record.get("comments")==null) this.record.put("comments", listManager.collection2string(new ArrayList<String>()));
-            if (this.record.get("commentMode")==null || this.record.get("commentMode").equals("")) this.record.put("commentMode", "1");
+            if (this.record.get("commentMode")==null || this.record.get("commentMode").equals("")) this.record.put("commentMode", "2");
         }
         
         private void setKey(final String key) {
@@ -506,7 +506,7 @@ public class blogBoard {
         
         private void setCommentMode(final String mode) {
             if (mode == null) 
-                record.put("commentMode", "1");
+                record.put("commentMode", "2");
             else 
                 record.put("commentMode", mode);
         }