joaogl / base

src/Controllers/SettingsController.php

Spacing +2 added lines, -2 removed lines

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

     public function  update($id, Request $request)

     {

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

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

 

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

 

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

         $after = $move->value;

 

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

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

 

         return redirect('admin/settings');

     }

src/Controllers/AuthController.php

Spacing +33 added lines, -33 removed lines

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

     {

         // Find the user using the password reset code

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

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

         {

             // Redirect to the forgot password page

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

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

 

         // Find the user using the password reset code

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

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

         {

             // Redirect to the forgot password page

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

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

         }

         try {

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

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

             {

                 $data = array(

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

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

 

                 // Try to log the user in

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

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

                 {

                     $user = Sentinel::check();

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

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

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

                     

                     // Redirect to the dashboard page

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

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

         } catch (ThrottlingException $e) {

             $delay = $e->getDelay();

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

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

         }

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

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

 

         // Ooops.. something went wrong

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

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

 

         // Declare the rules for the form validation

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

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

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

 

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

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

 

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

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

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

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

 

             // Set the standard data to the user

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

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

 

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

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

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

                             $user[$fieldid] = $field;

 

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

 

                 // Send the activation code through email

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

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

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

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

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

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

                 });

             }

 

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

             if ($adminActivation)

             {

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

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

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

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

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

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

                 });

             }

 

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

                     Sentinel::login($user, false);

 

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

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

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

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

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

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

                     });

                 }

             }

 

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

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

 

             // Redirect to the home page with success menu

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

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

         } catch (UserExistsException $e) {

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

         }

 

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

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

 

         // Ooops.. something went wrong

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

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

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

 

-        if($user)

+        if ($user)

         {

             //get reminder for user

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

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

             $data = array(

                 'user'              => $user,

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

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

             );

 

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

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

 

             // Send the activation code through email

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

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

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

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

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

             });

         }

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

         if ($validator->fails()) {

             // Ooops.. something went wrong

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

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

         }

 

         // Find the user using the password reset code

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

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

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

         {

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

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

 

             // Ooops.. something went wrong

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

         } else {

             // Send the activation code through email

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

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

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

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

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

             });

         }

 

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

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

 

         // Password successfully reseted

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

src/Models/BaseUser.php

Spacing +1 added lines, -1 removed lines

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

         ],

         'joins' => [

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

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

         ],

     ];

 

src/Models/Logs.php

Spacing +2 added lines, -2 removed lines

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

src/Models/Settings.php

Spacing +4 added lines, -4 removed lines

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

src/Migrations/2016_01_14_235300_create_base_tables.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
     public function up()

     {

 

-        Schema::create('User', function (Blueprint $table) {

+        Schema::create('User', function(Blueprint $table) {

             $table->increments('id');

             $table->string('username', 25)->nullable()->unique();

             $table->string('password', 60)->nullable();

@@ -37,11 +37,11 @@ 
             $table->creation();

         });

 

-        Schema::table('User', function (Blueprint $table) {

+        Schema::table('User', function(Blueprint $table) {

             $table->creationRelation();

         });

 

-        Schema::create('Visits', function (Blueprint $table) {

+        Schema::create('Visits', function(Blueprint $table) {

             $table->increments('id');

             $table->string('url')->nullable();

             $table->string('ip', 15)->nullable();

@@ -60,7 +60,7 @@ 
             $table->timestamps();

         });

 

-        Schema::create('Logs', function (Blueprint $table) {

+        Schema::create('Logs', function(Blueprint $table) {

             $table->increments('id');

             $table->text('log');

             $table->integer('target')->nullable();

@@ -69,11 +69,11 @@ 
             $table->creation();

         });

 

-        Schema::table('Logs', function (Blueprint $table) {

+        Schema::table('Logs', function(Blueprint $table) {

             $table->creationRelation();

         });

 

-        Schema::create('Settings', function (Blueprint $table) {

+        Schema::create('Settings', function(Blueprint $table) {

             $table->increments('id');

             $table->string('friendly_name', 25);

             $table->string('name', 25);

@@ -83,11 +83,11 @@ 
             $table->creation();

         });

 

-        Schema::table('Settings', function (Blueprint $table) {

+        Schema::table('Settings', function(Blueprint $table) {

             $table->creationRelation();

         });

 

-        Schema::create('Group', function (Blueprint $table) {

+        Schema::create('Group', function(Blueprint $table) {

             $table->increments('id');

             $table->string('name', 25);

             $table->string('description', 250)->nullable();

@@ -101,11 +101,11 @@ 
             $table->unique('slug');

         });

 

-        Schema::table('Group', function (Blueprint $table) {

+        Schema::table('Group', function(Blueprint $table) {

             $table->creationRelation();

         });

 

-        Schema::create('Group_User', function (Blueprint $table) {

+        Schema::create('Group_User', function(Blueprint $table) {

             $table->increments('id');

             $table->integer('user')->unsigned();

             $table->integer('group')->unsigned();

@@ -118,11 +118,11 @@ 
             $table->foreign('group')->references('id')->on('Group');

         });

 

-        Schema::table('Group_User', function (Blueprint $table) {

+        Schema::table('Group_User', function(Blueprint $table) {

             $table->creationRelation();

         });

 

-        Schema::create('ActivityFeed', function (Blueprint $table) {

+        Schema::create('ActivityFeed', function(Blueprint $table) {

             $table->increments('id');

             $table->string('added_by', 150);

             $table->text('activity');

src/Base.php

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

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