From 8c6e1531e686e8c0cb0fb12b8e41dc348b8f4d00 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sat, 28 Oct 2006 01:20:10 +0000
Subject: [PATCH] a bugfix against empty paramter "user"
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2870 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
htroot/User_p.html | 2 +-
htroot/User_p.java | 32 ++++++++++++++++++--------------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/htroot/User_p.html b/htroot/User_p.html
index 50aa1f7cf..5da676257 100644
--- a/htroot/User_p.html
+++ b/htroot/User_p.html
@@ -98,7 +98,7 @@ generic error.
::
Passwords do not match.
::
-Username too short. Username must be >= 4 Charakters.
+Username too short. Username must be >= 4 Characters.
#(/error)#
If you want to manage more Users, return to the user page.
diff --git a/htroot/User_p.java b/htroot/User_p.java
index 0074a697e..1ed4c5217 100644
--- a/htroot/User_p.java
+++ b/htroot/User_p.java
@@ -93,21 +93,25 @@ public class User_p {
//current_user = edited user
} else if(post.containsKey("user") && !((String)post.get("user")).equals("newuser")){
if(post.containsKey("change_user")){
- //defaults for newuser are set above
+ //defaults for newuser are set above
entry=sb.userDB.getEntry((String)post.get("user"));
- //TODO: set username read-only in html
- prop.put("page_current_user", post.get("user"));
- prop.put("page_username", post.get("user"));
- prop.put("page_firstname", entry.getFirstName());
- prop.put("page_lastname", entry.getLastName());
- prop.put("page_address", entry.getAddress());
- prop.put("page_timelimit", entry.getTimeLimit());
- prop.put("page_timeused", entry.getTimeUsed());
- prop.put("page_proxyRight", (entry.hasProxyRight()?1:0));
- prop.put("page_uploadRight", (entry.hasUploadRight()?1:0));
- prop.put("page_downloadRight", (entry.hasDownloadRight()?1:0));
- prop.put("page_adminRight", (entry.hasAdminRight()?1:0));
- prop.put("page_blogRight", (entry.hasBlogRight()?1:0));
+ // program crashes if a submit with emty username was made on previous mask and the user clicked on the
+ // link: "If you want to manage more Users, return to the user page." (parameter "user" is empty)
+ if (entry != null) {
+ //TODO: set username read-only in html
+ prop.put("page_current_user", post.get("user"));
+ prop.put("page_username", post.get("user"));
+ prop.put("page_firstname", entry.getFirstName());
+ prop.put("page_lastname", entry.getLastName());
+ prop.put("page_address", entry.getAddress());
+ prop.put("page_timelimit", entry.getTimeLimit());
+ prop.put("page_timeused", entry.getTimeUsed());
+ prop.put("page_proxyRight", (entry.hasProxyRight()?1:0));
+ prop.put("page_uploadRight", (entry.hasUploadRight()?1:0));
+ prop.put("page_downloadRight", (entry.hasDownloadRight()?1:0));
+ prop.put("page_adminRight", (entry.hasAdminRight()?1:0));
+ prop.put("page_blogRight", (entry.hasBlogRight()?1:0));
+ }
}else if( post.containsKey("delete_user") && !((String)post.get("user")).equals("newuser") ){
sb.userDB.removeEntry((String)post.get("user"));
}