diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-10-09 18:52:17 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-10-09 18:52:17 -0400 |
| commit | db4376c0c1d5d2ea72696e6d73b469cb2dc30b91 (patch) | |
| tree | d0e77f04664a5db2beb7286457be8d04703a8703 | |
| parent | 51226909b3f371245485b29b84a32aa1013a79b0 (diff) | |
Add parsing of the ! separator to user page URLs.
| -rw-r--r-- | src/controllers/Users.class.php | 15 | ||||
| -rw-r--r-- | src/views/pages/users/individual.html.php | 6 |
2 files changed, 12 insertions, 9 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'); diff --git a/src/views/pages/users/individual.html.php b/src/views/pages/users/individual.html.php index 39360b7..1ca346e 100644 --- a/src/views/pages/users/individual.html.php +++ b/src/views/pages/users/individual.html.php @@ -1,7 +1,7 @@ <?php global $VARS, $CONTACT_METHODS; $t = $VARS['template']; $users = $VARS['users']; -$username = $VARS['username']; +$usernames = $VARS['usernames']; function inputText($user, $key, $label, $hint='') { global $VARS; $t = $VARS['template']; @@ -58,9 +58,9 @@ function inputField($user, $arr) { //////////////////////////////////////////////////////////////////////////////// if (count($users)>1) { - $t->header("Users: $username"); + $t->header("Users: $usernames"); } else { - $t->header("User: $username"); + $t->header("User: $usernames"); } foreach($users as $user) { |