*) added login link to blog

*) added copyright notice to blog.java
*) deleted some whitespaces in the code


git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1991 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/Blog.html

@@ -19,7 +19,7 @@
 #{/entries}#
 #(moreentries)#::<a href="Blog.html?start=#[start]#&num=#[num]#">show more entries...</a>#(/moreentries)#
 <br>
-#(admin)#::<a href="Blog.html?edit=true">new entry</a> - #(/admin)#<a href="Blog.html">Blog-Home</a></center>
+#(admin)#<a href="Blog.html?login=true">Login</a> - ::<a href="Blog.html?edit=true">new entry</a> - #(/admin)#<a href="Blog.html">Blog-Home</a></center>
 ::
 <!-- 1: edit -->
 <form action="Blog.html" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">

htroot/Blog.java

@@ -1,3 +1,51 @@
+// Blog.java 
+// -----------------------
+// part of YACY
+// (C) by Michael Peter Christen; mc@anomic.de
+// first published on http://www.anomic.de
+// Frankfurt, Germany, 2004
+//
+// This File is contributed by Jan Sandbrink
+// Contains contributions from Marc Nause [MN]
+// last change: 03.04.2006
+//
+// 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// Using this software in any meaning (reading, learning, copying, compiling,
+// running) means that you agree that the Author(s) is (are) not responsible
+// for cost, loss of data or any harm that may be caused directly or indirectly
+// by usage of this softare or this documentation. The usage of this software
+// is on your own risk. The installation and usage (starting/running) of this
+// software may allow other people or application to access your computer and
+// any attached devices and is highly dependent on the configuration of the
+// software which must be done by the user of the software; the author(s) is
+// (are) also not responsible for proper configuration and usage of the
+// software, even if provoked by documentation provided together with
+// the software.
+//
+// Any changes to this file according to the GPL as documented in the file
+// gpl.txt aside this file in the shipment you received can be done to the
+// lines that follows this copyright notice here, but changes must not be
+// done inside the copyright notive above. A re-distribution must contain
+// the intact and unchanged copyright notice.
+// Contributions and changes to the program code must be marked as such.
+
+// You must compile this file with
+// javac -classpath .:../Classes Blacklist_p.java
+// if the shell's current path is HTROOT
+
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
@@ -26,12 +74,6 @@ public class Blog {
 		serverObjects prop = new serverObjects();
 		
 		boolean hasRights = switchboard.verifyAuthentication(header, true);
-		if(!hasRights){
-		  userDB.Entry userentry = switchboard.userDB.proxyAuth((String)header.get("Authorization", "xxxxxx"));
-		  if(userentry != null && userentry.hasBlogRight()){
-		    hasRights=true;
-		  }
-		}
 
         if(hasRights) prop.put("mode_admin",1);
         else prop.put("mode_admin",0);
@@ -41,6 +83,17 @@ public class Blog {
             post.put("page", "blog_default");
         }
 
+        if(!hasRights){
+            userDB.Entry userentry = switchboard.userDB.proxyAuth((String)header.get("Authorization", "xxxxxx"));
+            if(userentry != null && userentry.hasBlogRight()){
+                hasRights=true;
+            }
+            //opens login window if login link is clicked - contrib [MN]
+            else if(post.containsKey("login")){
+                prop.put("AUTHENTICATE","admin log-in");
+            }
+		}
+
 		String pagename = post.get("page", "blog_default");
 	    String ip = post.get("CLIENTIP", "127.0.0.1");
 	    String author = post.get("author", "anonymous");