From c01f196f723dcb3dea6947c821a70d4d80563bbd Mon Sep 17 00:00:00 2001
From: Volkan Gezer <volkangezer@gmail.com>
Date: Thu, 29 May 2014 21:09:56 +0200
Subject: make reshare settings foldable

---
 settings/js/admin.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'settings/js')

diff --git a/settings/js/admin.js b/settings/js/admin.js
index 249131464a8..9353333b47e 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -83,6 +83,9 @@ $(document).ready(function(){
 	$('#allowLinks').change(function() {
 		$("#publicLinkSettings").toggleClass('hidden', !this.checked);
 	});
+	$('#allowResharing').change(function() {
+		$("#resharingSettings").toggleClass('hidden', !this.checked);
+	});
 
 	$('#security').change(function(){
 		$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} );
-- 
cgit v1.2.3


From ce46cd3680979019de59e48654771f3061076e7b Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Tue, 28 Jan 2014 22:32:51 +0530
Subject: Implements Group Creation from Sidebar

---
 settings/ajax/creategroup.php |  4 ++--
 settings/js/users.js          | 41 +++++++++++++++++++++++++++++++++++++++++
 settings/templates/users.php  |  9 ++++++---
 3 files changed, 49 insertions(+), 5 deletions(-)

(limited to 'settings/js')

diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 0a79527c219..bd878dc1c0a 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -7,7 +7,7 @@ $groupname = $_POST["groupname"];
 
 // Does the group exist?
 if( in_array( $groupname, OC_Group::getGroups())) {
-	OC_JSON::error(array("data" => array( "message" => $l->t("Group already exists") )));
+	OC_JSON::error(array("data" => array( "message" => 'Group already exists' )));
 	exit();
 }
 
@@ -16,5 +16,5 @@ if( OC_Group::createGroup( $groupname )) {
 	OC_JSON::success(array("data" => array( "groupname" => $groupname )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to add group") )));
+	OC_JSON::error(array("data" => array( "message" => 'Unable to add group' )));
 }
diff --git a/settings/js/users.js b/settings/js/users.js
index eef3c237277..7b06d961b1a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -530,6 +530,47 @@ $(document).ready(function () {
 			}
 		);
 	});
+	$('#newgroup').submit(function (event) {
+		event.preventDefault();
+		var groupname = $('#newgroupname').val();
+		if ($.trim(groupname) === '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid groupname must be provided'),
+				t('settings', 'Error creating group'));
+			return false;
+		}
+		$.post(
+			OC.filePath('settings', 'ajax', 'creategroup.php'),
+			{
+				groupname : groupname
+			},
+			function (result) {
+				if (result.status !== 'success') {
+					OC.dialogs.alert(result.data.message,
+						t('settings', 'Error creating group'));
+				} else {
+					if (result.data.groupname) {
+						var addedGroups = result.data.groupname;
+						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+					}
+					if (result.data.homeExists){
+						OC.Notification.hide();
+						OC.Notification.show(t('settings', 'Warning: Home directory for user "{group}" already exists', {group: result.data.groupname}));
+						if (UserList.notificationTimeout){
+							window.clearTimeout(UserList.notificationTimeout);
+						}
+						UserList.notificationTimeout = window.setTimeout(
+							function(){
+								OC.Notification.hide();
+								UserList.notificationTimeout = null;
+							}, 10000);
+					}
+				}
+
+			}
+		)
+	});
+
 	// Handle undo notifications
 	OC.Notification.hide();
 	$('#notification').on('click', '.undo', function () {
diff --git a/settings/templates/users.php b/settings/templates/users.php
index a56c7229c1a..83ac79365b6 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -19,8 +19,10 @@ $_['subadmingroups'] = array_flip($items);
 	<ul>
 		<!-- Add new group -->
 		<li>
-			<input type="text" placeholder="<?php p($l->t('Group')); ?>..." />
-			<button><?php p($l->t('Add')); ?></button>
+			<form id="newgroup">
+				<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
+				<input type="submit" value="<?php p($l->t('Create'))?>" />
+			</form>
 		</li>
 		<!-- Everyone -->
 		<li>
@@ -89,7 +91,8 @@ $_['subadmingroups'] = array_flip($items);
 			<?php foreach($_["groups"] as $group): ?>
 			<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
 			<?php endforeach;?>
-		</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
+		</select>
+		<input type="submit" value="<?php p($l->t('Create'))?>" />
 	</form>
 	<?php if((bool)$_['recoveryAdminEnabled']): ?>
 	<div class="recoveryPassword">
-- 
cgit v1.2.3


From 71160ff853a504ba084dc51f305970cd7b5cb597 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 30 Jan 2014 21:18:18 +0530
Subject: Deletes Group Clientside Effectively.

---
 settings/css/settings.css    |  6 +++++-
 settings/js/users.js         | 50 ++++++++++++++++++++++++++++++++++++++++++++
 settings/templates/users.php |  5 ++++-
 3 files changed, 59 insertions(+), 2 deletions(-)

(limited to 'settings/js')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 39290308cbe..ae986ccb9b4 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -51,7 +51,11 @@ table.nostyle label { margin-right: 2em; }
 table.nostyle td { padding: 0.2em 0; }
 
 /* USERS */
-.usercount { float: right; margin:6px;}
+.usercount { float: left; margin: 5px; }
+span.utils .delete {
+	float: left; position: relative;
+	margin: 3px; top: 4px;
+}
 form { display:inline; }
 table.grid th { height:2em; color:#999; }
 table.grid th, table.grid td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 7b06d961b1a..8107a98df0b 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -16,6 +16,48 @@ function setQuota (uid, quota, ready) {
 	);
 }
 
+var GroupList = {
+
+	delete_group: function (gid) {
+		if(GroupList.deleteGid !=='undefined') {
+			GroupList.finishDelete(null);
+		}
+
+		//Set the undo flag
+		GroupList.deleteCanceled = false;
+
+		//Provide an option to undo
+		$('#notification').data('deletegroup', true);
+		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(gid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
+	},
+
+	finishDelete: function (ready) {
+		if (!GroupList.deleteCanceled && GroupList.deleteGid) {
+			$.ajax({
+				type: 'POST',
+				url: OC.filePath('settings', 'ajax', 'removegroup.php'),
+				async: false,
+				data: { groupname: GroupList.deleteGid },
+				success: function (result) {
+					if (result.status === 'success') {
+						// Remove undo option, & remove user from table
+						OC.Notification.hide();
+						$('li').filterAttr('data-gid', GroupList.deleteGid).remove();
+						GroupList.deleteCanceled = true;
+						if (ready) {
+							ready();
+						}
+					} else {
+						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove group'));
+					}
+				}
+			});
+		}
+
+	},
+
+}
+
 var UserList = {
 	useUndo: true,
 	availableGroups: [],
@@ -477,6 +519,14 @@ $(document).ready(function () {
 		});
 	});
 
+	$('ul').on('click', 'span.utils>a', function (event) {
+		var li = $(this).parent().parent();
+		var gid = $(li).attr('data-gid');
+		$(li).hide();
+		// Call function for handling delete/undo on Groups
+		GroupList.delete_group(gid);
+	});
+
 	$('#newuser').submit(function (event) {
 		event.preventDefault();
 		var username = $('#newusername').val();
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 83ac79365b6..daf0ee49e4a 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -30,10 +30,13 @@ $_['subadmingroups'] = array_flip($items);
 		</li>
 		<!--List of Groups-->
 		<?php foreach($_["groups"] as $group): ?>
-		<li>
+		<li data-gid="<?php p($group['name']) ?>">
 			<a href="#"><?php p($group['name']); ?></a>
 			<span class="utils">
 				<span class="usercount"><?php p(count($group['useringroup'])); ?></span>
+				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
+					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
+				</a>
 			</span>
 		</li>
 	<?php endforeach; ?>
-- 
cgit v1.2.3


From c7af9cd6dd81072cf686ec123322c4241322bf73 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 12 Feb 2014 11:00:10 +0530
Subject: Initial Commit : User Search, Fixes Typos

---
 settings/ajax/creategroup.php |  2 +-
 settings/css/settings.css     |  4 +++-
 settings/js/users.js          | 11 +++++++++++
 settings/templates/users.php  |  6 +++++-
 4 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'settings/js')

diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index b770aaaf311..0a79527c219 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -7,7 +7,7 @@ $groupname = $_POST["groupname"];
 
 // Does the group exist?
 if( in_array( $groupname, OC_Group::getGroups())) {
-	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to add group") )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Group already exists") )));
 	exit();
 }
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index d0a64dd6bda..696fe01a91e 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -7,7 +7,7 @@ input#openid, input#webdav { width:20em; }
 
 #user-controls {
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
-	position: fixed; right: 0; left:380px; height: 44px; width: 100%;
+	position: fixed; right: 0; left:380px; height: 44px;
 	padding: 0; margin: 0;
 	background: #eee; border-bottom: 1px solid #e7e7e7;
 	z-index: 50;
@@ -57,6 +57,8 @@ span.utils .delete {
 	margin: 3px; top: 4px;
 }
 #app-navigation ul li:hover > span.utils .delete { display: block; }
+#usersearchform { position: absolute; top: 4px; right: 10px; }
+#usersearchform label { font-weight: 700; }
 form { display:inline; }
 table.grid th { height:2em; color:#999; }
 table.grid th, table.grid td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 8107a98df0b..c1a52ef9bee 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -620,6 +620,17 @@ $(document).ready(function () {
 			}
 		)
 	});
+	// Implements User Search 
+	$('#usersearchform input').keyup(function() {
+		var inputVal = $(this).val();
+		$('table tbody tr td.name').each(function() {
+			if ($('table tbody tr').text().search(new RegExp(inputVal, "i")) < 0) {
+				$('table tbody tr').fadeOut();
+			} else {
+				$('table tbody tr').show();
+			}
+		});
+	});
 
 	// Handle undo notifications
 	OC.Notification.hide();
diff --git a/settings/templates/users.php b/settings/templates/users.php
index daf0ee49e4a..89c83c3bd41 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -44,7 +44,7 @@ $_['subadmingroups'] = array_flip($items);
 	<!-- Default storage -->
 	<div class="app-settings">
 		<div class="quota">
-			<span><?php p($l->t('Default Storage'));?></span>
+			<span><?php p($l->t('Default Quota'));?></span>
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
 				<option
@@ -106,6 +106,10 @@ $_['subadmingroups'] = array_flip($items);
 		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
 	</div>
 	<?php endif; ?>
+	<form autocomplete="off" id="usersearchform">
+		<label><?php p($l->t( 'Search' )); ?></label>
+		<input type="text" class="input" />
+	</form>
 </div>
 <table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>">
 	<thead>
-- 
cgit v1.2.3


From 8e34316e04dd2ca3b43f2d862adab050e2fcca57 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 12 Feb 2014 19:38:21 +0530
Subject: Fixes User Search by username.

---
 settings/js/users.js         | 10 +++++-----
 settings/templates/users.php |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users.js b/settings/js/users.js
index c1a52ef9bee..4609a56b494 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -622,12 +622,12 @@ $(document).ready(function () {
 	});
 	// Implements User Search 
 	$('#usersearchform input').keyup(function() {
-		var inputVal = $(this).val();
-		$('table tbody tr td.name').each(function() {
-			if ($('table tbody tr').text().search(new RegExp(inputVal, "i")) < 0) {
-				$('table tbody tr').fadeOut();
+		var inputVal = $(this).val(), regex = new RegExp(inputVal, "i");;
+		$('table tbody tr td.name').each(function (key,element) {
+			if (regex.test($(element).text())) {
+				$(element).parent().show();
 			} else {
-				$('table tbody tr').show();
+				$(element).parent().hide();
 			}
 		});
 	});
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 89c83c3bd41..ec9ca074164 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -107,8 +107,7 @@ $_['subadmingroups'] = array_flip($items);
 	</div>
 	<?php endif; ?>
 	<form autocomplete="off" id="usersearchform">
-		<label><?php p($l->t( 'Search' )); ?></label>
-		<input type="text" class="input" />
+		<input type="text" class="input" placeholder="<?php p($l->t( 'Search by Username' )); ?>" />
 	</form>
 </div>
 <table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>">
-- 
cgit v1.2.3


From dc28f589517e05ef29c6c06145ab4944c0aa2994 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 18 Feb 2014 14:34:08 +0100
Subject: add Storage Location col

---
 settings/ajax/createuser.php |  5 ++++-
 settings/ajax/userlist.php   | 23 ++++++++++++++---------
 settings/js/users.js         |  9 +++++----
 settings/templates/users.php |  2 ++
 settings/users.php           |  3 +++
 5 files changed, 28 insertions(+), 14 deletions(-)

(limited to 'settings/js')

diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 94b56fa0349..946081e566a 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -43,12 +43,15 @@ try {
 		OC_Group::addToGroup( $username, $i );
 	}
 
+	$userManager = \OC_User::getManager();
+	$user = $userManager->get($username);
 	OC_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())));
 }
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 4abf54b8987..b73826393d9 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -33,25 +33,30 @@ if (isset($_GET['limit'])) {
 	$limit = 10;
 }
 $users = array();
+$userManager = \OC_User::getManager();
 if (OC_User::isAdminUser(OC_User::getUser())) {
 	$batch = OC_User::getDisplayNames('', $limit, $offset);
-	foreach ($batch as $user => $displayname) {
+	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());
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
 	$batch = OC_Group::usersInGroups($groups, '', $limit, $offset);
-	foreach ($batch as $user) {
+	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());
 	}
 }
 OC_JSON::success(array('data' => $users));
diff --git a/settings/js/users.js b/settings/js/users.js
index 4609a56b494..5d4fbed2a2b 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -125,7 +125,7 @@ var UserList = {
 		}
 	},
 
-	add: function (username, displayname, groups, subadmin, quota, sort) {
+	add: function (username, displayname, groups, subadmin, quota, storageLocation, sort) {
 		var tr = $('tbody tr').first().clone();
 		var subadminsEl;
 		var subadminSelect;
@@ -184,6 +184,7 @@ var UserList = {
 				quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
 			}
 		}
+		tr.find('td.storageLocation').text(storageLocation);
 		$(tr).appendTo('tbody');
 
 		if (sort) {
@@ -279,7 +280,7 @@ var UserList = {
 					if($('tr[data-uid="' + user.name + '"]').length > 0) {
 						return true;
 					}
-					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false);
+					alert(user.storageLocation);
 					tr.addClass('appear transparent');
 					trs.push(tr);
 					loadedUsers++;
@@ -574,7 +575,7 @@ $(document).ready(function () {
 							}, 10000);
 					}
 					if($('tr[data-uid="' + username + '"]').length === 0) {
-						UserList.add(username, username, result.data.groups, null, 'default', true);
+						UserList.add(username, username, result.data.groups, null, 'default', result.data.storageLocation, true);
 					}
 				}
 			}
@@ -620,7 +621,7 @@ $(document).ready(function () {
 			}
 		)
 	});
-	// Implements User Search 
+	// Implements User Search
 	$('#usersearchform input').keyup(function() {
 		var inputVal = $(this).val(), regex = new RegExp(inputVal, "i");;
 		$('table tbody tr td.name').each(function (key,element) {
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 7cb40ebbd27..8c624ff655c 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -138,6 +138,7 @@ $_['subadmingroups'] = array_flip($items);
 			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
 			<?php endif;?>
 			<th id="headerQuota"><?php p($l->t('Storage')); ?></th>
+			<th id="headerStorageLocation"><?php p($l->t('Storage Location')); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
 	</thead>
@@ -214,6 +215,7 @@ $_['subadmingroups'] = array_flip($items);
 					</option>
 				</select>
 			</td>
+			<td class="storageLocation"><?php p($user["storageLocation"]); ?></td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
 					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
diff --git a/settings/users.php b/settings/users.php
index a3faa51ea0e..e1b3083ed3e 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -17,6 +17,7 @@ OC_App::setActiveNavigationEntry( 'core_users' );
 
 $users = array();
 $groups = array();
+$userManager = \OC_User::getManager();
 
 if (isset($_GET['offset'])) {
 	$offset = $_GET['offset'];
@@ -66,6 +67,7 @@ foreach($accessibleusers as $uid => $displayName) {
 		$name = $name . ' ('.$uid.')';
 	}
 
+	$user = $userManager->get($uid);
 	$users[] = array(
 		"name" => $uid,
 		"displayName" => $displayName,
@@ -73,6 +75,7 @@ foreach($accessibleusers as $uid => $displayName) {
 		'quota' => $quota,
 		'isQuotaUserDefined' => $isQuotaUserDefined,
 		'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
+		'storageLocation' => $user->getHome(),
 	);
 }
 
-- 
cgit v1.2.3


From 970f8997260606d805880192dbb389e8b196371a Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Tue, 18 Feb 2014 21:59:45 +0530
Subject: Initial Commit : Changes Storage to Quota, Implements GroupName
 editing.

---
 settings/ajax/changegroupname.php | 24 ++++++++++++++++++++++++
 settings/css/settings.css         |  7 ++++++-
 settings/js/users.js              | 33 +++++++++++++++++++++++++++++++++
 settings/routes.php               |  2 ++
 settings/templates/users.php      |  4 +++-
 5 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 settings/ajax/changegroupname.php

(limited to 'settings/js')

diff --git a/settings/ajax/changegroupname.php b/settings/ajax/changegroupname.php
new file mode 100644
index 00000000000..cbf1e3e5e86
--- /dev/null
+++ b/settings/ajax/changegroupname.php
@@ -0,0 +1,24 @@
+<?php
+// Check if we are a user
+
+OCP\JSON::callCheck();
+OC_JSON::checkLoggedIn();
+
+$l=OC_L10N::get('core');
+
+$groupname = $_POST["groupname"];
+
+// Return Success story
+// TODO : make changes to the API to allow this.
+// setGroupname doesnt exist yet.	
+if(OC_Group::setGroupname($groupname)) {
+	OC_JSON::success(
+		array("data" => array(
+			"message" => $l->t('Group name has been changed.'),
+			"groupname" => $groupname,
+			)
+		)
+	);
+} else {
+	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change group name"))));
+}
\ No newline at end of file
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 696fe01a91e..b96c0806b99 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -52,11 +52,16 @@ table.nostyle td { padding: 0.2em 0; }
 
 /* USERS */
 .usercount { float: left; margin: 5px; }
+span.utils .delete, span.utils .rename {
+	float: left; position: relative; display: none;
+	margin: 3px; top: 4px;
+}
+#app-navigation ul li:hover > span.utils .delete,
+#app-navigation ul li:hover > span.utils .rename { display: block; }
 span.utils .delete {
 	float: left; position: relative; display: none;
 	margin: 3px; top: 4px;
 }
-#app-navigation ul li:hover > span.utils .delete { display: block; }
 #usersearchform { position: absolute; top: 4px; right: 10px; }
 #usersearchform label { font-weight: 700; }
 form { display:inline; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 5d4fbed2a2b..f31367472a8 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -632,6 +632,39 @@ $(document).ready(function () {
 			}
 		});
 	});
+	
+	// Implements Groupname editing.
+	$('#app-navigation').on('click', 'span.utils>img.rename', function (event) {
+		event.stopPropagation();
+		var img = $(this);
+		var gid = img.parent().parent().attr('data-gid');
+		var groupname = escapeHTML(img.parent().parent().attr('data-gid'));
+		var input = $('<input type="text" value="' + groupname + '">');
+		img.css('display', 'none');
+		img.parent().parent().children('a').replaceWith(input);
+		input.focus();
+		input.keypress(function (event) {
+			if (event.keyCode === 13) {
+				if ($(this).val().length > 0) {
+					$.post(
+						OC.filePath('settings', 'ajax', 'changegroupname.php'),
+						{	groupname: gid,
+							groupname: $(this).val()
+						}
+					);
+					input.blur();
+				} else {
+					input.blur();
+				}
+			}
+		});
+		input.blur(function () {
+			var input = $(this), groupname = input.val();
+			input.closest('li').attr('data-gid', groupname);
+			input.replaceWith('<a href="#">' + escapeHTML(groupname) + '</a>');
+			img.css('display', '');
+		});
+	});
 
 	// Handle undo notifications
 	OC.Notification.hide();
diff --git a/settings/routes.php b/settings/routes.php
index 0e0f293b9be..1352fac8383 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -44,6 +44,8 @@ $this->create('settings_users_changepassword', '/settings/users/changepassword')
 	->action('OC\Settings\ChangePassword\Controller', 'changeUserPassword');
 $this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
 	->actionInclude('settings/ajax/changedisplayname.php');
+$this->create('settings_ajax_changegorupname', '/settings/ajax/changegroupname.php')
+	->actionInclude('settings/ajax/changegroupname.php');	
 // personal
 $this->create('settings_personal_changepassword', '/settings/personal/changepassword')
 	->post()
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 8c624ff655c..129f01282a5 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -45,6 +45,8 @@ $_['subadmingroups'] = array_flip($items);
 			<a href="#"><?php p($group['name']); ?></a>
 			<span class="utils">
 				<span class="usercount"><?php p(count($group['useringroup'])); ?></span>
+				<img class="svg action rename" src="<?php p(image_path('core', 'actions/rename.svg'))?>"
+					alt="<?php p($l->t("change group name"))?>" title="<?php p($l->t("change group name"))?>" />
 				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
 					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
 				</a>
@@ -137,7 +139,7 @@ $_['subadmingroups'] = array_flip($items);
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
 			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
 			<?php endif;?>
-			<th id="headerQuota"><?php p($l->t('Storage')); ?></th>
+			<th id="headerQuota"><?php p($l->t('Quota')); ?></th>
 			<th id="headerStorageLocation"><?php p($l->t('Storage Location')); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
-- 
cgit v1.2.3


From 57ffaddf26b47a381c6b920608900dd710178323 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 18 Feb 2014 18:37:10 +0100
Subject: add Last Login column

---
 core/js/js.js                |  1 +
 lib/base.php                 |  4 ++++
 lib/private/user/user.php    | 20 ++++++++++++++++++++
 settings/ajax/userlist.php   |  8 ++++++--
 settings/js/users.js         | 13 ++++++++++---
 settings/templates/users.php | 11 +++++++++++
 settings/users.php           |  1 +
 7 files changed, 53 insertions(+), 5 deletions(-)

(limited to 'settings/js')

diff --git a/core/js/js.js b/core/js/js.js
index 21a2d4c1b35..096cc3ad7c1 100644
--- a/core/js/js.js
+++ b/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
diff --git a/lib/base.php b/lib/base.php
index 5f2131f388f..5866c949b6e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -882,6 +882,7 @@ class OC {
 
 		// if return is true we are logged in -> redirect to the default page
 		if ($return === true) {
+			OC_User::getManager()->get(OC_User::getUser())->updateLastLogin();
 			$_REQUEST['redirect_url'] = \OC_Request::requestUri();
 			OC_Util::redirectToDefaultPage();
 			exit;
@@ -915,6 +916,7 @@ class OC {
 			$granted = OC_User::loginWithCookie(
 				$_COOKIE['oc_username'], $_COOKIE['oc_token']);
 			if($granted === true) {
+				OC_User::getManager()->get(OC_User::getUser())->updateLastLogin();
 				OC_Util::redirectToDefaultPage();
 				// doesn't return
 			}
@@ -952,6 +954,7 @@ class OC {
 			}
 
 			$userid = OC_User::getUser();
+			OC_User::getManager()->get($userid)->updateLastLogin();
 			self::cleanupLoginTokens($userid);
 			if (!empty($_POST["remember_login"])) {
 				if (defined("DEBUG") && DEBUG) {
@@ -983,6 +986,7 @@ class OC {
 
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
 			//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
+			OC_User::getManager()->get(OC_User::getUser())->updateLastLogin();
 			OC_User::unsetMagicInCookie();
 			$_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
 		}
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index 8aba7188e24..82f02e0f2b5 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -52,6 +52,11 @@ class User {
 	 */
 	private $config;
 
+	/**
+	 * @var int $home
+	 */
+	private $lastLogin;
+
 	/**
 	 * @param string $uid
 	 * @param \OC_User_Interface $backend
@@ -243,4 +248,19 @@ class User {
 			$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
 		}
 	}
+
+	/**
+	 * returns the timestamp of the user's last login or 0 if the user did never
+	 * login
+	 *
+	 * @return int
+	 */
+	public function getLastLogin() {
+		return $this->lastLogin;
+	}
+
+	public function updateLastLogin() {
+		$this->lastLogin = time();
+		\OC_Preferences::setValue($this->uid, 'login', 'lastLogin', $this->lastLogin);
+	}
 }
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index b73826393d9..b1c26429534 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -44,7 +44,9 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 			'groups' => join(', ', OC_Group::getUserGroups($uid)),
 			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($uid)),
 			'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
-			'storageLocation' => $user->getHome());
+			'storageLocation' => $user->getHome(),
+			'lastLogin' => $user->getLastLogin(),
+		);
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
@@ -56,7 +58,9 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 			'displayname' => $user->getDisplayName(),
 			'groups' => join(', ', OC_Group::getUserGroups($uid)),
 			'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
-			'storageLocation' => $user->getHome());
+			'storageLocation' => $user->getHome(),
+			'lastLogin' => $user->getLastLogin(),
+		);
 	}
 }
 OC_JSON::success(array('data' => $users));
diff --git a/settings/js/users.js b/settings/js/users.js
index f31367472a8..0068cb36414 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -125,7 +125,7 @@ var UserList = {
 		}
 	},
 
-	add: function (username, displayname, groups, subadmin, quota, storageLocation, sort) {
+	add: function (username, displayname, groups, subadmin, quota, storageLocation, lastLogin, sort) {
 		var tr = $('tbody tr').first().clone();
 		var subadminsEl;
 		var subadminSelect;
@@ -185,6 +185,13 @@ var UserList = {
 			}
 		}
 		tr.find('td.storageLocation').text(storageLocation);
+		if(lastLogin == 0) {
+			lastLogin = t('settings', 'never');
+		} else {
+			lastLogin = new Date(lastLogin);
+			lastLogin = relative_modified_date(lastLogin.getTime() / 1000);
+		}
+		tr.find('td.lastLogin').text(lastLogin);
 		$(tr).appendTo('tbody');
 
 		if (sort) {
@@ -280,7 +287,7 @@ var UserList = {
 					if($('tr[data-uid="' + user.name + '"]').length > 0) {
 						return true;
 					}
-					alert(user.storageLocation);
+					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, user.storageLocation, user.lastLogin, false);
 					tr.addClass('appear transparent');
 					trs.push(tr);
 					loadedUsers++;
@@ -575,7 +582,7 @@ $(document).ready(function () {
 							}, 10000);
 					}
 					if($('tr[data-uid="' + username + '"]').length === 0) {
-						UserList.add(username, username, result.data.groups, null, 'default', result.data.storageLocation, true);
+						UserList.add(username, username, result.data.groups, null, 'default', result.data.storageLocation, 0, true);
 					}
 				}
 			}
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 129f01282a5..204079977a8 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -141,6 +141,7 @@ $_['subadmingroups'] = array_flip($items);
 			<?php endif;?>
 			<th id="headerQuota"><?php p($l->t('Quota')); ?></th>
 			<th id="headerStorageLocation"><?php p($l->t('Storage Location')); ?></th>
+			<th id="headerLastLogin"><?php p($l->t('Last Login')); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
 	</thead>
@@ -218,6 +219,16 @@ $_['subadmingroups'] = array_flip($items);
 				</select>
 			</td>
 			<td class="storageLocation"><?php p($user["storageLocation"]); ?></td>
+			<?php
+			if($user["lastLogin"] === 0) {
+				$lastLogin = 'never';
+				$lastLoginDate = '';
+			} else {
+				$lastLogin = relative_modified_date($user["lastLogin"]);
+				$lastLoginDate = \OC_Util::formatDate($user["lastLogin"]);
+			}
+			?>
+			<td class="lastLogin" title="<?php p('<span style="white-space: nowrap;">').p($lastLoginDate).p('</span>'); ?>"><?php p($lastLogin); ?></td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
 					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
diff --git a/settings/users.php b/settings/users.php
index e1b3083ed3e..dd0fdd80eb4 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -76,6 +76,7 @@ foreach($accessibleusers as $uid => $displayName) {
 		'isQuotaUserDefined' => $isQuotaUserDefined,
 		'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
 		'storageLocation' => $user->getHome(),
+		'lastLogin' => $user->getLastLogin(),
 	);
 }
 
-- 
cgit v1.2.3


From f751e0bc48fb107a1f8314ea1071f6808d226595 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 19 Feb 2014 13:14:18 +0530
Subject: Splits Code for Users and Groups.

---
 settings/js/users.js        | 689 --------------------------------------------
 settings/js/users/groups.js | 130 +++++++++
 settings/js/users/users.js  | 566 ++++++++++++++++++++++++++++++++++++
 settings/users.php          |   3 +-
 4 files changed, 698 insertions(+), 690 deletions(-)
 delete mode 100644 settings/js/users.js
 create mode 100644 settings/js/users/groups.js
 create mode 100644 settings/js/users/users.js

(limited to 'settings/js')

