jeremykenedy / laravel-logger

src/LaravelLoggerServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
      */
     public function boot(Router $router)
     {
-        $router->middlewareGroup('activity',[LogActivity::class]);
+        $router->middlewareGroup('activity', [LogActivity::class]);
         $this->loadTranslationsFrom(__DIR__.'/resources/lang/', 'LaravelLogger');
     }
 

src/app/Http/Controllers/LaravelLoggerController.php

Indentation +4 added lines, -4 removed lines

@@ -98,13 +98,13 @@
 
         if (config('LaravelLogger.loggerPaginationEnabled')) {
             $userActivities = Activity::where('userId', $activity->userId)
-                           ->orderBy('created_at', 'desc')
-                           ->paginate(config('LaravelLogger.loggerPaginationPerPage'));
+                            ->orderBy('created_at', 'desc')
+                            ->paginate(config('LaravelLogger.loggerPaginationPerPage'));
             $totalUserActivities = $userActivities->total();
         } else {
             $userActivities = Activity::where('userId', $activity->userId)
-                           ->orderBy('created_at', 'desc')
-                           ->get();
+                            ->orderBy('created_at', 'desc')
+                            ->get();
             $totalUserActivities = $userActivities->count();
         }
 

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
      */
     private function mapAdditionalDetails($collectionItems)
     {
-        $collectionItems->map(function ($collectionItem) {
+        $collectionItems->map(function($collectionItem) {
             $eventTime = Carbon::parse($collectionItem->updated_at);
             $collectionItem['timePassed'] = $eventTime->diffForHumans();
             $collectionItem['userAgentDetails'] = UserAgentDetails::details($collectionItem->useragent);
@@ -110,7 +110,7 @@ 
 
         self::mapAdditionalDetails($userActivities);
 
-        $data  = [
+        $data = [
             'activity'              => $activity,
             'userDetails'           => $userDetails,
             'ipAddressDetails'      => $ipAddressDetails,
@@ -187,7 +187,7 @@ 
         $eventTime = Carbon::parse($activity->created_at);
         $timePassed = $eventTime->diffForHumans();
 
-        $data  = [
+        $data = [
             'activity'              => $activity,
             'userDetails'           => $userDetails,
             'ipAddressDetails'      => $ipAddressDetails,

src/app/Http/Traits/IpAddressDetails.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             "SA" => "South America"
         );
         if (filter_var($ip, FILTER_VALIDATE_IP) && in_array($purpose, $support)) {
-            $ipdat = @json_decode(file_get_contents("http://www.geoplugin.net/json.gp?ip=" . $ip));
+            $ipdat = @json_decode(file_get_contents("http://www.geoplugin.net/json.gp?ip=".$ip));
             if (@strlen(trim($ipdat->geoplugin_countryCode)) == 2) {
                 switch ($purpose) {
                     case "location":

Braces +12 added lines, -8 removed lines

@@ -19,10 +19,12 @@ 
         if (filter_var($ip, FILTER_VALIDATE_IP) === FALSE) {
             $ip = $_SERVER["REMOTE_ADDR"];
             if ($deep_detect) {
-                if (filter_var(@$_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP))
-                    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-                if (filter_var(@$_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP))
-                    $ip = $_SERVER['HTTP_CLIENT_IP'];
+                if (filter_var(@$_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP)) {
+                                    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+                }
+                if (filter_var(@$_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP)) {
+                                    $ip = $_SERVER['HTTP_CLIENT_IP'];
+                }
             }
         }
         $purpose    = str_replace(array("name", "\n", "\t", " ", "-", "_"), NULL, strtolower(trim($purpose)));
@@ -58,10 +60,12 @@ 
                         break;
                     case "address":
                         $address = array($ipdat->geoplugin_countryName);
-                        if (@strlen($ipdat->geoplugin_regionName) >= 1)
-                            $address[] = $ipdat->geoplugin_regionName;
-                        if (@strlen($ipdat->geoplugin_city) >= 1)
-                            $address[] = $ipdat->geoplugin_city;
+                        if (@strlen($ipdat->geoplugin_regionName) >= 1) {
+                                                    $address[] = $ipdat->geoplugin_regionName;
+                        }
+                        if (@strlen($ipdat->geoplugin_city) >= 1) {
+                                                    $address[] = $ipdat->geoplugin_city;
+                        }
                         $output = implode(", ", array_reverse($address));
                         break;
                     case "city":

src/app/Http/Traits/ActivityLogger.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@ 
         $userType   = trans('LaravelLogger::laravel-logger.userTypes.guest');
         $userId     = null;
 
-        if(\Auth::check()) {
+        if (\Auth::check()) {
             $userType   = trans('LaravelLogger::laravel-logger.userTypes.registered');
             $userId     = \Request::user()->id;
         }
 
-        if(Crawler::isCrawler()) {
+        if (Crawler::isCrawler()) {
             $userType    = trans('LaravelLogger::laravel-logger.userTypes.crawler');
-            $description = $userType . ' ' . trans('LaravelLogger::laravel-logger.verbTypes.crawled') . ' ' . \Request::fullUrl();
+            $description = $userType.' '.trans('LaravelLogger::laravel-logger.verbTypes.crawled').' '.\Request::fullUrl();
         }
 
         if (!$description) {
@@ -51,7 +51,7 @@ 
                     break;
             }
 
-            $description = $verb . ' ' . \Request::path();
+            $description = $verb.' '.\Request::path();
         }
 
         $data = [
@@ -71,7 +71,7 @@ 
         if ($validator->fails()) {
             $errors = json_encode($validator->errors(), true);
             if (config('LaravelLogger.logDBActivityLogFailuresToFile')) {
-                Log::error('Failed to record activity event. Failed Validation: ' . $errors);
+                Log::error('Failed to record activity event. Failed Validation: '.$errors);
             }
         } else {
             self::storeActivity($data);

src/app/Http/Traits/UserAgentDetails.php

Braces +2 added lines, -4 removed lines

@@ -45,13 +45,11 @@
             if (preg_match("/^[\d]+\.[\d]+(?:\.[\d]{0,2}$)?/",$ua_array[4],$matches))
             {
                 $return['version'] = $matches[0];
-            }
-            else
+            } else
             {
                 $return['version'] = $ua_array[4];
             }
-        }
-        else
+        } else
         {
             return false;
         }

Spacing +10 added lines, -10 removed lines

@@ -34,21 +34,21 @@ 
         $replace_pat = '$7$8|$2$3|$9|${17}${15}$5$3|${18}${13}$6${11}';
 
         // Run the preg_replace .. and explode on |
-        $ua_array = explode("|",preg_replace($regex_pat, $replace_pat, $ua, PREG_PATTERN_ORDER));
+        $ua_array = explode("|", preg_replace($regex_pat, $replace_pat, $ua, PREG_PATTERN_ORDER));
 
-        if (count($ua_array)>1)
+        if (count($ua_array) > 1)
         {
-            $return['platform']  = $ua_array[0];  // Windows / iPad / MacOS / BlackBerry
-            $return['type']      = $ua_array[1];  // Mozilla / Opera etc.
-            $return['renderer']  = $ua_array[2];  // WebKit / Presto / Trident / Gecko etc.
-            $return['browser']   = $ua_array[3];  // Chrome / Safari / MSIE / Firefox
+            $return['platform']  = $ua_array[0]; // Windows / iPad / MacOS / BlackBerry
+            $return['type']      = $ua_array[1]; // Mozilla / Opera etc.
+            $return['renderer']  = $ua_array[2]; // WebKit / Presto / Trident / Gecko etc.
+            $return['browser']   = $ua_array[3]; // Chrome / Safari / MSIE / Firefox
 
             /*
                Not necessary but this will filter out Chromes ridiculously long version
                numbers 31.0.1234.122 becomes 31.0, while a "normal" 3 digit version number
                like 10.2.1 would stay 10.2.1, 11.0 stays 11.0. Non-match stays what it is.
             */
-            if (preg_match("/^[\d]+\.[\d]+(?:\.[\d]{0,2}$)?/",$ua_array[4],$matches))
+            if (preg_match("/^[\d]+\.[\d]+(?:\.[\d]{0,2}$)?/", $ua_array[4], $matches))
             {
                 $return['version'] = $matches[0];
             }
@@ -63,7 +63,7 @@ 
         }
 
         // Replace some browsernames e.g. MSIE -> Internet Explorer
-        switch(strtolower($return['browser']))
+        switch (strtolower($return['browser']))
         {
             case "msie":
             case "trident":
@@ -77,11 +77,11 @@ 
             break;
         }
 
-        switch(strtolower($return['platform']))
+        switch (strtolower($return['platform']))
         {
             case "android":    // These browsers claim to be Safari but are BB Mobile
             case "blackberry": // and Android Mobile
-                if ($return['browser'] =="Safari" || $return['browser'] == "Mobile" || $return['browser'] == "")
+                if ($return['browser'] == "Safari" || $return['browser'] == "Mobile" || $return['browser'] == "")
                 {
                     $return['browser'] = "{$return['platform']} mobile";
                 }

src/app/Logic/helpers.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
             $routeUrl .= $parsedUrl['path'];
         }
         if (isset($parsedUrl['query'])) {
-            $routeUrl .= '?' . $parsedUrl['query'];
+            $routeUrl .= '?'.$parsedUrl['query'];
         }
         echo $routeUrl;
     }

src/app/Models/Activity.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      */
     protected $table;
 
-   /**
+    /**
      * The connection name for the model.
      *
      * @var string

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
      *
      * @return array
      */
-    public static function rules($merge=[])
+    public static function rules($merge = [])
     {
         return array_merge([
             'description'   => 'required|string',

src/resources/lang/en/laravel-logger.php

Indentation +2 added lines, -2 removed lines

@@ -137,11 +137,11 @@
     |--------------------------------------------------------------------------
     */
 
-   'messages' => [
+    'messages' => [
         'logClearedSuccessfuly' => 'Activity log cleared successfully',
         'logDestroyedSuccessfuly' => 'Activity log deleted successfully',
         'logRestoredSuccessfuly' => 'Activity log restored successfully',
-   ],
+    ],
 
     /*
     |--------------------------------------------------------------------------

src/database/migrations/2017_11_04_103444_create_laravel_logger_activity_table.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         $tableCheck     = Schema::connection($connection)->hasTable($table);
 
         if (!$tableCheck) {
-            Schema::connection($connection)->create($table, function (Blueprint $table) {
+            Schema::connection($connection)->create($table, function(Blueprint $table) {
                 $table->increments('id');
                 $table->longText('description');
                 $table->string('userType');