Move logic to preparing step

Author: JulianPrieber

resources/views/components/finishing.blade.php

@@ -7,7 +7,6 @@
 use Illuminate\Support\Facades\File;
 use Database\Seeders\ButtonSeeder;
 use App\Models\Page;
-use App\Models\Link;
 
 set_time_limit(0);
 
@@ -430,66 +429,4 @@
     session(['update_error' => $e->getMessage()]);
 }
 
-try {
-
-    $links = Link::where('button_id', 94)->get()->groupBy('user_id');
-
-    foreach ($links as $userId => $userLinks) {
-        $hasXTwitter = $userLinks->contains('title', 'x-twitter');
-
-        foreach ($userLinks as $link) {
-            if ($link->title == 'twitter') {
-                if ($hasXTwitter) {
-                    $link->delete();
-                } else {
-                    $link->title = 'x-twitter';
-                    $link->save();
-                    $hasXTwitter = true;
-                }
-            }
-        }
-    }
-
-} catch (exception $e) {
-session(['update_error' => $e->getMessage()]);
-}
-
-try {
-
-    $themesPath = base_path('themes');
-    $regex = '/[0-9.-]/';
-    $files = scandir($themesPath);
-    $files = array_diff($files, array('.', '..'));
-
-    $themeError = 'The update was successful. Your theme-filesystem was detected as corrupted and has been reset.';
-
-    foreach ($files as $file) {
-
-        $basename = basename($file);
-        $filePath = $themesPath . '/' . $basename;
-
-        if (!is_dir($filePath)) {
-
-            File::deleteDirectory($themesPath);
-            mkdir($themesPath);
-            session(['update_error' => $themeError]);
-            break;
-
-        }
-
-        if (preg_match($regex, $basename)) {
-
-            $newBasename = preg_replace($regex, '', $basename);
-            $newPath = $themesPath . '/' . $newBasename;
-            File::copyDirectory($filePath, $newPath);
-            File::deleteDirectory($filePath);
-
-        }
-
-    }
-
-} catch (exception $e) {
-    session(['update_error' => $e->getMessage()]);
-}
-
-?>
+?>

resources/views/components/pre-update.blade.php

@@ -80,4 +80,66 @@
         $link->save();
     }
 }
+}
+
+try {
+
+    $links = Link::where('button_id', 94)->get()->groupBy('user_id');
+
+    foreach ($links as $userId => $userLinks) {
+        $hasXTwitter = $userLinks->contains('title', 'x-twitter');
+
+        foreach ($userLinks as $link) {
+            if ($link->title == 'twitter') {
+                if ($hasXTwitter) {
+                    $link->delete();
+                } else {
+                    $link->title = 'x-twitter';
+                    $link->save();
+                    $hasXTwitter = true;
+                }
+            }
+        }
+    }
+
+} catch (exception $e) {
+    session(['update_error' => $e->getMessage()]);
+}
+
+try {
+
+    $themesPath = base_path('themes');
+    $regex = '/[0-9.-]/';
+    $files = scandir($themesPath);
+    $files = array_diff($files, array('.', '..'));
+
+    $themeError = 'Your theme-filesystem was detected as corrupted and has been reset. Rerun the updater to complete the update.';
+
+    foreach ($files as $file) {
+
+        $basename = basename($file);
+        $filePath = $themesPath . '/' . $basename;
+
+        if (!is_dir($filePath)) {
+
+            File::deleteDirectory($themesPath);
+            mkdir($themesPath);
+            session(['update_error' => $themeError]);
+            break;
+
+        }
+
+        if (preg_match($regex, $basename)) {
+
+            $newBasename = preg_replace($regex, '', $basename);
+            $newPath = $themesPath . '/' . $newBasename;
+            File::copyDirectory($filePath, $newPath);
+            File::deleteDirectory($filePath);
+
+        }
+
+    }
+
+} catch (exception $e) {
+    session(['update_error' => $e->getMessage()]);
 }