From b08b01689f9052727b81075217b7b95b72f4120b Mon Sep 17 00:00:00 2001
From: Christian Wolf <git@christianwolf.email>
Date: Wed, 17 Apr 2019 15:04:40 +0200
Subject: [PATCH] Removed bug in backend of users

---
 src/admin/mymodels/user.php            | 4 ++--
 src/admin/views/user/view.html.php     | 2 +-
 src/admin/views/users/tmpl/default.php | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/admin/mymodels/user.php b/src/admin/mymodels/user.php
index 1b4ddbd..aa0902f 100644
--- a/src/admin/mymodels/user.php
+++ b/src/admin/mymodels/user.php
@@ -106,14 +106,14 @@ class ClubsUser
     /**
      * @param string $user
      */
-    public function setUser(string $user)
+    public function setUser(string $user, bool $force = false)
     {
         if($this->id === 'new')
             $valid = self::isUserNameFree($user);
         else 
             $valid = self::isUserNameFree($user, $this->id);
         
-        if(! $valid)
+        if(!$force && ! $valid)
             throw new UserInvalidException();
         
         $this->user = $user;
diff --git a/src/admin/views/user/view.html.php b/src/admin/views/user/view.html.php
index 08cdb42..1fc6cd1 100644
--- a/src/admin/views/user/view.html.php
+++ b/src/admin/views/user/view.html.php
@@ -37,7 +37,7 @@ class ClubsViewUser extends HtmlView
             $dataurl = $input->get->get('data', null, 'json');
             $data = json_decode($dataurl, true);
             
-            $this->user->setUser($data['user']);
+            $this->user->setUser($data['user'], true);
             $this->user->setName($data['name']);
             $this->user->setAddress($data['address']);
             $this->user->setCity($data['city']);
diff --git a/src/admin/views/users/tmpl/default.php b/src/admin/views/users/tmpl/default.php
index 28da5d6..fd1c66f 100644
--- a/src/admin/views/users/tmpl/default.php
+++ b/src/admin/views/users/tmpl/default.php
@@ -10,7 +10,8 @@ defined('_JEXEC') or die;
 <table width='100%' class='table table-stiped, table-hover'>
   <thead>
   <tr>
-    <th width='30%'>Benutzername</th>
+    <th width='15%'>Benutzername</th>
+    <th width='20%'>Name</th>
     <th width='30%'>Ort</th>
     <th width='30%'>E-Mail</th>
     <th width='5%'>L&ouml;schen?</th>
@@ -20,6 +21,7 @@ defined('_JEXEC') or die;
 <?php foreach($this->users as $user): ?>
 <?php $link = Route::_('index.php?option=com_clubs&view=user&id=' . $user->getId()); ?>
   <tr>
+    <td><a href='<?php echo $link; ?>'><?php echo htmlentities($user->getUser()); ?></a></td>
     <td><a href='<?php echo $link; ?>'><?php echo htmlentities($user->getName()); ?></a></td>
     <td><?php echo htmlentities($user->getCity()); ?></td>
     <td><a href='mailto:<?php echo htmlentities($user->getMail()); ?>'><?php echo htmlentities($user->getMail()); ?></a></td>