Changeset 182 for binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs

Timestamp:

Sep 9, 2014, 8:04:37 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

• binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs (modified) (3 diffs)

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs

@@ -16 +16 @@
                 private string realm = "7dtd Admin Panel";
 
-                public Web (int port)
+                public Web ()
                 {
                         try {
+                                int webPort = GamePrefs.GetInt (EnumGamePrefs.ControlPanelPort);
+                                if (!GamePrefs.GetBool (EnumGamePrefs.ControlPanelEnabled) || webPort < 1 || webPort > 65533) {
+                                        Log.Out ("Webserver not started (ControlPanel not enabled or ControlPanelPort not within 1-65534)");
+                                        return;
+                                }
+                                if (!Directory.Exists (Application.dataPath + "/../webserver")) {
+                                        Log.Out ("Webserver not started (folder \"webserver\" not found in game folder)");
+                                        return;
+                                }
+
                                 if (!HttpListener.IsSupported)
                                         throw new NotSupportedException ("Needs Windows XP SP2, Server 2003 or later.");
@@ -27 +37 @@
                                 handlers.Add ("/api/", new ApiHandler ("/api/"));
 
-                                _listener.Prefixes.Add (String.Format ("http://*:{0}/", port));
+                                _listener.Prefixes.Add (String.Format ("http://*:{0}/", webPort + 2));
                                 authEnabled = File.Exists (Application.dataPath + "/../webserver/protect");
                                 if (authEnabled)
@@ -49 +59 @@
                                 );
 
-                                Log.Out ("Started Webserver on " + port + " (authentication " + (authEnabled ? "enabled" : "disabled") + ")");
+                                NetTelnetServer.RegisterServer(this);
+
+
+                                Log.Out ("Started Webserver on " + (webPort + 2) + " (authentication " + (authEnabled ? "enabled" : "disabled") + ")");
                         } catch (Exception e) {
                                 Log.Out ("Error in Web.ctor: " + e);