diff --git a/settings/js/users.js b/settings/js/users.js
deleted file mode 100644
index 0068cb36414..00000000000
--- a/settings/js/users.js
+++ /dev/null
@@ -1,689 +0,0 @@
-/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-function setQuota (uid, quota, ready) {
-	$.post(
-		OC.filePath('settings', 'ajax', 'setquota.php'),
-		{username: uid, quota: quota},
-		function (result) {
-			if (ready) {
-				ready(result.data.quota);
-			}
-		}
-	);
-}
-
-var GroupList = {
-
-	delete_group: function (gid) {
-		if(GroupList.deleteGid !=='undefined') {
-			GroupList.finishDelete(null);
-		}
-
-		//Set the undo flag
-		GroupList.deleteCanceled = false;
-
-		//Provide an option to undo
-		$('#notification').data('deletegroup', true);
-		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(gid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
-	},
-
-	finishDelete: function (ready) {
-		if (!GroupList.deleteCanceled && GroupList.deleteGid) {
-			$.ajax({
-				type: 'POST',
-				url: OC.filePath('settings', 'ajax', 'removegroup.php'),
-				async: false,
-				data: { groupname: GroupList.deleteGid },
-				success: function (result) {
-					if (result.status === 'success') {
-						// Remove undo option, & remove user from table
-						OC.Notification.hide();
-						$('li').filterAttr('data-gid', GroupList.deleteGid).remove();
-						GroupList.deleteCanceled = true;
-						if (ready) {
-							ready();
-						}
-					} else {
-						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove group'));
-					}
-				}
-			});
-		}
-
-	},
-
-}
-
-var UserList = {
-	useUndo: true,
-	availableGroups: [],
-	offset: 30, //The first 30 users are there. No prob, if less in total.
-				//hardcoded in settings/users.php
-
-	usersToLoad: 10, //So many users will be loaded when user scrolls down
-
-	/**
-	 * @brief Initiate user deletion process in UI
-	 * @param string uid the user ID to be deleted
-	 *
-	 * Does not actually delete the user; it sets them for
-	 * deletion when the current page is unloaded, at which point
-	 * finishDelete() completes the process. This allows for 'undo'.
-	 */
-	do_delete: function (uid) {
-		if (typeof UserList.deleteUid !== 'undefined') {
-			//Already a user in the undo queue
-			UserList.finishDelete(null);
-		}
-		UserList.deleteUid = uid;
-
-		// Set undo flag
-		UserList.deleteCanceled = false;
-
-		// Provide user with option to undo
-		$('#notification').data('deleteuser', true);
-		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(uid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
-	},
-
-	/**
-	 * @brief Delete a user via ajax
-	 * @param bool ready whether to use ready() upon completion
-	 *
-	 * Executes deletion via ajax of user identified by property deleteUid
-	 * if 'undo' has not been used.  Completes the user deletion procedure
-	 * and reflects success in UI.
-	 */
-	finishDelete: function (ready) {
-
-		// Check deletion has not been undone
-		if (!UserList.deleteCanceled && UserList.deleteUid) {
-
-			// Delete user via ajax
-			$.ajax({
-				type: 'POST',
-				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
-				async: false,
-				data: { username: UserList.deleteUid },
-				success: function (result) {
-					if (result.status === 'success') {
-						// Remove undo option, & remove user from table
-						OC.Notification.hide();
-						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
-						UserList.deleteCanceled = true;
-						if (ready) {
-							ready();
-						}
-					} else {
-						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
-					}
-				}
-			});
-		}
-	},
-
-	add: function (username, displayname, groups, subadmin, quota, storageLocation, lastLogin, sort) {
-		var tr = $('tbody tr').first().clone();
-		var subadminsEl;
-		var subadminSelect;
-		var groupsSelect;
-		if (tr.find('div.avatardiv').length){
-			$('div.avatardiv', tr).avatar(username, 32);
-		}
-		tr.attr('data-uid', username);
-		tr.attr('data-displayName', displayname);
-		tr.find('td.name').text(username);
-		tr.find('td.displayName > span').text(displayname);
-
-		// make them look like the multiselect buttons
-		// until they get time to really get initialized
-		groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
-			.attr('data-username', username)
-			.data('user-groups', groups);
-		if (tr.find('td.subadmins').length > 0) {
-			subadminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
-				.attr('data-username', username)
-				.data('user-groups', groups)
-				.data('subadmin', subadmin);
-			tr.find('td.subadmins').empty();
-		}
-		$.each(this.availableGroups, function (i, group) {
-			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
-			if (typeof subadminSelect !== 'undefined' && group !== 'admin') {
-				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
-			}
-		});
-		tr.find('td.groups').empty().append(groupsSelect);
-		subadminsEl = tr.find('td.subadmins');
-		if (subadminsEl.length > 0) {
-			subadminsEl.append(subadminSelect);
-		}
-		if (tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
-			var rm_img = $('<img class="svg action">').attr({
-				src: OC.imagePath('core', 'actions/delete')
-			});
-			var rm_link = $('<a class="action delete">')
-				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
-				.append(rm_img);
-			tr.find('td.remove').append(rm_link);
-		} else if (OC.currentUser === username) {
-			tr.find('td.remove a').remove();
-		}
-		var quotaSelect = tr.find('select.quota-user');
-		if (quota === 'default') {
-			quotaSelect.find('option').attr('selected', null);
-			quotaSelect.find('option').first().attr('selected', 'selected');
-			quotaSelect.data('previous', 'default');
-		} else {
-			if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
-				quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
-			} else {
-				quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
-			}
-		}
-		tr.find('td.storageLocation').text(storageLocation);
-		if(lastLogin == 0) {
-			lastLogin = t('settings', 'never');
-		} else {
-			lastLogin = new Date(lastLogin);
-			lastLogin = relative_modified_date(lastLogin.getTime() / 1000);
-		}
-		tr.find('td.lastLogin').text(lastLogin);
-		$(tr).appendTo('tbody');
-
-		if (sort) {
-			UserList.doSort();
-		}
-
-		quotaSelect.on('change', function () {
-			var uid = $(this).parent().parent().attr('data-uid');
-			var quota = $(this).val();
-			setQuota(uid, quota, function(returnedQuota){
-				if (quota !== returnedQuota) {
-					$(quotaSelect).find(':selected').text(returnedQuota);
-				}
-			});
-		});
-
-		// defer init so the user first sees the list appear more quickly
-		window.setTimeout(function(){
-			quotaSelect.singleSelect();
-			UserList.applyMultiplySelect(groupsSelect);
-			if (subadminSelect) {
-				UserList.applyMultiplySelect(subadminSelect);
-			}
-		}, 0);
-		return tr;
-	},
-	// From http://my.opera.com/GreyWyvern/blog/show.dml/1671288
-	alphanum: function(a, b) {
-		function chunkify(t) {
-			var tz = [], x = 0, y = -1, n = 0, i, j;
-
-			while (i = (j = t.charAt(x++)).charCodeAt(0)) {
-			var m = (i === 46 || (i >=48 && i <= 57));
-			if (m !== n) {
-				tz[++y] = "";
-				n = m;
-			}
-			tz[y] += j;
-			}
-			return tz;
-		}
-
-		var aa = chunkify(a.toLowerCase());
-		var bb = chunkify(b.toLowerCase());
-
-		for (x = 0; aa[x] && bb[x]; x++) {
-			if (aa[x] !== bb[x]) {
-			var c = Number(aa[x]), d = Number(bb[x]);
-			if (c === aa[x] && d === bb[x]) {
-				return c - d;
-			} else {
-				return (aa[x] > bb[x]) ? 1 : -1;
-			}
-			}
-		}
-		return aa.length - bb.length;
-	},
-	doSort: function() {
-		var self = this;
-		var rows = $('tbody tr').get();
-
-		rows.sort(function(a, b) {
-			return UserList.alphanum($(a).find('td.name').text(), $(b).find('td.name').text());
-		});
-
-		var items = [];
-		$.each(rows, function(index, row) {
-			items.push(row);
-			if(items.length === 100) {
-				$('tbody').append(items);
-				items = [];
-			}
-		});
-		if(items.length > 0) {
-			$('tbody').append(items);
-		}
-	},
-	update: function () {
-		if (UserList.updating) {
-			return;
-		}
-		$('table+.loading').css('visibility', 'visible');
-		UserList.updating = true;
-		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad });
-		$.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) {
-			var loadedUsers = 0;
-			var trs = [];
-			if (result.status === 'success') {
-				//The offset does not mirror the amount of users available,
-				//because it is backend-dependent. For correct retrieval,
-				//always the limit(requested amount of users) needs to be added.
-				$.each(result.data, function (index, user) {
-					if($('tr[data-uid="' + user.name + '"]').length > 0) {
-						return true;
-					}
-					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, user.storageLocation, user.lastLogin, false);
-					tr.addClass('appear transparent');
-					trs.push(tr);
-					loadedUsers++;
-				});
-				if (result.data.length > 0) {
-					UserList.doSort();
-					$('table+.loading').css('visibility', 'hidden');
-				}
-				else {
-					UserList.noMoreEntries = true;
-					$('table+.loading').remove();
-				}
-				UserList.offset += loadedUsers;
-				// animate
-				setTimeout(function() {
-					for (var i = 0; i < trs.length; i++) {
-						trs[i].removeClass('transparent');
-					}
-				}, 0);
-			}
-			UserList.updating = false;
-		});
-	},
-
-	applyMultiplySelect: function (element) {
-		var checked = [];
-		var user = element.attr('data-username');
-		if ($(element).hasClass('groupsselect')) {
-			if (element.data('userGroups')) {
-				checked = element.data('userGroups');
-			}
-			if (user) {
-				var checkHandeler = function (group) {
-					if (user === OC.currentUser && group === 'admin') {
-						return false;
-					}
-					if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
-						return false;
-					}
-					$.post(
-						OC.filePath('settings', 'ajax', 'togglegroups.php'),
-						{
-							username: user,
-							group: group
-						},
-						function (response) {
-							if(response.status === 'success'
-									&& UserList.availableGroups.indexOf(response.data.groupname) === -1
-									&& response.data.action === 'add') {
-								UserList.availableGroups.push(response.data.groupname);
-							}
-							if(response.data.message) {
-								OC.Notification.show(response.data.message);
-							}
-						}
-					);
-				};
-			} else {
-				checkHandeler = false;
-			}
-			var addGroup = function (select, group) {
-				$('select[multiple]').each(function (index, element) {
-					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
-						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
-					}
-				});
-			};
-			var label;
-			if (oc_isadmin) {
-				label = t('settings', 'add group');
-			} else {
-				label = null;
-			}
-			element.multiSelect({
-				createCallback: addGroup,
-				createText: label,
-				selectedFirst: true,
-				checked: checked,
-				oncheck: checkHandeler,
-				onuncheck: checkHandeler,
-				minWidth: 100
-			});
-		}
-		if ($(element).hasClass('subadminsselect')) {
-			if (element.data('subadmin')) {
-				checked = element.data('subadmin');
-			}
-			var checkHandeler = function (group) {
-				if (group === 'admin') {
-					return false;
-				}
-				$.post(
-					OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
-					{
-						username: user,
-						group: group
-					},
-					function () {
-					}
-				);
-			};
-
-			var addSubAdmin = function (group) {
-				$('select[multiple]').each(function (index, element) {
-					if ($(element).find('option[value="' + group + '"]').length === 0) {
-						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
-					}
-				});
-			};
-			element.multiSelect({
-				createCallback: addSubAdmin,
-				createText: null,
-				checked: checked,
-				oncheck: checkHandeler,
-				onuncheck: checkHandeler,
-				minWidth: 100
-			});
-		}
-	},
-
-	_onScroll: function(e) {
-		if (!!UserList.noMoreEntries) {
-			return;
-		}
-		if ($(window).scrollTop() + $(window).height() > $(document).height() - 500) {
-			UserList.update(true);
-		}
-	},
-};
-
-$(document).ready(function () {
-
-	UserList.doSort();
-	UserList.availableGroups = $('#content table').data('groups');
-	$(window).scroll(function(e) {UserList._onScroll(e);});
-	$('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
-
-	$('select[multiple]').each(function (index, element) {
-		UserList.applyMultiplySelect($(element));
-	});
-
-	$('table').on('click', 'td.remove>a', function (event) {
-		var row = $(this).parent().parent();
-		var uid = $(row).attr('data-uid');
-		$(row).hide();
-		// Call function for handling delete/undo
-		UserList.do_delete(uid);
-	});
-
-	$('table').on('click', 'td.password>img', function (event) {
-		event.stopPropagation();
-		var img = $(this);
-		var uid = img.parent().parent().attr('data-uid');
-		var input = $('<input type="password">');
-		img.css('display', 'none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($(this).val().length > 0) {
-					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
-					$.post(
-						OC.generateUrl('/settings/users/changepassword'),
-						{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
-						function (result) {
-							if (result.status != 'success') {
-								OC.Notification.show(t('admin', result.data.message));
-							}
-						}
-					);
-					input.blur();
-				} else {
-					input.blur();
-				}
-			}
-		});
-		input.blur(function () {
-			$(this).replaceWith($('<span>●●●●●●●</span>'));
-			img.css('display', '');
-		});
-	});
-	$('input:password[id="recoveryPassword"]').keyup(function(event) {
-		OC.Notification.hide();
-	});
-
-	$('table').on('click', 'td.password', function (event) {
-		$(this).children('img').click();
-	});
-
-	$('table').on('click', 'td.displayName>img', function (event) {
-		event.stopPropagation();
-		var img = $(this);
-		var uid = img.parent().parent().attr('data-uid');
-		var displayName = escapeHTML(img.parent().parent().attr('data-displayName'));
-		var input = $('<input type="text" value="' + displayName + '">');
-		img.css('display', 'none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($(this).val().length > 0) {
-					$.post(
-						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
-						{username: uid, displayName: $(this).val()},
-						function (result) {
-							if (result && result.status==='success'){
-								img.parent().parent().find('div.avatardiv').avatar(result.data.username, 32);
-							}
-						}
-					);
-					input.blur();
-				} else {
-					input.blur();
-				}
-			}
-		});
-		input.blur(function () {
-			var input = $(this),
-				displayName = input.val();
-			input.closest('tr').attr('data-displayName', displayName);
-			input.replaceWith('<span>' + escapeHTML(displayName) + '</span>');
-			img.css('display', '');
-		});
-	});
-	$('table').on('click', 'td.displayName', function (event) {
-		$(this).children('img').click();
-	});
-
-	$('select.quota, select.quota-user').singleSelect().on('change', function () {
-		var select = $(this);
-		var uid = $(this).parent().parent().attr('data-uid');
-		var quota = $(this).val();
-		setQuota(uid, quota, function(returnedQuota){
-			if (quota !== returnedQuota) {
-				select.find(':selected').text(returnedQuota);
-			}
-		});
-	});
-
-	$('ul').on('click', 'span.utils>a', function (event) {
-		var li = $(this).parent().parent();
-		var gid = $(li).attr('data-gid');
-		$(li).hide();
-		// Call function for handling delete/undo on Groups
-		GroupList.delete_group(gid);
-	});
-
-	$('#newuser').submit(function (event) {
-		event.preventDefault();
-		var username = $('#newusername').val();
-		var password = $('#newuserpassword').val();
-		if ($.trim(username) === '') {
-			OC.dialogs.alert(
-				t('settings', 'A valid username must be provided'),
-				t('settings', 'Error creating user'));
-			return false;
-		}
-		if ($.trim(password) === '') {
-			OC.dialogs.alert(
-				t('settings', 'A valid password must be provided'),
-				t('settings', 'Error creating user'));
-			return false;
-		}
-		var groups = $('#newusergroups').prev().children('div').data('settings').checked;
-		$('#newuser').get(0).reset();
-		$.post(
-			OC.filePath('settings', 'ajax', 'createuser.php'),
-			{
-				username: username,
-				password: password,
-				groups: groups
-			},
-			function (result) {
-				if (result.status !== 'success') {
-					OC.dialogs.alert(result.data.message,
-						t('settings', 'Error creating user'));
-				} else {
-					if (result.data.groups) {
-						var addedGroups = result.data.groups;
-						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
-					}
-					if (result.data.homeExists){
-						OC.Notification.hide();
-						OC.Notification.show(t('settings', 'Warning: Home directory for user "{user}" already exists', {user: result.data.username}));
-						if (UserList.notificationTimeout){
-							window.clearTimeout(UserList.notificationTimeout);
-						}
-						UserList.notificationTimeout = window.setTimeout(
-							function(){
-								OC.Notification.hide();
-								UserList.notificationTimeout = null;
-							}, 10000);
-					}
-					if($('tr[data-uid="' + username + '"]').length === 0) {
-						UserList.add(username, username, result.data.groups, null, 'default', result.data.storageLocation, 0, true);
-					}
-				}
-			}
-		);
-	});
-	$('#newgroup').submit(function (event) {
-		event.preventDefault();
-		var groupname = $('#newgroupname').val();
-		if ($.trim(groupname) === '') {
-			OC.dialogs.alert(
-				t('settings', 'A valid groupname must be provided'),
-				t('settings', 'Error creating group'));
-			return false;
-		}
-		$.post(
-			OC.filePath('settings', 'ajax', 'creategroup.php'),
-			{
-				groupname : groupname
-			},
-			function (result) {
-				if (result.status !== 'success') {
-					OC.dialogs.alert(result.data.message,
-						t('settings', 'Error creating group'));
-				} else {
-					if (result.data.groupname) {
-						var addedGroups = result.data.groupname;
-						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
-					}
-					if (result.data.homeExists){
-						OC.Notification.hide();
-						OC.Notification.show(t('settings', 'Warning: Home directory for user "{group}" already exists', {group: result.data.groupname}));
-						if (UserList.notificationTimeout){
-							window.clearTimeout(UserList.notificationTimeout);
-						}
-						UserList.notificationTimeout = window.setTimeout(
-							function(){
-								OC.Notification.hide();
-								UserList.notificationTimeout = null;
-							}, 10000);
-					}
-				}
-
-			}
-		)
-	});
-	// Implements User Search
-	$('#usersearchform input').keyup(function() {
-		var inputVal = $(this).val(), regex = new RegExp(inputVal, "i");;
-		$('table tbody tr td.name').each(function (key,element) {
-			if (regex.test($(element).text())) {
-				$(element).parent().show();
-			} else {
-				$(element).parent().hide();
-			}
-		});
-	});
-	
-	// Implements Groupname editing.
-	$('#app-navigation').on('click', 'span.utils>img.rename', function (event) {
-		event.stopPropagation();
-		var img = $(this);
-		var gid = img.parent().parent().attr('data-gid');
-		var groupname = escapeHTML(img.parent().parent().attr('data-gid'));
-		var input = $('<input type="text" value="' + groupname + '">');
-		img.css('display', 'none');
-		img.parent().parent().children('a').replaceWith(input);
-		input.focus();
-		input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($(this).val().length > 0) {
-					$.post(
-						OC.filePath('settings', 'ajax', 'changegroupname.php'),
-						{	groupname: gid,
-							groupname: $(this).val()
-						}
-					);
-					input.blur();
-				} else {
-					input.blur();
-				}
-			}
-		});
-		input.blur(function () {
-			var input = $(this), groupname = input.val();
-			input.closest('li').attr('data-gid', groupname);
-			input.replaceWith('<a href="#">' + escapeHTML(groupname) + '</a>');
-			img.css('display', '');
-		});
-	});
-
-	// Handle undo notifications
-	OC.Notification.hide();
-	$('#notification').on('click', '.undo', function () {
-		if ($('#notification').data('deleteuser')) {
-			$('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
-			UserList.deleteCanceled = true;
-		}
-		OC.Notification.hide();
-	});
-	UserList.useUndo = ('onbeforeunload' in window);
-	$(window).bind('beforeunload', function () {
-		UserList.finishDelete(null);
-	});
-});
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
new file mode 100644
index 00000000000..9920f72889b
--- /dev/null
+++ b/settings/js/users/groups.js
@@ -0,0 +1,130 @@
+/**
+ * Copyright (c) 2014, Raghu Nayyar <beingminimal@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+ var GroupList = {
+
+	delete_group: function (gid) {
+		if(GroupList.deleteGid !=='undefined') {
+			GroupList.finishDelete(null);
+		}
+
+		//Set the undo flag
+		GroupList.deleteCanceled = false;
+
+		//Provide an option to undo
+		$('#notification').data('deletegroup', true);
+		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(gid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
+	},
+
+	finishDelete: function (ready) {
+		if (!GroupList.deleteCanceled && GroupList.deleteGid) {
+			$.ajax({
+				type: 'POST',
+				url: OC.filePath('settings', 'ajax', 'removegroup.php'),
+				async: false,
+				data: { groupname: GroupList.deleteGid },
+				success: function (result) {
+					if (result.status === 'success') {
+						// Remove undo option, & remove user from table
+						OC.Notification.hide();
+						$('li').filterAttr('data-gid', GroupList.deleteGid).remove();
+						GroupList.deleteCanceled = true;
+						if (ready) {
+							ready();
+						}
+					} else {
+						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove group'));
+					}
+				}
+			});
+		}
+
+	},
+
+}
+
+$(document).ready( function () {
+	$('ul').on('click', 'span.utils>a', function (event) {
+		var li = $(this).parent().parent();
+		var gid = $(li).attr('data-gid');
+		$(li).hide();
+		// Call function for handling delete/undo on Groups
+		GroupList.delete_group(gid);
+	});
+	$('#newgroup').submit(function (event) {
+		event.preventDefault();
+		var groupname = $('#newgroupname').val();
+		if ($.trim(groupname) === '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid groupname must be provided'),
+				t('settings', 'Error creating group'));
+			return false;
+		}
+		$.post(
+			OC.filePath('settings', 'ajax', 'creategroup.php'),
+			{
+				groupname : groupname
+			},
+			function (result) {
+				if (result.status !== 'success') {
+					OC.dialogs.alert(result.data.message,
+						t('settings', 'Error creating group'));
+				} else {
+					if (result.data.groupname) {
+						var addedGroups = result.data.groupname;
+						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+					}
+					if (result.data.homeExists){
+						OC.Notification.hide();
+						OC.Notification.show(t('settings', 'Warning: Home directory for user "{group}" already exists', {group: result.data.groupname}));
+						if (UserList.notificationTimeout){
+							window.clearTimeout(UserList.notificationTimeout);
+						}
+						UserList.notificationTimeout = window.setTimeout(
+							function(){
+								OC.Notification.hide();
+								UserList.notificationTimeout = null;
+							}, 10000);
+					}
+				}
+
+			}
+		)
+	});
+	// Implements Groupname editing.
+	$('#app-navigation').on('click', 'span.utils>img.rename', function (event) {
+		event.stopPropagation();
+		var img = $(this);
+		var gid = img.parent().parent().attr('data-gid');
+		var groupname = escapeHTML(img.parent().parent().attr('data-gid'));
+		var input = $('<input type="text" value="' + groupname + '">');
+		img.css('display', 'none');
+		img.parent().parent().children('a').replaceWith(input);
+		input.focus();
+		input.keypress(function (event) {
+			if (event.keyCode === 13) {
+				if ($(this).val().length > 0) {
+					$.post(
+						OC.filePath('settings', 'ajax', 'changegroupname.php'),
+						{	groupname: gid,
+							groupname: $(this).val()
+						}
+					);
+					input.blur();
+				} else {
+					input.blur();
+				}
+			}
+		});
+		input.blur(function () {
+			var input = $(this), groupname = input.val();
+			input.closest('li').attr('data-gid', groupname);
+			input.replaceWith('<a href="#">' + escapeHTML(groupname) + '</a>');
+			img.css('display', '');
+		});
+	});
+
+});
\ No newline at end of file
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
new file mode 100644
index 00000000000..47fe5cc5a69
--- /dev/null
+++ b/settings/js/users/users.js
@@ -0,0 +1,566 @@
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+var UserList = {
+	useUndo: true,
+	availableGroups: [],
+	offset: 30, //The first 30 users are there. No prob, if less in total.
+				//hardcoded in settings/users.php
+
+	usersToLoad: 10, //So many users will be loaded when user scrolls down
+
+	/**
+	 * @brief Initiate user deletion process in UI
+	 * @param string uid the user ID to be deleted
+	 *
+	 * Does not actually delete the user; it sets them for
+	 * deletion when the current page is unloaded, at which point
+	 * finishDelete() completes the process. This allows for 'undo'.
+	 */
+	do_delete: function (uid) {
+		if (typeof UserList.deleteUid !== 'undefined') {
+			//Already a user in the undo queue
+			UserList.finishDelete(null);
+		}
+		UserList.deleteUid = uid;
+
+		// Set undo flag
+		UserList.deleteCanceled = false;
+
+		// Provide user with option to undo
+		$('#notification').data('deleteuser', true);
+		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(uid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
+	},
+
+	/**
+	 * @brief Delete a user via ajax
+	 * @param bool ready whether to use ready() upon completion
+	 *
+	 * Executes deletion via ajax of user identified by property deleteUid
+	 * if 'undo' has not been used.  Completes the user deletion procedure
+	 * and reflects success in UI.
+	 */
+	finishDelete: function (ready) {
+
+		// Check deletion has not been undone
+		if (!UserList.deleteCanceled && UserList.deleteUid) {
+
+			// Delete user via ajax
+			$.ajax({
+				type: 'POST',
+				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
+				async: false,
+				data: { username: UserList.deleteUid },
+				success: function (result) {
+					if (result.status === 'success') {
+						// Remove undo option, & remove user from table
+						OC.Notification.hide();
+						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
+						UserList.deleteCanceled = true;
+						if (ready) {
+							ready();
+						}
+					} else {
+						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
+					}
+				}
+			});
+		}
+	},
+
+	add: function (username, displayname, groups, subadmin, quota, storageLocation, lastLogin, sort) {
+		var tr = $('tbody tr').first().clone();
+		var subadminsEl;
+		var subadminSelect;
+		var groupsSelect;
+		if (tr.find('div.avatardiv').length){
+			$('div.avatardiv', tr).avatar(username, 32);
+		}
+		tr.attr('data-uid', username);
+		tr.attr('data-displayName', displayname);
+		tr.find('td.name').text(username);
+		tr.find('td.displayName > span').text(displayname);
+
+		// make them look like the multiselect buttons
+		// until they get time to really get initialized
+		groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
+			.attr('data-username', username)
+			.data('user-groups', groups);
+		if (tr.find('td.subadmins').length > 0) {
+			subadminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
+				.attr('data-username', username)
+				.data('user-groups', groups)
+				.data('subadmin', subadmin);
+			tr.find('td.subadmins').empty();
+		}
+		$.each(this.availableGroups, function (i, group) {
+			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
+			if (typeof subadminSelect !== 'undefined' && group !== 'admin') {
+				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
+			}
+		});
+		tr.find('td.groups').empty().append(groupsSelect);
+		subadminsEl = tr.find('td.subadmins');
+		if (subadminsEl.length > 0) {
+			subadminsEl.append(subadminSelect);
+		}
+		if (tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
+			var rm_img = $('<img class="svg action">').attr({
+				src: OC.imagePath('core', 'actions/delete')
+			});
+			var rm_link = $('<a class="action delete">')
+				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
+				.append(rm_img);
+			tr.find('td.remove').append(rm_link);
+		} else if (OC.currentUser === username) {
+			tr.find('td.remove a').remove();
+		}
+		var quotaSelect = tr.find('select.quota-user');
+		if (quota === 'default') {
+			quotaSelect.find('option').attr('selected', null);
+			quotaSelect.find('option').first().attr('selected', 'selected');
+			quotaSelect.data('previous', 'default');
+		} else {
+			if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
+				quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
+			} else {
+				quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
+			}
+		}
+		tr.find('td.storageLocation').text(storageLocation);
+		if(lastLogin == 0) {
+			lastLogin = t('settings', 'never');
+		} else {
+			lastLogin = new Date(lastLogin);
+			lastLogin = relative_modified_date(lastLogin.getTime() / 1000);
+		}
+		tr.find('td.lastLogin').text(lastLogin);
+		$(tr).appendTo('tbody');
+
+		if (sort) {
+			UserList.doSort();
+		}
+
+		quotaSelect.on('change', function () {
+			var uid = $(this).parent().parent().attr('data-uid');
+			var quota = $(this).val();
+			setQuota(uid, quota, function(returnedQuota){
+				if (quota !== returnedQuota) {
+					$(quotaSelect).find(':selected').text(returnedQuota);
+				}
+			});
+		});
+
+		// defer init so the user first sees the list appear more quickly
+		window.setTimeout(function(){
+			quotaSelect.singleSelect();
+			UserList.applyMultiplySelect(groupsSelect);
+			if (subadminSelect) {
+				UserList.applyMultiplySelect(subadminSelect);
+			}
+		}, 0);
+		return tr;
+	},
+	// From http://my.opera.com/GreyWyvern/blog/show.dml/1671288
+	alphanum: function(a, b) {
+		function chunkify(t) {
+			var tz = [], x = 0, y = -1, n = 0, i, j;
+
+			while (i = (j = t.charAt(x++)).charCodeAt(0)) {
+			var m = (i === 46 || (i >=48 && i <= 57));
+			if (m !== n) {
+				tz[++y] = "";
+				n = m;
+			}
+			tz[y] += j;
+			}
+			return tz;
+		}
+
+		var aa = chunkify(a.toLowerCase());
+		var bb = chunkify(b.toLowerCase());
+
+		for (x = 0; aa[x] && bb[x]; x++) {
+			if (aa[x] !== bb[x]) {
+			var c = Number(aa[x]), d = Number(bb[x]);
+			if (c === aa[x] && d === bb[x]) {
+				return c - d;
+			} else {
+				return (aa[x] > bb[x]) ? 1 : -1;
+			}
+			}
+		}
+		return aa.length - bb.length;
+	},
+	doSort: function() {
+		var self = this;
+		var rows = $('tbody tr').get();
+
+		rows.sort(function(a, b) {
+			return UserList.alphanum($(a).find('td.name').text(), $(b).find('td.name').text());
+		});
+
+		var items = [];
+		$.each(rows, function(index, row) {
+			items.push(row);
+			if(items.length === 100) {
+				$('tbody').append(items);
+				items = [];
+			}
+		});
+		if(items.length > 0) {
+			$('tbody').append(items);
+		}
+	},
+	update: function () {
+		if (UserList.updating) {
+			return;
+		}
+		$('table+.loading').css('visibility', 'visible');
+		UserList.updating = true;
+		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad });
+		$.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) {
+			var loadedUsers = 0;
+			var trs = [];
+			if (result.status === 'success') {
+				//The offset does not mirror the amount of users available,
+				//because it is backend-dependent. For correct retrieval,
+				//always the limit(requested amount of users) needs to be added.
+				$.each(result.data, function (index, user) {
+					if($('tr[data-uid="' + user.name + '"]').length > 0) {
+						return true;
+					}
+					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, user.storageLocation, user.lastLogin, false);
+					tr.addClass('appear transparent');
+					trs.push(tr);
+					loadedUsers++;
+				});
+				if (result.data.length > 0) {
+					UserList.doSort();
+					$('table+.loading').css('visibility', 'hidden');
+				}
+				else {
+					UserList.noMoreEntries = true;
+					$('table+.loading').remove();
+				}
+				UserList.offset += loadedUsers;
+				// animate
+				setTimeout(function() {
+					for (var i = 0; i < trs.length; i++) {
+						trs[i].removeClass('transparent');
+					}
+				}, 0);
+			}
+			UserList.updating = false;
+		});
+	},
+
+	applyMultiplySelect: function (element) {
+		var checked = [];
+		var user = element.attr('data-username');
+		if ($(element).hasClass('groupsselect')) {
+			if (element.data('userGroups')) {
+				checked = element.data('userGroups');
+			}
+			if (user) {
+				var checkHandeler = function (group) {
+					if (user === OC.currentUser && group === 'admin') {
+						return false;
+					}
+					if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
+						return false;
+					}
+					$.post(
+						OC.filePath('settings', 'ajax', 'togglegroups.php'),
+						{
+							username: user,
+							group: group
+						},
+						function (response) {
+							if(response.status === 'success'
+									&& UserList.availableGroups.indexOf(response.data.groupname) === -1
+									&& response.data.action === 'add') {
+								UserList.availableGroups.push(response.data.groupname);
+							}
+							if(response.data.message) {
+								OC.Notification.show(response.data.message);
+							}
+						}
+					);
+				};
+			} else {
+				checkHandeler = false;
+			}
+			var addGroup = function (select, group) {
+				$('select[multiple]').each(function (index, element) {
+					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
+						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+					}
+				});
+			};
+			var label;
+			if (oc_isadmin) {
+				label = t('settings', 'add group');
+			} else {
+				label = null;
+			}
+			element.multiSelect({
+				createCallback: addGroup,
+				createText: label,
+				selectedFirst: true,
+				checked: checked,
+				oncheck: checkHandeler,
+				onuncheck: checkHandeler,
+				minWidth: 100
+			});
+		}
+		if ($(element).hasClass('subadminsselect')) {
+			if (element.data('subadmin')) {
+				checked = element.data('subadmin');
+			}
+			var checkHandeler = function (group) {
+				if (group === 'admin') {
+					return false;
+				}
+				$.post(
+					OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
+					{
+						username: user,
+						group: group
+					},
+					function () {
+					}
+				);
+			};
+
+			var addSubAdmin = function (group) {
+				$('select[multiple]').each(function (index, element) {
+					if ($(element).find('option[value="' + group + '"]').length === 0) {
+						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+					}
+				});
+			};
+			element.multiSelect({
+				createCallback: addSubAdmin,
+				createText: null,
+				checked: checked,
+				oncheck: checkHandeler,
+				onuncheck: checkHandeler,
+				minWidth: 100
+			});
+		}
+	},
+
+	_onScroll: function(e) {
+		if (!!UserList.noMoreEntries) {
+			return;
+		}
+		if ($(window).scrollTop() + $(window).height() > $(document).height() - 500) {
+			UserList.update(true);
+		}
+	},
+};
+
+function setQuota (uid, quota, ready) {
+	$.post(
+		OC.filePath('settings', 'ajax', 'setquota.php'),
+		{username: uid, quota: quota},
+		function (result) {
+			if (ready) {
+				ready(result.data.quota);
+			}
+		}
+	);
+}
+
+$(document).ready(function () {
+
+	UserList.doSort();
+	UserList.availableGroups = $('#content table').data('groups');
+	$(window).scroll(function(e) {UserList._onScroll(e);});
+	$('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
+
+	$('select[multiple]').each(function (index, element) {
+		UserList.applyMultiplySelect($(element));
+	});
+
+	$('table').on('click', 'td.remove>a', function (event) {
+		var row = $(this).parent().parent();
+		var uid = $(row).attr('data-uid');
+		$(row).hide();
+		// Call function for handling delete/undo
+		UserList.do_delete(uid);
+	});
+
+	$('table').on('click', 'td.password>img', function (event) {
+		event.stopPropagation();
+		var img = $(this);
+		var uid = img.parent().parent().attr('data-uid');
+		var input = $('<input type="password">');
+		img.css('display', 'none');
+		img.parent().children('span').replaceWith(input);
+		input.focus();
+		input.keypress(function (event) {
+			if (event.keyCode === 13) {
+				if ($(this).val().length > 0) {
+					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
+					$.post(
+						OC.generateUrl('/settings/users/changepassword'),
+						{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
+						function (result) {
+							if (result.status != 'success') {
+								OC.Notification.show(t('admin', result.data.message));
+							}
+						}
+					);
+					input.blur();
+				} else {
+					input.blur();
+				}
+			}
+		});
+		input.blur(function () {
+			$(this).replaceWith($('<span>●●●●●●●</span>'));
+			img.css('display', '');
+		});
+	});
+	$('input:password[id="recoveryPassword"]').keyup(function(event) {
+		OC.Notification.hide();
+	});
+
+	$('table').on('click', 'td.password', function (event) {
+		$(this).children('img').click();
+	});
+
+	$('table').on('click', 'td.displayName>img', function (event) {
+		event.stopPropagation();
+		var img = $(this);
+		var uid = img.parent().parent().attr('data-uid');
+		var displayName = escapeHTML(img.parent().parent().attr('data-displayName'));
+		var input = $('<input type="text" value="' + displayName + '">');
+		img.css('display', 'none');
+		img.parent().children('span').replaceWith(input);
+		input.focus();
+		input.keypress(function (event) {
+			if (event.keyCode === 13) {
+				if ($(this).val().length > 0) {
+					$.post(
+						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
+						{username: uid, displayName: $(this).val()},
+						function (result) {
+							if (result && result.status==='success'){
+								img.parent().parent().find('div.avatardiv').avatar(result.data.username, 32);
+							}
+						}
+					);
+					input.blur();
+				} else {
+					input.blur();
+				}
+			}
+		});
+		input.blur(function () {
+			var input = $(this),
+				displayName = input.val();
+			input.closest('tr').attr('data-displayName', displayName);
+			input.replaceWith('<span>' + escapeHTML(displayName) + '</span>');
+			img.css('display', '');
+		});
+	});
+	$('table').on('click', 'td.displayName', function (event) {
+		$(this).children('img').click();
+	});
+
+	$('select.quota, select.quota-user').singleSelect().on('change', function () {
+		var select = $(this);
+		var uid = $(this).parent().parent().attr('data-uid');
+		var quota = $(this).val();
+		setQuota(uid, quota, function(returnedQuota){
+			if (quota !== returnedQuota) {
+				select.find(':selected').text(returnedQuota);
+			}
+		});
+	});
+
+	$('#newuser').submit(function (event) {
+		event.preventDefault();
+		var username = $('#newusername').val();
+		var password = $('#newuserpassword').val();
+		if ($.trim(username) === '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid username must be provided'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
+		if ($.trim(password) === '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid password must be provided'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
+		var groups = $('#newusergroups').prev().children('div').data('settings').checked;
+		$('#newuser').get(0).reset();
+		$.post(
+			OC.filePath('settings', 'ajax', 'createuser.php'),
+			{
+				username: username,
+				password: password,
+				groups: groups
+			},
+			function (result) {
+				if (result.status !== 'success') {
+					OC.dialogs.alert(result.data.message,
+						t('settings', 'Error creating user'));
+				} else {
+					if (result.data.groups) {
+						var addedGroups = result.data.groups;
+						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+					}
+					if (result.data.homeExists){
+						OC.Notification.hide();
+						OC.Notification.show(t('settings', 'Warning: Home directory for user "{user}" already exists', {user: result.data.username}));
+						if (UserList.notificationTimeout){
+							window.clearTimeout(UserList.notificationTimeout);
+						}
+						UserList.notificationTimeout = window.setTimeout(
+							function(){
+								OC.Notification.hide();
+								UserList.notificationTimeout = null;
+							}, 10000);
+					}
+					if($('tr[data-uid="' + username + '"]').length === 0) {
+						UserList.add(username, username, result.data.groups, null, 'default', result.data.storageLocation, 0, true);
+					}
+				}
+			}
+		);
+	});
+	// Implements User Search
+	$('#usersearchform input').keyup(function() {
+		var inputVal = $(this).val(), regex = new RegExp(inputVal, "i");;
+		$('table tbody tr td.name').each(function (key,element) {
+			if (regex.test($(element).text())) {
+				$(element).parent().show();
+			} else {
+				$(element).parent().hide();
+			}
+		});
+	});
+
+	// Handle undo notifications
+	OC.Notification.hide();
+	$('#notification').on('click', '.undo', function () {
+		if ($('#notification').data('deleteuser')) {
+			$('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
+			UserList.deleteCanceled = true;
+		}
+		OC.Notification.hide();
+	});
+	UserList.useUndo = ('onbeforeunload' in window);
+	$(window).bind('beforeunload', function () {
+		UserList.finishDelete(null);
+	});
+});
diff --git a/settings/users.php b/settings/users.php
index dd0fdd80eb4..d391ff0ca81 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -8,7 +8,8 @@
 OC_Util::checkSubAdminUser();
 
 // We have some javascript foo!
-OC_Util::addScript( 'settings', 'users' );
+OC_Util::addScript( 'settings', 'users/users' );
+OC_Util::addScript( 'settings', 'users/groups' );
 OC_Util::addScript( 'core', 'multiselect' );
 OC_Util::addScript( 'core', 'singleselect' );
 OC_Util::addScript('core', 'jquery.inview');
-- 
cgit v1.2.3


From e681e1eec094385e2a41ea301834d6593d97ec0b Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 19 Feb 2014 14:40:49 +0530
Subject: Initial Commit: Takes Quota Settings inside Navigation, Changes
 Create -> Add Group

---
 settings/js/users/groups.js  |  9 ++++++
 settings/templates/users.php | 66 +++++++++++++++++++++++---------------------
 2 files changed, 44 insertions(+), 31 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 9920f72889b..5e9f5582b5a 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -127,4 +127,13 @@ $(document).ready( function () {
 		});
 	});
 
+	// Implements Quota Settings Toggle.
+	$('#app-navigation').find('.settings-button').on('click', function (e) {
+		e.stopPropagation();
+		$('#app-settings').removeClass('open');
+		$('#app-settings').toggleClass('open');
+		$(document).click(function() {
+			$('#app-settings').removeClass('open');
+    	});
+	});
 });
\ No newline at end of file
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e9fa5df6675..1feaecd8e86 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -21,7 +21,7 @@ $_['subadmingroups'] = array_flip($items);
 		<li>
 			<form id="newgroup">
 				<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
-				<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
+				<input type="submit" class="button" value="<?php p($l->t('Add Group'))?>" />
 			</form>
 		</li>
 		<!-- Everyone -->
@@ -54,37 +54,41 @@ $_['subadmingroups'] = array_flip($items);
 		</li>
 	<?php endforeach; ?>
 	</ul>
-	<!-- Default storage -->
-	<div class="app-settings">
-		<div class="quota">
-			<span><?php p($l->t('Default Quota'));?></span>
-			<?php if((bool) $_['isadmin']): ?>
-			<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
-				<option
-					<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
+
+	<div id="app-settings" class="" style="">
+		<div id="app-settings-header">
+			<button class="settings-button" tabindex="0"></button>
+		</div>
+		<div id="app-settings-content">
+			<div class="quota">
+				<!-- Default storage -->
+				<span><?php p($l->t('Default Quota'));?></span>
+				<?php if((bool) $_['isadmin']): ?>
+				<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
+					<option
+						<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
 						value='none'>
-					<?php p($l->t('Unlimited'));?>
-				</option>
-				<?php foreach($_['quota_preset'] as $preset):?>
-				<?php if($preset !== 'default'):?>
-				<option
-				<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
-					value='<?php p($preset);?>'>
-					<?php p($preset);?>
-				</option>
-				<?php endif;?>
-				<?php endforeach;?>
-				<?php if($_['defaultQuotaIsUserDefined']):?>
-				<option selected="selected"
-					value='<?php p($_['default_quota']);?>'>
-					<?php p($_['default_quota']);?>
-				</option>
-				<?php endif;?>
-				<option data-new value='other'>
-					<?php p($l->t('Other'));?>
-					...
-				</option>
-			</select>
+						<?php p($l->t('Unlimited'));?>
+					</option>
+					<?php foreach($_['quota_preset'] as $preset):?>
+						<?php if($preset !== 'default'):?>
+						<option
+							<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
+							value='<?php p($preset);?>'>
+							<?php p($preset);?>
+						</option>
+						<?php endif;?>
+					<?php endforeach;?>
+					<?php if($_['defaultQuotaIsUserDefined']):?>
+						<option selected="selected" value='<?php p($_['default_quota']);?>'>
+							<?php p($_['default_quota']);?>
+						</option>
+					<?php endif;?>
+					<option data-new value='other'>
+						<?php p($l->t('Other'));?>
+						...
+					</option>
+				</select>
 			<?php endif; ?>
 			<?php if((bool) !$_['isadmin']): ?>
 				<select class='quota' disabled="disabled">
-- 
cgit v1.2.3


From 478393e15ad3d6c884368f0b1a922eda6f9ffe0e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 19 Feb 2014 11:40:07 +0100
Subject: load groups when clicking on them

---
 settings/ajax/userlist.php  | 17 ++++++++++++++++-
 settings/js/users/groups.js |  5 +++++
 settings/js/users/users.js  | 34 ++++++++++++++++++++++++++++------
 3 files changed, 49 insertions(+), 7 deletions(-)

(limited to 'settings/js')

diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index b1c26429534..7ca1d535a46 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -32,10 +32,19 @@ if (isset($_GET['limit'])) {
 } else {
 	$limit = 10;
 }
+if (isset($_GET['gid']) && !empty($_GET['gid'])) {
+	$gid = $_GET['gid'];
+} else {
+	$gid = false;
+}
 $users = array();
 $userManager = \OC_User::getManager();
 if (OC_User::isAdminUser(OC_User::getUser())) {
-	$batch = OC_User::getDisplayNames('', $limit, $offset);
+	if($gid !== false) {
+		$batch = OC_Group::displayNamesInGroup($gid, '', $limit, $offset);
+	} else {
+		$batch = OC_User::getDisplayNames('', $limit, $offset);
+	}
 	foreach ($batch as $uid => $displayname) {
 		$user = $userManager->get($uid);
 		$users[] = array(
@@ -50,6 +59,12 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	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, '', $limit, $offset);
 	foreach ($batch as $uid) {
 		$user = $userManager->get($uid);
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 5e9f5582b5a..f6124eaa795 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -19,6 +19,11 @@
 		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(gid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
 	},
 
+	showGroup: function (gid) {
+		UserList.empty();
+		UserList.update(gid);
+	},
+
 	finishDelete: function (ready) {
 		if (!GroupList.deleteCanceled && GroupList.deleteGid) {
 			$.ajax({
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 47fe5cc5a69..3ef6706b98c 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -139,7 +139,13 @@ var UserList = {
 		}
 		tr.find('td.lastLogin').text(lastLogin);
 		$(tr).appendTo('tbody');
-
+		if(UserList.isEmpty === true) {
+			//when the list was emptied, one row was left, necessary to keep
+			//add working and the layout unbroken. We need to remove this item
+			tr.show();
+			$('tbody tr').first().remove();
+			UserList.isEmpty = false;
+		}
 		if (sort) {
 			UserList.doSort();
 		}
@@ -215,16 +221,23 @@ var UserList = {
 			$('tbody').append(items);
 		}
 	},
-	update: function () {
+	empty: function() {
+		//one row needs to be kept, because it is cloned to add new rows
+		$('tbody tr:not(:first)').remove();
+		$('tbody tr').first().hide();
+		UserList.isEmpty = true;
+		UserList.offset = 0;
+	},
+	update: function (gid) {
 		if (UserList.updating) {
 			return;
 		}
 		$('table+.loading').css('visibility', 'visible');
 		UserList.updating = true;
-		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad });
-		$.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) {
-			var loadedUsers = 0;
-			var trs = [];
+		if(gid === undefined) {
+			gid = '';
+		}
+		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad, gid: gid }), function (result) {
 			if (result.status === 'success') {
 				//The offset does not mirror the amount of users available,
 				//because it is backend-dependent. For correct retrieval,
@@ -485,6 +498,15 @@ $(document).ready(function () {
 		});
 	});
 
+	// click on group name
+	// FIXME: also triggered when clicking on "remove"
+	$('ul').on('click', 'li', function (event) {
+		var li = $(this);
+		var gid = $(li).attr('data-gid');
+		// Call function for handling delete/undo on Groups
+		GroupList.showGroup(gid);
+	});
+
 	$('#newuser').submit(function (event) {
 		event.preventDefault();
 		var username = $('#newusername').val();
-- 
cgit v1.2.3


From 1f4bc7cb1047525422c9db1cc5ba56c564304fb1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 20 Feb 2014 18:42:03 +0100
Subject: port scroll improvements

---
 settings/js/users/users.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 3ef6706b98c..8b1d04e2a36 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -11,6 +11,7 @@ var UserList = {
 				//hardcoded in settings/users.php
 
 	usersToLoad: 10, //So many users will be loaded when user scrolls down
+	currentGid: '',
 
 	/**
 	 * @brief Initiate user deletion process in UI
@@ -237,7 +238,10 @@ var UserList = {
 		if(gid === undefined) {
 			gid = '';
 		}
+		UserList.currentGid = gid;
 		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad, gid: gid }), function (result) {
+			var loadedUsers = 0;
+			var trs = [];
 			if (result.status === 'success') {
 				//The offset does not mirror the amount of users available,
 				//because it is backend-dependent. For correct retrieval,
@@ -371,8 +375,8 @@ var UserList = {
 		if (!!UserList.noMoreEntries) {
 			return;
 		}
-		if ($(window).scrollTop() + $(window).height() > $(document).height() - 500) {
-			UserList.update(true);
+		if (UserList.scrollArea.scrollTop() + UserList.scrollArea.height() > UserList.scrollArea.get(0).scrollHeight - 500) {
+			UserList.update(UserList.currentGid, true);
 		}
 	},
 };
@@ -394,6 +398,7 @@ $(document).ready(function () {
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').data('groups');
 	$(window).scroll(function(e) {UserList._onScroll(e);});
+		UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);});
 	$('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
 
 	$('select[multiple]').each(function (index, element) {
-- 
cgit v1.2.3


From d650cd66dc54ec17f3ee4644d8945223f54e20d3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 20 Feb 2014 19:11:52 +0100
Subject: mark selected group active

---
 settings/js/users/groups.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index f6124eaa795..5275d437ec8 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -22,6 +22,11 @@
 	showGroup: function (gid) {
 		UserList.empty();
 		UserList.update(gid);
+		$('#app-navigation li').removeClass('active');
+		if(gid !== undefined) {
+			//TODO: treat Everyone properly
+			$('#app-navigation li').filterAttr('data-gid', gid).addClass('active');
+		}
 	},
 
 	finishDelete: function (ready) {
-- 
cgit v1.2.3


From eed108ec1b6181356b4ec3223e63ba4669e8b3af Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Sun, 23 Feb 2014 02:58:44 +0530
Subject: Enhancement : The edit icon looks like files app rename fileaction.

---
 settings/css/settings.css                   | 19 ++++++++++---------
 settings/js/users/groups.js                 |  6 +++---
 settings/templates/users/part.grouplist.php | 14 ++++++++++----
 3 files changed, 23 insertions(+), 16 deletions(-)

(limited to 'settings/js')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 2012818338f..2f0585f2990 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -52,19 +52,20 @@ table.nostyle td { padding: 0.2em 0; }
 
 /* USERS */
 .usercount { float: left; margin: 5px; }
-li.active span.utils .delete { left: 7px; }
-li.active span.utils .delete, li.active span.utils .rename {
+li.active span.utils .delete {
 	float: left; position: relative; opacity: 0.5;
-	top: -7px; width: 44px; height: 44px;
+	top: -7px; left: 7px; width: 44px; height: 44px;
 }
-li.active span.utils .rename {
-	width: 16px; height: 16px;
-	padding: 14px;
-	cursor: pointer;
+li.active .rename {
+	padding: 8px 14px 20px 14px;
+	top: 0px; position: absolute; width: 16px; height: 16px; 
+	opacity: 0.5; 
+	display: inline-block !important;
 }
 li.active span.utils .delete img { margin: 14px; }
-li.active span.utils .delete:hover, li.active span.utils .rename:hover { opacity: 1; }
-span.utils .delete, span.utils .rename { display: none; }
+li.active .rename { opacity: 0.5; }
+li.active span.utils .delete:hover, li.active .rename:hover { opacity: 1; }
+span.utils .delete, .rename { display: none; }
 #app-navigation ul li.active > span.utils .delete,
 #app-navigation ul li.active > span.utils .rename { display: block; }
 #usersearchform { position: absolute; top: 4px; right: 10px; }
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 5275d437ec8..3234d6911e4 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -105,14 +105,14 @@ $(document).ready( function () {
 		)
 	});
 	// Implements Groupname editing.
-	$('#app-navigation').on('click', 'span.utils>img.rename', function (event) {
+	$('#app-navigation').on('click', 'img.rename', function (event) {
 		event.stopPropagation();
 		var img = $(this);
 		var gid = img.parent().parent().attr('data-gid');
 		var groupname = escapeHTML(img.parent().parent().attr('data-gid'));
 		var input = $('<input type="text" value="' + groupname + '">');
 		img.css('display', 'none');
-		img.parent().parent().children('a').replaceWith(input);
+		img.parent().children('span').replaceWith(input);
 		input.focus();
 		input.keypress(function (event) {
 			if (event.keyCode === 13) {
@@ -132,7 +132,7 @@ $(document).ready( function () {
 		input.blur(function () {
 			var input = $(this), groupname = input.val();
 			input.closest('li').attr('data-gid', groupname);
-			input.replaceWith('<a href="#">' + escapeHTML(groupname) + '</a>');
+			input.replaceWith('<span>' + escapeHTML(groupname) + '</span>');
 			img.css('display', '');
 		});
 	});
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index ce038c90107..7833bb69a1a 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -8,7 +8,11 @@
 	</li>
 	<!-- Everyone -->
 	<li>
-		<a href="#"><?php p($l->t('Everyone')); ?></a>
+		<a href="#">
+			<span>
+				<?php p($l->t('Everyone')); ?>
+			</span>
+		</a>
 	</li>
 
 	<!-- The Admin Group -->
@@ -24,11 +28,13 @@
 	<!--List of Groups-->
 	<?php foreach($_["groups"] as $group): ?>
 		<li data-gid="<?php p($group['name']) ?>">
-			<a href="#"><?php p($group['name']); ?></a>
+			<a href="#">
+				<span><?php p($group['name']); ?></span>
+				<img class="svg action rename" src="<?php p(image_path('core', 'actions/rename.svg'))?>"
+				original-title="<?php p($l->t('Edit'))?>" alt="<?php p($l->t("change group name"))?>" title="<?php p($l->t("change group name"))?>" />
+			</a>
 			<span class="utils">
 				<span class="usercount"><?php if(count($group['useringroup']) > 0) { p(count($group['useringroup'])); } ?></span>
-				<img class="svg action rename" src="<?php p(image_path('core', 'actions/rename.svg'))?>"
-					original-title="<?php p($l->t('Edit'))?>" alt="<?php p($l->t("change group name"))?>" title="<?php p($l->t("change group name"))?>" />
 				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
 					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
 				</a>
-- 
cgit v1.2.3


From 506e065f23f1bcc36762cd8347d0e8135503ed45 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Feb 2014 09:54:38 +0100
Subject: stricter test for 0

---
 settings/js/users/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 8b1d04e2a36..e82a6ceac13 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -132,7 +132,7 @@ var UserList = {
 			}
 		}
 		tr.find('td.storageLocation').text(storageLocation);
-		if(lastLogin == 0) {
+		if(lastLogin === 0) {
 			lastLogin = t('settings', 'never');
 		} else {
 			lastLogin = new Date(lastLogin);
-- 
cgit v1.2.3


From 65aa20433c796c40592e6031eb8ba323c171c108 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Tue, 25 Feb 2014 15:39:01 +0530
Subject: Enhancement : Toggle Add Group on Click, @blizzz have a look here.

---
 settings/css/settings.css                   |  5 +++++
 settings/js/users/groups.js                 | 18 +++++++++++++++++-
 settings/templates/users/part.grouplist.php |  9 +++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'settings/js')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 2f0585f2990..e6ad4fd304f 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -51,6 +51,11 @@ table.nostyle label { margin-right: 2em; }
 table.nostyle td { padding: 0.2em 0; }
 
 /* USERS */
+#newgroup-init a span { margin-left: 20px; }
+#newgroup-init a span:before {
+	position: absolute;	left: 12px; top:-2px;
+	content: '+'; font-weight: bold; font-size: 150%;
+}
 .usercount { float: left; margin: 5px; }
 li.active span.utils .delete {
 	float: left; position: relative; opacity: 0.5;
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 3234d6911e4..3ac8d3f36e3 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -64,7 +64,23 @@ $(document).ready( function () {
 		// Call function for handling delete/undo on Groups
 		GroupList.delete_group(gid);
 	});
-	$('#newgroup').submit(function (event) {
+
+	// Display or hide of Create Group List Element
+	$('#newgroup-form').hide();
+	$('#newgroup-init').on('click', function (e) {
+		e.stopPropagation();
+		$('#newgroup-form').show();
+		$('#newgroup-init').hide();
+		$(document).click( function (e) {
+			if (e.target.id !== 'newgroup-form') {
+				$("#newgroup-form").hide();
+				$("#newgroup-init").show();
+			}			
+		});
+	});
+
+	// Responsible for Creating Groups.
+	$('#newgroup-form form').submit(function (event) {
 		event.preventDefault();
 		var groupname = $('#newgroupname').val();
 		if ($.trim(groupname) === '') {
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 51351733d0d..620049eb298 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -1,7 +1,12 @@
 <ul>
 	<!-- Add new group -->
-	<li>
-		<form id="newgroup">
+	<li id="newgroup-init">
+		<a href="#">
+			<span><?php p($l->t('Add Group'))?></span>
+		</a>
+	</li>
+	<li id="newgroup-form">
+		<form>
 			<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
 			<input type="submit" class="button" value="<?php p($l->t('Add Group'))?>" />
 		</form>
-- 
cgit v1.2.3


From faab6c095c895f146ac0f749d287040fd46c1cf2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Feb 2014 14:05:48 +0100
Subject: move group-click initialization to groups.js and only react on
 elements with a data-gid attribute given

---
 settings/js/users/groups.js                 | 12 +++++++++++-
 settings/js/users/users.js                  |  9 ---------
 settings/templates/users/part.grouplist.php |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 3ac8d3f36e3..d939f0d3ad6 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -75,7 +75,7 @@ $(document).ready( function () {
 			if (e.target.id !== 'newgroup-form') {
 				$("#newgroup-form").hide();
 				$("#newgroup-init").show();
-			}			
+			}
 		});
 	});
 
@@ -120,6 +120,16 @@ $(document).ready( function () {
 			}
 		)
 	});
+
+	// click on group name
+	// FIXME: also triggered when clicking on "remove"
+	$('ul').on('click', 'li[data-gid]', function (event) {
+		var li = $(this);
+		var gid = $(li).attr('data-gid');
+		// Call function for handling delete/undo on Groups
+		GroupList.showGroup(gid);
+	});
+
 	// Implements Groupname editing.
 	$('#app-navigation').on('click', 'img.rename', function (event) {
 		event.stopPropagation();
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e82a6ceac13..e939d1d3bfc 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -503,15 +503,6 @@ $(document).ready(function () {
 		});
 	});
 
-	// click on group name
-	// FIXME: also triggered when clicking on "remove"
-	$('ul').on('click', 'li', function (event) {
-		var li = $(this);
-		var gid = $(li).attr('data-gid');
-		// Call function for handling delete/undo on Groups
-		GroupList.showGroup(gid);
-	});
-
 	$('#newuser').submit(function (event) {
 		event.preventDefault();
 		var username = $('#newusername').val();
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 620049eb298..6acf12a952f 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -12,7 +12,7 @@
 		</form>
 	</li>
 	<!-- Everyone -->
-	<li>
+	<li data-gid="">
 		<a href="#">
 			<span>
 				<?php p($l->t('Everyone')); ?>
-- 
cgit v1.2.3


From 749afe74df7143329139f9a619b74c311646ddea Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Feb 2014 14:12:06 +0100
Subject: when clicking on Add Group also put the focus into the group name
 field

---
 settings/js/users/groups.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index d939f0d3ad6..415d65b95cd 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -77,6 +77,7 @@ $(document).ready( function () {
 				$("#newgroup-init").show();
 			}
 		});
+		$('#newgroupname').focus();
 	});
 
 	// Responsible for Creating Groups.
-- 
cgit v1.2.3


From 330dfeb46bc8107cf2f0b9a18926c48e88f5cb08 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Feb 2014 14:18:19 +0100
Subject: group name input shall not vanish upon click, plus cleanup (groups do
 not have home folders)

---
 settings/js/users/groups.js | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 415d65b95cd..d84614f5e7d 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -71,12 +71,6 @@ $(document).ready( function () {
 		e.stopPropagation();
 		$('#newgroup-form').show();
 		$('#newgroup-init').hide();
-		$(document).click( function (e) {
-			if (e.target.id !== 'newgroup-form') {
-				$("#newgroup-form").hide();
-				$("#newgroup-init").show();
-			}
-		});
 		$('#newgroupname').focus();
 	});
 
@@ -104,20 +98,7 @@ $(document).ready( function () {
 						var addedGroups = result.data.groupname;
 						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
 					}
-					if (result.data.homeExists){
-						OC.Notification.hide();
-						OC.Notification.show(t('settings', 'Warning: Home directory for user "{group}" already exists', {group: result.data.groupname}));
-						if (UserList.notificationTimeout){
-							window.clearTimeout(UserList.notificationTimeout);
-						}
-						UserList.notificationTimeout = window.setTimeout(
-							function(){
-								OC.Notification.hide();
-								UserList.notificationTimeout = null;
-							}, 10000);
-					}
 				}
-
 			}
 		)
 	});
-- 
cgit v1.2.3


From 480173569fdf729c33c076c62a31a15ad9c57057 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Feb 2014 14:26:35 +0100
Subject: put Add Group elements hiding and showing into its own function

---
 settings/js/users/groups.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index d84614f5e7d..f8f6d3fedcc 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -29,6 +29,19 @@
 		}
 	},
 
+	toggleAddGroup: function(event) {
+		if($('#newgroup-init').is(":visible")) {
+			event.stopPropagation();
+			$('#newgroup-form').show();
+			$('#newgroup-init').hide();
+			$('#newgroupname').focus();
+		} else {
+			$('#newgroup-form').hide();
+			$('#newgroup-init').show();
+			$('#newgroupname').val('');
+		}
+	},
+
 	finishDelete: function (ready) {
 		if (!GroupList.deleteCanceled && GroupList.deleteGid) {
 			$.ajax({
@@ -68,10 +81,7 @@ $(document).ready( function () {
 	// Display or hide of Create Group List Element
 	$('#newgroup-form').hide();
 	$('#newgroup-init').on('click', function (e) {
-		e.stopPropagation();
-		$('#newgroup-form').show();
-		$('#newgroup-init').hide();
-		$('#newgroupname').focus();
+		GroupList.toggleAddGroup(e);
 	});
 
 	// Responsible for Creating Groups.
@@ -98,6 +108,7 @@ $(document).ready( function () {
 						var addedGroups = result.data.groupname;
 						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
 					}
+					GroupList.toggleAddGroup();
 				}
 			}
 		)
-- 
cgit v1.2.3


From a4cfa9554548c53a3d0aa267495427729deb9352 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Feb 2014 15:22:20 +0100
Subject: restructure group.js and put functions to object, also add group list
 sorting after adding.

---
 settings/js/users/groups.js                 | 91 +++++++++++++++++++++--------
 settings/templates/users/part.grouplist.php |  2 +-
 2 files changed, 68 insertions(+), 25 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index f8f6d3fedcc..7c8b6608f11 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -5,6 +5,61 @@
  */
 
  var GroupList = {
+	addGroup: function(gid) {
+		var li = $('li[data-gid]').last().clone();
+		var ul = $('li[data-gid]').first().parent();
+		li.attr('data-gid', gid);
+		li.attr('data-usercount', 0);
+		li.find('a span').first().text(gid);
+		li.find('span[class=usercount]').first().text('');
+
+		$(li).appendTo(ul);
+
+		GroupList.sortGroups(0);
+	},
+
+	sortGroups: function(usercount) {
+		var lis = $('li[data-gid]').filterAttr('data-usercount', usercount.toString()).get();
+		var ul = $(lis).first().parent();
+
+		lis.sort(function(a, b) {
+			return UserList.alphanum($(a).find('a span').text(), $(b).find('a span').text());
+		});
+
+		var items = [];
+		$.each(lis, function(index, li) {
+			items.push(li);
+			if(items.length === 100) {
+				$(ul).append(items);
+				items = [];
+			}
+		});
+		if(items.length > 0) {
+			$(ul).append(items);
+		}
+	},
+
+	createGroup: function(groupname) {
+		$.post(
+			OC.filePath('settings', 'ajax', 'creategroup.php'),
+			{
+				groupname : groupname
+			},
+			function (result) {
+				if (result.status !== 'success') {
+					OC.dialogs.alert(result.data.message,
+						t('settings', 'Error creating group'));
+				} else {
+					if (result.data.groupname) {
+						var addedGroups = result.data.groupname;
+						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+						GroupList.addGroup(result.data.groupname);
+					}
+					GroupList.toggleAddGroup();
+				}
+			}
+		)
+	},
 
 	delete_group: function (gid) {
 		if(GroupList.deleteGid !=='undefined') {
@@ -42,6 +97,16 @@
 		}
 	},
 
+	isGroupNameValid: function(groupname) {
+		if ($.trim(groupname) === '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid groupname must be provided'),
+				t('settings', 'Error creating group'));
+			return false;
+		}
+		return true;
+	},
+
 	finishDelete: function (ready) {
 		if (!GroupList.deleteCanceled && GroupList.deleteGid) {
 			$.ajax({
@@ -87,31 +152,9 @@ $(document).ready( function () {
 	// Responsible for Creating Groups.
 	$('#newgroup-form form').submit(function (event) {
 		event.preventDefault();
-		var groupname = $('#newgroupname').val();
-		if ($.trim(groupname) === '') {
-			OC.dialogs.alert(
-				t('settings', 'A valid groupname must be provided'),
-				t('settings', 'Error creating group'));
-			return false;
+		if(GroupList.isGroupNameValid($('#newgroupname').val())) {
+			GroupList.createGroup($('#newgroupname').val());
 		}
-		$.post(
-			OC.filePath('settings', 'ajax', 'creategroup.php'),
-			{
-				groupname : groupname
-			},
-			function (result) {
-				if (result.status !== 'success') {
-					OC.dialogs.alert(result.data.message,
-						t('settings', 'Error creating group'));
-				} else {
-					if (result.data.groupname) {
-						var addedGroups = result.data.groupname;
-						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
-					}
-					GroupList.toggleAddGroup();
-				}
-			}
-		)
 	});
 
 	// click on group name
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 6acf12a952f..4b1958c1a67 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -32,7 +32,7 @@
 
 	<!--List of Groups-->
 	<?php foreach($_["groups"] as $group): ?>
-		<li data-gid="<?php p($group['name']) ?>">
+		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p(count($group['useringroup'])) ?>">
 			<a href="#">
 				<span><?php p($group['name']); ?></span>
 				<img class="svg action rename" src="<?php p(image_path('core', 'actions/rename.svg'))?>"
-- 
cgit v1.2.3


From 853ced644d6984ffa7260015851646717855a6c6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Feb 2014 15:41:03 +0100
Subject: hide Add Group when clicking away or  pressing ESC

---
 settings/js/users/groups.js | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 7c8b6608f11..9f8225294b9 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -74,6 +74,11 @@
 		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(gid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
 	},
 
+	elementBelongsToAddGroup: function(el) {
+		return !(el !== $('#newgroup-form').get(0)
+				&& $('#newgroup-form').find($(el)).length === 0);
+	},
+
 	showGroup: function (gid) {
 		UserList.empty();
 		UserList.update(gid);
@@ -84,8 +89,12 @@
 		}
 	},
 
+	isAddGroupButtonVisible: function() {
+		return $('#newgroup-init').is(":visible");
+	},
+
 	toggleAddGroup: function(event) {
-		if($('#newgroup-init').is(":visible")) {
+		if(GroupList.isAddGroupButtonVisible()) {
 			event.stopPropagation();
 			$('#newgroup-form').show();
 			$('#newgroup-init').hide();
@@ -149,6 +158,18 @@ $(document).ready( function () {
 		GroupList.toggleAddGroup(e);
 	});
 
+	$(document).on('click keydown keyup', function(event) {
+		if(!GroupList.isAddGroupButtonVisible()
+			&& !GroupList.elementBelongsToAddGroup(event.target)) {
+			GroupList.toggleAddGroup();
+		}
+		// Escape
+		if(!GroupList.isAddGroupButtonVisible() && event.keyCode && event.keyCode === 27) {
+			GroupList.toggleAddGroup();
+		}
+	});
+
+
 	// Responsible for Creating Groups.
 	$('#newgroup-form form').submit(function (event) {
 		event.preventDefault();
-- 
cgit v1.2.3


From cfba7e20cf1395ec3044b5ed8368536f2155b1fa Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Feb 2014 16:11:20 +0100
Subject: don't hide add group when text is entered (except for ESC press)

---
 settings/js/users/groups.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 9f8225294b9..e5d83b03775 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -79,6 +79,14 @@
 				&& $('#newgroup-form').find($(el)).length === 0);
 	},
 
+	hasAddGroupNameText: function() {
+		name = $('#newgroupname').val();
+		if($.trim(name) === '') {
+			return false;
+		}
+		return true;
+	},
+
 	showGroup: function (gid) {
 		UserList.empty();
 		UserList.update(gid);
@@ -160,7 +168,8 @@ $(document).ready( function () {
 
 	$(document).on('click keydown keyup', function(event) {
 		if(!GroupList.isAddGroupButtonVisible()
-			&& !GroupList.elementBelongsToAddGroup(event.target)) {
+			&& !GroupList.elementBelongsToAddGroup(event.target)
+		    && !GroupList.hasAddGroupNameText()) {
 			GroupList.toggleAddGroup();
 		}
 		// Escape
-- 
cgit v1.2.3


From b6b133237ae4624b81a2a4c86cd237a0ce70afd8 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 27 Feb 2014 02:01:50 +0530
Subject: Initial Commit with Group Toggle.

---
 settings/js/users/groups.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index e5d83b03775..fcb173de80a 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -148,7 +148,6 @@
 		}
 
 	},
-
 }
 
 $(document).ready( function () {
@@ -231,11 +230,15 @@ $(document).ready( function () {
 
 	// Implements Quota Settings Toggle.
 	$('#app-navigation').find('.settings-button').on('click', function (e) {
+		$('.settings-button').addClass('opened');
+		var settings = $('#app-settings');
 		e.stopPropagation();
-		$('#app-settings').removeClass('open');
-		$('#app-settings').toggleClass('open');
-		$(document).click(function() {
-			$('#app-settings').removeClass('open');
-    	});
+		settings.animate({height: "100px"});
+		$('#app-settings-content').css('display', 'block');
+		$(document).click(function (e) {
+			if (!settings.is(e.target) && settings.has(e.target).length === 0) {
+				settings.animate({height: "45px"});
+			}
+		});
 	});
 });
\ No newline at end of file
-- 
cgit v1.2.3


From b3d68fc17558fd5828b292c4474f8a538d1148a9 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 26 Feb 2014 18:04:55 +0100
Subject: refactor delete handling and apply it to users and groups

---
 core/js/js.js                      |   1 +
 settings/ajax/creategroup.php      |   1 +
 settings/js/users/deleteHandler.js | 153 +++++++++++++++++++++++++++++++++++++
 settings/js/users/groups.js        |  76 ++++++++----------
 settings/js/users/users.js         | 117 +++++++++-------------------
 settings/users.php                 |   1 +
 6 files changed, 226 insertions(+), 123 deletions(-)
 create mode 100644 settings/js/users/deleteHandler.js

(limited to 'settings/js')

diff --git a/core/js/js.js b/core/js/js.js
index 096cc3ad7c1..968bf650ad5 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -668,6 +668,7 @@ OC.Notification={
 				callback.call();
 			}
 			$('#notification').empty();
+			console.log('OCNO EMPTY');
 			if(OC.Notification.queuedNotifications.length > 0){
 				OC.Notification.showHtml(OC.Notification.queuedNotifications[0]);
 				OC.Notification.queuedNotifications.shift();
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 0a79527c219..f78d123270e 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -4,6 +4,7 @@ OCP\JSON::callCheck();
 OC_JSON::checkAdminUser();
 
 $groupname = $_POST["groupname"];
+$l = OC_L10N::get('core');
 
 // Does the group exist?
 if( in_array( $groupname, OC_Group::getGroups())) {
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
new file mode 100644
index 00000000000..83d1cafc30d
--- /dev/null
+++ b/settings/js/users/deleteHandler.js
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+
+/**
+ * @brief takes care of deleting things represented by an ID
+ * @param String endpoint: the corresponding ajax PHP script. Currently limited
+ * to settings - ajax path.
+ * @param String paramID: the by the script expected parameter name holding the
+ * ID of the object to delete
+ * @param Function markCallback: the function to be called after successfully
+ * marking the object for deletion.
+ * @param Function removeCallback: the function to be called after successful
+ * delete. The id of the object will be passed as argument. Insuccessful
+ * operations will display an error using OC.dialogs, no callback is fired.
+ */
+function DeleteHandler(endpoint, paramID, markCallback, removeCallback) {
+	this.oidToDelete = false;
+	this.canceled = false;
+
+	this.ajaxEndpoint = endpoint;
+	this.ajaxParamID = paramID;
+
+	this.markCallback = markCallback;
+	this.removeCallback = removeCallback;
+	this.undoCallback = false;
+
+	this.notifier = false;
+	this.notificationDataID = false;
+	this.notificationMessage = false;
+	this.notificationPlaceholder = '%oid';
+}
+
+/**
+ * @brief enabled the notification system. Required for undo UI.
+ * @param Object notifier: Usually OC.Notification
+ * @param String dataID: an identifier for the notificatior, e.g. 'deleteuser'
+ * @param String message: the message that should be shown upon delete. %oid
+ * will be replaced with the affected id of the item to be deleted
+ * @param Function undoCb: called after "undo" was clicked so consument can
+ * update the web interface
+ */
+DeleteHandler.prototype.setNotification = function(notifier, dataID, message, undoCb) {
+	this.notifier = notifier;
+	this.notificationDataID = dataID;
+	this.notificationMessage = message;
+	this.undoCallback = undoCb;
+
+	dh = this;
+
+	$('#notification').on('click', '.undo', function () {
+		if ($('#notification').data(dh.notificationDataID)) {
+			oid = dh.oidToDelete;
+			UserDeleteHandler.cancel();
+			if(typeof dh.undoCallback !== 'undefined') {
+				dh.undoCallback(oid);
+			}
+		}
+		dh.notifier.hide();
+	});
+}
+
+/**
+ * @brief shows the Undo Notification (if configured)
+ */
+DeleteHandler.prototype.showNotification = function() {
+	if(this.notifier !== false) {
+		if(!this.notifier.isHidden()) {
+			this.hideNotification();
+		}
+		$('#notification').data(this.notificationDataID, true);
+		msg = this.notificationMessage.replace(this.notificationPlaceholder,
+											this.oidToDelete);
+		console.log('NOTISHOW ' + msg);
+		this.notifier.showHtml(msg);
+	}
+}
+
+/**
+ * @brief hides the Undo Notification
+ */
+DeleteHandler.prototype.hideNotification = function() {
+	if(this.notifier !== false) {
+		$('#notification').removeData(this.notificationDataID);
+		this.notifier.hide();
+	}
+}
+
+/**
+ * @brief initilizes the delete operation for a given object id
+ * @param String oid: the object id
+ */
+DeleteHandler.prototype.mark = function(oid) {
+	if(this.oidToDelete !== false) {
+		this.delete();
+	}
+	this.oidToDelete = oid;
+	this.canceled = false;
+	this.markCallback(oid);
+	this.showNotification();
+}
+
+/**
+ * @brief cancels a delete operation
+ */
+DeleteHandler.prototype.cancel = function(oid) {
+	this.canceled = true;
+	this.oidToDelete = false;
+}
+
+/**
+ * @brief executes a delete operation. Requires that the operation has been
+ * initilized by mark(). On error, it will show a message via
+ * OC.dialogs.alert. On success, a callback is fired so that the client can
+ * update the web interface accordingly.
+ */
+DeleteHandler.prototype.delete = function() {
+	if(this.canceled || this.oidToDelete === false) {
+		return false;
+	}
+
+	dh = this;
+	console.log($('#notification').data(this.notificationDataID));
+	if($('#notification').data(this.notificationDataID) === true) {
+		dh.hideNotification();
+		console.log('HIDDEN NOTI');
+	}
+
+	payload = {};
+	payload[dh['ajaxParamID']] = dh.oidToDelete;
+	$.ajax({
+		type: 'POST',
+		url: OC.filePath('settings', 'ajax', dh.ajaxEndpoint),
+		async: false,
+		data: payload,
+		success: function (result) {
+			if (result.status === 'success') {
+				// Remove undo option, & remove user from table
+
+				//TODO: following line
+				dh.removeCallback(dh.oidToDelete);
+				dh.canceled = true;
+				console.log(dh.ajaxEndpoint);
+			} else {
+				OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete ' + escapeHTML(dh.oidToDelete)));
+				dh.undoCallback(dh.oidToDelete);
+			}
+		}
+	});
+}
\ No newline at end of file
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index fcb173de80a..f5a2ce755b3 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -61,19 +61,6 @@
 		)
 	},
 
-	delete_group: function (gid) {
-		if(GroupList.deleteGid !=='undefined') {
-			GroupList.finishDelete(null);
-		}
-
-		//Set the undo flag
-		GroupList.deleteCanceled = false;
-
-		//Provide an option to undo
-		$('#notification').data('deletegroup', true);
-		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(gid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
-	},
-
 	elementBelongsToAddGroup: function(el) {
 		return !(el !== $('#newgroup-form').get(0)
 				&& $('#newgroup-form').find($(el)).length === 0);
@@ -124,40 +111,44 @@
 		return true;
 	},
 
-	finishDelete: function (ready) {
-		if (!GroupList.deleteCanceled && GroupList.deleteGid) {
-			$.ajax({
-				type: 'POST',
-				url: OC.filePath('settings', 'ajax', 'removegroup.php'),
-				async: false,
-				data: { groupname: GroupList.deleteGid },
-				success: function (result) {
-					if (result.status === 'success') {
-						// Remove undo option, & remove user from table
-						OC.Notification.hide();
-						$('li').filterAttr('data-gid', GroupList.deleteGid).remove();
-						GroupList.deleteCanceled = true;
-						if (ready) {
-							ready();
-						}
-					} else {
-						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove group'));
-					}
-				}
-			});
-		}
+	hide: function(gid) {
+		$('li[data-gid="' + gid + '"]').hide();
+	},
+	show: function(gid) {
+		$('li[data-gid="' + gid + '"]').show();
+	},
+	remove: function(gid) {
+		$('li').filterAttr('data-gid', gid).remove();
+	},
+	initDeleteHandling: function() {
+		//set up handler
+		GroupDeleteHandler = new DeleteHandler('removegroup.php', 'groupname',
+											  GroupList.hide, GroupList.remove);
+
+		//configure undo
+		OC.Notification.hide();
+		msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
+			  t('settings', 'undo') + '</span>';
+		GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg,
+										  GroupList.show);
+
+		//when to mark user for delete
+		$('ul').on('click', 'span.utils>a', function (event) {
+			// Call function for handling delete/undo
+			gid = $(this).parent().parent().attr('data-gid');
+			GroupDeleteHandler.mark(gid);
+		});
 
+		console.log('init del groups');
+		//delete a marked user when leaving the page
+		$(window).on('beforeunload', function () {
+			GroupDeleteHandler.delete();
+		});
 	},
 }
 
 $(document).ready( function () {
-	$('ul').on('click', 'span.utils>a', function (event) {
-		var li = $(this).parent().parent();
-		var gid = $(li).attr('data-gid');
-		$(li).hide();
-		// Call function for handling delete/undo on Groups
-		GroupList.delete_group(gid);
-	});
+	GroupList.initDeleteHandling();
 
 	// Display or hide of Create Group List Element
 	$('#newgroup-form').hide();
@@ -191,7 +182,6 @@ $(document).ready( function () {
 	$('ul').on('click', 'li[data-gid]', function (event) {
 		var li = $(this);
 		var gid = $(li).attr('data-gid');
-		// Call function for handling delete/undo on Groups
 		GroupList.showGroup(gid);
 	});
 
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e939d1d3bfc..708451dbaca 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -5,7 +5,6 @@
  */
 
 var UserList = {
-	useUndo: true,
 	availableGroups: [],
 	offset: 30, //The first 30 users are there. No prob, if less in total.
 				//hardcoded in settings/users.php
@@ -13,65 +12,6 @@ var UserList = {
 	usersToLoad: 10, //So many users will be loaded when user scrolls down
 	currentGid: '',
 
-	/**
-	 * @brief Initiate user deletion process in UI
-	 * @param string uid the user ID to be deleted
-	 *
-	 * Does not actually delete the user; it sets them for
-	 * deletion when the current page is unloaded, at which point
-	 * finishDelete() completes the process. This allows for 'undo'.
-	 */
-	do_delete: function (uid) {
-		if (typeof UserList.deleteUid !== 'undefined') {
-			//Already a user in the undo queue
-			UserList.finishDelete(null);
-		}
-		UserList.deleteUid = uid;
-
-		// Set undo flag
-		UserList.deleteCanceled = false;
-
-		// Provide user with option to undo
-		$('#notification').data('deleteuser', true);
-		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(uid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
-	},
-
-	/**
-	 * @brief Delete a user via ajax
-	 * @param bool ready whether to use ready() upon completion
-	 *
-	 * Executes deletion via ajax of user identified by property deleteUid
-	 * if 'undo' has not been used.  Completes the user deletion procedure
-	 * and reflects success in UI.
-	 */
-	finishDelete: function (ready) {
-
-		// Check deletion has not been undone
-		if (!UserList.deleteCanceled && UserList.deleteUid) {
-
-			// Delete user via ajax
-			$.ajax({
-				type: 'POST',
-				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
-				async: false,
-				data: { username: UserList.deleteUid },
-				success: function (result) {
-					if (result.status === 'success') {
-						// Remove undo option, & remove user from table
-						OC.Notification.hide();
-						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
-						UserList.deleteCanceled = true;
-						if (ready) {
-							ready();
-						}
-					} else {
-						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
-					}
-				}
-			});
-		}
-	},
-
 	add: function (username, displayname, groups, subadmin, quota, storageLocation, lastLogin, sort) {
 		var tr = $('tbody tr').first().clone();
 		var subadminsEl;
@@ -229,6 +169,40 @@ var UserList = {
 		UserList.isEmpty = true;
 		UserList.offset = 0;
 	},
+	hide: function(uid) {
+		$('tr[data-uid="' + uid + '"]').hide();
+	},
+	show: function(uid) {
+		$('tr[data-uid="' + uid + '"]').show();
+	},
+	remove: function(uid) {
+		$('tr').filterAttr('data-uid', uid).remove();
+	},
+	initDeleteHandling: function() {
+		//set up handler
+		UserDeleteHandler = new DeleteHandler('removeuser.php', 'username',
+											  UserList.hide, UserList.remove);
+
+		//configure undo
+		OC.Notification.hide();
+		msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
+			  t('settings', 'undo') + '</span>';
+		UserDeleteHandler.setNotification(OC.Notification, 'deleteuser', msg,
+										  UserList.show);
+
+		//when to mark user for delete
+		$('table').on('click', 'td.remove>a', function (event) {
+			// Call function for handling delete/undo
+			uid = $(this).parent().parent().attr('data-uid');
+			UserDeleteHandler.mark(uid);
+		});
+
+		//delete a marked user when leaving the page
+		console.log('init del users');
+		$(window).on('beforeunload', function () {
+			UserDeleteHandler.delete();
+		});
+	},
 	update: function (gid) {
 		if (UserList.updating) {
 			return;
@@ -394,6 +368,7 @@ function setQuota (uid, quota, ready) {
 }
 
 $(document).ready(function () {
+	UserList.initDeleteHandling();
 
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').data('groups');
@@ -405,13 +380,7 @@ $(document).ready(function () {
 		UserList.applyMultiplySelect($(element));
 	});
 
-	$('table').on('click', 'td.remove>a', function (event) {
-		var row = $(this).parent().parent();
-		var uid = $(row).attr('data-uid');
-		$(row).hide();
-		// Call function for handling delete/undo
-		UserList.do_delete(uid);
-	});
+
 
 	$('table').on('click', 'td.password>img', function (event) {
 		event.stopPropagation();
@@ -568,17 +537,5 @@ $(document).ready(function () {
 		});
 	});
 
-	// Handle undo notifications
-	OC.Notification.hide();
-	$('#notification').on('click', '.undo', function () {
-		if ($('#notification').data('deleteuser')) {
-			$('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
-			UserList.deleteCanceled = true;
-		}
-		OC.Notification.hide();
-	});
-	UserList.useUndo = ('onbeforeunload' in window);
-	$(window).bind('beforeunload', function () {
-		UserList.finishDelete(null);
-	});
+
 });
diff --git a/settings/users.php b/settings/users.php
index 7bf240fa16e..c0c1adc74c7 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -8,6 +8,7 @@
 OC_Util::checkSubAdminUser();
 
 // We have some javascript foo!
+OC_Util::addScript('settings', 'users/deleteHandler');
 OC_Util::addScript( 'settings', 'users/users' );
 OC_Util::addScript( 'settings', 'users/groups' );
 OC_Util::addScript( 'core', 'multiselect' );
-- 
cgit v1.2.3


From 7aca12608640a7a2d0a833efaba8a389988647d0 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 6 Mar 2014 12:35:44 +0530
Subject: Adds @blizzz to authors

---
 settings/js/users/groups.js | 1 +
 settings/js/users/users.js  | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index f5a2ce755b3..13090b99162 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2014, Raghu Nayyar <beingminimal@gmail.com>
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 708451dbaca..afe00fc8024 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -1,4 +1,6 @@
 /**
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
+ * Copyright (c) 2014, Raghu Nayyar <beingminimal@gmail.com>
  * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
-- 
cgit v1.2.3


From e159f7e4a96d26548066b532d600198a67557b61 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 6 Mar 2014 12:44:42 +0530
Subject: Enhancement: Implements Grouplist Toggle, Courtesy Calendar App
 Settings.

---
 settings/js/users/groups.js | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 13090b99162..b666ad5e74b 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -220,16 +220,26 @@ $(document).ready( function () {
 	});
 
 	// Implements Quota Settings Toggle.
-	$('#app-navigation').find('.settings-button').on('click', function (e) {
-		$('.settings-button').addClass('opened');
-		var settings = $('#app-settings');
-		e.stopPropagation();
-		settings.animate({height: "100px"});
-		$('#app-settings-content').css('display', 'block');
-		$(document).click(function (e) {
-			if (!settings.is(e.target) && settings.has(e.target).length === 0) {
-				settings.animate({height: "45px"});
+	$('#app-settings-header').on('click keydown',function(event) {
+		if(wrongKey(event)) {
+			return;
+		}
+		var bodyListener = function(e) {
+			if($('#app-settings').find($(e.target)).length === 0) {
+				$('#app-settings').switchClass('open', '');
 			}
-		});
+		};
+		if($('#app-settings').hasClass('open')) {
+			$('#app-settings').switchClass('open', '');
+			$('body').unbind('click', bodyListener);
+		} else {
+			$('#app-settings').switchClass('', 'open');
+			$('body').bind('click', bodyListener);
+		}
 	});
-});
\ No newline at end of file
+});
+
+var wrongKey = function(event) {
+	return ((event.type === 'keydown' || event.type === 'keypress') 
+		&& (event.keyCode !== 32 && event.keyCode !== 13));
+};
\ No newline at end of file
-- 
cgit v1.2.3


From d3cee79b5a75f6257250e124b975ea046f396703 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 6 Mar 2014 13:27:29 +0530
Subject: Enhancement: Adding Group on the Sidebar updates the multiselect on
 the Userlist.

---
 settings/js/users/groups.js                  | 15 ++++++++-
 settings/templates/users/part.createuser.php | 14 ++++----
 settings/templates/users/part.userlist.php   | 50 +++++++++++++++-------------
 3 files changed, 48 insertions(+), 31 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index b666ad5e74b..0180cb64898 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -55,6 +55,19 @@
 						var addedGroups = result.data.groupname;
 						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
 						GroupList.addGroup(result.data.groupname);
+
+						$('#newusergroups').children().first().attr('value', result.data.groupname);
+						$('#newusergroups').children().first().text(result.data.groupname);
+
+						$('.groupsselect').each( function (index, element) {
+							$(element).children().first().attr('value', result.data.groupname);
+							$(element).children().first().text(result.data.groupname);
+						});
+
+						$('.subadminsselect').each( function (index, element) {
+							$(element).children().first().attr('value', result.data.groupname);
+							$(element).children().first().text(result.data.groupname);
+						});
 					}
 					GroupList.toggleAddGroup();
 				}
@@ -124,7 +137,7 @@
 	initDeleteHandling: function() {
 		//set up handler
 		GroupDeleteHandler = new DeleteHandler('removegroup.php', 'groupname',
-											  GroupList.hide, GroupList.remove);
+											GroupList.hide, GroupList.remove);
 
 		//configure undo
 		OC.Notification.hide();
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index e52f0da0b36..73799ff5d5b 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -1,16 +1,18 @@
 <div id="user-controls">
 	<form id="newuser" autocomplete="off">
-		<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
+		<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" />
+		<input
 			type="password" id="newuserpassword"
-			placeholder="<?php p($l->t('Password'))?>" /> <select
-			class="groupsselect"
-			id="newusergroups" data-placeholder="groups"
+			placeholder="<?php p($l->t('Password'))?>"
+		/>
+		<select
+			class="groupsselect" id="newusergroups" data-placeholder="groups"
 			title="<?php p($l->t('Groups'))?>" multiple="multiple">
 			<?php foreach($_["adminGroup"] as $adminGroup): ?>
-			<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
+				<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
 			<?php endforeach; ?>
 			<?php foreach($_["groups"] as $group): ?>
-			<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
+				<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
 			<?php endforeach;?>
 		</select>
 		<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index 989d5f362c4..17105b6e59d 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -33,32 +33,34 @@
 				src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"
 				alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/>
 			</td>
-			<td class="groups"><select
-				class="groupsselect"
-				data-username="<?php p($user['name']) ;?>"
-				data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
-				data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
-				multiple="multiple">
-					<?php foreach($_["adminGroup"] as $adminGroup): ?>
-					<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
-					<?php endforeach; ?>
-					<?php foreach($_["groups"] as $group): ?>
-					<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
-					<?php endforeach;?>
-			</select>
+			<td class="groups">
+				<select
+					class="groupsselect"
+					data-username="<?php p($user['name']) ;?>"
+					data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
+					data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
+					multiple="multiple">
+						<?php foreach($_["adminGroup"] as $adminGroup): ?>
+						<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
+						<?php endforeach; ?>
+						<?php foreach($_["groups"] as $group): ?>
+						<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
+						<?php endforeach;?>
+				</select>
 			</td>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<td class="subadmins"><select
-				class="subadminsselect"
-				data-username="<?php p($user['name']) ;?>"
-				data-subadmin="<?php p(json_encode($user['subadmin']));?>"
-				data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
-				multiple="multiple">
-					<?php foreach($_["subadmingroups"] as $group): ?>
-					<option value="<?php p($group);?>"><?php p($group);?></option>
-					<?php endforeach;?>
-			</select>
-			</td>
+				<td class="subadmins">
+					<select
+						class="subadminsselect"
+						data-username="<?php p($user['name']) ;?>"
+						data-subadmin="<?php p(json_encode($user['subadmin']));?>"
+						data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
+						multiple="multiple">
+						<?php foreach($_["subadmingroups"] as $group): ?>
+							<option value="<?php p($group);?>"><?php p($group);?></option>
+						<?php endforeach;?>
+					</select>
+				</td>
 			<?php endif;?>
 			<td class="quota">
 				<select class='quota-user' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
-- 
cgit v1.2.3


From fe4b1f8b101c0d582919f41efc7169c9d81aeca0 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 6 Mar 2014 13:41:51 +0530
Subject: Enhancement: Adds Group to grouplist when added via multiselect

---
 settings/js/users/users.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index afe00fc8024..ce1ac36635c 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -293,6 +293,7 @@ var UserList = {
 						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
 				});
+				GroupList.addGroup(escapeHTML(group));
 			};
 			var label;
 			if (oc_isadmin) {
-- 
cgit v1.2.3


From 5f57d72b93afe221139f6d0a2be033aea926b313 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 1 Apr 2014 15:59:53 +0200
Subject: kick out deprecated and dislodged OC.Router

---
 settings/js/users/users.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index ce1ac36635c..63153f67f50 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -215,7 +215,8 @@ var UserList = {
 			gid = '';
 		}
 		UserList.currentGid = gid;
-		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad, gid: gid }), function (result) {
+		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad, gid: gid });
+		$.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) {
 			var loadedUsers = 0;
 			var trs = [];
 			if (result.status === 'success') {
@@ -375,8 +376,12 @@ $(document).ready(function () {
 
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').data('groups');
-	$(window).scroll(function(e) {UserList._onScroll(e);});
-		UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);});
+
+
+	UserList.scrollArea = $('#app-content');
+	UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);});
+
+
 	$('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
 
 	$('select[multiple]').each(function (index, element) {
-- 
cgit v1.2.3


From 19fd7cd9c7206cea7c0eba21ed2b5d34ce652429 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 1 Apr 2014 22:44:08 +0200
Subject: When emptying a list, a hidden entry remains. If the user uid is the
 same as of a user being to be loaded, it will not be appended but removed.
 Thus, add a random user name to avoid such happenings.

---
 settings/js/users/users.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 63153f67f50..f5c3b1decc5 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -167,7 +167,11 @@ var UserList = {
 	empty: function() {
 		//one row needs to be kept, because it is cloned to add new rows
 		$('tbody tr:not(:first)').remove();
-		$('tbody tr').first().hide();
+		tr = $('tbody tr').first();
+		tr.hide();
+		//on an update a user may be missing when the username matches with that
+		//of the hidden row. So change this to a random string.
+		tr.attr('data-uid', Math.random().toString(36).substring(2));
 		UserList.isEmpty = true;
 		UserList.offset = 0;
 	},
-- 
cgit v1.2.3


From 5b8ba79356c50934b949a9e2a1942aeddd7640ff Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 2 Apr 2014 21:48:35 +0200
Subject: make filter work on server-side

---
 settings/ajax/userlist.php  | 11 ++++++++---
 settings/js/users/filter.js | 39 +++++++++++++++++++++++++++++++++++++++
 settings/js/users/users.js  | 16 +++-------------
 settings/users.php          |  1 +
 4 files changed, 51 insertions(+), 16 deletions(-)
 create mode 100644 settings/js/users/filter.js

(limited to 'settings/js')

diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 7ca1d535a46..32237d60b6e 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -37,13 +37,18 @@ if (isset($_GET['gid']) && !empty($_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())) {
 	if($gid !== false) {
-		$batch = OC_Group::displayNamesInGroup($gid, '', $limit, $offset);
+		$batch = OC_Group::displayNamesInGroup($gid, $pattern, $limit, $offset);
 	} else {
-		$batch = OC_User::getDisplayNames('', $limit, $offset);
+		$batch = OC_User::getDisplayNames($pattern, $limit, $offset);
 	}
 	foreach ($batch as $uid => $displayname) {
 		$user = $userManager->get($uid);
@@ -65,7 +70,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 		//don't you try to investigate loops you must not know about
 		$groups = array();
 	}
-	$batch = OC_Group::usersInGroups($groups, '', $limit, $offset);
+	$batch = OC_Group::usersInGroups($groups, $pattern, $limit, $offset);
 	foreach ($batch as $uid) {
 		$user = $userManager->get($uid);
 		$users[] = array(
diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
new file mode 100644
index 00000000000..134ca47a7d1
--- /dev/null
+++ b/settings/js/users/filter.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * @brief foobar
+ * @param jQuery input element that works as the user text input field
+ */
+function UserManagementFilter(filterInput, userList) {
+	this.filterInput = filterInput;
+	this.userList = userList;
+	this.thread = undefined;
+
+	this.init();
+}
+
+UserManagementFilter.prototype.init = function() {
+	umf = this;
+	this.filterInput.keyup(function() {
+		clearTimeout(umf.thread);
+		umf.thread = setTimeout(
+			function() {
+				umf.run();
+			},
+			300
+		);
+	});
+}
+
+UserManagementFilter.prototype.run = function() {
+	this.userList.empty();
+	this.userList.update();
+}
+
+UserManagementFilter.prototype.getPattern = function() {
+	return this.filterInput.val();
+}
\ No newline at end of file
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index f5c3b1decc5..92ce8277baf 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -219,7 +219,8 @@ var UserList = {
 			gid = '';
 		}
 		UserList.currentGid = gid;
-		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad, gid: gid });
+		pattern = filter.getPattern();
+		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad, gid: gid, pattern: pattern });
 		$.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) {
 			var loadedUsers = 0;
 			var trs = [];
@@ -538,16 +539,5 @@ $(document).ready(function () {
 		);
 	});
 	// Implements User Search
-	$('#usersearchform input').keyup(function() {
-		var inputVal = $(this).val(), regex = new RegExp(inputVal, "i");;
-		$('table tbody tr td.name').each(function (key,element) {
-			if (regex.test($(element).text())) {
-				$(element).parent().show();
-			} else {
-				$(element).parent().hide();
-			}
-		});
-	});
-
-
+	filter = new UserManagementFilter($('#usersearchform input'), UserList);
 });
diff --git a/settings/users.php b/settings/users.php
index c0c1adc74c7..d6e270bbc32 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -9,6 +9,7 @@ OC_Util::checkSubAdminUser();
 
 // We have some javascript foo!
 OC_Util::addScript('settings', 'users/deleteHandler');
+OC_Util::addScript('settings', 'users/filter');
 OC_Util::addScript( 'settings', 'users/users' );
 OC_Util::addScript( 'settings', 'users/groups' );
 OC_Util::addScript( 'core', 'multiselect' );
-- 
cgit v1.2.3


From 68dc665c65d5cac1b3b99831d011819570ecf62a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 2 Apr 2014 21:55:57 +0200
Subject: dynamically decide whether to load 10 or 30 users

---
 settings/js/users/users.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 92ce8277baf..481cf1586ce 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -88,6 +88,7 @@ var UserList = {
 			tr.show();
 			$('tbody tr').first().remove();
 			UserList.isEmpty = false;
+			UserList.checkUsersToLoad();
 		}
 		if (sort) {
 			UserList.doSort();
@@ -164,6 +165,14 @@ var UserList = {
 			$('tbody').append(items);
 		}
 	},
+	checkUsersToLoad: function() {
+		//30 shall be loaded initially, from then on always 10 upon scrolling
+		if(UserList.isEmpty === false) {
+			UserList.usersToLoad = 10;
+		} else {
+			UserList.usersToLoad = 30;
+		}
+	},
 	empty: function() {
 		//one row needs to be kept, because it is cloned to add new rows
 		$('tbody tr:not(:first)').remove();
@@ -174,6 +183,7 @@ var UserList = {
 		tr.attr('data-uid', Math.random().toString(36).substring(2));
 		UserList.isEmpty = true;
 		UserList.offset = 0;
+		UserList.checkUsersToLoad();
 	},
 	hide: function(uid) {
 		$('tr[data-uid="' + uid + '"]').hide();
-- 
cgit v1.2.3


From 8df50acce78e56518131a5905ae45b1a3fb0f821 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 2 Apr 2014 22:00:25 +0200
Subject: some documentation

---
 settings/js/users/filter.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 134ca47a7d1..493ce991732 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -5,8 +5,10 @@
  */
 
 /**
- * @brief foobar
+ * @brief this object takes care of the filter funcationality on the user
+ * management page
  * @param jQuery input element that works as the user text input field
+ * @param object the UserList object
  */
 function UserManagementFilter(filterInput, userList) {
 	this.filterInput = filterInput;
@@ -16,6 +18,9 @@ function UserManagementFilter(filterInput, userList) {
 	this.init();
 }
 
+/**
+ * @brief sets up when the filter action shall be triggered
+ */
 UserManagementFilter.prototype.init = function() {
 	umf = this;
 	this.filterInput.keyup(function() {
@@ -29,11 +34,19 @@ UserManagementFilter.prototype.init = function() {
 	});
 }
 
+/**
+ * @brief the filter action needs to be done, here the accurate steps are being
+ * taken care of
+ */
 UserManagementFilter.prototype.run = function() {
 	this.userList.empty();
 	this.userList.update();
 }
 
+/**
+ * @brief returns the filter String
+ * @returns string
+ */
 UserManagementFilter.prototype.getPattern = function() {
 	return this.filterInput.val();
 }
\ No newline at end of file
-- 
cgit v1.2.3


From dbc854d8b8cb0a187859fae174a41de5b296595c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 3 Apr 2014 18:46:16 +0200
Subject: Fire up server request only on typing printed or modifying characters
 and when the string actually changed

---
 settings/js/users/filter.js | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 493ce991732..2c0eefe25d4 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -14,6 +14,7 @@ function UserManagementFilter(filterInput, userList) {
 	this.filterInput = filterInput;
 	this.userList = userList;
 	this.thread = undefined;
+	this.oldval = this.filterInput.val();
 
 	this.init();
 }
@@ -23,14 +24,33 @@ function UserManagementFilter(filterInput, userList) {
  */
 UserManagementFilter.prototype.init = function() {
 	umf = this;
-	this.filterInput.keyup(function() {
-		clearTimeout(umf.thread);
-		umf.thread = setTimeout(
-			function() {
-				umf.run();
-			},
-			300
-		);
+	this.filterInput.keyup(function(e) {
+		console.log(e.keyCode);
+
+		//we want to react on any printable letter, plus on modyfing stuff like
+		//Backspace and Delete. extended https://stackoverflow.com/a/12467610
+		var valid =
+			e.keyCode ===  0 || e.keyCode ===  8  || // like ö or ж; backspace
+			e.keyCode ===  9 || e.keyCode === 46  || // tab; delete
+			e.keyCode === 32                      || // space
+			(e.keyCode >  47 && e.keyCode <   58) || // number keys
+			(e.keyCode >  64 && e.keyCode <   91) || // letter keys
+			(e.keyCode >  95 && e.keyCode <  112) || // numpad keys
+			(e.keyCode > 185 && e.keyCode <  193) || // ;=,-./` (in order)
+			(e.keyCode > 218 && e.keyCode <  223);   // [\]' (in order)
+
+		//besides the keys, the value must have been changed compared to last
+		//time
+		if(valid && umf.oldVal !== umf.getPattern()) {
+			clearTimeout(umf.thread);
+			umf.thread = setTimeout(
+				function() {
+					umf.run();
+				},
+				300
+			);
+		}
+		umf.oldVal = umf.getPattern();
 	});
 }
 
-- 
cgit v1.2.3


From 249e42c4cdf81c2d1c294a5535c055cdfee992b4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 15 Apr 2014 00:13:23 +0200
Subject: enable group filtering

---
 settings/ajax/grouplist.php                 | 75 +++++++++++++++++++++++++++++
 settings/js/users/filter.js                 |  7 +--
 settings/js/users/groups.js                 | 49 +++++++++++++++++--
 settings/js/users/users.js                  |  5 +-
 settings/routes.php                         |  2 +
 settings/templates/users/part.grouplist.php |  9 ++--
 settings/users.php                          | 11 +++--
 7 files changed, 143 insertions(+), 15 deletions(-)
 create mode 100644 settings/ajax/grouplist.php

(limited to 'settings/js')

diff --git a/settings/ajax/grouplist.php b/settings/ajax/grouplist.php
new file mode 100644
index 00000000000..1041d7374e7
--- /dev/null
+++ b/settings/ajax/grouplist.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Arthur Schiwon
+ * @copyright 2014 Arthur Schiwon <blizzz@owncloud.com>
+ *
+ * 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();
+
+$accessiblegroups = $groupManager->search($pattern);
+if (!OC_User::isAdminUser(OC_User::getUser())) {
+	$subadminGroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$accessiblegroups = array_intersect($accessiblegroups, $subadminGroups);
+}
+
+$sortGroupsIndex = 0;
+$sortGroupsKeys = array();
+$sortAdminGroupsIndex = 0;
+$sortAdminGroupsKeys = array();
+
+foreach($accessiblegroups as $group) {
+	$gid = $group->getGID();
+	$usersInGroup = OC_Group::usersInGroup($gid, '');
+	if (!OC_User::isAdminUser($gid)) {
+		$groups[] = array(
+			'id' => str_replace(' ','', $gid ),
+			'name' => $gid,
+			'usercount' => count($usersInGroup),
+		);
+		$sortGroupsKeys[$sortGroupsIndex] = count($usersInGroup);
+		$sortGroupsIndex++;
+	} else {
+		$adminGroup[] =  array(
+			'id' => str_replace(' ','', $gid ),
+			'name' => $gid,
+			'usercount' => count($usersInGroup)
+		);
+		$sortAdminGroupsKeys[$sortAdminGroupsIndex] = count($usersInGroup);
+		$sortAdminGroupsIndex++;
+	}
+}
+
+if(!empty($groups)) {
+	array_multisort($sortGroupsKeys, SORT_DESC, $groups);
+}
+if(!empty($adminGroup)) {
+	array_multisort($sortAdminGroupsKeys, SORT_DESC, $adminGroup);
+}
+
+OC_JSON::success(
+	array('data' => array('adminGroups' => $adminGroups, 'groups' => $groups)));
diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 2c0eefe25d4..89c2f46dacf 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -10,9 +10,10 @@
  * @param jQuery input element that works as the user text input field
  * @param object the UserList object
  */
-function UserManagementFilter(filterInput, userList) {
+function UserManagementFilter(filterInput, userList, groupList) {
 	this.filterInput = filterInput;
 	this.userList = userList;
+	this.groupList = groupList;
 	this.thread = undefined;
 	this.oldval = this.filterInput.val();
 
@@ -25,8 +26,6 @@ function UserManagementFilter(filterInput, userList) {
 UserManagementFilter.prototype.init = function() {
 	umf = this;
 	this.filterInput.keyup(function(e) {
-		console.log(e.keyCode);
-
 		//we want to react on any printable letter, plus on modyfing stuff like
 		//Backspace and Delete. extended https://stackoverflow.com/a/12467610
 		var valid =
@@ -61,6 +60,8 @@ UserManagementFilter.prototype.init = function() {
 UserManagementFilter.prototype.run = function() {
 	this.userList.empty();
 	this.userList.update();
+	this.groupList.empty();
+	this.groupList.update();
 }
 
 /**
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 0180cb64898..1088467ca11 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -6,17 +6,22 @@
  */
 
  var GroupList = {
-	addGroup: function(gid) {
+	addGroup: function(gid, usercount) {
+		if(usercount === undefined || usercount === 0) {
+			usercount = '';
+		}
 		var li = $('li[data-gid]').last().clone();
 		var ul = $('li[data-gid]').first().parent();
 		li.attr('data-gid', gid);
-		li.attr('data-usercount', 0);
+		li.attr('data-usercount', usercount);
 		li.find('a span').first().text(gid);
-		li.find('span[class=usercount]').first().text('');
+		li.find('span[class=usercount]').first().text(usercount);
 
 		$(li).appendTo(ul);
 
 		GroupList.sortGroups(0);
+
+		return li;
 	},
 
 	sortGroups: function(usercount) {
@@ -75,6 +80,41 @@
 		)
 	},
 
+	update: function() {
+		if (GroupList.updating) {
+			return;
+		}
+		GroupList.updating = true;
+		pattern = filter.getPattern();
+		var query = $.param({ pattern: pattern });
+		$.get(OC.generateUrl('/settings/ajax/grouplist') + '?' + query, function (result) {
+			var lis = [];
+			if (result.status === 'success') {
+				$.each(result.data, function (i, subset) {
+					$.each(subset, function (index, group) {
+						if($('li[data-gid="' + group.name + '"]').length > 0) {
+							return true;
+						}
+						var li = GroupList.addGroup(group.name, group.usercount);
+						li.addClass('appear transparent');
+						lis.push(li);
+					});
+				});
+				if (result.data.length > 0) {
+					GroupList.doSort();
+				} else {
+					GroupList.noMoreEntries = true;
+				}
+				setTimeout(function() {
+					for (var i = 0; i < lis.length; i++) {
+						lis[i].removeClass('transparent');
+					}
+				}, 0);
+			}
+			GroupList.updating = false;
+		});
+	},
+
 	elementBelongsToAddGroup: function(el) {
 		return !(el !== $('#newgroup-form').get(0)
 				&& $('#newgroup-form').find($(el)).length === 0);
@@ -134,6 +174,9 @@
 	remove: function(gid) {
 		$('li').filterAttr('data-gid', gid).remove();
 	},
+	empty: function() {
+		$('li:not([data-gid=""])').remove();
+	},
 	initDeleteHandling: function() {
 		//set up handler
 		GroupDeleteHandler = new DeleteHandler('removegroup.php', 'groupname',
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 481cf1586ce..e9c85d20e95 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -403,8 +403,6 @@ $(document).ready(function () {
 		UserList.applyMultiplySelect($(element));
 	});
 
-
-
 	$('table').on('click', 'td.password>img', function (event) {
 		event.stopPropagation();
 		var img = $(this);
@@ -549,5 +547,6 @@ $(document).ready(function () {
 		);
 	});
 	// Implements User Search
-	filter = new UserManagementFilter($('#usersearchform input'), UserList);
+	filter = new UserManagementFilter(
+		$('#usersearchform input'), UserList, GroupList);
 });
diff --git a/settings/routes.php b/settings/routes.php
index 1352fac8383..9acfc2852bd 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -25,6 +25,8 @@ $this->create('settings_admin', '/settings/admin')
 // users
 $this->create('settings_ajax_userlist', '/settings/ajax/userlist')
 	->actionInclude('settings/ajax/userlist.php');
+$this->create('settings_ajax_grouplist', '/settings/ajax/grouplist')
+	->actionInclude('settings/ajax/grouplist.php');
 $this->create('settings_ajax_createuser', '/settings/ajax/createuser.php')
 	->actionInclude('settings/ajax/createuser.php');
 $this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php')
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 4b1958c1a67..0d5fef7775c 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -18,6 +18,9 @@
 				<?php p($l->t('Everyone')); ?>
 			</span>
 		</a>
+		<span class="utils">
+			<span class="usercount"></span>
+		</span>
 	</li>
 
 	<!-- The Admin Group -->
@@ -25,21 +28,21 @@
 		<li data-gid="admin">
 			<a href="#"><?php p($l->t('Admins')); ?></a>
 			<span class="utils">
-				<span class="usercount"><?php if(count($adminGroup['useringroup']) > 0) { p(count($adminGroup['useringroup'])); } ?></span>
+				<span class="usercount"><?php if($adminGroup['useringroup'] > 0) { p($adminGroup['useringroup']); } ?></span>
 			</span>
 		</li>
 	<?php endforeach; ?>
 
 	<!--List of Groups-->
 	<?php foreach($_["groups"] as $group): ?>
-		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p(count($group['useringroup'])) ?>">
+		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p($group['useringroup']) ?>">
 			<a href="#">
 				<span><?php p($group['name']); ?></span>
 				<img class="svg action rename" src="<?php p(image_path('core', 'actions/rename.svg'))?>"
 				original-title="<?php p($l->t('Edit'))?>" alt="<?php p($l->t("change group name"))?>" title="<?php p($l->t("change group name"))?>" />
 			</a>
 			<span class="utils">
-				<span class="usercount"><?php if(count($group['useringroup']) > 0) { p(count($group['useringroup'])); } ?></span>
+				<span class="usercount"><?php if($group['useringroup'] > 0) { p($group['useringroup']); } ?></span>
 				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
 					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
 				</a>
diff --git a/settings/users.php b/settings/users.php
index d6e270bbc32..d3fcbb26a36 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -22,6 +22,7 @@ $users = array();
 $groups = array();
 $adminGroup = array();
 $userManager = \OC_User::getManager();
+$groupManager = \OC_Group::getManager();
 
 if (isset($_GET['offset'])) {
 	$offset = $_GET['offset'];
@@ -89,14 +90,18 @@ $sortGroupsKeys = array();
 $sortAdminGroupsIndex = 0;
 $sortAdminGroupsKeys = array();
 foreach( $accessiblegroups as $gid ) {
-	$usersInGroup = OC_Group::usersInGroup($gid, '', $limit, $offset);
+	$group = $groupManager->get($gid);
+	if(!$group) {
+		continue;
+	}
+	$usersInGroup = $group->count();
 	if (!OC_User::isAdminUser($gid)) {
 		$groups[] = array(
 			'id' => str_replace(' ','', $gid ),
 			'name' => $gid,
 			'useringroup' => $usersInGroup,
 		);
-		$sortGroupsKeys[$sortGroupsIndex] = count($usersInGroup);
+		$sortGroupsKeys[$sortGroupsIndex] = $usersInGroup;
 		$sortGroupsIndex++;
 	} else {
 		$adminGroup[] =  array(
@@ -104,7 +109,7 @@ foreach( $accessiblegroups as $gid ) {
 			'name' => $gid,
 			'useringroup' => $usersInGroup
 		);
-		$sortAdminGroupsKeys[$sortAdminGroupsIndex] = count($usersInGroup);
+		$sortAdminGroupsKeys[$sortAdminGroupsIndex] = $usersInGroup;
 		$sortAdminGroupsIndex++;
 	}
 }
-- 
cgit v1.2.3


From d779db5aba7bbf5a0042e611808e902063089bde Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 16 Apr 2014 18:57:35 +0200
Subject: js cleanup

---
 settings/js/users/deleteHandler.js | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index 83d1cafc30d..82c44b30581 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -14,7 +14,7 @@
  * @param Function markCallback: the function to be called after successfully
  * marking the object for deletion.
  * @param Function removeCallback: the function to be called after successful
- * delete. The id of the object will be passed as argument. Insuccessful
+ * delete. The id of the object will be passed as argument. Unsuccessful
  * operations will display an error using OC.dialogs, no callback is fired.
  */
 function DeleteHandler(endpoint, paramID, markCallback, removeCallback) {
@@ -37,23 +37,23 @@ function DeleteHandler(endpoint, paramID, markCallback, removeCallback) {
 /**
  * @brief enabled the notification system. Required for undo UI.
  * @param Object notifier: Usually OC.Notification
- * @param String dataID: an identifier for the notificatior, e.g. 'deleteuser'
+ * @param String dataID: an identifier for the notifier, e.g. 'deleteuser'
  * @param String message: the message that should be shown upon delete. %oid
  * will be replaced with the affected id of the item to be deleted
- * @param Function undoCb: called after "undo" was clicked so consument can
+ * @param Function undoCb: called after "undo" was clicked so the consumer can
  * update the web interface
  */
-DeleteHandler.prototype.setNotification = function(notifier, dataID, message, undoCb) {
+DeleteHandler.prototype.setNotification = function(notifier, dataID, message, undoCallback) {
 	this.notifier = notifier;
 	this.notificationDataID = dataID;
 	this.notificationMessage = message;
-	this.undoCallback = undoCb;
+	this.undoCallback = undoCallback;
 
-	dh = this;
+	var dh = this;
 
 	$('#notification').on('click', '.undo', function () {
 		if ($('#notification').data(dh.notificationDataID)) {
-			oid = dh.oidToDelete;
+			var oid = dh.oidToDelete;
 			UserDeleteHandler.cancel();
 			if(typeof dh.undoCallback !== 'undefined') {
 				dh.undoCallback(oid);
@@ -61,7 +61,7 @@ DeleteHandler.prototype.setNotification = function(notifier, dataID, message, un
 		}
 		dh.notifier.hide();
 	});
-}
+};
 
 /**
  * @brief shows the Undo Notification (if configured)
@@ -72,12 +72,12 @@ DeleteHandler.prototype.showNotification = function() {
 			this.hideNotification();
 		}
 		$('#notification').data(this.notificationDataID, true);
-		msg = this.notificationMessage.replace(this.notificationPlaceholder,
+		var msg = this.notificationMessage.replace(this.notificationPlaceholder,
 											this.oidToDelete);
 		console.log('NOTISHOW ' + msg);
 		this.notifier.showHtml(msg);
 	}
-}
+};
 
 /**
  * @brief hides the Undo Notification
@@ -87,10 +87,10 @@ DeleteHandler.prototype.hideNotification = function() {
 		$('#notification').removeData(this.notificationDataID);
 		this.notifier.hide();
 	}
-}
+};
 
 /**
- * @brief initilizes the delete operation for a given object id
+ * @brief initializes the delete operation for a given object id
  * @param String oid: the object id
  */
 DeleteHandler.prototype.mark = function(oid) {
@@ -101,19 +101,19 @@ DeleteHandler.prototype.mark = function(oid) {
 	this.canceled = false;
 	this.markCallback(oid);
 	this.showNotification();
-}
+};
 
 /**
  * @brief cancels a delete operation
  */
-DeleteHandler.prototype.cancel = function(oid) {
+DeleteHandler.prototype.cancel = function() {
 	this.canceled = true;
 	this.oidToDelete = false;
-}
+};
 
 /**
  * @brief executes a delete operation. Requires that the operation has been
- * initilized by mark(). On error, it will show a message via
+ * initialized by mark(). On error, it will show a message via
  * OC.dialogs.alert. On success, a callback is fired so that the client can
  * update the web interface accordingly.
  */
@@ -122,15 +122,15 @@ DeleteHandler.prototype.delete = function() {
 		return false;
 	}
 
-	dh = this;
+	var dh = this;
 	console.log($('#notification').data(this.notificationDataID));
 	if($('#notification').data(this.notificationDataID) === true) {
 		dh.hideNotification();
 		console.log('HIDDEN NOTI');
 	}
 
-	payload = {};
-	payload[dh['ajaxParamID']] = dh.oidToDelete;
+	var payload = {};
+	payload[dh.ajaxParamID] = dh.oidToDelete;
 	$.ajax({
 		type: 'POST',
 		url: OC.filePath('settings', 'ajax', dh.ajaxEndpoint),
@@ -150,4 +150,4 @@ DeleteHandler.prototype.delete = function() {
 			}
 		}
 	});
-}
\ No newline at end of file
+};
-- 
cgit v1.2.3


From 3c9788d40ccdad168eefbd75ba74e9550ee3805b Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 16 Apr 2014 19:41:09 +0200
Subject: js cleanup + typos

---
 settings/js/users/filter.js | 12 ++++++------
 settings/js/users/groups.js | 40 ++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 89c2f46dacf..3b04a8750cf 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @brief this object takes care of the filter funcationality on the user
+ * @brief this object takes care of the filter functionality on the user
  * management page
  * @param jQuery input element that works as the user text input field
  * @param object the UserList object
@@ -24,9 +24,9 @@ function UserManagementFilter(filterInput, userList, groupList) {
  * @brief sets up when the filter action shall be triggered
  */
 UserManagementFilter.prototype.init = function() {
-	umf = this;
+	var umf = this;
 	this.filterInput.keyup(function(e) {
-		//we want to react on any printable letter, plus on modyfing stuff like
+		//we want to react on any printable letter, plus on modifying stuff like
 		//Backspace and Delete. extended https://stackoverflow.com/a/12467610
 		var valid =
 			e.keyCode ===  0 || e.keyCode ===  8  || // like ö or ж; backspace
@@ -51,7 +51,7 @@ UserManagementFilter.prototype.init = function() {
 		}
 		umf.oldVal = umf.getPattern();
 	});
-}
+};
 
 /**
  * @brief the filter action needs to be done, here the accurate steps are being
@@ -62,7 +62,7 @@ UserManagementFilter.prototype.run = function() {
 	this.userList.update();
 	this.groupList.empty();
 	this.groupList.update();
-}
+};
 
 /**
  * @brief returns the filter String
@@ -70,4 +70,4 @@ UserManagementFilter.prototype.run = function() {
  */
 UserManagementFilter.prototype.getPattern = function() {
 	return this.filterInput.val();
-}
\ No newline at end of file
+};
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 1088467ca11..25b865cf18d 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -77,7 +77,7 @@
 					GroupList.toggleAddGroup();
 				}
 			}
-		)
+		);
 	},
 
 	update: function() {
@@ -85,7 +85,7 @@
 			return;
 		}
 		GroupList.updating = true;
-		pattern = filter.getPattern();
+		var pattern = filter.getPattern();
 		var query = $.param({ pattern: pattern });
 		$.get(OC.generateUrl('/settings/ajax/grouplist') + '?' + query, function (result) {
 			var lis = [];
@@ -116,12 +116,12 @@
 	},
 
 	elementBelongsToAddGroup: function(el) {
-		return !(el !== $('#newgroup-form').get(0)
-				&& $('#newgroup-form').find($(el)).length === 0);
+		return !(el !== $('#newgroup-form').get(0) &&
+				$('#newgroup-form').find($(el)).length === 0);
 	},
 
 	hasAddGroupNameText: function() {
-		name = $('#newgroupname').val();
+		var name = $('#newgroupname').val();
 		if($.trim(name) === '') {
 			return false;
 		}
@@ -158,7 +158,7 @@
 	isGroupNameValid: function(groupname) {
 		if ($.trim(groupname) === '') {
 			OC.dialogs.alert(
-				t('settings', 'A valid groupname must be provided'),
+				t('settings', 'A valid group name must be provided'),
 				t('settings', 'Error creating group'));
 			return false;
 		}
@@ -184,15 +184,15 @@
 
 		//configure undo
 		OC.Notification.hide();
-		msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
-			  t('settings', 'undo') + '</span>';
+		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
+			t('settings', 'undo') + '</span>';
 		GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg,
-										  GroupList.show);
+										GroupList.show);
 
 		//when to mark user for delete
-		$('ul').on('click', 'span.utils>a', function (event) {
+		$('ul').on('click', 'span.utils>a', function () {
 			// Call function for handling delete/undo
-			gid = $(this).parent().parent().attr('data-gid');
+			var gid = $(this).parent().parent().attr('data-gid');
 			GroupDeleteHandler.mark(gid);
 		});
 
@@ -201,8 +201,8 @@
 		$(window).on('beforeunload', function () {
 			GroupDeleteHandler.delete();
 		});
-	},
-}
+	}
+};
 
 $(document).ready( function () {
 	GroupList.initDeleteHandling();
@@ -214,9 +214,9 @@ $(document).ready( function () {
 	});
 
 	$(document).on('click keydown keyup', function(event) {
-		if(!GroupList.isAddGroupButtonVisible()
-			&& !GroupList.elementBelongsToAddGroup(event.target)
-		    && !GroupList.hasAddGroupNameText()) {
+		if(!GroupList.isAddGroupButtonVisible() &&
+			!GroupList.elementBelongsToAddGroup(event.target) &&
+			!GroupList.hasAddGroupNameText()) {
 			GroupList.toggleAddGroup();
 		}
 		// Escape
@@ -236,7 +236,7 @@ $(document).ready( function () {
 
 	// click on group name
 	// FIXME: also triggered when clicking on "remove"
-	$('ul').on('click', 'li[data-gid]', function (event) {
+	$('ul').on('click', 'li[data-gid]', function () {
 		var li = $(this);
 		var gid = $(li).attr('data-gid');
 		GroupList.showGroup(gid);
@@ -296,6 +296,6 @@ $(document).ready( function () {
 });
 
 var wrongKey = function(event) {
-	return ((event.type === 'keydown' || event.type === 'keypress') 
-		&& (event.keyCode !== 32 && event.keyCode !== 13));
-};
\ No newline at end of file
+	return ((event.type === 'keydown' || event.type === 'keypress') &&
+		(event.keyCode !== 32 && event.keyCode !== 13));
+};
-- 
cgit v1.2.3


From d87347e64ef90b89b1ff2b2221514b6fe1c57086 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 16 Apr 2014 22:16:55 +0200
Subject: update GroupList when a users is added or removed to a group

---
 settings/js/users/groups.js | 16 +++++++++++-----
 settings/js/users/users.js  | 10 ++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 25b865cf18d..4c555bd4c86 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -7,15 +7,11 @@
 
  var GroupList = {
 	addGroup: function(gid, usercount) {
-		if(usercount === undefined || usercount === 0) {
-			usercount = '';
-		}
 		var li = $('li[data-gid]').last().clone();
 		var ul = $('li[data-gid]').first().parent();
 		li.attr('data-gid', gid);
-		li.attr('data-usercount', usercount);
 		li.find('a span').first().text(gid);
-		li.find('span[class=usercount]').first().text(usercount);
+		GroupList.setUserCount(li, usercount);
 
 		$(li).appendTo(ul);
 
@@ -24,6 +20,14 @@
 		return li;
 	},
 
+	setUserCount: function(groupLiElement, usercount) {
+		if(usercount === undefined || usercount === 0) {
+			usercount = '';
+		}
+		groupLiElement.attr('data-usercount', usercount);
+		groupLiElement.find('span[class=usercount]').first().text(usercount);
+	},
+
 	sortGroups: function(usercount) {
 		var lis = $('li[data-gid]').filterAttr('data-usercount', usercount.toString()).get();
 		var ul = $(lis).first().parent();
@@ -93,6 +97,8 @@
 				$.each(result.data, function (i, subset) {
 					$.each(subset, function (index, group) {
 						if($('li[data-gid="' + group.name + '"]').length > 0) {
+							var li = $('li[data-gid="' + group.name + '"]');
+							GroupList.setUserCount(li, group.usercount);
 							return true;
 						}
 						var li = GroupList.addGroup(group.name, group.usercount);
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e9c85d20e95..d1cab63eaab 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -289,10 +289,12 @@ var UserList = {
 							group: group
 						},
 						function (response) {
-							if(response.status === 'success'
-									&& UserList.availableGroups.indexOf(response.data.groupname) === -1
-									&& response.data.action === 'add') {
-								UserList.availableGroups.push(response.data.groupname);
+							if(response.status === 'success') {
+								GroupList.update();
+								if(UserList.availableGroups.indexOf(response.data.groupname) === -1
+										&& response.data.action === 'add') {
+									UserList.availableGroups.push(response.data.groupname);
+								}
 							}
 							if(response.data.message) {
 								OC.Notification.show(response.data.message);
-- 
cgit v1.2.3


From 7b8935abdacfa25c55738b0395440c84bf86ffbb Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 17 Apr 2014 20:14:51 +0200
Subject: show users whose username starts with the search pattern first

We may want to switch or extend it to display name. I leave it like this for now, continued work on this needs to have sortable columns in mind
---
 settings/js/users/users.js | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index d1cab63eaab..092998c029f 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -145,12 +145,43 @@ var UserList = {
 		}
 		return aa.length - bb.length;
 	},
+	preSortSearchString: function(a, b) {
+		var pattern = filter.getPattern();
+		if(typeof pattern === 'undefined') {
+			return undefined;
+		}
+		pattern = pattern.toLowerCase();
+		var aMatches = false;
+		var bMatches = false;
+		if(typeof a === 'string' && a.toLowerCase().indexOf(pattern) === 0) {
+			aMatches = true;
+		}
+		if(typeof b === 'string' && b.toLowerCase().indexOf(pattern) === 0) {
+			bMatches = true;
+		}
+
+		if((aMatches && bMatches) || (!aMatches && !bMatches)) {
+			return undefined;
+		}
+
+		if(aMatches) {
+			return -1;
+		} else {
+			return 1;
+		}
+	},
 	doSort: function() {
 		var self = this;
 		var rows = $('tbody tr').get();
 
 		rows.sort(function(a, b) {
-			return UserList.alphanum($(a).find('td.name').text(), $(b).find('td.name').text());
+			a = $(a).find('td.name').text();
+			b = $(b).find('td.name').text();
+			var firstSort = UserList.preSortSearchString(a, b);
+			if(typeof firstSort !== 'undefined') {
+				return firstSort;
+			}
+			return UserList.alphanum(a, b);
 		});
 
 		var items = [];
@@ -391,6 +422,10 @@ function setQuota (uid, quota, ready) {
 $(document).ready(function () {
 	UserList.initDeleteHandling();
 
+	// Implements User Search
+	filter = new UserManagementFilter(
+		$('#usersearchform input'), UserList, GroupList);
+
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').data('groups');
 
@@ -548,7 +583,5 @@ $(document).ready(function () {
 			}
 		);
 	});
-	// Implements User Search
-	filter = new UserManagementFilter(
-		$('#usersearchform input'), UserList, GroupList);
+
 });
-- 
cgit v1.2.3


From dea7f457823e5b1a18f4165ded98baa0815ae79e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 17 Apr 2014 21:40:28 +0200
Subject: stick with current group when the filter is used

---
 settings/js/users/filter.js | 2 +-
 settings/js/users/groups.js | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 3b04a8750cf..456c51376b9 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -59,7 +59,7 @@ UserManagementFilter.prototype.init = function() {
  */
 UserManagementFilter.prototype.run = function() {
 	this.userList.empty();
-	this.userList.update();
+	this.userList.update(GroupList.getCurrentGID());
 	this.groupList.empty();
 	this.groupList.update();
 };
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 4c555bd4c86..e62dfd9dff7 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -6,6 +6,8 @@
  */
 
  var GroupList = {
+	activeGID: '',
+
 	addGroup: function(gid, usercount) {
 		var li = $('li[data-gid]').last().clone();
 		var ul = $('li[data-gid]').first().parent();
@@ -28,6 +30,10 @@
 		groupLiElement.find('span[class=usercount]').first().text(usercount);
 	},
 
+	getCurrentGID: function() {
+		return GroupList.activeGID;
+	},
+
 	sortGroups: function(usercount) {
 		var lis = $('li[data-gid]').filterAttr('data-usercount', usercount.toString()).get();
 		var ul = $(lis).first().parent();
@@ -135,6 +141,7 @@
 	},
 
 	showGroup: function (gid) {
+		GroupList.activeGID = gid;
 		UserList.empty();
 		UserList.update(gid);
 		$('#app-navigation li').removeClass('active');
-- 
cgit v1.2.3


From a9bd416643ad950de5f21aaaa4f5c77dd51c787a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 17 Apr 2014 22:14:04 +0200
Subject: add reset button for the filter field

---
 settings/css/settings.css                    | 10 ++++++++--
 settings/js/users/filter.js                  | 12 ++++++++++++
 settings/js/users/users.js                   |  1 +
 settings/templates/users/part.createuser.php |  3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'settings/js')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index e6ad4fd304f..604b5024371 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -63,8 +63,8 @@ li.active span.utils .delete {
 }
 li.active .rename {
 	padding: 8px 14px 20px 14px;
-	top: 0px; position: absolute; width: 16px; height: 16px; 
-	opacity: 0.5; 
+	top: 0px; position: absolute; width: 16px; height: 16px;
+	opacity: 0.5;
 	display: inline-block !important;
 }
 li.active span.utils .delete img { margin: 14px; }
@@ -108,6 +108,12 @@ div.quota>span {
 }
 select.quota.active { background: #fff; }
 
+input.userFilter {width: 200px;}
+span.userFilterReset {
+	width: 16px; height: 16px; position: absolute;
+	padding-top: 20px; margin-left: -20px;
+}
+
 /* positioning fixes */
 #newuser .multiselect {
 	min-width: 150px !important;
diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 456c51376b9..403e9c00c11 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -71,3 +71,15 @@ UserManagementFilter.prototype.run = function() {
 UserManagementFilter.prototype.getPattern = function() {
 	return this.filterInput.val();
 };
+
+/**
+ * @brief adds reset functionality to an HTML element
+ * @param jQuery the jQuery representation of that element
+ */
+UserManagementFilter.prototype.addResetButton = function(button) {
+	var umf = this;
+	button.click(function(){
+		umf.filterInput.val('');
+		umf.run();
+	});
+};
\ No newline at end of file
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 092998c029f..3832464c346 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -425,6 +425,7 @@ $(document).ready(function () {
 	// Implements User Search
 	filter = new UserManagementFilter(
 		$('#usersearchform input'), UserList, GroupList);
+	filter.addResetButton($('.userFilterReset').first());
 
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').data('groups');
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index 6af1e934e1d..2e37f3885a0 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -27,6 +27,7 @@
 	</div>
 	<?php endif; ?>
 	<form autocomplete="off" id="usersearchform">
-		<input type="text" class="input" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
+		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
+		<span  class="svg icon-delete userFilterReset"></a>
 	</form>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From 0067306fd6596bf549717fe51994dcfa0ab76498 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 20 Apr 2014 00:20:27 +0200
Subject: Remove uneeded last comma

---
 settings/js/users/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 3832464c346..fe9c255d0ca 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -404,7 +404,7 @@ var UserList = {
 		if (UserList.scrollArea.scrollTop() + UserList.scrollArea.height() > UserList.scrollArea.get(0).scrollHeight - 500) {
 			UserList.update(UserList.currentGid, true);
 		}
-	},
+	}
 };
 
 function setQuota (uid, quota, ready) {
-- 
cgit v1.2.3


From 66d00cf7822985f61051efdc5ae3ce2c9b89fd74 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 7 May 2014 17:10:47 +0200
Subject: user management: remove unneeded and erroneous user filter reset
 function

---
 settings/css/settings.css                    | 4 ----
 settings/js/users/users.js                   | 1 -
 settings/templates/users/part.createuser.php | 1 -
 3 files changed, 6 deletions(-)

(limited to 'settings/js')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 604b5024371..0895fa26ced 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -109,10 +109,6 @@ div.quota>span {
 select.quota.active { background: #fff; }
 
 input.userFilter {width: 200px;}
-span.userFilterReset {
-	width: 16px; height: 16px; position: absolute;
-	padding-top: 20px; margin-left: -20px;
-}
 
 /* positioning fixes */
 #newuser .multiselect {
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index fe9c255d0ca..da3011ce0be 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -425,7 +425,6 @@ $(document).ready(function () {
 	// Implements User Search
 	filter = new UserManagementFilter(
 		$('#usersearchform input'), UserList, GroupList);
-	filter.addResetButton($('.userFilterReset').first());
 
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').data('groups');
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index 2e37f3885a0..58d02e31513 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -28,6 +28,5 @@
 	<?php endif; ?>
 	<form autocomplete="off" id="usersearchform">
 		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
-		<span  class="svg icon-delete userFilterReset"></a>
 	</form>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From f324aa7b240f8b06485250d583b905fda9c25d03 Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 7 May 2014 17:37:33 +0200
Subject: fix some jshint errors

---
 settings/js/users/users.js | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index da3011ce0be..b9654e774ba 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -51,13 +51,13 @@ var UserList = {
 			subadminsEl.append(subadminSelect);
 		}
 		if (tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
-			var rm_img = $('<img class="svg action">').attr({
+			var deleteImage = $('<img class="svg action">').attr({
 				src: OC.imagePath('core', 'actions/delete')
 			});
-			var rm_link = $('<a class="action delete">')
+			var deleteLink = $('<a class="action delete">')
 				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
-				.append(rm_img);
-			tr.find('td.remove').append(rm_link);
+				.append(deleteImage);
+			tr.find('td.remove').append(deleteLink);
 		} else if (OC.currentUser === username) {
 			tr.find('td.remove a').remove();
 		}
@@ -120,12 +120,12 @@ var UserList = {
 			var tz = [], x = 0, y = -1, n = 0, i, j;
 
 			while (i = (j = t.charAt(x++)).charCodeAt(0)) {
-			var m = (i === 46 || (i >=48 && i <= 57));
-			if (m !== n) {
-				tz[++y] = "";
-				n = m;
-			}
-			tz[y] += j;
+				var m = (i === 46 || (i >=48 && i <= 57));
+				if (m !== n) {
+					tz[++y] = "";
+					n = m;
+				}
+				tz[y] += j;
 			}
 			return tz;
 		}
@@ -133,14 +133,14 @@ var UserList = {
 		var aa = chunkify(a.toLowerCase());
 		var bb = chunkify(b.toLowerCase());
 
-		for (x = 0; aa[x] && bb[x]; x++) {
+		for (var x = 0; aa[x] && bb[x]; x++) {
 			if (aa[x] !== bb[x]) {
-			var c = Number(aa[x]), d = Number(bb[x]);
-			if (c === aa[x] && d === bb[x]) {
-				return c - d;
-			} else {
-				return (aa[x] > bb[x]) ? 1 : -1;
-			}
+				var c = Number(aa[x]), d = Number(bb[x]);
+				if (c === aa[x] && d === bb[x]) {
+					return c - d;
+				} else {
+					return (aa[x] > bb[x]) ? 1 : -1;
+				}
 			}
 		}
 		return aa.length - bb.length;
@@ -207,7 +207,7 @@ var UserList = {
 	empty: function() {
 		//one row needs to be kept, because it is cloned to add new rows
 		$('tbody tr:not(:first)').remove();
-		tr = $('tbody tr').first();
+		var tr = $('tbody tr').first();
 		tr.hide();
 		//on an update a user may be missing when the username matches with that
 		//of the hidden row. So change this to a random string.
@@ -228,19 +228,19 @@ var UserList = {
 	initDeleteHandling: function() {
 		//set up handler
 		UserDeleteHandler = new DeleteHandler('removeuser.php', 'username',
-											  UserList.hide, UserList.remove);
+											UserList.hide, UserList.remove);
 
 		//configure undo
 		OC.Notification.hide();
-		msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
-			  t('settings', 'undo') + '</span>';
+		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
+			t('settings', 'undo') + '</span>';
 		UserDeleteHandler.setNotification(OC.Notification, 'deleteuser', msg,
-										  UserList.show);
+										UserList.show);
 
 		//when to mark user for delete
 		$('table').on('click', 'td.remove>a', function (event) {
 			// Call function for handling delete/undo
-			uid = $(this).parent().parent().attr('data-uid');
+			var uid = $(this).parent().parent().attr('data-uid');
 			UserDeleteHandler.mark(uid);
 		});
 
-- 
cgit v1.2.3


From 747c01161530edf47c4e727250f592652e66ba31 Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Mon, 5 May 2014 22:41:54 -0400
Subject: More specific selectors, javascript cleanup.

* Assigned jQuery selector results to variables for speed.
* Moved all .attr('data') calls to .data() calls.
* Added :data(uid) selector.
* Split the multiselect checkhandlers into separate functions.
* De-duped click event on password change/img.
* Used fluent interface on jQuery object for event binding.
* Removed redundant tag names in class selectors.
* Fixed incorrect date display for last login.
* Added Userlist.has() to search for uid.
* General code convention compliance fixes.

to-do: Group dropdowns currently don't add the admin group after the search result, not sure why yet.
---
 settings/js/users/users.js                 | 522 +++++++++++++++--------------
 settings/templates/users/part.setquota.php |   2 +-
 settings/templates/users/part.userlist.php |   4 +-
 3 files changed, 276 insertions(+), 252 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index b9654e774ba..f40854cf637 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -6,6 +6,10 @@
  * See the COPYING-README file.
  */
 
+var $userList;
+var $userListBody;
+var filter;
+
 var UserList = {
 	availableGroups: [],
 	offset: 30, //The first 30 users are there. No prob, if less in total.
@@ -15,29 +19,30 @@ var UserList = {
 	currentGid: '',
 
 	add: function (username, displayname, groups, subadmin, quota, storageLocation, lastLogin, sort) {
-		var tr = $('tbody tr').first().clone();
+		var $tr = $userListBody.find('tr:first-child').clone();
 		var subadminsEl;
 		var subadminSelect;
 		var groupsSelect;
-		if (tr.find('div.avatardiv').length){
-			$('div.avatardiv', tr).avatar(username, 32);
+		if ($tr.find('div.avatardiv').length){
+			$tr.find('.avatardiv').imageplaceholder(username, displayname);
+			$('div.avatardiv', $tr).avatar(username, 32);
 		}
-		tr.attr('data-uid', username);
-		tr.attr('data-displayName', displayname);
-		tr.find('td.name').text(username);
-		tr.find('td.displayName > span').text(displayname);
+		$tr.data('uid', username);
+		$tr.data('displayname', displayname);
+		$tr.find('td.name').text(username);
+		$tr.find('td.displayName > span').text(displayname);
 
 		// make them look like the multiselect buttons
 		// until they get time to really get initialized
 		groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
-			.attr('data-username', username)
+			.data('username', username)
 			.data('user-groups', groups);
-		if (tr.find('td.subadmins').length > 0) {
+		if ($tr.find('td.subadmins').length > 0) {
 			subadminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
-				.attr('data-username', username)
+				.data('username', username)
 				.data('user-groups', groups)
 				.data('subadmin', subadmin);
-			tr.find('td.subadmins').empty();
+			$tr.find('td.subadmins').empty();
 		}
 		$.each(this.availableGroups, function (i, group) {
 			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
@@ -45,48 +50,49 @@ var UserList = {
 				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
 			}
 		});
-		tr.find('td.groups').empty().append(groupsSelect);
-		subadminsEl = tr.find('td.subadmins');
+		$tr.find('td.groups').empty().append(groupsSelect);
+		subadminsEl = $tr.find('td.subadmins');
 		if (subadminsEl.length > 0) {
 			subadminsEl.append(subadminSelect);
 		}
-		if (tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
+		if ($tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
 			var deleteImage = $('<img class="svg action">').attr({
 				src: OC.imagePath('core', 'actions/delete')
 			});
 			var deleteLink = $('<a class="action delete">')
 				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
 				.append(deleteImage);
-			tr.find('td.remove').append(deleteLink);
+			$tr.find('td.remove').append(deleteLink);
 		} else if (OC.currentUser === username) {
-			tr.find('td.remove a').remove();
+			$tr.find('td.remove a').remove();
 		}
-		var quotaSelect = tr.find('select.quota-user');
+		var $quotaSelect = $tr.find('.quota-user');
 		if (quota === 'default') {
-			quotaSelect.find('option').attr('selected', null);
-			quotaSelect.find('option').first().attr('selected', 'selected');
-			quotaSelect.data('previous', 'default');
+			$quotaSelect
+				.data('previous', 'default')
+				.find('option').attr('selected', null)
+				.first().attr('selected', 'selected');
 		} else {
-			if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
-				quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
+			if ($quotaSelect.find('option[value="' + quota + '"]').length > 0) {
+				$quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
 			} else {
-				quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
+				$quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
 			}
 		}
-		tr.find('td.storageLocation').text(storageLocation);
+		$tr.find('td.storageLocation').text(storageLocation);
 		if(lastLogin === 0) {
 			lastLogin = t('settings', 'never');
 		} else {
-			lastLogin = new Date(lastLogin);
+			lastLogin = new Date(lastLogin * 1000);
 			lastLogin = relative_modified_date(lastLogin.getTime() / 1000);
 		}
-		tr.find('td.lastLogin').text(lastLogin);
-		$(tr).appendTo('tbody');
+		$tr.find('td.lastLogin').text(lastLogin);
+		$tr.appendTo($userList);
 		if(UserList.isEmpty === true) {
 			//when the list was emptied, one row was left, necessary to keep
 			//add working and the layout unbroken. We need to remove this item
-			tr.show();
-			$('tbody tr').first().remove();
+			$tr.show();
+			$userListBody.find('tr:first').remove();
 			UserList.isEmpty = false;
 			UserList.checkUsersToLoad();
 		}
@@ -94,25 +100,25 @@ var UserList = {
 			UserList.doSort();
 		}
 
-		quotaSelect.on('change', function () {
-			var uid = $(this).parent().parent().attr('data-uid');
+		$quotaSelect.on('change', function () {
+			var uid = $(this).closest('tr').data('uid');
 			var quota = $(this).val();
 			setQuota(uid, quota, function(returnedQuota){
 				if (quota !== returnedQuota) {
-					$(quotaSelect).find(':selected').text(returnedQuota);
+					$($quotaSelect).find(':selected').text(returnedQuota);
 				}
 			});
 		});
 
 		// defer init so the user first sees the list appear more quickly
 		window.setTimeout(function(){
-			quotaSelect.singleSelect();
-			UserList.applyMultiplySelect(groupsSelect);
+			$quotaSelect.singleSelect();
+			UserList.applyGroupSelect(groupsSelect);
 			if (subadminSelect) {
-				UserList.applyMultiplySelect(subadminSelect);
+				UserList.applySubadminSelect(subadminSelect);
 			}
 		}, 0);
-		return tr;
+		return $tr;
 	},
 	// From http://my.opera.com/GreyWyvern/blog/show.dml/1671288
 	alphanum: function(a, b) {
@@ -171,8 +177,7 @@ var UserList = {
 		}
 	},
 	doSort: function() {
-		var self = this;
-		var rows = $('tbody tr').get();
+		var rows = $userListBody.find('tr').get();
 
 		rows.sort(function(a, b) {
 			a = $(a).find('td.name').text();
@@ -188,12 +193,12 @@ var UserList = {
 		$.each(rows, function(index, row) {
 			items.push(row);
 			if(items.length === 100) {
-				$('tbody').append(items);
+				$userListBody.append(items);
 				items = [];
 			}
 		});
 		if(items.length > 0) {
-			$('tbody').append(items);
+			$userListBody.append(items);
 		}
 	},
 	checkUsersToLoad: function() {
@@ -206,24 +211,27 @@ var UserList = {
 	},
 	empty: function() {
 		//one row needs to be kept, because it is cloned to add new rows
-		$('tbody tr:not(:first)').remove();
-		var tr = $('tbody tr').first();
-		tr.hide();
+		$userListBody.find('tr:not(:first)').remove();
+		var $tr = $userListBody.find('tr:first');
+		$tr.hide();
 		//on an update a user may be missing when the username matches with that
 		//of the hidden row. So change this to a random string.
-		tr.attr('data-uid', Math.random().toString(36).substring(2));
+		$tr.data('uid', Math.random().toString(36).substring(2));
 		UserList.isEmpty = true;
 		UserList.offset = 0;
 		UserList.checkUsersToLoad();
 	},
 	hide: function(uid) {
-		$('tr[data-uid="' + uid + '"]').hide();
+		$('tr:data(' + uid + ')').hide();
 	},
 	show: function(uid) {
-		$('tr[data-uid="' + uid + '"]').show();
+		$('tr:data(' + uid + ')').show();
 	},
 	remove: function(uid) {
-		$('tr').filterAttr('data-uid', uid).remove();
+		$('tr:data(' + uid + ')').remove();
+	},
+	has: function(uid) {
+		return $('tr:data(' + uid + ')').length > 0;
 	},
 	initDeleteHandling: function() {
 		//set up handler
@@ -238,9 +246,9 @@ var UserList = {
 										UserList.show);
 
 		//when to mark user for delete
-		$('table').on('click', 'td.remove>a', function (event) {
+		$userListBody.on('click', '.delete', function () {
 			// Call function for handling delete/undo
-			var uid = $(this).parent().parent().attr('data-uid');
+			var uid = $(this).closest('tr').data('uid');
 			UserDeleteHandler.mark(uid);
 		});
 
@@ -254,147 +262,153 @@ var UserList = {
 		if (UserList.updating) {
 			return;
 		}
-		$('table+.loading').css('visibility', 'visible');
+		$userList.siblings('.loading').css('visibility', 'visible');
 		UserList.updating = true;
 		if(gid === undefined) {
 			gid = '';
 		}
 		UserList.currentGid = gid;
-		pattern = filter.getPattern();
-		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad, gid: gid, pattern: pattern });
-		$.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) {
-			var loadedUsers = 0;
-			var trs = [];
-			if (result.status === 'success') {
-				//The offset does not mirror the amount of users available,
-				//because it is backend-dependent. For correct retrieval,
-				//always the limit(requested amount of users) needs to be added.
-				$.each(result.data, function (index, user) {
-					if($('tr[data-uid="' + user.name + '"]').length > 0) {
-						return true;
+		var pattern = filter.getPattern();
+		$.get(
+			OC.generateUrl('/settings/ajax/userlist'),
+			{ offset: UserList.offset, limit: UserList.usersToLoad, gid: gid, pattern: pattern },
+			function (result) {
+				var loadedUsers = 0;
+				var trs = [];
+				if (result.status === 'success') {
+					//The offset does not mirror the amount of users available,
+					//because it is backend-dependent. For correct retrieval,
+					//always the limit(requested amount of users) needs to be added.
+					$.each(result.data, function (index, user) {
+						if($('tr:data(' + user.name + ')').length > 0) {
+							return true;
+						}
+						var $tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, user.storageLocation, user.lastLogin, false);
+						$tr.addClass('appear transparent');
+						trs.push($tr);
+						loadedUsers++;
+					});
+					if (result.data.length > 0) {
+						UserList.doSort();
+						$userList.siblings('.loading').css('visibility', 'hidden');
 					}
-					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, user.storageLocation, user.lastLogin, false);
-					tr.addClass('appear transparent');
-					trs.push(tr);
-					loadedUsers++;
-				});
-				if (result.data.length > 0) {
-					UserList.doSort();
-					$('table+.loading').css('visibility', 'hidden');
-				}
-				else {
-					UserList.noMoreEntries = true;
-					$('table+.loading').remove();
-				}
-				UserList.offset += loadedUsers;
-				// animate
-				setTimeout(function() {
-					for (var i = 0; i < trs.length; i++) {
-						trs[i].removeClass('transparent');
+					else {
+						UserList.noMoreEntries = true;
+						$userList.siblings('.loading').remove();
 					}
-				}, 0);
-			}
-			UserList.updating = false;
+					UserList.offset += loadedUsers;
+					// animate
+					setTimeout(function() {
+						for (var i = 0; i < trs.length; i++) {
+							trs[i].removeClass('transparent');
+						}
+					}, 0);
+				}
+				UserList.updating = false;
 		});
 	},
 
-	applyMultiplySelect: function (element) {
+	applyGroupSelect: function (element) {
 		var checked = [];
-		var user = element.attr('data-username');
-		if ($(element).hasClass('groupsselect')) {
-			if (element.data('userGroups')) {
-				checked = element.data('userGroups');
+		var $element = $(element);
+		var user = $element.data('username');
+
+		if ($element.data('user-groups')) {
+			checked = $element.data('user-groups');
+		}
+		var checkHandler = function (group) {
+			if (user === OC.currentUser && group === 'admin') {
+				return false;
 			}
-			if (user) {
-				var checkHandeler = function (group) {
-					if (user === OC.currentUser && group === 'admin') {
-						return false;
-					}
-					if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
-						return false;
-					}
-					$.post(
-						OC.filePath('settings', 'ajax', 'togglegroups.php'),
-						{
-							username: user,
-							group: group
-						},
-						function (response) {
-							if(response.status === 'success') {
-								GroupList.update();
-								if(UserList.availableGroups.indexOf(response.data.groupname) === -1
-										&& response.data.action === 'add') {
-									UserList.availableGroups.push(response.data.groupname);
-								}
-							}
-							if(response.data.message) {
-								OC.Notification.show(response.data.message);
-							}
-						}
-					);
-				};
-			} else {
-				checkHandeler = false;
+			if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
+				return false;
 			}
-			var addGroup = function (select, group) {
-				$('select[multiple]').each(function (index, element) {
-					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
-						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+			$.post(
+				OC.filePath('settings', 'ajax', 'togglegroups.php'),
+				{
+					username: user,
+					group: group
+				},
+				function (response) {
+					if (response.status === 'success') {
+						GroupList.update();
+						if (UserList.availableGroups.indexOf(response.data.groupname) === -1 &&
+							response.data.action === 'add'
+						) {
+							UserList.availableGroups.push(response.data.groupname);
+						}
 					}
-				});
-				GroupList.addGroup(escapeHTML(group));
-			};
-			var label;
-			if (oc_isadmin) {
-				label = t('settings', 'add group');
-			} else {
-				label = null;
-			}
-			element.multiSelect({
-				createCallback: addGroup,
-				createText: label,
-				selectedFirst: true,
-				checked: checked,
-				oncheck: checkHandeler,
-				onuncheck: checkHandeler,
-				minWidth: 100
+					if (response.data.message) {
+						OC.Notification.show(response.data.message);
+					}
+				}
+			);
+		};
+		var addGroup = function (select, group) {
+			$('select[multiple]').each(function (index, element) {
+				$element = $(element);
+				if ($element.find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $element.data('msid')) {
+					$element.append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+				}
 			});
+			GroupList.addGroup(escapeHTML(group));
+		};
+		var label;
+		if (oc_isadmin) {
+			label = t('settings', 'add group');
+		}
+		else {
+			label = null;
+		}
+		$element.multiSelect({
+			createCallback: addGroup,
+			createText: label,
+			selectedFirst: true,
+			checked: checked,
+			oncheck: checkHandler,
+			onuncheck: checkHandler,
+			minWidth: 100
+		});
+	},
+
+	applySubadminSelect: function (element) {
+		var checked = [];
+		var $element = $(element);
+		var user = $element.data('username');
+
+		if ($element.data('subadmin')) {
+			checked = $element.data('subadmin');
 		}
-		if ($(element).hasClass('subadminsselect')) {
-			if (element.data('subadmin')) {
-				checked = element.data('subadmin');
+		var checkHandler = function (group) {
+			if (group === 'admin') {
+				return false;
 			}
-			var checkHandeler = function (group) {
-				if (group === 'admin') {
-					return false;
+			$.post(
+				OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
+				{
+					username: user,
+					group: group
+				},
+				function () {
 				}
-				$.post(
-					OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
-					{
-						username: user,
-						group: group
-					},
-					function () {
-					}
-				);
-			};
+			);
+		};
 
-			var addSubAdmin = function (group) {
-				$('select[multiple]').each(function (index, element) {
-					if ($(element).find('option[value="' + group + '"]').length === 0) {
-						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
-					}
-				});
-			};
-			element.multiSelect({
-				createCallback: addSubAdmin,
-				createText: null,
-				checked: checked,
-				oncheck: checkHandeler,
-				onuncheck: checkHandeler,
-				minWidth: 100
+		var addSubAdmin = function (group) {
+			$('select[multiple]').each(function (index, element) {
+				if ($(element).find('option[value="' + group + '"]').length === 0) {
+					$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+				}
 			});
-		}
+		};
+		$element.multiSelect({
+			createCallback: addSubAdmin,
+			createText: null,
+			checked: checked,
+			oncheck: checkHandler,
+			onuncheck: checkHandler,
+			minWidth: 100
+		});
 	},
 
 	_onScroll: function(e) {
@@ -420,112 +434,122 @@ function setQuota (uid, quota, ready) {
 }
 
 $(document).ready(function () {
+	$userList = $('#userlist');
+	$userListBody = $userList.find('tbody');
+
+	// This adds a custom :data(value) jQuery selector, to select elements having data-uid="value":
+	jQuery.expr[':'].uid = function(elem, index, match) {
+		// if the requested value's set, compare it, otherwise return whether the element has the uid data element
+		return match[3] ? jQuery(elem).data('uid') === match[3] : !!jQuery(elem).data('uid');
+	};
+
 	UserList.initDeleteHandling();
 
 	// Implements User Search
-	filter = new UserManagementFilter(
-		$('#usersearchform input'), UserList, GroupList);
+	filter = new UserManagementFilter($('#usersearchform input'), UserList, GroupList);
+	filter.addResetButton($('.userFilterReset').first());
 
 	UserList.doSort();
-	UserList.availableGroups = $('#content table').data('groups');
+	UserList.availableGroups = $userList.data('groups');
 
 
 	UserList.scrollArea = $('#app-content');
 	UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);});
 
 
-	$('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
+	$userList.after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
 
-	$('select[multiple]').each(function (index, element) {
-		UserList.applyMultiplySelect($(element));
+	$('.groupsselect').each(function (index, element) {
+		UserList.applyGroupSelect(element);
+	});
+	$('.subadminsselect').each(function (index, element) {
+		UserList.applySubadminSelect(element);
 	});
 
-	$('table').on('click', 'td.password>img', function (event) {
+	$userListBody.on('click', '.password', function (event) {
 		event.stopPropagation();
-		var img = $(this);
-		var uid = img.parent().parent().attr('data-uid');
-		var input = $('<input type="password">');
-		img.css('display', 'none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($(this).val().length > 0) {
-					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
-					$.post(
-						OC.generateUrl('/settings/users/changepassword'),
-						{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
-						function (result) {
-							if (result.status != 'success') {
-								OC.Notification.show(t('admin', result.data.message));
+
+		var $td = $(this).closest('td');
+		var $tr = $td.closest('tr');
+		var uid = $tr.data('uid');
+		var $input = $('<input type="password">');
+		$td.find('img').hide();
+		$td.children('span').replaceWith($input);
+		$input
+			.focus()
+			.keypress(function (event) {
+				if (event.keyCode === 13) {
+					if ($(this).val().length > 0) {
+						var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
+						$.post(
+							OC.generateUrl('/settings/users/changepassword'),
+							{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
+							function (result) {
+								if (result.status != 'success') {
+									OC.Notification.show(t('admin', result.data.message));
+								}
 							}
-						}
-					);
-					input.blur();
-				} else {
-					input.blur();
+						);
+						$input.blur();
+					} else {
+						$input.blur();
+					}
 				}
-			}
-		});
-		input.blur(function () {
-			$(this).replaceWith($('<span>●●●●●●●</span>'));
-			img.css('display', '');
-		});
+			})
+			.blur(function () {
+				$(this).replaceWith($('<span>●●●●●●●</span>'));
+				$td.find('img').show();
+			});
 	});
-	$('input:password[id="recoveryPassword"]').keyup(function(event) {
+	$('input:password[id="recoveryPassword"]').keyup(function() {
 		OC.Notification.hide();
 	});
 
-	$('table').on('click', 'td.password', function (event) {
-		$(this).children('img').click();
-	});
-
-	$('table').on('click', 'td.displayName>img', function (event) {
+	$userListBody.on('click', '.displayName', function (event) {
 		event.stopPropagation();
-		var img = $(this);
-		var uid = img.parent().parent().attr('data-uid');
-		var displayName = escapeHTML(img.parent().parent().attr('data-displayName'));
-		var input = $('<input type="text" value="' + displayName + '">');
-		img.css('display', 'none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($(this).val().length > 0) {
-					$.post(
-						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
-						{username: uid, displayName: $(this).val()},
-						function (result) {
-							if (result && result.status==='success'){
-								img.parent().parent().find('div.avatardiv').avatar(result.data.username, 32);
+		var $td = $(this).closest('td');
+		var $tr = $td.closest('tr');
+		var uid = $tr.data('uid');
+		var displayName = escapeHTML($tr.data('displayname'));
+		var $input = $('<input type="text" value="' + displayName + '">');
+		$td.find('img').hide();
+		$td.children('span').replaceWith($input);
+		$input
+			.focus()
+			.keypress(function (event) {
+				if (event.keyCode === 13) {
+					if ($(this).val().length > 0) {
+						$tr.find('.avatardiv').imageplaceholder(uid, displayName);
+						$.post(
+							OC.filePath('settings', 'ajax', 'changedisplayname.php'),
+							{username: uid, displayName: $(this).val()},
+							function (result) {
+								if (result && result.status==='success'){
+									$tr.find('.avatardiv').avatar(result.data.username, 32);
+								}
 							}
-						}
-					);
-					input.blur();
-				} else {
-					input.blur();
+						);
+						$input.blur();
+					} else {
+						$input.blur();
+					}
 				}
-			}
-		});
-		input.blur(function () {
-			var input = $(this),
-				displayName = input.val();
-			input.closest('tr').attr('data-displayName', displayName);
-			input.replaceWith('<span>' + escapeHTML(displayName) + '</span>');
-			img.css('display', '');
-		});
-	});
-	$('table').on('click', 'td.displayName', function (event) {
-		$(this).children('img').click();
+			})
+			.blur(function () {
+				var displayName = $input.val();
+				$tr.data('displayname', displayName);
+				$input.replaceWith('<span>' + escapeHTML(displayName) + '</span>');
+				$td.find('img').show();
+			});
 	});
 
-	$('select.quota, select.quota-user').singleSelect().on('change', function () {
-		var select = $(this);
-		var uid = $(this).parent().parent().attr('data-uid');
+	$('#default_quota, .quota-user').singleSelect().on('change', function () {
+		var $select = $(this);
+		var uid = $select.closest('tr').data('uid');
 		var quota = $(this).val();
 		setQuota(uid, quota, function(returnedQuota){
 			if (quota !== returnedQuota) {
-				select.find(':selected').text(returnedQuota);
+				$select.find(':selected').text(returnedQuota);
 			}
 		});
 	});
@@ -546,7 +570,7 @@ $(document).ready(function () {
 				t('settings', 'Error creating user'));
 			return false;
 		}
-		var groups = $('#newusergroups').prev().children('div').data('settings').checked;
+		var groups = $('#newusergroups').val();
 		$('#newuser').get(0).reset();
 		$.post(
 			OC.filePath('settings', 'ajax', 'createuser.php'),
@@ -576,7 +600,7 @@ $(document).ready(function () {
 								UserList.notificationTimeout = null;
 							}, 10000);
 					}
-					if($('tr[data-uid="' + username + '"]').length === 0) {
+					if(!UserList.has(username)) {
 						UserList.add(username, username, result.data.groups, null, 'default', result.data.storageLocation, 0, true);
 					}
 				}
diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
index e246a94ad29..fc5624d069a 100644
--- a/settings/templates/users/part.setquota.php
+++ b/settings/templates/users/part.setquota.php
@@ -6,7 +6,7 @@
 		<!-- Default storage -->
 		<span><?php p($l->t('Default Quota'));?></span>
 		<?php if((bool) $_['isAdmin']): ?>
-			<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
+			<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
 				<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
 					<?php p($l->t('Unlimited'));?>
 				</option>
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index 047ebb46670..c74fdcc9efa 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -1,4 +1,4 @@
-<table class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>">
+<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>">
 	<thead>
 		<tr>
 			<?php if ($_['enableAvatars']): ?>
@@ -20,7 +20,7 @@
 	<tbody>
 		<?php foreach($_["users"] as $user): ?>
 		<tr data-uid="<?php p($user["name"]) ?>"
-			data-displayName="<?php p($user["displayName"]) ?>">
+			data-displayname="<?php p($user["displayName"]) ?>">
 			<?php if ($_['enableAvatars']): ?>
 			<td class="avatar"><div class="avatardiv"></div></td>
 			<?php endif; ?>
-- 
cgit v1.2.3


From ad1c34db45f74a61e6a933ca54ebf24aac031309 Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Tue, 6 May 2014 10:52:14 -0400
Subject: Revisions from review.

* Explicit toString()-based getters for uid and displayname data.
* Restored user check for group multiselect in new user creation form.
* Removed jQuery colon expr for uid.
---
 settings/js/users/users.js | 101 ++++++++++++++++++++++++---------------------
 1 file changed, 54 insertions(+), 47 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index f40854cf637..cd81a4b7718 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -101,7 +101,7 @@ var UserList = {
 		}
 
 		$quotaSelect.on('change', function () {
-			var uid = $(this).closest('tr').data('uid');
+			var uid = UserList.getUID(this);
 			var quota = $(this).val();
 			setQuota(uid, quota, function(returnedQuota){
 				if (quota !== returnedQuota) {
@@ -222,16 +222,27 @@ var UserList = {
 		UserList.checkUsersToLoad();
 	},
 	hide: function(uid) {
-		$('tr:data(' + uid + ')').hide();
+		UserList.getRow(uid).hide();
 	},
 	show: function(uid) {
-		$('tr:data(' + uid + ')').show();
+		UserList.getRow(uid).show();
 	},
 	remove: function(uid) {
-		$('tr:data(' + uid + ')').remove();
+		UserList.getRow(uid).remove();
 	},
 	has: function(uid) {
-		return $('tr:data(' + uid + ')').length > 0;
+		return UserList.getRow(uid).length > 0;
+	},
+	getRow: function(uid) {
+		return $userListBody.find('tr').filter(function(){
+			return UserList.getUID(this) === uid;
+		});
+	},
+	getUID: function(element) {
+		return ($(element).closest('tr').data('uid') || '').toString();
+	},
+	getDisplayName: function(element) {
+		return ($(element).closest('tr').data('displayname') || '').toString();
 	},
 	initDeleteHandling: function() {
 		//set up handler
@@ -248,7 +259,7 @@ var UserList = {
 		//when to mark user for delete
 		$userListBody.on('click', '.delete', function () {
 			// Call function for handling delete/undo
-			var uid = $(this).closest('tr').data('uid');
+			var uid = UserList.getUID(this);
 			UserDeleteHandler.mark(uid);
 		});
 
@@ -280,7 +291,7 @@ var UserList = {
 					//because it is backend-dependent. For correct retrieval,
 					//always the limit(requested amount of users) needs to be added.
 					$.each(result.data, function (index, user) {
-						if($('tr:data(' + user.name + ')').length > 0) {
+						if(UserList.has(user.name)) {
 							return true;
 						}
 						var $tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, user.storageLocation, user.lastLogin, false);
@@ -311,38 +322,41 @@ var UserList = {
 	applyGroupSelect: function (element) {
 		var checked = [];
 		var $element = $(element);
-		var user = $element.data('username');
+		var user = UserList.getUID($element);
 
 		if ($element.data('user-groups')) {
 			checked = $element.data('user-groups');
 		}
-		var checkHandler = function (group) {
-			if (user === OC.currentUser && group === 'admin') {
-				return false;
-			}
-			if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
-				return false;
-			}
-			$.post(
-				OC.filePath('settings', 'ajax', 'togglegroups.php'),
-				{
-					username: user,
-					group: group
-				},
-				function (response) {
-					if (response.status === 'success') {
-						GroupList.update();
-						if (UserList.availableGroups.indexOf(response.data.groupname) === -1 &&
-							response.data.action === 'add'
-						) {
-							UserList.availableGroups.push(response.data.groupname);
+		var checkHandler = null;
+		if(user) { // Only if in a user row, and not the #newusergroups select
+			checkHandler = function (group) {
+				if (user === OC.currentUser && group === 'admin') {
+					return false;
+				}
+				if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
+					return false;
+				}
+				$.post(
+					OC.filePath('settings', 'ajax', 'togglegroups.php'),
+					{
+						username: user,
+						group: group
+					},
+					function (response) {
+						if (response.status === 'success') {
+							GroupList.update();
+							if (UserList.availableGroups.indexOf(response.data.groupname) === -1 &&
+								response.data.action === 'add'
+							) {
+								UserList.availableGroups.push(response.data.groupname);
+							}
+						}
+						if (response.data.message) {
+							OC.Notification.show(response.data.message);
 						}
 					}
-					if (response.data.message) {
-						OC.Notification.show(response.data.message);
-					}
-				}
-			);
+				);
+			}
 		};
 		var addGroup = function (select, group) {
 			$('select[multiple]').each(function (index, element) {
@@ -374,7 +388,7 @@ var UserList = {
 	applySubadminSelect: function (element) {
 		var checked = [];
 		var $element = $(element);
-		var user = $element.data('username');
+		var user = UserList.getUID($element);
 
 		if ($element.data('subadmin')) {
 			checked = $element.data('subadmin');
@@ -411,7 +425,7 @@ var UserList = {
 		});
 	},
 
-	_onScroll: function(e) {
+	_onScroll: function() {
 		if (!!UserList.noMoreEntries) {
 			return;
 		}
@@ -437,12 +451,6 @@ $(document).ready(function () {
 	$userList = $('#userlist');
 	$userListBody = $userList.find('tbody');
 
-	// This adds a custom :data(value) jQuery selector, to select elements having data-uid="value":
-	jQuery.expr[':'].uid = function(elem, index, match) {
-		// if the requested value's set, compare it, otherwise return whether the element has the uid data element
-		return match[3] ? jQuery(elem).data('uid') === match[3] : !!jQuery(elem).data('uid');
-	};
-
 	UserList.initDeleteHandling();
 
 	// Implements User Search
@@ -470,8 +478,7 @@ $(document).ready(function () {
 		event.stopPropagation();
 
 		var $td = $(this).closest('td');
-		var $tr = $td.closest('tr');
-		var uid = $tr.data('uid');
+		var uid = UserList.getUID($td);
 		var $input = $('<input type="password">');
 		$td.find('img').hide();
 		$td.children('span').replaceWith($input);
@@ -509,8 +516,8 @@ $(document).ready(function () {
 		event.stopPropagation();
 		var $td = $(this).closest('td');
 		var $tr = $td.closest('tr');
-		var uid = $tr.data('uid');
-		var displayName = escapeHTML($tr.data('displayname'));
+		var uid = UserList.getUID($td);
+		var displayName = escapeHTML(UserList.getDisplayName($td));
 		var $input = $('<input type="text" value="' + displayName + '">');
 		$td.find('img').hide();
 		$td.children('span').replaceWith($input);
@@ -545,8 +552,8 @@ $(document).ready(function () {
 
 	$('#default_quota, .quota-user').singleSelect().on('change', function () {
 		var $select = $(this);
-		var uid = $select.closest('tr').data('uid');
-		var quota = $(this).val();
+		var uid = UserList.getUID($select);
+		var quota = $select.val();
 		setQuota(uid, quota, function(returnedQuota){
 			if (quota !== returnedQuota) {
 				$select.find(':selected').text(returnedQuota);
-- 
cgit v1.2.3


From c38548a1aa47fb53c61da8f54427ac923c7fdc64 Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Thu, 8 May 2014 09:42:55 -0400
Subject: Rebase cleanup.

Removing code that should not have been restored.
Originally removed in 45fd8f6d.
---
 settings/js/users/users.js                   | 1 -
 settings/templates/users/part.createuser.php | 1 -
 2 files changed, 2 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index cd81a4b7718..48586b485d5 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -455,7 +455,6 @@ $(document).ready(function () {
 
 	// Implements User Search
 	filter = new UserManagementFilter($('#usersearchform input'), UserList, GroupList);
-	filter.addResetButton($('.userFilterReset').first());
 
 	UserList.doSort();
 	UserList.availableGroups = $userList.data('groups');
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index adddc418a90..4d573168fc1 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -30,6 +30,5 @@
 	<?php endif; ?>
 	<form autocomplete="off" id="usersearchform">
 		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
-		<span class="svg icon-delete userFilterReset"></span>
 	</form>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From 4de14fe6da1dacea9c44396927564ab990105df2 Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Thu, 8 May 2014 17:38:29 -0400
Subject: Javascript cleanup for groups.

---
 settings/js/users/groups.js                 | 275 ++++++++++++++--------------
 settings/templates/users/part.grouplist.php |  14 +-
 2 files changed, 148 insertions(+), 141 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index e62dfd9dff7..5939731cca1 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -5,84 +5,82 @@
  * See the COPYING-README file.
  */
 
- var GroupList = {
+var $userGroupList;
+
+var GroupList;
+GroupList = {
 	activeGID: '',
 
-	addGroup: function(gid, usercount) {
-		var li = $('li[data-gid]').last().clone();
-		var ul = $('li[data-gid]').first().parent();
-		li.attr('data-gid', gid);
-		li.find('a span').first().text(gid);
-		GroupList.setUserCount(li, usercount);
+	addGroup: function (gid, usercount) {
+		var $li = $userGroupList.find('.isgroup:last-child').clone();
+		$li
+			.data('gid', gid)
+			.find('.groupname').text(gid);
+		GroupList.setUserCount($li, usercount);
 
-		$(li).appendTo(ul);
+		$li.appendTo($userGroupList);
 
-		GroupList.sortGroups(0);
+		GroupList.sortGroups();
 
-		return li;
+		return $li;
 	},
 
-	setUserCount: function(groupLiElement, usercount) {
-		if(usercount === undefined || usercount === 0) {
+	setUserCount: function (groupLiElement, usercount) {
+		var $groupLiElement = $(groupLiElement);
+		if (usercount === undefined || usercount === 0) {
 			usercount = '';
 		}
-		groupLiElement.attr('data-usercount', usercount);
-		groupLiElement.find('span[class=usercount]').first().text(usercount);
+		$groupLiElement.data('usercount', usercount);
+		$groupLiElement.find('.usercount').text(usercount);
 	},
 
-	getCurrentGID: function() {
+	getCurrentGID: function () {
 		return GroupList.activeGID;
 	},
 
-	sortGroups: function(usercount) {
-		var lis = $('li[data-gid]').filterAttr('data-usercount', usercount.toString()).get();
-		var ul = $(lis).first().parent();
+	sortGroups: function () {
+		var lis = $('.isgroup').get();
 
-		lis.sort(function(a, b) {
-			return UserList.alphanum($(a).find('a span').text(), $(b).find('a span').text());
+		lis.sort(function (a, b) {
+			return UserList.alphanum(
+				$(a).find('a span').text(),
+				$(b).find('a span').text()
+			);
 		});
 
 		var items = [];
-		$.each(lis, function(index, li) {
+		$.each(lis, function (index, li) {
 			items.push(li);
-			if(items.length === 100) {
-				$(ul).append(items);
+			if (items.length === 100) {
+				$userGroupList.append(items);
 				items = [];
 			}
 		});
-		if(items.length > 0) {
-			$(ul).append(items);
+		if (items.length > 0) {
+			$userGroupList.append(items);
 		}
 	},
 
-	createGroup: function(groupname) {
+	createGroup: function (groupname) {
 		$.post(
 			OC.filePath('settings', 'ajax', 'creategroup.php'),
 			{
-				groupname : groupname
+				groupname: groupname
 			},
 			function (result) {
 				if (result.status !== 'success') {
 					OC.dialogs.alert(result.data.message,
 						t('settings', 'Error creating group'));
-				} else {
+				}
+				else {
 					if (result.data.groupname) {
-						var addedGroups = result.data.groupname;
-						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+						var addedGroup = result.data.groupname;
+						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, [addedGroup]));
 						GroupList.addGroup(result.data.groupname);
 
-						$('#newusergroups').children().first().attr('value', result.data.groupname);
-						$('#newusergroups').children().first().text(result.data.groupname);
-
-						$('.groupsselect').each( function (index, element) {
-							$(element).children().first().attr('value', result.data.groupname);
-							$(element).children().first().text(result.data.groupname);
-						});
-
-						$('.subadminsselect').each( function (index, element) {
-							$(element).children().first().attr('value', result.data.groupname);
-							$(element).children().first().text(result.data.groupname);
-						});
+						$('.groupsselect, .subadminsselect')
+							.append($('<option>', { value: result.data.groupname })
+								.text(result.data.groupname));
 					}
 					GroupList.toggleAddGroup();
 				}
@@ -90,85 +88,87 @@
 		);
 	},
 
-	update: function() {
+	update: function () {
 		if (GroupList.updating) {
 			return;
 		}
 		GroupList.updating = true;
-		var pattern = filter.getPattern();
-		var query = $.param({ pattern: pattern });
-		$.get(OC.generateUrl('/settings/ajax/grouplist') + '?' + query, function (result) {
-			var lis = [];
-			if (result.status === 'success') {
-				$.each(result.data, function (i, subset) {
-					$.each(subset, function (index, group) {
-						if($('li[data-gid="' + group.name + '"]').length > 0) {
-							var li = $('li[data-gid="' + group.name + '"]');
-							GroupList.setUserCount(li, group.usercount);
-							return true;
-						}
-						var li = GroupList.addGroup(group.name, group.usercount);
-						li.addClass('appear transparent');
-						lis.push(li);
+		$.get(
+			OC.generateUrl('/settings/ajax/grouplist'),
+			{pattern: filter.getPattern()},
+			function (result) {
+
+				var lis = [];
+				if (result.status === 'success') {
+					$.each(result.data, function (i, subset) {
+						$.each(subset, function (index, group) {
+							if (GroupList.getGroupLI(group.name).length > 0) {
+								GroupList.setUserCount(GroupList.getGroupLI(group.name).first(), group.usercount);
+							}
+							else {
+								var $li = GroupList.addGroup(group.name, group.usercount);
+								$li.addClass('appear transparent');
+								lis.push($li);
+							}
+						});
 					});
-				});
-				if (result.data.length > 0) {
-					GroupList.doSort();
-				} else {
-					GroupList.noMoreEntries = true;
-				}
-				setTimeout(function() {
-					for (var i = 0; i < lis.length; i++) {
-						lis[i].removeClass('transparent');
+					if (result.data.length > 0) {
+						GroupList.doSort();
 					}
-				}, 0);
+					else {
+						GroupList.noMoreEntries = true;
+					}
+					setTimeout(function () {
+						$(lis).removeClass('transparent');
+					}, 0);
+				}
+				GroupList.updating = false;
+
 			}
-			GroupList.updating = false;
-		});
+		);
 	},
 
-	elementBelongsToAddGroup: function(el) {
+	elementBelongsToAddGroup: function (el) {
 		return !(el !== $('#newgroup-form').get(0) &&
-				$('#newgroup-form').find($(el)).length === 0);
+		$('#newgroup-form').find($(el)).length === 0);
 	},
 
-	hasAddGroupNameText: function() {
+	hasAddGroupNameText: function () {
 		var name = $('#newgroupname').val();
-		if($.trim(name) === '') {
-			return false;
-		}
-		return true;
+		return $.trim(name) !== '';
+
 	},
 
 	showGroup: function (gid) {
 		GroupList.activeGID = gid;
 		UserList.empty();
 		UserList.update(gid);
-		$('#app-navigation li').removeClass('active');
-		if(gid !== undefined) {
+		$userGroupList.find('li').removeClass('active');
+		if (gid !== undefined) {
 			//TODO: treat Everyone properly
-			$('#app-navigation li').filterAttr('data-gid', gid).addClass('active');
+			GroupList.getGroupLI(gid).addClass('active');
 		}
 	},
 
-	isAddGroupButtonVisible: function() {
+	isAddGroupButtonVisible: function () {
 		return $('#newgroup-init').is(":visible");
 	},
 
-	toggleAddGroup: function(event) {
-		if(GroupList.isAddGroupButtonVisible()) {
+	toggleAddGroup: function (event) {
+		if (GroupList.isAddGroupButtonVisible()) {
 			event.stopPropagation();
 			$('#newgroup-form').show();
 			$('#newgroup-init').hide();
 			$('#newgroupname').focus();
-		} else {
+		}
+		else {
 			$('#newgroup-form').hide();
 			$('#newgroup-init').show();
 			$('#newgroupname').val('');
 		}
 	},
 
-	isGroupNameValid: function(groupname) {
+	isGroupNameValid: function (groupname) {
 		if ($.trim(groupname) === '') {
 			OC.dialogs.alert(
 				t('settings', 'A valid group name must be provided'),
@@ -178,35 +178,36 @@
 		return true;
 	},
 
-	hide: function(gid) {
-		$('li[data-gid="' + gid + '"]').hide();
+	hide: function (gid) {
+		GroupList.getGroupLI(gid).hide();
 	},
-	show: function(gid) {
-		$('li[data-gid="' + gid + '"]').show();
+	show: function (gid) {
+		GroupList.getGroupLI(gid).show();
 	},
-	remove: function(gid) {
-		$('li').filterAttr('data-gid', gid).remove();
+	remove: function (gid) {
+		GroupList.getGroupLI(gid).remove();
 	},
-	empty: function() {
-		$('li:not([data-gid=""])').remove();
+	empty: function () {
+		$userGroupList.filter(function(item){
+			return item.data('gid') !== '';
+		}).remove();
 	},
-	initDeleteHandling: function() {
+	initDeleteHandling: function () {
 		//set up handler
 		GroupDeleteHandler = new DeleteHandler('removegroup.php', 'groupname',
-											GroupList.hide, GroupList.remove);
+			GroupList.hide, GroupList.remove);
 
 		//configure undo
 		OC.Notification.hide();
 		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
 			t('settings', 'undo') + '</span>';
 		GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg,
-										GroupList.show);
+			GroupList.show);
 
 		//when to mark user for delete
-		$('ul').on('click', 'span.utils>a', function () {
+		$userGroupList.on('click', '.delete', function () {
 			// Call function for handling delete/undo
-			var gid = $(this).parent().parent().attr('data-gid');
-			GroupDeleteHandler.mark(gid);
+			GroupDeleteHandler.mark(GroupList.getElementGID(this));
 		});
 
 		console.log('init del groups');
@@ -214,10 +215,21 @@
 		$(window).on('beforeunload', function () {
 			GroupDeleteHandler.delete();
 		});
+	},
+
+	getGroupLI: function (gid) {
+		return $userGroupList.find('li.isgroup').filter(function () {
+			return GroupList.getElementGID(this) === gid;
+		});
+	},
+
+	getElementGID: function (element) {
+		return ($(element).closest('li').data('gid') || '').toString();
 	}
 };
 
 $(document).ready( function () {
+	$userGroupList = $('#usergrouplist');
 	GroupList.initDeleteHandling();
 
 	// Display or hide of Create Group List Element
@@ -248,64 +260,59 @@ $(document).ready( function () {
 	});
 
 	// click on group name
-	// FIXME: also triggered when clicking on "remove"
-	$('ul').on('click', 'li[data-gid]', function () {
-		var li = $(this);
-		var gid = $(li).attr('data-gid');
-		GroupList.showGroup(gid);
+	$userGroupList.on('click', '.isgroup', function () {
+		GroupList.showGroup(GroupList.getElementGID(this));
 	});
 
 	// Implements Groupname editing.
-	$('#app-navigation').on('click', 'img.rename', function (event) {
+	$('#app-navigation').on('click', '.isgroup .rename', function (event) {
 		event.stopPropagation();
-		var img = $(this);
-		var gid = img.parent().parent().attr('data-gid');
-		var groupname = escapeHTML(img.parent().parent().attr('data-gid'));
-		var input = $('<input type="text" value="' + groupname + '">');
-		img.css('display', 'none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function (event) {
+		var $li = $(this).closest('li');
+		var gid = GroupList.getElementGID(this);
+		var groupname = escapeHTML(gid);
+		var $input = $('<input type="text" value="' + groupname + '">');
+		$li.find('.dorename img').hide();
+		$li.find('.dorename span').replaceWith($input);
+		$input.focus();
+		$input.keypress(function (event) {
 			if (event.keyCode === 13) {
-				if ($(this).val().length > 0) {
+				if ($input.val().length > 0) {
 					$.post(
 						OC.filePath('settings', 'ajax', 'changegroupname.php'),
-						{	groupname: gid,
-							groupname: $(this).val()
-						}
+						{ groupname: $input.val() }
 					);
-					input.blur();
+					$input.blur();
 				} else {
-					input.blur();
+					$input.blur();
 				}
 			}
 		});
-		input.blur(function () {
-			var input = $(this), groupname = input.val();
-			input.closest('li').attr('data-gid', groupname);
-			input.replaceWith('<span>' + escapeHTML(groupname) + '</span>');
-			img.css('display', '');
+		$input.blur(function () {
+			var $input = $(this), groupname = $input.val();
+			$input.closest('li').data('gid', groupname);
+			$input.replaceWith('<span>' + escapeHTML(groupname) + '</span>');
+			$li.find('img').show();
 		});
 	});
 
 	// Implements Quota Settings Toggle.
+	var $appSettings = $('#app-settings');
 	$('#app-settings-header').on('click keydown',function(event) {
 		if(wrongKey(event)) {
 			return;
 		}
-		var bodyListener = function(e) {
-			if($('#app-settings').find($(e.target)).length === 0) {
-				$('#app-settings').switchClass('open', '');
-			}
-		};
-		if($('#app-settings').hasClass('open')) {
-			$('#app-settings').switchClass('open', '');
-			$('body').unbind('click', bodyListener);
+		if($appSettings.hasClass('open')) {
+			$appSettings.switchClass('open', '');
 		} else {
-			$('#app-settings').switchClass('', 'open');
-			$('body').bind('click', bodyListener);
+			$appSettings.switchClass('', 'open');
+		}
+	});
+	$('body').on('click', function(event){
+		if($appSettings.find(event.target).length === 0) {
+			$appSettings.switchClass('open', '');
 		}
 	});
+
 });
 
 var wrongKey = function(event) {
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 5b9d23e43ad..71ec8f0c502 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -1,4 +1,4 @@
-<ul>
+<ul id="usergrouplist">
 	<!-- Add new group -->
 	<li id="newgroup-init">
 		<a href="#">
@@ -12,7 +12,7 @@
 		</form>
 	</li>
 	<!-- Everyone -->
-	<li data-gid="">
+	<li data-gid="" class="isgroup">
 		<a href="#">
 			<span>
 				<?php p($l->t('Everyone')); ?>
@@ -25,8 +25,8 @@
 
 	<!-- The Admin Group -->
 	<?php foreach($_["adminGroup"] as $adminGroup): ?>
-		<li data-gid="admin">
-			<a href="#"><?php p($l->t('Admins')); ?></a>
+		<li data-gid="admin" class="isgroup">
+			<a href="#"><span class="groupname"><?php p($l->t('Admins')); ?></span></a>
 			<span class="utils">
 				<span class="usercount"><?php if($adminGroup['usercount'] > 0) { p($adminGroup['usercount']); } ?></span>
 			</span>
@@ -35,9 +35,9 @@
 
 	<!--List of Groups-->
 	<?php foreach($_["groups"] as $group): ?>
-		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p($group['usercount']) ?>">
-			<a href="#">
-				<span><?php p($group['name']); ?></span>
+		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p($group['usercount']) ?>" class="isgroup">
+			<a href="#" class="dorename">
+				<span class="groupname"><?php p($group['name']); ?></span>
 				<img class="svg action rename" src="<?php p(image_path('core', 'actions/rename.svg'))?>"
 				original-title="<?php p($l->t('Edit'))?>" alt="<?php p($l->t("change group name"))?>" title="<?php p($l->t("change group name"))?>" />
 			</a>
-- 
cgit v1.2.3


From fc7438b22155313b5f592d8ead1a2636afc17e2c Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Fri, 9 May 2014 09:28:16 -0400
Subject: Fix UserList.empty(), use _.defer() instead of setTimeout()

---
 settings/js/users/groups.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 5939731cca1..d7642743548 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -118,9 +118,9 @@ GroupList = {
 					else {
 						GroupList.noMoreEntries = true;
 					}
-					setTimeout(function () {
+					_.defer(function () {
 						$(lis).removeClass('transparent');
-					}, 0);
+					});
 				}
 				GroupList.updating = false;
 
@@ -188,8 +188,8 @@ GroupList = {
 		GroupList.getGroupLI(gid).remove();
 	},
 	empty: function () {
-		$userGroupList.filter(function(item){
-			return item.data('gid') !== '';
+		$userGroupList.find('.isgroup').filter(function(index, item){
+			return $(item).data('gid') !== '';
 		}).remove();
 	},
 	initDeleteHandling: function () {
-- 
cgit v1.2.3


From d030c28d697d6de6349be979f74d7b10d3a2c4e8 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 9 May 2014 18:58:50 +0200
Subject: bind undo to current deleteHandler

---
 settings/js/users/deleteHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index 82c44b30581..58017dd91a6 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -54,7 +54,7 @@ DeleteHandler.prototype.setNotification = function(notifier, dataID, message, un
 	$('#notification').on('click', '.undo', function () {
 		if ($('#notification').data(dh.notificationDataID)) {
 			var oid = dh.oidToDelete;
-			UserDeleteHandler.cancel();
+			dh.cancel();
 			if(typeof dh.undoCallback !== 'undefined') {
 				dh.undoCallback(oid);
 			}
-- 
cgit v1.2.3


From 7b63c2c0362a54218841d548c2cafb5bc417a0db Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 13 May 2014 15:22:46 +0200
Subject: cleanup

---
 core/js/js.js                      | 1 -
 settings/js/users/deleteHandler.js | 4 ----
 settings/js/users/groups.js        | 1 -
 settings/js/users/users.js         | 1 -
 4 files changed, 7 deletions(-)

(limited to 'settings/js')

diff --git a/core/js/js.js b/core/js/js.js
index 968bf650ad5..096cc3ad7c1 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -668,7 +668,6 @@ OC.Notification={
 				callback.call();
 			}
 			$('#notification').empty();
-			console.log('OCNO EMPTY');
 			if(OC.Notification.queuedNotifications.length > 0){
 				OC.Notification.showHtml(OC.Notification.queuedNotifications[0]);
 				OC.Notification.queuedNotifications.shift();
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index 58017dd91a6..48c7f149928 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -74,7 +74,6 @@ DeleteHandler.prototype.showNotification = function() {
 		$('#notification').data(this.notificationDataID, true);
 		var msg = this.notificationMessage.replace(this.notificationPlaceholder,
 											this.oidToDelete);
-		console.log('NOTISHOW ' + msg);
 		this.notifier.showHtml(msg);
 	}
 };
@@ -123,10 +122,8 @@ DeleteHandler.prototype.delete = function() {
 	}
 
 	var dh = this;
-	console.log($('#notification').data(this.notificationDataID));
 	if($('#notification').data(this.notificationDataID) === true) {
 		dh.hideNotification();
-		console.log('HIDDEN NOTI');
 	}
 
 	var payload = {};
@@ -143,7 +140,6 @@ DeleteHandler.prototype.delete = function() {
 				//TODO: following line
 				dh.removeCallback(dh.oidToDelete);
 				dh.canceled = true;
-				console.log(dh.ajaxEndpoint);
 			} else {
 				OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete ' + escapeHTML(dh.oidToDelete)));
 				dh.undoCallback(dh.oidToDelete);
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index d7642743548..c3b8cc6a081 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -210,7 +210,6 @@ GroupList = {
 			GroupDeleteHandler.mark(GroupList.getElementGID(this));
 		});
 
-		console.log('init del groups');
 		//delete a marked user when leaving the page
 		$(window).on('beforeunload', function () {
 			GroupDeleteHandler.delete();
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 48586b485d5..68098e03a50 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -264,7 +264,6 @@ var UserList = {
 		});
 
 		//delete a marked user when leaving the page
-		console.log('init del users');
 		$(window).on('beforeunload', function () {
 			UserDeleteHandler.delete();
 		});
-- 
cgit v1.2.3


From ec572607e136e5284991854db13b045632caafe6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 13 May 2014 15:31:11 +0200
Subject: remove group rename stuff, there is not support in the backends yet.
 to do for oc8.

---
 settings/ajax/changegroupname.php           | 24 ----------------------
 settings/js/users/groups.js                 | 31 -----------------------------
 settings/templates/users/part.grouplist.php |  7 +------
 3 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 settings/ajax/changegroupname.php

(limited to 'settings/js')

diff --git a/settings/ajax/changegroupname.php b/settings/ajax/changegroupname.php
deleted file mode 100644
index 9bb3c0af125..00000000000
--- a/settings/ajax/changegroupname.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-OCP\JSON::callCheck();
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAdminUser();
-
-$l=OC_L10N::get('settings');
-
-$groupname = $_POST["groupname"];
-
-// Return Success story
-// TODO : make changes to the API to allow this.
-// setGroupname doesnt exist yet.
-if(OC_Group::setGroupname($groupname)) {
-	OCP\JSON::success(
-		array("data" => array(
-			"message" => $l->t('Group name has been changed.'),
-			"groupname" => $groupname,
-			)
-		)
-	);
-} else {
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to change group name"))));
-}
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index c3b8cc6a081..3b487624823 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -263,37 +263,6 @@ $(document).ready( function () {
 		GroupList.showGroup(GroupList.getElementGID(this));
 	});
 
-	// Implements Groupname editing.
-	$('#app-navigation').on('click', '.isgroup .rename', function (event) {
-		event.stopPropagation();
-		var $li = $(this).closest('li');
-		var gid = GroupList.getElementGID(this);
-		var groupname = escapeHTML(gid);
-		var $input = $('<input type="text" value="' + groupname + '">');
-		$li.find('.dorename img').hide();
-		$li.find('.dorename span').replaceWith($input);
-		$input.focus();
-		$input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($input.val().length > 0) {
-					$.post(
-						OC.filePath('settings', 'ajax', 'changegroupname.php'),
-						{ groupname: $input.val() }
-					);
-					$input.blur();
-				} else {
-					$input.blur();
-				}
-			}
-		});
-		$input.blur(function () {
-			var $input = $(this), groupname = $input.val();
-			$input.closest('li').data('gid', groupname);
-			$input.replaceWith('<span>' + escapeHTML(groupname) + '</span>');
-			$li.find('img').show();
-		});
-	});
-
 	// Implements Quota Settings Toggle.
 	var $appSettings = $('#app-settings');
 	$('#app-settings-header').on('click keydown',function(event) {
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 466fe956cdc..2a55f8d7b92 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -38,11 +38,6 @@
 		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p($group['usercount']) ?>" class="isgroup">
 			<a href="#" class="dorename">
 				<span class="groupname"><?php p($group['name']); ?></span>
-				<!-- TODO: backend does not support renaming groups yet
-				<img class="svg action rename"
-					src="<?php p(image_path('core', 'actions/rename.svg'))?>"
-					original-title="<?php p($l->t('Edit'))?>" alt="" />
-				-->
 			</a>
 			<span class="utils">
 				<span class="usercount"><?php if($group['usercount'] > 0) { p($group['usercount']); } ?></span>
@@ -52,4 +47,4 @@
 			</span>
 		</li>
 	<?php endforeach; ?>
-</ul>
\ No newline at end of file
+</ul>
-- 
cgit v1.2.3


From 92b8344489e99899c105bd37b3e0bab9cf44176f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 13 May 2014 15:59:04 +0200
Subject: replace setTimeout and clearTimeout handling by _.debounce

---
 settings/js/users/filter.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 403e9c00c11..bd3473d0e4d 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -41,14 +41,9 @@ UserManagementFilter.prototype.init = function() {
 		//besides the keys, the value must have been changed compared to last
 		//time
 		if(valid && umf.oldVal !== umf.getPattern()) {
-			clearTimeout(umf.thread);
-			umf.thread = setTimeout(
-				function() {
-					umf.run();
-				},
-				300
-			);
+			umf.run();
 		}
+
 		umf.oldVal = umf.getPattern();
 	});
 };
@@ -57,12 +52,15 @@ UserManagementFilter.prototype.init = function() {
  * @brief the filter action needs to be done, here the accurate steps are being
  * taken care of
  */
-UserManagementFilter.prototype.run = function() {
-	this.userList.empty();
-	this.userList.update(GroupList.getCurrentGID());
-	this.groupList.empty();
-	this.groupList.update();
-};
+UserManagementFilter.prototype.run = _.debounce(function() {
+		console.log(this);
+		this.userList.empty();
+		this.userList.update(GroupList.getCurrentGID());
+		this.groupList.empty();
+		this.groupList.update();
+	},
+	300
+);
 
 /**
  * @brief returns the filter String
@@ -82,4 +80,4 @@ UserManagementFilter.prototype.addResetButton = function(button) {
 		umf.filterInput.val('');
 		umf.run();
 	});
-};
\ No newline at end of file
+};
-- 
cgit v1.2.3


From 28a012410aa632038769124df658cd9e7bcd9348 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 13 May 2014 16:43:14 +0200
Subject: polish JSDoc

---
 settings/js/users/deleteHandler.js | 62 ++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 20 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index 48c7f149928..894744ba3e9 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -4,18 +4,18 @@
  * See the COPYING-README file.
  */
 
-
 /**
- * @brief takes care of deleting things represented by an ID
- * @param String endpoint: the corresponding ajax PHP script. Currently limited
+ * takes care of deleting things represented by an ID
+ *
+ * @class
+ * @param {string} endpoint the corresponding ajax PHP script. Currently limited
  * to settings - ajax path.
- * @param String paramID: the by the script expected parameter name holding the
+ * @param {string} paramID the by the script expected parameter name holding the
  * ID of the object to delete
- * @param Function markCallback: the function to be called after successfully
+ * @param {markCallback} markCallback function to be called after successfully
  * marking the object for deletion.
- * @param Function removeCallback: the function to be called after successful
- * delete. The id of the object will be passed as argument. Unsuccessful
- * operations will display an error using OC.dialogs, no callback is fired.
+ * @param {removeCallback} removeCallback the function to be called after
+ * successful delete.
  */
 function DeleteHandler(endpoint, paramID, markCallback, removeCallback) {
 	this.oidToDelete = false;
@@ -35,13 +35,34 @@ function DeleteHandler(endpoint, paramID, markCallback, removeCallback) {
 }
 
 /**
- * @brief enabled the notification system. Required for undo UI.
- * @param Object notifier: Usually OC.Notification
- * @param String dataID: an identifier for the notifier, e.g. 'deleteuser'
- * @param String message: the message that should be shown upon delete. %oid
+ * The function to be called after successfully marking the object for deletion
+ * @callback markCallback
+ * @param {string} oid the ID of the specific user or group
+ */
+
+/**
+ * The function to be called after successful delete. The id of the object will
+ * be passed as argument. Unsuccessful operations will display an error using
+ * OC.dialogs, no callback is fired.
+ * @callback removeCallback
+ * @param {string} oid the ID of the specific user or group
+ */
+
+/**
+ * This callback is fired after "undo" was clicked so the consumer can update
+ * the web interface
+ * @callback undoCallback
+ * @param {string} oid the ID of the specific user or group
+ */
+
+/**
+ * enabled the notification system. Required for undo UI.
+ *
+ * @param {object} notifier Usually OC.Notification
+ * @param {string} dataID an identifier for the notifier, e.g. 'deleteuser'
+ * @param {string} message the message that should be shown upon delete. %oid
  * will be replaced with the affected id of the item to be deleted
- * @param Function undoCb: called after "undo" was clicked so the consumer can
- * update the web interface
+ * @param {undoCallback} undoCallback called after "undo" was clicked
  */
 DeleteHandler.prototype.setNotification = function(notifier, dataID, message, undoCallback) {
 	this.notifier = notifier;
@@ -64,7 +85,7 @@ DeleteHandler.prototype.setNotification = function(notifier, dataID, message, un
 };
 
 /**
- * @brief shows the Undo Notification (if configured)
+ * shows the Undo Notification (if configured)
  */
 DeleteHandler.prototype.showNotification = function() {
 	if(this.notifier !== false) {
@@ -79,7 +100,7 @@ DeleteHandler.prototype.showNotification = function() {
 };
 
 /**
- * @brief hides the Undo Notification
+ * hides the Undo Notification
  */
 DeleteHandler.prototype.hideNotification = function() {
 	if(this.notifier !== false) {
@@ -89,8 +110,9 @@ DeleteHandler.prototype.hideNotification = function() {
 };
 
 /**
- * @brief initializes the delete operation for a given object id
- * @param String oid: the object id
+ * initializes the delete operation for a given object id
+ *
+ * @param {string} oid the object id
  */
 DeleteHandler.prototype.mark = function(oid) {
 	if(this.oidToDelete !== false) {
@@ -103,7 +125,7 @@ DeleteHandler.prototype.mark = function(oid) {
 };
 
 /**
- * @brief cancels a delete operation
+ * cancels a delete operation
  */
 DeleteHandler.prototype.cancel = function() {
 	this.canceled = true;
@@ -111,7 +133,7 @@ DeleteHandler.prototype.cancel = function() {
 };
 
 /**
- * @brief executes a delete operation. Requires that the operation has been
+ * executes a delete operation. Requires that the operation has been
  * initialized by mark(). On error, it will show a message via
  * OC.dialogs.alert. On success, a callback is fired so that the client can
  * update the web interface accordingly.
-- 
cgit v1.2.3


From 75cc16f2bd827ea3d3ce90c8c67dd4c46521f005 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 20 May 2014 10:37:22 +0200
Subject: remove debug output

---
 settings/js/users/filter.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index bd3473d0e4d..1f7a29de0c9 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -53,7 +53,6 @@ UserManagementFilter.prototype.init = function() {
  * taken care of
  */
 UserManagementFilter.prototype.run = _.debounce(function() {
-		console.log(this);
 		this.userList.empty();
 		this.userList.update(GroupList.getCurrentGID());
 		this.groupList.empty();
-- 
cgit v1.2.3


From 39982c2aea841658bd6dbc67db50b568a32c8608 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 2 Jun 2014 17:32:47 +0200
Subject: fix grouplist behaviour (blank after filtering)

---
 settings/js/users/groups.js                 | 5 ++++-
 settings/templates/users/part.grouplist.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 3b487624823..0ff8bdd6384 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -107,6 +107,7 @@ GroupList = {
 							}
 							else {
 								var $li = GroupList.addGroup(group.name, group.usercount);
+
 								$li.addClass('appear transparent');
 								lis.push($li);
 							}
@@ -119,7 +120,9 @@ GroupList = {
 						GroupList.noMoreEntries = true;
 					}
 					_.defer(function () {
-						$(lis).removeClass('transparent');
+						$(lis).each(function () {
+							this.removeClass('transparent')
+						});
 					});
 				}
 				GroupList.updating = false;
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 2a55f8d7b92..a903f43f876 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -14,7 +14,7 @@
 	<!-- Everyone -->
 	<li data-gid="" class="isgroup">
 		<a href="#">
-			<span>
+			<span class="groupname">
 				<?php p($l->t('Everyone')); ?>
 			</span>
 		</a>
-- 
cgit v1.2.3


From 53dc30af4fb09dabdd342ccd5dee9f20eaac52b0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 18 Apr 2014 14:29:45 +0200
Subject: Add option to enable app for specific groups

---
 lib/private/app.php         | 18 ++++++++++---
 settings/ajax/enableapp.php |  4 ++-
 settings/apps.php           |  3 +++
 settings/js/apps.js         | 61 ++++++++++++++++++++++++++++++++++++++++++---
 settings/templates/apps.php |  9 ++++++-
 5 files changed, 86 insertions(+), 9 deletions(-)

(limited to 'settings/js')

diff --git a/lib/private/app.php b/lib/private/app.php
index 676df47245a..aa0fdd6da6c 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -208,12 +208,13 @@ class OC_App {
 	/**
 	 * enables an app
 	 * @param mixed $app app
+	 * @param array $groups (optional) when set, only these groups will have access to the app
 	 * @throws \Exception
 	 * @return void
 	 *
 	 * This function set an app as enabled in appconfig.
 	 */
-	public static function enable($app) {
+	public static function enable($app, $groups = null) {
 		self::$enabledAppsCache = array(); // flush
 		if (!OC_Installer::isInstalled($app)) {
 			// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
@@ -242,7 +243,11 @@ class OC_App {
 					)
 				);
 			} else {
-				OC_Appconfig::setValue($app, 'enabled', 'yes');
+				if (!is_null($groups)) {
+					OC_Appconfig::setValue($app, 'enabled', json_encode($groups));
+				}else{
+					OC_Appconfig::setValue($app, 'enabled', 'yes');
+				}
 				if (isset($appdata['id'])) {
 					OC_Appconfig::setValue($app, 'ocsid', $appdata['id']);
 				}
@@ -723,10 +728,15 @@ class OC_App {
 					continue;
 				}
 
-				if (OC_Appconfig::getValue($app, 'enabled', 'no') == 'yes') {
+				$enabled = OC_Appconfig::getValue($app, 'enabled', 'no');
+				$info['groups'] = null;
+				if ($enabled === 'yes') {
 					$active = true;
-				} else {
+				} else if($enabled === 'no') {
 					$active = false;
+				} else {
+					$active = true;
+					$info['groups'] = $enabled;
 				}
 
 				$info['active'] = $active;
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 735794360b3..81ca1e0338d 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -3,8 +3,10 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
+$groups = isset($_POST['groups']) ? $_POST['groups'] : null;
+
 try {
-	OC_App::enable(OC_App::cleanAppId($_POST['appid']));
+	OC_App::enable(OC_App::cleanAppId($_POST['appid']), $groups);
 	OC_JSON::success();
 } catch (Exception $e) {
 	OC_Log::write('core', $e->getMessage(), OC_Log::ERROR);
diff --git a/settings/apps.php b/settings/apps.php
index 6fd2efc2018..7573c8b573f 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -25,13 +25,16 @@ OC_Util::checkAdminUser();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
+OC_Util::addScript("core", "multiselect");
 OC_App::setActiveNavigationEntry( "core_apps" );
 
 $combinedApps = OC_App::listAllApps();
+$groups = \OC_Group::getGroups();
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
 
 $tmpl->assign('apps', $combinedApps);
+$tmpl->assign('groups', $groups);
 
 $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
 
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 05db4c9a048..2093242032a 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -88,12 +88,35 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		} else {
 			page.find(".warning").hide();
 		}
+
+		$('#group_select > option').each(function (i, el) {
+			if (app.groups.length === 0 || app.groups.indexOf(el.value) >= 0) {
+				$(el).attr('selected', 'selected');
+			} else {
+				$(el).attr('selected', null);
+			}
+		});
+		page.find("div.multiselect").parent().remove();
+		if (app.active) {
+			if (app.groups.length) {
+				$('#group_select').multiSelect();
+				page.find("#groups_enable").attr('checked','checked');
+			} else {
+				page.find("#groups_enable").attr('checked', null);
+			}
+			page.find("#groups_enable").show();
+			page.find("label[for='groups_enable']").show();
+		} else {
+			page.find("#groups_enable").hide();
+			page.find("label[for='groups_enable']").hide();
+		}
 	},
-	enableApp:function(appid, active, element) {
+	enableApp:function(appid, active, element, groups) {
 		console.log('enableApp:', appid, active, element);
+		groups = groups || [];
 		var appitem=$('#app-navigation ul li[data-id="'+appid+'"]');
 		element.val(t('settings','Please wait....'));
-		if(active) {
+		if(active && !groups.length) {
 			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
 				if(!result || result.status !== 'success') {
 					if (result.data && result.data.message) {
@@ -108,14 +131,17 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				}
 				else {
 					appitem.data('active',false);
+					appitem.data('groups', '');
 					element.data('active',false);
 					OC.Settings.Apps.removeNavigation(appid);
 					appitem.removeClass('active');
 					element.val(t('settings','Enable'));
+					element.parent().find("#groups_enable").hide();
+					element.parent().find("label[for='groups_enable']").hide();
 				}
 			},'json');
 		} else {
-			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) {
+			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid: appid, groups: groups},function(result) {
 				if(!result || result.status !== 'success') {
 					if (result.data && result.data.message) {
 						OC.Settings.Apps.showErrorMessage(result.data.message);
@@ -132,6 +158,13 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					element.data('active',true);
 					appitem.addClass('active');
 					element.val(t('settings','Disable'));
+					element.parent().find("#groups_enable").show();
+					element.parent().find("label[for='groups_enable']").show();
+					if (groups) {
+						appitem.data('groups', JSON.stringify(groups));
+					} else {
+						appitem.data('groups', '');
+					}
 				}
 			},'json')
 			.fail(function() {
@@ -244,6 +277,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 $(document).ready(function(){
 	$('#app-navigation ul li').each(function(index,li){
 		var app = OC.get('appData_'+$(li).data('id'));
+		app.groups= $(li).data('groups') || [];
 		$(li).data('app',app);
 		$(this).find('span.hidden').remove();
 	});
@@ -281,6 +315,15 @@ $(document).ready(function(){
 		}
 	});
 
+	$('#group_select').change(function() {
+		var element = $('#app-content input.enable');
+		var groups = $(this).val();
+		var appid = element.data('appid');
+		if (appid) {
+			OC.Settings.Apps.enableApp(appid, false, element, groups);
+		}
+	});
+
 	if(appid) {
 		var item = $('#app-navigation ul li[data-id="'+appid+'"]');
 		if(item) {
@@ -289,4 +332,16 @@ $(document).ready(function(){
 			$('#app-navigation').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
 		}
 	}
+
+	$("#groups_enable").change(function() {
+		if (this.checked) {
+			$("div.multiselect").parent().remove();
+			$('#group_select').multiSelect();
+		} else {
+			$('#group_select').hide().val(null);
+			$("div.multiselect").parent().remove();
+		}
+
+		$('#group_select').change();
+	});
 });
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index b7f3b6121ad..fa4cb48bce0 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -16,7 +16,7 @@
 		<?php endif; ?>
 
 		<?php foreach($_['apps'] as $app):?>
-		<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
+		<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>" data-groups="<?php p($app['groups']) ?>"
 			<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
 				data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
 			<a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
@@ -53,6 +53,13 @@
 		print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
 	<input class="enable hidden" type="submit" />
 	<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
+	<input class="hidden" type="checkbox" id="groups_enable"/>
+	<label class="hidden" for="groups_enable"><?php p($l->t('Only for specific groups')); ?></label>
+	<select class="hidden" id="group_select" multiple="multiple" title="<?php p($l->t('All')); ?>">
+		<?php foreach($_['groups'] as $group):?>
+			<option value="<?php p($group);?>"><?php p($group); ?></option>
+		<?php endforeach;?>
+	</select>
 	<div class="warning hidden"></div>
 	</div>
 </div>
-- 
cgit v1.2.3


From 727277945670f339e91d0f6aef618b9cf43618d2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 21 Apr 2014 13:00:29 +0200
Subject: Prevent js error

---
 settings/js/apps.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 2093242032a..f0e40232ee0 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -277,7 +277,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
 $(document).ready(function(){
 	$('#app-navigation ul li').each(function(index,li){
 		var app = OC.get('appData_'+$(li).data('id'));
-		app.groups= $(li).data('groups') || [];
+		if (app) {
+			app.groups= $(li).data('groups') || [];
+		}
 		$(li).data('app',app);
 		$(this).find('span.hidden').remove();
 	});
-- 
cgit v1.2.3


From 7e07ff6f4f0c4649a6d81925a05bd01eb816c4ba Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 28 Apr 2014 13:27:32 +0200
Subject: Disable enabling apps by groups for filesystem, authentication and
 loggin apps

---
 settings/js/apps.js | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/apps.js b/settings/js/apps.js
index f0e40232ee0..a9478c043a2 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -89,26 +89,33 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			page.find(".warning").hide();
 		}
 
-		$('#group_select > option').each(function (i, el) {
-			if (app.groups.length === 0 || app.groups.indexOf(el.value) >= 0) {
-				$(el).attr('selected', 'selected');
-			} else {
-				$(el).attr('selected', null);
-			}
-		});
 		page.find("div.multiselect").parent().remove();
-		if (app.active) {
-			if (app.groups.length) {
-				$('#group_select').multiSelect();
-				page.find("#groups_enable").attr('checked','checked');
-			} else {
-				page.find("#groups_enable").attr('checked', null);
-			}
-			page.find("#groups_enable").show();
-			page.find("label[for='groups_enable']").show();
-		} else {
+		if(OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||
+			OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) {
 			page.find("#groups_enable").hide();
 			page.find("label[for='groups_enable']").hide();
+			page.find("#groups_enable").attr('checked', null);
+		} else {
+			$('#group_select > option').each(function (i, el) {
+				if (app.groups.length === 0 || app.groups.indexOf(el.value) >= 0) {
+					$(el).attr('selected', 'selected');
+				} else {
+					$(el).attr('selected', null);
+				}
+			});
+			if (app.active) {
+				if (app.groups.length) {
+					$('#group_select').multiSelect();
+					page.find("#groups_enable").attr('checked','checked');
+				} else {
+					page.find("#groups_enable").attr('checked', null);
+				}
+				page.find("#groups_enable").show();
+				page.find("label[for='groups_enable']").show();
+			} else {
+				page.find("#groups_enable").hide();
+				page.find("label[for='groups_enable']").hide();
+			}
 		}
 	},
 	enableApp:function(appid, active, element, groups) {
@@ -271,6 +278,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
 	showErrorMessage: function(message) {
 		$('.appinfo .warning').show();
 		$('.appinfo .warning').text(message);
+	},
+	isType: function(app, type){
+		return app.types && app.types.indexOf(type) !== -1;
 	}
 };
 
@@ -278,6 +288,7 @@ $(document).ready(function(){
 	$('#app-navigation ul li').each(function(index,li){
 		var app = OC.get('appData_'+$(li).data('id'));
 		if (app) {
+			console.log(app);
 			app.groups= $(li).data('groups') || [];
 		}
 		$(li).data('app',app);
-- 
cgit v1.2.3


From e3567242b254140129fc0f0ef057e5b38beed721 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 28 Apr 2014 14:12:13 +0200
Subject: Remove debug statements

---
 settings/js/apps.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/apps.js b/settings/js/apps.js
index a9478c043a2..d77d0708863 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -119,7 +119,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 	},
 	enableApp:function(appid, active, element, groups) {
-		console.log('enableApp:', appid, active, element);
 		groups = groups || [];
 		var appitem=$('#app-navigation ul li[data-id="'+appid+'"]');
 		element.val(t('settings','Please wait....'));
@@ -185,7 +184,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 	},
 	updateApp:function(appid, element) {
-		console.log('updateApp:', appid, element);
 		element.val(t('settings','Updating....'));
 		$.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appid},function(result) {
 			if(!result || result.status !== 'success') {
@@ -288,7 +286,6 @@ $(document).ready(function(){
 	$('#app-navigation ul li').each(function(index,li){
 		var app = OC.get('appData_'+$(li).data('id'));
 		if (app) {
-			console.log(app);
 			app.groups= $(li).data('groups') || [];
 		}
 		$(li).data('app',app);
-- 
cgit v1.2.3


From 953e194245a519eebce0e36cd8ac27a59e8657bd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 6 May 2014 12:41:06 +0200
Subject: Dont show group settings for login, filesystem, etc apps after
 enabling them

---
 settings/js/apps.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/apps.js b/settings/js/apps.js
index d77d0708863..eec5532d5ab 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -144,6 +144,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					element.val(t('settings','Enable'));
 					element.parent().find("#groups_enable").hide();
 					element.parent().find("label[for='groups_enable']").hide();
+					var app = OC.get('appData_' + appid);
+					app.active = false;
 				}
 			},'json');
 		} else {
@@ -164,12 +166,20 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					element.data('active',true);
 					appitem.addClass('active');
 					element.val(t('settings','Disable'));
-					element.parent().find("#groups_enable").show();
-					element.parent().find("label[for='groups_enable']").show();
-					if (groups) {
-						appitem.data('groups', JSON.stringify(groups));
+					var app = OC.get('appData_' + appid);
+					app.active = true;
+					if (OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||
+						OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) {
+						element.parent().find("#groups_enable").hide();
+						element.parent().find("label[for='groups_enable']").hide();
 					} else {
-						appitem.data('groups', '');
+						element.parent().find("#groups_enable").show();
+						element.parent().find("label[for='groups_enable']").show();
+						if (groups) {
+							appitem.data('groups', JSON.stringify(groups));
+						} else {
+							appitem.data('groups', '');
+						}
 					}
 				}
 			},'json')
-- 
cgit v1.2.3


From 0f82b8efb318e30a97bf7033776cc7d330d73d1d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 8 May 2014 11:18:41 +0200
Subject: Preserve changed groups when switching between apps

---
 settings/js/apps.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'settings/js')

diff --git a/settings/js/apps.js b/settings/js/apps.js
index eec5532d5ab..f50914157a6 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -341,6 +341,11 @@ $(document).ready(function(){
 		var appid = element.data('appid');
 		if (appid) {
 			OC.Settings.Apps.enableApp(appid, false, element, groups);
+			var li = $('[data-id="'+appid+'"');
+			var app = OC.get('appData_' + $(li).data('id'));
+			app.groups = groups;
+			li.data('groups', groups);
+			li.attr('data-groups', JSON.stringify(groups));
 		}
 	});
 
-- 
cgit v1.2.3


From 49f1e4a81172805ca9f084d82fce40286671ce8a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 8 May 2014 18:07:06 +0200
Subject: Fix syntax error

---
 settings/js/apps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'settings/js')

diff --git a/settings/js/apps.js b/settings/js/apps.js
index f50914157a6..b1c28498266 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -341,7 +341,7 @@ $(document).ready(function(){
 		var appid = element.data('appid');
 		if (appid) {
 			OC.Settings.Apps.enableApp(appid, false, element, groups);
-			var li = $('[data-id="'+appid+'"');
+			var li = $('[data-id="'+appid+'"]');
 			var app = OC.get('appData_' + $(li).data('id'));
 			app.groups = groups;
 			li.data('groups', groups);
-- 
cgit v1.2.3


From 9396b22fe3ecfa5862a59c59383b69c0ab337bc4 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 2 Jun 2014 23:39:59 +0200
Subject: add missing placeholder shim for change password fields in IE8/9

---
 settings/js/personal.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'settings/js')

diff --git a/settings/js/personal.js b/settings/js/personal.js
index f56dd3425f7..8aeca71c296 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -187,6 +187,8 @@ $(document).ready(function(){
 
 	});
 
+	$('.personalblock input[type=password]').placeholder();
+
 	$('#displayName').keyUpDelayedOrEnter(changeDisplayName);
 	$('#email').keyUpDelayedOrEnter(changeEmailAddress);
 
-- 
cgit v1.2.3


From 210a1ef7e6862af6313063b9e64b7c4563c7540d Mon Sep 17 00:00:00 2001
From: Morris Jobke <morris.jobke@gmail.com>
Date: Wed, 4 Jun 2014 18:22:40 +0200
Subject: add to app navigation after enabling

---
 settings/js/apps.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/apps.js b/settings/js/apps.js
index b1c28498266..4018f40861d 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -232,7 +232,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			if(response.status === 'success'){
 				var navIds=response.nav_ids;
 				for(var i=0; i< navIds.length; i++){
-					$('#apps .wrapper').children('li[data-id="'+navIds[i]+'"]').remove();
+					$('#apps ul').children('li[data-id="'+navIds[i]+'"]').remove();
 				}
 			}
 		});
@@ -243,7 +243,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				var navEntries=response.nav_entries;
 				for(var i=0; i< navEntries.length; i++){
 					var entry = navEntries[i];
-					var container = $('#apps .wrapper');
+					var container = $('#apps ul');
 
 					if(container.children('li[data-id="'+entry.id+'"]').length === 0){
 						var li=$('<li></li>');
@@ -257,8 +257,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						li.append(a);
 
 						// append the new app as last item in the list
-						// (.push is from sticky footer)
-						$('#apps .wrapper .push').before(li);
+						// which is the "add apps" entry with the id
+						// #apps-management
+						$('#apps-management').before(li);
 
 						// scroll the app navigation down
 						// so the newly added app is seen
@@ -268,11 +269,12 @@ OC.Settings.Apps = OC.Settings.Apps || {
 
 						// draw attention to the newly added app entry
 						// by flashing it twice
-						container.children('li[data-id="' + entry.id + '"]')
-							.animate({opacity: 0.3})
+						$('#header .menutoggle')
+							.animate({opacity: .5})
 							.animate({opacity: 1})
-							.animate({opacity: 0.3})
-							.animate({opacity: 1});
+							.animate({opacity: .5})
+							.animate({opacity: 1})
+							.animate({opacity: .75});
 
 						if (!SVGSupport() && entry.icon.match(/\.svg$/i)) {
 							$(img).addClass('svg');
-- 
cgit v1.2.3


From e26936e94f7a88e07ecc385a84a954839d98f331 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 4 Jun 2014 18:44:12 +0200
Subject: remove obsolete placeholder call, fix #8881

---
 settings/js/personal.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/personal.js b/settings/js/personal.js
index 8aeca71c296..f56dd3425f7 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -187,8 +187,6 @@ $(document).ready(function(){
 
 	});
 
-	$('.personalblock input[type=password]').placeholder();
-
 	$('#displayName').keyUpDelayedOrEnter(changeDisplayName);
 	$('#email').keyUpDelayedOrEnter(changeEmailAddress);
 
-- 
cgit v1.2.3


From 218131d30d6105d0bcd601ea955b258e3e88bdf1 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 5 Jun 2014 10:52:06 +0200
Subject: fix leading decimal Scrutinizer coding style issue

---
 settings/js/apps.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 4018f40861d..2539982be83 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -270,11 +270,11 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						// draw attention to the newly added app entry
 						// by flashing it twice
 						$('#header .menutoggle')
-							.animate({opacity: .5})
+							.animate({opacity: 0.5})
 							.animate({opacity: 1})
-							.animate({opacity: .5})
+							.animate({opacity: 0.5})
 							.animate({opacity: 1})
-							.animate({opacity: .75});
+							.animate({opacity: 0.75});
 
 						if (!SVGSupport() && entry.icon.match(/\.svg$/i)) {
 							$(img).addClass('svg');
-- 
cgit v1.2.3