Your Web-Base Installation is now ready to use!
-- You can now login into your Administrator Dashboard to adjust your settings - and add routes & pages. - You can add new documents and views by adding classes in the corresponding - directories and link to them, by creating rules in the Administrator Dashboard. -
-![\"$langName\"](\"/img/icons/lang/$langCode.gif\" "\\"$langName\\""){kind=icon}
"
);
}
-
- return implode('', $this->languageFlags);
}
}
+
+ public function getCode() {
+ return implode('', $this->languageFlags);
+ }
}
\ No newline at end of file
diff --git a/core/Views/LoginBody.class.php b/core/Views/LoginBody.class.php
index fb089f5..25e1c73 100644
--- a/core/Views/LoginBody.class.php
+++ b/core/Views/LoginBody.class.php
@@ -32,7 +32,7 @@ class LoginBody extends Body {
$backToStartPage = L("Back to Start Page");
$stayLoggedIn = L("Stay logged in");
- $flags = new LanguageFlags($this->getDocument());
+ $flags = $this->load(LanguageFlags::class);
$iconBack = $this->createIcon("arrow-circle-left");
$domain = $_SERVER['HTTP_HOST'];
$protocol = getProtocol();
diff --git a/core/core.php b/core/core.php
index 26af7e6..a75510f 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1,104 +1,122 @@
0) {
- $numCharacters = 26 + 26 + 10; // a-z + A-Z + 0-9
- for ($i = 0; $i < $length; $i++)
- {
- try {
- $num = random_int(0, $numCharacters - 1);
- } catch (Exception $e) {
- $num = rand(0, $numCharacters - 1);
- }
-
- if($num < 26) $randomString .= chr(ord('a') + $num);
- else if($num - 26 < 26) $randomString .= chr(ord('A') + $num - 26);
- else $randomString .= chr(ord('0') + $num - 26 - 26);
- }
- }
-
- return $randomString;
- }
-
- function startsWith($haystack, $needle) {
- $length = strlen($needle);
- return (substr($haystack, 0, $length) === $needle);
- }
-
- function endsWith($haystack, $needle) {
- $length = strlen($needle);
- if ($length == 0)
- return true;
-
- return (substr($haystack, -$length) === $needle);
- }
-
- function intendCode($code, $escape=true) {
- $newCode = "";
- $first = true;
- $brackets = array();
- $intend = 0;
-
- foreach(explode("\n", $code) as $line) {
- if(!$first) $newCode .= "\n";
- if($escape) $line = htmlspecialchars($line);
- $line = trim($line);
-
- if(count($brackets) > 0 && startsWith($line, current($brackets))) {
- $intend = max(0, $intend - 2);
- array_pop($brackets);
+function generateRandomString($length): string {
+ $randomString = '';
+ if ($length > 0) {
+ $numCharacters = 26 + 26 + 10; // a-z + A-Z + 0-9
+ for ($i = 0; $i < $length; $i++) {
+ try {
+ $num = random_int(0, $numCharacters - 1);
+ } catch (Exception $e) {
+ $num = rand(0, $numCharacters - 1);
}
- $newCode .= str_repeat(" ", $intend);
- $newCode .= $line;
- $first = false;
+ if ($num < 26) $randomString .= chr(ord('a') + $num);
+ else if ($num - 26 < 26) $randomString .= chr(ord('A') + $num - 26);
+ else $randomString .= chr(ord('0') + $num - 26 - 26);
+ }
+ }
- if(endsWith($line, "{")) {
- $intend += 2;
- array_push($brackets, "}");
- } else if(endsWith($line, "(")) {
- $intend += 2;
- array_push($brackets, ")");
- }
+ return $randomString;
+}
+
+function startsWith($haystack, $needle) {
+ $length = strlen($needle);
+ return (substr($haystack, 0, $length) === $needle);
+}
+
+function endsWith($haystack, $needle) {
+ $length = strlen($needle);
+ if ($length == 0)
+ return true;
+
+ return (substr($haystack, -$length) === $needle);
+}
+
+function intendCode($code, $escape = true) {
+ $newCode = "";
+ $first = true;
+ $brackets = array();
+ $intend = 0;
+
+ foreach (explode("\n", $code) as $line) {
+ if (!$first) $newCode .= "\n";
+ if ($escape) $line = htmlspecialchars($line);
+ $line = trim($line);
+
+ if (count($brackets) > 0 && startsWith($line, current($brackets))) {
+ $intend = max(0, $intend - 2);
+ array_pop($brackets);
}
- return $newCode;
- }
+ $newCode .= str_repeat(" ", $intend);
+ $newCode .= $line;
+ $first = false;
- function replaceCssSelector($sel) {
- return preg_replace("~[.#<>]~", "_", preg_replace("~[:\-]~", "", $sel));
- }
-
- function getClassPath($class, $suffix=true) {
- $path = str_replace('\\', '/', $class);
- $path = array_values(array_filter(explode("/", $path)));
-
- if (strcasecmp($path[0], "api") === 0 && count($path) > 2 && strcasecmp($path[1], "Parameter") !== 0) {
- $path = "Api/" . $path[1] . "API";
- } else {
- $path = implode("/", $path);
+ if (endsWith($line, "{")) {
+ $intend += 2;
+ array_push($brackets, "}");
+ } else if (endsWith($line, "(")) {
+ $intend += 2;
+ array_push($brackets, ")");
}
-
- $suffix = ($suffix ? ".class" : "");
- return "core/$path$suffix.php";
}
- function createError($msg) {
- return json_encode(array("success" => false, "msg" => $msg));
+ return $newCode;
+}
+
+function replaceCssSelector($sel) {
+ return preg_replace("~[.#<>]~", "_", preg_replace("~[:\-]~", "", $sel));
+}
+
+function getClassPath($class, $suffix = true) {
+ $path = str_replace('\\', '/', $class);
+ $path = array_values(array_filter(explode("/", $path)));
+
+ if (strcasecmp($path[0], "api") === 0 && count($path) > 2 && strcasecmp($path[1], "Parameter") !== 0) {
+ $path = "Api/" . $path[1] . "API";
+ } else {
+ $path = implode("/", $path);
}
+
+ $suffix = ($suffix ? ".class" : "");
+ return "core/$path$suffix.php";
+}
+
+function createError($msg) {
+ return json_encode(array("success" => false, "msg" => $msg));
+}
+
+function serveStatic(string $webRoot, string $file): string {
+
+ $path = realpath($webRoot . "/" . $file);
+ if (!startsWith($path, $webRoot . "/")) {
+ http_response_code(406);
+ return "Access restricted, requested file outside web root: " . htmlspecialchars($path);
+ }
+
+ if (!file_exists($path) || !is_file($path) || !is_readable($path)) {
+ http_response_code(500);
+ return "Unable to read file: " . htmlspecialchars($path);
+ }
+
+ $pathInfo = pathinfo($file);
+
+ // maybe I will allow more later…
+ $allowedExtension = array("html", "htm");
+ $ext = $pathInfo["extension"] ?? "";
+ if (!in_array($ext, $allowedExtension)) {
+ http_response_code(406);
+ return "Access restricted: Extension '" . htmlspecialchars($ext) . "' not allowed.";
+ }
+
+ $mimeType = mime_content_type($file);
+ header("Content-Type: $mimeType");
+ return readfile($file);
+}
diff --git a/index.php b/index.php
index 7ead9e1..5136212 100644
--- a/index.php
+++ b/index.php
@@ -89,6 +89,7 @@ if(isset($_GET["api"]) && is_string($_GET["api"])) {
$success = $req->execute(array("request" => $documentName));
$response = "";
if (!$success) {
+ http_response_code(500);
$response = "Unable to find route: " . $req->getLastError();
} else {
$route = $req->getResult()["route"];
@@ -106,8 +107,8 @@ if(isset($_GET["api"]) && is_string($_GET["api"])) {
header("Location: $target");
break;
case "static":
- http_response_code(501);
- $response = "Not implemented yet.";
+ $currentDir = dirname(__FILE__);
+ $response = serveStatic($currentDir, $target);
break;
case "dynamic":
$view = $route["extra"] ?? "";
diff --git a/static/welcome.html b/static/welcome.html
new file mode 100644
index 0000000..4aeac1e
--- /dev/null
+++ b/static/welcome.html
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ Your Web-Base Installation is now ready to use!
++ You can now login into your Administrator Dashboard to adjust your settings + and add routes & pages. + You can add new documents and views by adding classes in the corresponding + directories and link to them, by creating rules in the Administrator Dashboard. +
+