joaogl / base

src/Repositories/JobsRepository.php

Braces +3 added lines, -2 removed lines

@@ -20,8 +20,9 @@
      */
     public function __construct($model = null)
     {
-        if (isset($model))
-            $this->model = $model;
+        if (isset($model)) {
+                    $this->model = $model;
+        }
     }
 
     /**

src/Repositories/UserRepository.php

Braces +3 added lines, -2 removed lines

@@ -20,8 +20,9 @@
      */

     public function __construct($model = null)

     {

-        if (isset($model))

-            $this->model = $model;

+        if (isset($model)) {
+                    $this->model = $model;
+        }
     }

 

     /**

src/Controllers/SettingsController.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 

     public function  update($id, Request $request)

     {

-        $this->validate($request, [ 'value' => 'required' ]);

+        $this->validate($request, ['value' => 'required']);

 

         $move = Base::getSettingsRepository()->findOrFail($id);

 

@@ -39,7 +39,7 @@ 
 

         $after = $move->value;

 

-        Base::Log('Website settings changed. Changed "' . $move->friendly_name . '" value from "' . $before . '" to "' . $after . '"');

+        Base::Log('Website settings changed. Changed "'.$move->friendly_name.'" value from "'.$before.'" to "'.$after.'"');

 

         return redirect('admin/settings');

     }

src/Controllers/AuthController.php

Spacing +33 added lines, -33 removed lines

@@ -94,7 +94,7 @@ 
     public function getForgotPasswordConfirm($userId, $passwordResetCode)

     {

         // Find the user using the password reset code

-        if(!$user = Sentinel::findById($userId))

+        if (!$user = Sentinel::findById($userId))

         {

             // Redirect to the forgot password page

             return Redirect::route('forgot-password')->with('error', Lang::get('base.auth.forgot_password_confirm.error'));

@@ -133,7 +133,7 @@ 
         }

 

         // Find the user using the password reset code

-        if(!$user = Sentinel::findById($userId))

+        if (!$user = Sentinel::findById($userId))

         {

             // Redirect to the forgot password page

             return Redirect::route('login')->with('error', Lang::get('base.auth.activate.error'));

@@ -185,7 +185,7 @@ 
             return back()->withInput()->withErrors($validator);

         }

         try {

-            foreach(Sentinel::createModel()->getLoginNames() as $loginName)

+            foreach (Sentinel::createModel()->getLoginNames() as $loginName)

             {

                 $data = array(

                     $loginName => Input::only('email')["email"],

@@ -193,11 +193,11 @@ 
                 );

 

                 // Try to log the user in

-                if(Sentinel::authenticate($data, Input::get('remember-me', false)))

+                if (Sentinel::authenticate($data, Input::get('remember-me', false)))

                 {

                     $user = Sentinel::check();

                     $user->update(['ip' => Request::ip()]);

-                    Base::Log($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') logged in with IP ' . Request::ip() );

+                    Base::Log($user->username.' ('.$user->first_name.' '.$user->last_name.') logged in with IP '.Request::ip());

                     

                     // Redirect to the dashboard page

                     return Redirect::route("home")->with('success', Lang::get('base.auth.signin.success'));

@@ -209,9 +209,9 @@ 
             $this->messageBag->add('email', Lang::get('base.auth.account.not_activated'));

         } catch (ThrottlingException $e) {

             $delay = $e->getDelay();

-            $this->messageBag->add('email', Lang::get('base.auth.account.suspended', compact('delay' )));

+            $this->messageBag->add('email', Lang::get('base.auth.account.suspended', compact('delay')));

         }

-        Base::Log('Login attempt registred for ' . Input::only('email')["email"] . ' from IP ' . Request::ip() );

+        Base::Log('Login attempt registred for '.Input::only('email')["email"].' from IP '.Request::ip());

 

         // Ooops.. something went wrong

         return back()->withInput()->withErrors($this->messageBag);

@@ -245,7 +245,7 @@ 
         $rules = array();

 

         // Declare the rules for the form validation

-        foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field)

+        foreach (Sentinel::createModel()->getRegisterFields() as $fieldid => $field)

             $rules[$fieldid] = $field['validator'];

 

         $rules['g-recaptcha-response'] = 'required';

@@ -268,7 +268,7 @@ 
             $data = array();

 

             // Set the data to the user from the User class

-            foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field)

+            foreach (Sentinel::createModel()->getRegisterFields() as $fieldid => $field)

                 $data[$fieldid] = Input::get($fieldid);

 

             // Set the standard data to the user

@@ -288,7 +288,7 @@ 
                     $testing = Sentinel::createModel()->getRegisterFields();

                     $user = Sentinel::findById($user->id);

 

-                    foreach($data as $fieldid => $field)

+                    foreach ($data as $fieldid => $field)

                         if (!isset($testing[$fieldid]) || $testing[$fieldid]['save'] == true)

                             $user[$fieldid] = $field;

 

@@ -314,18 +314,18 @@ 
                 );

 

                 // Send the activation code through email

-                Mail::queue('emails.auth.register-activate', $data, function ($m) use ($user) {

-                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);

-                    $m->subject(Lang::get('base.mails.welcome') . ' ' . $user->first_name);

+                Mail::queue('emails.auth.register-activate', $data, function($m) use ($user) {

+                    $m->to($user->email, $user->first_name.' '.$user->last_name);

+                    $m->subject(Lang::get('base.mails.welcome').' '.$user->first_name);

                 });

             }

 

             // If the administrator needs to activate the account send the user a warning saying that

             if ($adminActivation)

             {

-                Mail::queue('emails.auth.register-admin-activate', ['user' => $user], function ($m) use ($user) {

-                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);

-                    $m->subject(Lang::get('base.mails.welcome') . ' ' . $user->first_name);

+                Mail::queue('emails.auth.register-admin-activate', ['user' => $user], function($m) use ($user) {

+                    $m->to($user->email, $user->first_name.' '.$user->last_name);

+                    $m->subject(Lang::get('base.mails.welcome').' '.$user->first_name);

                 });

             }

 

@@ -337,22 +337,22 @@ 
                 if (Activation::complete($user, $activation->code)) {

                     Sentinel::login($user, false);

 

-                    Mail::queue('emails.auth.activated', ['user' => $user], function ($m) use ($user) {

-                        $m->to($user->email, $user->first_name . ' ' . $user->last_name);

-                        $m->subject(Lang::get('base.mails.welcome') . ' ' . $user->first_name);

+                    Mail::queue('emails.auth.activated', ['user' => $user], function($m) use ($user) {

+                        $m->to($user->email, $user->first_name.' '.$user->last_name);

+                        $m->subject(Lang::get('base.mails.welcome').' '.$user->first_name);

                     });

                 }

             }

 

-            Base::Log('New account registred for ' . $user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') from IP ' . Request::ip() );

+            Base::Log('New account registred for '.$user->username.' ('.$user->first_name.' '.$user->last_name.') from IP '.Request::ip());

 

             // Redirect to the home page with success menu

-            return Redirect::to("login")->with('success', Lang::get('base.auth.signup.success') . $adminActivation ? Lang::get('base.auth.signup.admin') : $userActivation ? Lang::get('base.auth.signup.self') : Lang::get('base.auth.signup.ready'));

+            return Redirect::to("login")->with('success', Lang::get('base.auth.signup.success').$adminActivation ? Lang::get('base.auth.signup.admin') : $userActivation ? Lang::get('base.auth.signup.self') : Lang::get('base.auth.signup.ready'));

         } catch (UserExistsException $e) {

             $this->messageBag->add('email', Lang::get('base.auth.account.already_exists'));

         }

 

-        Base::Log('New account registration attempt from IP ' . Request::ip() );

+        Base::Log('New account registration attempt from IP '.Request::ip());

 

         // Ooops.. something went wrong

         return Redirect::back()->withInput()->withErrors($this->messageBag);

@@ -382,7 +382,7 @@ 
         // Get the user password recovery code

         $user = Sentinel::findByCredentials(['email' => Input::get('email')]);

 

-        if($user)

+        if ($user)

         {

             //get reminder for user

             $reminder = Reminder::exists($user) ?: Reminder::create($user);

@@ -390,14 +390,14 @@ 
             // Data to be used on the email view

             $data = array(

                 'user'              => $user,

-                'forgotPasswordUrl' => URL::route('forgot-password-confirm',[$user->id, $reminder->code]),

+                'forgotPasswordUrl' => URL::route('forgot-password-confirm', [$user->id, $reminder->code]),

             );

 

-            Base::Log('Forgot password request for ' . $user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') from IP ' . Request::ip() );

+            Base::Log('Forgot password request for '.$user->username.' ('.$user->first_name.' '.$user->last_name.') from IP '.Request::ip());

 

             // Send the activation code through email

-            Mail::queue('emails.auth.forgot-password', $data, function ($m) use ($user) {

-                $m->to($user->email, $user->first_name . ' ' . $user->last_name);

+            Mail::queue('emails.auth.forgot-password', $data, function($m) use ($user) {

+                $m->to($user->email, $user->first_name.' '.$user->last_name);

                 $m->subject(Lang::get('base.mails.recovery'));

             });

         }

@@ -427,26 +427,26 @@ 
         // If validation fails, we'll exit the operation now.

         if ($validator->fails()) {

             // Ooops.. something went wrong

-            return Redirect::route('forgot-password-confirm', compact(['userId','passwordResetCode']))->withInput()->withErrors($validator);

+            return Redirect::route('forgot-password-confirm', compact(['userId', 'passwordResetCode']))->withInput()->withErrors($validator);

         }

 

         // Find the user using the password reset code

         $user = Sentinel::findById($userId);

-        if(!$reminder = Reminder::complete($user, $passwordResetCode, Input::get('password')))

+        if (!$reminder = Reminder::complete($user, $passwordResetCode, Input::get('password')))

         {

-            Base::Log('Forgot password confirm failed for ' . $user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') from IP ' . Request::ip() );

+            Base::Log('Forgot password confirm failed for '.$user->username.' ('.$user->first_name.' '.$user->last_name.') from IP '.Request::ip());

 

             // Ooops.. something went wrong

             return Redirect::route('login')->with('error', Lang::get('base.auth.forgot_password_confirm.error'));

         } else {

             // Send the activation code through email

-            Mail::queue('emails.auth.password-changed', [ 'user' => $user], function ($m) use ($user) {

-                $m->to($user->email, $user->first_name . ' ' . $user->last_name);

+            Mail::queue('emails.auth.password-changed', ['user' => $user], function($m) use ($user) {

+                $m->to($user->email, $user->first_name.' '.$user->last_name);

                 $m->subject(Lang::get('base.mails.password_changed'));

             });

         }

 

-        Base::Log('Forgot password confirmed for ' . $user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') from IP ' . Request::ip() );

+        Base::Log('Forgot password confirmed for '.$user->username.' ('.$user->first_name.' '.$user->last_name.') from IP '.Request::ip());

 

         // Password successfully reseted

         return Redirect::route('login')->with('success', Lang::get('base.auth.forgot_password_confirm.success'));

Braces +49 added lines, -38 removed lines

@@ -49,10 +49,11 @@ 
         // Is the user logged in?

         if (Sentinel::check())

         {

-            if (Sentinel::inRole('admin'))

-                return Redirect::route('home');

-            else

-                return Redirect::route('user.home');

+            if (Sentinel::inRole('admin')) {
+                            return Redirect::route('home');
+            } else {
+                            return Redirect::route('user.home');
+            }
         }

 

         // Show the page

@@ -69,10 +70,11 @@ 
         // Is the user logged in?

         if (Sentinel::check())

         {

-            if (Sentinel::inRole('admin'))

-                return Redirect::route('home');

-            else

-                return Redirect::route('user.home');

+            if (Sentinel::inRole('admin')) {
+                            return Redirect::route('home');
+            } else {
+                            return Redirect::route('user.home');
+            }
         }

 

         // Show the page

@@ -89,10 +91,11 @@ 
         // Is the user logged in?

         if (Sentinel::check())

         {

-            if (Sentinel::inRole('admin'))

-                return Redirect::route('home');

-            else

-                return Redirect::route('user.home');

+            if (Sentinel::inRole('admin')) {
+                            return Redirect::route('home');
+            } else {
+                            return Redirect::route('user.home');
+            }
         }

 

         // Show the page

@@ -145,10 +148,11 @@ 
         // Is user logged in?

         if (Sentinel::check())

         {

-            if (Sentinel::inRole('admin'))

-                return Redirect::route('home');

-            else

-                return Redirect::route('user.home');

+            if (Sentinel::inRole('admin')) {
+                            return Redirect::route('home');
+            } else {
+                            return Redirect::route('user.home');
+            }
         }

 

         // Find the user using the password reset code

@@ -167,8 +171,7 @@ 
             // Activation was successful

             // Redirect to the login page

             return Redirect::route('login')->with('success', Lang::get('base.auth.activate.success'));

-        }

-        else

+        } else

         {

             // Activation not found or not completed.

             $error = Lang::get('base.auth.activate.error');

@@ -192,8 +195,9 @@ 
             'password' => 'required|between:3,32',

         );

 

-        if (!$isEmail)

-            $rules['email'] = 'required';

+        if (!$isEmail) {
+                    $rules['email'] = 'required';
+        }
 

         // Create a new validator instance from our validation rules

         $validator = Validator::make(Input::all(), $rules);

@@ -258,14 +262,16 @@ 
         $userActivation = $signupStatus == 2;

         $adminActivation = $signupStatus == 3;

 

-        if (!$signupEnabled)

-            return Redirect::to(URL::previous())->withInput()->with('error', Lang::get('base.auth.account.registration_disabled'));

+        if (!$signupEnabled) {
+                    return Redirect::to(URL::previous())->withInput()->with('error', Lang::get('base.auth.account.registration_disabled'));
+        }
 

         $rules = array();

 

         // Declare the rules for the form validation

-        foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field)

-            $rules[$fieldid] = $field['validator'];

+        foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field) {
+                    $rules[$fieldid] = $field['validator'];
+        }
 

         $rules['g-recaptcha-response'] = 'required';

 

@@ -276,8 +282,9 @@ 
 

         // If validation fails, we'll exit the operation now.

         if ($validator->fails() || ($err = $this->captchaCheck()) == false) {

-            if ($err)

-                return Redirect::to(URL::previous())->withInput()->withErrors(['g-recaptcha-response' => Lang::get('base.captcha.error')]);

+            if ($err) {
+                            return Redirect::to(URL::previous())->withInput()->withErrors(['g-recaptcha-response' => Lang::get('base.captcha.error')]);
+            }
 

             // Ooops.. something went wrong

             return Redirect::to(URL::previous())->withInput()->withErrors($validator);

@@ -287,15 +294,17 @@ 
             $data = array();

 

             // Set the data to the user from the User class

-            foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field)

-                $data[$fieldid] = Input::get($fieldid);

+            foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field) {
+                            $data[$fieldid] = Input::get($fieldid);
+            }
 

             // Set the standard data to the user

             $data['ip'] = Request::getClientIP();

             $data['status'] = 0;

             $data['staff'] = 0;

-            if ($data['birthday'] != null)

-                $data['birthday'] = \Carbon\Carbon::createFromFormat('d/m/Y', $data['birthday']);

+            if ($data['birthday'] != null) {
+                            $data['birthday'] = \Carbon\Carbon::createFromFormat('d/m/Y', $data['birthday']);
+            }
 

             // Find the user if it exists and needs to be created

             $user = Sentinel::getUserRepository()->findByCredentials(['email' => Input::get('email')]);

@@ -307,19 +316,21 @@ 
                     $testing = Sentinel::createModel()->getRegisterFields();

                     $user = Sentinel::findById($user->id);

 

-                    foreach($data as $fieldid => $field)

-                        if (!isset($testing[$fieldid]) || $testing[$fieldid]['save'] == true)

-                            $user[$fieldid] = $field;

+                    foreach($data as $fieldid => $field) {
+                                            if (!isset($testing[$fieldid]) || $testing[$fieldid]['save'] == true)

+                            $user[$fieldid] = $field;
+                    }
 

                     $user['password'] = bcrypt($user['password']);

                     Sentinel::update($user, ['email' => Input::get('email')]);

-                }

-                else

-                    return Redirect::to(URL::previous())->withInput()->with('error', Lang::get('base.auth.account.registration_failed'));

+                } else {
+                                    return Redirect::to(URL::previous())->withInput()->with('error', Lang::get('base.auth.account.registration_failed'));
+                }
             }

             // Register the user

-            else

-                $user = Sentinel::register($data, false);

+            else {
+                            $user = Sentinel::register($data, false);
+            }
 

             // If the user needs to activate the account send him an email

             if ($userActivation)

src/Middleware/VisitsCounter.php

Braces +3 added lines, -2 removed lines

@@ -17,8 +17,9 @@
      */
     public function handle($request, Closure $next)
     {
-        if (config('jlourenco.base.VisitCounter'))
-            Base::RegisterVisit();
+        if (config('jlourenco.base.VisitCounter')) {
+                    Base::RegisterVisit();
+        }
 
         return $next($request);
     }

