Merge pull request #975 from irgsmirx/patch-1

Update lib/util.php
12 years ago · 9dc5ea172e
parent 8240717309 1e3231c732
commit 9dc5ea172e
1 changed files with 21 additions and 8 deletions
--- a/lib/util.php
+++ b/lib/util.php
@ -688,14 +688,27 @@ class OC_Util {
                curl_close($curl);

            } else {
-                
-                $ctx = stream_context_create(
-                    array(
-                        'http' => array(
-                            'timeout' => 10
-                        )
-                    )
-                );
+	        $contextArray = null;
+	            
+	        if(OC_Config::getValue('proxy','')<>'') {
+	                $contextArray = array(
+	                                    'http' => array(
+	                                        'timeout' => 10,
+	                                        'proxy' => OC_Config::getValue('proxy')
+	                                    )
+	                             );
+	        } else {
+	                $contextArray = array(
+	                                    'http' => array(
+		                                'timeout' => 10
+	                                  )
+	                             );
+	        }
+	            
+	            
+	        $ctx = stream_context_create(
+	            $contextArray
+	        );
                $data=@file_get_contents($url, 0, $ctx);
                
            }