+
+
+
+#%env/templates/footer.template%#
+
+
diff --git a/htroot/ConfigAccountList_p.java b/htroot/ConfigAccountList_p.java
new file mode 100644
index 000000000..e6ee44f63
--- /dev/null
+++ b/htroot/ConfigAccountList_p.java
@@ -0,0 +1,103 @@
+// ConfigAccountList_p.java
+// -------------------------
+// (c) 2017 by reger24; https://github.com/reger24
+//
+// This is a part of YaCy, a peer-to-peer based web search engine
+//
+// 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
+
+import java.util.Date;
+import java.util.Iterator;
+import net.yacy.cora.date.GenericFormatter;
+import net.yacy.cora.protocol.RequestHeader;
+import net.yacy.data.UserDB;
+import net.yacy.data.UserDB.AccessRight;
+import net.yacy.search.Switchboard;
+import net.yacy.server.serverObjects;
+import net.yacy.server.serverSwitch;
+
+public class ConfigAccountList_p {
+
+ public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) {
+
+ final serverObjects prop = new serverObjects();
+ final Switchboard sb = (Switchboard) env;
+ UserDB.Entry entry;
+
+ if (sb.userDB == null) {
+ prop.put("userlist", 0);
+ return prop;
+ }
+
+ //Generate Userlist
+ final Iterator it = sb.userDB.iterator(true);
+ int numUsers = 0;
+ while (it.hasNext()) {
+ entry = it.next();
+ if (entry == null) {
+ continue;
+ }
+ prop.putHTML("userlist_" + numUsers + "_username", entry.getUserName());
+ prop.putHTML("userlist_" + numUsers + "_lastname", entry.getLastName());
+ prop.putHTML("userlist_" + numUsers + "_firstname", entry.getFirstName());
+ prop.putHTML("userlist_" + numUsers + "_address", entry.getAddress());
+ if (entry.getLastAccess() != null) {
+ prop.put("userlist_" + numUsers + "_lastaccess", GenericFormatter.FORMAT_SIMPLE.format(new Date(entry.getLastAccess())));
+ } else {
+ prop.put("userlist_" + numUsers + "_lastaccess", "never");
+ }
+
+ final AccessRight[] rights = AccessRight.values();
+ String rightStr = "";
+ for (final AccessRight right : rights) {
+ if (entry.hasRight(right)) {
+ if (rightStr.isEmpty()) {
+ rightStr = right.getFriendlyName();
+ } else {
+ rightStr += ", " + right.getFriendlyName();
+ }
+ }
+ }
+ prop.putHTML("userlist_" + numUsers + "_rights", rightStr);
+
+ long percent;
+ if (entry.getTrafficLimit() != null) {
+ long limit = entry.getTrafficLimit();
+ long used = entry.getTrafficSize();
+ percent = used * 100 / limit;
+ prop.put("userlist_" + numUsers + "_time", percent);
+ } else {
+ prop.put("userlist_" + numUsers + "_time", "");
+ }
+
+ percent = -1;
+ if (entry.getTimeLimit() > 0) {
+ long limit = entry.getTimeLimit();
+ long used = entry.getTimeUsed();
+ percent = used * 100 / limit;
+ prop.put("userlist_" + numUsers + "_traffic", percent);
+ } else {
+ prop.put("userlist_" + numUsers + "_traffic", "");
+ }
+
+
+ numUsers++;
+ }
+ prop.put("userlist", numUsers);
+
+ // return rewrite properties
+ return prop;
+ }
+}
diff --git a/htroot/ConfigAccounts_p.html b/htroot/ConfigAccounts_p.html
index 40bd836aa..4a95fc370 100644
--- a/htroot/ConfigAccounts_p.html
+++ b/htroot/ConfigAccounts_p.html
@@ -75,7 +75,7 @@
+
#%env/templates/footer.template%#
diff --git a/htroot/ConfigAccounts_p.java b/htroot/ConfigAccounts_p.java
index 7ab11efc9..2b5a39f88 100644
--- a/htroot/ConfigAccounts_p.java
+++ b/htroot/ConfigAccounts_p.java
@@ -55,7 +55,7 @@ public class ConfigAccounts_p {
/* Acquire a transaction token for the next POST form submission */
prop.put(TransactionManager.TRANSACTION_TOKEN_PARAM, TransactionManager.getTransactionToken(header));
- final Switchboard sb = Switchboard.getSwitchboard();
+ final Switchboard sb = (Switchboard) env;
UserDB.Entry entry = null;
// admin password
@@ -156,8 +156,8 @@ public class ConfigAccounts_p {
//user != current_user
//user=from userlist
//current_user = edited user
- } else if (post.containsKey("user") && !"newuser".equals(post.get("user"))){
- TransactionManager.checkPostTransaction(header, post);
+ } else if (post.containsKey("user") && !"newuser".equals(post.get("user"))) {
+ TransactionManager.checkPostTransaction(header, post);
if (post.containsKey("change_user")) {
//defaults for newuser are set above
entry = sb.userDB.getEntry(post.get("user"));
@@ -183,7 +183,7 @@ public class ConfigAccounts_p {
sb.userDB.removeEntry(post.get("user"));
}
} else if (post.containsKey("change")) { //New User / edit User
- TransactionManager.checkPostTransaction(header, post);
+ TransactionManager.checkPostTransaction(header, post);
prop.put("text", "0");
prop.put("error", "0");
@@ -270,7 +270,24 @@ public class ConfigAccounts_p {
prop.putHTML("text_username", username);
prop.put("text", "2");
}//edit user
+
prop.putHTML("username", username);
+ if (entry != null) {
+ //TODO: set username read-only in html
+ prop.putHTML("current_user", entry.getUserName());
+ prop.putHTML("username", entry.getUserName());
+ prop.putHTML("firstname", entry.getFirstName());
+ prop.putHTML("lastname", entry.getLastName());
+ prop.putHTML("address", entry.getAddress());
+ prop.put("timelimit", entry.getTimeLimit());
+ prop.put("timeused", entry.getTimeUsed());
+ int count = 0;
+ for (final AccessRight right : rights) {
+ prop.put("rights_" + count + "_set", entry.hasRight(right) ? "1" : "0");
+ count++;
+ }
+ prop.put("rights", count);
+ }
}
//Generate Userlist
diff --git a/htroot/ConfigSearchPage_p.html b/htroot/ConfigSearchPage_p.html
index fa133af3b..1abb99c57 100644
--- a/htroot/ConfigSearchPage_p.html
+++ b/htroot/ConfigSearchPage_p.html
@@ -121,12 +121,6 @@
#(/search.navigation.location)#
-