src/Middleware/NewPasswordForce.php

Braces +5 added lines, -4 removed lines

@@ -20,10 +20,11 @@
         {
             if ($user->force_new_password)
             {
-                if ($request->ajax())
-                    return response('New password is required. Login into the website.', 401);
-                else
-                    return Redirect::route('change-password');
+                if ($request->ajax()) {
+                                    return response('New password is required. Login into the website.', 401);
+                } else {
+                                    return Redirect::route('change-password');
+                }
             }
         }
         return $next($request);

src/Models/BaseUser.php

Spacing +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
             'BlogPost.contents' => 1,

         ],

         'joins' => [

-            'BlogPost' => [ 'User.id', 'BlogPost.author' ],

+            'BlogPost' => ['User.id', 'BlogPost.author'],

         ],

     ];

 

src/Models/Logs.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
         if ($value > 0)
             if ($user = Sentinel::findUserById($value))
                 if ($user != null)
-                    return $user->first_name . ' ' . $user->last_name . ' (ID: ' . $user->id . ')';
+                    return $user->first_name.' '.$user->last_name.' (ID: '.$user->id.')';
 
         return $value;
     }
@@ -54,7 +54,7 @@ 
         if ($value > 0)
             if ($user = Sentinel::findUserById($value))
                 if ($user != null)
