Continuing the New User management

core/css/styles.css

@@ -309,7 +309,7 @@ input[type="submit"].enabled {
 	position: fixed;
 	top:45px;
 	right: 0;
-	left: 0;
+	left:0;
 	height: 44px;
 	width: 100%;
 	padding: 0;

core/js/js.js

@@ -1087,6 +1087,7 @@ function initCore() {
 	$('a.action.delete').tipsy({gravity:'e', fade:true, live:true});
 	$('a.action').tipsy({gravity:'s', fade:true, live:true});
 	$('td .modified').tipsy({gravity:'s', fade:true, live:true});
+	$('td.lastLogin').tipsy({gravity:'s', fade:true, html:true});
 	$('input').tipsy({gravity:'w', fade:true});
 
 	// toggle for menus

lib/private/group/group.php

@@ -186,7 +186,7 @@ public function searchUsers($search, $limit = null, $offset = null) {
 	 * @param string $search
 	 * @return int|bool
 	 */
-	public function count($search) {
+	public function count($search = '') {
 		$users = false;
 		foreach ($this->backends as $backend) {
 			if($backend->implementsActions(OC_GROUP_BACKEND_COUNT_USERS)) {

lib/private/group/metadata.php

@@ -0,0 +1,188 @@
+<?php
+
+/**
+ * Copyright (c) 2014 Arthur Schiwon <[email protected]>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Group;
+
+class MetaData {
+	const SORT_NONE = 0;
+	const SORT_USERCOUNT = 1;
+
+	/**
+	 * @var string $user
+	 */
+	protected $user;
+
+	/**
+	 * @var bool $isAdmin
+	 */
+	protected $isAdmin;
+
+	/**
+	 * @var string[] $groups
+	 */
+	protected $groups = array();
+
+	/**
+	 * @var \OC\Group\Manager $groupManager
+	 */
+	protected $groupManager;
+
+	/**
+	 * @var int $sorting
+	 */
+	protected $sorting = false;
+
+	/**
+	 * @var string $lastSearch
+	 */
+	protected $lastSearch;
+
+	/**
+	 * @param string the uid of the current user
+	 * @param bool whether the current users is an admin
+	 * @param \OC\Group\Manager
+	 */
+	public function __construct(
+			$user,
+			$isAdmin,
+			\OC\Group\Manager $groupManager
+			) {
+		$this->user = $user;
+		$this->isAdmin = (bool)$isAdmin;
+		$this->groupManager = $groupManager;
+	}
+
+	/**
+	 * returns an array with meta data about all available groups
+	 * the array is structured as follows:
+	 * [0] array containing meta data about admin groups
+	 * [1] array containing meta data about unprivileged groups
+	 * @param string only effective when instance was created with isAdmin being
+	 * true
+	 * @return array
+	 */
+	public function get($search = '') {
+		if($this->lastSearch !== $search) {
+			$this->lastSearch = $search;
+			$this->groups = array();
+		}
+
+		$adminGroups = array();
+		$groups = array();
+		$sortGroupsIndex = 0;
+		$sortGroupsKeys = array();
+		$sortAdminGroupsIndex = 0;
+		$sortAdminGroupsKeys = array();
+
+		foreach($this->getGroups($search) as $group) {
+			$groupMetaData = $this->generateGroupMetaData($group);
+			if (strtolower($group->getGID()) !== 'admin') {
+				$this->addEntry(
+					$groups,
+					$sortGroupsKeys,
+					$sortGroupsIndex,
+					$groupMetaData);
+			} else {
+				//admin group is hard coded to 'admin' for now. In future,
+				//backends may define admin groups too. Then the if statement
+				//has to be adjusted accordingly.
+				$this->addEntry(
+					$adminGroups,
+					$sortAdminGroupsKeys,
+					$sortAdminGroupsIndex,
+					$groupMetaData);
+			}
+		}
+
+		//whether sorting is necessary is will be checked in sort()
+		$this->sort($groups, $sortGroupsKeys);
+		$this->sort($adminGroups, $sortAdminGroupsKeys);
+
+		return array($adminGroups, $groups);
+	}
+
+	/**
+	 * @brief sets the sort mode, currently 0 (none) and 1 (user entries,
+	 * descending) are supported
+	 * @param int the sortMode (SORT_NONE, SORT_USERCOUNT)
+	 */
+	public function setSorting($sortMode) {
+		if($sortMode >= 0 && $sortMode <= 1) {
+			$this->sorting = $sortMode;
+		} else {
+			$this->sorting = 0;
+		}
+	}
+
+	/**
+	 * @brief adds an group entry to the resulting array
+	 * @param array the resulting array, by reference
+	 * @param array the sort key array, by reference
+	 * @param array the sort key index, by reference
+	 * @param array the group's meta data as returned by generateGroupMetaData()
+	 * @return null
+	 */
+	private function addEntry(&$entries, &$sortKeys, &$sortIndex, $data) {
+		$entries[] = $data;
+		if($this->sorting === 1) {
+			$sortKeys[$sortIndex] = $data['usercount'];
+			$sortIndex++;
+		}
+	}
+
+	/**
+	 * @brief creates an array containing the group meta data
+	 * @param \OC\Group\Group
+	 * @return array with the keys 'id', 'name' and 'usercount'
+	 */
+	private function generateGroupMetaData(\OC\Group\Group $group) {
+		return array(
+				'id' => str_replace(' ','', $group->getGID()),
+				'name' => $group->getGID(),
+				'usercount' => $group->count()
+			);
+	}
+
+	/**
+	 * @brief sorts the result array, if applicable
+	 * @param array the result array, by reference
+	 * @param array the array containing the sort keys
+	 * @param return null
+	 */
+	private function sort(&$entries, $sortKeys) {
+		if($this->sorting > 0) {
+			array_multisort($sortKeys, SORT_DESC, $entries);
+		}
+	}
+
+	/**
+	 * @brief returns the available groups
+	 * @param string a search string
+	 * @return \OC\Group\Group[]
+	 */
+	private function getGroups($search = '') {
+		if(count($this->groups) === 0) {
+			$this->fetchGroups($search);
+		}
+		return $this->groups;
+	}
+
+	/**
+	 * @brief fetches the group using the group manager or the subAdmin API
+	 * @param string a search string
+	 * @return null
+	 */
+	private function fetchGroups($search = '') {
+		if($this->isAdmin) {
+			$this->groups = $this->groupManager->search($search);
+		} else {
+			$this->groups = \OC_SubAdmin::getSubAdminsGroups($this->user);
+		}
+	}
+}

settings/ajax/creategroup.php

@@ -4,6 +4,7 @@
 OC_JSON::checkAdminUser();
 
 $groupname = $_POST["groupname"];
+$l = OC_L10N::get('settings');
 
 // Does the group exist?
 if( in_array( $groupname, OC_Group::getGroups())) {

settings/ajax/createuser.php

@@ -43,12 +43,15 @@
 		OC_Group::addToGroup( $username, $i );
 	}
 
-	OC_JSON::success(array("data" =>
+	$userManager = \OC_User::getManager();
+	$user = $userManager->get($username);
+	OCP\JSON::success(array("data" =>
 				array(
 					// returns whether the home already existed
 					"homeExists" => $homeExists,
 					"username" => $username,
-					"groups" => OC_Group::getUserGroups( $username ))));
+					"groups" => OC_Group::getUserGroups( $username ),
+					'storageLocation' => $user->getHome())));
 } catch (Exception $exception) {
-	OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
+	OCP\JSON::error(array("data" => array( "message" => $exception->getMessage())));
 }

settings/ajax/grouplist.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Arthur Schiwon
+ * @copyright 2014 Arthur Schiwon <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+OC_JSON::callCheck();
+OC_JSON::checkSubAdminUser();
+if (isset($_GET['pattern']) && !empty($_GET['pattern'])) {
+	$pattern = $_GET['pattern'];
+} else {
+	$pattern = '';
+}
+$groups = array();
+$adminGroups = array();
+$groupManager = \OC_Group::getManager();
+$isAdmin = OC_User::isAdminUser(OC_User::getUser());
+
+//we pass isAdmin as true, because OC_SubAdmin has no search feature,
+//groups will be filtered out later
+$groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), true, $groupManager);
+$groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT);
+list($adminGroups, $groups) = $groupsInfo->get($pattern);
+
+$accessibleGroups = $groupManager->search($pattern);
+if(!$isAdmin) {
+	$subadminGroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$accessibleGroups = array_intersect($groups, $subadminGroups);
+}
+
+OC_JSON::success(
+	array('data' => array('adminGroups' => $adminGroups, 'groups' => $groups)));

settings/ajax/userlist.php

@@ -32,26 +32,55 @@
 } else {
 	$limit = 10;
 }
