joaogl / base

src/Base.php

Unused Use Statements +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php namespace jlourenco\base;

 

-use jlourenco\base\Repositories\SettingsRepositoryInterface;

-use jlourenco\base\Repositories\UserRepositoryInterface;

-use jlourenco\base\Repositories\LogRepositoryInterface;

-use jlourenco\base\Repositories\VisitsRepositoryInterface;

-use jlourenco\base\Repositories\JobsRepositoryInterface;

-use BadMethodCallException;

-use Request;

-use Jenssegers\Agent\Agent;

-use GeoIP;

+use jlourenco\base\Repositories\SettingsRepositoryInterface;
+use jlourenco\base\Repositories\UserRepositoryInterface;
+use jlourenco\base\Repositories\LogRepositoryInterface;
+use jlourenco\base\Repositories\VisitsRepositoryInterface;
+use jlourenco\base\Repositories\JobsRepositoryInterface;
+use BadMethodCallException;
+use Request;
+use Jenssegers\Agent\Agent;
+use GeoIP;
 use Sentinel;

 

 class Base

Spacing +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
         $platform = $agent->platform();

         $pversion = $agent->version($platform);

 

-        $browserString = $browser . ' version ' . $version . ' | ' . $platform . ' version ' . $pversion;

+        $browserString = $browser.' version '.$version.' | '.$platform.' version '.$pversion;

 

 

         $visit = $this->getVisitsRepository()->create(['url' => Request::url(), 'ip' => Request::ip(), 'browser' => $browserString]);

Braces +4 added lines, -3 removed lines

@@ -226,9 +226,10 @@
     {

         $target = null;

 

-        if ($user = Sentinel::getUser())

-            if ($user != null)

-                $target = $user->id;

+        if ($user = Sentinel::getUser()) {
+                    if ($user != null)

+                $target = $user->id;
+        }
 

         $log = $this->getLogsRepository()->create(['log' => $logMessage, 'ip' => Request::ip(), 'target' => $target]);

     }

src/Controllers/AuthController.php

