Alot of fixes to editusers

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2536 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Mar 10, 2007 · b85ad37 · b85ad37
1 parent a276d19
commit b85ad37
Showing 1 changed file with 24 additions and 12 deletions.
diff --git a/admin/html.php b/admin/html.php
@@ -1483,7 +1483,7 @@
 
 if ($action == "modifyuser")
 {
-	if($_SESSION['loginID'] == $_POST['uid'])
+	if($_SESSION['loginID'] == 1 || $_SESSION['loginID'] == $_POST['uid'])
 	{
 		$usersummary = "<table width='100%' border='0'>\n\t<tr><td colspan='4' bgcolor='black' align='center'>\n"
 		. "\t\t<strong><font color='white'>".$clang->gT("Modifying User")."</td></tr>\n"
@@ -1689,13 +1689,15 @@
 	{
 		$usersummary .= "\t\t<td align='center'><strong>---</strong></td>\n";
 	}
+	if ($_SESSION['loginID'] == 1)
+		{
 	$usersummary .= "\t\t<td align='center' style='padding-top:10px;'>\n"
 	."\t\t\t<form method='post' action='$scriptname'>"
 	."<input type='submit' value='".$clang->gT("Edit User")."' />"
 	."<input type='hidden' name='action' value='modifyuser' />"
 	."<input type='hidden' name='uid' value='{$usrhimself['uid']}' />"
 	."</form>";
-
+		}
 	// users are allowed to delete all successor users (but the admin not himself)
 	if ($usrhimself['parent_id'] != 0 && ($_SESSION['USER_RIGHT_DELETE_USER'] == 1 || ($usrhimself['uid'] == $_SESSION['loginID'])))
 	{
@@ -1740,7 +1742,7 @@
 			//."<select name='parent' size='1' onChange='document.getElementById(\"button{$usr['uid']}\").createElement(\"input\")'>";
 			if($usr['uid'] != $usrhimself['uid'])
 			{
-//				$usersummary .= "<option value='{$usrhimself['uid']}'";
+				//$usersummary .= "<option value='{$usrhimself['uid']}'";
 				if($usr['parent_id'] == $usrhimself['uid']) {
 					$usersummary .= $usrhimself['user'];
 				}
@@ -1755,7 +1757,8 @@
 
 		$usersummary .= "\t\t<td align='center' style='padding-top:10px;'>\n";
 		// users are allowed to delete all successor users (but the admin not himself)
-		if ($usr['parent_id'] != 0 && ($_SESSION['USER_RIGHT_DELETE_USER'] == 1 || ($usr['uid'] == $_SESSION['loginID'])))
+		//  || ($usr['uid'] == $_SESSION['loginID']))
+		if ($_SESSION['loginID'] == 1 || ($_SESSION['USER_RIGHT_DELETE_USER'] == 1  && $usr['parent_id'] == $_SESSION['loginID']))
 		{
 			$usersummary .= "\t\t\t<form method='post' action='$scriptname?action=deluser'>"
 			."<input type='submit' value='".$clang->gT("Delete")."' onClick='return confirm(\"".$clang->gT("Are you sure you want to delete this entry.")."\")' />"
@@ -1764,14 +1767,23 @@
 			."<input type='hidden' name='uid' value='{$usr['uid']}' />"
 			."</form>";
 		}
-
-		$usersummary .= "\t\t\t<form method='post' action='$scriptname'>"
-		."<input type='submit' value='".$clang->gT("Set User Rights")."' />"
-		."<input type='hidden' name='action' value='setuserrights' />"
-		."<input type='hidden' name='user' value='{$usr['user']}' />"
-		."<input type='hidden' name='uid' value='{$usr['uid']}' />"
-		."</form>";
-
+		if ($_SESSION['loginID'] == 1 || ($_SESSION['USER_RIGHT_CREATE_USER'] == 1 && ($usr['parent_id'] == $_SESSION['loginID'])))
+		{
+			$usersummary .= "\t\t\t<form method='post' action='$scriptname'>"
+			."<input type='submit' value='".$clang->gT("Set User Rights")."' />"
+			."<input type='hidden' name='action' value='setuserrights' />"
+			."<input type='hidden' name='user' value='{$usr['user']}' />"
+			."<input type='hidden' name='uid' value='{$usr['uid']}' />"
+			."</form>";
+		}
+		if ($_SESSION['loginID'] == 1 || ($_SESSION['USER_RIGHT_CREATE_USER'] == 1 && ($usr['uid'] == $_SESSION['loginID'] || $usr['parent_id'] == $_SESSION['loginID'])))
+		{
+			$usersummary .= "\t\t\t<form method='post' action='$scriptname'>"
+			."<input type='submit' value='".$clang->gT("Edit User")."' />"
+			."<input type='hidden' name='action' value='modifyuser' />"
+			."<input type='hidden' name='uid' value='{$usr['uid']}' />"
+			."</form>";
+		}
 		$usersummary .= "\t\t</td>\n"
 		. "\t</tr>\n";
 		$row++;