use messages instead of modal errors

Author: simonLeary42

test/functional/PIMemberRequestTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use PHPUnit\Framework\TestCase;
+use UnityWebPortal\lib\UnityHTTPDMessageSeverity;
 use UnityWebPortal\lib\UnitySQL;
 
 class PIMemberRequestTest extends TestCase
@@ -44,7 +45,12 @@ public function testRequestMembership()
             $this->cancelRequest($gid);
             $this->assertFalse($SQL->requestExists($uid, $gid));
             $this->requestMembership("asdlkjasldkj");
-            $this->assertContains("This PI doesn't exist", $_SESSION["MODAL_ERRORS"]);
+            assertMessageExists(
+                $this,
+                UnityHTTPDMessageSeverity::BAD,
+                ".*",
+                "This PI doesn't exist",
+            );
             $this->requestMembership($pi_group->getOwner()->getMail());
             $this->assertTrue($SQL->requestExists($uid, $gid));
         } finally {

webroot/panel/groups.php

@@ -7,8 +7,6 @@
 use UnityWebPortal\lib\UnityHTTPD;
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    $modalErrors = array();
-
     if (isset($_POST["form_type"])) {
         if (isset($_POST["pi"])) {
             $pi_groupname = $_POST["pi"];
@@ -20,7 +18,8 @@
             }
             $pi_account = new UnityGroup($pi_groupname, $LDAP, $SQL, $MAILER, $WEBHOOK);
             if (!$pi_account->exists()) {
-                array_push($modalErrors, "This PI doesn't exist");
+                UnityHTTPD::messageBad("Invalid Group Membership Request", "This PI doesn't exist");
+                UnityHTTPD::redirect();
             }
         }
 
@@ -31,30 +30,36 @@
                 }
                 if ($pi_account->exists()) {
                     if ($pi_account->requestExists($USER)) {
-                        array_push($modalErrors, "You've already requested this");
+                        UnityHTTPD::messageBad(
+                            "Invalid Group Membership Request",
+                            "You've already requested this"
+                        );
+                        UnityHTTPD::redirect();
                     }
                     if ($pi_account->memberExists($USER)) {
-                        array_push($modalErrors, "You're already in this PI group");
+                        UnityHTTPD::messageBad(
+                            "Invalid Group Membership Request",
+                            "You're already in this PI group"
+                        );
+                        UnityHTTPD::redirect();
                     }
                 }
-                if (empty($modalErrors)) {
-                    $pi_account->newUserRequest($USER);
-                }
+                $pi_account->newUserRequest($USER);
+                UnityHTTPD::messageGood("Group Membership Request Submitted", "");
+                UnityHTTPD::redirect();
                 break;
             case "removePIForm":
                 $pi_account->removeUser($USER);
+                UnityHTTPD::messageGood("Group Membership Removed", "");
+                UnityHTTPD::redirect();
                 break;
             case "cancelPIForm":
                 $pi_account->cancelGroupJoinRequest($USER);
+                UnityHTTPD::messageGood("Group Membership Request Cancelled", "");
+                UnityHTTPD::redirect();
                 break;
         }
     }
-    $_SESSION['MODAL_ERRORS'] = $modalErrors;
-} else {
-    if (isset($_SESSION['MODAL_ERRORS'])) {
-        $modalErrors = $_SESSION['MODAL_ERRORS'];
-        $_SESSION['MODAL_ERRORS'] = array();  // Forget after shown
-    }
 }
 
 
@@ -178,18 +183,6 @@
         openModal("Add New PI", "<?php echo CONFIG["site"]["prefix"]; ?>/panel/modal/new_pi.php");
     });
 
-    <?php
-    // This is here to re-open the modal if there are errors
-    if (isset($modalErrors) && is_array($modalErrors) && count($modalErrors) > 0) {
-        $errorHTML = "";
-        foreach ($modalErrors as $error) {
-            $errorHTML .= "<span>" . htmlentities($error) . "</span>";
-        }
-
-        echo "openModal('Add New PI', '" . CONFIG["site"]["prefix"] . "/panel/modal/new_pi.php');";
-    }
-    ?>
-
     // tables.js uses ajax_url to populate expandable tables
     var ajax_url = "<?php echo CONFIG["site"]["prefix"]; ?>/panel/ajax/get_group_members.php?gid=";
 </script>