Merge pull request Fotolia#3 from Manackkel/master

slaanesh · slaanesh · commit d62a6115a3cd · 2013-02-05T07:50:08.000-08:00
Add downloadMediaComp method
diff --git a/php/example.php b/php/example.php
@@ -22,6 +22,10 @@
     }
 }
 
+// download comp file
+$comp_dl_data = $api->getMediaComp(35957426);
+$api->downloadMediaComp($comp_dl_data['url'], '/tmp/comp.jpg');
+
 // loggin in and retrieving user data
 $api->loginUser('your_login', 'your_password');
 print_r($api->getUserData());
diff --git a/php/fotolia-api.php b/php/fotolia-api.php
@@ -314,6 +314,29 @@ public function getMedia($id, $license_name, $subaccount_id = NULL)
      * @param  string $output_file if null the downloaded file will be echoed on standard output
      */
     public function downloadMedia($download_url, $output_file = NULL)
+    {
+        return $this->_download($download_url, $output_file);
+    }
+
+    /**
+     * Download a media comp and write it to a file if necessary
+     *
+     * @param  string $download_url URL as returned by getMediaComp()
+     * @param  string $output_file if null the downloaded file will be echoed on standard output
+     */
+    public function downloadMediaComp($download_url, $output_file = NULL)
+    {
+        return $this->_download($download_url, $output_file, false);
+    }
+
+    /**
+     * Download a content and write it to a file if necessary
+     *
+     * @param  string $download_url URL
+     * @param  string $output_file if null the downloaded file will be echoed on standard output
+     * @param  bool $http_auth set curl password if needed
+     */
+    private function _download($download_url, $output_file = NULL, $http_auth = true)
     {
         $ch = $this->_getCurlHandler($download_url);
 
@@ -327,7 +350,9 @@ public function downloadMedia($download_url, $output_file = NULL)
         }
 
         curl_setopt($ch, CURLOPT_FILE, $output_fd);
-        curl_setopt($ch, CURLOPT_USERPWD, $this->_getHttpAuth(TRUE, TRUE));
+        if ($http_auth) {
+            curl_setopt($ch, CURLOPT_USERPWD, $this->_getHttpAuth(TRUE, TRUE));
+        }
 
         $response = curl_exec($ch);
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,10 @@`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
	`25`	`+// download comp file`
	`26`	`+$comp_dl_data = $api->getMediaComp(35957426);`
	`27`	`+$api->downloadMediaComp($comp_dl_data['url'], '/tmp/comp.jpg');`
	`28`	`+`
`25`	`29`	`// loggin in and retrieving user data`
`26`	`30`	`$api->loginUser('your_login', 'your_password');`
`27`	`31`	`print_r($api->getUserData());`