Merge pull request #74 from LaswitchTech/dev

General: Version bumped to v0.0.74

Author: LouisOuellet

Helper/CoreHelper.php

@@ -622,13 +622,13 @@ public function unpack(string $source, string $destination): bool
     public function delete(string $directory): bool
     {
         // If it doesn't exist, treat it as an error or success depending on your preference
-        if (!file_exists($directory)) {
+        if (!file_exists($directory) && !is_link($directory)) {
             // Option 1: Treat as an error
             return false;
         }
 
         // If it's a file or symlink, just unlink it
-        if (!is_dir($directory)) {
+        if (!is_dir($directory) || is_link($directory)) {
             if (!@unlink($directory)) {
                 return false;
             }
@@ -641,16 +641,20 @@ public function delete(string $directory): bool
             return false;
         }
 
+        // Loop through each item in the directory
         foreach ($items as $item) {
+
             // Skip pointers
-            if ($item === '.' || $item === '..') {
+            if (in_array($item,['.','..'])) {
                 continue;
             }
 
+            // Full path to the item
             $path = $directory . DIRECTORY_SEPARATOR . $item;
 
             // Recursively call delete on each item
             if (!$this->delete($path)) {
+
                 // If any item fails to be deleted, return false
                 return false;
             }

VERSION

@@ -1 +1 @@
-v0.0.73
+v0.0.74

src/Builder.php

@@ -297,6 +297,23 @@ public function js()
         $html .= '    const ADMIN_MODE = ' . ($this->Auth->isAuthorized('Administrator', 1) ? 'true' : 'false') . ';' . PHP_EOL;
         $html .= '</script>' . PHP_EOL;
 
+        // Load Core JS
+        $path = $this->Config->root() . '/vendor/laswitchtech/core/assets/js';
+        if(is_file($path.'.cfg')){
+            if(is_dir($path)){
+                $assets = json_decode(file_get_contents($path.'.cfg') ?? '[]',true);
+                foreach($assets as $file){
+                    if(is_file($path.'/'.$file)){
+                        if(str_ends_with($file, '.mjs')){
+                            $html .= '<script type="module" src="/assets/core/js/'.trim($file,'/').'"></script>' . PHP_EOL;
+                        } else {
+                            $html .= '<script src="/assets/core/js/'.trim($file,'/').'"></script>' . PHP_EOL;
+                        }
+                    }
+                }
+            }
+        }
+
         // Load Themes JS
         $path = $this->Config->root() . '/lib/themes';
         if(is_dir($path)){
@@ -319,23 +336,6 @@ public function js()
             }
         }
 
-        // Load Core JS
-        $path = $this->Config->root() . '/vendor/laswitchtech/core/assets/js';
-        if(is_file($path.'.cfg')){
-            if(is_dir($path)){
-                $assets = json_decode(file_get_contents($path.'.cfg') ?? '[]',true);
-                foreach($assets as $file){
-                    if(is_file($path.'/'.$file)){
-                        if(str_ends_with($file, '.mjs')){
-                            $html .= '<script type="module" src="/assets/core/js/'.trim($file,'/').'"></script>' . PHP_EOL;
-                        } else {
-                            $html .= '<script src="/assets/core/js/'.trim($file,'/').'"></script>' . PHP_EOL;
-                        }
-                    }
-                }
-            }
-        }
-
         // Load Themes Assets JS
         $path = $this->Config->root() . '/lib/themes';
         if(is_dir($path)){