fix: User-Button nur für Admins, Quelle-Spalte nach Datum verschoben

Author: skerbis

lib/Activity.php

@@ -136,11 +136,16 @@ public static function userListCallback(array $params): string
             $user = rex_user::get($params['subject']);
 
             if (null === $user) {
-                return '<a href="#" class="btn btn-sm btn-primary rex-activity-btn-disabled"><i class="rex-icon rex-icon-user"></i> ' . self::$addon->i18n('deleted_user') . ' [' . $params['subject'] . ']</a>';
+                return rex_escape(self::$addon->i18n('deleted_user') . ' [' . $params['subject'] . ']');
             }
 
             $name = rex_escape('' !== $user->getName() ? $user->getName() : $user->getLogin());
-            return '<a class="btn btn-sm btn-primary" href="' . rex_url::backendController(['page' => 'users/users', 'user_id' => $user->getId()]) . '" title="' . $name . '"><i class="rex-icon rex-icon-user"></i> ' . $name . '</a>';
+
+            if (rex::getUser() instanceof rex_user && rex::getUser()->isAdmin()) {
+                return '<a class="btn btn-sm btn-primary" href="' . rex_url::backendController(['page' => 'users/users', 'user_id' => $user->getId()]) . '" title="' . $name . '"><i class="rex-icon rex-icon-user"></i> ' . $name . '</a>';
+            }
+
+            return '<i class="rex-icon rex-icon-user"></i> ' . $name;
         }
 
         return '';

pages/system.activity-log.php

@@ -36,7 +36,7 @@
 $search = rex_get('search', 'string', '');
 $clear = rex_get('clear_filter', 'string', '');
 
-$query = 'SELECT id,created_at,type,message,causer_id,source FROM ' . $table;
+$query = 'SELECT id,created_at,source,type,message,causer_id FROM ' . $table;
 $where = [];
 
 if ($clear) {