fix(admin-panels): include paths

sqlitecloud · Jul 29, 2024 · 33b8984 · 33b8984
1 parent d70e028
commit 33b8984
Show file tree

Hide file tree

Showing 21 changed files with 55 additions and 52 deletions.
diff --git a/admin/auth.php b/admin/auth.php
@@ -3,11 +3,14 @@
 session_set_cookie_params(0);
 session_start();
 
+echo var_dump($_SESSION);
+
 // check if there is no valid session or if session is expired
 $session_max_time = 60 * 600; // 60 minutes
 if ((!isset($_SESSION['username'])) || (isset($_SESSION['start']) && (time() - $_SESSION['start'] >= $session_max_time))) {
     session_unset();
     session_destroy();
-    header("Location: login.php");
+    echo var_dump($_SESSION);
+    //header("Location: login.php");
     exit();
 }
diff --git a/admin/backups.php b/admin/backups.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -12,4 +12,4 @@
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/commands.php b/admin/commands.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -12,4 +12,4 @@
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/connections.php b/admin/connections.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -12,4 +12,4 @@
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/console.php b/admin/console.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -34,4 +34,4 @@
     global $jsinclude;
 $jsinclude = "console.js";
 ?>
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/console_action.php b/admin/console_action.php
@@ -2,8 +2,8 @@
 
 use SQLiteCloud\SQLiteCloudRowset;
 
-include_once('auth.php');
-include_once('common.php');
+include_once(__DIR__ . '/auth.php');
+include_once(__DIR__ . '/common.php');
 
 $data = json_decode(file_get_contents('php://input'), true);
 $database = $data["database"];

diff --git a/admin/databases.php b/admin/databases.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -46,4 +46,4 @@ function on_column($value, $row, $col)
     global $jsinclude;
 $jsinclude = "upload.js";
 ?>
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/download.php b/admin/download.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once('common.php');
+include_once(__DIR__ . '/common.php');
 $dbName = $_GET['db'];
 $maxRead = 1 * 1024 * 1024; // 1MB
 $dbSize = 0;

diff --git a/admin/include/footer.php b/admin/include/footer.php
@@ -10,16 +10,16 @@
 	  <script src="dashboard.js"></script>
 	  <?php
             global $jscript;
-	  global $jsinclude;
+      global $jsinclude;
 
-	  if (isset($jscript)) {
-	      echo '<script>' . $jscript . '</script>';
-	  }
-	  if (isset($jsinclude)) {
-	      echo '<script src="' . $jsinclude . '"></script>';
-	  }
-	  echo "\n";
-	  ?>
+      if (isset($jscript)) {
+          echo '<script>' . $jscript . '</script>';
+      }
+      if (isset($jsinclude)) {
+          echo '<script src="' . $jsinclude . '"></script>';
+      }
+      echo "\n";
+      ?>
   </body>
 </html>
 

diff --git a/admin/include/header.php b/admin/include/header.php
@@ -1,6 +1,6 @@
 <?php
-include_once('auth.php');
-include_once('common.php');
+include_once(__DIR__ . '/../auth.php');
+include_once(__DIR__ . '/../common.php');
 $page = current_page();
 ?>
 

diff --git a/admin/index.php b/admin/index.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -21,4 +21,4 @@
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/latency.php b/admin/latency.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -12,4 +12,4 @@
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/login.php b/admin/login.php
@@ -1,4 +1,4 @@
-<?php include_once('common.php'); ?>
+<?php include_once(__DIR__ . '/common.php'); ?>
 <!doctype html>
 <html lang="en">
   <head>

diff --git a/admin/login_action.php b/admin/login_action.php
@@ -6,21 +6,21 @@
 $password = $data["password"];
 $port = $data["port"];
 
-include_once('common.php');
+include_once(__DIR__ . '/common.php');
 $rc = do_real_connect($hostname, $port, $username, $password);
 
 $r = null;
 if ($rc === true) {
     // successfully connected
-    $r = array('result' => 1);
+    $r = ['result' => 1];
     $_SESSION['start'] = time();
     $_SESSION['port'] = $port;
     $_SESSION['hostname'] = $hostname;
     $_SESSION['username'] = $username;
     $_SESSION['password'] = $password;
 } else {
     // error
-    $r = array('result' => 0, 'msg' => $rc);
+    $r = ['result' => 0, 'msg' => $rc];
 }
 
 echo json_encode($r);
diff --git a/admin/logs.php b/admin/logs.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -43,4 +43,4 @@ function on_column($value, $row, $col)
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/plugins.php b/admin/plugins.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -12,4 +12,4 @@
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/settings.php b/admin/settings.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -12,4 +12,4 @@
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/stats.php b/admin/stats.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
     <?php $rs = query_liststats(); ?>
@@ -34,4 +34,4 @@
 $jscript = $script1 . "\n" . $script2 . "\n" . $script3 . "\n" . $script4 . "\n";
 ?>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/admin/upload_action.php b/admin/upload_action.php
@@ -1,7 +1,7 @@
 <?php
 
-include_once('auth.php');
-include_once('common.php');
+include_once(__DIR__ . '/auth.php');
+include_once(__DIR__ . '/common.php');
 
 function do_upload_loop()
 {

diff --git a/admin/users.php b/admin/users.php
@@ -1,4 +1,4 @@
-<?php include_once('include/header.php'); ?>
+<?php include_once(__DIR__ . '/include/header.php'); ?>
 
     <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
 
@@ -12,4 +12,4 @@
 
     </main>
 
-<?php include_once('include/footer.php'); ?>
+<?php include_once(__DIR__ . '/include/footer.php'); ?>
diff --git a/vercel.json b/vercel.json
@@ -1,13 +1,13 @@
 {
+  "version": 2,
   "builds": [
     {
       "src": "admin/**/*.php",
-      "use": "[email protected]",
-      "config": {
-        "includeFiles": [
-          "admin/**/*"
-        ]
-      }
+      "use": "[email protected]"
+    },
+    {
+      "src": "admin/**/*",
+      "use": "@vercel/static"
     }
   ],
   "routes": [
@@ -16,4 +16,4 @@
       "dest": "/admin/$1"
     }
   ]
-}
+}