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/Middleware/VisitsCounter.php

Braces +3 added lines, -2 removed lines

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

src/Middleware/NewPasswordForce.php

Braces +5 added lines, -4 removed lines

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

src/Models/Logs.php

Spacing +2 added lines, -2 removed lines

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

Braces +6 added lines, -4 removed lines

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

src/Models/Settings.php

Spacing +4 added lines, -4 removed lines

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

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

Spacing +5 added lines, -5 removed lines

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

  * are defined here.

  */

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

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

 {

 

     /**

@@ -32,23 +32,23 @@ 
     /* 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'));

     Route::post('forgot-password/{userId}/{passwordResetCode}', 'jlourenco\base\Controllers\AuthController@postForgotPasswordConfirm');

 

     # Logout

-    Route::get('logout', array('as' => 'logout','uses' => 'jlourenco\base\Controllers\AuthController@getLogout'));

+    Route::get('logout', array('as' => 'logout', 'uses' => 'jlourenco\base\Controllers\AuthController@getLogout'));

 

     # Account Activation

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

 

     # User account

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

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

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

         Route::post('my-account', 'jlourenco\base\Controllers\UsersController@updateAccount');

     });

src/baseServiceProvider.php

Spacing +13 added lines, -13 removed lines

@@ -47,31 +47,31 @@ 
         // Publish our views
         $this->loadViewsFrom(base_path("resources/views"), 'base');
         $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")
         ], 'migrations');
 
         // Publish our migrations
         $this->publishes([
-            __DIR__ .  '/migrations' => base_path("database/migrations")
+            __DIR__.'/migrations' => base_path("database/migrations")
         ], 'migrations');
 
         // 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");
     }
 
@@ -82,7 +82,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');
@@ -102,7 +102,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');
@@ -118,7 +118,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');
@@ -134,7 +134,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');
@@ -150,7 +150,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');
@@ -166,7 +166,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');
@@ -182,7 +182,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;

Braces +6 added lines, -4 removed lines

@@ -71,8 +71,9 @@ 
         ], 'routes');
 
         // Include the routes file
-        if(file_exists(base_path("app/Http/base_routes.php")))
-            include 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");
+        }
     }
 
     /**
@@ -88,8 +89,9 @@ 
             $users = array_get($config, 'models.User');
             $model = array_get($config, 'models.Group');
 
-            if (class_exists($model) && method_exists($model, 'setUsersModel'))
-                forward_static_call_array([$model, 'setUsersModel'], [$users]);
+            if (class_exists($model) && method_exists($model, 'setUsersModel')) {
+                            forward_static_call_array([$model, 'setUsersModel'], [$users]);
+            }
 
             return new UserRepository($users);
         });