X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Futil%2FServerConstants.java;h=8689209444b1f5199b0d6c29905aa2686d33d362;hb=14ce2292d15b5d43a285804991f9b7d94207e274;hp=49f5d050a86054eed7195ea1956afd404f3ad6c3;hpb=943d8e7ed0ea5a9d56e7e694a3cbd849c52bad16;p=gigi.git

diff --git a/src/org/cacert/gigi/util/ServerConstants.java b/src/org/cacert/gigi/util/ServerConstants.java
index 49f5d050..86892094 100644
--- a/src/org/cacert/gigi/util/ServerConstants.java
+++ b/src/org/cacert/gigi/util/ServerConstants.java
@@ -12,17 +12,21 @@ public class ServerConstants {
 
     private static String apiHostName = "api.cacert.local";
 
-    private static String port;
+    private static String securePort, port;
 
     public static void init(Properties conf) {
-        port = "";
-        if ( !conf.getProperty("port").equals("443")) {
-            port = ":" + conf.getProperty("port");
+        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");
+
     }
 
     public static String getSecureHostName() {
@@ -42,7 +46,15 @@ public class ServerConstants {
     }
 
     public static String getSecureHostNamePort() {
-        return secureHostName + port;
+        return secureHostName + securePort;
+    }
+
+    public static String getStaticHostNamePortSecure() {
+        return staticHostName + securePort;
+    }
+
+    public static String getWwwHostNamePortSecure() {
+        return wwwHostName + securePort;
     }
 
     public static String getStaticHostNamePort() {
@@ -54,7 +66,21 @@ public class ServerConstants {
     }
 
     public static String getApiHostNamePort() {
-        return apiHostName + port;
+        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()));
     }
 
 }