LinkStackOrg / LinkStack

app/Http/Controllers/Auth/RegisteredUserController.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
 
         $name = $request->input('name');
 
-        if(env('MANUAL_USER_VERIFICATION') == true){
+        if (env('MANUAL_USER_VERIFICATION') == true) {
             $block = 'yes';
         } else {
             $block = 'no';
@@ -66,10 +66,10 @@ 
             $user = $request->name;
             $email = $request->email;
             
-            if(env('REGISTER_AUTH') == 'verified'){
-                if(env('MANUAL_USER_VERIFICATION') == true){
+            if (env('REGISTER_AUTH') == 'verified') {
+                if (env('MANUAL_USER_VERIFICATION') == true) {
                 try {
-                Mail::send('auth.user-confirmation', ['user' => $user, 'email' => $email], function ($message) use ($user) {
+                Mail::send('auth.user-confirmation', ['user' => $user, 'email' => $email], function($message) use ($user) {
                     $message->to(env('ADMIN_EMAIL'))
                             ->subject('New user registration');
                 });

app/Http/Controllers/Auth/VerifyEmailController.php

Spacing +2 added lines, -2 removed lines

@@ -18,13 +18,13 @@
     public function __invoke(EmailVerificationRequest $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
+            return redirect()->intended(RouteServiceProvider::HOME . '?verified=1');
         }
 
         if ($request->user()->markEmailAsVerified()) {
             event(new Verified($request->user()));
         }
 
-        return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
+        return redirect()->intended(RouteServiceProvider::HOME . '?verified=1');
     }
 }

app/Http/Controllers/Auth/ConfirmablePasswordController.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      */
     public function store(Request $request)
     {
-        if (! Auth::guard('web')->validate([
+        if (!Auth::guard('web')->validate([
             'email' => $request->user()->email,
             'password' => $request->password,
         ])) {

app/Http/Controllers/Auth/NewPasswordController.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         // database. Otherwise we will parse the error and return the response.
         $status = Password::reset(
             $request->only('email', 'password', 'password_confirmation', 'token'),
-            function ($user) use ($request) {
+            function($user) use ($request) {
                 $user->forceFill([
                     'password' => Hash::make($request->password),
                     'remember_token' => Str::random(60),

app/Http/Controllers/UserController.php

Indentation +1 added lines, -1 removed lines

@@ -1094,7 +1094,7 @@
             $pathinfo = "/img/" . $name. "." . pathinfo($file, PATHINFO_EXTENSION);
             }}
             return $pathinfo;
-          }
+            }
 
         if (file_exists(base_path(findAvatar($userId)))){
             $imagePath = base_path(findAvatar($userId));

Spacing +51 added lines, -51 removed lines

@@ -84,7 +84,7 @@ 
     //Show littlelink page. example => http://127.0.0.1:8000/+admin
     public function littlelink(request $request)
     {
-        if(isset($request->useif)){
+        if (isset($request->useif)) {
             $littlelink_name = User::select('littlelink_name')->where('id', $request->littlelink)->value('littlelink_name');
             $id = $request->littlelink;
         } else {
@@ -140,7 +140,7 @@ 
             return abort(404);
         }
 
-        return redirect(url('@'.$user));
+        return redirect(url('@' . $user));
     }
 
     //Show add/update form
@@ -165,7 +165,7 @@ 
 
             $bid = $links->button_id;
 
-            if($bid == 1 or $bid == 2){
+            if ($bid == 1 or $bid == 2) {
                 $data['linkTypeID'] = "2";
             } elseif ($bid == 42) {
                 $data['linkTypeID'] = "3";
@@ -212,7 +212,7 @@ 
         $customParams = [];
         foreach ($request->all() as $key => $param) {
             //echo $key . " = " . $param . "<br />";
-            if (str_starts_with($key, "_") ||  in_array($key, ['linktype_id', 'linktype_title', 'link_text', 'link_url']))
+            if (str_starts_with($key, "_") || in_array($key, ['linktype_id', 'linktype_title', 'link_text', 'link_url']))
                 continue;
 
             $customParams[$key] = $param;
@@ -231,7 +231,7 @@ 
             }
         }
 
-        $message = (ucwords($button?->name) ?? ucwords($linkType->typename)). " has been ";
+        $message = (ucwords($button?->name) ?? ucwords($linkType->typename)) . " has been ";
 
         if ($OrigLink) {
             //EDITING EXISTING
@@ -239,50 +239,50 @@ 
             $isCustomWebsite = $customParams['GetSiteIcon'] ?? null;
             $SpacerHeight = $customParams['height'] ?? null;
 
-                if($linkType->typename == "link" and $isCustomWebsite == "1"){
+                if ($linkType->typename == "link" and $isCustomWebsite == "1") {
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $LinkTitle,
                         'button_id' => "2",
                     ]);
-                }elseif($linkType->typename == "link"){
+                }elseif ($linkType->typename == "link") {
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $LinkTitle,
                         'button_id' => "1",
                     ]);
-                }elseif($linkType->typename == "spacer"){
+                }elseif ($linkType->typename == "spacer") {
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $customParams['height'] ?? null,
                         'button_id' => "43",
                     ]);
-                }elseif($linkType->typename == "heading"){
+                }elseif ($linkType->typename == "heading") {
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $LinkTitle,
                         'button_id' => "42",
                     ]);
-                }elseif($linkType->typename == "text"){
+                }elseif ($linkType->typename == "text") {
                     $OrigLink->update([
                         'button_id' => "93",
                         'title' => $request->text,
                     ]);
-                }elseif($linkType->typename == "email"){
-                    $LinkURL = "mailto:".$LinkURL;
+                }elseif ($linkType->typename == "email") {
+                    $LinkURL = "mailto:" . $LinkURL;
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'button_id' => $button?->id,
                         'title' => $LinkTitle,
                     ]);
-                }elseif($linkType->typename == "telephone"){
-                    $LinkURL = "tel:".$LinkURL;
+                }elseif ($linkType->typename == "telephone") {
+                    $LinkURL = "tel:" . $LinkURL;
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'button_id' => $button?->id,
                         'title' => $LinkTitle,
                     ]);
-                }elseif($linkType->typename == "vcard"){
+                }elseif ($linkType->typename == "vcard") {
 
                     $prefix = $request->input('prefix');
                     $firstName = $request->input('first_name');
@@ -354,7 +354,7 @@ 
                         'button_id' => 96,
                         'title' => $LinkTitle,
                     ]);
-                }else{
+                } else {
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $LinkTitle,
@@ -362,7 +362,7 @@ 
                     ]);
                 }
                 
-            $message .="updated";
+            $message .= "updated";
 
         } else {
             // ADDING NEW
@@ -373,29 +373,29 @@ 
             $links = new Link;
             $links->link = $LinkURL;
             $links->user_id = $userId;
-            if($linkType->typename == "spacer"){
+            if ($linkType->typename == "spacer") {
             $links->title = $SpacerHeight;
-            }else{
+            } else {
             $links->title = $LinkTitle;
             }
-            if($linkType->typename == "link" and $isCustomWebsite == "1"){
+            if ($linkType->typename == "link" and $isCustomWebsite == "1") {
                 $links->button_id = "2";
-            }elseif($linkType->typename == "link"){
+            }elseif ($linkType->typename == "link") {
                 $links->button_id = "1";
-            }elseif($linkType->typename == "spacer"){
+            }elseif ($linkType->typename == "spacer") {
                 $links->button_id = "43";
-            }elseif($linkType->typename == "heading"){
+            }elseif ($linkType->typename == "heading") {
                 $links->button_id = "42";
-            }elseif($linkType->typename == "text"){
+            }elseif ($linkType->typename == "text") {
                 $links->button_id = "93";
                 $links->title = $request->text;
-            }elseif($linkType->typename == "email"){
-                $links->link = "mailto:".$links->link;
+            }elseif ($linkType->typename == "email") {
+                $links->link = "mailto:" . $links->link;
                 $links->button_id = $button?->id;
-            }elseif($linkType->typename == "telephone"){
-                $links->link = "tel:".$links->link;
+            }elseif ($linkType->typename == "telephone") {
+                $links->link = "tel:" . $links->link;
                 $links->button_id = $button?->id;
-            }elseif($linkType->typename == "vcard"){
+            }elseif ($linkType->typename == "vcard") {
 
                 $prefix = $request->input('prefix');
                 $firstName = $request->input('first_name');
@@ -463,11 +463,11 @@ 
                 $links->link = $json ? $json : null;               
 
                 $links->button_id = 96;
-            }else{
+            } else {
                 $links->button_id = $button?->id;
             }
 
-            if(empty($links->button_id)) {
+            if (empty($links->button_id)) {
                 return redirect(route('showButtons')); die;
             }
             
@@ -534,7 +534,7 @@ 
 
         if (substr($linkId, -1) == '+') {
             $linkWithoutPlus = str_replace('+', '', $linkId);
-            return redirect(url('info/'.$linkWithoutPlus));
+            return redirect(url('info/' . $linkWithoutPlus));
         }
     
         $link = Link::find($linkId);
@@ -625,11 +625,11 @@ 
 
         $directory = base_path("assets/favicon/icons");
         $files = scandir($directory);
-        foreach($files as $file) {
-        if (strpos($file, $linkId.".") !== false) {
-        $pathinfo = pathinfo($file, PATHINFO_EXTENSION);}}
+        foreach ($files as $file) {
+        if (strpos($file, $linkId . ".") !== false) {
+        $pathinfo = pathinfo($file, PATHINFO_EXTENSION); }}
         if (isset($pathinfo)) {
-        try{File::delete(base_path("assets/favicon/icons")."/".$linkId.".".$pathinfo);} catch (exception $e) {}
+        try {File::delete(base_path("assets/favicon/icons") . "/" . $linkId . "." . $pathinfo); } catch (exception $e) {}
         }
 
         return redirect('/studio/links');
@@ -642,11 +642,11 @@ 
 
         $directory = base_path("assets/favicon/icons");
         $files = scandir($directory);
-        foreach($files as $file) {
-        if (strpos($file, $linkId.".") !== false) {
-        $pathinfo = pathinfo($file, PATHINFO_EXTENSION);}}
+        foreach ($files as $file) {
+        if (strpos($file, $linkId . ".") !== false) {
+        $pathinfo = pathinfo($file, PATHINFO_EXTENSION); }}
         if (isset($pathinfo)) {
-        try{File::delete(base_path("assets/favicon/icons")."/".$linkId.".".$pathinfo);} catch (exception $e) {}
+        try {File::delete(base_path("assets/favicon/icons") . "/" . $linkId . "." . $pathinfo); } catch (exception $e) {}
         }
 
         return redirect('/studio/links');
@@ -770,7 +770,7 @@ 
                 'sometimes',
                 'max:255',
                 'string',
-                'isunique:users,id,'.$userId,
+                'isunique:users,id,' . $userId,
             ],
             'name' => 'sometimes|max:255|string',
             'image' => 'sometimes|image|mimes:jpeg,jpg,png,webp|max:2048', // Max file size: 2MB
@@ -794,7 +794,7 @@ 
         $sharebtn = $request->sharebtn;
         $tablinks = $request->tablinks;
 
-        if(env('HOME_URL') !== '' && $pageName != $littlelink_name && $littlelink_name == env('HOME_URL')){
+        if (env('HOME_URL') !== '' && $pageName != $littlelink_name && $littlelink_name == env('HOME_URL')) {
             EnvEditor::editKey('HOME_URL', $pageName);
         }
     
@@ -883,7 +883,7 @@ 
 
         $user_id = Auth::user()->id;
         $path = findBackground($user_id);
-        $path = base_path('assets/img/background-img/'.$path);
+        $path = base_path('assets/img/background-img/' . $path);
         
         if (File::exists($path)) {
             File::delete($path);
@@ -1020,7 +1020,7 @@ 
         // echo Auth::id();
         $id = $request->id;
 
-    if($id == Auth::id() and $id != "1") {
+    if ($id == Auth::id() and $id != "1") {
 
         Link::where('user_id', $id)->delete();
 
@@ -1066,7 +1066,7 @@ 
         $fileName = "links-$domain-$date.json";
         $headers = [
             'Content-Type' => 'application/json',
-            'Content-Disposition' => 'attachment; filename="'.$fileName.'"',
+            'Content-Disposition' => 'attachment; filename="' . $fileName . '"',
         ];
         return response()->json($userData, 200, $headers);
 
@@ -1088,18 +1088,18 @@ 
         $userData = $user->toArray();
         $userData['links'] = $links->toArray();
     
-        function findAvatar($name){
+        function findAvatar($name) {
             $directory = base_path('assets/img');
             $files = scandir($directory);
             $pathinfo = "error.error";
-            foreach($files as $file) {
-            if (strpos($file, $name.'.') !== false) {
-            $pathinfo = "/img/" . $name. "." . pathinfo($file, PATHINFO_EXTENSION);
+            foreach ($files as $file) {
+            if (strpos($file, $name . '.') !== false) {
+            $pathinfo = "/img/" . $name . "." . pathinfo($file, PATHINFO_EXTENSION);
             }}
             return $pathinfo;
           }
 
-        if (file_exists(base_path(findAvatar($userId)))){
+        if (file_exists(base_path(findAvatar($userId)))) {
             $imagePath = base_path(findAvatar($userId));
             $imageData = base64_encode(file_get_contents($imagePath));
             $userData['image_data'] = $imageData;
@@ -1113,7 +1113,7 @@ 
         $fileName = "user_data-$domain-$date.json";
         $headers = [
             'Content-Type' => 'application/json',
-            'Content-Disposition' => 'attachment; filename="'.$fileName.'"',
+            'Content-Disposition' => 'attachment; filename="' . $fileName . '"',
         ];
         return response()->json($userData, 200, $headers);
     

Braces +33 added lines, -29 removed lines

@@ -212,8 +212,9 @@ 
         $customParams = [];
         foreach ($request->all() as $key => $param) {
             //echo $key . " = " . $param . "<br />";
-            if (str_starts_with($key, "_") ||  in_array($key, ['linktype_id', 'linktype_title', 'link_text', 'link_url']))
-                continue;
+            if (str_starts_with($key, "_") ||  in_array($key, ['linktype_id', 'linktype_title', 'link_text', 'link_url'])) {
+                            continue;
+            }
 
             $customParams[$key] = $param;
         }
@@ -221,8 +222,9 @@ 
         $userId = Auth::user()->id;
         $button = Button::where('name', $request->button)->first();
 
-        if ($button && empty($LinkTitle))
-            $LinkTitle = $button->alt;
+        if ($button && empty($LinkTitle)) {
+                    $LinkTitle = $button->alt;
+        }
 
         if ($linkType->typename == 'video' && empty($LinkTitle)) {
             $embed = OEmbed::get($LinkURL);
@@ -245,44 +247,44 @@ 
                         'title' => $LinkTitle,
                         'button_id' => "2",
                     ]);
-                }elseif($linkType->typename == "link"){
+                } elseif($linkType->typename == "link"){
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $LinkTitle,
                         'button_id' => "1",
                     ]);
-                }elseif($linkType->typename == "spacer"){
+                } elseif($linkType->typename == "spacer"){
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $customParams['height'] ?? null,
                         'button_id' => "43",
                     ]);
-                }elseif($linkType->typename == "heading"){
+                } elseif($linkType->typename == "heading"){
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $LinkTitle,
                         'button_id' => "42",
                     ]);
-                }elseif($linkType->typename == "text"){
+                } elseif($linkType->typename == "text"){
                     $OrigLink->update([
                         'button_id' => "93",
                         'title' => $request->text,
                     ]);
-                }elseif($linkType->typename == "email"){
+                } elseif($linkType->typename == "email"){
                     $LinkURL = "mailto:".$LinkURL;
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'button_id' => $button?->id,
                         'title' => $LinkTitle,
                     ]);
-                }elseif($linkType->typename == "telephone"){
+                } elseif($linkType->typename == "telephone"){
                     $LinkURL = "tel:".$LinkURL;
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'button_id' => $button?->id,
                         'title' => $LinkTitle,
                     ]);
-                }elseif($linkType->typename == "vcard"){
+                } elseif($linkType->typename == "vcard"){
 
                     $prefix = $request->input('prefix');
                     $firstName = $request->input('first_name');
@@ -354,7 +356,7 @@ 
                         'button_id' => 96,
                         'title' => $LinkTitle,
                     ]);
