joaogl / base

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

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

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;

src/Repositories/SettingsRepository.php

Braces +3 added lines, -2 removed lines

@@ -20,8 +20,9 @@
      */

     public function __construct($model = null)

     {

-        if (isset($model))

-            $this->model = $model;

+        if (isset($model)) {
+                    $this->model = $model;
+        }
     }

 

     /**

src/Repositories/VisitsRepository.php

Braces +3 added lines, -2 removed lines

@@ -20,8 +20,9 @@
      */
     public function __construct($model = null)
     {
-        if (isset($model))
-            $this->model = $model;
+        if (isset($model)) {
+                    $this->model = $model;
+        }
     }
 
     /**

src/Repositories/LogRepository.php

Braces +3 added lines, -2 removed lines

@@ -20,8 +20,9 @@
      */
     public function __construct($model = null)
     {
-        if (isset($model))
-            $this->model = $model;
+        if (isset($model)) {
+                    $this->model = $model;
+        }
     }
 
     /**

src/Controllers/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/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');