1 files changed, 15 insertions, 8 deletions

@@ -23,14 +23,11 @@ public class XmlRpc {
     private String function;
     private Object[] params;
     private int step = 3;
-    private String url = "";
+    private String url;
 
     public XmlRpc(String function) {
         this.function = function;
-        if (url.equals(""))
-        {
-            url = Wrapper.getConfig("centralServerURL");
-        }
+        this.url = "http://central.fourisland.com/xmlrpc.php";
 
         Verification ver = new Verification();
         params = new Object[3];
@@ -39,11 +36,21 @@ public class XmlRpc {
         params[2] = ver.getID();
     }
     
-    public XmlRpc(String function, String url, String username, String password)
-    {
+    public XmlRpc(String url, String function) {
         this.function = function;
         this.url = url;
 
+        Verification ver = new Verification();
+        params = new Object[3];
+        params[0] = ver.getUsername();
+        params[1] = ver.getHash();
+        params[2] = ver.getID();
+    }
+    
+    public XmlRpc(String function, String username, String password)
+    {
+        this.function = function;
+
         Verification ver = new Verification(username, password);
         params = new Object[3];
         params[0] = ver.getUsername();
@@ -69,7 +76,7 @@ public class XmlRpc {
         Object result = null;
         try {
             XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
-            config.setServerURL(new URL(url));
+            config.setServerURL(new URL("http://central.fourisland.com/xmlrpc.php"));
             XmlRpcClient client = new XmlRpcClient();
             client.setConfig(config);