unittests added to some plugins

added "name" tag to all form elements

pythonrewrite/plugins/user_manager/unittests.py

@@ -0,0 +1,27 @@
+import WebInterfaceTestClass
+
+## this user may not be removed
+from user_manager import RESERVED_USERS
+
+class unittests(WebInterfaceTestClass.WebInterfaceTestClass):
+
+	def test_read_users(self):
+		print self._getUsers()
+		#self.cmd.showforms()
+
+
+	def _addUser(self, user, password):
+		self._gotPage()
+		## TODO: finish
+
+
+	def _gotoPage(self):
+		url = self.URL + "plugins/user_manager"
+		self.register_auth(url)
+		self.cmd.go(url)
+	
+
+	def _getUsers(self):
+		self._gotoPage()
+		self.cmd.find("Data.Status.Plugins.user_manager=([\w/]+)")
+		return self.locals["__match__"].split("/")

pythonrewrite/plugins/user_manager/user_list.cs

@@ -15,7 +15,7 @@
 
 <h2><?cs var:html_escape(Lang.Plugins.user_manager.Title.AddUser) ?></h2>
 <p>
-	<?cs call:print_form_header("plugins/user_manager") ?>
+	<?cs call:print_form_header("add_user", "plugins/user_manager") ?>
 	<table>
 		<tr><td class="left_column">
 			<label for="new_user"><?cs var:html_escape(Lang.Plugins.user_manager.Text.NewUser) ?>:</label></td>
@@ -38,7 +38,7 @@
 
 <h2><?cs var:html_escape(Lang.Plugins.user_manager.Title.ChangePassword) ?></h2>
 <p>
-	<?cs call:print_form_header("plugins/user_manager") ?>
+	<?cs call:print_form_header("change_password", "plugins/user_manager") ?>
 	<table>
 		<tr><td class="left_column">
 			<label for="chpw_user"><?cs var:html_escape(Lang.Plugins.user_manager.Text.ChangePasswordUser) ?>:</label></td>
@@ -66,7 +66,7 @@
 <h2><?cs var:html_escape(Lang.Plugins.user_manager.Title.DelUser) ?></h2>
 <p>
 	<table><tr><td class="left_column">
-	<?cs call:print_form_header("plugins/user_manager") ?>
+	<?cs call:print_form_header("del_user", "plugins/user_manager") ?>
 		<label for="user"><?cs var:html_escape(Lang.Plugins.user_manager.Text.DelUser) ?>: </label><select id="user" name="user" size="0">
 			<?cs each:x=Data.Plugins.user_manager.Users ?><?cs if:x != "admin" ?>
 				<option><?cs var:html_escape(x) ?></option>

pythonrewrite/plugins/user_manager/user_manager.py

@@ -1,5 +1,6 @@
 import CryptoBoxPlugin
 
+RESERVED_USERS = [ "admin" ]
 
 class user_manager(CryptoBoxPlugin.CryptoBoxPlugin):
 
@@ -7,8 +8,6 @@ class user_manager(CryptoBoxPlugin.CryptoBoxPlugin):
 	requestAuth = True
 	rank = 45
 
-	reservedUsers = [ "admin" ]
-
 	def doAction(self, store=None, user=None, new_pw=None, new_pw2=None):
 		import re
 		adminDict = self.cbox.prefs.userDB["admins"]
@@ -46,7 +45,7 @@ class user_manager(CryptoBoxPlugin.CryptoBoxPlugin):
 			else:
 				self.cbox.log.info("user_manager: invalid user choosen (%s)" % str(user))
 		elif store == "del_user":
-			if user in self.reservedUsers:
+			if user in RESERVED_USERS:
 				self.cbox.log.info("user_manager: tried to remove reserved user (%s)" % user)
 			elif user in adminDict.keys():
 				del adminDict[user]
@@ -64,7 +63,7 @@ class user_manager(CryptoBoxPlugin.CryptoBoxPlugin):
 
 
 	def getStatus(self):
-		return str(self.cbox.prefs.userDB["admins"].keys())
+		return "/".join(self.cbox.prefs.userDB["admins"].keys())
 
 
 	def __cleanHDF(self):