FEATURE: Full site restore

content restore was already enabled, so the last step was completing
file restorartion if there was a file archive uploaded

now that this has been added, full site restore from backup archives now
works.

app/Http/Controllers/FrontController.php

@@ -59,7 +59,11 @@ class FrontController extends Controller
                 }
                 return view($template, $pageData);
             } else {
-                return response()->file('../public/index.html');
+                if (is_file('../public/index.html')) {
+                    return response()->file('../public/index.html');
+                } else {
+                    return redirect()->intended('dashboard/start');
+                }
             }
         } else {
             return view('back.init', ["status" => false, "title" => "Set Up"]);

app/Services/Upkeep/InitService.php

@@ -124,19 +124,38 @@ class InitService
 
     public function restore($request)
     {
-        $file = $request->file('backup-upload');
+        //content required, so check it
-        $file->move(env('FIPAMO_DIR') . '/', $file->getClientOriginalName());
+        $result         = [];
-        $zip     = new \ZipArchive();
+        $contentArchive = $request->file('backup-content-upload');
-        $result  = [];
+        $fileArchive    = $request->file('backup-files-upload');
-        $tempDir = env('FIPAMO_DIR') . '/_temp';
+        if ($contentArchive == null || $contentArchive == '') {
-        if ($zip->open(env('FIPAMO_DIR') . '/' . $file->getClientOriginalName()) === true) {
+            return $result = [
-            $folks = json_decode($zip->getFromName('config/folks.json'), true);
+                'type'    => 'requestLame',
+                'message' => 'Content Archive EMPTY',
+            ];
+        }
+        $result = $this->restoreContent($contentArchive, $request);
+        //file upload is optional, so if it's present, restore it
+        if ($fileArchive != null || $fileArchive != '') {
+            $result = $this->restoreFiles($fileArchive);
+        }
+        return $result;
+    }
+
+    private function restoreContent($contentUpload, $request)
+    {
+        $contentUpload->move(env('FIPAMO_DIR') . '/', $contentUpload->getClientOriginalName());
+        $contentZip = new \ZipArchive();
+        $result     = [];
+        $tempDir    = env('FIPAMO_DIR') . '/_temp';
+        if ($contentZip->open(env('FIPAMO_DIR') . '/' . $contentUpload->getClientOriginalName()) === true) {
+            $folks = json_decode($contentZip->getFromName('config/folks.json'), true);
             $found = find($folks, ['handle' => $request->restore_member_handle]);
             if ($found) {
                 if (password_verify($request->restore_member_pass, $found['password'])) {
                     //restore assets from previous site
                     if ($request->restore_former_url != '' || $request->restore_former_url != null) {
-                        $this->moveAssets($zip, $request->restore_former_url);
+                        $this->moveAssets($contentZip, $request->restore_former_url);
                     }
                     $newFolks = [];
                     if (!isset($found['secret'])) {
@@ -145,7 +164,7 @@ class InitService
                     array_push($newFolks, $found);
                     //make temp folder and dump file in there
                     mkdir($tempDir, 0755, true);
-                    $zip->extractTo($tempDir);
+                    $contentZip->extractTo($tempDir);
                     //load up old config file
                     $newConfig = json_decode(
                         file_get_contents($tempDir . '/config/settings.json'),
@@ -166,11 +185,11 @@ class InitService
                     rename($tempDir . '/content/pages/', env('PAGES_PATH'));
                     //clean up temp dir and zip file
                     $this->docs::deleteFolder($tempDir);
-                    $zip->close();
+                    $contentZip->close();
-                    unlink(env('FIPAMO_DIR') . '/' . $file->getClientOriginalName());
+                    unlink(env('FIPAMO_DIR') . '/' . $contentUpload->getClientOriginalName());
                     $result = [
                         'type'    => 'requestGood',
-                        'message' => 'Site Restored! Redirecting',
+                        'message' => 'Content Restored! Redirecting',
                     ];
                 } else {
                     $result = [
@@ -185,6 +204,36 @@ class InitService
                 ];
             }
         };
+    }
+
+    private function restoreFiles($filesUpload)
+    {
+        $filesUpload->move(env('FIPAMO_DIR') . '/', $filesUpload->getClientOriginalName());
+        $filesZip = new \ZipArchive();
+        $tempDir  = env('FIPAMO_DIR') . '/_file_temp';
+        $result   = [];
+        //images path for blog and user
+        $blogImagePath = '../public/assets/images/blog';
+        $userImagePath = '../public/assets/images/user';
+        if ($filesZip->open(env('FIPAMO_DIR') . '/' . $filesUpload->getClientOriginalName()) === true) {
+            $filesZip->extractTo($tempDir);
+            //clear and move dir if present
+            delete_directory($blogImagePath, false);
+            if (is_dir($tempDir . '/public/assets/images/blog')) {
+                rename($tempDir . '/public/assets/images/blog', $blogImagePath);
+            }
+            delete_directory($userImagePath, false);
+            if (is_dir($tempDir . '/public/assets/images/user')) {
+                rename($tempDir . '/public/assets/images/user', $userImagePath);
+            }
+            $result = [
+                'type'    => 'requestGood',
+                'message' => 'Files & Content Restored! Redirecting',
+            ];
+        }
+        delete_directory($tempDir);
+        $filesZip->close();
+        unlink(env('FIPAMO_DIR') . '/' . $filesUpload->getClientOriginalName());
         return $result;
     }
 

content/init/settings-template.json

@@ -9,7 +9,7 @@
     "theme": "fipamo-default-v2",
     "display_limit": 5,
     "last_content_backup": null,
-    "last_file_backup": null,
+    "last_files_backup": null,
     "externalAPI": "false",
     "dynamicRender": "false"
   },

resources/views/forms/init-restore.blade.php

@@ -4,12 +4,16 @@
     </a>
 </div>
 <form id="init-restore" method="POST">
-    <label class="inline">previous</label><input type="text" class="inline" name="restore_former_url" id="restore_former_url" placeholder="previous site url"/>
     <label class="inline">handle</label><input type="text" class="inline" name="restore_member_handle" id="restore_member_handle" placeholder="handle"/>
     <label class="inline">password</label><input type="password"class="inline"  name="restore_member_pass" id="restore_member_pass" placeholder="password"/>
+    <label class="inline">previous</label><input type="text" class="inline" name="restore_former_url" id="restore_former_url" placeholder="previous site url"/>
     <div>
-        <label>Grab your backup zip</label>
+        <label>Grab your content backup</label>
-        <input id="backup-upload" type="file" name="backup-upload" placeholder="Backup Zip"/>
+        <input id="backup-content-upload" type="file" name="backup-content-upload" placeholder="Content Archive"/>
+    </div>
+    <div>
+        <label>Grab your file backup</label>
+        <input id="backup-files-upload" type="file" name="backup-files-upload" placeholder="File Archive"/>
     </div>
     <br/><br/>
     <button id="blog-restore" data-action='blog-restore' type='submit'>RESTORE</button>