joaogl / base

src/Controllers/GroupsController.php

Doc Comments +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
      * Group update form processing page.
      *
      * @param  int      $id
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function postEdit($id = null)
     {
@@ -164,7 +164,7 @@ 
     /**
      * Group create form processing.
      *
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function postCreate()
     {
@@ -232,7 +232,7 @@ 
      * Delete the given group.
      *
      * @param  int      $id
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function getDelete($id = null)
     {

Unused Use Statements -4 removed lines

@@ -1,11 +1,7 @@
 <?php namespace jlourenco\base\Controllers;
 
-use Illuminate\Http\Request;
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
-use Blog;
 use Sentinel;
-use Searchy;
 use Validator;
 use Input;
 use Base;

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
         $group = Sentinel::getRoleRepository()->find($id);
 
         // Get the group's information
-        if($group == null)
+        if ($group == null)
         {
             // Prepare the error message
             $error = Lang::get('base.groups.not_found');
@@ -128,7 +128,7 @@ 
         // Was the post updated?
         if ($group->save())
         {
-            Base::Log('Group (' . $group->id . ' - ' . $group->name . ') was edited.');
+            Base::Log('Group ('.$group->id.' - '.$group->name.') was edited.');
 
             // Prepare the success message
             $success = Lang::get('base.groups.changed');
@@ -195,7 +195,7 @@ 
 
         $group->save();
 
-        Base::Log('A new group (' . $group->id . ' - ' . $group->name . ') was created.');
+        Base::Log('A new group ('.$group->id.' - '.$group->name.') was created.');
 
         // Redirect to the home page with success menu
         return Redirect::route("groups")->with('success', Lang::get('base.groups.created'));
@@ -248,7 +248,7 @@ 
             return Redirect::route('groups')->with('error', $error);
         }
 
-        Base::Log('Group (' . $group->id . ' - ' . $group->name . ') was deleted.');
+        Base::Log('Group ('.$group->id.' - '.$group->name.') was deleted.');
 
         // Delete the group
         $group->delete();

Braces +9 added lines, -6 removed lines

@@ -76,8 +76,9 @@ 
 
         $groups2 = Sentinel::getRoleRepository()->all(['id', 'name']);
 
-        foreach ($groups2 as $g)
-            $groups[$g->id] = $g->name;
+        foreach ($groups2 as $g) {
+                    $groups[$g->id] = $g->name;
+        }
 
         // Show the page
         return View('admin.groups.edit', compact('group', 'groups'));
@@ -154,8 +155,9 @@ 
 
         $groups2 = Sentinel::getRoleRepository()->all(['id', 'name']);
 
-        foreach ($groups2 as $g)
-            $groups[$g->id] = $g->name;
+        foreach ($groups2 as $g) {
+                    $groups[$g->id] = $g->name;
+        }
 
         // Show the page
         return View('admin.groups.create', compact('groups'));
@@ -184,8 +186,9 @@ 
 
         $group = Sentinel::getRoleRepository()->findBySlug($slug);
 
-        if ($group != null)
-            return Redirect::route("groups")->with('error', Lang::get('base.groups.already_exists'));
+        if ($group != null) {
+                    return Redirect::route("groups")->with('error', Lang::get('base.groups.already_exists'));
+        }
 
         $group = Sentinel::getRoleRepository()->create([
             'name' => Input::get('name'),

src/routes.php

Spacing +8 added lines, -8 removed lines

@@ -6,7 +6,7 @@ 
  * All the "restricted area" routes

  * are defined here.

  */

-Route::group(array('prefix' => '/', 'middleware' => 'webPublic'), function ()

+Route::group(array('prefix' => '/', 'middleware' => 'webPublic'), function()

 {

 

     /**

@@ -38,10 +38,10 @@ 
     /* POST */ Route::post('login', 'jlourenco\base\Controllers\AuthController@postSignin');

 

     /* GET  */ Route::get('register', array('as' => 'register', 'uses' => 'jlourenco\base\Controllers\AuthController@getSignup'));

-    /* POST */ Route::post('register', array('as' => 'register','uses' => 'jlourenco\base\Controllers\AuthController@postSignup'));

+    /* POST */ Route::post('register', array('as' => 'register', 'uses' => 'jlourenco\base\Controllers\AuthController@postSignup'));

 

     /* GET  */ Route::get('forgot-password', array('as' => 'forgot-password', 'uses' => 'jlourenco\base\Controllers\AuthController@getLostPassword'));

-    /* POST */ Route::post('forgot-password', array('as' => 'forgot-password','uses' => 'jlourenco\base\Controllers\AuthController@postForgotPassword'));

+    /* POST */ Route::post('forgot-password', array('as' => 'forgot-password', 'uses' => 'jlourenco\base\Controllers\AuthController@postForgotPassword'));

 

     # Forgot Password Confirmation

     Route::get('forgot-password/{userId}/{passwordResetCode}', array('as' => 'forgot-password-confirm', 'uses' => 'jlourenco\base\Controllers\AuthController@getForgotPasswordConfirm'));

@@ -54,7 +54,7 @@ 
     Route::get('activate/{userId}/{activationCode}', array('as' => 'activate', 'uses' => 'jlourenco\base\Controllers\AuthController@getActivate'));

 

     # User account

-    Route::group(array('middleware' => 'auth'), function () {

+    Route::group(array('middleware' => 'auth'), function() {

         Route::get('profile', array('as' => 'profile', 'uses' => 'jlourenco\base\Controllers\UsersController@myAccount'));

         Route::post('profile', 'jlourenco\base\Controllers\UsersController@updateAccount');

 

@@ -70,7 +70,7 @@ 
  * All the "restricted area" routes

  * are defined here.

  */

-Route::group(array('prefix' => '/admin', 'middleware' => ['webAdmin', 'auth']), function ()

+Route::group(array('prefix' => '/admin', 'middleware' => ['webAdmin', 'auth']), function()

 {

 

     # Dashboard

@@ -89,7 +89,7 @@ 
     /* POST */ Route::post('settings/{id}/edit', array('as' => 'settings.update', 'uses' => 'jlourenco\base\Controllers\SettingsController@update'));

 

     # User Management

-    Route::group(array('prefix' => 'users'), function () {

+    Route::group(array('prefix' => 'users'), function() {

         Route::get('/list', array('as' => 'users', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminIndex'));

         Route::get('/pending', array('as' => 'users.pending', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminPending'));

         Route::get('/blocked', array('as' => 'users.blocked', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminBlocked'));

@@ -102,7 +102,7 @@ 
         Route::get('/list/{userId}/delete', array('as' => 'delete/user', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminDelete'));

         Route::get('/list/{userId}/confirm-delete', array('as' => 'confirm-delete/user', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminModalDelete'));

         Route::get('/list/{userId}/restore', array('as' => 'restore/user', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminRestore'));

-        Route::get('deleted',array('as' => 'users.deleted', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminDeletedUsers'));

+        Route::get('deleted', array('as' => 'users.deleted', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminDeletedUsers'));

         Route::get('/list/{userId}', array('as' => 'users.show', 'uses' => 'jlourenco\base\Controllers\UsersController@adminShow'));

 

         Route::get('/list/{userId}/confirm-remove/{groupId}', array('as' => 'confirm-remove/group', 'uses' => 'jlourenco\base\Controllers\UsersController@getAdminModalRemoveGroup'));

@@ -112,7 +112,7 @@ 
     });

 

     # Groups Management

-    Route::group(array('prefix' => 'groups'), function () {

+    Route::group(array('prefix' => 'groups'), function() {

         Route::get('/list', array('as' => 'groups', 'uses' => 'jlourenco\base\Controllers\GroupsController@index'));

         Route::get('/create', array('as' => 'create.group', 'uses' => 'jlourenco\base\Controllers\GroupsController@getCreate'));

         Route::post('/create', 'jlourenco\base\Controllers\GroupsController@postCreate');

src/Controllers/UsersController.php

Spacing +48 added lines, -48 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'));

                 });

 

@@ -486,7 +486,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');

 

@@ -577,7 +577,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();

@@ -656,7 +656,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');

@@ -689,16 +689,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;

                 }

             }

 

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

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

 

-            if($currentStatus != $status)

+            if ($currentStatus != $status)

             {

                 if ($currentStatus == 0)

                     // Remove existing activation record

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

                     }

 

-                    if($activation)

+                    if ($activation)

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

                 }

 

@@ -763,16 +763,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');

@@ -864,36 +864,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'));

                     });

 

@@ -906,9 +906,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);

                     });

 

                 }

@@ -969,7 +969,7 @@ 
         }

 

         // Check if we are not trying to delete ourselves

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

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

             // Prepare the error message

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

 

@@ -1010,7 +1010,7 @@ 
         }

 

         // Check if we are not trying to delete ourselves

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

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

             // Prepare the error message

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

 

Braces +57 added lines, -48 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'));

                 });

 

@@ -584,8 +586,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');

@@ -604,12 +605,14 @@ 
         foreach ($groups2 as $g)

         {

             $has = false;

-            foreach ($user->roles as $g2)

-                if ($g2->id == $g->id)

-                    $has = true;

-

-            if (!$has)

-                $groups[$g->id] = $g->name;

+            foreach ($user->roles as $g2) {
+                            if ($g2->id == $g->id)

+                    $has = true;
+            }
+

+            if (!$has) {
+                            $groups[$g->id] = $g->name;
+            }
         }

 

         // Show the page

@@ -663,13 +666,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;

 

@@ -694,8 +699,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;

@@ -735,10 +741,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);

 

@@ -749,14 +755,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())

@@ -769,8 +776,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);

 

@@ -850,10 +858,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'))

@@ -869,8 +878,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;

@@ -889,8 +899,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/Controllers/AuthController.php

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

Spacing +15 added lines, -15 removed lines

@@ -49,41 +49,41 @@ 
     {
         // Publish our views
         $this->publishes([
-            __DIR__ .  '/views' => base_path("resources/views")
+            __DIR__.'/views' => base_path("resources/views")
         ]);
 
         // Publish our lang
         $this->publishes([
-            __DIR__ .  '/lang' => base_path("resources/lang")
+            __DIR__.'/lang' => base_path("resources/lang")
         ]);
 
         // Publish our public
         $this->publishes([
-            __DIR__ .  '/public' => base_path("public")
+            __DIR__.'/public' => base_path("public")
         ]);
 
         // Publish our migrations
         $this->publishes([
-            __DIR__ .  '/migrations' => base_path("database/migrations")
+            __DIR__.'/migrations' => base_path("database/migrations")
         ], 'migrations');
 
         // Publish our migrations
         $this->publishes([
-            __DIR__ .  '/seeds' => base_path("database/seeds")
+            __DIR__.'/seeds' => base_path("database/seeds")
         ], 'seeds');
 
         // Publish a config file
         $this->publishes([
-            __DIR__ . '/config' => base_path('/config')
+            __DIR__.'/config' => base_path('/config')
         ], 'config');
 
         // Publish our routes
         $this->publishes([
-            __DIR__ .  '/routes.php' => base_path("app/Http/base_routes.php")
+            __DIR__.'/routes.php' => base_path("app/Http/base_routes.php")
         ], 'routes');
 
         // Include the routes file
-        if(file_exists(base_path("app/Http/base_routes.php")))
+        if (file_exists(base_path("app/Http/base_routes.php")))
             include base_path("app/Http/base_routes.php");
     }
 
@@ -94,7 +94,7 @@ 
      */
     protected function registerUsers()
     {
-        $this->app->singleton('jlourenco.user', function ($app) {
+        $this->app->singleton('jlourenco.user', function($app) {
             $config = $app['config']->get('jlourenco.base');
 
             $users = array_get($config, 'models.User');
@@ -114,7 +114,7 @@ 
      */
     protected function registerGroups()
     {
-        $this->app->singleton('jlourenco.group', function ($app) {
+        $this->app->singleton('jlourenco.group', function($app) {
             $config = $app['config']->get('jlourenco.base');
 
             $model = array_get($config, 'base.models.Group');
@@ -130,7 +130,7 @@ 
      */
     protected function registerSettings()
     {
-        $this->app->singleton('jlourenco.settings', function ($app) {
+        $this->app->singleton('jlourenco.settings', function($app) {
             $config = $app['config']->get('jlourenco.base');
 
             $model = array_get($config, 'models.Settings');
@@ -146,7 +146,7 @@ 
      */
     protected function registerLog()
     {
-        $this->app->singleton('jlourenco.log', function ($app) {
+        $this->app->singleton('jlourenco.log', function($app) {
             $config = $app['config']->get('jlourenco.base');
 
             $model = array_get($config, 'models.Logs');
@@ -162,7 +162,7 @@ 
      */
     protected function registerVisits()
     {
-        $this->app->singleton('jlourenco.visits', function ($app) {
+        $this->app->singleton('jlourenco.visits', function($app) {
             $config = $app['config']->get('jlourenco.base');
 
             $model = array_get($config, 'models.Visits');
@@ -178,7 +178,7 @@ 
      */
     protected function registerJobs()
     {
-        $this->app->singleton('jlourenco.jobs', function ($app) {
+        $this->app->singleton('jlourenco.jobs', function($app) {
             $config = $app['config']->get('jlourenco.base');
 
             $model = array_get($config, 'models.Jobs');
@@ -194,7 +194,7 @@ 
      */
     protected function registerBase()
     {
-        $this->app->singleton('base', function ($app) {
+        $this->app->singleton('base', function($app) {
             $base = new Base($app['jlourenco.settings'], $app['jlourenco.user'], $app['jlourenco.log'], $app['jlourenco.visits'], $app['jlourenco.jobs']);
 
             return $base;