From 2c19bb0e6f52afdc7ad4d11058988e4b3f1cf0a3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 May 2017 17:17:52 +0200
Subject: [PATCH] show role of users in user list

---
 CHANGELOG                                |  1 +
 views/bootstrap/class.SubstituteUser.php | 15 ++++++++++++++-
 views/bootstrap/class.UserList.php       | 15 ++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2ef70254e..44c35548d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - fix authentication in webdav.php (Closes #250)
 - update last access time only once a minute
 - run action 'css' in view if it exists, move css code for timeline
+- show role of users in user list and substitute user list
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.34
diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index 72cc53412..eeb0c5cd8 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -49,7 +49,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 ?>
 	<table class="table table-condensed">
 		<thead>
-		<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
+		<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('role'); ?></th><th></th></tr>
 		</thead>
 		<tbody>
 <?php
@@ -73,6 +73,19 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
+			switch($currUser->getRole()) {
+			case SeedDMS_Core_User::role_user:
+				printMLText("role_user");
+				break;
+			case SeedDMS_Core_User::role_admin:
+				printMLText("role_admin");
+				break;
+			case SeedDMS_Core_User::role_guest:
+				printMLText("role_guest");
+				break;
+			}
+			echo "</td>";
+			echo "<td>";
 			if($currUser->getID() != $user->getID()) {
 				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 			}
diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 8873c0f09..a94159dc6 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -50,7 +50,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 ?>
 
 	<table class="table table-condensed">
-	  <thead><tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr></thead><tbody>
+	  <thead><tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr></thead><tbody>
 <?php
 		foreach ($allUsers as $currUser) {
 			echo "<tr>";
@@ -74,6 +74,19 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
+			switch($currUser->getRole()) {
+			case SeedDMS_Core_User::role_user:
+				printMLText("role_user");
+				break;
+			case SeedDMS_Core_User::role_admin:
+				printMLText("role_admin");
+				break;
+			case SeedDMS_Core_User::role_guest:
+				printMLText("role_guest");
+				break;
+			}
+			echo "</td>";
+			echo "<td>";
 			echo SeedDMS_Core_File::format_filesize($currUser->getUsedDiskSpace());
 			if($quota) {
 				echo " / ";