Changeset 4216 for extensions/piwigopress/PiwigoPress_get.php

Timestamp:

Nov 5, 2009, 11:15:41 PM (14 years ago)

Author:

vdigital

Message:

[PiwigoPress]

• Alternate pwg_get_contents (cURL)
• Generated \r\n in code
• Readme FAQ

File:

• extensions/piwigopress/PiwigoPress_get.php (modified) (4 diffs)

extensions/piwigopress/PiwigoPress_get.php

@@ -19 +19 @@
         $pwg_prev_host = $host;
         $mode = $pwg_mode;
-        //$mode = 'ch'; // Forcing a test '' all, 'fs' fsockopen, 'ch' cURL
+        // $mode = 'ch'; // Forcing a test '' all, 'fs' fsockopen, 'ch' cURL
 
 // 1 - The simplest solution: file_get_contents
@@ -34 +34 @@
         }
         if ( $mode == '' ) $mode = 'fs';
-        if ( $pwg_mode == '' ) $pwg_mode = 'fs';
+        if ( $pwg_mode == '' ) $pwg_mode = 'fs'; // Remind it
 // 2 - Often accepted access: fsockopen
         if ($mode == 'fs') {
@@ -56 +56 @@
                 }
         }
-        $return["stat"] = 'failed';
-        $pwg_mode = 'failed';
-        return serialize($return);
 
-// Not active cURL right now
-        if ( $pwg_mode == 'fs' ) $pwg_mode = 'ch';
+        if ( $pwg_mode == 'fs' ) $pwg_mode = 'ch'; // Remind it
 // 3 - Sometime another solution: curl_exec
 // See http://fr2.php.net/manual/en/curl.installation.php
   if (function_exists('curl_init') and $pwg_mode == 'ch') {
                 $ch = @curl_init();
+                @curl_setopt($ch, CURLOPT_URL, $url);
+                @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
                 @curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-                @curl_setopt($ch, CURLOPT_URL, $url);
                 @curl_setopt($ch, CURLOPT_HEADER, 1);
                 @curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0');
@@ -76 +73 @@
                 $status = @curl_getinfo($ch, CURLINFO_HTTP_CODE);
                 @curl_close($value);
-                if ($value !== false and $status >= 200 and $status < 400)
-                                $value = substr($value, $header_length);
+                if ($value !== false and $status >= 200 and $status < 400) {
+                        $value = substr($value, $header_length);
+                        // echo '<br/>-ch- ('. $value . ') <br/>';
+                        return $value;
+                }
+                else $pwg_mode = 'failed'; // Sorry but remind it as well
         }
 
         // No other solutions
         $return["stat"] = 'failed';
-        echo '<br/>- pwg_get_contents: failed on file_get, fsockopen and cURL processes<br/>';
-        $pwg_mode = 'failed';
+        // echo '<br/>- pwg_get_contents: failed on file_get, fsockopen and cURL processes<br/>';
         return serialize($return);
 }