Merge pull request #4 from sqlitecloud/#3-PHP-Admin-do-not-work-in-a-sub-directory

#3 - PHP Admin doesn't work in a sub-directory

Author: danielebriggi

.pre-commit-config.yaml

@@ -32,4 +32,5 @@ repos:
         - --runtime-set
         - ignore_warnings_on_exit 1
         - --ignore=^admin/.*$
+        files: \.php$
         require_serial: true

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
     "php.suggest.basic": false,
-    "phpserver.relativePath": "./admin",
     "intelephense.environment.phpVersion": "7.0.0",
     "intelephense.telemetry.enabled": false,
     "php-cs-fixer.executablePath": "${workspaceFolder}/vendor/bin/php-cs-fixer",

admin/common.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../bootstrap.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 use SQLiteCloud\SQLiteCloudClient;
 

admin/console.js

@@ -50,7 +50,7 @@ form.addEventListener('submit', function(event) {
 
 async function postData(data) {
 	try {
-		const response = await fetch ('/console_action.php', {
+		const response = await fetch ('./console_action.php', {
 				method: 'POST',
 				body: JSON.stringify(data)
 			}

admin/login.js

@@ -23,13 +23,13 @@ form.addEventListener('submit', function(event) {
 		  div.style.display = "block";
 		  return;
 	  }
-	  location.href = '/index.php';
+	  location.href = './index.php';
 	});
 });
 
 async function postData(data) {
 	try {
-		const response = await fetch ('/login_action.php', {
+		const response = await fetch ('./login_action.php', {
 				method: 'POST',
 				body: JSON.stringify(data)
 			}

admin/upload.js

@@ -46,7 +46,7 @@ function uploadStart(file, key, size, chunkSize) {
 	if (enableLogging) console.log("reqcount: " + reqcount);
 
 	var xhr = new XMLHttpRequest();
-	xhr.open('POST', '/upload_action.php', false);
+	xhr.open('POST', './upload_action.php', false);
 	xhr.setRequestHeader("Connection", "keep-alive");
 	xhr.setRequestHeader("Keep-Alive", "timeout=15, max=" + reqcount + "\"");
 	xhr.send(formdata);
@@ -63,13 +63,13 @@ function uploadEnd() {
 	formdata.append('action', 2);		// END
 
 	var xhr = new XMLHttpRequest();
-	xhr.open('POST', '/upload_action.php', false);
+	xhr.open('POST', './upload_action.php', false);
 	xhr.send(formdata);
 
 	progressSet(100);
 	displayMessage("Database succesfully uploaded.");
 
-	setTimeout(() => {location.href = '/databases.php';}, 500);
+	setTimeout(() => {location.href = './databases.php';}, 500);
 	return true;
 }
 
@@ -82,7 +82,7 @@ function uploadAbort() {
 	formdata.append('action', 666);		// ABORT
 
 	var xhr = new XMLHttpRequest();
-	xhr.open('POST', '/upload_action.php', false);
+	xhr.open('POST', './upload_action.php', false);
 	xhr.send(formdata);
 
 	return true;
@@ -129,7 +129,7 @@ function uploadLoop (file, start, end, size) {
 		formdata.append('encoding', 1);					// 1 -> base64, 2 -> binary
 
 		// post data
-		xhr.open('POST', '/upload_action.php', true);
+		xhr.open('POST', './upload_action.php', true);
 		xhr.send(formdata);
 	}
 	reader.readAsDataURL(chunk);

admin/upload_action.php

@@ -26,11 +26,6 @@ function do_upload_loop()
     } else {
         echo 0;
     }
-
-    // DEBUG CODE
-    // $fp = fopen('/Users/marco/Desktop/lidn.txt', ($start == 0) ? 'w' : 'a');
-    // fwrite($fp, $chunk);
-    // fclose($fp);
 }
 
 function do_upload_start()