Readme, some fixes, rel noopener for _blank links

core/Elements/Document.class.php

@@ -27,12 +27,17 @@ abstract class Document {
 
   public function getView() : ?View {
 
-    $file = getClassPath($this->activeView);
-    if(!file_exists($file) || !is_subclass_of($this->activeView, View::class)) {
+    $view = parseClass($this->activeView);
+    $file = getClassPath($view);
+    if(!file_exists($file) || !is_subclass_of($view, View::class)) {
       return null;
     }
 
-    return new $this->activeView($this);
+    return new $view($this);
+  }
+
+  public function getRequestedView(): string {
+    return $this->activeView;
   }
 
   function getCode(): string {

core/Elements/View.class.php

@@ -89,7 +89,7 @@ abstract class View extends StaticView {
 
   protected function createExternalLink($link, $title=null): string {
     if(is_null($title)) $title=$link;
-    return "<a href=\"$link\" target=\"_blank\" class=\"external\">$title</a>";
+    return "<a href=\"$link\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"external\">$title</a>";
   }
 
   protected function createIcon($icon, $type = "fas", $classes = ""): string {

core/Objects/ApiObject.class.php

@@ -4,7 +4,7 @@ namespace Objects;
 
 abstract class ApiObject implements \JsonSerializable {
 
-  public abstract function jsonSerialize();
+  public abstract function jsonSerialize(): array;
 
   public function __toString() { return json_encode($this); }
 

core/Objects/Language.class.php

@@ -31,7 +31,10 @@ namespace Objects {
     public function getEntries() { return $this->entries; }
     public function getModules() { return $this->modules; }
 
-    public function loadModule(LanguageModule $module) {
+      /**
+       * @param $module LanguageModule class or object
+       */
+    public function loadModule($module) {
       if(!is_object($module))
         $module = new $module;
 
@@ -40,7 +43,7 @@ namespace Objects {
       $this->modules[] = $module;
     }
 
-    public function translate($key) {
+    public function translate(string $key): string {
       if(isset($this->entries[$key]))
         return $this->entries[$key];
 
@@ -51,7 +54,7 @@ namespace Objects {
       setcookie('lang', $this->langCode, 0, "/", "");
     }
 
-    public function jsonSerialize() {
+    public function jsonSerialize(): array {
       return array(
         'uid' => $this->languageId,
         'code' => $this->langCode,

core/Objects/Session.class.php

@@ -28,7 +28,7 @@ class Session extends ApiObject {
     $this->csrfToken = $csrfToken ?? generateRandomString(16);
   }
 
-  public static function create($user, $stayLoggedIn) {
+  public static function create($user, $stayLoggedIn): ?Session {
     $session = new Session($user, null, null);
     if($session->insert($stayLoggedIn)) {
       return $session;
@@ -69,15 +69,15 @@ class Session extends ApiObject {
     setcookie('session', $sessionCookie, $this->getExpiresTime(), "/", "", $secure);
   }
 
-  public function getExpiresTime() {
+  public function getExpiresTime(): int {
     return ($this->stayLoggedIn == 0 ? 0 : $this->expires);
   }
 
-  public function getExpiresSeconds() {
+  public function getExpiresSeconds(): int {
     return ($this->stayLoggedIn == 0 ? -1 : $this->expires - time());
   }
 
-  public function jsonSerialize() {
+  public function jsonSerialize(): array {
     return array(
       'uid' => $this->sessionId,
       'user_id' => $this->user->getId(),
@@ -89,7 +89,7 @@ class Session extends ApiObject {
     );
   }
 
-  public function insert($stayLoggedIn) {
+  public function insert($stayLoggedIn): bool {
     $this->updateMetaData();
     $sql = $this->user->getSQL();
 

core/core.php

@@ -1,8 +1,8 @@
 <?php
 
-define("WEBBASE_VERSION", "1.2.2");
+define("WEBBASE_VERSION", "1.2.3");
 
-function getProtocol() {
+function getProtocol(): string {
   return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? "https" : "http";
 }
 
@@ -26,12 +26,12 @@ function generateRandomString($length): string {
   return $randomString;
 }
 
-function startsWith($haystack, $needle) {
+function startsWith($haystack, $needle): bool {
   $length = strlen($needle);
   return (substr($haystack, 0, $length) === $needle);
 }
 
-function endsWith($haystack, $needle) {
+function endsWith($haystack, $needle): bool {
   $length = strlen($needle);
   if ($length == 0)
     return true;
@@ -97,7 +97,7 @@ function createError($msg) {
   return json_encode(array("success" => false, "msg" => $msg));
 }
 
-function serveStatic(string $webRoot, string $file) {
+function serveStatic(string $webRoot, string $file): string {
 
   $path = realpath($webRoot . "/" . $file);
   if (!startsWith($path, $webRoot . "/")) {