Controller for OPTIONS can be false

Author: phpipam

php-client/class.phpipam-api.php

@@ -526,9 +526,6 @@ public function set_api_controller ($controller = false) {
         if($controller!==false) {
             $this->api_server_controller = strtolower($controller);
         }
-        else {
-            $this->exception("Invalid controller $controller");
-        }
     }
 
     /**
@@ -641,10 +638,14 @@ private function curl_set_connection ($token_file) {
             // Get cURL resource
             $this->Connection = curl_init();
 
+            // set URL
+            if($this->api_server_controller===false)    { $url = $this->api_url.$this->api_app_id."/"; }
+            else                                        { $url = $this->api_url.$this->api_app_id.str_replace("//", "/", "/".$this->api_server_controller."/".$this->api_server_identifiers."/"); }
+
             // set default curl options and params
             curl_setopt_array($this->Connection, array(
                     CURLOPT_RETURNTRANSFER => 1,
-                    CURLOPT_URL => $this->api_url.$this->api_app_id.str_replace("//", "/", "/".$this->api_server_controller."/".$this->api_server_identifiers."/"),
+                    CURLOPT_URL => $url,
                     CURLOPT_HEADER => 0,
                     CURLOPT_VERBOSE => $this->debug,
                     CURLOPT_TIMEOUT => 4,
@@ -717,7 +718,7 @@ private function curl_add_token_header ($token_file) {
                 $this->token_expires = $token[1];
 
                 // is token still valid ?
-                if ($this->token_expires < time()) {
+                if (strlen($this->token)<2 && $this->token_expires < time()) {
                     // initiate authentication
                     $this->curl_authenticate ();
                     //save token to file