Merge pull request #101 from enkia/add-chromeos

Add chromeos

Author: jeremykenedy

src/App/Http/Controllers/LaravelLoggerController.php

@@ -51,7 +51,7 @@ private function mapAdditionalDetails($collectionItems)
         $collectionItems->map(function ($collectionItem) {
             $eventTime = Carbon::parse($collectionItem->updated_at);
             $collectionItem['timePassed'] = $eventTime->diffForHumans();
-            $collectionItem['userAgentDetails'] = UserAgentDetails::details($collectionItem->useragent);
+            $collectionItem['userAgentDetails'] = UserAgentDetails::details($collectionItem->userAgent);
             $collectionItem['langDetails'] = UserAgentDetails::localeLang($collectionItem->locale);
             $collectionItem['userDetails'] = config('LaravelLogger.defaultUserModel')::find($collectionItem->userId);
 
@@ -111,7 +111,7 @@ public function showAccessLogEntry(Request $request, $id)
         $activity = Activity::findOrFail($id);
 
         $userDetails = config('LaravelLogger.defaultUserModel')::find($activity->userId);
-        $userAgentDetails = UserAgentDetails::details($activity->useragent);
+        $userAgentDetails = UserAgentDetails::details($activity->userAgent);
         $ipAddressDetails = IpAddressDetails::checkIP($activity->ipAddress);
         $langDetails = UserAgentDetails::localeLang($activity->locale);
         $eventTime = Carbon::parse($activity->created_at);
@@ -205,7 +205,7 @@ public function showClearedAccessLogEntry(Request $request, $id)
         $activity = self::getClearedActvity($id);
 
         $userDetails = config('LaravelLogger.defaultUserModel')::find($activity->userId);
-        $userAgentDetails = UserAgentDetails::details($activity->useragent);
+        $userAgentDetails = UserAgentDetails::details($activity->userAgent);
         $ipAddressDetails = IpAddressDetails::checkIP($activity->ipAddress);
         $langDetails = UserAgentDetails::localeLang($activity->locale);
         $eventTime = Carbon::parse($activity->created_at);

src/App/Http/Traits/UserAgentDetails.php

@@ -15,7 +15,7 @@ public static function details($ua)
     {
         $ua = is_null($ua) ? $_SERVER['HTTP_USER_AGENT'] : $ua;
         // Enumerate all common platforms, this is usually placed in braces (order is important! First come first serve..)
-        $platforms = 'Windows|iPad|iPhone|Macintosh|Android|BlackBerry|Unix|Linux';
+        $platforms = 'Windows|iPad|iPhone|Macintosh|Android|BlackBerry|Unix|Linux|X11|CrOS';
 
         // All browsers except MSIE/Trident and..
         // NOT for browsers that use this syntax: Version/0.xx Browsername
@@ -53,7 +53,11 @@ public static function details($ua)
                 $return['version'] = $ua_array[4];
             }
         } else {
-            return false;
+            $return['platform'] = '-';
+            $return['type'] = '-';
+            $return['renderer'] = '-';
+            $return['browser'] = '-';
+            $return['version'] = '-';
         }
 
         // Replace some browsernames e.g. MSIE -> Internet Explorer
@@ -98,7 +102,7 @@ public static function localeLang($locale)
         }
 
         $a = explode(',', $locale);
-        $a = explode(';', $a[1]);
+        $a ??= explode(';', $a[1]);
 
         return $a[0];
     }

src/resources/views/logger/activity-log-item.blade.php

@@ -123,6 +123,10 @@
             $platformIcon = 'fa-linux';
             break;
 
+        case 'CrOS':
+            $platformIcon = 'fa-chrome';
+            break;
+
         default:
             $platformIcon = 'fa-';
             break;

src/resources/views/logger/partials/activity-table.blade.php

@@ -185,6 +185,10 @@
                                     $platformIcon = 'fa-linux';
                                     break;
 
+                                case 'CrOS':
+                                    $platformIcon = 'fa-chrome';
+                                    break;
+
                                 default:
                                     $platformIcon = 'fa-';
                                     break;