From 62ed77ab25f8f2cf5103caf572079ebc2b50f6bc Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 28 Jul 2019 15:33:01 +0200 Subject: Groups: Fix Naming and IDs --- includes/pages/admin_groups.php | 4 ++-- includes/view/User_view.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'includes') diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php index 6ba2ceaf..5127041d 100644 --- a/includes/pages/admin_groups.php +++ b/includes/pages/admin_groups.php @@ -57,7 +57,7 @@ function admin_groups() } else { switch ($request->input('action')) { case 'edit': - if ($request->has('id') && preg_match('/^-\d{1,11}$/', $request->input('id'))) { + if ($request->has('id') && preg_match('/^\d{1,11}$/', $request->input('id'))) { $group_id = $request->input('id'); } else { return error('Incomplete call, missing Groups ID.', true); @@ -113,7 +113,7 @@ function admin_groups() case 'save': if ( $request->has('id') - && preg_match('/^-\d{1,11}$/', $request->input('id')) + && preg_match('/^\d{1,11}$/', $request->input('id')) && $request->hasPostData('submit') ) { $group_id = $request->input('id'); diff --git a/includes/view/User_view.php b/includes/view/User_view.php index c8d60994..b8b875e4 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -853,7 +853,7 @@ function User_groups_render($user_groups) { $output = []; foreach ($user_groups as $group) { - $groupName = preg_replace('/(^\d+-)/', '', $group['Name']); + $groupName = $group['Name']; $output[] = __($groupName); } -- cgit v1.2.3-54-g00ecf