+if (isset($_GET['gid']) && !empty($_GET['gid'])) {
+	$gid = $_GET['gid'];
+} else {
+	$gid = false;
+}
+if (isset($_GET['pattern']) && !empty($_GET['pattern'])) {
+	$pattern = $_GET['pattern'];
+} else {
+	$pattern = '';
+}
 $users = array();
+$userManager = \OC_User::getManager();
 if (OC_User::isAdminUser(OC_User::getUser())) {
-	$batch = OC_User::getDisplayNames('', $limit, $offset);
-	foreach ($batch as $user => $displayname) {
+	if($gid !== false) {
+		$batch = OC_Group::displayNamesInGroup($gid, $pattern, $limit, $offset);
+	} else {
+		$batch = OC_User::getDisplayNames($pattern, $limit, $offset);
+	}
+	foreach ($batch as $uid => $displayname) {
+		$user = $userManager->get($uid);
 		$users[] = array(
-			'name' => $user,
+			'name' => $uid,
 			'displayname' => $displayname,
-			'groups' => join(', ', OC_Group::getUserGroups($user)),
-			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)),
-			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+			'groups' => join(', ', OC_Group::getUserGroups($uid)),
+			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($uid)),
+			'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
+			'storageLocation' => $user->getHome(),
+			'lastLogin' => $user->getLastLogin(),
+		);
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$batch = OC_Group::usersInGroups($groups, '', $limit, $offset);
-	foreach ($batch as $user) {
+	if($gid !== false && in_array($gid, $groups)) {
+		$groups = array($gid);
+	} elseif($gid !== false) {
+		//don't you try to investigate loops you must not know about
+		$groups = array();
+	}
+	$batch = OC_Group::usersInGroups($groups, $pattern, $limit, $offset);
+	foreach ($batch as $uid) {
+		$user = $userManager->get($uid);
 		$users[] = array(
 			'name' => $user,
-			'displayname' => OC_User::getDisplayName($user),
-			'groups' => join(', ', OC_Group::getUserGroups($user)),
-			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+			'displayname' => $user->getDisplayName(),
+			'groups' => join(', ', OC_Group::getUserGroups($uid)),
+			'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
+			'storageLocation' => $user->getHome(),
+			'lastLogin' => $user->getLastLogin(),
+		);
 	}
 }
 OC_JSON::success(array('data' => $users));