joaogl / base

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

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

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

 

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;