Doc Comments +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
     /**

      * Account sign in form processing.

      *

-     * @return Redirect

+     * @return \Illuminate\Http\RedirectResponse

      */

     public function postSignin()

     {

@@ -361,7 +361,7 @@ 
     /**

      * Forgot password form processing page.

      *

-     * @return Redirect

+     * @return \Illuminate\Http\RedirectResponse

      */

     public function postForgotPassword()

     {

@@ -411,7 +411,7 @@ 
      *

      * @param number $userId

      * @param  string   $passwordResetCode

-     * @return Redirect

+     * @return \Illuminate\Http\RedirectResponse

      */

     public function postForgotPasswordConfirm($userId, $passwordResetCode)

     {

Unused Use Statements +11 added lines, -13 removed lines

@@ -1,21 +1,19 @@
 <?php namespace jlourenco\base\Controllers;

 

-use App\Http\Controllers\Controller;

-use Illuminate\Support\Facades\Request;

-use Sentinel;

-use View;

-use Validator;

-use Input;

-use Session;

-use Redirect;

-use Lang;

-use URL;

-use Activation;

+use Illuminate\Support\Facades\Request;
+use Sentinel;
+use View;
+use Validator;
+use Input;
+use Redirect;
+use Lang;
+use URL;
+use Activation;
 use Base;

 use \Cartalyst\Sentinel\Checkpoints\NotActivatedException;

 use \Cartalyst\Sentinel\Checkpoints\ThrottlingException;

-use Reminder;

-use Mail;

+use Reminder;
+use Mail;
 use Illuminate\Support\MessageBag;

 

 class AuthController extends controller

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 +38 added lines, -28 removed lines

@@ -47,8 +47,9 @@ 
     public function getSignin()

     {

         // Is the user logged in?

-        if (Sentinel::check())

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

+        if (Sentinel::check()) {
+                    return Redirect::route('home');
+        }
 

         // Show the page

         return View('auth.login');

@@ -62,8 +63,9 @@ 
     public function getSignup()

     {

         // Is the user logged in?

-        if (Sentinel::check())

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

+        if (Sentinel::check()) {
+                    return Redirect::route('home');
+        }
 

         // Show the page

         return View('auth.register');

@@ -77,8 +79,9 @@ 
     public function getLostPassword()

     {

         // Is the user logged in?

-        if (Sentinel::check())

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

+        if (Sentinel::check()) {
+                    return Redirect::route('home');
+        }
 

         // Show the page

         return View('auth.forgot-password');

@@ -148,8 +151,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');

@@ -173,8 +175,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);

@@ -239,14 +242,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';

 

@@ -257,8 +262,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);

@@ -268,15 +274,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')]);

@@ -288,19 +296,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/Controllers/UsersController.php

Doc Comments -2 removed lines

@@ -76,7 +76,6 @@ 
     /**

      * Display specified user profil.

      *

-     * @param  int  $id

      * @return Response

      */

     public function show(User $user)

@@ -209,7 +208,6 @@ 
     /**

      * Change password form processing page.

      *

-     * @param  int      $id

      * @return Redirect

      */

     public function postChangePassword()

Unused Use Statements +13 added lines, -14 removed lines

@@ -1,19 +1,18 @@
 <?php namespace jlourenco\base\Controllers;

 

-use App\Http\Controllers\Controller;

-use Validator;

-use App\Http\Requests;

-use Sentinel;

-use View;

-use Input;

-use File;

-use Activation;

-use Hash;

-use Mail;

-use URL;

-use Illuminate\Support\Facades\Redirect;

-use Base;

-use DB;

+use App\Http\Controllers\Controller;
+use Validator;
+use Sentinel;
+use View;
+use Input;
+use File;
+use Activation;
+use Hash;
+use Mail;
+use URL;
+use Illuminate\Support\Facades\Redirect;
+use Base;
+use DB;
 use Lang;

 

 class UsersController extends Controller

Spacing +46 added lines, -46 removed lines

@@ -138,7 +138,7 @@ 
         // Do we want to update the user password?

         if ($password = Input::get('password'))

         {

-            if (Sentinel::validateCredentials($user, [ 'email' => $email, 'password' => Input::get('old-password')]))

+            if (Sentinel::validateCredentials($user, ['email' => $email, 'password' => Input::get('old-password')]))

             {

                 $passwordChanged = true;

                 $user->password = Hash::make($password);

@@ -157,18 +157,18 @@ 
         if ($file = Input::file('pic')) {

             $extension = $file->getClientOriginalExtension() ?: 'png';

             $folderName = '/uploads/users/';

-            $destinationPath = public_path() . $folderName;

-            $safeName = str_random(10) . '.' . $extension;

+            $destinationPath = public_path().$folderName;

+            $safeName = str_random(10).'.'.$extension;

             $file->move($destinationPath, $safeName);

 

             //delete old pic if exists

-            if (File::exists(public_path() . $folderName . $user->pic))

-                File::delete(public_path() . $folderName . $user->pic);

+            if (File::exists(public_path().$folderName.$user->pic))

+                File::delete(public_path().$folderName.$user->pic);

 

             //save new file path into db

             $user->pic = $safeName;

 

-            Base::Log($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') changed its profile photo. ');

+            Base::Log($user->username.' ('.$user->first_name.' '.$user->last_name.') changed its profile photo. ');

         }

 

         // Was the user updated?

@@ -178,14 +178,14 @@ 
 

             if ($passwordChanged)

             {

-                Base::Log($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') changed its password. ');

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

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

+                Base::Log($user->username.' ('.$user->first_name.' '.$user->last_name.') changed its password. ');

+                Mail::queue('emails.account.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($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') updated the profile. ');

+            Base::Log($user->username.' ('.$user->first_name.' '.$user->last_name.') updated the profile. ');

 

             // Redirect to the user page

             return Redirect::route('profile')->with('success', $success);

@@ -234,7 +234,7 @@ 
             // Do we want to update the user password?

             $password = Input::get('password');

 

-            if (Sentinel::validateCredentials($user, [ 'email' => $user->email, 'password' => Input::get('old-password')]))

+            if (Sentinel::validateCredentials($user, ['email' => $user->email, 'password' => Input::get('old-password')]))

             {

                 $user->password = Hash::make($password);

                 $redirect = 'change-password';

@@ -251,12 +251,12 @@ 
                     // Prepare the success message

                     $success = Lang::get('base.auth.account.changed');

 

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

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

+                    Mail::queue('emails.account.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($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') changed its password account. ');

+                    Base::Log($user->username.' ('.$user->first_name.' '.$user->last_name.') changed its password account. ');

 

                     // Redirect to the user page

                     return Redirect::route($redirect)->with('success', $success);

@@ -353,13 +353,13 @@ 
                 $activation = Activation::exists($user);

             }

 

-            if($activation)

+            if ($activation)

                 Activation::complete($user, $activation->code);

 

-            Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') account was accepted. ', $user->id);

+            Base::TargettedLog($user->username.' ('.$user->first_name.' '.$user->last_name.') account was accepted. ', $user->id);

 

-            Mail::queue('emails.account.accepted-by-admin', [ 'user' => $user ], function ($m) use ($user) {

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

+            Mail::queue('emails.account.accepted-by-admin', ['user' => $user], function($m) use ($user) {

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

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

             });

 

@@ -399,11 +399,11 @@ 
 

         if ($user->save())

         {

-            Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') account was refused. ', $user->id);

+            Base::TargettedLog($user->username.' ('.$user->first_name.' '.$user->last_name.') account was refused. ', $user->id);

 

             if (Base::getSetting('SEND_EMAIL_ON_REFUSE'))

-                Mail::queue('emails.account.refused-by-admin', [ 'user' => $user ], function ($m) use ($user) {

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

+                Mail::queue('emails.account.refused-by-admin', ['user' => $user], function($m) use ($user) {

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

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

                 });

 

@@ -484,7 +484,7 @@ 
         }

 

         // Check if we are not trying to delete ourselves

-        if ($user->id === Sentinel::getUser()->id)  {

+        if ($user->id === Sentinel::getUser()->id) {

             // Prepare the error message

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

 

@@ -575,7 +575,7 @@ 
     public function getAdminEdit($id = null)

     {

         // Get the user information

-        if($user = Sentinel::findById($id))

+        if ($user = Sentinel::findById($id))

         {

             // Get this user groups

             $userRoles = $user->getRoles()->lists('name', 'id')->all();

@@ -640,7 +640,7 @@ 
 

         try {

             // Update the user

-            $user->gender   = Input::get('gender');

+            $user->gender = Input::get('gender');

             $user->first_name  = Input::get('first_name');

             $user->last_name   = Input::get('last_name');

             $user->username    = Input::get('username');

@@ -673,16 +673,16 @@ 
                 if ($extension == 'png' || $extension == 'PNG' || $extension == 'JGP' || $extension == 'jpg' || $extension == 'gif')

                 {

                     $folderName      = '/uploads/users/';

-                    $destinationPath = public_path() . $folderName;

+                    $destinationPath = public_path().$folderName;

                     $safeName        = str_random(10).'.'.$extension;

                     $file->move($destinationPath, $safeName);

 

                     //delete old pic if exists

-                    if(File::exists(public_path() . $folderName . $user->pic))

-                        File::delete(public_path() . $folderName . $user->pic);

+                    if (File::exists(public_path().$folderName.$user->pic))

+                        File::delete(public_path().$folderName.$user->pic);

 

                     //save new file path into db

-                    $user->pic   = $safeName;

+                    $user->pic = $safeName;

                 }

             }

 

@@ -717,7 +717,7 @@ 
             $status = $activation = Activation::completed($user);

             $currentStatus = Input::get('status');

 

-            if($currentStatus != $status)

+            if ($currentStatus != $status)

             {

                 if ($currentStatus == 0)

                     // Remove existing activation record

@@ -733,7 +733,7 @@ 
                         $activation = Activation::exists($user);

                     }

 

-                    if($activation)

+                    if ($activation)

                         Activation::complete($user, $activation->code);

                 }

 

@@ -747,16 +747,16 @@ 
             {

                 if ($password_changed && Input::get('send_new_password_email'))

                 {

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

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

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

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

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

                     });

                 }

 

                 if ($password_changed)

-                    Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') password was changed by an admin. ', $user->id);

+                    Base::TargettedLog($user->username.' ('.$user->first_name.' '.$user->last_name.') password was changed by an admin. ', $user->id);

 

-                Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') profile was changed by an admin. ', $user->id);

+                Base::TargettedLog($user->username.' ('.$user->first_name.' '.$user->last_name.') profile was changed by an admin. ', $user->id);

 

                 // Prepare the success message

                 $success = Lang::get('base.auth.user_changed');

@@ -848,36 +848,36 @@ 
                 if ($extension == 'png' || $extension == 'PNG' || $extension == 'JGP' || $extension == 'jpg' || $extension == 'gif')

                 {

                     $folderName      = '/uploads/users/';

-                    $destinationPath = public_path() . $folderName;

+                    $destinationPath = public_path().$folderName;

                     $safeName        = str_random(10).'.'.$extension;

                     $file->move($destinationPath, $safeName);

 

                     //delete old pic if exists

-                    if(File::exists(public_path() . $folderName . $user->pic))

-                        File::delete(public_path() . $folderName . $user->pic);

+                    if (File::exists(public_path().$folderName.$user->pic))

+                        File::delete(public_path().$folderName.$user->pic);

 

                     //save new file path into db

-                    $user->pic   = $safeName;

+                    $user->pic = $safeName;

                 }

             }

 

             $user->save();

 

-            Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') account was created by an admin. ', $user->id);

+            Base::TargettedLog($user->username.' ('.$user->first_name.' '.$user->last_name.') account was created by an admin. ', $user->id);

 

             if (Input::get('send_new_password_email'))

             {

                 if ($activate)

                 {

-                    Mail::queue('emails.account.account-created-by-admin', [ 'user' => $user, 'new_password' => Input::get('password') ], function ($m) use ($user) {

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

+                    Mail::queue('emails.account.account-created-by-admin', ['user' => $user, 'new_password' => Input::get('password')], function($m) use ($user) {

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

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

                     });

                 }

                 else

                 {

-                    Mail::queue('emails.account.account-created-by-admin-inactive', [ 'user' => $user, 'new_password' => Input::get('password') ], function ($m2) use ($user) {

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

+                    Mail::queue('emails.account.account-created-by-admin-inactive', ['user' => $user, 'new_password' => Input::get('password')], function($m2) use ($user) {

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

                         $m2->subject(Lang::get('base.mails.account_created'));

                     });

 

@@ -890,9 +890,9 @@ 
                     );

 

                     // 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);

                     });

 

                 }

Braces +49 added lines, -42 removed lines

@@ -130,8 +130,9 @@ 
         $user->gender = Input::get('gender');

         $user->description = Input::get('description');

 

-        if (Input::get('birthday') != null)

-            $user->birthday = \Carbon\Carbon::createFromFormat('d/m/Y', Input::get('birthday'));

+        if (Input::get('birthday') != null) {
+                    $user->birthday = \Carbon\Carbon::createFromFormat('d/m/Y', Input::get('birthday'));
+        }
 

         $passwordChanged = false;

 

@@ -142,8 +143,7 @@ 
             {

                 $passwordChanged = true;

                 $user->password = Hash::make($password);

-            }

-            else

+            } else

             {

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

                 $validator->messages()->add('old-password', Lang::get('base.auth.wrong_password'));

@@ -162,8 +162,9 @@ 
             $file->move($destinationPath, $safeName);

 

             //delete old pic if exists

-            if (File::exists(public_path() . $folderName . $user->pic))

-                File::delete(public_path() . $folderName . $user->pic);

+            if (File::exists(public_path() . $folderName . $user->pic)) {
+                            File::delete(public_path() . $folderName . $user->pic);
+            }
 

             //save new file path into db

             $user->pic = $safeName;

@@ -261,8 +262,7 @@ 
                     // Redirect to the user page

                     return Redirect::route($redirect)->with('success', $success);

                 }

-            }

-            else

+            } else

             {

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

                 $validator->messages()->add('old-password', Lang::get('base.auth.wrong_password'));

@@ -353,8 +353,9 @@ 
                 $activation = Activation::exists($user);

             }

 

-            if($activation)

-                Activation::complete($user, $activation->code);

+            if($activation) {
+                            Activation::complete($user, $activation->code);
+            }
 

             Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') account was accepted. ', $user->id);

 

@@ -401,9 +402,10 @@ 
         {

             Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') account was refused. ', $user->id);

 

-            if (Base::getSetting('SEND_EMAIL_ON_REFUSE'))

-                Mail::queue('emails.account.refused-by-admin', [ 'user' => $user ], function ($m) use ($user) {

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

+            if (Base::getSetting('SEND_EMAIL_ON_REFUSE')) {
+                            Mail::queue('emails.account.refused-by-admin', [ 'user' => $user ], function ($m) use ($user) {

+                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+            }
                     $m->subject(Lang::get('base.mails.account_accepted'));

                 });

 

@@ -582,8 +584,7 @@ 
 

             // Get a list of all the available groups

             $roles = Sentinel::getRoleRepository()->all();

-        }

-        else

+        } else

         {

             // Prepare the error message

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

@@ -647,13 +648,15 @@ 
             $user->email       = Input::get('email');

             $user->description = Input::get('description');

 

-            if (Input::get('force_new_password'))

-                $user->force_new_password = 1;

-            else

-                $user->force_new_password = 0;

+            if (Input::get('force_new_password')) {
+                            $user->force_new_password = 1;
+            } else {
+                            $user->force_new_password = 0;
+            }
 

-            if (Input::get('birthday') != null)

-                $user->birthday = \Carbon\Carbon::createFromFormat('d/m/Y', Input::get('birthday'));

+            if (Input::get('birthday') != null) {
+                            $user->birthday = \Carbon\Carbon::createFromFormat('d/m/Y', Input::get('birthday'));
+            }
 

             $password_changed = false;

 

@@ -678,8 +681,9 @@ 
                     $file->move($destinationPath, $safeName);

 

                     //delete old pic if exists

-                    if(File::exists(public_path() . $folderName . $user->pic))

-                        File::delete(public_path() . $folderName . $user->pic);

+                    if(File::exists(public_path() . $folderName . $user->pic)) {
+                                            File::delete(public_path() . $folderName . $user->pic);
+                    }
 

                     //save new file path into db

                     $user->pic   = $safeName;

@@ -719,10 +723,10 @@ 
 

             if($currentStatus != $status)

             {

-                if ($currentStatus == 0)

-                    // Remove existing activation record

-                    Activation::remove($user);

-                else

+                if ($currentStatus == 0) {
+                                    // Remove existing activation record

+                    Activation::remove($user);
+                } else

                 {

                     $activation = Activation::exists($user);

 

@@ -733,14 +737,15 @@ 
                         $activation = Activation::exists($user);

                     }

 

-                    if($activation)

-                        Activation::complete($user, $activation->code);

+                    if($activation) {
+                                            Activation::complete($user, $activation->code);
+                    }
                 }

 

                 $user->status = $currentStatus;

-            }

-            else

-                $user->status = $currentStatus;

+            } else {
+                            $user->status = $currentStatus;
+            }
 

             // Was the user updated?

             if ($user->save())

@@ -753,8 +758,9 @@ 
                     });

                 }

 

-                if ($password_changed)

-                    Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') password was changed by an admin. ', $user->id);

