Merge pull request #147 from Extendy/bugfixes/issue145

fix: #145 admin list users urls problem
Extendy · Feb 29, 2024 · f6aa069 · f6aa069
2 parents 6e27a6c + 9a9c697
commit f6aa069
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/Controllers/Url.php b/app/Controllers/Url.php
@@ -77,7 +77,12 @@ public function listuserurls($urlOwnerUserId = null)
 
         $data['filterrule']  = 'user';
         $data['filtervalue'] = $urlOwnerUserId;
-        $data['filtertext']  = lang('Url.urlsUserLinks') . ' ' . smarty_get_user_username($user_id);
+
+        if ($urlOwnerUserId !== null) {
+            $data['filtertext'] = lang('Url.urlsUserLinks') . ' ' . smarty_get_user_username($urlOwnerUserId);
+        } else {
+            $data['filtertext'] = lang('Url.urlsAllLink') . ' ' . smarty_get_user_username($user_id);
+        }
 
         if (! auth()->user()->can('admin.manageotherurls', 'super.admin') && (int) $urlOwnerUserId !== $user_id) {
             return smarty_permission_error(lang('Common.permissionsNoenoughpermissions'), false);

diff --git a/app/Models/UrlModel.php b/app/Models/UrlModel.php
@@ -73,7 +73,14 @@ public function getUrlsForUser(int|array|null $userIds = null, int|null $start =
         $builder = $this->builder();
 
         // Check if shared URLs should be included
-        $sharedUrlFeatureEnabled = setting('Smartyurl.url_can_be_shared_between_users');
+        if ((is_array($userIds) && in_array(user_id(), $userIds, true)) || ((user_id() === $userIds))) {
+            // that mean user is try to get his urls, so i will check if the shared urls feature is enabled
+            $sharedUrlFeatureEnabled = setting('Smartyurl.url_can_be_shared_between_users');
+        } else {
+            // that mean other user try to get the user urls , mostly admin
+            // so i will not show shared urls
+            $sharedUrlFeatureEnabled = false;
+        }
 
         // Check if $userIds is an array or a single value
         if (isset($userIds)) {