From 0d24252aad3bc25c455891bad87700d49f6b11b2 Mon Sep 17 00:00:00 2001 From: sj84 Date: Wed, 30 Aug 2023 17:39:54 +0900 Subject: [PATCH] =?UTF-8?q?userManager=20Structure=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Controls/ControlUserSetting.cs | 4 +- INT69DC_7C/DialogForms/DialogFormLogOn.cs | 48 +++++----- INT69DC_7C/DialogForms/DialogFormLogOn1.cs | 36 ++++---- INT69DC_7C/Forms/FormMainDisplay.cs | 56 ++++++------ INT69DC_7C/Forms/FormUserEditor.cs | 91 ++++++++++--------- INT69DC_7C/Part11_UserManager/UserItem.cs | 52 +++++------ .../UserManager.Structure.cs | 44 +++++---- 7 files changed, 169 insertions(+), 162 deletions(-) diff --git a/INT69DC_7C/Controls/ControlUserSetting.cs b/INT69DC_7C/Controls/ControlUserSetting.cs index 527accb..caa7d5b 100644 --- a/INT69DC_7C/Controls/ControlUserSetting.cs +++ b/INT69DC_7C/Controls/ControlUserSetting.cs @@ -103,8 +103,8 @@ namespace INT69DC_7C.Controls this.labelID.Text = item.ID; this.labelPassword.Text = item.Password; - this.labelExpireAccountDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateRegister, item.DateExpireRegister); - this.labelExpirePasswordDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateLogin, item.DateExpireLogin); + this.labelExpireAccountDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordLogin, item.DateIdExpire); + this.labelExpirePasswordDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdRegister, item.DatePasswordExpire); this.labelStatusExpireAccount.Visible = item.IsLockAccount; this.labelStatusExpirePassword.Visible = item.IsLockPassword; } diff --git a/INT69DC_7C/DialogForms/DialogFormLogOn.cs b/INT69DC_7C/DialogForms/DialogFormLogOn.cs index aff33e4..c95f11a 100644 --- a/INT69DC_7C/DialogForms/DialogFormLogOn.cs +++ b/INT69DC_7C/DialogForms/DialogFormLogOn.cs @@ -164,20 +164,20 @@ namespace INT69DC_7C.DialogForms this.ParentForm.SystemConfig.CurrentUser.ID = userInfo.user_id; this.ParentForm.SystemConfig.CurrentUser.Password = userInfo.user_pw; - this.ParentForm.SystemConfig.CurrentUser.ExpireAccount = userInfo.expire_period_account; - this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.expire_period_pw; + this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period; + this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period; - DateTime time = DateTime.ParseExact(userInfo.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateRegister = time; - time = DateTime.ParseExact(userInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateLogin = time; - time = DateTime.ParseExact(userInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireRegister = time; - time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireLogin = time; + DateTime time = DateTime.ParseExact(userInfo.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time; + time = DateTime.ParseExact(userInfo.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time; + time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time; + time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time; - this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.flock_status_account == 0 ? false : true; - this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.flock_status_password == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.id_flock_status == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.password_flock_status == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; #endregion @@ -271,20 +271,20 @@ namespace INT69DC_7C.DialogForms this.ParentForm.SystemConfig.CurrentUser.ID = userInfo.user_id; this.ParentForm.SystemConfig.CurrentUser.Password = userInfo.user_pw; - this.ParentForm.SystemConfig.CurrentUser.ExpireAccount = userInfo.expire_period_account; - this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.expire_period_pw; + this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period; + this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period; - DateTime time = DateTime.ParseExact(userInfo.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateRegister = time; - time = DateTime.ParseExact(userInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateLogin = time; - time = DateTime.ParseExact(userInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireRegister = time; - time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireLogin = time; + DateTime time = DateTime.ParseExact(userInfo.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time; + time = DateTime.ParseExact(userInfo.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time; + time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time; + time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time; - this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.flock_status_account == 0 ? false : true; - this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.flock_status_password == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.id_flock_status == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.password_flock_status == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; #endregion diff --git a/INT69DC_7C/DialogForms/DialogFormLogOn1.cs b/INT69DC_7C/DialogForms/DialogFormLogOn1.cs index 3990331..05916ea 100644 --- a/INT69DC_7C/DialogForms/DialogFormLogOn1.cs +++ b/INT69DC_7C/DialogForms/DialogFormLogOn1.cs @@ -244,38 +244,38 @@ namespace INT69DC_7C.DialogForms this.ParentForm.SystemConfig.CurrentUser.ID = user.user_id; this.ParentForm.SystemConfig.CurrentUser.Password = user.user_pw; - this.ParentForm.SystemConfig.CurrentUser.ExpireAccount = user.expire_period_account; - this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = user.expire_period_pw; + this.ParentForm.SystemConfig.CurrentUser.ExpireId = user.id_expire_period; + this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = user.password_expire_period; // console - Console.WriteLine(user.register_date.GetDateTime()); - DateTime time = DateTime.ParseExact(user.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateRegister = time; + Console.WriteLine(user.password_login_date.GetDateTime()); + DateTime time = DateTime.ParseExact(user.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time; // console - Console.WriteLine(user.login_date.GetDateTime()); - time = DateTime.ParseExact(user.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateLogin = time; + Console.WriteLine(user.id_register_date.GetDateTime()); + time = DateTime.ParseExact(user.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time; if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Admin || this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer) { - this.ParentForm.SystemConfig.CurrentUser.DateExpireRegister = DateTime.Now; - this.ParentForm.SystemConfig.CurrentUser.DateExpireLogin = DateTime.Now; + this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = DateTime.Now; + this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = DateTime.Now; } else { // console - Console.WriteLine(user.expire_account_date.GetDateTime()); - time = DateTime.ParseExact(user.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireLogin = time; + Console.WriteLine(user.id_expire_date.GetDateTime()); + time = DateTime.ParseExact(user.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time; // console - Console.WriteLine(user.expire_register_date.GetDateTime()); - time = DateTime.ParseExact(user.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireRegister = time; + Console.WriteLine(user.password_expire_date.GetDateTime()); + time = DateTime.ParseExact(user.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time; } - this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = user.flock_status_account == 0 ? false : true; - this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = user.flock_status_password == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = user.id_flock_status == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = user.password_flock_status == 0 ? false : true; if (this.ParentForm.SystemConfig.IsPart11 == true) this.ParentForm.SystemConfig.CurrentUser.IsAdmin = user.fadmin == 0 ? false : true; diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index 2fbc0dc..d489601 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -956,25 +956,25 @@ namespace INT69DC_7C.Forms this.ParentForm.SystemConfig.CurrentUser.ID = userInfo.user_id; this.ParentForm.SystemConfig.CurrentUser.Password = userInfo.user_pw; - this.ParentForm.SystemConfig.CurrentUser.ExpireAccount = userInfo.expire_period_account; - this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.expire_period_pw; + this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period; + this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period; - Console.WriteLine(userInfo.register_date.GetDateTime()); - Console.WriteLine(userInfo.login_date.GetDateTime()); - Console.WriteLine(userInfo.expire_account_date.GetDateTime()); - Console.WriteLine(userInfo.expire_register_date.GetDateTime()); + Console.WriteLine(userInfo.password_login_date.GetDateTime()); + Console.WriteLine(userInfo.id_register_date.GetDateTime()); + Console.WriteLine(userInfo.id_expire_date.GetDateTime()); + Console.WriteLine(userInfo.password_expire_date.GetDateTime()); - DateTime time = DateTime.ParseExact(userInfo.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateRegister = time; - time = DateTime.ParseExact(userInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateLogin = time; - time = DateTime.ParseExact(userInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireRegister = time; - time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireLogin = time; + DateTime time = DateTime.ParseExact(userInfo.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time; + time = DateTime.ParseExact(userInfo.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time; + time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time; + time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time; - this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.flock_status_account == 0 ? false : true; - this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.flock_status_password == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.id_flock_status == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.password_flock_status == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; @@ -2415,20 +2415,20 @@ namespace INT69DC_7C.Forms this.ParentForm.SystemConfig.CurrentUser.ID = userInfo.user_id; this.ParentForm.SystemConfig.CurrentUser.Password = userInfo.user_pw; - this.ParentForm.SystemConfig.CurrentUser.ExpireAccount = userInfo.expire_period_account; - this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.expire_period_pw; + this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period; + this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period; - DateTime time = DateTime.ParseExact(userInfo.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateRegister = time; - time = DateTime.ParseExact(userInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateLogin = time; - time = DateTime.ParseExact(userInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireRegister = time; - time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CurrentUser.DateExpireLogin = time; + DateTime time = DateTime.ParseExact(userInfo.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time; + time = DateTime.ParseExact(userInfo.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time; + time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time; + time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time; - this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.flock_status_account == 0 ? false : true; - this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.flock_status_password == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.id_flock_status == 0 ? false : true; + this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.password_flock_status == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs index b29e765..a69639e 100644 --- a/INT69DC_7C/Forms/FormUserEditor.cs +++ b/INT69DC_7C/Forms/FormUserEditor.cs @@ -265,7 +265,7 @@ namespace INT69DC_7C.Forms item.ID = this.labelID.Text; item.Password = this.labelPassword.Text; - item.ExpireAccount = int.Parse(this.labelExpiryDateOfAccount.Text); + item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text); item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text); //item.IsAdmin = this.cbAdministrator.Checked; @@ -287,13 +287,13 @@ namespace INT69DC_7C.Forms if (isNewReg == true) { #region 신규 등록 - UserManager.UserManager_UserNew(item.ID, item.Password, item.IsAdmin == false ? 0 : 1, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId); + UserManager.UserManager_UserNew(item.ID, item.Password, item.IsAdmin == false ? 0 : 1, item.ExpirePassword, item.ExpireId, item.ActiveLevel, menuId); #endregion } else { #region 유저 수정 - UserManager.UserManager_UserModify(item.ID, item.Password, item.IsAdmin == false ? 0 : 1, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId); + UserManager.UserManager_UserModify(item.ID, item.Password, item.IsAdmin == false ? 0 : 1, item.ExpirePassword, item.ExpireId, item.ActiveLevel, menuId); #endregion } @@ -514,8 +514,8 @@ namespace INT69DC_7C.Forms this.SelectedUserItem.ID = item.user_id; this.SelectedUserItem.Password = item.user_pw; - this.SelectedUserItem.ExpireAccount = item.expire_period_account; - this.SelectedUserItem.ExpirePassword = item.expire_period_pw; + this.SelectedUserItem.ExpireId = item.id_expire_period; + this.SelectedUserItem.ExpirePassword = item.password_expire_period; this.SelectedUserItem.ActiveLevel = item.active_level; if (this.SelectedUserItem.ActiveLevel == 1) @@ -535,29 +535,29 @@ namespace INT69DC_7C.Forms if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin || this.SelectedUserItem.Group == DataStore.UserGroup.Developer) { - Console.WriteLine(item.register_date.GetDateTime()); - Console.WriteLine(item.login_date.GetDateTime()); - Console.WriteLine(item.expire_account_date.GetDateTime()); - Console.WriteLine(item.expire_register_date.GetDateTime()); + Console.WriteLine(item.password_login_date.GetDateTime()); + Console.WriteLine(item.id_register_date.GetDateTime()); + Console.WriteLine(item.id_expire_date.GetDateTime()); + Console.WriteLine(item.password_expire_date.GetDateTime()); - this.SelectedUserItem.DateRegister = DateTime.Now; - this.SelectedUserItem.DateLogin = DateTime.Now; - this.SelectedUserItem.DateExpireRegister = DateTime.Now; - this.SelectedUserItem.DateExpireLogin = DateTime.Now; + this.SelectedUserItem.DatePasswordLogin = DateTime.Now; + this.SelectedUserItem.DateIdRegister = DateTime.Now; + this.SelectedUserItem.DateIdExpire = DateTime.Now; + this.SelectedUserItem.DatePasswordExpire = DateTime.Now; } else { - DateTime time = DateTime.ParseExact(item.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.SelectedUserItem.DateRegister = time; - time = DateTime.ParseExact(item.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.SelectedUserItem.DateLogin = time; - time = DateTime.ParseExact(item.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.SelectedUserItem.DateExpireRegister = time; - time = DateTime.ParseExact(item.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.SelectedUserItem.DateExpireLogin = time; + DateTime time = DateTime.ParseExact(item.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.SelectedUserItem.DatePasswordLogin = time; + time = DateTime.ParseExact(item.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.SelectedUserItem.DateIdRegister = time; + time = DateTime.ParseExact(item.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.SelectedUserItem.DateIdExpire = time; + time = DateTime.ParseExact(item.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.SelectedUserItem.DatePasswordExpire = time; } - this.SelectedUserItem.IsLockAccount = item.flock_status_account == 0 ? false : true; + this.SelectedUserItem.IsLockAccount = item.id_flock_status == 0 ? false : true; this.SelectedUserItem.IsLockPassword = item.flock_status_password == 0 ? false : true; this.SelectedUserItem.IsAdmin = item.fadmin == 0 ? false : true; @@ -568,8 +568,8 @@ namespace INT69DC_7C.Forms this.SelectedUserItem.ID = item.user_id; this.SelectedUserItem.Password = item.user_pw; - this.SelectedUserItem.ExpireAccount = item.expire_period_account; - this.SelectedUserItem.ExpirePassword = item.expire_period_pw; + this.SelectedUserItem.ExpireId = item.id_expire_period; + this.SelectedUserItem.ExpirePassword = item.password_expire_period; this.SelectedUserItem.ActiveLevel = item.active_level; if (item.active_level == 1) @@ -586,35 +586,36 @@ namespace INT69DC_7C.Forms if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin || this.SelectedUserItem.Group == DataStore.UserGroup.Developer) { - Console.WriteLine(item.register_date.GetDateTime()); - Console.WriteLine(item.login_date.GetDateTime()); - Console.WriteLine(item.expire_account_date.GetDateTime()); - Console.WriteLine(item.expire_register_date.GetDateTime()); + Console.WriteLine(item.password_login_date.GetDateTime()); + Console.WriteLine(item.id_register_date.GetDateTime()); + Console.WriteLine(item.id_expire_date.GetDateTime()); + Console.WriteLine(item.password_expire_date.GetDateTime()); - this.SelectedUserItem.DateRegister = DateTime.Now; - this.SelectedUserItem.DateLogin = DateTime.Now; - this.SelectedUserItem.DateExpireRegister = DateTime.Now; - this.SelectedUserItem.DateExpireLogin = DateTime.Now; + this.SelectedUserItem.DatePasswordLogin = DateTime.Now; + this.SelectedUserItem.DateIdRegister = DateTime.Now; + this.SelectedUserItem.DateIdExpire = DateTime.Now; + this.SelectedUserItem.DatePasswordExpire = DateTime.Now; } else { - DateTime time = DateTime.ParseExact(item.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.SelectedUserItem.DateRegister = time; - time = DateTime.ParseExact(item.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.SelectedUserItem.DateLogin = time; - time = DateTime.ParseExact(item.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.SelectedUserItem.DateExpireRegister = time; - time = DateTime.ParseExact(item.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.SelectedUserItem.DateExpireLogin = time; + DateTime time = DateTime.ParseExact(item.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.SelectedUserItem.DatePasswordLogin = time; + time = DateTime.ParseExact(item.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.SelectedUserItem.DateIdRegister = time; + time = DateTime.ParseExact(item.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.SelectedUserItem.DateIdExpire = time; + time = DateTime.ParseExact(item.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null); + this.SelectedUserItem.DatePasswordExpire = time; } - this.SelectedUserItem.IsLockAccount = item.flock_status_account == 0 ? false : true; - this.SelectedUserItem.IsLockPassword = item.flock_status_password == 0 ? false : true; + this.SelectedUserItem.IsLockAccount = item.id_flock_status == 0 ? false : true; + this.SelectedUserItem.IsLockPassword = item.password_flock_status == 0 ? false : true; this.SelectedUserItem.IsAdmin = item.fadmin == 0 ? false : true; } private void UpdateSelectUserDisplay(UserItem item) + { this.SetEnableID(false); @@ -645,10 +646,10 @@ namespace INT69DC_7C.Forms } else { - this.labelExpiryDateOfAccount.Text = item.ExpireAccount.ToString(); + this.labelExpiryDateOfAccount.Text = item.ExpireId.ToString(); this.labelExpiryDateOfPassword.Text = item.ExpirePassword.ToString(); - this.labelExpiryDateOfAccount2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateLogin, item.DateExpireRegister); - this.labelExpiryDateOfPassword2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateRegister, item.DateExpireLogin); + this.labelExpiryDateOfAccount2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdRegister, item.DateIdExpire); + this.labelExpiryDateOfPassword2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordLogin, item.DatePasswordExpire); this.labelStatusExpiryAccount.Visible = item.IsLockAccount; this.labelStatusExpiryPassword.Visible = item.IsLockPassword; diff --git a/INT69DC_7C/Part11_UserManager/UserItem.cs b/INT69DC_7C/Part11_UserManager/UserItem.cs index 884af9e..ad4807d 100644 --- a/INT69DC_7C/Part11_UserManager/UserItem.cs +++ b/INT69DC_7C/Part11_UserManager/UserItem.cs @@ -13,16 +13,16 @@ namespace INT69DC_7C.Part11_UserManager private string m_ID; private string m_Password; - private int m_ExpireAccount; + private int m_ExpireId; private int m_ExpirePassword; private bool m_IsLockAccount; private bool m_IsLockPassword; - private DateTime m_DateRegister; - private DateTime m_DateLogin; - private DateTime m_DateExpireRegister; - private DateTime m_DateExpireLogin; + private DateTime m_DatePasswordLogin; + private DateTime m_DateIdRegister; + private DateTime m_DateIdExpire; + private DateTime m_DatePasswordExpire; private DataStore.UserGroup m_Group; @@ -50,10 +50,10 @@ namespace INT69DC_7C.Part11_UserManager set { this.m_Password = value; } } - public int ExpireAccount + public int ExpireId { - get { return this.m_ExpireAccount; } - set { this.m_ExpireAccount = value; } + get { return this.m_ExpireId; } + set { this.m_ExpireId = value; } } public int ExpirePassword { @@ -72,25 +72,25 @@ namespace INT69DC_7C.Part11_UserManager set { this.m_IsLockPassword = value; } } - public DateTime DateRegister + public DateTime DatePasswordLogin { - get { return this.m_DateRegister; } - set { this.m_DateRegister = value; } + get { return this.m_DatePasswordLogin; } + set { this.m_DatePasswordLogin = value; } } - public DateTime DateLogin + public DateTime DateIdRegister { - get { return this.m_DateLogin; } - set { this.m_DateLogin = value; } + get { return this.m_DateIdRegister; } + set { this.m_DateIdRegister = value; } } - public DateTime DateExpireRegister + public DateTime DateIdExpire { - get { return this.m_DateExpireRegister; } - set { this.m_DateExpireRegister = value; } + get { return this.m_DateIdExpire; } + set { this.m_DateIdExpire = value; } } - public DateTime DateExpireLogin + public DateTime DatePasswordExpire { - get { return this.m_DateExpireLogin; } - set { this.m_DateExpireLogin = value; } + get { return this.m_DatePasswordExpire; } + set { this.m_DatePasswordExpire = value; } } public DataStore.UserGroup Group @@ -118,13 +118,13 @@ namespace INT69DC_7C.Part11_UserManager this.ID = "-"; this.Password = "-"; - this.ExpireAccount = 0; + this.ExpireId = 0; this.ExpirePassword = 0; - this.DateRegister = DateTime.Now; - this.DateLogin = DateTime.Now; - this.DateExpireRegister = DateTime.Now; - this.DateExpireLogin = DateTime.Now; + this.DatePasswordLogin = DateTime.Now; + this.DateIdRegister = DateTime.Now; + this.DateIdExpire = DateTime.Now; + this.DatePasswordExpire = DateTime.Now; this.Group = DataStore.UserGroup.None; @@ -143,7 +143,7 @@ namespace INT69DC_7C.Part11_UserManager ret = 9999; else { - dayDiff = timeNow.Date - this.DateExpireLogin.Date; + dayDiff = timeNow.Date - this.DatePasswordExpire.Date; ret = dayDiff.Days; } diff --git a/INT69DC_7C/Part11_UserManager/UserManager.Structure.cs b/INT69DC_7C/Part11_UserManager/UserManager.Structure.cs index 999f5cc..cf9c829 100644 --- a/INT69DC_7C/Part11_UserManager/UserManager.Structure.cs +++ b/INT69DC_7C/Part11_UserManager/UserManager.Structure.cs @@ -212,34 +212,37 @@ namespace INT69DC_7C.Part11_UserManager public Int32 fadmin; [MarshalAs(UnmanagedType.I4)] - public Int32 expire_period_pw; // password lock + public Int32 password_expire_period; // password lock date [MarshalAs(UnmanagedType.I4)] - public Int32 expire_period_account; // account lock + public Int32 id_expire_period; // id lock date [MarshalAs(UnmanagedType.I4)] - public Int32 flock_status_account; // user ID (account) lock + public Int32 id_flock_status; // user ID (account) lock status [MarshalAs(UnmanagedType.I4)] - public Int32 flock_status_password; // password lock (need to change password) + public Int32 password_flock_status; // password lock status (need to change password) [MarshalAs(UnmanagedType.Struct)] - public DateTime_t register_date; // date/time when the user password was registered or changed + public DateTime_t password_login_date; // date/time when the user password was registered or changed [MarshalAs(UnmanagedType.Struct)] - public DateTime_t login_date; // date/time when the user was login + public DateTime_t id_register_date; // date/time when the user was login [MarshalAs(UnmanagedType.Struct)] - public DateTime_t expire_register_date; + public DateTime_t password_expire_date; // Password Expiration Date [MarshalAs(UnmanagedType.Struct)] - public DateTime_t expire_account_date; + public DateTime_t id_expire_date; // Account Expiration Date [MarshalAs(UnmanagedType.Struct)] - public MenuID_t menuID; + public MenuID_t menuID; // flag of Menu IDs [MarshalAs(UnmanagedType.I4)] - public Int32 active_level; + public Int32 active_level; // menu active level : max : MAX_ACTIVE_LEVEL + + [MarshalAs(UnmanagedType.I4)] + public Int32 fFirstPW; // [1] First (request to modify), [0] Next (not request) } #endregion @@ -324,34 +327,37 @@ namespace INT69DC_7C.Part11_UserManager public Int32 fadmin; [MarshalAs(UnmanagedType.I4)] - public Int32 expire_period_pw; // password lock + public Int32 password_expire_period; // password lock [MarshalAs(UnmanagedType.I4)] - public Int32 expire_period_account; // account lock + public Int32 id_expire_period; // account lock [MarshalAs(UnmanagedType.I4)] - public Int32 flock_status_account; // user ID (account) lock + public Int32 id_flock_status; // user ID (account) lock [MarshalAs(UnmanagedType.I4)] public Int32 flock_status_password; // password lock (need to change password) [MarshalAs(UnmanagedType.Struct)] - public DateTime_t register_date; // date/time when the user password was registered or changed + public DateTime_t password_login_date; // date/time when the user password was registered or changed [MarshalAs(UnmanagedType.Struct)] - public DateTime_t login_date; // date/time when the user was login + public DateTime_t id_register_date; // date/time when the user was login [MarshalAs(UnmanagedType.Struct)] - public DateTime_t expire_register_date; + public DateTime_t password_expire_date; // Password Expiration Date [MarshalAs(UnmanagedType.Struct)] - public DateTime_t expire_account_date; + public DateTime_t id_expire_date; // Account Expiration Date [MarshalAs(UnmanagedType.I4)] - public Int32 active_level; + public Int32 active_level; // menu active level : max : MAX_ACTIVE_LEVEL [MarshalAs(UnmanagedType.Struct)] - public MenuID_t menuID; + public MenuID_t menuID; // flag of Menu IDs + + [MarshalAs(UnmanagedType.I4)] + public Int32 fFirstPW; // flag first password } #endregion