X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Futil%2FServerConstants.java;h=5ae4e1b320435fbf40f7bce0f020b1d042fcf072;hb=33f0fbe597dbcee9c387d0dfddc7dfbbdb997b46;hp=eafe93933647b7519860cb4b4fea0917b8e7d1d6;hpb=2824d1c165c501e2f3a8809044788b33b81f478a;p=gigi.git

diff --git a/src/org/cacert/gigi/util/ServerConstants.java b/src/org/cacert/gigi/util/ServerConstants.java
index eafe9393..5ae4e1b3 100644
--- a/src/org/cacert/gigi/util/ServerConstants.java
+++ b/src/org/cacert/gigi/util/ServerConstants.java
@@ -3,53 +3,91 @@ package org.cacert.gigi.util;
 import java.util.Properties;
 
 public class ServerConstants {
-	private static String wwwHostName = "www.cacert.local";
-	private static String secureHostName = "secure.cacert.local";
-	private static String staticHostName = "static.cacert.local";
-	private static String apiHostName = "api.cacert.local";
-	private static String port;
-
-	public static void init(Properties conf) {
-		port = "";
-		if (!conf.getProperty("port").equals("443")) {
-			port = ":" + conf.getProperty("port");
-		}
-		wwwHostName = conf.getProperty("name.www");
-		secureHostName = conf.getProperty("name.secure");
-		staticHostName = conf.getProperty("name.static");
-		apiHostName = conf.getProperty("name.api");
-	}
-
-	public static String getSecureHostName() {
-		return secureHostName;
-	}
-
-	public static String getStaticHostName() {
-		return staticHostName;
-	}
-
-	public static String getWwwHostName() {
-		return wwwHostName;
-	}
-
-	public static String getApiHostName() {
-		return apiHostName;
-	}
-
-	public static String getSecureHostNamePort() {
-		return secureHostName + port;
-	}
-
-	public static String getStaticHostNamePort() {
-		return staticHostName + port;
-	}
-
-	public static String getWwwHostNamePort() {
-		return wwwHostName + port;
-	}
-
-	public static String getApiHostNamePort() {
-		return apiHostName + port;
-	}
+
+    private static String wwwHostName = "www.cacert.local";
+
+    private static String secureHostName = "secure.cacert.local";
+
+    private static String staticHostName = "static.cacert.local";
+
+    private static String apiHostName = "api.cacert.local";
+
+    private static String securePort, port;
+
+    private static String suffix = "cacert.local";
+
+    public static void init(Properties conf) {
+        securePort = port = "";
+        if ( !conf.getProperty("https.port").equals("443")) {
+            securePort = ":" + conf.getProperty("https.port");
+        }
+        if ( !conf.getProperty("http.port").equals("80")) {
+            port = ":" + conf.getProperty("http.port");
+        }
+        wwwHostName = conf.getProperty("name.www");
+        secureHostName = conf.getProperty("name.secure");
+        staticHostName = conf.getProperty("name.static");
+        apiHostName = conf.getProperty("name.api");
+        suffix = conf.getProperty("name.suffix", conf.getProperty("name.www").substring(4));
+
+    }
+
+    public static String getSecureHostName() {
+        return secureHostName;
+    }
+
+    public static String getStaticHostName() {
+        return staticHostName;
+    }
+
+    public static String getWwwHostName() {
+        return wwwHostName;
+    }
+
+    public static String getApiHostName() {
+        return apiHostName;
+    }
+
+    public static String getSecureHostNamePort() {
+        return secureHostName + securePort;
+    }
+
+    public static String getStaticHostNamePortSecure() {
+        return staticHostName + securePort;
+    }
+
+    public static String getWwwHostNamePortSecure() {
+        return wwwHostName + securePort;
+    }
+
+    public static String getStaticHostNamePort() {
+        return staticHostName + port;
+    }
+
+    public static String getWwwHostNamePort() {
+        return wwwHostName + port;
+    }
+
+    public static String getApiHostNamePort() {
+        return apiHostName + securePort;
+    }
+
+    public static int getSecurePort() {
+        if (securePort.isEmpty()) {
+            return 443;
+        }
+        return Integer.parseInt(securePort.substring(1, securePort.length()));
+    }
+
+    public static int getPort() {
+        if (port.isEmpty()) {
+            return 80;
+        }
+        return Integer.parseInt(port.substring(1, port.length()));
+    }
+
+    public static String getSuffix() {
+        return suffix;
+    }
 
 }