From 20f061aa82629358cdd0be7a7a7d5c623215facc Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 13 Oct 2022 11:11:47 -0400
Subject: [PATCH 01/35] initial frontend changes to account.php under
 LoginShell

---
 webroot/panel/account.php | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index e132d3b4..d7d55f07 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -136,13 +136,35 @@
 "<div class='inline'>
 <form action='' method='POST'>
 <input type='hidden' name='form_type' value='loginshell'>
-<input type='text' name='loginshell' placeholder='Login Shell (ie. /bin/bash)' 
-value=" . $USER->getLoginShell() . " required>
+<select id=",">
+  <option>/bin/bash</option>
+  <option>/bin/zsh</option>
+  <option>/bin/csh</option>
+  <option>/bin/tcsh</option>
+  <option>/bin/fish</option>
+  <option>custom</option>
+</select>
+<br>
+
+<input id="," placeholder="," style="," value='loginshell'> 
+<value=" . $USER->getLoginShell() . " required>
 <input type='submit' value='Set Login Shell'>
 </form>
-</div>";
+</div>"
 ?>
 
+<script>
+document.querySelector("#choose").addEventListener('change', function() {
+  var textarea = document.querySelector("#custom-text");
+  if (this.value == 'custom') {
+    textarea.style.display = 'block';
+  } else {
+    textarea.style.display = 'none';
+  }
+
+});
+</script>
+
 <script>
     $("button.btnAddKey").click(function() {
         openModal("Add New Key", "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/new_key.php");

From 201508efaa3431cf0b6ebb92a9a5c4cdb16ee148 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 13 Oct 2022 11:34:23 -0400
Subject: [PATCH 02/35] Update account.php

---
 webroot/panel/account.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index d7d55f07..936c65ce 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -146,12 +146,17 @@
 </select>
 <br>
 
-<input id="," placeholder="," style="," value='loginshell'> 
+<input id="," placeholder="," style="," value='submit'> 
 <value=" . $USER->getLoginShell() . " required>
 <input type='submit' value='Set Login Shell'>
+
 </form>
 </div>"
 ?>
+<script>
+$USER = $_POST['loginshell'];
+echo("[".$USER."]");
+</script>
 
 <script>
 document.querySelector("#choose").addEventListener('change', function() {

From 9fac36a3e810051ec37cce1d810783bdbabb312b Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 13 Oct 2022 13:34:44 -0400
Subject: [PATCH 03/35] update account.php

---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 936c65ce..3c92891a 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -146,7 +146,7 @@
 </select>
 <br>
 
-<input id="," placeholder="," style="," value='submit'> 
+<input id="," placeholder="," style="," value='custom'> 
 <value=" . $USER->getLoginShell() . " required>
 <input type='submit' value='Set Login Shell'>
 

From e1f5266dd111bcfd8ead245fa0f031caf1b00f69 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 13 Oct 2022 13:56:05 -0400
Subject: [PATCH 04/35] Update account.php

---
 webroot/panel/account.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 3c92891a..7c0a70fe 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -146,8 +146,8 @@
 </select>
 <br>
 
-<input id="," placeholder="," style="," value='custom'> 
-<value=" . $USER->getLoginShell() . " required>
+<input id="," placeholder="," style="," value='custom'
+<value=". $USER->getLoginShell() . " required>
 <input type='submit' value='Set Login Shell'>
 
 </form>
@@ -162,9 +162,9 @@
 document.querySelector("#choose").addEventListener('change', function() {
   var textarea = document.querySelector("#custom-text");
   if (this.value == 'custom') {
-    textarea.style.display = 'block';
-  } else {
     textarea.style.display = 'none';
+  } else {
+    textarea.style.display = 'block';
   }
 
 });

From 423923374796d2d13defe36c6876ad772e3754fe Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Fri, 14 Oct 2022 10:05:18 -0400
Subject: [PATCH 05/35] added if statement to account.php

---
 webroot/panel/account.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 7c0a70fe..8a7d699e 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -132,10 +132,15 @@
 
 <?php
 echo "<h5>Login Shell</h5>";
+if (isset($_GET["loginshell"])) {
+    header("Location: " . $_GET["loginshell"] . ".php");
+    exit();
+} 
 echo
+
 "<div class='inline'>
-<form action='' method='POST'>
-<input type='hidden' name='form_type' value='loginshell'>
+<form action='' method='get'>
+<input type='submit' name='form_type' value='Submit'>
 <select id=",">
   <option>/bin/bash</option>
   <option>/bin/zsh</option>
@@ -153,10 +158,6 @@
 </form>
 </div>"
 ?>
-<script>
-$USER = $_POST['loginshell'];
-echo("[".$USER."]");
-</script>
 
 <script>
 document.querySelector("#choose").addEventListener('change', function() {

From 630527392a60fb65115def29525fbf5f54f66855 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Fri, 14 Oct 2022 10:28:44 -0400
Subject: [PATCH 06/35] cleaned up syntax account.php

---
 webroot/panel/account.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 8a7d699e..66094c02 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -140,7 +140,7 @@
 
 "<div class='inline'>
 <form action='' method='get'>
-<input type='submit' name='form_type' value='Submit'>
+<name='form_type' value='Submit'>
 <select id=",">
   <option>/bin/bash</option>
   <option>/bin/zsh</option>
@@ -151,8 +151,7 @@
 </select>
 <br>
 
-<input id="," placeholder="," style="," value='custom'
-<value=". $USER->getLoginShell() . " required>
+<input id="," placeholder="," style="," " . $USER->getLoginShell() . " >
 <input type='submit' value='Set Login Shell'>
 
 </form>

From bcf695558401fe5592db8906bb88b672cdd1bca1 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Fri, 14 Oct 2022 10:41:04 -0400
Subject: [PATCH 07/35] Update account.php

---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 66094c02..c6f657d3 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -159,7 +159,7 @@
 ?>
 
 <script>
-document.querySelector("#choose").addEventListener('change', function() {
+document.querySelector("loginshell").addEventListener('change', function() {
   var textarea = document.querySelector("#custom-text");
   if (this.value == 'custom') {
     textarea.style.display = 'none';

From 1ddc32f72c64425454f7131e3a1ee22fb741dcfd Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Mon, 17 Oct 2022 10:10:55 -0400
Subject: [PATCH 08/35] got rid of csh/tcsh and fish option

---
 webroot/panel/account.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index c6f657d3..61016045 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -144,9 +144,6 @@
 <select id=",">
   <option>/bin/bash</option>
   <option>/bin/zsh</option>
-  <option>/bin/csh</option>
-  <option>/bin/tcsh</option>
-  <option>/bin/fish</option>
   <option>custom</option>
 </select>
 <br>

From b694648a8ba99187008157f4c23c4234e92e0adf Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Tue, 18 Oct 2022 16:42:41 -0400
Subject: [PATCH 09/35] update to shell functionality

generated from config.ini
---
 config/branding/config.ini |  7 +++++++
 webroot/panel/account.php  | 38 ++++++++------------------------------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/config/branding/config.ini b/config/branding/config.ini
index 750b7fdf..cba69aa6 100644
--- a/config/branding/config.ini
+++ b/config/branding/config.ini
@@ -30,6 +30,13 @@ logos[] = "mghpcc.png"
 links[] = "https://www.mghpcc.org/"
 title[] = "Massachusetts Green High Performance Computing Center"
 
+[loginshell] ; menu items, Login Shells
+shell[] = "/bin/bash"
+shell[] = "/bin/zsh"
+shell[] = "/bin/csh"
+shell[] = "/bin/tcsh"
+shell[] = "custom"
+
 [menuitems]  ; menu items, add a label and link for each
 labels[] = "Documentation"
 links[] = "https://docs.unity.rc.umass.edu/"
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 61016045..d031c6d5 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -130,42 +130,20 @@
 
 <hr>
 
+<select>
 <?php
-echo "<h5>Login Shell</h5>";
-if (isset($_GET["loginshell"])) {
-    header("Location: " . $_GET["loginshell"] . ".php");
-    exit();
-} 
-echo
-
-"<div class='inline'>
-<form action='' method='get'>
-<name='form_type' value='Submit'>
-<select id=",">
-  <option>/bin/bash</option>
-  <option>/bin/zsh</option>
-  <option>custom</option>
+foreach ($BRANDING["loginshell"]["shell"] as $shell) {
+echo "<option>$shell</option>";
+}
+?>
 </select>
+
 <br>
 
-<input id="," placeholder="," style="," " . $USER->getLoginShell() . " >
+<input id=" " placeholder=" " style=" ">
 <input type='submit' value='Set Login Shell'>
 
-</form>
-</div>"
-?>
-
-<script>
-document.querySelector("loginshell").addEventListener('change', function() {
-  var textarea = document.querySelector("#custom-text");
-  if (this.value == 'custom') {
-    textarea.style.display = 'none';
-  } else {
-    textarea.style.display = 'block';
-  }
-
-});
-</script>
+</div>
 
 <script>
     $("button.btnAddKey").click(function() {

From ce00916756d2490c14e4823861b9afa9b95e05b5 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Tue, 18 Oct 2022 16:47:50 -0400
Subject: [PATCH 10/35] Update account.php

---
 webroot/panel/account.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index d031c6d5..f53c80ff 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -135,12 +135,18 @@
 foreach ($BRANDING["loginshell"]["shell"] as $shell) {
 echo "<option>$shell</option>";
 }
+if($_POST['submit'])
+{
+$shell=$_POST['shell'];
+}
 ?>
 </select>
 
 <br>
 
-<input id=" " placeholder=" " style=" ">
+
+
+<select id="loginshell" placeholder=" " style=" " name="shell">
 <input type='submit' value='Set Login Shell'>
 
 </div>

From c33b18eb6d3dc92b772c9b0379e9d286e61bb840 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 19 Oct 2022 13:44:06 -0400
Subject: [PATCH 11/35] fixes to foreach loop in account.php

---
 webroot/panel/account.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index f53c80ff..3a8186ab 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -135,18 +135,15 @@
 foreach ($BRANDING["loginshell"]["shell"] as $shell) {
 echo "<option>$shell</option>";
 }
-if($_POST['submit'])
-{
-$shell=$_POST['shell'];
+if($_POST['shell']) {
+$shell=$_POST['custom'];
 }
 ?>
+
 </select>
 
 <br>
 
-
-
-<select id="loginshell" placeholder=" " style=" " name="shell">
 <input type='submit' value='Set Login Shell'>
 
 </div>

From e431d71664f13c34e62fc9cba2adf12b2024faa8 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 19 Oct 2022 13:47:25 -0400
Subject: [PATCH 12/35] hardcoded textbox for now.

---
 webroot/panel/account.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 3a8186ab..fab06927 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -135,11 +135,11 @@
 foreach ($BRANDING["loginshell"]["shell"] as $shell) {
 echo "<option>$shell</option>";
 }
-if($_POST['shell']) {
+if(isset($_POST['shell'])) {
 $shell=$_POST['custom'];
 }
 ?>
-
+<input type="text" value="">;
 </select>
 
 <br>

From d1f625a7bdf31bf5c5cb24d568e2d7d3005d65da Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 19 Oct 2022 13:48:02 -0400
Subject: [PATCH 13/35] Update account.php

---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index fab06927..0cc5aae9 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -139,7 +139,7 @@
 $shell=$_POST['custom'];
 }
 ?>
-<input type="text" value="">;
+<input type="text" value="">
 </select>
 
 <br>

From c1e210e71ce962550d37c57bb98cd065e4de2488 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 19 Oct 2022 14:06:09 -0400
Subject: [PATCH 14/35] trying to add txtbox visibility

adding this gets rid of the submit button.
---
 webroot/panel/account.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 0cc5aae9..3b2a4302 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -139,14 +139,22 @@
 $shell=$_POST['custom'];
 }
 ?>
-<input type="text" value="">
+<div id="field"><input type="text" name="shell"></div>
+
 </select>
 
-<br>
+<script type="text/javascript">
+$(document).ready(function(){
 
-<input type='submit' value='Set Login Shell'>
+$('input[name="custom"]').change(function(){
+var v = $('input[name="custom"]').val();
+if(v=="custom") $('#field').show();
+else $('#field').hide();
+})
+})
 
-</div>
+<br>
+<input type='submit' value='Set Login Shell'>
 
 <script>
     $("button.btnAddKey").click(function() {

From 45ca04ef4b406915d61d12150479be23169ff295 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 19 Oct 2022 14:42:37 -0400
Subject: [PATCH 15/35] trying to add getPIGROUP functionality in User
 Management

---
 webroot/admin/user-mgmt.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 450b1a6a..5a895efb 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -41,6 +41,7 @@
         echo "<tr>";
         echo "<td>" . $user->getFirstname() . " " . $user->getLastname() . "</td>";
         echo "<td>" . $user->getUID() . "</td>";
+        echo "<td>" . $user->getPIGroup() . "</td>";
         echo "<td>" . $user->getOrg() . "</td>";
         echo "<td><a href='mailto:" . $user->getMail() . "'>" . $user->getMail() . "</a></td>";
         echo "<td>";

From 52a90496a4370647fed4255da94b6f1d206a2c83 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 19 Oct 2022 14:44:06 -0400
Subject: [PATCH 16/35] Update user-mgmt.php

---
 webroot/admin/user-mgmt.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 5a895efb..97676906 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -41,8 +41,8 @@
         echo "<tr>";
         echo "<td>" . $user->getFirstname() . " " . $user->getLastname() . "</td>";
         echo "<td>" . $user->getUID() . "</td>";
-        echo "<td>" . $user->getPIGroup() . "</td>";
         echo "<td>" . $user->getOrg() . "</td>";
+        echo "<td>" . $user->getPIGroup() . "</td>";
         echo "<td><a href='mailto:" . $user->getMail() . "'>" . $user->getMail() . "</a></td>";
         echo "<td>";
 

From 647f07314f31546d2337d6f988c110346401f50f Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 10:44:41 -0400
Subject: [PATCH 17/35] updated config.ini to get rid of custom

---
 config/branding/config.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/branding/config.ini b/config/branding/config.ini
index cba69aa6..e9852771 100644
--- a/config/branding/config.ini
+++ b/config/branding/config.ini
@@ -31,11 +31,11 @@ links[] = "https://www.mghpcc.org/"
 title[] = "Massachusetts Green High Performance Computing Center"
 
 [loginshell] ; menu items, Login Shells
+shell[] = ""
 shell[] = "/bin/bash"
 shell[] = "/bin/zsh"
 shell[] = "/bin/csh"
 shell[] = "/bin/tcsh"
-shell[] = "custom"
 
 [menuitems]  ; menu items, add a label and link for each
 labels[] = "Documentation"

From 5966b7182765acbde58ff3cbaf2aae5df4671910 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 11:59:36 -0400
Subject: [PATCH 18/35] added column for PI group under user-mgmt.php

In the future it needs to display what PI group the user belongs to.
---
 webroot/admin/user-mgmt.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 97676906..8ba1c6b7 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -30,6 +30,7 @@
         <td>Name</td>
         <td>Unity ID</td>
         <td>Org</td>
+        <td>PIGroup</td>
         <td>Mail</td>
         <td>Actions</td>
     </tr>

From 0f85628feb952cad37becf63129970ca719f5cf9 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 12:03:40 -0400
Subject: [PATCH 19/35] Update user-mgmt.php

---
 webroot/admin/user-mgmt.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 8ba1c6b7..678d4e56 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -43,7 +43,7 @@
         echo "<td>" . $user->getFirstname() . " " . $user->getLastname() . "</td>";
         echo "<td>" . $user->getUID() . "</td>";
         echo "<td>" . $user->getOrg() . "</td>";
-        echo "<td>" . $user->getPIGroup() . "</td>";
+        echo "<td>" . $user->getAllPIGroups() . "</td>";
         echo "<td><a href='mailto:" . $user->getMail() . "'>" . $user->getMail() . "</a></td>";
         echo "<td>";
 

From ec558ed845cfe2ae7b90cb99279b62d8d37dd5cb Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 12:04:07 -0400
Subject: [PATCH 20/35] Update user-mgmt.php

---
 webroot/admin/user-mgmt.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 678d4e56..8545ff6a 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -30,7 +30,7 @@
         <td>Name</td>
         <td>Unity ID</td>
         <td>Org</td>
-        <td>PIGroup</td>
+        <td>PIGroups</td>
         <td>Mail</td>
         <td>Actions</td>
     </tr>

From baece3dc45bafa45c688e84f7fd1ea6414a83693 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 15:16:43 -0400
Subject: [PATCH 21/35] Revert "Update user-mgmt.php"

This reverts commit ec558ed845cfe2ae7b90cb99279b62d8d37dd5cb.
---
 webroot/admin/user-mgmt.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 8545ff6a..678d4e56 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -30,7 +30,7 @@
         <td>Name</td>
         <td>Unity ID</td>
         <td>Org</td>
-        <td>PIGroups</td>
+        <td>PIGroup</td>
         <td>Mail</td>
         <td>Actions</td>
     </tr>

From 75b459ccb00bac0338de434ce763551dc61aec24 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 15:16:59 -0400
Subject: [PATCH 22/35] Revert "Update user-mgmt.php"

This reverts commit 0f85628feb952cad37becf63129970ca719f5cf9.
---
 webroot/admin/user-mgmt.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 678d4e56..8ba1c6b7 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -43,7 +43,7 @@
         echo "<td>" . $user->getFirstname() . " " . $user->getLastname() . "</td>";
         echo "<td>" . $user->getUID() . "</td>";
         echo "<td>" . $user->getOrg() . "</td>";
-        echo "<td>" . $user->getAllPIGroups() . "</td>";
+        echo "<td>" . $user->getPIGroup() . "</td>";
         echo "<td><a href='mailto:" . $user->getMail() . "'>" . $user->getMail() . "</a></td>";
         echo "<td>";
 

From 2a53fee26ede88bd0d7a0f68b171c0c66ba38de4 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 15:18:35 -0400
Subject: [PATCH 23/35] Revert "Update user-mgmt.php"

This reverts commit 52a90496a4370647fed4255da94b6f1d206a2c83.
---
 webroot/admin/user-mgmt.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 8ba1c6b7..bc0487b4 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -42,8 +42,8 @@
         echo "<tr>";
         echo "<td>" . $user->getFirstname() . " " . $user->getLastname() . "</td>";
         echo "<td>" . $user->getUID() . "</td>";
-        echo "<td>" . $user->getOrg() . "</td>";
         echo "<td>" . $user->getPIGroup() . "</td>";
+        echo "<td>" . $user->getOrg() . "</td>";
         echo "<td><a href='mailto:" . $user->getMail() . "'>" . $user->getMail() . "</a></td>";
         echo "<td>";
 

From 51d898d0e4523310cc5f1f2cb0c2fd66faa1f841 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 15:18:46 -0400
Subject: [PATCH 24/35] Revert "trying to add getPIGROUP functionality in User
 Management"

This reverts commit 45ca04ef4b406915d61d12150479be23169ff295.
---
 webroot/admin/user-mgmt.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index bc0487b4..4cf1dd99 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -42,7 +42,6 @@
         echo "<tr>";
         echo "<td>" . $user->getFirstname() . " " . $user->getLastname() . "</td>";
         echo "<td>" . $user->getUID() . "</td>";
-        echo "<td>" . $user->getPIGroup() . "</td>";
         echo "<td>" . $user->getOrg() . "</td>";
         echo "<td><a href='mailto:" . $user->getMail() . "'>" . $user->getMail() . "</a></td>";
         echo "<td>";

From c93102b84a27c6062f5814353caf0aaac429f9bd Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Thu, 20 Oct 2022 15:19:17 -0400
Subject: [PATCH 25/35] Revert "added column for PI group under user-mgmt.php"

This reverts commit 5966b7182765acbde58ff3cbaf2aae5df4671910.
---
 webroot/admin/user-mgmt.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 4cf1dd99..450b1a6a 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -30,7 +30,6 @@
         <td>Name</td>
         <td>Unity ID</td>
         <td>Org</td>
-        <td>PIGroup</td>
         <td>Mail</td>
         <td>Actions</td>
     </tr>

From bfc4383edd5c7a38aed36583d3378341725c37b1 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 9 Nov 2022 16:07:51 -0500
Subject: [PATCH 26/35] Final fixes to shell frontend in account.php

ready for pr merge
---
 config/branding/config.ini |  3 --
 webroot/panel/account.php  | 56 +++++++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/config/branding/config.ini b/config/branding/config.ini
index e9852771..e349a861 100644
--- a/config/branding/config.ini
+++ b/config/branding/config.ini
@@ -31,11 +31,8 @@ links[] = "https://www.mghpcc.org/"
 title[] = "Massachusetts Green High Performance Computing Center"
 
 [loginshell] ; menu items, Login Shells
-shell[] = ""
 shell[] = "/bin/bash"
 shell[] = "/bin/zsh"
-shell[] = "/bin/csh"
-shell[] = "/bin/tcsh"
 
 [menuitems]  ; menu items, add a label and link for each
 labels[] = "Documentation"
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 3b2a4302..6c777e0a 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -42,7 +42,7 @@
             $USER->setSSHKeys($keys);  // Update user keys
             break;
         case "loginshell":
-            $USER->setLoginShell($_POST["loginshell"]);
+            //$USER->setLoginShell($_POST["loginshell"]);
             break;
         case "pi_request":
             if (!$USER->isPI()) {
@@ -130,36 +130,48 @@
 
 <hr>
 
-<select>
-<?php
-foreach ($BRANDING["loginshell"]["shell"] as $shell) {
-echo "<option>$shell</option>";
-}
-if(isset($_POST['shell'])) {
-$shell=$_POST['custom'];
-}
-?>
-<div id="field"><input type="text" name="shell"></div>
+<form action="" method="POST">
+
+    <input type="hidden" name="form_type" value="loginshell">
+
+    <select id="loginSelector">
 
-</select>
+        <option value="" disabled selected hidden>Select Login Shell...</option>
 
-<script type="text/javascript">
-$(document).ready(function(){
+        <?php
+        foreach ($BRANDING["loginshell"]["shell"] as $shell) {
+            echo "<option>$shell</option>";
+        }
+        
+        if(isset($_POST['shell'])) {
+        }
+        ?>
 
-$('input[name="custom"]').change(function(){
-var v = $('input[name="custom"]').val();
-if(v=="custom") $('#field').show();
-else $('#field').hide();
-})
-})
+        <option value = "custom">Custom</option>
+        
+    </select>
 
-<br>
-<input type='submit' value='Set Login Shell'>
+    <input id="customLoginBox" type="text" name="shell">
+
+    <input type='submit' value='Set Login Shell'>
+
+</form>
 
 <script>
     $("button.btnAddKey").click(function() {
         openModal("Add New Key", "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/new_key.php");
     });
+
+    $("#customLoginBox").hide();
+
+    $("#loginSelector").change(function() {
+        var customBox = $("#customLoginBox");
+        if($(this).val() == "custom") {
+            customBox.show();
+        } else {
+            customBox.hide();
+        }
+    });
 </script>
 
 <style>

From 690e076c239e937e711b6d701b2e6c8b907ec658 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Fri, 2 Dec 2022 14:20:53 -0500
Subject: [PATCH 27/35] setLoginShell added custom functionality

---
 webroot/panel/account.php | 42 +++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 6c777e0a..973b588f 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -42,6 +42,11 @@
             $USER->setSSHKeys($keys);  // Update user keys
             break;
         case "loginshell":
+            if ($_POST["shellSelect"] == "custom"){
+                $USER->setLoginShell($_POST["shell"]);
+            } else {
+                $USER->setLoginShell($_POST["shellSelect"]);
+            }
             //$USER->setLoginShell($_POST["loginshell"]);
             break;
         case "pi_request":
@@ -134,29 +139,46 @@
 
     <input type="hidden" name="form_type" value="loginshell">
 
-    <select id="loginSelector">
+    <select id="loginSelector" name= "shellSelect"> 
 
-        <option value="" disabled selected hidden>Select Login Shell...</option>
+        <option value="" disabled hidden>Select Login Shell...</option>
 
         <?php
+        $cur_shell = $USER->getLoginShell();
+        $found_selector = false;
         foreach ($BRANDING["loginshell"]["shell"] as $shell) {
-            echo "<option>$shell</option>";
+            if ($cur_shell == $shell){
+                echo "<option selected>$shell</option>";
+                $found_selector = true;
+            } else {
+                echo "<option>$shell</option>";
+            }
         }
-        
-        if(isset($_POST['shell'])) {
+
+        if ($found_selector) {
+            echo "<option value = 'custom'> Custom </option>";
+        } else {
+            echo "<option value = 'custom' selected> Custom </option>";
         }
         ?>
 
-        <option value = "custom">Custom</option>
+        
         
     </select>
+<?php
 
-    <input id="customLoginBox" type="text" name="shell">
-
+    if ($found_selector) {
+        echo "<input id='customLoginBox' type='text' name='shell'>";
+    } else {
+        echo "<input id='customLoginBox' type='text' name='shell' value= '$cur_shell'>";
+    }
+?>
     <input type='submit' value='Set Login Shell'>
 
 </form>
 
+
+
 <script>
     $("button.btnAddKey").click(function() {
         openModal("Add New Key", "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/new_key.php");
@@ -172,6 +194,10 @@
             customBox.hide();
         }
     });
+
+    if ($("#loginSelector").val() == "custom") {
+        $("#customLoginBox").show();
+    }
 </script>
 
 <style>

From e0249fd465dd36cd9ec1d4bff7336aa24479d002 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 14 Dec 2022 10:33:01 -0500
Subject: [PATCH 28/35] Update webroot/panel/account.php

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 973b588f..280cecc0 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -156,7 +156,7 @@
         }
 
         if ($found_selector) {
-            echo "<option value = 'custom'> Custom </option>";
+            echo "<option value='custom'>Custom</option>";
         } else {
             echo "<option value = 'custom' selected> Custom </option>";
         }

From a2bf4aed55cb85a2d0a00c5ba85528e70ae94bfc Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 14 Dec 2022 10:33:12 -0500
Subject: [PATCH 29/35] Update webroot/panel/account.php

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 280cecc0..2f7f42c7 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -158,7 +158,7 @@
         if ($found_selector) {
             echo "<option value='custom'>Custom</option>";
         } else {
-            echo "<option value = 'custom' selected> Custom </option>";
+            echo "<option value='custom' selected>Custom</option>";
         }
         ?>
 

From 40c540ab9ef8c7b06477cb6d533d5bfb75a0b3ca Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 14 Dec 2022 10:33:41 -0500
Subject: [PATCH 30/35] Update webroot/panel/account.php

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 2f7f42c7..bb1a8d42 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -161,9 +161,6 @@
             echo "<option value='custom' selected>Custom</option>";
         }
         ?>
-
-        
-        
     </select>
 <?php
 

From e42b2c94c29b4fcb52dbc68e8a0163dc32a1b399 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 14 Dec 2022 10:33:58 -0500
Subject: [PATCH 31/35] Update webroot/panel/account.php

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index bb1a8d42..71f4f1b0 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -165,7 +165,7 @@
 <?php
 
     if ($found_selector) {
-        echo "<input id='customLoginBox' type='text' name='shell'>";
+        echo "<input id='customLoginBox' type='text' placeholder='Enter login shell path (ie. /bin/bash)' name='shell'>";
     } else {
         echo "<input id='customLoginBox' type='text' name='shell' value= '$cur_shell'>";
     }

From 395d885bd336542a59e12a3d3ab05ed52267a3e6 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 14 Dec 2022 10:34:10 -0500
Subject: [PATCH 32/35] Update webroot/panel/account.php

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 71f4f1b0..06ce4f50 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -167,7 +167,7 @@
     if ($found_selector) {
         echo "<input id='customLoginBox' type='text' placeholder='Enter login shell path (ie. /bin/bash)' name='shell'>";
     } else {
-        echo "<input id='customLoginBox' type='text' name='shell' value= '$cur_shell'>";
+        echo "<input id='customLoginBox' type='text' placeholder='Enter login shell path (ie. /bin/bash)' name='shell' value='$cur_shell'>";
     }
 ?>
     <input type='submit' value='Set Login Shell'>

From e7b5d8d8be4cc73bbd058c19d5d09a8059bc51b2 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 14 Dec 2022 10:34:19 -0500
Subject: [PATCH 33/35] Update webroot/panel/account.php

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 06ce4f50..e4b2da24 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -174,8 +174,6 @@
 
 </form>
 
-
-
 <script>
     $("button.btnAddKey").click(function() {
         openModal("Add New Key", "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/new_key.php");

From b880e6071ae896f0bfef234d76a2dd6ba75e01f6 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 14 Dec 2022 10:34:34 -0500
Subject: [PATCH 34/35] Update webroot/panel/account.php

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index e4b2da24..b5a8f428 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -47,7 +47,6 @@
             } else {
                 $USER->setLoginShell($_POST["shellSelect"]);
             }
-            //$USER->setLoginShell($_POST["loginshell"]);
             break;
         case "pi_request":
             if (!$USER->isPI()) {

From d00161b3df88d7d0e8cff70f4d710499628bdd09 Mon Sep 17 00:00:00 2001
From: Sean Mckeag <mckeags7@gmail.com>
Date: Wed, 14 Dec 2022 10:35:27 -0500
Subject: [PATCH 35/35] Update webroot/panel/account.php

Co-authored-by: Hakan Saplakoglu <hakansaplakog@gmail.com>
---
 webroot/panel/account.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index b5a8f428..54ef615c 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -178,7 +178,13 @@
         openModal("Add New Key", "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/new_key.php");
     });
 
-    $("#customLoginBox").hide();
+    var customLoginBox = $("#customLoginBox");
+    if (customLoginBox.val() == "") {
+        // login box is empty, so we hide it by default
+        // if the login box had a value, that means it would be a custom shell
+        // and should not hide by default
+        customLoginBox.hide();
+    }
 
     $("#loginSelector").change(function() {
         var customBox = $("#customLoginBox");