-                    return $user->first_name . ' ' . $user->last_name . ' (ID: ' . $user->id . ')';
+                    return $user->first_name.' '.$user->last_name.' (ID: '.$user->id.')';
 
         return $value;
     }

Braces +6 added lines, -4 removed lines

@@ -35,10 +35,11 @@ 
      */
     public function getCreatedByAttribute($value)
     {
-        if ($value > 0)
-            if ($user = Sentinel::findUserById($value))
+        if ($value > 0) {
+                    if ($user = Sentinel::findUserById($value))
                 if ($user != null)
                     return $user->first_name . ' ' . $user->last_name . ' (ID: ' . $user->id . ')';
+        }
 
         return $value;
     }
@@ -51,10 +52,11 @@ 
      */
     public function getTargetAttribute($value)
     {
-        if ($value > 0)
-            if ($user = Sentinel::findUserById($value))
+        if ($value > 0) {
+                    if ($user = Sentinel::findUserById($value))
                 if ($user != null)
                     return $user->first_name . ' ' . $user->last_name . ' (ID: ' . $user->id . ')';
+        }
 
         return $value;
     }

src/Models/Settings.php

Spacing +4 added lines, -4 removed lines

@@ -28,13 +28,13 @@
         $str = explode("* ", $this->description);
         $choices = array();
 
-        foreach($str as $st)
+        foreach ($str as $st)
         {
             preg_match('/(?P<digit>\d+) - (?P<name>\w+)/', $st, $matches);
             if (sizeof($matches) > 0) {
-                $st = str_replace("*/","",$st);
-                $st = str_replace("/*","",$st);
-                $choices[$matches[1]] = explode($matches[1] . ' - ', $st)[1];
+                $st = str_replace("*/", "", $st);
+                $st = str_replace("/*", "", $st);
+                $choices[$matches[1]] = explode($matches[1].' - ', $st)[1];
             }
         }