vojtasvoboda / oc-useraccesslog-plugin

updates/create_accesslog_table.php

Indentation +26 added lines, -26 removed lines

@@ -9,31 +9,31 @@
 class CreateAccessLogTable extends Migration
 {
 
-	public function up()
-	{
-		Schema::create('user_access_log', function($table)
-		{
-			$table->engine = 'InnoDB';
-			$table->increments('id');
-
-			$table->integer('user_id')->unsigned()->nullable();
-			$table->foreign('user_id')->references('id')->on('users')->onDelete('set null');
-
-			$table->string('ip_address')->nullable();
-
-			$table->timestamps();
-		});
-	}
-
-	public function down()
-	{
-		DB::statement("SET foreign_key_checks = 0");
-		Schema::table('user_access_log', function($table)
-		{
-			$table->dropForeign('user_access_log_user_id_foreign');
-		});
-		Schema::dropIfExists('user_access_log');
-		DB::statement("SET foreign_key_checks = 1");
-	}
+    public function up()
+    {
+        Schema::create('user_access_log', function($table)
+        {
+            $table->engine = 'InnoDB';
+            $table->increments('id');
+
+            $table->integer('user_id')->unsigned()->nullable();
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('set null');
+
+            $table->string('ip_address')->nullable();
+
+            $table->timestamps();
+        });
+    }
+
+    public function down()
+    {
+        DB::statement("SET foreign_key_checks = 0");
+        Schema::table('user_access_log', function($table)
+        {
+            $table->dropForeign('user_access_log_user_id_foreign');
+        });
+        Schema::dropIfExists('user_access_log');
+        DB::statement("SET foreign_key_checks = 1");
+    }
 
 }

