svn commit: r1052344 - in /incubator/vcl/trunk/web/.ht-inc: groups.php privileges.php

[jf...@apache.org]

Author: jfthomps
Date: Thu Dec 23 18:12:32 2010
New Revision: 1052344

URL: http://svn.apache.org/viewvc?rev=1052344&view=rev
Log:
VCL-113
inconsistances with "None" user group

groups.php: modified viewGroups - removed references to usergroup with id of 82 and/or name of None (as related to the usergroup table) - all occurances were related to removing it from being displayed except one select box where it was set as the default even though it could have been removed from the array supplied as data for the select box

privileges.php: modified viewNodes - removed one place where usergroup with id of 82 was being removed if it existed

Modified:
    incubator/vcl/trunk/web/.ht-inc/groups.php
    incubator/vcl/trunk/web/.ht-inc/privileges.php

Modified: incubator/vcl/trunk/web/.ht-inc/groups.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/groups.php?rev=1052344&r1=1052343&r2=1052344&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/groups.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/groups.php Thu Dec 23 18:12:32 2010
@@ -49,7 +49,6 @@ function viewGroups() {
 	$modetype = getContinuationVar("type");
 
 	$usergroups = getUserGroups(1);
-	unset($usergroups[82]);  // remove None group
 	if($user['showallgroups'])
 		$affilusergroups = $usergroups;
 	else
@@ -112,7 +111,7 @@ function viewGroups() {
 	print "</TD>\n";
 	print "    <TD><INPUT type=text name=owner size=15></TD>\n";
 	print "    <TD>\n";
-	printSelectInput("editgroupid", $affilusergroups, 82);
+	printSelectInput("editgroupid", $affilusergroups);
 	print "    </TD>\n";
 	print "    <TD><INPUT type=text name=initialmax maxlength=4 size=4 ";
 	print "value=240></TD>\n";
@@ -130,8 +129,6 @@ function viewGroups() {
 	print "  </TR>\n";
 	$dispUserGrpIDs = array();
 	foreach(array_keys($usergroups) as $id) {
-		if($usergroups[$id]["name"] == " None")
-			continue;
 		# figure out if user is owner or in editor group
 		$owner = 0;
 		$editor = 0;
@@ -223,8 +220,6 @@ function viewGroups() {
 		print "    </TD>\n";
 		print "    <TD><INPUT type=text name=name maxlength=30 size=10></TD>\n";
 		print "    <TD colspan=2>\n";
-		# remove the "None" group
-		unset($usergroups[82]);
 		# find a custom group the user is in and make it the default
 		$defaultgroupkey = "";
 		foreach(array_keys($user["groups"]) as $grpid) {

Modified: incubator/vcl/trunk/web/.ht-inc/privileges.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/privileges.php?rev=1052344&r1=1052343&r2=1052344&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/privileges.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/privileges.php Thu Dec 23 18:12:32 2010
@@ -397,8 +397,6 @@ function viewNodes() {
 	print "    <TD>\n";
 	# FIXME should $groups be only the user's groups?
 	$groups = getUserGroups(0, $user['affiliationid']);
-	if(array_key_exists(82, $groups))
-		unset($groups[82]); # remove None group
 	printSelectInput("newgroupid", $groups, -1, 0, 0, 'newgroupid');
 	print "    </TD>\n";