INT69DC_7C/DialogForms/DialogFormYesNo.cs

@@ -91,10 +91,6 @@ namespace INT69DC_7C.DialogForms
                         this.labelErrorCode.Text = "이더넷";
                         this.labelMessage1.Text = "로컬IP주소 자동으로 설정하시겠습니까?";
                         break;
-                    case 17:
-                        this.labelErrorCode.Text = "로그인";
-                        this.labelMessage1.Text = "비밀번호를 초기화 하시겠습니까?";
-                        break;
                     default:
                         break;
                 }
@@ -168,10 +164,6 @@ namespace INT69DC_7C.DialogForms
                         this.labelErrorCode.Text = "Ethernet";
                         this.labelMessage1.Text = "Do you want to set the local IP address to DHCP?";
                         break;
-                    case 17:
-                        this.labelErrorCode.Text = "Login";
-                        this.labelMessage1.Text = "Do you want to reset your password?";
-                        break;
                     default:
                         break;
                 }
@@ -247,10 +239,6 @@ namespace INT69DC_7C.DialogForms
                         this.labelErrorCode.Text = "以太网";
                         this.labelMessage1.Text = "是否要将本地 IP 地址设置为 DHCP？";
                         break;
-                    case 17:
-                        this.labelErrorCode.Text = "登录";
-                        this.labelMessage1.Text = "您想重置密码吗？";
-                        break;
                     default:
                         break;
                 }
@@ -324,10 +312,6 @@ namespace INT69DC_7C.DialogForms
                         this.labelErrorCode.Text = "Ethernet";
                         this.labelMessage1.Text = "Do you want to set the local IP address to DHCP?";
                         break;
-                    case 17:
-                        this.labelErrorCode.Text = "Přihlásit se";
-                        this.labelMessage1.Text = "Chcete obnovit své heslo?";
-                        break;
                     default:
                         break;
                 }
@@ -403,10 +387,6 @@ namespace INT69DC_7C.DialogForms
                         this.labelErrorCode.Text = "Ethernet";
                         this.labelMessage1.Text = "Do you want to set the local IP address to DHCP?";
                         break;
-                    case 17:
-                        this.labelErrorCode.Text = "Einloggen";
-                        this.labelMessage1.Text = "Möchten Sie Ihr Passwort zurücksetzen?";
-                        break;
                     default:
                         break;
                 }

INT69DC_7C/Forms/FormUserEditor.cs

@@ -152,8 +152,6 @@ namespace INT69DC_7C.Forms
         }
         private void SetEnablePassword(bool value)
         {
-            value = false;
-
             this.labelPassword.Enabled = value;
 
             if (value == true)
@@ -485,7 +483,7 @@ namespace INT69DC_7C.Forms
             this.SelectedUserItem = new UserItem();
 
             this.labelID.Text = "";
-            this.labelPassword.Text = this.SelectedUserItem.ResetPW;
+            this.labelPassword.Text = "";
             this.labelExpiryDateOfAccount.Text = "180";
             this.labelExpiryDateOfPassword.Text = "90";
             this.labelExpiryDateOfAccount2.Text = "yyyy.mm.DD";
@@ -601,6 +599,7 @@ namespace INT69DC_7C.Forms
             this.SelectedUserItem.IsFirstPassword = item.fFirstPW;
         }
         private void UpdateSelectUserDisplay(UserItem item)
+
         {
             this.SetEnableID(false);
 
@@ -666,7 +665,7 @@ namespace INT69DC_7C.Forms
                 {
                     this.buttonDelete.Visible = false;
                     this.SetEnablePassword(true);
-                    this.comboBoxAccessRight.Enabled = false;
+                    this.comboBoxAccessRight.Enabled = false;                    
                 }
                 else
                 {
@@ -996,31 +995,6 @@ namespace INT69DC_7C.Forms
                 UserManager.UserManager_UserDel(id);
             }
         }
-        private void buttonResetPW_Click(object sender, EventArgs e)
-        {
-            int ret = 0;
-            string id = "", pw = "";
-
-            if (this.listBoxUserList.Items.Count <= 1)
-                return;
-
-            if (this.listBoxUserList.SelectItemIndex <= 0)
-                return;
-
-            // 메시지
-            // 비밀번호를 초기화 하시겠습니까?
-            DialogFormYesNo dlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 17);
-            if (dlg.ShowDialog() == DialogResult.Yes)
-            {
-                id = this.SelectedUserItem.ID;
-                pw = this.SelectedUserItem.ResetPW;
-
-                ret = UserManager.UserManager_UserResetPWDirect(id, pw);
-
-                if (ret == 0)
-                    this.labelPassword.Text = pw;
-            }
-        }
 
         private void buttonGroupEditor_Click(object sender, EventArgs e)
         {

INT69DC_7C/Forms/FormUserEditor.designer.cs

@@ -50,7 +50,6 @@
             this.labelAutomaticLogoutTime = new SmartX.SmartLabel();
             this.buttonDelete = new SmartX.SmartButton();
             this.smartGroupBox2 = new SmartX.SmartGroupBox();
-            this.labelEquipment = new SmartX.SmartLabel();
             this.labelMenu = new SmartX.SmartLabel();
             this.labelMain = new SmartX.SmartLabel();
             this.labelViewer = new SmartX.SmartLabel();
@@ -83,7 +82,7 @@
             this.labelID = new SmartX.SmartLabel();
             this.labelTitleID = new SmartX.SmartLabel();
             this.buttonGroupEditor = new SmartX.SmartButton();
-            this.buttonResetPW = new SmartX.SmartButton();
+            this.labelEquipment = new SmartX.SmartLabel();
             ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
             this.smartGroupBox1.SuspendLayout();
             this.smartGroupBox2.SuspendLayout();
@@ -111,7 +110,7 @@
             this.labelTitle.BackPictureBox2 = null;
             this.labelTitle.BorderColor = System.Drawing.Color.Black;
             this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold);