reportwidgets/AccessLogChartLineAggregated.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
     {
         try {
             $this->vars['all'] = $this->loadData();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->vars['error'] = $ex->getMessage();
             $this->vars['all'] = '';
         }

Indentation +12 added lines, -12 removed lines

@@ -38,24 +38,24 @@
      *
      * @return array
      */
-	public function defineProperties()
-	{
-		return [
-			'title' => [
-				'title' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartlineaggregated.title',
-				'default' => 'Access statistics in time',
-				'type' => 'string',
-				'validationPattern' => '^.+$',
-				'validationMessage' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartlineaggregated.title_validation',
-			],
+    public function defineProperties()
+    {
+        return [
+            'title' => [
+                'title' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartlineaggregated.title',
+                'default' => 'Access statistics in time',
+                'type' => 'string',
+                'validationPattern' => '^.+$',
+                'validationMessage' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartlineaggregated.title_validation',
+            ],
             'days' => [
                 'title' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartlineaggregated.days_title',
                 'default' => '30',
                 'type' => 'string',
                 'validationPattern' => '^[0-9]+$',
             ]
-		];
-	}
+        ];
+    }
 
     protected function loadData()
     {

Spacing +12 added lines, -12 removed lines

@@ -21,11 +21,11 @@ 
     public function render()
     {
         try {
-            $this->vars['all'] = $this->loadData();
+            $this->vars[ 'all' ] = $this->loadData();
         }
         catch (Exception $ex) {
-            $this->vars['error'] = $ex->getMessage();
-            $this->vars['all'] = '';
+            $this->vars[ 'error' ] = $ex->getMessage();
+            $this->vars[ 'all' ] = '';
         }
 
         return $this->makePartial('widget');
@@ -59,7 +59,7 @@ 
     {
         $days = $this->property('days');
         if (!$days) {
-            throw new ApplicationException('Invalid days value: ' . $days);
+            throw new ApplicationException('Invalid days value: '.$days);
         }
 
         // all accesses for last month
@@ -71,9 +71,9 @@ 
         // we need at least two days, to display chart
         if (sizeof($all) == 1) {
             $day = reset($all);
-            $date = Carbon::createFromFormat('Y-m-d', $day['date'])->subDays(1);
+            $date = Carbon::createFromFormat('Y-m-d', $day[ 'date' ])->subDays(1);
             $dateFormated = $date->format('Y-m-d');
-            $all[$dateFormated] = [
+            $all[ $dateFormated ] = [
                 'timestamp' => $date->timestamp * 1000,
                 'date' => $dateFormated,
                 'count' => 0,
@@ -81,9 +81,9 @@ 
         }
 
         // count accessess for each day
-        $all_render = [];
+        $all_render = [ ];
         foreach ($all as $a) {
-            $all_render[] = [$a['timestamp'], $a['count']];
+            $all_render[ ] = [ $a[ 'timestamp' ], $a[ 'count' ] ];
         }
 
         return $all_render;
@@ -98,7 +98,7 @@ 
      */
     private function sortItemsToDays($items)
     {
-        $all = [];
+        $all = [ ];
 
         foreach ($items as $item)
         {
@@ -107,8 +107,8 @@ 
             $day = Carbon::createFromFormat('Y-m-d H:i:s', $item->created_at)->format('Y-m-d');
 
             // init empty day
-            if (!isset($all[$day])) {
-                $all[$day] = [
+            if (!isset($all[ $day ])) {
+                $all[ $day ] = [
                     'timestamp' => $timestamp,
                     'date' => $day,
                     'count' => 0,
@@ -116,7 +116,7 @@ 
             }
 
             // increase count
-            $all[$day]['count']++;
+            $all[ $day ][ 'count' ]++;
         }
 
         return $all;

reportwidgets/Registrations.php

Spacing +12 added lines, -12 removed lines

@@ -20,11 +20,11 @@ 
     public function render()
     {
         try {
-            $this->vars['registrations'] = $this->loadData();
+            $this->vars[ 'registrations' ] = $this->loadData();
 
         } catch (Exception $ex) {
-            $this->vars['error'] = $ex->getMessage();
-            $this->vars['registrations'] = [];
+            $this->vars[ 'error' ] = $ex->getMessage();
+            $this->vars[ 'registrations' ] = [ ];
         }
 
         return $this->makePartial('widget');
@@ -53,7 +53,7 @@ 
     {
         $days = $this->property('days');
         if (!$days) {
-            throw new ApplicationException('Invalid days value: ' . $days);
+            throw new ApplicationException('Invalid days value: '.$days);
         }
 
         // all accesses for last month
@@ -65,9 +65,9 @@ 
         // we need at least two days, to display chart
         if (sizeof($all) == 1) {
             $day = reset($all);
-            $date = Carbon::createFromFormat('Y-m-d', $day['date'])->subDays(1);
+            $date = Carbon::createFromFormat('Y-m-d', $day[ 'date' ])->subDays(1);
             $dateFormated = $date->format('Y-m-d');
-            $all[$dateFormated] = [
+            $all[ $dateFormated ] = [
                 'timestamp' => $date->timestamp * 1000,
                 'date' => $dateFormated,
                 'count' => 0,
@@ -75,9 +75,9 @@ 
         }
 
         // count all
-        $all_render = [];
+        $all_render = [ ];
         foreach ($all as $a) {
-            $all_render[] = [$a['timestamp'], $a['count']];
+            $all_render[ ] = [ $a[ 'timestamp' ], $a[ 'count' ] ];
         }
 
         return $all_render;
@@ -92,7 +92,7 @@ 
      */
     private function sortItemsToDays($items)
     {
-        $all = [];
+        $all = [ ];
 
         foreach ($items as $item)
         {
@@ -101,8 +101,8 @@ 
             $day = Carbon::createFromFormat('Y-m-d H:i:s', $item->created_at)->format('Y-m-d');
 
             // init empty day
-            if (!isset($all[$day])) {
-                $all[$day] = [
+            if (!isset($all[ $day ])) {
+                $all[ $day ] = [
                     'timestamp' => $timestamp,
                     'date' => $day,
                     'count' => 0,
@@ -110,7 +110,7 @@ 
             }
 
             // increase count
-            $all[$day]['count']++;
+            $all[ $day ][ 'count' ]++;
         }
 
         return $all;

reportwidgets/AccessLogChartLine.php

Spacing +29 added lines, -29 removed lines

@@ -21,15 +21,15 @@ 
     public function render()
     {
         try {
-            $this->vars['all'] = $this->loadData()['all'];
-            $this->vars['rows'] = $this->loadData()['user_rows'];
-            $this->vars['users'] = $this->loadData()['users'];
+            $this->vars[ 'all' ] = $this->loadData()[ 'all' ];
+            $this->vars[ 'rows' ] = $this->loadData()[ 'user_rows' ];
+            $this->vars[ 'users' ] = $this->loadData()[ 'users' ];
 
         } catch (Exception $ex) {
-            $this->vars['error'] = $ex->getMessage();
-            $this->vars['all'] = 0;
-            $this->vars['users'] = [];
-            $this->vars['rows'] = [];
+            $this->vars[ 'error' ] = $ex->getMessage();
+            $this->vars[ 'all' ] = 0;
+            $this->vars[ 'users' ] = [ ];
+            $this->vars[ 'rows' ] = [ ];
         }
 
         return $this->makePartial('widget');
@@ -58,35 +58,35 @@ 
     {
         $days = $this->property('days');
         if (!$days) {
-            throw new ApplicationException('Invalid days value: ' . $days);
+            throw new ApplicationException('Invalid days value: '.$days);
         }
 
         // all accesses for last month
         $items = AccessLog::where('created_at', '>=', Carbon::now()->subDays($days)->format('Y-m-d'))->get();
 
         // parse data
-        $all = [];
-        $users = [];
-        $user_rows = [];
+        $all = [ ];
+        $users = [ ];
+        $user_rows = [ ];
         foreach ($items as $item)
         {
             // user
             $user_id = $item->user_id ? $item->user_id : 0;
-            $users[$user_id] = $user_id > 0 ? User::find($user_id) : $this->getDeletedFakeUser();
+            $users[ $user_id ] = $user_id > 0 ? User::find($user_id) : $this->getDeletedFakeUser();
 
             // date
             $timestamp = strtotime($item->created_at) * 1000;
             $day = Carbon::createFromFormat('Y-m-d H:i:s', $item->created_at)->format('Y-m-d');
 
-            if (isset($user_rows[$user_id][$day])) {
-                $user_rows[$user_id][$day][1]++;
+            if (isset($user_rows[ $user_id ][ $day ])) {
+                $user_rows[ $user_id ][ $day ][ 1 ]++;
             } else {
-                $user_rows[$user_id][$day] = [$timestamp, 1];
+                $user_rows[ $user_id ][ $day ] = [ $timestamp, 1 ];
             }
 
             // init empty day
-            if (!isset($all[$day])) {
-                $all[$day] = [
+            if (!isset($all[ $day ])) {
+                $all[ $day ] = [
                     'timestamp' => $timestamp,
                     'date' => $day,
                     'count' => 0,
@@ -94,15 +94,15 @@ 
             }
 
             // increase count
-            $all[$day]['count']++;
+            $all[ $day ][ 'count' ]++;
         }
 
         // we need at least two days, to display chart
         if (sizeof($all) == 1) {
             $day = reset($all);
-            $date = Carbon::createFromFormat('Y-m-d', $day['date'])->subDays(1);
+            $date = Carbon::createFromFormat('Y-m-d', $day[ 'date' ])->subDays(1);
             $dateFormated = $date->format('Y-m-d');
-            $all[$dateFormated] = [
+            $all[ $dateFormated ] = [
                 'timestamp' => $date->timestamp * 1000,
                 'date' => $dateFormated,
                 'count' => 0,
@@ -112,27 +112,27 @@ 
         // transform user line to json
         foreach ($user_rows as $key => $user_row)
         {
-            $rows = [];
-            foreach($user_row as $row) {
-                $rows[] = [
-                    $row[0],
-                    $row[1],
+            $rows = [ ];
+            foreach ($user_row as $row) {
+                $rows[ ] = [
+                    $row[ 0 ],
+                    $row[ 1 ],
                 ];
             }
 
             // we need at least two days, to display chart
             if (sizeof($rows) == 1) {
                 $first = reset($rows);
-                $rows[] = [$first[0] - 86400000, 0];
+                $rows[ ] = [ $first[ 0 ] - 86400000, 0 ];
             }
 
-            $user_rows[$key] = $rows;
+            $user_rows[ $key ] = $rows;
         }
 
         // count all
-        $all_render = [];
+        $all_render = [ ];
         foreach ($all as $a) {
-            $all_render[] = [$a['timestamp'], $a['count']];
+            $all_render[ ] = [ $a[ 'timestamp' ], $a[ 'count' ] ];
         }
 
         return [

Indentation +10 added lines, -10 removed lines

@@ -35,24 +35,24 @@
         return $this->makePartial('widget');
     }
 
-	public function defineProperties()
-	{
-		return [
-			'title' => [
+    public function defineProperties()
+    {
+        return [
+            'title' => [
                 'title' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartline.title',
                 'default' => 'Access statistics in time each user',
-				'type' => 'string',
-				'validationPattern' => '^.+$',
-				'validationMessage' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartline.title_validation',
-			],
+                'type' => 'string',
+                'validationPattern' => '^.+$',
+                'validationMessage' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartline.title_validation',
+            ],
             'days' => [
                 'title' => 'vojtasvoboda.useraccesslog::lang.reportwidgets.chartline.days_title',
                 'default' => '30',
                 'type' => 'string',
                 'validationPattern' => '^[0-9]+$',
             ]
-		];
-	}
+        ];
+    }
 
     protected function loadData()
     {

models/AccessLog.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      * @var array Relations
      */
     public $belongsTo = [
-        'user' => [User::class],
+        'user' => [ User::class ],
     ];
 
     /**

models/Settings.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 {
     use ValidationTrait;
 
-    public $implement = ['System.Behaviors.SettingsModel'];
+    public $implement = [ 'System.Behaviors.SettingsModel' ];
 
     public $settingsCode = 'vojtasvoboda_useraccesslog_settings';
 

reportwidgets/AccessLogStatistics.php

Spacing +8 added lines, -8 removed lines

@@ -19,13 +19,13 @@ 
     public function render()
     {
         try {
-            $this->vars['all'] = $this->getCounts()['all'];
-            $this->vars['counts'] = $this->getCounts()['counts'];
+            $this->vars[ 'all' ] = $this->getCounts()[ 'all' ];
+            $this->vars[ 'counts' ] = $this->getCounts()[ 'counts' ];
 
         } catch (Exception $ex) {
-            $this->vars['error'] = $ex->getMessage();
-            $this->vars['all'] = 0;
-            $this->vars['counts'] = [];
+            $this->vars[ 'error' ] = $ex->getMessage();
+            $this->vars[ 'all' ] = 0;
+            $this->vars[ 'counts' ] = [ ];
         }
 
         return $this->makePartial('widget');
@@ -58,13 +58,13 @@ 
     {
         $log = AccessLog::all()->groupBy('user_id');
 
-        $counts = [];
+        $counts = [ ];
         $all = 0;
         foreach ($log as $l) {
-            $first = $l[0];
+            $first = $l[ 0 ];
             $user = $first->user ? $first->user : $this->getDeletedFakeUser();
             $size = sizeof($l);
-            $counts[] = [
+            $counts[ ] = [
                 'size' => $size,
                 'id' => $first->user_id,
                 'name' => $user->username

Plugin.php

Spacing +3 added lines, -3 removed lines

@@ -38,13 +38,13 @@ 
     public function boot()
     {
         // log user after login
-        Event::listen('rainlab.user.login', function ($user) {
+        Event::listen('rainlab.user.login', function($user) {
             AccessLog::add($user);
         });
 
         // extend users side-menu with User Access log
         if (!empty(Settings::get('show_access_log_listing', false))) {
-            Event::listen('backend.menu.extendItems', function ($manager) {
+            Event::listen('backend.menu.extendItems', function($manager) {
                 $manager->addSideMenuItem('RainLab.User', 'user', 'access_log', [
                     'label' => 'backend::lang.access_log.menu_label',
                     'url' => Backend::url('vojtasvoboda/useraccesslog/log'),
@@ -86,7 +86,7 @@ 
                 'icon' => 'icon-cog',
                 'description' => 'vojtasvoboda.useraccesslog::lang.settings.description',
                 'class' => Settings::class,
-                'permissions' => ['vojtasvoboda.useraccesslog.*'],
+                'permissions' => [ 'vojtasvoboda.useraccesslog.*' ],
                 'order' => 600,
             ]
         ];