diff --git a/webroot/admin/ajax/get_group_members.php b/webroot/admin/ajax/get_group_members.php index 2f5ff45b..b736403c 100644 --- a/webroot/admin/ajax/get_group_members.php +++ b/webroot/admin/ajax/get_group_members.php @@ -1,6 +1,6 @@ isAdmin()) { die(); diff --git a/webroot/admin/content.php b/webroot/admin/content.php index fd302674..52b60bc8 100644 --- a/webroot/admin/content.php +++ b/webroot/admin/content.php @@ -1,6 +1,6 @@ isAdmin()) { die(); diff --git a/webroot/admin/notices.php b/webroot/admin/notices.php index 3d01a0b1..c9884a22 100644 --- a/webroot/admin/notices.php +++ b/webroot/admin/notices.php @@ -1,6 +1,6 @@ isAdmin()) { die(); diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php index f99faae1..bb13b828 100644 --- a/webroot/admin/pi-mgmt.php +++ b/webroot/admin/pi-mgmt.php @@ -1,6 +1,6 @@ - - "; echo ""; @@ -130,7 +130,7 @@ echo "" . $pi_user->getMail() . ""; echo ""; echo - "
diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php index a971ab46..94f4a100 100644 --- a/webroot/admin/user-mgmt.php +++ b/webroot/admin/user-mgmt.php @@ -1,6 +1,6 @@ "; echo ""; - echo " diff --git a/webroot/api/content/index.php b/webroot/api/content/index.php index 8af1b8ae..5d57135f 100644 --- a/webroot/api/content/index.php +++ b/webroot/api/content/index.php @@ -2,7 +2,7 @@ header('Content-type: text/plain'); -require_once "../../../resources/autoload.php"; +require_once __DIR__ . "/../../../resources/autoload.php"; if (isset($_GET["line_wrap"])) { $CHAR_WRAP = $_GET["line_wrap"]; diff --git a/webroot/api/notices/index.php b/webroot/api/notices/index.php index 3ccdbb8d..9c4eaca9 100644 --- a/webroot/api/notices/index.php +++ b/webroot/api/notices/index.php @@ -2,7 +2,7 @@ header('Content-type: text/plain'); -require_once "../../../resources/autoload.php"; +require_once __DIR__ . "/../../../resources/autoload.php"; $notices = $SQL->getNotices(); $jsonArray = []; diff --git a/webroot/index.php b/webroot/index.php index cede6f18..d7090304 100644 --- a/webroot/index.php +++ b/webroot/index.php @@ -1,6 +1,6 @@ diff --git a/webroot/panel/account.php b/webroot/panel/account.php index 867387ef..8bc02a15 100644 --- a/webroot/panel/account.php +++ b/webroot/panel/account.php @@ -1,6 +1,6 @@ getGroups()) > 0; if ($hasGroups) { - die(); break; } if (!$SQL->accDeletionRequestExists($USER->getUID())) { @@ -115,8 +114,8 @@ } elseif ($isActive) { echo "

You are curently a user on the Unity Cluster

"; } else { - echo "

You are currently not assigned to any PI, and will be - unable to use the cluster. Go to the My PIs + echo "

You are currently not assigned to any PI, and will be + unable to use the cluster. Go to the My PIs page to join a PI, or click on the button below if you are a PI

"; echo "

Students should not request a PI account.

"; } @@ -124,7 +123,7 @@ if (!$isPI) { if ($SQL->accDeletionRequestExists($USER->getUID())) { echo - " "; echo ""; @@ -135,7 +134,7 @@ echo "
"; } else { echo - "
"; if ($SQL->requestExists($USER->getUID())) { @@ -163,7 +162,7 @@ echo "
- @@ -182,7 +181,7 @@ - @@ -209,10 +208,10 @@ "; } else { - echo ""; } @@ -232,7 +231,7 @@ echo "

You cannot request to delete your account while you are in a PI group.

"; } else { echo - " "; if ($SQL->accDeletionRequestExists($USER->getUID())) { diff --git a/webroot/panel/ajax/get_group_members.php b/webroot/panel/ajax/get_group_members.php index 92015cbf..500c1431 100644 --- a/webroot/panel/ajax/get_group_members.php +++ b/webroot/panel/ajax/get_group_members.php @@ -1,6 +1,6 @@ Current Groups"; if ($USER->isPI() && count($groups) == 1) { - echo "You are only a member of your own PI group. + echo "You are only a member of your own PI group. Navigate to the my users page to see your group."; } if (count($groups) == 0) { - echo "You are not a member of any groups. Request to join a PI using the button below, + echo "You are not a member of any groups. Request to join a PI using the button below, or request your own PI account on the account settings page"; } @@ -112,7 +112,7 @@ echo "" . $owner->getMail() . ""; echo " - diff --git a/webroot/panel/modal/new_key.php b/webroot/panel/modal/new_key.php index 40c509fc..9bc54988 100644 --- a/webroot/panel/modal/new_key.php +++ b/webroot/panel/modal/new_key.php @@ -1,9 +1,9 @@ -/panel/account.php"> @@ -16,12 +16,12 @@
- +
- +
diff --git a/webroot/panel/modal/new_pi.php b/webroot/panel/modal/new_pi.php index ed116557..a007e43b 100644 --- a/webroot/panel/modal/new_pi.php +++ b/webroot/panel/modal/new_pi.php @@ -1,6 +1,6 @@ /panel/groups.php"> @@ -40,4 +40,4 @@ $(document).click(function() { $("div.searchWrapper").hide(); }); - \ No newline at end of file + diff --git a/webroot/panel/modal/pi_search.php b/webroot/panel/modal/pi_search.php index 28a077a0..5b6d7414 100644 --- a/webroot/panel/modal/pi_search.php +++ b/webroot/panel/modal/pi_search.php @@ -1,6 +1,6 @@

Your unity cluster username will be

-

In order to activate your account on the Unity cluster, +

In order to activate your account on the Unity cluster, you must join an existing PI group, or request your own PI group.

@@ -59,7 +59,7 @@ $pending_requests = $SQL->getRequestsByUser($USER->getUID()); if (count($pending_requests) > 0) { // already has pending requests - echo "

Your request to activate your account has been submitted. + echo "

Your request to activate your account has been submitted. You will receive an email when your account is activated.

"; } else { echo ""; diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php index 85258581..b9f8db02 100644 --- a/webroot/panel/pi.php +++ b/webroot/panel/pi.php @@ -1,6 +1,6 @@ getGroupMembers(); if (count($requests) + count($assocs) == 1) { - echo "

You do not have any users attached to your PI account. + echo "

You do not have any users attached to your PI account. Ask your users to request to join your account on the My PIs page.

"; } @@ -69,9 +69,9 @@ " - - "; echo ""; @@ -99,7 +99,7 @@ "
-
"; echo ""; diff --git a/workers/clear-audit-log.php b/workers/clear-audit-log.php index 3426dd04..66dab341 100644 --- a/workers/clear-audit-log.php +++ b/workers/clear-audit-log.php @@ -1,7 +1,7 @@ getAllUsers($SQL, $MAILER, $REDIS, $WEBHOOK, true);