Revert isAllowedUser commit and duplicate function to isAllowedPageUser()

1 files changed, 24 insertions, 3 deletions

diff --git a/etc/inc/priv.inc b/etc/inc/priv.inc
index 3d5adb3..88cc883 100644
--- a/etc/inc/priv.inc
+++ b/etc/inc/priv.inc
@@ -175,11 +175,32 @@ function get_user_privdesc(& $user) {
 	return $privs;
 }
 
-function isAllowedPage($page, $username) {
+function isAllowedPageUser($username, $page) {
 	global $_SESSION;
 
-	if($username == "")
-		$username = $_SESSION['Username'];
+	if (!isset($username))
+		return false;
+
+	/* admin/root access check */
+	$user = getUserEntry($username);
+	if (isset($user))
+		if (isset($user['uid']))
+			if ($user['uid']==0)
+				return true;
+
+	/* user privelege access check */
+	if (cmp_page_matches($page, $_SESSION['page-match']))
+		return true;
+
+	return false;
+}
+
+
+function isAllowedPage($page) {
+	global $_SESSION;
+
+
+	$username = $_SESSION['Username'];
 
 	if (!isset($username))
 		return false;