Refs #3490 Display User ID in Real time map

plugins/UserCountryMap/UserCountryMap.php

@@ -79,5 +79,6 @@ class UserCountryMap extends \Piwik\Plugin
     {
         $translationKeys[] = 'UserCountryMap_WithUnknownRegion';
         $translationKeys[] = 'UserCountryMap_WithUnknownCity';
+        $translationKeys[] = 'General_UserId';
     }
 }

plugins/UserCountryMap/javascripts/realtime-map.js

@@ -142,7 +142,7 @@
                         'visitLocalTime', 'city', 'country', 'referrerType', 'referrerName',
                         'referrerTypeName', 'browserIcon', 'operatingSystemIcon',
                         'countryFlag', 'idVisit', 'actionDetails', 'continentCode',
-                        'actions', 'searches', 'goalConversions', 'visitorId'].join(','),
+                        'actions', 'searches', 'goalConversions', 'visitorId', 'userId'].join(','),
                     minTimestamp: firstRun ? -1 : lastTimestamp
                 });
             }
@@ -214,6 +214,8 @@
                 return '<h3>' + (r.city ? r.city + ' / ' : '') + r.country + '</h3>' +
                     // icons
                     ico(r.countryFlag) + ico(r.browserIcon) + ico(r.operatingSystemIcon) + '<br/>' +
+                    // User ID
+                    (r.userId ? _pk_translate('General_UserId') + ':&nbsp;' + r.userId + '<br/>' : '') +
                     // last action
                     (ad && ad.length && ad[ad.length - 1].pageTitle ? '<em>' + ad[ad.length - 1].pageTitle + '</em><br/>' : '') +
                     // time of visit