Merge ../../BizApps/BusinessAppTemplate

app.php

@@ -1,5 +1,4 @@
 <?php
-
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -14,7 +13,7 @@ if ($_SESSION['loggedin'] != true) {
 require_once __DIR__ . "/pages.php";
 
 $pageid = "home";
-if (isset($_GET['page']) && !is_empty($_GET['page'])) {
+if (!empty($_GET['page'])) {
     $pg = strtolower($_GET['page']);
     $pg = preg_replace('/[^0-9a-z_]/', "", $pg);
     if (array_key_exists($pg, PAGES) && file_exists(__DIR__ . "/pages/" . $pg . ".php")) {
@@ -66,28 +65,35 @@ header("Link: <static/js/bootstrap.bundle.min.js>; rel=preload; as=script", fals
 
         <?php
 // Alert messages
-        if (isset($_GET['msg']) && !is_empty($_GET['msg']) && array_key_exists($_GET['msg'], MESSAGES)) {
+        if (!empty($_GET['msg'])) {
-            // optional string generation argument
+            if (array_key_exists($_GET['msg'], MESSAGES)) {
-            if (!isset($_GET['arg']) || is_empty($_GET['arg'])) {
+                // optional string generation argument
-                $alertmsg = $Strings->get(MESSAGES[$_GET['msg']]['string'], false);
+                if (empty($_GET['arg'])) {
+                    $alertmsg = $Strings->get(MESSAGES[$_GET['msg']]['string'], false);
+                } else {
+                    $alertmsg = $Strings->build(MESSAGES[$_GET['msg']]['string'], ["arg" => strip_tags($_GET['arg'])], false);
+                }
+                $alerttype = MESSAGES[$_GET['msg']]['type'];
+                $alerticon = "square-o";
+                switch (MESSAGES[$_GET['msg']]['type']) {
+                    case "danger":
+                        $alerticon = "times";
+                        break;
+                    case "warning":
+                        $alerticon = "exclamation-triangle";
+                        break;
+                    case "info":
+                        $alerticon = "info-circle";
+                        break;
+                    case "success":
+                        $alerticon = "check";
+                        break;
+                }
             } else {
-                $alertmsg = $Strings->build(MESSAGES[$_GET['msg']]['string'], ["arg" => strip_tags($_GET['arg'])], false);
+                // We don't have a message for this, so just assume an error and escape stuff.
-            }
+                $alertmsg = htmlentities($Strings->get($_GET['msg'], false));
-            $alerttype = MESSAGES[$_GET['msg']]['type'];
+                $alerticon = "times";
-            $alerticon = "square-o";
+                $alerttype = "danger";
-            switch (MESSAGES[$_GET['msg']]['type']) {
-                case "danger":
-                    $alerticon = "times";
-                    break;
-                case "warning":
-                    $alerticon = "exclamation-triangle";
-                    break;
-                case "info":
-                    $alerticon = "info-circle";
-                    break;
-                case "success":
-                    $alerticon = "check";
-                    break;
             }
             echo <<<END
             <div class="row justify-content-center" id="msg-alert-box">

index.php

@@ -47,7 +47,7 @@ if (Login::checkLoginServer()) {
                         $username_ok = true;
                         break;
                     default:
-                        if (!is_empty($error)) {
+                        if (!empty($error)) {
                             $alert = $error;
                         } else {
                             $alert = $Strings->get("login error", false);

lib/Strings.lib.php

@@ -21,6 +21,10 @@ class Strings {
 
         $this->load("en");
 
+        if ($language == "en") {
+            return;
+        }
+
         if (file_exists(__DIR__ . "/../langs/$language/")) {
             $this->language = $language;
             $this->load($language);

mobile/index.php

@@ -75,7 +75,7 @@ if (mobile_enabled() !== TRUE) {
 }
 
 // Make sure we have a username and access key
-if (is_empty($VARS['username']) || is_empty($VARS['key'])) {
+if (empty($VARS['username']) || empty($VARS['key'])) {
     http_response_code(401);
     die(json_encode(["status" => "ERROR", "msg" => "Missing username and/or access key."]));
 }

required.php

@@ -133,6 +133,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 }
 
 /**
+ * @deprecated
  * Checks if a string or whatever is empty.
  * @param $str The thingy to check
  * @return boolean True if it's empty or whatever.