Upload 2 files

save.php

@@ -78,12 +78,24 @@ function sanitizeFileName($file, $allowedExtension = 'html') {
 	//sanitize, remove double dot .. and remove get parameters if any
 	$file = preg_replace('@\?.*$@' , '', preg_replace('@\.{2,}@' , '', preg_replace('@[^\/\\a-zA-Z0-9\-\._]@', '', $file)));
 	
-	if ($file) {
-		$file = __DIR__ . DIRECTORY_SEPARATOR . $file;
-	} else {
+	if (!$file) {
 		return '';
 	}
 	
+	// For loadFile action, return the sanitized filename as-is for storage manager
+	// Only add __DIR__ for local file operations
+	$action = $_GET['action'] ?? $_POST['action'] ?? '';
+	if ($action === 'loadFile' || $action === 'listFiles') {
+		// For external storage operations, just sanitize and add extension
+		if ($allowedExtension) {
+			$file = preg_replace('/\.[^.]+$/', '', $file) . ".$allowedExtension";
+		}
+		return $file;
+	}
+	
+	// For local file operations, add the full path
+	$file = __DIR__ . DIRECTORY_SEPARATOR . $file;
+	
 	//allow only .html extension
 	if ($allowedExtension) {
 		$file = preg_replace('/\.[^.]+$/', '', $file) . ".$allowedExtension";
@@ -180,20 +192,49 @@ if ($action) {
 		case 'loadFile':
 			// Load a specific file for current user
 			$filename = sanitizeFileName($_GET['file'] ?? '');
+			error_log("VvvebJs LoadFile Debug - Original filename: " . ($_GET['file'] ?? ''));
+			error_log("VvvebJs LoadFile Debug - Sanitized filename: " . $filename);
+			
 			if ($filename) {
-				$content = $storageManager->getFile($filename);
-				if ($content !== false) {
-					header('Content-Type: application/json');
-					echo json_encode([
-						'success' => true,
-						'content' => $content,
-						'filename' => $filename
-					]);
-				} else {
+				try {
+					$content = $storageManager->getFile($filename);
+					error_log("VvvebJs LoadFile Debug - Content length: " . ($content !== false ? strlen($content) : 'false'));
+					
+					if ($content !== false) {
+						header('Content-Type: application/json');
+						echo json_encode([
+							'success' => true,
+							'content' => $content,
+							'filename' => $filename
+						]);
+					} else {
+						// Enhanced error information
+						$github = StorageConfig::getGitHubConfig();
+						$debugInfo = [
+							'filename' => $filename,
+							'user' => $storageManager->getCurrentUser(),
+							'userPath' => $storageManager->getUserPath(),
+							'fullPath' => $github['path'] . $storageManager->getUserPath() . $filename,
+							'hasToken' => !empty($github['token']),
+							'repo' => $github['owner'] . '/' . $github['repo']
+						];
+						
+						error_log("VvvebJs LoadFile Error - Debug info: " . json_encode($debugInfo));
+						
+						header('Content-Type: application/json');
+						echo json_encode([
+							'success' => false,
+							'message' => 'File not found or access denied',
+							'debug' => $debugInfo
+						]);
+					}
+				} catch (Exception $e) {
+					error_log("VvvebJs LoadFile Exception: " . $e->getMessage());
 					header('Content-Type: application/json');
 					echo json_encode([
 						'success' => false,
-						'message' => 'File not found or access denied'
+						'message' => 'Error loading file: ' . $e->getMessage(),
+						'filename' => $filename
 					]);
 				}
 			} else {

storage.php

@@ -300,6 +300,8 @@ class GitHubStorage {
         $userDir = $this->config['path'] . $this->userPath;
         $url = "https://api.github.com/repos/{$this->config['owner']}/{$this->config['repo']}/contents/{$userDir}";
         
+        error_log("GitHub listUserFiles: Requesting $url");
+        
         $result = $this->makeRequest($url, 'GET');
         if ($result && is_array($result)) {
             $files = [];
@@ -316,9 +318,13 @@ class GitHubStorage {
                     ];
                 }
             }
+            error_log("GitHub listUserFiles: Found " . count($files) . " files");
             return $files;
+        } else {
+            error_log("GitHub listUserFiles: No files found or directory doesn't exist");
+            // If directory doesn't exist, return empty array instead of error
+            return [];
         }
-        return [];
     }
     
     public function delete($filename) {