str2int

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -160,7 +160,7 @@ private function getCustomIDMappings(): array
         }
         $output_map = [];
         foreach ($output as [$uid, $uidNumber_str]) {
-            $output_map[$uid] = intval($uidNumber_str);
+            $output_map[$uid] = str2int($uidNumber_str);
         }
         return $output_map;
     }

resources/lib/utils.php

@@ -1,6 +1,5 @@
 <?php
 
-use UnityWebPortal\lib\exceptions\ArrayKeyException;
 use UnityWebPortal\lib\exceptions\EnsureException;
 use UnityWebPortal\lib\exceptions\EncodingUnknownException;
 use UnityWebPortal\lib\exceptions\EncodingConversionException;
@@ -83,3 +82,15 @@ function getHyperlink($text, ...$url_components)
     $url = getURL(...$url_components);
     return "<a href='$url'>$text</a>";
 }
+
+/**
+ * @throws ValueError
+ */
+function str2int(string $x): int
+{
+    if (is_numeric($x)) {
+        return intval($x);
+    } else {
+        throw new ValueError("not numeric: $x");
+    }
+}

webroot/api/content/index.php

@@ -6,6 +6,6 @@
 
 require_once __DIR__ . "/../../../resources/autoload.php";
 
-$CHAR_WRAP = UnityHTTPD::getQueryParameter("line_wrap", false) ?? 80;
+$CHAR_WRAP = str2int(UnityHTTPD::getQueryParameter("line_wrap", false) ?? "80");
 $content_name = UnityHTTPD::getQueryParameter("content_name");
 echo $SQL->getPage($content_name)["content"];

webroot/panel/account.php

@@ -52,11 +52,7 @@
             break;
         case "delKey":
             $keys = $USER->getSSHKeys();
-            $indexStr = $_POST["delIndex"];
-            if (!preg_match("/^[0-9]+$/", $indexStr)) {
-                break;
-            }
-            $index = intval($indexStr);
+            $index = str2int(UnityHTTPD::getPostData("delIndex"));
             if ($index >= count($keys)) {
                 break;
             }