From 45283d57b587414b9c529a0347754e263323275e Mon Sep 17 00:00:00 2001
From: Schwirg László <lschwirg@vonalkod.hu>
Date: Tue, 19 Sep 2023 12:10:45 +0200
Subject: [PATCH] - beépülők frissítése

---
 Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs              |  8 ++++++--
 Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs                 | 10 +++++-----
 Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj |  4 ++--
 Vrh.Log4Pro.MaintenanceConsole/packages.config                       |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs b/Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs
index 3bb4c03..6f33968 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs
+++ b/Vrh.Log4Pro.MaintenanceConsole/Manager - UserManager.cs
@@ -152,9 +152,13 @@ namespace Vrh.Log4Pro.MaintenanceConsole.UserManagerNS
 		private static object CreateAdminusers(object parameter, object o)
 		{
 			var config = (parameter as Menu.ExecutorParameter).GetConfig<Log4ProUserManagerXmlProcessor>();
-			try 
+			var adminun = ColorConsole.ReadLine($"Enter administrator name:", ConsoleColor.Yellow);
+			if (adminun.ToUpper() == "EX") { return null; }
+			var adminpsw = ColorConsole.ReadLine($"Enter administrator password:", ConsoleColor.Yellow);
+			if (adminpsw.ToUpper() == "EX") { return null; }
+			try
 			{ 
-				MembershipTools.Users.CreateAdminRolesAndUsers();
+				MembershipTools.Users.CreateAdminRolesAndUsers(adminpsw);
 				ColorConsole.WriteLine($"Creating admin users was successful!", ConsoleColor.Green);
 			}
 			catch (Exception ex) { ColorConsole.WriteLine(ex.Message, ConsoleColor.Red); }
diff --git a/Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs b/Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs
index 73d505c..af9327f 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs
+++ b/Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs
@@ -47,9 +47,8 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 			public const string ROLENAME_ADMINISTRATOR = "Administrator";
 			public const string ROLENAME_ADMIN = "Admin";
 			public const string USERNAME_ADMINISTRATOR = "Administrator";
-			public const string PASSWORD_ADMINISTRATOR = "Admin123";
 			public const string USERNAME_ADMIN = "Admin";
-			public const string PASSWORD_ADMIN = "Admin123";
+			public const string PASSWORD_ADMINISTRATOR = "Admin123";
 			public static readonly string[] SYSTEMUSERNAMELIST = new string[] { ROLENAME_ADMIN, USERNAME_ADMINISTRATOR };
 			public static readonly DateTime NEVERONLINE = new DateTime(2000, 1, 1);
 		}
@@ -119,7 +118,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 				}
 				#endregion ellenőrzések
 
-				CreateAdminRolesAndUsers();
+				CreateAdminRolesAndUsers(username,password);
 				MembershipUser user = Membership.GetUser(username);
 				if (user == null)
 				{
@@ -177,8 +176,9 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 			}
 			#endregion Create
 			#region CreateAdminRolesAndUsers
-			public static void CreateAdminRolesAndUsers()
+			public static void CreateAdminRolesAndUsers(string adminun=null, string adminpsw=null)
 			{
+				if (string.IsNullOrWhiteSpace(adminpsw)) adminun = Constants.USERNAME_ADMIN;
 				MembershipUser user;
 				if (!System.Web.Security.Roles.RoleExists(Constants.ROLENAME_ADMINISTRATOR)) { System.Web.Security.Roles.CreateRole(Constants.ROLENAME_ADMINISTRATOR); }
 				if (!System.Web.Security.Roles.RoleExists(Constants.ROLENAME_ADMIN)) { System.Web.Security.Roles.CreateRole(Constants.ROLENAME_ADMIN); }
@@ -186,7 +186,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 				user = Membership.GetUser(Constants.USERNAME_ADMIN);
 				if (user == null)
 				{
-					user = Membership.CreateUser(Constants.USERNAME_ADMIN, Constants.PASSWORD_ADMIN);
+					user = Membership.CreateUser(Constants.USERNAME_ADMIN, Constants.PASSWORD_ADMINISTRATOR);
 				}
 				if (!System.Web.Security.Roles.IsUserInRole(Constants.USERNAME_ADMIN, Constants.ROLENAME_ADMINISTRATOR)) { System.Web.Security.Roles.AddUserToRole(Constants.USERNAME_ADMIN, Constants.ROLENAME_ADMINISTRATOR); }
 				if (!System.Web.Security.Roles.IsUserInRole(Constants.USERNAME_ADMIN, Constants.ROLENAME_ADMIN)) { System.Web.Security.Roles.AddUserToRole(Constants.USERNAME_ADMIN, Constants.ROLENAME_ADMIN); }
diff --git a/Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj b/Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj
index 3952f28..2c04d05 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj
+++ b/Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj
@@ -359,8 +359,8 @@
     <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net452\Vrh.Web.Providers.dll</HintPath>
     </Reference>
-    <Reference Include="Vrh.XmlProcessing, Version=1.31.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Vrh.XmlProcessing.1.31.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
+    <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
diff --git a/Vrh.Log4Pro.MaintenanceConsole/packages.config b/Vrh.Log4Pro.MaintenanceConsole/packages.config
index 7d745be..bb902ab 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/packages.config
+++ b/Vrh.Log4Pro.MaintenanceConsole/packages.config
@@ -75,5 +75,5 @@
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net472" />
   <package id="VRH.Common" version="3.0.0" targetFramework="net472" />
   <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net472" />
-  <package id="Vrh.XmlProcessing" version="1.31.0" targetFramework="net472" />
+  <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net472" />
 </packages>
\ No newline at end of file
--
libgit2 0.21.2