Merge pull request FuseCP#193 from simonegli8/CoreWCF

Bugfixes
mapsouza · Oct 14, 2024 · 297d580 · 297d580
2 parents 2b3571b + 78a38c9
commit 297d580
Show file tree

Hide file tree

Showing 191 changed files with 349,920 additions and 29,524 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,9 @@ install.*.exe
 
 # SQLite databases
 *.sqlite
+*.sqlite-journal
+*.sqlite-shm
+*.sqlite-wal
 
 #build
 [Oo]bj/

diff --git a/Languages/Resources.xml b/Languages/Resources.xml
@@ -515,6 +515,16 @@
     <Key>ModuleTitle.MySql8Users</Key>
     <DefaultValue>MySQL 8 Users</DefaultValue>
   </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_Modules.ascx.resx</File>
+    <Key>ModuleTitle.MySql9Databases</Key>
+    <DefaultValue>MySQL 9 Databases</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_Modules.ascx.resx</File>
+    <Key>ModuleTitle.MySql9Users</Key>
+    <DefaultValue>MySQL 9 Users</DefaultValue>
+  </Resource>
   <Resource>
     <File>App_GlobalResources\SolidCP_Modules.ascx.resx</File>
     <Key>ModuleTitle.MariaDBDatabases</Key>
@@ -1795,6 +1805,16 @@
     <Key>PageTitle.SpaceMySql8</Key>
     <DefaultValue>{user} - {space} - MySQL 8.x</DefaultValue>
   </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_Pages.ascx.resx</File>
+    <Key>PageName.SpaceMySql9</Key>
+    <DefaultValue>MySQL 9.x</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_Pages.ascx.resx</File>
+    <Key>PageTitle.SpaceMySql9</Key>
+    <DefaultValue>{user} - {space} - MySQL 9.x</DefaultValue>
+  </Resource>
   <Resource>
     <File>App_GlobalResources\SolidCP_Pages.ascx.resx</File>
     <Key>PageName.SpaceMariaDB</Key>
@@ -5325,6 +5345,21 @@
     <Key>Quota.MySQL8.MaxDatabaseSize</Key>
     <DefaultValue>Max Database Size, MB</DefaultValue>
   </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>Quota.MySQL9.Backup</Key>
+    <DefaultValue>Database Backups</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>Quota.MySQL9.Databases</Key>
+    <DefaultValue>Databases</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>Quota.MySQL9.MaxDatabaseSize</Key>
+    <DefaultValue>Max Database Size, MB</DefaultValue>
+  </Resource>
   <Resource>
     <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
     <Key>Quota.MySQL4.MaxDatabaseSize</Key>
@@ -5340,6 +5375,11 @@
     <Key>Quota.MySQL8.Restore</Key>
     <DefaultValue>Database Restores</DefaultValue>
   </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>Quota.MySQL9.Restore</Key>
+    <DefaultValue>Database Restores</DefaultValue>
+  </Resource>
   <Resource>
     <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
     <Key>Quota.MySQL4.Truncate</Key>
@@ -5370,6 +5410,16 @@
     <Key>Quota.MySQL8.Users</Key>
     <DefaultValue>Users</DefaultValue>
   </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>Quota.MySQL9.Truncate</Key>
+    <DefaultValue>Database Truncate</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>Quota.MySQL9.Users</Key>
+    <DefaultValue>Users</DefaultValue>
+  </Resource>
   <Resource>
     <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
     <Key>Quota.MariaDB.Backup</Key>
@@ -5415,6 +5465,11 @@
     <Key>ReportResourceGroup.MySQL8</Key>
     <DefaultValue>MySQL 8</DefaultValue>
   </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>ReportResourceGroup.MySQL9</Key>
+    <DefaultValue>MySQL 9</DefaultValue>
+  </Resource>
   <Resource>
     <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
     <Key>ResourceGroup.MsSQL2005</Key>
@@ -5445,6 +5500,11 @@
     <Key>ResourceGroup.MySQL8</Key>
     <DefaultValue>MySQL 8</DefaultValue>
   </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>ResourceGroup.MySQL9</Key>
+    <DefaultValue>MySQL 9</DefaultValue>
+  </Resource>
   <Resource>
     <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
     <Key>ResourceGroup.MsSQL2012</Key>
@@ -5895,6 +5955,16 @@
     <Key>ServiceItemType.MySQL8User</Key>
     <DefaultValue>MySQL 8 User</DefaultValue>
   </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>ServiceItemType.MySQL9Database</Key>