+            this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold);
             this.labelTitle.InitVisible = true;
             this.labelTitle.LineSpacing = 0F;
             this.labelTitle.Location = new System.Drawing.Point(199, 7);
@@ -194,7 +193,6 @@
             this.smartGroupBox1.BackColor = System.Drawing.Color.White;
             this.smartGroupBox1.BackPictureBox = this.smartForm1;
             this.smartGroupBox1.BackPictureBox1 = null;
-            this.smartGroupBox1.Controls.Add(this.buttonResetPW);
             this.smartGroupBox1.Controls.Add(this.comboBoxAccessRight);
             this.smartGroupBox1.Controls.Add(this.labelAccessRightAdmin);
             this.smartGroupBox1.Controls.Add(this.labelAutoLogoutWarning);
@@ -238,7 +236,7 @@
             // 
             // comboBoxAccessRight
             // 
-            this.comboBoxAccessRight.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Regular);
+            this.comboBoxAccessRight.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Regular);
             this.comboBoxAccessRight.Location = new System.Drawing.Point(219, 156);
             this.comboBoxAccessRight.Name = "comboBoxAccessRight";
             this.comboBoxAccessRight.Size = new System.Drawing.Size(291, 29);
@@ -447,7 +445,7 @@
             this.labelStatusExpiryPassword.BackPictureBox2 = null;
             this.labelStatusExpiryPassword.BorderColor = System.Drawing.Color.Black;
             this.labelStatusExpiryPassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.labelStatusExpiryPassword.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
+            this.labelStatusExpiryPassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
             this.labelStatusExpiryPassword.ForeColor = System.Drawing.Color.DarkRed;
             this.labelStatusExpiryPassword.InitVisible = true;
             this.labelStatusExpiryPassword.LineSpacing = 0F;
@@ -468,7 +466,7 @@
             this.labelStatusExpiryAccount.BackPictureBox2 = null;
             this.labelStatusExpiryAccount.BorderColor = System.Drawing.Color.Black;
             this.labelStatusExpiryAccount.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.labelStatusExpiryAccount.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
+            this.labelStatusExpiryAccount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
             this.labelStatusExpiryAccount.ForeColor = System.Drawing.Color.DarkRed;
             this.labelStatusExpiryAccount.InitVisible = true;
             this.labelStatusExpiryAccount.LineSpacing = 0F;
@@ -572,24 +570,6 @@
             this.smartGroupBox2.Text = "Access right";
             this.smartGroupBox2.TextColor = System.Drawing.Color.Black;
             // 
-            // labelEquipment
-            // 
-            this.labelEquipment.BackPictureBox = this.smartForm1;
-            this.labelEquipment.BackPictureBox1 = null;
-            this.labelEquipment.BackPictureBox2 = null;
-            this.labelEquipment.BorderColor = System.Drawing.Color.Black;
-            this.labelEquipment.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.labelEquipment.InitVisible = true;
-            this.labelEquipment.LineSpacing = 0F;
-            this.labelEquipment.Location = new System.Drawing.Point(427, 79);
-            this.labelEquipment.Name = "labelEquipment";
-            this.labelEquipment.Size = new System.Drawing.Size(130, 18);
-            this.labelEquipment.TabIndex = 264;
-            this.labelEquipment.Text = "Equipment";
-            this.labelEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
-            this.labelEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
-            this.labelEquipment.Wordwrap = false;
-            // 
             // labelMenu
             // 
             this.labelMenu.BackColor = System.Drawing.Color.Black;
@@ -1238,37 +1218,23 @@
             this.buttonGroupEditor.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonGroupEditor.UpImage")));
             this.buttonGroupEditor.Click += new System.EventHandler(this.buttonGroupEditor_Click);
             // 
-            // buttonResetPW
+            // labelEquipment
             // 
