fix: issue with group users having the same name

2pisoftware · Nov 17, 2023 · 3d656fd · 3d656fd
1 parent 0ed58ef
commit 3d656fd
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 46 deletions.
diff --git a/system/modules/admin/actions/groupmember.php b/system/modules/admin/actions/groupmember.php
@@ -15,8 +15,8 @@ function groupmember_GET(Web $w)
     foreach ($users as $user) {
         // We do not list ourselves as an option 
         if ($user->id != $option["group_id"]) {
-            $name = $user->is_group == 1 ? strtoupper($user->login) : $user->getContact()->getFullName();
-            $select[!empty($user->is_group)][$name] = array($name, $user->id);
+            $name = $user->is_group == 1 ? strtoupper($user->login) : $user->getContact()->getFullName() . " (" . (!empty($user->getContact()->email) ? $user->getContact()->email : "no email") . ")";
+            $select[!empty($user->is_group)][$user->id] = array($name, $user->id);
         }
     }
 

diff --git a/system/modules/admin/actions/moreInfo.php b/system/modules/admin/actions/moreInfo.php
@@ -1,49 +1,46 @@
 <?php
+
 /**
-* Display member and permission infomation
-*
-* @param <type> $w
-*/
+ * Display member and permission infomation
+ *
+ * @param <type> $w
+ */
 function moreInfo_GET(Web &$w)
 {
-	$option = $w->pathMatch("group_id");
-
-	AdminService::getInstance($w)->navigation($w, AuthService::getInstance($w)->getUser($option['group_id'])->login);
-
-	if (AuthService::getInstance($w)->user()->is_admin || AuthService::getInstance($w)->getRoleForLoginUser($option['group_id'], AuthService::getInstance($w)->user()->id) == "owner")
-	{
-		$w->ctx("addMember", Html::box("/admin/groupmember/".$option['group_id'],"New Member",true));
-	}
-	$w->ctx("editPermission", Html::b("/admin/permissionedit/".$option['group_id'],"Edit Permissions"));
-
-	//fill in member table;
-	$table = array(array("Name","Role","Operations"));
-
-	$groupMembers = AuthService::getInstance($w)->getGroupMembers($option['group_id']);
-
-	if ($groupMembers)
-	{
-		foreach ($groupMembers as $groupMember)
-		{
-			$line = array();
-
-			$style = $groupMember->role == "owner" ? "<div style=\"color:red;\">" : "<div style=\"color:blue;\">";
-
-			$name = $groupMember->getUser()->is_group == 1 ? $groupMember->getUser()->login : $groupMember->getUser()->getContact()->getFullName();
-
-			$line[] = $style.$name."</div>";
-			$line[] = $style.$groupMember->role."</div>";
-
-			if (AuthService::getInstance($w)->user()->is_admin || AuthService::getInstance($w)->getRoleForLoginUser($option['group_id'], AuthService::getInstance($w)->user()->id) == "owner")
-			{
-				$line[] = Html::a("/admin/memberdelete/".$option['group_id']."/".$groupMember->id,"Delete",null,null,"Are you sure you want to delete this member?");
-			}
-			else
-			{
-				$line[] = null;
-			}
-			$table[] = $line;
-		}
-	}
-	$w->ctx("memberList", Html::table($table,null,"tablesorter",true));
+    $option = $w->pathMatch("group_id");
+
+    AdminService::getInstance($w)->navigation($w, AuthService::getInstance($w)->getUser($option['group_id'])->login);
+
+    if (AuthService::getInstance($w)->user()->is_admin || AuthService::getInstance($w)->getRoleForLoginUser($option['group_id'], AuthService::getInstance($w)->user()->id) == "owner") {
+        $w->ctx("addMember", Html::box("/admin/groupmember/" . $option['group_id'], "New Member", true));
+    }
+    $w->ctx("editPermission", Html::b("/admin/permissionedit/" . $option['group_id'], "Edit Permissions"));
+
+    //fill in member table;
+    $table = array(array("Name", "Email", "Role", "Operations"));
+
+    $groupMembers = AuthService::getInstance($w)->getGroupMembers($option['group_id']);
+
+    if ($groupMembers) {
+        foreach ($groupMembers as $groupMember) {
+            $line = array();
+
+            $style = $groupMember->role == "owner" ? "<div style=\"color:red;\">" : "<div>";
+
+            $name = $groupMember->getUser()->is_group == 1 ? $groupMember->getUser()->login : $groupMember->getUser()->getContact()->getFullName();
+            $email = $groupMember->getUser()->is_group == 1 ? "" : $groupMember->getUser()->getContact()->email;
+
+            $line[] = $style . $name . "</div>";
+            $line[] = $style . $email . "</div>";
+            $line[] = $style . $groupMember->role . "</div>";
+
+            if (AuthService::getInstance($w)->user()->is_admin || AuthService::getInstance($w)->getRoleForLoginUser($option['group_id'], AuthService::getInstance($w)->user()->id) == "owner") {
+                $line[] = Html::a("/admin/memberdelete/" . $option['group_id'] . "/" . $groupMember->id, "Delete", null, null, "Are you sure you want to delete this member?");
+            } else {
+                $line[] = null;
+            }
+            $table[] = $line;
+        }
+    }
+    $w->ctx("memberList", Html::table($table, null, "tablesorter", true));
 }