+    <DefaultValue>MySQL 9 Database</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
+    <Key>ServiceItemType.MySQL9User</Key>
+    <DefaultValue>MySQL 9 User</DefaultValue>
+  </Resource>
   <Resource>
     <File>App_GlobalResources\SolidCP_SharedResources.ascx.resx</File>
     <Key>ServiceItemType.MariaDBDatabase</Key>
@@ -42113,7 +42183,7 @@ The following substitution variables can be used in the pattern:&lt;br/&gt;
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\IIS60_Settings.ascx.resx</File>
     <Key>lblWebAppGallery.Text</Key>
-    <DefaultValue>Web Appication Gallery</DefaultValue>
+    <DefaultValue>Web Application Gallery</DefaultValue>
   </Resource>
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\IIS60_Settings.ascx.resx</File>
@@ -42298,7 +42368,7 @@ The following substitution variables can be used in the pattern:&lt;br/&gt;
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\IIS70_Settings.ascx.resx</File>
     <Key>lblWebAppGallery.Text</Key>
-    <DefaultValue>Web Appication Gallery</DefaultValue>
+    <DefaultValue>Web Application Gallery</DefaultValue>
   </Resource>
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\IIS70_Settings.ascx.resx</File>
@@ -43407,6 +43477,11 @@ for your installation of ADO.NET Driver for MySQL (also known as MySQL Connector
     <Key>Text.SelectDatabase</Key>
     <DefaultValue>&lt;Select Database&gt;</DefaultValue>
   </Resource>
+  <Resource>
+    <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\MSSQL_Settings.ascx.resx</File>
+    <Key>chkTrustServerCertificate.Text</Key>
+    <DefaultValue>Always trust server certificate</DefaultValue>
+  </Resource>
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\MSSQL_Settings.ascx.resx</File>
     <Key>DefaultLocation.Text</Key>
@@ -47398,7 +47473,7 @@ The following substitution variables can be used in the pattern:&lt;br/&gt;
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\Unix_Settings.ascx.resx</File>
     <Key>lblUsersHome.Text</Key>
-    <DefaultValue>Users Home Directory:</DefaultValue>
+    <DefaultValue>Hosting Spaces Folder:</DefaultValue>
   </Resource>
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\vsftpd_Settings.ascx.resx</File>
@@ -47415,6 +47490,11 @@ The following substitution variables can be used in the pattern:&lt;br/&gt;
     <Key>chkEnableHardQuota.Text</Key>
     <DefaultValue>Enable Hard Quota:</DefaultValue>
   </Resource>
+  <Resource>
+    <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\Windows2008_Settings.ascx.resx</File>
+    <Key>lblFileServiceInfo</Key>
+    <DefaultValue>Install File Services role on the file server to enable the check box</DefaultValue>
+  </Resource>
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\Windows2008_Settings.ascx.resx</File>
     <Key>lblLocationDrive.Text</Key>
@@ -47432,6 +47512,26 @@ The following substitution variables can be used in the pattern:&lt;br/&gt;
   </Resource>
   <Resource>
     <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\Windows2012_Settings.ascx.resx</File>
+    <Key>lblFileServiceInfo</Key>
+    <DefaultValue>Install File Services role on the file server to enable the check box</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\Windows2012_Settings.ascx.resx</File>
+    <Key>lblSpacesFolder.Text</Key>
+    <DefaultValue>Hosting Spaces Folder:</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\Windows2016_Settings.ascx.resx</File>
+    <Key>chkEnableHardQuota.Text</Key>
+    <DefaultValue>Enable Hard Quota:</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\Windows2016_Settings.ascx.resx</File>
+    <Key>lblFileServiceInfo</Key>
+    <DefaultValue>Install File Services role on the file server to enable the check box</DefaultValue>
+  </Resource>
+  <Resource>
+    <File>DesktopModules\SolidCP\ProviderControls\App_LocalResources\Windows2016_Settings.ascx.resx</File>
     <Key>lblSpacesFolder.Text</Key>
     <DefaultValue>Hosting Spaces Folder:</DefaultValue>
   </Resource>

diff --git a/SolidCP.Installer/Sources/SolidCP.Setup/Wizard/DatabasePage.Designer.cs b/SolidCP.Installer/Sources/SolidCP.Setup/Wizard/DatabasePage.Designer.cs