-            this.buttonResetPW.BackPictureBox = null;
-            this.buttonResetPW.BackPictureBox1 = null;
-            this.buttonResetPW.BackPictureBox2 = null;
-            this.buttonResetPW.ButtonColor = System.Drawing.Color.Gainsboro;
-            this.buttonResetPW.ButtonImageAutoSize = true;
-            this.buttonResetPW.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
-            this.buttonResetPW.DisableImage = null;
-            this.buttonResetPW.DownImage = null;
-            this.buttonResetPW.GroupID = 0;
-            this.buttonResetPW.InitVisible = true;
-            this.buttonResetPW.Location = new System.Drawing.Point(516, 120);
-            this.buttonResetPW.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
-            this.buttonResetPW.Name = "buttonResetPW";
-            this.buttonResetPW.NestedClickEventPrevent = false;
-            this.buttonResetPW.OutlinePixel = 1;
-            this.buttonResetPW.RepeatInterval = 200;
-            this.buttonResetPW.RepeatIntervalAccelerate = null;
-            this.buttonResetPW.SafeInterval = 200;
-            this.buttonResetPW.Size = new System.Drawing.Size(80, 30);
-            this.buttonResetPW.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
-            this.buttonResetPW.TabIndex = 243;
-            this.buttonResetPW.Text = "Reset";
-            this.buttonResetPW.TextColor = System.Drawing.Color.Black;
-            this.buttonResetPW.TextDownColor = System.Drawing.Color.White;
-            this.buttonResetPW.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
-            this.buttonResetPW.TextLocation = new System.Drawing.Point(0, 0);
-            this.buttonResetPW.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
-            this.buttonResetPW.UpImage = null;
-            this.buttonResetPW.Click += new System.EventHandler(this.buttonResetPW_Click);
+            this.labelEquipment.BackPictureBox = this.smartForm1;
+            this.labelEquipment.BackPictureBox1 = null;
+            this.labelEquipment.BackPictureBox2 = null;
+            this.labelEquipment.BorderColor = System.Drawing.Color.Black;
+            this.labelEquipment.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.labelEquipment.InitVisible = true;
+            this.labelEquipment.LineSpacing = 0F;
+            this.labelEquipment.Location = new System.Drawing.Point(427, 79);
+            this.labelEquipment.Name = "labelEquipment";
+            this.labelEquipment.Size = new System.Drawing.Size(130, 18);
+            this.labelEquipment.TabIndex = 264;
+            this.labelEquipment.Text = "Equipment";
+            this.labelEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.labelEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+            this.labelEquipment.Wordwrap = false;
             // 
             // FormUserEditor
             // 
@@ -1347,6 +1313,5 @@
         private System.Windows.Forms.ComboBox comboBoxAccessRight;
         public SmartX.SmartLabel labelAccessRightAdmin;
         private SmartX.SmartLabel labelEquipment;
-        private SmartX.SmartButton buttonResetPW;
     }
 }

INT69DC_7C/Part11_UserManager/UserItem.cs

@@ -12,7 +12,6 @@ namespace INT69DC_7C.Part11_UserManager
         #region Field
         private string m_ID;
         private string m_Password;
-        private string m_ResetPW;
 
         private int m_ExpireId;
         private int m_ExpirePassword;
@@ -52,11 +51,6 @@ namespace INT69DC_7C.Part11_UserManager
             get { return this.m_Password; }
             set { this.m_Password = value; }
         }
-        public string ResetPW
-        {
-            get { return this.m_ResetPW; }
-            private set { this.m_ResetPW = value; }
-        }
 
         public int ExpireId
         {
@@ -131,7 +125,6 @@ namespace INT69DC_7C.Part11_UserManager
         {
             this.ID = "-";
             this.Password = "-";
-            this.ResetPW = "Password12!";
 
             this.ExpireId = 0;
             this.ExpirePassword = 0;

INT69DC_7C/Part11_UserManager/UserManager.Define.cs

@@ -131,9 +131,6 @@ namespace INT69DC_7C.Part11_UserManager
         [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
         private static extern int DLL_UserMgr_UserModifyID(IntPtr user_org_id, IntPtr user_new_id);
 
-        [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
-        private static extern int DLL_UserMgr_UserResetPWDirect(IntPtr user_id, IntPtr user_pw);
-
         [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
         private static extern int DLL_UserMgr_UserModifyOthers(IntPtr user_id, int fadmin, int expire_pw, int expire_account, int active_level);
 

INT69DC_7C/Part11_UserManager/UserManager.cs

@@ -147,17 +147,6 @@ namespace INT69DC_7C.Part11_UserManager
 
             return ret;
         }
-        public static int UserManager_UserResetPWDirect(String sID, String sNewPW)
-        {
-            int ret = 0;
-
-            IntPtr pID = Marshal.StringToBSTR(sID.ToString());
-            IntPtr pPW = Marshal.StringToBSTR(sNewPW.ToString());
-
-            ret = DLL_UserMgr_UserResetPWDirect(pID, pPW);
-
-            return ret;
-        }
 
         public static void UserManager_UserModifyID(String sID, String sNewID)
         {

INT69DC_7C/Version.txt

@@ -22,7 +22,6 @@
 	- Part 11 적용
 	  INT99DC_7C V3.0.2 참조
 	  데이터 백업 스틱 2모드에서 통합 저장 방식으로 변경함
-	  PW 초기값 : Password12!
 	- 모터설정 - 모터 테스트(COM1, RS485)
 	  '정회전' 동작 안하는 버그 수정