Completed
Pull Request — development (#318)
by Claudio
06:27 queued 04:33
created
app/Models/Permissions.php 1 patch
Switch Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,30 +1,30 @@
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Models;
3
+ namespace App\Models;
4 4
 
5 5
 /**
6 6
  * Class Permissions.
7 7
  */
8
-class Permissions extends ChocolateyModel
9
-{
10
-    /**
8
+ class Permissions extends ChocolateyModel
9
+ {
10
+     /**
11 11
      * Disable Timestamps.
12 12
      *
13 13
      * @var bool
14 14
      */
15
-    public $timestamps = false;
15
+     public $timestamps = false;
16 16
 
17
-    /**
17
+     /**
18 18
      * The table associated with the model.
19 19
      *
20 20
      * @var string
21 21
      */
22
-    protected $table = 'permissions';
22
+     protected $table = 'permissions';
23 23
 
24
-    /**
24
+     /**
25 25
      * Primary Key of the Table.
26 26
      *
27 27
      * @var string
28 28
      */
29
-    protected $primaryKey = 'id';
29
+     protected $primaryKey = 'id';
30 30
 }
Please login to merge, or discard this patch.
app/Http/Controllers/LoginController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
             return response()->json(UserFacade::setSession(User::where('real_name', $fbUser->getId())->first()));
107 107
         }
108 108
 
109
-        (new AccountController())->createUser($request, ['email' => $fbUser->getEmail().'-fblogin'], true, false);
109
+        (new AccountController())->createUser($request, ['email' => $fbUser->getEmail() . '-fblogin'], true, false);
110 110
 
111 111
         UserFacade::updateSession(['last_login' => time(), 'ip_register' => $request->ip(), 'ip_current' => $request->ip(), 'real_name' => $fbUser->getId()]);
112 112
 
Please login to merge, or discard this patch.
app/Http/Controllers/AccountController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
             'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false ? '1' : '0',
79 79
         ]);
80 80
 
81
-        foreach ((array) $request->json()->all() as $setting => $value) {
81
+        foreach ((array)$request->json()->all() as $setting => $value) {
82 82
             UserPreferences::find(UserFacade::getUser()->uniqueId)->update([$setting => $value == true ? '1' : '0']);
83 83
         }
84 84
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 
152 152
         if ($sendEmail == true) {
153 153
             Mail::send(['email' => $userInfo['email'], 'name' => $userName, 'url' => "/activate/{$token}",
154
-                'subject'       => 'Welcome to '.Config::get('chocolatey.hotelName'), ]);
154
+                'subject'       => 'Welcome to ' . Config::get('chocolatey.hotelName'), ]);
155 155
         }
156 156
 
157 157
         return UserFacade::setSession((new User())->store($userName, $userInfo['email'], $request->ip(), $newUser));
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
     {
171 171
         $partialName = explode(' ', (new Alliteration())->getName());
172 172
 
173
-        return strtolower($partialName[0].strstr($userMail, '@', true).$partialName[1]);
173
+        return strtolower($partialName[0] . strstr($userMail, '@', true) . $partialName[1]);
174 174
     }
175 175
 
176 176
     /**
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
         $token = Mail::store(UserFacade::getUser()->email, 'public/registration/activate');
220 220
 
221 221
         Mail::send(['name' => UserFacade::getUser()->name, 'email' => $request->user()->email,
222
-            'url'          => "/activate/{$token}", 'subject' => 'Welcome to '.Config::get('chocolatey.hotelName'),
222
+            'url'          => "/activate/{$token}", 'subject' => 'Welcome to ' . Config::get('chocolatey.hotelName'),
223 223
         ]);
224 224
 
225 225
         return response(null);
Please login to merge, or discard this patch.
app/Console/Kernel.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,30 +1,30 @@
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Console;
3
+ namespace App\Console;
4 4
 
5
-use Illuminate\Console\Scheduling\Schedule;
6
-use Laravel\Lumen\Console\Kernel as ConsoleKernel;
5
+ use Illuminate\Console\Scheduling\Schedule;
6
+ use Laravel\Lumen\Console\Kernel as ConsoleKernel;
7 7
 
8 8
 /**
9 9
  * Class Kernel.
10 10
  */
11
-class Kernel extends ConsoleKernel
12
-{
13
-    /**
11
+ class Kernel extends ConsoleKernel
12
+ {
13
+     /**
14 14
      * The Artisan commands provided by your application.
15 15
      *
16 16
      * @var array
17 17
      */
18
-    protected $commands = [];
18
+     protected $commands = [];
19 19
 
20
-    /**
20
+     /**
21 21
      * Define the application's command schedule.
22 22
      *
23 23
      * @param \Illuminate\Console\Scheduling\Schedule $schedule
24 24
      *
25 25
      * @return void
26 26
      */
27
-    protected function schedule(Schedule $schedule)
28
-    {
29
-    }
27
+     protected function schedule(Schedule $schedule)
28
+     {
29
+     }
30 30
 }
Please login to merge, or discard this patch.