-                }else{
+                } else{
                     $OrigLink->update([
                         'link' => $LinkURL,
                         'title' => $LinkTitle,
@@ -375,27 +377,27 @@ 
             $links->user_id = $userId;
             if($linkType->typename == "spacer"){
             $links->title = $SpacerHeight;
-            }else{
+            } else{
             $links->title = $LinkTitle;
             }
             if($linkType->typename == "link" and $isCustomWebsite == "1"){
                 $links->button_id = "2";
-            }elseif($linkType->typename == "link"){
+            } elseif($linkType->typename == "link"){
                 $links->button_id = "1";
-            }elseif($linkType->typename == "spacer"){
+            } elseif($linkType->typename == "spacer"){
                 $links->button_id = "43";
-            }elseif($linkType->typename == "heading"){
+            } elseif($linkType->typename == "heading"){
                 $links->button_id = "42";
-            }elseif($linkType->typename == "text"){
+            } elseif($linkType->typename == "text"){
                 $links->button_id = "93";
                 $links->title = $request->text;
-            }elseif($linkType->typename == "email"){
+            } elseif($linkType->typename == "email"){
                 $links->link = "mailto:".$links->link;
                 $links->button_id = $button?->id;
-            }elseif($linkType->typename == "telephone"){
+            } elseif($linkType->typename == "telephone"){
                 $links->link = "tel:".$links->link;
                 $links->button_id = $button?->id;
-            }elseif($linkType->typename == "vcard"){
+            } elseif($linkType->typename == "vcard"){
 
                 $prefix = $request->input('prefix');
                 $firstName = $request->input('first_name');
@@ -463,7 +465,7 @@ 
                 $links->link = $json ? $json : null;               
 
                 $links->button_id = 96;
-            }else{
+            } else{
                 $links->button_id = $button?->id;
             }
 
@@ -712,14 +714,16 @@ 
             'button' => 'required',
         ]);
 
-        if (stringStartsWith($request->link, 'http://') == 'true' or stringStartsWith($request->link, 'https://') == 'true' or stringStartsWith($request->link, 'mailto:') == 'true')
-            $link1 = $request->link;
-        else
-            $link1 = 'https://' . $request->link;
-        if (stringEndsWith($request->link, '/') == 'true')
-            $link = rtrim($link1, "/ ");
-        else
-        $link = $link1;
+        if (stringStartsWith($request->link, 'http://') == 'true' or stringStartsWith($request->link, 'https://') == 'true' or stringStartsWith($request->link, 'mailto:') == 'true') {
+                    $link1 = $request->link;
+        } else {
+                    $link1 = 'https://' . $request->link;
+        }
+        if (stringEndsWith($request->link, '/') == 'true') {
+                    $link = rtrim($link1, "/ ");
+        } else {
+                $link = $link1;
+        }
         $title = $request->title;
         $order = $request->order;
         $button = $request->button;

app/Http/Controllers/InstallerController.php

Spacing +37 added lines, -37 removed lines

@@ -38,9 +38,9 @@ 
 
     public function db(request $request)
     {
-        if($request->database == 'MySQL'){
+        if ($request->database == 'MySQL') {
             return redirect(url('?mysql'));
-        }else{
+        } else {
             return redirect(url('?4'));
         }
     }
@@ -55,13 +55,13 @@ 
 
         $file = base_path('INSTALLERLOCK');
         if (!file_exists($file)) {
-            $handleFile = fopen($file, 'w') or die('Cannot create file:  '.$file);
+            $handleFile = fopen($file, 'w') or die('Cannot create file:  ' . $file);
             fclose($handleFile);
         }
 
-        try{EnvEditor::addKey('ADMIN_EMAIL', $email);}catch(Exception $e){}
+        try {EnvEditor::addKey('ADMIN_EMAIL', $email); } catch (Exception $e) {}
 
-        if(DB::table('users')->count() == '0'){
+        if (DB::table('users')->count() == '0') {
         Schema::disableForeignKeyConstraints();
         DB::table('users')->delete();
         DB::table('users')->truncate();
@@ -92,12 +92,12 @@ 
         $DB_USERNAME = $request->username;
         $DB_PASSWORD = $request->password;
 
-        if(EnvEditor::keyExists('DB_CONNECTION')){EnvEditor::editKey('DB_CONNECTION', $DB_CONNECTION);}else{EnvEditor::addKey('DB_CONNECTION', $DB_CONNECTION);}
-        if(EnvEditor::keyExists('DB_HOST')){EnvEditor::editKey('DB_HOST', $DB_HOST);}else{EnvEditor::addKey('DB_HOST', $DB_HOST);}
-        if(EnvEditor::keyExists('DB_PORT')){EnvEditor::editKey('DB_PORT', $DB_PORT);}else{EnvEditor::addKey('DB_PORT', $DB_PORT);}
-        if(EnvEditor::keyExists('DB_DATABASE')){EnvEditor::editKey('DB_DATABASE', $DB_DATABASE);}else{EnvEditor::addKey('DB_DATABASE', $DB_DATABASE);}
-        if(EnvEditor::keyExists('DB_USERNAME')){EnvEditor::editKey('DB_USERNAME', $DB_USERNAME);}else{EnvEditor::addKey('DB_USERNAME', $DB_USERNAME);}
-        if(EnvEditor::keyExists('DB_PASSWORD')){EnvEditor::editKey('DB_PASSWORD', $DB_PASSWORD);}else{EnvEditor::addKey('DB_PASSWORD', $DB_PASSWORD);}
+        if (EnvEditor::keyExists('DB_CONNECTION')) {EnvEditor::editKey('DB_CONNECTION', $DB_CONNECTION); } else {EnvEditor::addKey('DB_CONNECTION', $DB_CONNECTION); }
+        if (EnvEditor::keyExists('DB_HOST')) {EnvEditor::editKey('DB_HOST', $DB_HOST); } else {EnvEditor::addKey('DB_HOST', $DB_HOST); }
+        if (EnvEditor::keyExists('DB_PORT')) {EnvEditor::editKey('DB_PORT', $DB_PORT); } else {EnvEditor::addKey('DB_PORT', $DB_PORT); }
+        if (EnvEditor::keyExists('DB_DATABASE')) {EnvEditor::editKey('DB_DATABASE', $DB_DATABASE); } else {EnvEditor::addKey('DB_DATABASE', $DB_DATABASE); }
+        if (EnvEditor::keyExists('DB_USERNAME')) {EnvEditor::editKey('DB_USERNAME', $DB_USERNAME); } else {EnvEditor::addKey('DB_USERNAME', $DB_USERNAME); }
+        if (EnvEditor::keyExists('DB_PASSWORD')) {EnvEditor::editKey('DB_PASSWORD', $DB_PASSWORD); } else {EnvEditor::addKey('DB_PASSWORD', $DB_PASSWORD); }
 
         return redirect(url('mysql-test'));
 
@@ -105,22 +105,22 @@ 
 
     public function mysqlTest(request $request)
     {
-        try {Artisan::call('migrate');} catch (exception $e) {$failed = "true";}
-        try {Artisan::call('db:seed --force');} catch (exception $e) {$failed = "true";}
-        try {Artisan::call('db:seed --class="PageSeeder" --force');} catch (exception $e) {$failed = "true";}
-        try {Artisan::call('db:seed --class="ButtonSeeder" --force');} catch (exception $e) {$failed = "true";}
-
-        try {$users = DB::table('buttons')->count(); $failed = false;} catch (exception $e) {$failed = true;}
-
-        if($failed == true){
-            if(EnvEditor::keyExists('DB_CONNECTION')){EnvEditor::editKey('DB_CONNECTION', 'sqlite');}else{EnvEditor::addKey('DB_CONNECTION', 'sqlite');}
-            if(EnvEditor::keyExists('DB_HOST')){EnvEditor::deleteKey('DB_HOST');}
-            if(EnvEditor::keyExists('DB_PORT')){EnvEditor::deleteKey('DB_PORT');}
-            if(EnvEditor::keyExists('DB_DATABASE')){EnvEditor::deleteKey('DB_DATABASE');}
-            if(EnvEditor::keyExists('DB_USERNAME')){EnvEditor::deleteKey('DB_USERNAME');}
-            if(EnvEditor::keyExists('DB_PASSWORD')){EnvEditor::deleteKey('DB_PASSWORD');}
+        try {Artisan::call('migrate'); } catch (exception $e) {$failed = "true"; }
+        try {Artisan::call('db:seed --force'); } catch (exception $e) {$failed = "true"; }
+        try {Artisan::call('db:seed --class="PageSeeder" --force'); } catch (exception $e) {$failed = "true"; }
+        try {Artisan::call('db:seed --class="ButtonSeeder" --force'); } catch (exception $e) {$failed = "true"; }
+
+        try {$users = DB::table('buttons')->count(); $failed = false; } catch (exception $e) {$failed = true; }
+
+        if ($failed == true) {
+            if (EnvEditor::keyExists('DB_CONNECTION')) {EnvEditor::editKey('DB_CONNECTION', 'sqlite'); } else {EnvEditor::addKey('DB_CONNECTION', 'sqlite'); }
+            if (EnvEditor::keyExists('DB_HOST')) {EnvEditor::deleteKey('DB_HOST'); }
+            if (EnvEditor::keyExists('DB_PORT')) {EnvEditor::deleteKey('DB_PORT'); }
+            if (EnvEditor::keyExists('DB_DATABASE')) {EnvEditor::deleteKey('DB_DATABASE'); }
+            if (EnvEditor::keyExists('DB_USERNAME')) {EnvEditor::deleteKey('DB_USERNAME'); }
+            if (EnvEditor::keyExists('DB_PASSWORD')) {EnvEditor::deleteKey('DB_PASSWORD'); }
             return redirect(url('?error'));
-        }else{
+        } else {
             return redirect(url('?4'));
         }
     }
@@ -131,25 +131,25 @@ 
         $user = User::find(1);
         $llName = $user->littlelink_name;
 
-        if($request->register == 'Yes'){ 
-            if(EnvEditor::keyExists('ALLOW_REGISTRATION')){EnvEditor::editKey('ALLOW_REGISTRATION', 'true');}else{EnvEditor::addKey('ALLOW_REGISTRATION', 'true');}
+        if ($request->register == 'Yes') { 
+            if (EnvEditor::keyExists('ALLOW_REGISTRATION')) {EnvEditor::editKey('ALLOW_REGISTRATION', 'true'); } else {EnvEditor::addKey('ALLOW_REGISTRATION', 'true'); }
         } else {
-            if(EnvEditor::keyExists('ALLOW_REGISTRATION')){EnvEditor::editKey('ALLOW_REGISTRATION', 'false');}else{EnvEditor::addKey('ALLOW_REGISTRATION', 'false');}
+            if (EnvEditor::keyExists('ALLOW_REGISTRATION')) {EnvEditor::editKey('ALLOW_REGISTRATION', 'false'); } else {EnvEditor::addKey('ALLOW_REGISTRATION', 'false'); }
         }
 
-        if($request->verify == 'Yes'){$value = "verified";}else{$value = "auth";}
-        if(EnvEditor::keyExists('REGISTER_AUTH')){EnvEditor::editKey('REGISTER_AUTH', $value);}
+        if ($request->verify == 'Yes') {$value = "verified"; } else {$value = "auth"; }
+        if (EnvEditor::keyExists('REGISTER_AUTH')) {EnvEditor::editKey('REGISTER_AUTH', $value); }
 
-        if($request->page == 'No'){$value = "";}else{$value = '"' . $llName . '"';}
-        if(EnvEditor::keyExists('HOME_URL')){EnvEditor::editKey('HOME_URL', $value);}
+        if ($request->page == 'No') {$value = ""; } else {$value = '"' . $llName . '"'; }
+        if (EnvEditor::keyExists('HOME_URL')) {EnvEditor::editKey('HOME_URL', $value); }
 
-        if(EnvEditor::keyExists('APP_NAME')){EnvEditor::editKey('APP_NAME', '"' . $request->app . '"');}
+        if (EnvEditor::keyExists('APP_NAME')) {EnvEditor::editKey('APP_NAME', '"' . $request->app . '"'); }
 
-        if(file_exists(base_path("INSTALLING"))){unlink(base_path("INSTALLING"));}
+        if (file_exists(base_path("INSTALLING"))) {unlink(base_path("INSTALLING")); }
 
         $file = base_path('INSTALLERLOCK');
         if (file_exists($file)) {
-            unlink($file) or die('Cannot delete file: '.$file);
+            unlink($file) or die('Cannot delete file: ' . $file);
             sleep(1);
         }
 
@@ -164,7 +164,7 @@ 
         $value = $request->value;
         $value = '"' . $request->value . '"';
         
-        if(EnvEditor::keyExists($entry)){EnvEditor::editKey($entry, $value);}
+        if (EnvEditor::keyExists($entry)) {EnvEditor::editKey($entry, $value); }
 
         return Redirect(url(''));
     }

Braces +14 added lines, -14 removed lines

@@ -40,7 +40,7 @@ 
     {
         if($request->database == 'MySQL'){
             return redirect(url('?mysql'));
-        }else{
+        } else{
             return redirect(url('?4'));
         }
     }
@@ -59,7 +59,7 @@ 
             fclose($handleFile);
         }
 
-        try{EnvEditor::addKey('ADMIN_EMAIL', $email);}catch(Exception $e){}
+        try{EnvEditor::addKey('ADMIN_EMAIL', $email);} catch(Exception $e){}
 
         if(DB::table('users')->count() == '0'){
         Schema::disableForeignKeyConstraints();
@@ -92,12 +92,12 @@ 
         $DB_USERNAME = $request->username;
         $DB_PASSWORD = $request->password;
 
-        if(EnvEditor::keyExists('DB_CONNECTION')){EnvEditor::editKey('DB_CONNECTION', $DB_CONNECTION);}else{EnvEditor::addKey('DB_CONNECTION', $DB_CONNECTION);}
-        if(EnvEditor::keyExists('DB_HOST')){EnvEditor::editKey('DB_HOST', $DB_HOST);}else{EnvEditor::addKey('DB_HOST', $DB_HOST);}
-        if(EnvEditor::keyExists('DB_PORT')){EnvEditor::editKey('DB_PORT', $DB_PORT);}else{EnvEditor::addKey('DB_PORT', $DB_PORT);}
-        if(EnvEditor::keyExists('DB_DATABASE')){EnvEditor::editKey('DB_DATABASE', $DB_DATABASE);}else{EnvEditor::addKey('DB_DATABASE', $DB_DATABASE);}
-        if(EnvEditor::keyExists('DB_USERNAME')){EnvEditor::editKey('DB_USERNAME', $DB_USERNAME);}else{EnvEditor::addKey('DB_USERNAME', $DB_USERNAME);}
-        if(EnvEditor::keyExists('DB_PASSWORD')){EnvEditor::editKey('DB_PASSWORD', $DB_PASSWORD);}else{EnvEditor::addKey('DB_PASSWORD', $DB_PASSWORD);}
+        if(EnvEditor::keyExists('DB_CONNECTION')){EnvEditor::editKey('DB_CONNECTION', $DB_CONNECTION);} else{EnvEditor::addKey('DB_CONNECTION', $DB_CONNECTION);}
+        if(EnvEditor::keyExists('DB_HOST')){EnvEditor::editKey('DB_HOST', $DB_HOST);} else{EnvEditor::addKey('DB_HOST', $DB_HOST);}
+        if(EnvEditor::keyExists('DB_PORT')){EnvEditor::editKey('DB_PORT', $DB_PORT);} else{EnvEditor::addKey('DB_PORT', $DB_PORT);}
+        if(EnvEditor::keyExists('DB_DATABASE')){EnvEditor::editKey('DB_DATABASE', $DB_DATABASE);} else{EnvEditor::addKey('DB_DATABASE', $DB_DATABASE);}
+        if(EnvEditor::keyExists('DB_USERNAME')){EnvEditor::editKey('DB_USERNAME', $DB_USERNAME);} else{EnvEditor::addKey('DB_USERNAME', $DB_USERNAME);}
+        if(EnvEditor::keyExists('DB_PASSWORD')){EnvEditor::editKey('DB_PASSWORD', $DB_PASSWORD);} else{EnvEditor::addKey('DB_PASSWORD', $DB_PASSWORD);}
 
         return redirect(url('mysql-test'));
 
@@ -113,14 +113,14 @@ 
         try {$users = DB::table('buttons')->count(); $failed = false;} catch (exception $e) {$failed = true;}
 
         if($failed == true){
-            if(EnvEditor::keyExists('DB_CONNECTION')){EnvEditor::editKey('DB_CONNECTION', 'sqlite');}else{EnvEditor::addKey('DB_CONNECTION', 'sqlite');}
+            if(EnvEditor::keyExists('DB_CONNECTION')){EnvEditor::editKey('DB_CONNECTION', 'sqlite');} else{EnvEditor::addKey('DB_CONNECTION', 'sqlite');}
             if(EnvEditor::keyExists('DB_HOST')){EnvEditor::deleteKey('DB_HOST');}
             if(EnvEditor::keyExists('DB_PORT')){EnvEditor::deleteKey('DB_PORT');}
             if(EnvEditor::keyExists('DB_DATABASE')){EnvEditor::deleteKey('DB_DATABASE');}
             if(EnvEditor::keyExists('DB_USERNAME')){EnvEditor::deleteKey('DB_USERNAME');}
             if(EnvEditor::keyExists('DB_PASSWORD')){EnvEditor::deleteKey('DB_PASSWORD');}
             return redirect(url('?error'));
-        }else{
+        } else{
             return redirect(url('?4'));
         }
     }
@@ -132,15 +132,15 @@ 
         $llName = $user->littlelink_name;
 
         if($request->register == 'Yes'){ 
-            if(EnvEditor::keyExists('ALLOW_REGISTRATION')){EnvEditor::editKey('ALLOW_REGISTRATION', 'true');}else{EnvEditor::addKey('ALLOW_REGISTRATION', 'true');}
+            if(EnvEditor::keyExists('ALLOW_REGISTRATION')){EnvEditor::editKey('ALLOW_REGISTRATION', 'true');} else{EnvEditor::addKey('ALLOW_REGISTRATION', 'true');}
         } else {
-            if(EnvEditor::keyExists('ALLOW_REGISTRATION')){EnvEditor::editKey('ALLOW_REGISTRATION', 'false');}else{EnvEditor::addKey('ALLOW_REGISTRATION', 'false');}
+            if(EnvEditor::keyExists('ALLOW_REGISTRATION')){EnvEditor::editKey('ALLOW_REGISTRATION', 'false');} else{EnvEditor::addKey('ALLOW_REGISTRATION', 'false');}
         }
 
-        if($request->verify == 'Yes'){$value = "verified";}else{$value = "auth";}
+        if($request->verify == 'Yes'){$value = "verified";} else{$value = "auth";}
         if(EnvEditor::keyExists('REGISTER_AUTH')){EnvEditor::editKey('REGISTER_AUTH', $value);}
 
-        if($request->page == 'No'){$value = "";}else{$value = '"' . $llName . '"';}
+        if($request->page == 'No'){$value = "";} else{$value = '"' . $llName . '"';}
         if(EnvEditor::keyExists('HOME_URL')){EnvEditor::editKey('HOME_URL', $value);}
 
         if(EnvEditor::keyExists('APP_NAME')){EnvEditor::editKey('APP_NAME', '"' . $request->app . '"');}

app/Http/Controllers/Admin/LinkTypeController.php

Spacing +5 added lines, -5 removed lines

@@ -49,10 +49,10 @@ 
 
         // store
         $LinkType = new LinkType;
-        $LinkType->typename       = $request->typename;
-        $LinkType->title      = $request->title;
+        $LinkType->typename = $request->typename;
+        $LinkType->title = $request->title;
         $LinkType->description = $request->description;
-        $LinkType->icon            = $request->icon;
+        $LinkType->icon = $request->icon;
         $LinkType->params = $request->params;
         $LinkType->save();
 
@@ -100,9 +100,9 @@ 
 
 
         // store
-        $linktype->title      = $request->title;
+        $linktype->title = $request->title;
         $linktype->description = $request->description;
-        $linktype->icon            = $request->icon;
+        $linktype->icon = $request->icon;
         $linktype->params = $request->params;
         $linktype->save();
 

app/Http/Controllers/LinkTypeViewController.php

Indentation +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
         // dynamiclly create params for predefined website to fill a select list with available buttons
         if (!empty($linkType) && $linkType->typename === 'predefined') {
             $buttons = Button::select('name')->orderBy('name', 'asc')->get();
-           $pdParams[] = ['tag' => 'select', 'name' => 'button', 'id'=> 'button'];
+            $pdParams[] = ['tag' => 'select', 'name' => 'button', 'id'=> 'button'];
             foreach ($buttons as $btn) {
                 $pdParams[0]['value'][] = [
                     'tag'=>'option',
@@ -133,10 +133,10 @@ 
                 $typeParams = json_decode($link['type_params']);
 
 
- //echo "<pre>";
+    //echo "<pre>";
 //  print_r($typeParams);
-                  //print_r($params[$idx]);
-                 //echo "</pre>";
+                    //print_r($params[$idx]);
+                    //echo "</pre>";
 
                 if ($typeParams && property_exists($typeParams, $params[$idx]['name'])) {
                     if (key_exists('value', $params[$idx]) && is_array($params[$idx]['value'])) {

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
             $data['params'] = json_decode($link['type_params']);
             $data['link_title'] = $link->title;
             $data['link_url'] = $link->link;
-            if (Route::currentRouteName() != 'showButtons') {$data['button_id'] = $link->button_id;}
+            if (Route::currentRouteName() != 'showButtons') {$data['button_id'] = $link->button_id; }
         }
 
         if (!empty($linkType) && $linkType->typename === 'predefined') {
@@ -50,7 +50,7 @@ 
 //echo "<pre>"; print_r($data['params']); exit;
 
         }
-        return view('components.pageitems.'. $linkType->typename.'-form', $data);
+        return view('components.pageitems.' . $linkType->typename . '-form', $data);
 
         $jsonForm = FormFactory::jsonForm();
         try {

Braces +6 added lines, -4 removed lines

@@ -118,11 +118,13 @@
         $params = json_decode($json, true);
         $idx = 0;
         foreach ($params as $p) {
-            if (!array_key_exists('for', $p))
-                $params[$idx]['for'] = $p['name'];
+            if (!array_key_exists('for', $p)) {
+                            $params[$idx]['for'] = $p['name'];
+            }
 
-            if (!array_key_exists('label', $p))
-                $params[$idx]['label'] = ucwords(preg_replace('/[^a-zA-Z0-9-]/', ' ', $p['name']));
+            if (!array_key_exists('label', $p)) {
+                            $params[$idx]['label'] = ucwords(preg_replace('/[^a-zA-Z0-9-]/', ' ', $p['name']));
+            }
 
             if (!array_key_exists('label', $p) || !str_contains($p['class'], 'form-control')) {
                 $params[$idx]['class'] = " form-control";

app/Http/Kernel.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'link-id' => \App\Http\Middleware\LinkId::class,
-	    'admin' => \App\Http\Middleware\admin::class,
+        'admin' => \App\Http\Middleware\admin::class,
         'blocked' => \App\Http\Middleware\CheckBlockedUser::class,
         'max.users' => \App\Http\Middleware\MaxUsers::class,
         'impersonate' => \App\Http\Middleware\Impersonate::class,