INT69DC_7C/Forms/FormUserEditor.cs

@@ -366,15 +366,6 @@ namespace INT69DC_7C.Forms
             else
                 return Color.Silver;
         }
-        private string PasswordToAsterisk(string sValue)
-        {
-            string temp = "";
-
-            for (int i = 0; i < sValue.Length; i++)
-                temp += "*";
-
-            return temp;
-        }
         private void CheckBoxCheckedAsLevel(DataStore.UserGroup level)
         {
             switch (level)
@@ -512,7 +503,6 @@ namespace INT69DC_7C.Forms
             this.labelExpiryDateOfPassword2.Text = "yyyy.mm.DD";
 
             this.comboBoxAccessRight.Visible = true;
-            this.comboBoxAccessRight.Enabled = true;
             this.comboBoxAccessRight.BringToFront();
             this.UpdateAccessRightComboBoxDisplay();
             this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
@@ -623,15 +613,21 @@ namespace INT69DC_7C.Forms
         }
         private void UpdateSelectUserDisplay(UserItem item)
         {
+            string pass = "";
             this.SetEnableID(false);
 
             // ID
             this.labelID.Text = item.ID;
             // Password
-            if (item.Password == this.SelectedUserItem.ResetPW)
+            if (this.SelectedUserItem.IsFirstPassword == 1)
                 this.labelPassword.Text = item.Password;
             else
-                this.labelPassword.Text = this.PasswordToAsterisk(item.Password);
+            {
+                for (int i = 0; i < item.Password.Length; i++)
+                    pass = pass + '*';
+
+                this.labelPassword.Text = pass;
+            }
             
             this.UpdateAccessRightDisplay(item.ActiveLevel);
             this.buttonSave.Visible = false;
@@ -1078,13 +1074,10 @@ namespace INT69DC_7C.Forms
 
                 this.labelPassword.Text = value;
 
-                if (this.labelPassword.Text != "")
-                {
                 if (this.buttonSave.Visible == false)
                     this.buttonSave.Visible = true;
             }
         }
-        }
         private void labelExpireAccount_Click(object sender, EventArgs e)
         {
             DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelExpiryDateOfAccount.Text, 3, 0, false, this.ParentForm.SystemConfig.Language);
@@ -1271,6 +1264,8 @@ namespace INT69DC_7C.Forms
 
             if (index == 0)
             {
+                this.SetEnablePassword(true);
+
                 UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString());
             }
             else if (index > 0)
@@ -1279,11 +1274,13 @@ namespace INT69DC_7C.Forms
                 if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index].ToString())
                 {
                     this.SetEnablePassword(true);
+                    this.buttonDelete.Visible = false;
                     this.buttonResetPW.Visible = false;
                 }
                 else
                 {
                     this.SetEnablePassword(false);
+                    this.buttonDelete.Visible = true;
                     this.buttonResetPW.Visible = true;
                 }
 

INT69DC_7C/Version.txt

@@ -22,9 +22,6 @@
 	- FormMenu 
 	  UpdateDisplayMenuAccess()
 	   NotLogin 수정
-            - 유저설정
-              Level3 본인에 한해서 비밀번호 변경 가능하도록 수정
-              admin을 제외한 다른 유저는 Reset만 가능
 
 @ Ver 11.3.0 by LSJ
 	- 2024.08.14