Handle redundant slashes in ticker config

I.e. `https://api.example.com//ticker/target` becomes `https://api.example.com/ticker/target`
baby636 · Mar 18, 2018 · 8a87239 · 8a87239
1 parent 6ff468a
commit 8a87239
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/include/classes/tools.class.php b/include/classes/tools.class.php
@@ -44,9 +44,13 @@ public function getApi($url, $target, $auth=NULL) {
       curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
       curl_setopt($ch, CURLOPT_TIMEOUT, 30);
       curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+      curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
       curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; PHP client; '.php_uname('s').'; PHP/'.phpversion().')');
     }
-    curl_setopt($ch, CURLOPT_URL, $url . $target);
+
+    $url = rtrim($url, '/');
+    $target = ltrim($target, '/');
+    curl_setopt($ch, CURLOPT_URL, $url . '/' . $target);
     // curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
 
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);