Merge branch 'master' into update_shipped_apps_from_appstore

Conflicts:
	lib/private/app.php
	settings/templates/apps.php

9 files changed, 347 insertions, 204 deletions

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a86fe9c0ac7..8ed22e98b52 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -98,6 +98,20 @@ if (!$_['isAnnotationsWorking']) {
 <?php
 }
 
+// SQLite database performance issue
+if ($_['databaseOverload']) {
+	?>
+<div class="section">
+	<h2><?php p($l->t('Database Performance Info'));?></h2>
+
+	<p class="securitywarning">
+		<?php p($l->t('SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: \'occ db:convert-type\'')); ?>
+	</p>
+
+</div>
+<?php
+}
+
 // if module fileinfo available?
 if (!$_['has_fileinfo']) {
 	?>
@@ -263,24 +277,21 @@ if (!$_['internetconnectionworking']) {
 					   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
 				<em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
-			</td>
-		</tr>
-		<tr>
-			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
-				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
-					   value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />
-				<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/>
-				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
-					   value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> />
-				<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
+				<div id="resharingSettings" <?php ($_['allowResharing'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?>>
+					<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
+						    value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />
+					<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/>
+					<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
+						    value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> />
+					<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
+				</div>
 			</td>
 		</tr>
 		<tr>
 			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
 				<input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
 					   value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="allowMailNotification"><?php p($l->t('Allow mail notification'));?></label><br/>
-				<em><?php p($l->t('Allow users to send mail notification for shared files')); ?></em>
+				<label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
 			</td>
 		</tr>
 		<tr>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index e2bc78b07fa..b35eda4350c 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') ?>"
@@ -54,6 +54,16 @@
 	<input class="enable hidden" type="submit" />
 	<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
 	<input class="uninstall hidden" type="submit" value="<?php p($l->t('Uninstall')); ?>"/>
+	<br />
+	<input class="hidden" type="checkbox" id="groups_enable"/>
+	<label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label>
+	<br />
+	<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>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 3739d220e6e..403dde30dae 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,21 +1,48 @@
-<div id="controls">
+<div id="app-navigation">
+	<ul>
 	<?php if($_['admin']) { ?>
-		<a class="button newquestion <?php p($_['style1']); ?>"
-			href="<?php print_unescaped($_['url1']); ?>"><?php p($l->t( 'User Documentation' )); ?></a>
-		<a class="button newquestion <?php p($_['style2']); ?>"
-			href="<?php print_unescaped($_['url2']); ?>"><?php p($l->t( 'Administrator Documentation' )); ?></a>
+		<li>
+			<a class="<?php p($_['style1']); ?>"
+				href="<?php print_unescaped($_['url1']); ?>">
+				<?php p($l->t( 'User Documentation' )); ?>
+			</a>
+		</li>
+		<li>
+			<a class="<?php p($_['style2']); ?>"
+				href="<?php print_unescaped($_['url2']); ?>">
+				<?php p($l->t( 'Administrator Documentation' )); ?>
+			</a>
+		</li>
 	<?php } ?>
-	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php
-		p($l->t( 'Online Documentation' )); ?></a>
-	<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php
-		p($l->t( 'Forum' )); ?></a>
+
+		<li>
+			<a href="http://owncloud.org/support" target="_blank">
+				<?php p($l->t( 'Online Documentation' )); ?> ↗
+			</a>
+		</li>
+		<li>
+			<a href="https://forum.owncloud.org" target="_blank">
+				<?php p($l->t( 'Forum' )); ?> ↗
+			</a>
+		</li>
+
 	<?php if($_['admin']) { ?>
-		<a class="button newquestion" href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md" target="_blank"><?php
-			p($l->t( 'Bugtracker' )); ?></a>
+		<li>
+			<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
+				target="_blank">
+				<?php p($l->t( 'Bugtracker' )); ?> ↗
+			</a>
+		</li>
 	<?php } ?>
-	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php
-		p($l->t( 'Commercial Support' )); ?></a>
+
+	<li>
+		<a href="https://owncloud.com" target="_blank">
+			<?php p($l->t( 'Commercial Support' )); ?> ↗
+		</a>
+	</li>
 </div>
-<div class="help-includes">
-	<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">abc</iframe>
+
+<div id="app-content" class="help-includes">
+	<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">
+	</iframe>
 </div>
diff --git a/settings/templates/users.php b/settings/templates/users.php
deleted file mode 100644
index 937b40611b0..00000000000
--- a/settings/templates/users.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * 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.
- */
-$allGroups=array();
-foreach($_["groups"] as $group) {
-	$allGroups[] = $group['name'];
-}
-$_['subadmingroups'] = $allGroups;
-$items = array_flip($_['subadmingroups']);
-unset($items['admin']);
-$_['subadmingroups'] = array_flip($items);
-?>
-
-<div id="controls">
-	<form id="newuser" autocomplete="off">
-		<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"
-			title="<?php p($l->t('Groups'))?>" multiple="multiple">
-			<?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'))?>" />
-	</form>
-	<?php if((bool)$_['recoveryAdminEnabled']): ?>
-	<div class="recoveryPassword">
-	<input id="recoveryPassword"
-		   type="password"
-		   placeholder="<?php p($l->t('Admin Recovery Password'))?>"
-		   title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
-		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
-	</div>
-	<?php endif; ?>
-	<div class="quota">
-		<span><?php p($l->t('Default Storage'));?></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 endif; ?>
-			<?php if((bool) !$_['isadmin']): ?>
-				<select class='quota' disabled="disabled">
-					<option selected="selected">
-				<?php p($_['default_quota']);?>
-					</option>
-				</select>
-			<?php endif; ?>
-	</div>
-</div>
-
-<table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>">
-	<thead>
-		<tr>
-			<?php if ($_['enableAvatars']): ?>
-			<th id='headerAvatar'></th>
-			<?php endif; ?>
-			<th id='headerName'><?php p($l->t('Username'))?></th>
-			<th id="headerDisplayName"><?php p($l->t( 'Full Name' )); ?></th>
-			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
-			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
-			<?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="headerRemove">&nbsp;</th>
-		</tr>
-	</thead>
-	<tbody>
-		<?php foreach($_["users"] as $user): ?>
-		<tr data-uid="<?php p($user["name"]) ?>"
-			data-displayName="<?php p($user["displayName"]) ?>">
-			<?php if ($_['enableAvatars']): ?>
-			<td class="avatar"><div class="avatardiv"></div></td>
-			<?php endif; ?>
-			<td class="name"><?php p($user["name"]); ?></td>
-			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
-				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
-				alt="<?php p($l->t("change full name"))?>" title="<?php p($l->t("change full name"))?>"/>
-			</td>
-			<td class="password"><span>●●●●●●●</span> <img class="svg action"
-				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($_["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>
-			<?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")')) ?>">
-					<option
-						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
-							value='default'>
-						<?php p($l->t('Default'));?>
-					</option>
-					<option
-					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
-							value='none'>
-						<?php p($l->t('Unlimited'));?>
-					</option>
-					<?php foreach($_['quota_preset'] as $preset):?>
-					<option
-					<?php if($user['quota']==$preset) print_unescaped('selected="selected"');?>
-						value='<?php p($preset);?>'>
-						<?php p($preset);?>
-					</option>
-					<?php endforeach;?>
-					<?php if($user['isQuotaUserDefined']):?>
-					<option selected="selected" value='<?php p($user['quota']);?>'>
-						<?php p($user['quota']);?>
-					</option>
-					<?php endif;?>
-					<option value='other' data-new>
-						<?php p($l->t('Other'));?>
-						...
-					</option>
-				</select>
-			</td>
-			<td class="remove">
-				<?php if($user['name']!=OC_User::getUser()):?>
-					<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>
-				<?php endif;?>
-			</td>
-		</tr>
-		<?php endforeach; ?>
-	</tbody>
-</table>
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
new file mode 100644
index 00000000000..c5805d53476
--- /dev/null
+++ b/settings/templates/users/main.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * 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.
+ */
+$userlistParams = array();
+$allGroups=array();
+foreach($_["groups"] as $group) {
+	$allGroups[] = $group['name'];
+}
+foreach($_["adminGroup"] as $group) {
+	$allGroups[] = $group['name'];
+}
+$userlistParams['subadmingroups'] = $allGroups;
+$userlistParams['allGroups'] = json_encode($allGroups);
+$items = array_flip($userlistParams['subadmingroups']);
+unset($items['admin']);
+$userlistParams['subadmingroups'] = array_flip($items);
+?>
+
+<div id="app-navigation">
+	<?php print_unescaped($this->inc('users/part.grouplist')); ?>
+	<div id="app-settings">
+		<?php print_unescaped($this->inc('users/part.setquota')); ?>
+	</div>
+</div>
+
+<div id="app-content">
+	<?php print_unescaped($this->inc('users/part.createuser')); ?>
+	<?php print_unescaped($this->inc('users/part.userlist', $userlistParams)); ?>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
new file mode 100644
index 00000000000..4d573168fc1
--- /dev/null
+++ b/settings/templates/users/part.createuser.php
@@ -0,0 +1,34 @@
+<div id="user-controls">
+	<form id="newuser" autocomplete="off">
+		<input id="newusername" type="text"
+			placeholder="<?php p($l->t('Login Name'))?>"
+			autocomplete="off" autocapitalize="off" autocorrect="off" />
+		<input
+			type="password" id="newuserpassword"
+			placeholder="<?php p($l->t('Password'))?>"
+			autocomplete="off" autocapitalize="off" autocorrect="off" />
+		<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>
+			<?php endforeach; ?>
+			<?php foreach($_["groups"] as $group): ?>
+				<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'))?>" />
+	</form>
+	<?php if((bool)$_['recoveryAdminEnabled']): ?>
+	<div class="recoveryPassword">
+	<input id="recoveryPassword"
+		   type="password"
+		   placeholder="<?php p($l->t('Admin Recovery Password'))?>"
+		   title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
+		   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">
+		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
+	</form>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
new file mode 100644
index 00000000000..593c202f2c9
--- /dev/null
+++ b/settings/templates/users/part.grouplist.php
@@ -0,0 +1,50 @@
+<ul id="usergrouplist">
+	<!-- Add new group -->
+	<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 icon-add" value="" />
+		</form>
+	</li>
+	<!-- Everyone -->
+	<li data-gid="" class="isgroup">
+		<a href="#">
+			<span class="groupname">
+				<?php p($l->t('Everyone')); ?>
+			</span>
+		</a>
+		<span class="utils">
+			<span class="usercount"></span>
+		</span>
+	</li>
+
+	<!-- The Admin Group -->
+	<?php foreach($_["adminGroup"] as $adminGroup): ?>
+		<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>
+		</li>
+	<?php endforeach; ?>
+
+	<!--List of Groups-->
+	<?php foreach($_["groups"] as $group): ?>
+		<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>
+			</a>
+			<span class="utils">
+				<span class="usercount"><?php if($group['usercount'] > 0) { p($group['usercount']); } ?></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; ?>
+</ul>
diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
new file mode 100644
index 00000000000..fc5624d069a
--- /dev/null
+++ b/settings/templates/users/part.setquota.php
@@ -0,0 +1,39 @@
+<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 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>
+				<?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">
+				<option selected="selected">
+					<?php p($_['default_quota']);?>
+				</option>
+			</select>
+		<?php endif; ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
new file mode 100644
index 00000000000..c74fdcc9efa
--- /dev/null
+++ b/settings/templates/users/part.userlist.php
@@ -0,0 +1,116 @@
+<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>">
+	<thead>
+		<tr>
+			<?php if ($_['enableAvatars']): ?>
+			<th id='headerAvatar'></th>
+			<?php endif; ?>
+			<th id='headerName'><?php p($l->t('Username'))?></th>
+			<th id="headerDisplayName"><?php p($l->t( 'Full Name' )); ?></th>
+			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
+			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
+			<?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('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>
+	<tbody>
+		<?php foreach($_["users"] as $user): ?>
+		<tr data-uid="<?php p($user["name"]) ?>"
+			data-displayname="<?php p($user["displayName"]) ?>">
+			<?php if ($_['enableAvatars']): ?>
+			<td class="avatar"><div class="avatardiv"></div></td>
+			<?php endif; ?>
+			<td class="name"><?php p($user["name"]); ?></td>
+			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
+				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("change full name"))?>" title="<?php p($l->t("change full name"))?>"/>
+			</td>
+			<td class="password"><span>●●●●●●●</span> <img class="svg action"
+				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>
+			<?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>
+			<?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")')) ?>">
+					<option
+						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
+							value='default'>
+						<?php p($l->t('Default'));?>
+					</option>
+					<option
+					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
+							value='none'>
+						<?php p($l->t('Unlimited'));?>
+					</option>
+					<?php foreach($_['quota_preset'] as $preset):?>
+					<option
+					<?php if($user['quota']==$preset) print_unescaped('selected="selected"');?>
+						value='<?php p($preset);?>'>
+						<?php p($preset);?>
+					</option>
+					<?php endforeach;?>
+					<?php if($user['isQuotaUserDefined']):?>
+					<option selected="selected" value='<?php p($user['quota']);?>'>
+						<?php p($user['quota']);?>
+					</option>
+					<?php endif;?>
+					<option value='other' data-new>
+						<?php p($l->t('Other'));?>
+						...
+					</option>
+				</select>
+			</td>
+			<td class="storageLocation"><?php p($user["storageLocation"]); ?></td>
+			<?php
+			if($user["lastLogin"] === 0) {
+				$lastLogin = $l->t('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;">'.$lastLoginDate.'</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'))?>">
+						<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
+					</a>
+				<?php endif;?>
+			</td>
+		</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>