Skip to content

add getQueryParameter function #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonLeary42 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

add getQueryParameter function #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4404f5e
getQueryParameter
simonLeary42 Dec 11, 2025
6fa9bdc
replace bad isset, is_null with is_array
simonLeary42 Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions resources/lib/UnityHTTPD.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,22 @@ public static function getPostData(string $key): mixed
}
}

/* returns null if not found and not $throw_if_not_found */
public static function getQueryParameter(string $key, bool $throw_if_not_found = true): mixed
{
if (!is_array($_GET)) {
throw new RuntimeException('$_GET is not an array!');
}
if (!array_key_exists($key, $_GET)) {
if ($throw_if_not_found) {
self::badRequest("\$_GET has no array key '$key'");
} else {
return null;
}
}
return $_GET[$key];
}

public static function getUploadedFileContents(
string $filename,
bool $do_delete_tmpfile_after_read = true,
Expand Down
7 changes: 2 additions & 5 deletions webroot/admin/ajax/get_group_members.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@
UnityHTTPD::forbidden("not an admin");
}

if (!isset($_GET["gid"])) {
UnityHTTPD::badRequest("PI UID not set");
}

$group = new UnityGroup($_GET["gid"], $LDAP, $SQL, $MAILER, $WEBHOOK);
$gid = UnityHTTPD::getQueryParameter("gid");
$group = new UnityGroup($gid, $LDAP, $SQL, $MAILER, $WEBHOOK);
$members = $group->getGroupMembersAttributes(["gecos", "mail"]);
$requests = $group->getRequests();

Expand Down
7 changes: 2 additions & 5 deletions webroot/admin/ajax/get_page_contents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
UnityHTTPD::forbidden("not an admin");
}

if (!isset($_GET["pageid"])) {
UnityHTTPD::badRequest("Pageid not found");
}

$page = $SQL->getPage($_GET["pageid"]);
$pageid = UnityHTTPD::getQueryParameter("pageid");
$page = $SQL->getPage($pageid);
echo $page["content"];
14 changes: 3 additions & 11 deletions webroot/api/content/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@

require_once __DIR__ . "/../../../resources/autoload.php";

if (isset($_GET["line_wrap"])) {
$CHAR_WRAP = $_GET["line_wrap"];
} else {
$CHAR_WRAP = 80;
}

if (!isset($_GET["content_name"])) {
UnityHTTPD::badRequest("content_name not set");
}

echo $SQL->getPage($_GET["content_name"])["content"];
$CHAR_WRAP = UnityHTTPD::getQueryParameter("line_wrap", false) ?? 80;
$content_name = UnityHTTPD::getQueryParameter("content_name");
echo $SQL->getPage($content_name)["content"];
3 changes: 2 additions & 1 deletion webroot/js/ajax/ssh_generate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
require "../../../resources/autoload.php";

use phpseclib3\Crypt\EC;
use UnityWebPortal\lib\UnityHTTPD;

echo "<pre>";

Expand All @@ -13,7 +14,7 @@
echo $public->toString('OpenSSH');
echo "</section>";
echo "<section class='privKey'>";
if (isset($_GET["type"]) && $_GET["type"] == "ppk") {
if (UnityHTTPD::getQueryParameter("type", false) == "ppk") {
echo $private->toString('PuTTY');
} else {
echo $private->toString('OpenSSH');
Expand Down
6 changes: 2 additions & 4 deletions webroot/panel/ajax/get_group_members.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
use UnityWebPortal\lib\UnityGroup;
use UnityWebPortal\lib\UnityHTTPD;

if (!isset($_GET["gid"])) {
UnityHTTPD::badRequest("PI UID not set");
}

$group = new UnityGroup($_GET["gid"], $LDAP, $SQL, $MAILER, $WEBHOOK);
$gid = UnityHTTPD::getQueryParameter("gid");
$group = new UnityGroup($gid, $LDAP, $SQL, $MAILER, $WEBHOOK);
if (!$group->memberExists($USER)) {
UnityHTTPD::forbidden("not a group member");
}
Expand Down
8 changes: 6 additions & 2 deletions webroot/panel/modal/pi_search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use UnityWebPortal\lib\UnityHTTPD;

$search_query = $_GET["search"]; // Search is passed as a get var
$search_query = UnityHTTPD::getQueryParameter("search");
if (empty($search_query)) {
echo "<span>No Results</span>";
UnityHTTPD::die();
Expand All @@ -27,7 +27,11 @@
try {
$fn = strtolower($assoc_obj->getOwner()->getFullName());
} catch (Throwable $e) {
UnitySite::errorLog("warning", "failed to get owner name for PI group '$assoc'", error: $e);
UnityHTTPD::errorLog(
"warning",
"failed to get owner name for PI group '$assoc'",
error: $e
);
$fn = "";
}
if (strpos($fn, strtolower($search_query)) !== false) {
Expand Down