From 1871a666579e51f12cf91570b49fdd6ce0039524 Mon Sep 17 00:00:00 2001
From: "DESKTOP-999R8N3\\CJY" <everymomentisu@gmail.com>
Date: Thu, 22 Aug 2024 09:20:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EC=A0=80=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=B0=8F=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=95=EB=A6=AC=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 INT69DC_7C/Forms/FormUserEditor.cs | 31 ++++++++++++++++--------------
 INT69DC_7C/Version.txt             |  5 ++++-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs
index f174d66..0b13ecd 100644
--- a/INT69DC_7C/Forms/FormUserEditor.cs
+++ b/INT69DC_7C/Forms/FormUserEditor.cs
@@ -366,6 +366,15 @@ 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)
@@ -503,6 +512,7 @@ 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);
@@ -613,21 +623,15 @@ namespace INT69DC_7C.Forms
         }
         private void UpdateSelectUserDisplay(UserItem item)
         {
-            string pass = "";
             this.SetEnableID(false);
 
             // ID
             this.labelID.Text = item.ID;
             // Password
-            if (this.SelectedUserItem.IsFirstPassword == 1)
+            if (item.Password == this.SelectedUserItem.ResetPW)
                 this.labelPassword.Text = item.Password;
             else
-            {
-                for (int i = 0; i < item.Password.Length; i++)
-                    pass = pass + '*';
-
-                this.labelPassword.Text = pass;
-            }
+                this.labelPassword.Text = this.PasswordToAsterisk(item.Password);
             
             this.UpdateAccessRightDisplay(item.ActiveLevel);
             this.buttonSave.Visible = false;
@@ -1074,8 +1078,11 @@ namespace INT69DC_7C.Forms
 
                 this.labelPassword.Text = value;
 
-                if (this.buttonSave.Visible == false)
-                    this.buttonSave.Visible = true;
+                if (this.labelPassword.Text != "")
+                {
+                    if (this.buttonSave.Visible == false)
+                        this.buttonSave.Visible = true;
+                }
             }
         }
         private void labelExpireAccount_Click(object sender, EventArgs e)
@@ -1264,8 +1271,6 @@ namespace INT69DC_7C.Forms
 
             if (index == 0)
             {
-                this.SetEnablePassword(true);
-
                 UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString());
             }
             else if (index > 0)
@@ -1274,13 +1279,11 @@ 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;
                 }
 
diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt
index d1a7694..aa476cf 100644
--- a/INT69DC_7C/Version.txt
+++ b/INT69DC_7C/Version.txt
@@ -21,7 +21,10 @@
 	- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
 	- FormMenu 
 	  UpdateDisplayMenuAccess()
-	   NotLogin 수정
+	  NotLogin 수정
+            - 유저설정
+              Level3 본인에 한해서 비밀번호 변경 가능하도록 수정
+              admin을 제외한 다른 유저는 Reset만 가능
 
 @ Ver 11.3.0 by LSJ
 	- 2024.08.14