+                if ($password_changed) {
+                                    Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') password was changed by an admin. ', $user->id);
+                }
 

                 Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') profile was changed by an admin. ', $user->id);

 

@@ -834,10 +840,11 @@ 
             $user->password = Hash::make(Input::get('password'));

             $user->description = Input::get('description');

 

-            if (Input::get('force_new_password'))

-                $user->force_new_password = 1;

-            else

-                $user->force_new_password = 0;

+            if (Input::get('force_new_password')) {
+                            $user->force_new_password = 1;
+            } else {
+                            $user->force_new_password = 0;
+            }
 

             // is new image uploaded?

             if ($file = Input::file('pic'))

@@ -853,8 +860,9 @@ 
                     $file->move($destinationPath, $safeName);

 

                     //delete old pic if exists

-                    if(File::exists(public_path() . $folderName . $user->pic))

-                        File::delete(public_path() . $folderName . $user->pic);

+                    if(File::exists(public_path() . $folderName . $user->pic)) {
+                                            File::delete(public_path() . $folderName . $user->pic);
+                    }
 

                     //save new file path into db

                     $user->pic   = $safeName;

@@ -873,8 +881,7 @@ 
                         $m->to($user->email, $user->first_name . ' ' . $user->last_name);

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

                     });

-                }

-                else

+                } else

                 {

                     Mail::queue('emails.account.account-created-by-admin-inactive', [ 'user' => $user, 'new_password' => Input::get('password') ], function ($m2) use ($user) {

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

src/Models/BaseUser.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php namespace jlourenco\base\Models;

 

-use Illuminate\Database\Eloquent\SoftDeletes;

-use Cartalyst\Sentinel\Users\EloquentUser;

-use jlourenco\support\Traits\Creation;

+use Illuminate\Database\Eloquent\SoftDeletes;
+use Cartalyst\Sentinel\Users\EloquentUser;
+use jlourenco\support\Traits\Creation;
 use Nicolaslopezj\Searchable\SearchableTrait;

 

 class BaseUser extends EloquentUser

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/Visits.php

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php namespace jlourenco\base\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use jlourenco\base\Repositories\LogRepositoryInterface;
-use jlourenco\support\Traits\Creation;
 
 class Visits extends Model
 {

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/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);
     }