start working on some shit

Author: Arisotura

lib/permissions.php

@@ -64,8 +64,6 @@ function LoadGroups()
 		$loguserGroup['id'], $secgroups, $loguserid);
 	$loguserPermset = LoadPermset($res);
 
-	$maxrank = FetchResult("SELECT MAX(rank) FROM {usergroups}");
-	
 	$loguser['banned'] = ($loguserGroup['id'] == Settings::get('bannedGroup'));
 	$loguser['root'] = ($loguserGroup['id'] == Settings::get('rootGroup'));
 }
@@ -172,6 +170,90 @@ function ForumsWithPermission($perm, $guest=false)
 	return $ret;
 }
 
+// retrieves the given permissions for the given users
+// retrieves all possible permissions if $perms is left out
+function GetUserPermissions($users, $perms=null)
+{
+	if (is_array($users))
+		$userclause = 'IN ({0c})';
+	else
+		$userclause = '= {0}';
+	
+	// retrieve all the groups those users belong to
+	$allgroups = Query("	
+				SELECT primarygroup gid, id uid, 0 type FROM {users} WHERE id {$userclause}
+		UNION 	SELECT groupid gid, userid uid, 1 type FROM {secondarygroups} WHERE userid {$userclause}",
+		$users);
+		
+	$primgroups = array();	// primary group IDs
+	$secgroups = array();	// secondary group IDs
+	$groupusers = array();	// array of user IDs for each group
+	
+	while ($g = Fetch($allgroups))
+	{
+		if ($g['type'])
+			$secgroups[] = $g['gid'];
+		else
+			$primgroups[] = $g['gid'];
+		
+		$groupusers[$g['gid']][] = $g['uid'];
+	}
+	
+	// remove duplicate group IDs. This is faster than using array_unique.
+	$primgroups = array_flip(array_flip($primgroups));
+	$secgroups = array_flip(array_flip($secgroups));
+	
+	if (is_array($perms))
+		$permclause = 'AND perm IN ({3c})';
+	else if ($perms)
+		$permclause = 'AND perm = {3}';
+	else
+		$permclause = '';
+	
+	// retrieve all the permissions related to those users and groups
+	$res = Query("	
+				SELECT *, 1 ord FROM {permissions} WHERE applyto=0 AND id IN ({1c}) {$permclause}
+		UNION 	SELECT *, 2 ord FROM {permissions} WHERE applyto=0 AND id IN ({2c}) {$permclause}
+		UNION 	SELECT *, 3 ord FROM {permissions} WHERE applyto=1 AND id {$userclause} {$permclause}
+				ORDER BY ord", 
+		$users, $primgroups, $secgroups, $perms);
+		
+	$permdata = array();
+	$permord = array();
+	
+	// compile all the resulting permission lists for all the requested users
+	while ($p = Fetch($res))
+	{
+		if ($p['value'] == 0) continue;
+		
+		$k = $p['perm'];
+		if ($p['arg']) $k .= '_'.$p['arg'];
+		
+		if ($p['applyto'] == 0)	// group perm -- apply it to all the matching users
+		{
+			foreach ($groupusers[$p['id']] as $uid)
+			{
+				if ($p['ord'] > $permord[$uid][$k] || $permdata[$uid][$k] != -1)
+					$permdata[$uid][$k] = $p['value'];
+				
+				$permord[$uid][$k] = $p['ord'];
+			}
+		}
+		else	// user perm
+		{
+			$uid = $p['id'];
+			
+			if ($p['ord'] > $permord[$uid][$k] || $permdata[$uid][$k] != -1)
+				$permdata[$uid][$k] = $p['value'];
+			
+			$permord[$uid][$k] = $p['ord'];
+		}
+	}
+	
+	unset($permord);
+	return $permdata;
+}
+
 
 LoadGroups();
 $loguser['powerlevel'] = -1; // safety

pages/editgroups.php

@@ -1,17 +1,13 @@
 <?php
 
-die('this sucks');
+CheckPermission('admin.editgroups');
 
-if (!$loguser['almighty'])
-	Kill(__('You may not perform this action.'));
-
-$title = 'Edit groups';
+$title = __('Edit groups');
+MakeCrumbs(array(actionLink('admin') => __('Admin'), '' => __('Edit groups')));
 
 $gtypes = array(
-	-1 => __('Group for banned users'),
-	0 => __('Standard group'),
-	1 => __('Group for normal users'),
-	2 => __('Group for roots')
+	0 => __('Primary'),
+	1 => __('Secondary')
 );
 
 $gdisplays = array(
@@ -22,24 +18,19 @@
 
 if (!$_POST['saveaction'])
 {
-	$groups = Query("SELECT * FROM {usergroups} WHERE rank<={0} ORDER BY rank", $loguserGroup['rank']);
+	$groups = Query("SELECT * FROM {usergroups} WHERE rank<={0} ORDER BY type, rank", $loguserGroup['rank']);
+	$gdata = array();
 
-	echo '
-	<table class="outline margin">
-		<tr class="header1"><th>Groups</th></tr>
-		<tr class="cell1">
-			<td class="center">';
-	$i = 0;
 	while ($group = Fetch($groups))
 	{
-		echo '
-				'.($i==0?'':' - ').actionLinkTag('<span style="color:'.htmlspecialchars($group['color_unspec']).';">'.htmlspecialchars($group['title']).'</span>', 'editgroups', $group['id']);
-		$i++;
+		$gtitle = htmlspecialchars($group['title']);
+		if (!$group['type'])
+			$gtitle = '<span class="userlink" style="color:'.htmlspecialchars($group['color_unspec']).';">'.$gtitle.'</span>';
+		
+		$gdata[] = actionLinkTag($gtitle, 'editgroups', $group['id']);
 	}
-	echo '
-			</td>
-		</tr>
-	</table>';
+	
+	RenderTemplate('grouplist', array('groups' => $gdata));
 }
 
 if (isset($_GET['id']))
@@ -54,7 +45,7 @@
 
 	MakeCrumbs(array(actionLink('admin') => __('Admin'), actionLink('editgroups') => __('Edit groups'), '' => htmlspecialchars($group['title'])));
 
-	$canPromoteHigher = ($gid == $loguserGroup['id']);
+	$canPromoteHigher = $loguser['root'] && ($gid == $loguserGroup['id']);
 }
 else
 {

pages/editsmilies.php

@@ -143,7 +143,7 @@
 if($title)
 	$temp[__("Title")] = $title;
 
-$glist = '<strong style="color: '.htmlspecialchars($ugroup['color_unspec']).';">'.htmlspecialchars($ugroup['name']).'</strong>';
+$glist = '<strong class="userlink" style="color: '.htmlspecialchars($ugroup['color_unspec']).';">'.htmlspecialchars($ugroup['name']).'</strong>';
 foreach ($usgroups as $sgroup)
 {
 	if ($sgroup['display'] > -1)

pages/profile.php

@@ -0,0 +1,13 @@
+	<table class="outline margin grouplist">
+		<tr class="header1"><th>Groups</th></tr>
+		<tr class="cell1">
+			<td class="center">
+			{foreach $groups as $g}
+				{if !($g@first)}
+				 - 
+				{/if}
+				{$g}
+			{/foreach}
+			</td>
+		</td>
+	</table>