Merge pull request #67 from csciuto/development

Added x-ctct-request-source header on REST calls

Author: csciuto

src/Ctct/Util/Config.php

@@ -110,10 +110,16 @@ class Config
         /**
          * Errors to be returned for various exceptions
          */
-        'errors' => array(
-            'id_or_object' => 'Only an id or %s object are allowed for this method.'
-        )
-
+        'errors'    => array(
+            'id_or_object'        => 'Only an id or %s object are allowed for this method.'
+        ),
+        
+        /**
+         * Setting the version fo the application used in Rest Calls when setting the version header
+         */
+        'settings'    => array(
+            'version'        => '1.2.0'
+        ),
     );
 
     /**

src/Ctct/Util/RestClient.php

@@ -68,11 +68,14 @@ public function delete($url, array $headers = array())
      */
     private static function httpRequest($url, $method, array $headers = array(), $data = null)
     {
+        //adding the version header to the existing headers
+        $headers[] = self::getVersionHeader();
+        
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $url);
         curl_setopt($curl, CURLOPT_HEADER, 0);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_USERAGENT, "ConstantContact AppConnect PHP Library v1.1");
+        curl_setopt($curl, CURLOPT_USERAGENT, "ConstantContact AppConnect PHP Library v" . Config::get('settings.version'));
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
@@ -87,7 +90,7 @@ private static function httpRequest($url, $method, array $headers = array(), $da
 
         // check if any errors were returned
         $body = json_decode($response->body, true);
-        if (isset($body[0]) && array_key_exists('error_key', $body[0])) {
+        if ((isset($body[0]) && array_key_exists('error_key', $body[0])) || ($response->error !== false)) {
             $ex = new CtctException($response->body);
             $ex->setCurlInfo($response->info);
             $ex->setErrors($body);
@@ -96,4 +99,12 @@ private static function httpRequest($url, $method, array $headers = array(), $da
 
         return $response;
     }
+    
+    /**
+     * Returns the version header for the rest calls
+     * @return string
+     */
+    public static function getVersionHeader(){
+        return 'x-ctct-request-source: sdk.php.' . Config::get('settings.version');
+    }
 }