Changeset 29629 for extensions

Timestamp:

Sep 18, 2014, 4:45:03 PM (10 years ago)

Author:

mistic100

Message:

update phpFlickr

Location:

extensions/flickr2piwigo

Files:

• admin/import.php (modified) (1 diff)
• include/phpFlickr/phpFlickr.php (modified) (10 diffs)

extensions/flickr2piwigo/admin/import.php

@@ -9 +9 @@
 if (empty($conf['flickr2piwigo']['api_key']) or empty($conf['flickr2piwigo']['secret_key']))
 {
-  $page['warnings'][] = l10n('Please fill your API keys on the configuration tab');
-  $_GET['action'] = 'error';
+  $_SESSION['page_warnings'][] = l10n('Please fill your API keys on the configuration tab');
+  redirect(FLICKR_ADMIN . '-config');
 }
 else if (!test_remote_download())

extensions/flickr2piwigo/include/phpFlickr/phpFlickr.php

@@ -92 +92 @@
                                         mysqli_query($db, "
                                                 CREATE TABLE IF NOT EXISTS `$table` (
-                                                        `request` CHAR( 35 ) NOT NULL ,
-                                                        `response` MEDIUMTEXT NOT NULL ,
-                                                        `expiration` DATETIME NOT NULL ,
-                                                        INDEX ( `request` )
+                                                        `request` varchar(128) NOT NULL,
+                                                        `response` mediumtext NOT NULL,
+                                                        `expiration` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                                        UNIQUE KEY `request` (`request`)
                                                 )
                                         ");
 
-                                        $result = mysqli_query($db, "SELECT COUNT(*) FROM $table");
-                                        $result = mysqli_fetch_row($result);
-                                        if ( $result[0] > $this->max_cache_rows ) {
-                                                mysqli_query($db, "DELETE FROM $table WHERE expiration < DATE_SUB(NOW(), INTERVAL $cache_expire second)");
+                                        $result = mysqli_query($db, "SELECT COUNT(*) 'count' FROM $table");
+                                        if( $result ) {
+                                                $result = mysqli_fetch_assoc($result);                                          
+                                        }
+                                        
+                                        if ( $result && $result['count'] > $this->max_cache_rows ) {
+                                                mysqli_query($db, "DELETE FROM $table WHERE CURRENT_TIMESTAMP > expiration");
                                                 mysqli_query($db, 'OPTIMIZE TABLE ' . $this->cache_table);
                                         }
@@ -133 +136 @@
                         //If there is no cache result, it returns a value of false. If it finds one,
                         //it returns the unparsed XML.
+                        unset($request['api_sig']);
                         foreach ( $request as $key => $value ) {
                                 if ( empty($value) ) unset($request[$key]);
@@ -142 +146 @@
                         $this->cache_request = $request;
                         if ($this->cache == 'db') {
-                                $result = mysqli_query($this->cache_db, "SELECT response FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "' AND DATE_SUB(NOW(), INTERVAL " . (int) $this->cache_expire . " SECOND) < expiration");
-                                if ( mysqli_num_rows($result) ) {
+                                $result = mysqli_query($this->cache_db, "SELECT response FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "' AND CURRENT_TIMESTAMP < expiration");
+                                if ( $result && mysqli_num_rows($result) ) {
                                         $result = mysqli_fetch_assoc($result);
-                                        return $result['response'];
+                                        return urldecode($result['response']);
                                 } else {
                                         return false;
@@ -175 +179 @@
                         if ($this->cache == 'db') {
                                 //$this->cache_db->query("DELETE FROM $this->cache_table WHERE request = '$reqhash'");
-                                $result = mysqli_query($this->cache_db, "SELECT COUNT(*) FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "'");
-                                $result = mysqli_fetch_row($result);
-                                if ( $result[0] ) {
-                                        $sql = "UPDATE " . $this->cache_table . " SET response = '" . str_replace("'", "''", $response) . "', expiration = '" . strftime("%Y-%m-%d %H:%M:%S") . "' WHERE request = '" . $reqhash . "'";
-                                        mysqli_query($this->cache_db, $sql);
-                                } else {
-                                        $sql = "INSERT INTO " . $this->cache_table . " (request, response, expiration) VALUES ('$reqhash', '" . str_replace("'", "''", $response) . "', '" . strftime("%Y-%m-%d %H:%M:%S") . "')";
-                                        mysqli_query($this->cache_db, $sql);
-                                }
+                                $response = urlencode($response);
+                                $sql = 'INSERT INTO '.$this->cache_table.' (request, response, expiration) 
+                                                VALUES (\''.$reqhash.'\', \''.$response.'\', TIMESTAMPADD(SECOND,'.$this->cache_expire.',CURRENT_TIMESTAMP))
+                                                ON DUPLICATE KEY UPDATE response=\''.$response.'\', 
+                                                expiration=TIMESTAMPADD(SECOND,'.$this->cache_expire.',CURRENT_TIMESTAMP) ';
+
+                                $result = mysqli_query($this->cache_db, $sql);
+                                if(!$result) {
+                                        echo mysqli_error($this->cache_db);
+                                }
+                                        
+                                return $result;
                         } elseif ($this->cache == "fs") {
                                 $file = $this->cache_dir . "/" . $reqhash . ".cache";
@@ -228 +235 @@
                                 $data = implode('&', $data);
 
-                                $fp = @pfsockopen($matches[1], 80);
+                                $fp = @pfsockopen('ssl://'.$matches[1], 443);
                                 if (!$fp) {
                                         die('Could not connect to the web service');
@@ -271 +278 @@
 
                         //Process arguments, including method and login data.
-                        $args = array_merge(array("method" => $command, "format" => "php_serial", "api_key" => $this->api_key), $args);
+                        $args = array_merge(array("method" => $command, "format" => "json", "nojsoncallback" => "1", "api_key" => $this->api_key), $args);
                         if (!empty($this->token)) {
                                 $args = array_merge($args, array("auth_token" => $this->token));
@@ -280 +287 @@
                         $auth_sig = "";
                         $this->last_request = $args;
-                        if (!($this->response = $this->getCached($args)) || $nocache) {
+                        $this->response = $this->getCached($args);
+                        if (!($this->response) || $nocache) {
                                 foreach ($args as $key => $data) {
                                         if ( is_null($data) ) {
@@ -296 +304 @@
                         }
 
+
                         /*
                          * Uncomment this line (and comment out the next one) if you're doing large queries
@@ -301 +310 @@
                          * the result, so be sure that you look at the results.
                          */
-                        //$this->parsed_response = unserialize($this->response);
-                        $this->parsed_response = $this->clean_text_nodes(unserialize($this->response));
+                        $this->parsed_response = json_decode($this->response, TRUE);
+/*                      $this->parsed_response = $this->clean_text_nodes(json_decode($this->response, TRUE)); */
                         if ($this->parsed_response['stat'] == 'fail') {
                                 if ($this->die_on_error) die("The Flickr API returned the following error: #{$this->parsed_response['code']} - {$this->parsed_response['message']}");
@@ -1135 +1144 @@
 
                         /* https://www.flickr.com/services/api/flickr.photos.search.html */
-                        $this->request("flickr.photos.search", $args);
-                        return $this->parsed_response ? $this->parsed_response['photos'] : false;
+                        $result = $this->request("flickr.photos.search", $args);
+                        return ($this->parsed_response) ? $this->parsed_response['photos'] : false;
                 }