19 Jun 2023

1) Removed debug option from fetch calls in PAGE-cb.js. Will always console.error() by default.
2) Slight changes to installer - Will not start if mod_rewrite is not enabled.

Author: code-boxx

assets/PAGE-cb.js

@@ -76,7 +76,7 @@ var cb = {
 
   // (B4) CHANGE "LOCAL" PAGE
   //  num : int, page number (1 to 5)
-  page : num => { for (let i in cb.hPages) {
+  page : num => { num--; for (let i in cb.hPages) {
     if (i==num) { cb.hPages[i].classList.remove("d-none"); }
     else { cb.hPages[i].classList.add("d-none"); }
   }},
@@ -88,15 +88,13 @@ var cb = {
   //  url : string, target URL
   //  data : optional object, data to send
   //  loading : boolean, show "now loading" screen? default true.
-  //  debug : boolean, debug mode. default false.
   //  onpass : function, run this function on server response
   //  onerr : optional function, run this function on error
   ajax : opt => {
     // (C1) CHECKS & DEFAULTS
     if (opt.url === undefined) { cb.modal("AJAX ERROR", "Target URL is not set!"); return false; }
     if (opt.onpass === undefined) { cb.modal("AJAX ERROR", "Function to call on onpass is not set!"); return false; }
     if (opt.loading === undefined) { opt.loading = true; }
-    if (opt.debug === undefined) { opt.debug = false; }
 
     // (C2) DATA TO SEND
     var data = new FormData();
@@ -105,19 +103,16 @@ var cb = {
     // (C3) AJAX REQUEST
     if (opt.loading) { cb.loading(true); }
     fetch(opt.url, { method:"POST", credentials:"include", body:data })
-    .then(res => {
-      if (opt.debug) { console.log(res); }
+    .then(async res => {
       if (res.status==200) { return res.text(); }
       else {
+        console.error(await res.text());
         cb.modal("SERVER ERROR", "Bad server response - " + res.status);
-        console.error(res.status, res);
         if (opt.onerr) { opt.onerr(); }
+        throw new Error("Bad server response");
       }
     })
-    .then(txt => {
-      if (opt.debug) { console.log(txt); }
-      opt.onpass(txt);
-    })
+    .then(txt => opt.onpass(txt))
     .catch(err => {
       cb.modal("AJAX ERROR", err.message);
       console.error(err);
@@ -130,10 +125,9 @@ var cb = {
 
   // (D) AJAX API CALL
   //  mod : string, module to call
-  //  req : string, request
+  //  act : string, action to perform
   //  data : object, data to send
   //  loading : boolean, show loading screen?
-  //  debug : boolean, optional debug mode. default false.
   //  passmsg : boolean false to supress toast "success message".
   //            boolean true to use server response message.
   //            string to override "OK" message.
@@ -144,34 +138,33 @@ var cb = {
   api : opt => {
     // (D1) INIT OPTIONS
     var options = {};
-    options.url = `${cbhost.api}${opt.mod}/${opt.req}/`;
+    options.url = `${cbhost.api}${opt.mod}/${opt.act}/`;
     if (opt.data) { options.data = opt.data; }
     if (opt.loading!=undefined) { options.loading = opt.loading; }
-    if (opt.debug!=undefined) { options.debug = opt.debug; }
     if (opt.onerr) { options.onerr = opt.onerr; }
     if (opt.passmsg === undefined) { opt.passmsg = "OK"; }
     if (opt.nofail === undefined) { opt.nofail = false; }
 
     // (D2) ON AJAX LOAD
     options.onpass = res => {
       // (D2-1) PARSE RESULTS
-      try { var res = JSON.parse(res); }
+      try { var r = JSON.parse(res); }
       catch (err) {
         console.error(res);
         cb.modal("AJAX ERROR", "Failed to parse JSON data.");
         return false;
       }
 
       // (D2-2) RESULTS FEEBACK
-      if (res.status=="E") { location.href = cbhost.base + "login/"; }
-      else if (res.status) {
+      if (r.status=="E") { location.href = cbhost.base + "login/"; }
+      else if (r.status) {
         if (opt.passmsg !== false) {
-          cb.toast(1, "Success", opt.passmsg===true ? res.message : opt.passmsg);
+          cb.toast(1, "Success", opt.passmsg===true ? r.message : opt.passmsg);
         }
-        if (opt.onpass) { opt.onpass(res); }
+        if (opt.onpass) { opt.onpass(r); }
       } else {
-        if (!opt.nofail) { cb.modal("ERROR", res.message); }
-        if (opt.onfail) { opt.onfail(res.message); }
+        if (!opt.nofail) { cb.modal("ERROR", r.message); }
+        if (opt.onfail) { opt.onfail(r.message); }
       }
     };
 
@@ -184,23 +177,21 @@ var cb = {
   //  target : string, ID of target HTML element
   //  data : object, data to send
   //  loading : boolean, show loading screen? Default false.
-  //  debug : boolean, optional debug mode. default false.
   //  onload : optional function, do this on loaded
   //  onerr : optional function, do this on ajax error
   load : opt => {
     // (E1) INIT OPTIONS
     var options = {};
     options.url = `${cbhost.base}${opt.page}/`;
     if (opt.loading!=undefined) { options.loading = opt.loading; }
-    if (opt.debug!=undefined) { options.debug = opt.debug; }
     if (opt.onerr) { options.onerr = opt.onerr; }
     if (opt.data) {
       opt.data["ajax"] = 1;
       options.data = opt.data;
     } else { options.data = { "ajax" : 1 }; }
 
     // (E2) ON AJAX LOAD
-    options.onpass = (res) => {
+    options.onpass = res => {
       if (res=="E") { location.href = cbhost.base + "login/"; }
       else {
         document.getElementById(opt.target).innerHTML = res;
@@ -214,7 +205,7 @@ var cb = {
 
   // (F) SIGN OFF
   bye : () => cb.modal("Please Confirm", "Sign off?", () => cb.api({
-    mod : "session", req : "logout", passmsg : false,
+    mod : "session", act : "logout", passmsg : false,
     onpass : () => location.href = cbhost.base + "login/"
   })),
 

lib/CORE-Install.php

@@ -70,13 +70,16 @@ function import ($pdo, $from=0) {
     exit("At least PHP ".I_MIN_PHP." is required. You are using ".PHP_VERSION);
   }
 
-  // (B2-2) MYSQL PDO
+  // (B2-2) MOD REWRITE
+  if (I_APACHE && !I_REWRITE) { exit("Please enable Apache MOD_REWRITE"); }
+
+  // (B2-3) MYSQL PDO
   if (I_PDO===false) { exit("PDO MYSQL extension is not enabled."); }
 
-  // (B2-3) OPENSSL
+  // (B2-4) OPENSSL
   if (I_PUSH && I_OPENSSL===false) { exit("OPENSSL extension is not enabled."); }
 
-  // (B2-4) FILES & FOLDERS - READ/WRITE PERMISSIONS
+  // (B2-5) FILES & FOLDERS - READ/WRITE PERMISSIONS
   foreach (I_ALL as $p) {
     if (!file_exists($p)) { exit("$p does not exist!"); }
     if (!is_readable($p)) { exit("Please give PHP read permission to $p"); }
@@ -265,10 +268,11 @@ function import ($pdo, $from=0) {
     <?php if (I_APACHE === false || I_REWRITE === false) { ?>
     <!-- (DD8) WARNINGS -->
     <div class="danger">
-      The installer cannot verify if you are running Apache Web Server, or if <code>MOD_REWRITE</code> is enabled.
-      You can still try to proceed if you want.
-      If you are not running Apache, you need to create your own "translated" <code>.htaccess</code> file.
-      See <code>lib/LIB-Route.php &gt; function init()</code>.
+      If you are running Apache Web Server - Please enable <code>MOD_REWRITE</code>.
+    </div>
+    <div class="danger">
+      If you are not running Apache Web Server, you can still try to proceed.
+      After the installation, "translate" your own <code>.htaccess</code> file.
     </div>
     <?php } ?>