Changeset 31864 for main/trunk/gli/src

Timestamp:

2017-08-09T20:24:33+12:00 (7 years ago)

Author:

ak19

Message:

1. Modified GLI and perl to set proxy_on, proxy_host and proxy_port for unix too, whereas in the past, only http(s)_proxy ENV vars were set by GLI for unix. If the env vars are not set, then perl assumes it's the wget setup for windows and passes the proxy vars that were set by GLI as flags to wget. If the env vars were set, then perl should run wget without setting the proxy vars as flags to wget, and wget will use the proxying info in the environment. So now, the decision as to whether proxy vars are set or not will result in context specific suggestion messages to the user when the Server Info button was pressed and if the URL could not be accessed for whatever reason. 2. Modified GLI code to not use proxy if proxying is toggled off, but use proxy when it's toggled back on. (Previously, if proxying was set at any point during a GLI session, then GLI remembered that even when proxying was turned off thereafter.)

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -766 +766 @@
 
         if(user_pass.indexOf("@") != -1) {
-            
-        // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the following can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
-        if (Utility.isWindows()) {
-           
+       
            arg.setValue("true"); // proxy_on argument
            arg.setAssigned(true);
@@ -780 +777 @@
            arg.setValue(proxy_port);
            arg.setAssigned(true);
+
+        
+        // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the following can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
+        if (Utility.isWindows()) {
         
            arg = current_download.getArgument("user_name");
@@ -799 +800 @@
         }
         else{
+        // unset proxy_on argument
+        arg = current_download.getArgument("proxy_on");
+        arg.setValue("false"); 
+        arg.setAssigned(false);
         return false;
         }
 
+    } else {
+        // unset proxy_on argument
+        arg = current_download.getArgument("proxy_on");
+        arg.setValue("false"); 
+        arg.setAssigned(false);
     }
     
@@ -830 +840 @@
         String str_url = "";
         if( arg_url!= null && arg_url.isAssigned()) {
-        str_url = arg_url.getValue();
+        str_url = arg_url.getValue();       
+        /*
+        String redirected_url = getRedirectURL(str_url); // work out the real URL
+        if(!str_url.equals(redirected_url)) {
+            arg_url.setValue(redirected_url);
+        }
+        */
         }
 
@@ -842 +858 @@
         no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
         }
-        
-        
-        //str_url = getRedirectURL(str_url); // work out the real URL
 
         server_info = new ServerInfoDialog(str_url ,proxy_url, mode,(Download)download_map.get(mode));