try and not require a password change on user edit

DavidGoodwin · Jun 25, 2021 · 8358661 · 8358661
1 parent 2eb02cc
commit 8358661
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/include/Form/User.php b/include/Form/User.php
@@ -9,7 +9,7 @@ class User implements Form {
      */
     protected $form;
 
-    public function __construct(array $data = []) {
+    public function __construct(array $data = [], $is_new = false) {
 
         $this->form = new \Zend_Form();
 
@@ -32,19 +32,19 @@ public function __construct(array $data = []) {
 
         $email = new \Zend_Form_Element_Text('email');
         $email->setRequired(false);
-	$email->setLabel('Email address');
+        $email->setLabel('Email address');
 
         $email->addValidator(new \Zend_Validate_StringLength([1, 100]));
         $email->addValidator(new \Zend_Validate_EmailAddress());
 
 
-
         $password = new \Zend_Form_Element_Text('password');
-        if(empty($data)) {
+        $password->setRequired(false);
+        if($is_new) {
             $password->setRequired(true);
         }
+        $password->addValidator(new \Zend_Validate_StringLength([0,100]));
         $password->setLabel('Password');
-        $password->addValidator(new \Zend_Validate_StringLength([1,100]));
 
 
         $uid_select = new \Zend_Form_Element_Select('uid');
@@ -68,7 +68,7 @@ public function __construct(array $data = []) {
 
         $this->form->addElement($submit);
 
-	if(!empty($data)) {
+        if(!empty($data)) {
             $this->form->isValid($data);
         }
 

diff --git a/public/index.php b/public/index.php
@@ -20,15 +20,19 @@
 
     $what = 'New User';
     $user = [];
+    $is_new = true;
 
     if (isset($_REQUEST['username'])) {
         $what = 'Edit User';
         $user = $model->getUserByUsername($_REQUEST['username']);
+        if(!empty($user)) {
+            $is_new = false;
+        }
     }
 
     $template = new \PureFTPAdmin\Template($what);
 
-    $form = new PureFTPAdmin\Form\User();
+    $form = new PureFTPAdmin\Form\User([], $is_new);
 
     $form->setGidList($model->getGidList());
     $form->setUidList($model->getUidList());