Renamed function that had _ in the functionname.

Made it possible to administer users if you have role CREATE (even if you are not logged on as Alpine)

git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@906 ab2d0c66-481e-0410-8bed-d214d4d58bed

2 files changed, 11 insertions, 10 deletions

diff --git a/app/acf-util/password-controller.lua b/app/acf-util/password-controller.lua
index 5882ba9..185c3e4 100755
--- a/app/acf-util/password-controller.lua
+++ b/app/acf-util/password-controller.lua
@@ -16,11 +16,11 @@ mvc.on_load = function(self, parent)
 end
 
 local function admin_permission()
-	if (sessiondata.userinfo) and (sessiondata.userinfo.userid == "alpine") then
+--	if (sessiondata.userinfo) and (sessiondata.userinfo.userid == "alpine") then
 		return true
-	else
-		return false
-	end
+--	else
+--		return false
+--	end
 end
 
 local function check_logonstatus(self)
@@ -101,8 +101,8 @@ function status(self)
 
 	-- Check for admin persmissions - else redirect to personal options
 	if not (admin_permission()) then
-		self.conf.action = "edit_me"
-		return edit_me(self)
+		self.conf.action = "editme"
+		return editme(self)
 	end
 
 	-- Redirect when creating a new account
@@ -181,9 +181,9 @@ function administrator(self)
 
 	-- Check for admin persmissions - else redirect to personal options
 	if not (admin_permission()) then
-		self.conf.action = "edit_me"
+		self.conf.action = "editme"
 		self.conf.type = "redir"
-		return edit_me(self)
+		return editme(self)
 	end
 
 	-- Output userinfo
@@ -209,7 +209,7 @@ function administrator(self)
 	return {config=output}
 end
 
-function edit_me(self)
+function editme(self)
 
 	-- Redirect the user if he's not logged in.
 	check_logonstatus(self)
diff --git a/app/acf-util/password.menu b/app/acf-util/password.menu
index de39793..1a7b62b 100755
--- a/app/acf-util/password.menu
+++ b/app/acf-util/password.menu
@@ -1,3 +1,4 @@
 #CAT  		GROUP/DESC		TAB		ACTION
-System		01User_management		Status		status
+System		01User_management		Administration	status
+System		01User_management		Edit_me		editme