Diff of /trunk/TSAdminTool/ProSupport.cs

Parent Directory | Revision Log | Patch

--- trunk/TSAdminTool/ProSupport.cs	2012/07/14 00:36:23	91
+++ trunk/TSAdminTool/ProSupport.cs	2012/07/14 00:55:41	92
@@ -17,7 +17,7 @@
 namespace AnywhereTS
 {
     public static class ProSupport
-    {       
+    {
         // File names
         public const string strHostsFilename = "hosts"; // The name of the thin clients host file.
         public const string strNetworkConfigFilename = "network"; // Name of the Thinstation common config file in the TFTP root directory.
@@ -27,9 +27,11 @@
         // Registry keys
         public const string strRegTFTP_root = "TFTP_root"; // Reg key for TFTP root directory in database
         public const string strRegDatabaseDir = "DatabaseDir"; // Reg key for database directory
-        public const string strRegDatabaseServer = "AnywhereTSServer"; // Reg key for database server
+        public const string strRegAnywhereTSServer = "ATSServer"; // Reg key for database server
+        public const string strRegDatabaseServer = "DatabaseServer"; // Reg key for database server
+        public const string strRegDatabaseInstance = "DatabaseInstance"; // Reg key for database server
         public const string strRegDestDir = "DestDir"; // Reg key for Destination directory, used in unmanged mode..
-        
+
         // Database constants
         public const string DEFAULT_RECORD_MAC = "Default     "; // Phony MAC address (12 chars) used to identify the client record that contains the default settings for all new clients
 
@@ -40,18 +42,22 @@
         public static atsDataSetTableAdapters.AppInfoTableAdapter appInfoTableAdapter; // The AnywhereTS application data adapter for the AppInfo table. Only this adapter should be used.
 
         public static string strAnywhereTSServer; // If this computer does not contain the database server, this is the name of the database server that contains the ATS database. Used by the Control Panel
-        
+        public static string strDatabaseServer; // If this computer does not contain the database server, this is the name of the database server that contains the ATS database. Used by the Control Panel
+        public static string strDatabaseInstance; // If this computer does not contain the database server, this is the name of the database server that contains the ATS database. Used by the Control Panel
+
         // Directories
         public static string strDatabasePath; // The directory where the database file is located.
         public static string strDestDir; // Destination directory for client files in unmanaged mode.
-        
+
         // Constructor Initializes the global variables
         static ProSupport()
         {
             // Initiate variables from registry
+            strAnywhereTSServer = ATSGlobals.GetATSRegValueString(strRegAnywhereTSServer);
             strDatabasePath = ATSGlobals.GetATSRegValueString(strRegDatabaseDir);
             strDestDir = ATSGlobals.GetATSRegValueString(strRegDestDir);
-            strAnywhereTSServer = ATSGlobals.GetATSRegValueString(strRegDatabaseServer);
+            strDatabaseServer = ATSGlobals.GetATSRegValueString(strRegDatabaseServer);
+            strDatabaseInstance = ATSGlobals.GetATSRegValueString(strRegDatabaseInstance);
         }
 
         // Loook up local IP for computer