Add parsing of the ! separator to user page URLs.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/controllers/Users.class.php b/src/controllers/Users.class.php
index 447a70f..a1ad2fe 100644
--- a/src/controllers/Users.class.php
+++ b/src/controllers/Users.class.php
@@ -87,17 +87,20 @@ class Users extends Controller {
 		$db = $mm->database();
 		$pm = $mm->pluginManager();
 
-		$username = implode('/', $remainder);
-		if ($username == 'all') {
+		$usernames = implode('/', $remainder);
+		$uids = array();
+		if ($usernames == 'all') {
 			$uids = $db->listUsers();
 		} else {
-			$uids = array($db->getUID($username));
+			foreach (explode('!', $usernames) as $username) {
+				$uids[] = $db->getUID($username);
+			}
 		}
-
+		
 		$vars = array();
 		
 		if (count($uids)<2) {
-			$user = Auth::getObj($uid);
+			$user = Auth::getObj($uids[0]);
 			
 			if ($user->isGroup()) $uid = false; // ignore groups.
 			
@@ -129,7 +132,7 @@ class Users extends Controller {
 		foreach ($uids as $uid) {
 			$vars['users'][] = Auth::getObj($uid);
 		}
-		$vars['username'] = $username;
+		$vars['usernames'] = $usernames;
 		$vars['config_options'] = $config_options;
 		$vars['groups'] = $db->listGroupNames();
 		require_once('ContactMethod.class.php');