WordPress.org
Get WordPress

Plugin Directory

Changeset 959871


Ignore:
Timestamp:
08/04/2014 10:23:37 AM (12 years ago)
Author:
fsimo
Message:

0.14

  • Flickr HTTPS endpoints (CURL options and some regexpr un phpFlickr)
Location:
wp2flickr/trunk
Files:
2 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • wp2flickr/trunk/phpFlickr-3.1/phpFlickr.php

    r919244 r959871  
    11<?php
    2 /* phpFlickr Class 3.1
     2/* phpFlickr
    33 * Written by Dan Coulter ([email protected])
    4  * Project Home Page: http://phpflickr.com/
    5  * Released under GNU Lesser General Public License (http://www.gnu.org/copyleft/lgpl.html)
    6  * For more information about the class and upcoming tools and toys using it,
    7  * visit http://www.phpflickr.com/
     4 * Project Home Page: http://github.com/dancoulter/phpflickr
    85 *
    9  *   For installation instructions, open the README.txt file packaged with this
    10  *   class. If you don't have a copy, you can see it at:
    11  *   http://www.phpflickr.com/README.txt
     6 * This program is free software: you can redistribute it and/or modify
     7 * it under the terms of the GNU General Public License as published by
     8 * the Free Software Foundation, either version 3 of the License, or
     9 * (at your option) any later version.
    1210 *
    13  *   Please submit all problems or questions to the Help Forum on my Google Code project page:
    14  *       http://code.google.com/p/phpflickr/issues/list
     11 * This program is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     14 * GNU General Public License for more details.
    1515 *
    16  */
     16 * You should have received a copy of the GNU General Public License
     17 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
     18 *
     19 */
    1720if ( !class_exists('w2f_phpFlickr') ) {
    1821    if (session_id() == "") {
    … …  
    2326        var $api_key;
    2427        var $secret;
    25        
     28
    2629        var $rest_endpoint = 'https://api.flickr.com/services/rest/';
    27         var $upload_endpoint = 'https://api.flickr.com/services/upload/';
    28         var $replace_endpoint = 'https://api.flickr.com/services/replace/';
     30        var $upload_endpoint = 'https://up.flickr.com/services/upload/';
     31        var $replace_endpoint = 'https://up.flickr.com/services/replace/';
    2932        var $req;
    3033        var $response;
    … …  
    5861        function w2f_phpFlickr ($api_key, $secret = NULL, $die_on_error = false) {
    5962            //The API Key must be set before any calls can be made.  You can
    60             //get your own at http://www.flickr.com/services/api/misc.api_keys.html
     63            //get your own at https://www.flickr.com/services/api/misc.api_keys.html
    6164            $this->api_key = $api_key;
    6265            $this->secret = $secret;
    … …  
    7982            if ($type == 'db') {
    8083                if ( preg_match('|mysql://([^:]*):([^@]*)@([^/]*)/(.*)|', $connection, $matches) ) {
    81                     //Array ( [0] => mysql://user:password@server/database [1] => user [2] => password [3] => server [4] => database ) 
    82                     $db = mysql_connect($matches[3], $matches[1], $matches[2]);
    83                     mysql_select_db($matches[4], $db);
    84                    
     84                    //Array ( [0] => mysql://user:password@server/database [1] => user [2] => password [3] => server [4] => database )
     85                    $db = mysqli_connect($matches[3],  $matches[1], $matches[2]);
     86                    mysqli_query($db, "USE $matches[4]");
     87
    8588                    /*
    8689                     * If high performance is crucial, you can easily comment
    8790                     * out this query once you've created your database table.
    8891                     */
    89                     mysql_query("
     92                    mysqli_query($db, "
    9093                        CREATE TABLE IF NOT EXISTS `$table` (
    91                             `request` CHAR( 35 ) NOT NULL ,
    92                             `response` MEDIUMTEXT NOT NULL ,
    93                             `expiration` DATETIME NOT NULL ,
    94                             INDEX ( `request` )
    95                         ) TYPE = MYISAM
    96                     ", $db);
     94                            `request` varchar(128) NOT NULL,
     95                            `response` mediumtext NOT NULL,
     96                            `expiration` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
     97                            UNIQUE KEY `request` (`request`)
     98                        )
     99                    ");
     100
     101                    $result = mysqli_query($db, "SELECT COUNT(*) 'count' FROM $table");
     102                    if( $result ) {
     103                        $result = mysqli_fetch_assoc($result);                     
     104                    }
    97105                   
    98                     $result = mysql_query("SELECT COUNT(*) FROM $table", $db);
    99                     $result = mysql_fetch_row($result);
    100                     if ( $result[0] > $this->max_cache_rows ) {
    101                         mysql_query("DELETE FROM $table WHERE expiration < DATE_SUB(NOW(), INTERVAL $cache_expire second)", $db);
    102                         mysql_query('OPTIMIZE TABLE ' . $this->cache_table, $db);
     106                    if ( $result && $result['count'] > $this->max_cache_rows ) {
     107                        mysqli_query($db, "DELETE FROM $table WHERE CURRENT_TIMESTAMP > expiration");
     108                        mysqli_query($db, 'OPTIMIZE TABLE ' . $this->cache_table);
    103109                    }
    104110                    $this->cache = 'db';
    … …  
    130136            //If there is no cache result, it returns a value of false. If it finds one,
    131137            //it returns the unparsed XML.
     138            unset($request['api_sig']);
    132139            foreach ( $request as $key => $value ) {
    133140                if ( empty($value) ) unset($request[$key]);
    … …  
    139146            $this->cache_request = $request;
    140147            if ($this->cache == 'db') {
    141                 $result = mysql_query("SELECT response FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "' AND DATE_SUB(NOW(), INTERVAL " . (int) $this->cache_expire . " SECOND) < expiration", $this->cache_db);
    142                 if ( mysql_num_rows($result) ) {
    143                     $result = mysql_fetch_assoc($result);
    144                     return $result['response'];
     148                $result = mysqli_query($this->cache_db, "SELECT response FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "' AND CURRENT_TIMESTAMP < expiration");
     149                if ( $result && mysqli_num_rows($result) ) {
     150                    $result = mysqli_fetch_assoc($result);
     151                    return urldecode($result['response']);
    145152                } else {
    146153                    return false;
    … …  
    172179            if ($this->cache == 'db') {
    173180                //$this->cache_db->query("DELETE FROM $this->cache_table WHERE request = '$reqhash'");
    174                 $result = mysql_query("SELECT COUNT(*) FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "'", $this->cache_db);
    175                 $result = mysql_fetch_row($result);
    176                 if ( $result[0] ) {
    177                     $sql = "UPDATE " . $this->cache_table . " SET response = '" . str_replace("'", "''", $response) . "', expiration = '" . strftime("%Y-%m-%d %H:%M:%S") . "' WHERE request = '" . $reqhash . "'";
    178                     mysql_query($sql, $this->cache_db);
    179                 } else {
    180                     $sql = "INSERT INTO " . $this->cache_table . " (request, response, expiration) VALUES ('$reqhash', '" . str_replace("'", "''", $response) . "', '" . strftime("%Y-%m-%d %H:%M:%S") . "')";
    181                     mysql_query($sql, $this->cache_db);
    182                 }
     181                $response = urlencode($response);
     182                $sql = 'INSERT INTO '.$this->cache_table.' (request, response, expiration)
     183                        VALUES (\''.$reqhash.'\', \''.$response.'\', TIMESTAMPADD(SECOND,'.$this->cache_expire.',CURRENT_TIMESTAMP))
     184                        ON DUPLICATE KEY UPDATE response=\''.$response.'\',
     185                        expiration=TIMESTAMPADD(SECOND,'.$this->cache_expire.',CURRENT_TIMESTAMP) ';
     186
     187                $result = mysqli_query($this->cache_db, $sql);
     188                if(!$result) {
     189                    echo mysqli_error($this->cache_db);
     190                }
     191                   
     192                return $result;
    183193            } elseif ($this->cache == "fs") {
    184194                $file = $this->cache_dir . "/" . $reqhash . ".cache";
    … …  
    192202            return false;
    193203        }
    194        
     204
    195205        function setCustomPost ( $function ) {
    196206            $this->custom_post = $function;
    197207        }
    198        
     208
    199209        function post ($data, $type = null) {
    200210            if ( is_null($type) ) {
    201211                $url = $this->rest_endpoint;
    202212            }
    203            
     213
    204214            if ( !is_null($this->custom_post) ) {
    205215                return call_user_func($this->custom_post, $url, $data);
    206216            }
    207            
    208             if ( !preg_match("|http://(.*?)(/.*)|", $url, $matches) ) {
     217
     218            if ( !preg_match("|https://(.*?)(/.*)|", $url, $matches) ) {
    209219                die('There was some problem figuring out your endpoint');
    210220            }
    211            
     221
    212222            if ( function_exists('curl_init') ) {
    213223                // Has curl. Use it!
    … …  
    224234                }
    225235                $data = implode('&', $data);
    226            
    227                 $fp = @pfsockopen($matches[1], 80);
     236
     237                $fp = @pfsockopen('ssl://'.$matches[1], 443);
    228238                if (!$fp) {
    229239                    die('Could not connect to the web service');
    … …  
    259269            return $response;
    260270        }
    261        
     271
    262272        function request ($command, $args = array(), $nocache = false)
    263273        {
    … …  
    268278
    269279            //Process arguments, including method and login data.
    270             $args = array_merge(array("method" => $command, "format" => "php_serial", "api_key" => $this->api_key), $args);
     280            $args = array_merge(array("method" => $command, "format" => "json", "nojsoncallback" => "1", "api_key" => $this->api_key), $args);
    271281            if (!empty($this->token)) {
    272282                $args = array_merge($args, array("auth_token" => $this->token));
    … …  
    277287            $auth_sig = "";
    278288            $this->last_request = $args;
    279             if (!($this->response = $this->getCached($args)) || $nocache) {
     289            $this->response = $this->getCached($args);
     290            if (!($this->response) || $nocache) {
    280291                foreach ($args as $key => $data) {
    281292                    if ( is_null($data) ) {
    … …  
    292303                $this->cache($args, $this->response);
    293304            }
    294            
     305
     306
    295307            /*
    296308             * Uncomment this line (and comment out the next one) if you're doing large queries
    … …  
    298310             * the result, so be sure that you look at the results.
    299311             */
    300             //$this->parsed_response = unserialize($this->response);
    301             $this->parsed_response = $this->clean_text_nodes(unserialize($this->response));
     312            $this->parsed_response = json_decode($this->response, TRUE);
     313/*          $this->parsed_response = $this->clean_text_nodes(json_decode($this->response, TRUE)); */
    302314            if ($this->parsed_response['stat'] == 'fail') {
    303315                if ($this->die_on_error) die("The Flickr API returned the following error: #{$this->parsed_response['code']} - {$this->parsed_response['message']}");
    … …  
    359371            $sizes = array(
    360372                "square" => "_s",
     373                "square_75" => "_s",
     374                "square_150" => "_q",
    361375                "thumbnail" => "_t",
    362376                "small" => "_m",
     377                "small_240" => "_m",
     378                "small_320" => "_n",
    363379                "medium" => "",
     380                "medium_500" => "",
    364381                "medium_640" => "_z",
     382                "medium_800" => "_c",
    365383                "large" => "_b",
    366                 "original" => "_o"
     384                "large_1024" => "_b",
     385                "large_1600" => "_h",
     386                "large_2048" => "_k",
     387                "original" => "_o",
    367388            );
    368            
     389
    369390            $size = strtolower($size);
    370391            if (!array_key_exists($size, $sizes)) {
    371392                $size = "medium";
    372393            }
    373            
     394
    374395            if ($size == "original") {
    375                 $url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['originalsecret'] . "_o" . "." . $photo['originalformat'];
     396                $url = "https://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['originalsecret'] . "_o" . "." . $photo['originalformat'];
    376397            } else {
    377                 $url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . $sizes[$size] . ".jpg";
     398                $url = "https://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . $sizes[$size] . ".jpg";
    378399            }
    379400            return $url;
    380         }
    381 
    382         function getFriendlyGeodata ($lat, $lon) {
    383             /* I've added this method to get the friendly geodata (i.e. 'in New York, NY') that the
    384              * website provides, but isn't available in the API. I'm providing this service as long
    385              * as it doesn't flood my server with requests and crash it all the time.
    386              */
    387             return unserialize(file_get_contents('http://phpflickr.com/geodata/?format=php&lat=' . $lat . '&lon=' . $lon));
    388401        }
    389402
    … …  
    416429                $photo = realpath($photo);
    417430                $args['photo'] = '@' . $photo;
    418                
     431
    419432
    420433                $curl = curl_init($this->upload_endpoint);
    … …  
    425438                $this->response = $response;
    426439                curl_close($curl);
    427                
     440
    428441                $rsp = explode("\n", $response);
    429442                foreach ($rsp as $line) {
    … …  
    478491                $photo = realpath($photo);
    479492                $args['photo'] = '@' . $photo;
    480                
     493
    481494
    482495                $curl = curl_init($this->upload_endpoint);
    … …  
    487500                $this->response = $response;
    488501                curl_close($curl);
    489                
     502
    490503                $rsp = explode("\n", $response);
    491504                foreach ($rsp as $line) {
    492                     if (ereg('<err code="([0-9]+)" msg="(.*)"', $line, $match)) {
     505                    if (preg_match('/<err code="([0-9]+)" msg="(.*)"/', $line, $match)) {
    493506                        if ($this->die_on_error)
    494507                            die("The Flickr API returned the following error: #{$match[1]} - {$match[2]}");
    … …  
    499512                            return false;
    500513                        }
    501                     } elseif (ereg("<ticketid>(.*)</", $line, $match)) {
     514                    } elseif (preg_match("/<ticketid>(.*)</", $line, $match)) {
    502515                        $this->error_code = false;
    503516                        $this->error_msg = false;
    … …  
    539552                $photo = realpath($photo);
    540553                $args['photo'] = '@' . $photo;
    541                
     554
    542555
    543556                $curl = curl_init($this->replace_endpoint);
    … …  
    548561                $this->response = $response;
    549562                curl_close($curl);
    550                
     563
    551564                if ($async == 1)
    552565                    $find = 'ticketid';
    … …  
    582595
    583596            if (empty($_SESSION['phpFlickr_auth_token']) && empty($this->token)) {
    584                 /*if ( $remember_uri === true ) {
     597                if ( $remember_uri === true ) {
    585598                    $_SESSION['phpFlickr_auth_redirect'] = $_SERVER['REQUEST_URI'];
    586599                } elseif ( $remember_uri !== false ) {
    … …  
    588601                }
    589602                $api_sig = md5($this->secret . "api_key" . $this->api_key . "perms" . $perms);
    590            
     603
    591604                if ($this->service == "23") {
    592605                    header("Location: http://www.23hq.com/services/auth/?api_key=" . $this->api_key . "&perms=" . $perms . "&api_sig=". $api_sig);
    593606                } else {
    594                     header("Location: http://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&perms=" . $perms . "&api_sig=". $api_sig);
    595                 }*/
    596                
    597                 if ($remember_uri) {
    598                     $redirect = $remember_uri;
    599                 }
    600                                
    601                 $api_sig = md5($this->secret . "api_key" . $this->api_key . "extra" . $redirect . "perms" . $perms);
    602                 if ($this->service == "23") {
    603                     header("Location: http://www.23hq.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
    604                 } else {
    605                     header("Location: http://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
    606                 }               
     607                    header("Location: https://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&perms=" . $perms . "&api_sig=". $api_sig);
     608                }
    607609                exit;
    608610            } else {
    … …  
    619621        }
    620622
     623        function auth_url($frob, $perms = 'read') {
     624            $sig = md5(sprintf('%sapi_key%sfrob%sperms%s', $this->secret, $this->api_key, $frob, $perms));
     625            return sprintf('https://flickr.com/services/auth/?api_key=%s&perms=%s&frob=%s&api_sig=%s', $this->api_key, $perms, $frob, $sig);
     626        }
     627
    621628        /*******************************
    622629
    … …  
    645652        /* Activity methods */
    646653        function activity_userComments ($per_page = NULL, $page = NULL) {
    647             /* http://www.flickr.com/services/api/flickr.activity.userComments.html */
     654            /* https://www.flickr.com/services/api/flickr.activity.userComments.html */
    648655            $this->request('flickr.activity.userComments', array("per_page" => $per_page, "page" => $page));
    649656            return $this->parsed_response ? $this->parsed_response['items']['item'] : false;
    … …  
    651658
    652659        function activity_userPhotos ($timeframe = NULL, $per_page = NULL, $page = NULL) {
    653             /* http://www.flickr.com/services/api/flickr.activity.userPhotos.html */
     660            /* https://www.flickr.com/services/api/flickr.activity.userPhotos.html */
    654661            $this->request('flickr.activity.userPhotos', array("timeframe" => $timeframe, "per_page" => $per_page, "page" => $page));
    655662            return $this->parsed_response ? $this->parsed_response['items']['item'] : false;
    … …  
    658665        /* Authentication methods */
    659666        function auth_checkToken () {
    660             /* http://www.flickr.com/services/api/flickr.auth.checkToken.html */
     667            /* https://www.flickr.com/services/api/flickr.auth.checkToken.html */
    661668            $this->request('flickr.auth.checkToken');
    662669            return $this->parsed_response ? $this->parsed_response['auth'] : false;
    … …  
    664671
    665672        function auth_getFrob () {
    666             /* http://www.flickr.com/services/api/flickr.auth.getFrob.html */
     673            /* https://www.flickr.com/services/api/flickr.auth.getFrob.html */
    667674            $this->request('flickr.auth.getFrob');
    668675            return $this->parsed_response ? $this->parsed_response['frob'] : false;
    … …  
    670677
    671678        function auth_getFullToken ($mini_token) {
    672             /* http://www.flickr.com/services/api/flickr.auth.getFullToken.html */
     679            /* https://www.flickr.com/services/api/flickr.auth.getFullToken.html */
    673680            $this->request('flickr.auth.getFullToken', array('mini_token'=>$mini_token));
    674681            return $this->parsed_response ? $this->parsed_response['auth'] : false;
    … …  
    676683
    677684        function auth_getToken ($frob) {
    678             /* http://www.flickr.com/services/api/flickr.auth.getToken.html */
     685            /* https://www.flickr.com/services/api/flickr.auth.getToken.html */
    679686            $this->request('flickr.auth.getToken', array('frob'=>$frob));
    680687            $_SESSION['phpFlickr_auth_token'] = $this->parsed_response['auth']['token'];
    … …  
    684691        /* Blogs methods */
    685692        function blogs_getList ($service = NULL) {
    686             /* http://www.flickr.com/services/api/flickr.blogs.getList.html */
     693            /* https://www.flickr.com/services/api/flickr.blogs.getList.html */
    687694            $rsp = $this->call('flickr.blogs.getList', array('service' => $service));
    688695            return $rsp['blogs']['blog'];
    689696        }
    690        
     697
    691698        function blogs_getServices () {
    692             /* http://www.flickr.com/services/api/flickr.blogs.getServices.html */
     699            /* https://www.flickr.com/services/api/flickr.blogs.getServices.html */
    693700            return $this->call('flickr.blogs.getServices', array());
    694701        }
    695702
    696703        function blogs_postPhoto ($blog_id = NULL, $photo_id, $title, $description, $blog_password = NULL, $service = NULL) {
    697             /* http://www.flickr.com/services/api/flickr.blogs.postPhoto.html */
     704            /* https://www.flickr.com/services/api/flickr.blogs.postPhoto.html */
    698705            return $this->call('flickr.blogs.postPhoto', array('blog_id' => $blog_id, 'photo_id' => $photo_id, 'title' => $title, 'description' => $description, 'blog_password' => $blog_password, 'service' => $service));
    699706        }
    … …  
    701708        /* Collections Methods */
    702709        function collections_getInfo ($collection_id) {
    703             /* http://www.flickr.com/services/api/flickr.collections.getInfo.html */
     710            /* https://www.flickr.com/services/api/flickr.collections.getInfo.html */
    704711            return $this->call('flickr.collections.getInfo', array('collection_id' => $collection_id));
    705712        }
    706713
    707714        function collections_getTree ($collection_id = NULL, $user_id = NULL) {
    708             /* http://www.flickr.com/services/api/flickr.collections.getTree.html */
     715            /* https://www.flickr.com/services/api/flickr.collections.getTree.html */
    709716            return $this->call('flickr.collections.getTree', array('collection_id' => $collection_id, 'user_id' => $user_id));
    710717        }
    711        
     718
    712719        /* Commons Methods */
    713720        function commons_getInstitutions () {
    714             /* http://www.flickr.com/services/api/flickr.commons.getInstitutions.html */
     721            /* https://www.flickr.com/services/api/flickr.commons.getInstitutions.html */
    715722            return $this->call('flickr.commons.getInstitutions', array());
    716723        }
    717        
     724
    718725        /* Contacts Methods */
    719726        function contacts_getList ($filter = NULL, $page = NULL, $per_page = NULL) {
    720             /* http://www.flickr.com/services/api/flickr.contacts.getList.html */
     727            /* https://www.flickr.com/services/api/flickr.contacts.getList.html */
    721728            $this->request('flickr.contacts.getList', array('filter'=>$filter, 'page'=>$page, 'per_page'=>$per_page));
    722729            return $this->parsed_response ? $this->parsed_response['contacts'] : false;
    … …  
    724731
    725732        function contacts_getPublicList ($user_id, $page = NULL, $per_page = NULL) {
    726             /* http://www.flickr.com/services/api/flickr.contacts.getPublicList.html */
     733            /* https://www.flickr.com/services/api/flickr.contacts.getPublicList.html */
    727734            $this->request('flickr.contacts.getPublicList', array('user_id'=>$user_id, 'page'=>$page, 'per_page'=>$per_page));
    728735            return $this->parsed_response ? $this->parsed_response['contacts'] : false;
    729736        }
    730        
     737
    731738        function contacts_getListRecentlyUploaded ($date_lastupload = NULL, $filter = NULL) {
    732             /* http://www.flickr.com/services/api/flickr.contacts.getListRecentlyUploaded.html */
     739            /* https://www.flickr.com/services/api/flickr.contacts.getListRecentlyUploaded.html */
    733740            return $this->call('flickr.contacts.getListRecentlyUploaded', array('date_lastupload' => $date_lastupload, 'filter' => $filter));
    734741        }
    … …  
    736743        /* Favorites Methods */
    737744        function favorites_add ($photo_id) {
    738             /* http://www.flickr.com/services/api/flickr.favorites.add.html */
     745            /* https://www.flickr.com/services/api/flickr.favorites.add.html */
    739746            $this->request('flickr.favorites.add', array('photo_id'=>$photo_id), TRUE);
    740747            return $this->parsed_response ? true : false;
    … …  
    742749
    743750        function favorites_getList ($user_id = NULL, $jump_to = NULL, $min_fave_date = NULL, $max_fave_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    744             /* http://www.flickr.com/services/api/flickr.favorites.getList.html */
     751            /* https://www.flickr.com/services/api/flickr.favorites.getList.html */
    745752            return $this->call('flickr.favorites.getList', array('user_id' => $user_id, 'jump_to' => $jump_to, 'min_fave_date' => $min_fave_date, 'max_fave_date' => $max_fave_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    746753        }
    747        
     754
    748755        function favorites_getPublicList ($user_id, $jump_to = NULL, $min_fave_date = NULL, $max_fave_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    749             /* http://www.flickr.com/services/api/flickr.favorites.getPublicList.html */
     756            /* https://www.flickr.com/services/api/flickr.favorites.getPublicList.html */
    750757            return $this->call('flickr.favorites.getPublicList', array('user_id' => $user_id, 'jump_to' => $jump_to, 'min_fave_date' => $min_fave_date, 'max_fave_date' => $max_fave_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    751758        }
    752        
     759
    753760        function favorites_remove ($photo_id, $user_id = NULL) {
    754             /* http://www.flickr.com/services/api/flickr.favorites.remove.html */
     761            /* https://www.flickr.com/services/api/flickr.favorites.remove.html */
    755762            $this->request("flickr.favorites.remove", array('photo_id' => $photo_id, 'user_id' => $user_id), TRUE);
    756763            return $this->parsed_response ? true : false;
    … …  
    759766        /* Galleries Methods */
    760767        function galleries_addPhoto ($gallery_id, $photo_id, $comment = NULL) {
    761             /* http://www.flickr.com/services/api/flickr.galleries.addPhoto.html */
     768            /* https://www.flickr.com/services/api/flickr.galleries.addPhoto.html */
    762769            return $this->call('flickr.galleries.addPhoto', array('gallery_id' => $gallery_id, 'photo_id' => $photo_id, 'comment' => $comment));
    763770        }
    764        
     771
    765772        function galleries_create ($title, $description, $primary_photo_id = NULL) {
    766             /* http://www.flickr.com/services/api/flickr.galleries.create.html */
     773            /* https://www.flickr.com/services/api/flickr.galleries.create.html */
    767774            return $this->call('flickr.galleries.create', array('title' => $title, 'description' => $description, 'primary_photo_id' => $primary_photo_id));
    768775        }
    769776
    770777        function galleries_editMeta ($gallery_id, $title, $description = NULL) {
    771             /* http://www.flickr.com/services/api/flickr.galleries.editMeta.html */
     778            /* https://www.flickr.com/services/api/flickr.galleries.editMeta.html */
    772779            return $this->call('flickr.galleries.editMeta', array('gallery_id' => $gallery_id, 'title' => $title, 'description' => $description));
    773780        }
    774781
    775782        function galleries_editPhoto ($gallery_id, $photo_id, $comment) {
    776             /* http://www.flickr.com/services/api/flickr.galleries.editPhoto.html */
     783            /* https://www.flickr.com/services/api/flickr.galleries.editPhoto.html */
    777784            return $this->call('flickr.galleries.editPhoto', array('gallery_id' => $gallery_id, 'photo_id' => $photo_id, 'comment' => $comment));
    778785        }
    779786
    780787        function galleries_editPhotos ($gallery_id, $primary_photo_id, $photo_ids) {
    781             /* http://www.flickr.com/services/api/flickr.galleries.editPhotos.html */
     788            /* https://www.flickr.com/services/api/flickr.galleries.editPhotos.html */
    782789            return $this->call('flickr.galleries.editPhotos', array('gallery_id' => $gallery_id, 'primary_photo_id' => $primary_photo_id, 'photo_ids' => $photo_ids));
    783790        }
    784791
    785792        function galleries_getInfo ($gallery_id) {
    786             /* http://www.flickr.com/services/api/flickr.galleries.getInfo.html */
     793            /* https://www.flickr.com/services/api/flickr.galleries.getInfo.html */
    787794            return $this->call('flickr.galleries.getInfo', array('gallery_id' => $gallery_id));
    788795        }
    789796
    790797        function galleries_getList ($user_id, $per_page = NULL, $page = NULL) {
    791             /* http://www.flickr.com/services/api/flickr.galleries.getList.html */
     798            /* https://www.flickr.com/services/api/flickr.galleries.getList.html */
    792799            return $this->call('flickr.galleries.getList', array('user_id' => $user_id, 'per_page' => $per_page, 'page' => $page));
    793800        }
    794801
    795802        function galleries_getListForPhoto ($photo_id, $per_page = NULL, $page = NULL) {
    796             /* http://www.flickr.com/services/api/flickr.galleries.getListForPhoto.html */
     803            /* https://www.flickr.com/services/api/flickr.galleries.getListForPhoto.html */
    797804            return $this->call('flickr.galleries.getListForPhoto', array('photo_id' => $photo_id, 'per_page' => $per_page, 'page' => $page));
    798805        }
    799            
     806
    800807        function galleries_getPhotos ($gallery_id, $extras = NULL, $per_page = NULL, $page = NULL) {
    801             /* http://www.flickr.com/services/api/flickr.galleries.getPhotos.html */
     808            /* https://www.flickr.com/services/api/flickr.galleries.getPhotos.html */
    802809            return $this->call('flickr.galleries.getPhotos', array('gallery_id' => $gallery_id, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    803810        }
    … …  
    805812        /* Groups Methods */
    806813        function groups_browse ($cat_id = NULL) {
    807             /* http://www.flickr.com/services/api/flickr.groups.browse.html */
     814            /* https://www.flickr.com/services/api/flickr.groups.browse.html */
    808815            $this->request("flickr.groups.browse", array("cat_id"=>$cat_id));
    809816            return $this->parsed_response ? $this->parsed_response['category'] : false;
    … …  
    811818
    812819        function groups_getInfo ($group_id, $lang = NULL) {
    813             /* http://www.flickr.com/services/api/flickr.groups.getInfo.html */
     820            /* https://www.flickr.com/services/api/flickr.groups.getInfo.html */
    814821            return $this->call('flickr.groups.getInfo', array('group_id' => $group_id, 'lang' => $lang));
    815822        }
    816823
    817824        function groups_search ($text, $per_page = NULL, $page = NULL) {
    818             /* http://www.flickr.com/services/api/flickr.groups.search.html */
     825            /* https://www.flickr.com/services/api/flickr.groups.search.html */
    819826            $this->request("flickr.groups.search", array("text"=>$text,"per_page"=>$per_page,"page"=>$page));
    820827            return $this->parsed_response ? $this->parsed_response['groups'] : false;
    … …  
    823830        /* Groups Members Methods */
    824831        function groups_members_getList ($group_id, $membertypes = NULL, $per_page = NULL, $page = NULL) {
    825             /* http://www.flickr.com/services/api/flickr.groups.members.getList.html */
     832            /* https://www.flickr.com/services/api/flickr.groups.members.getList.html */
    826833            return $this->call('flickr.groups.members.getList', array('group_id' => $group_id, 'membertypes' => $membertypes, 'per_page' => $per_page, 'page' => $page));
    827834        }
    828        
     835
    829836        /* Groups Pools Methods */
    830837        function groups_pools_add ($photo_id, $group_id) {
    831             /* http://www.flickr.com/services/api/flickr.groups.pools.add.html */
     838            /* https://www.flickr.com/services/api/flickr.groups.pools.add.html */
    832839            $this->request("flickr.groups.pools.add", array("photo_id"=>$photo_id, "group_id"=>$group_id), TRUE);
    833840            return $this->parsed_response ? true : false;
    … …  
    835842
    836843        function groups_pools_getContext ($photo_id, $group_id, $num_prev = NULL, $num_next = NULL) {
    837             /* http://www.flickr.com/services/api/flickr.groups.pools.getContext.html */
     844            /* https://www.flickr.com/services/api/flickr.groups.pools.getContext.html */
    838845            return $this->call('flickr.groups.pools.getContext', array('photo_id' => $photo_id, 'group_id' => $group_id, 'num_prev' => $num_prev, 'num_next' => $num_next));
    839846        }
    840        
     847
    841848        function groups_pools_getGroups ($page = NULL, $per_page = NULL) {
    842             /* http://www.flickr.com/services/api/flickr.groups.pools.getGroups.html */
     849            /* https://www.flickr.com/services/api/flickr.groups.pools.getGroups.html */
    843850            $this->request("flickr.groups.pools.getGroups", array('page'=>$page, 'per_page'=>$per_page));
    844851            return $this->parsed_response ? $this->parsed_response['groups'] : false;
    … …  
    846853
    847854        function groups_pools_getPhotos ($group_id, $tags = NULL, $user_id = NULL, $jump_to = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    848             /* http://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html */
     855            /* https://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html */
    849856            if (is_array($extras)) {
    850857                $extras = implode(",", $extras);
    … …  
    854861
    855862        function groups_pools_remove ($photo_id, $group_id) {
    856             /* http://www.flickr.com/services/api/flickr.groups.pools.remove.html */
     863            /* https://www.flickr.com/services/api/flickr.groups.pools.remove.html */
    857864            $this->request("flickr.groups.pools.remove", array("photo_id"=>$photo_id, "group_id"=>$group_id), TRUE);
    858865            return $this->parsed_response ? true : false;
    … …  
    861868        /* Interestingness methods */
    862869        function interestingness_getList ($date = NULL, $use_panda = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    863             /* http://www.flickr.com/services/api/flickr.interestingness.getList.html */
     870            /* https://www.flickr.com/services/api/flickr.interestingness.getList.html */
    864871            if (is_array($extras)) {
    865872                $extras = implode(",", $extras);
    … …  
    871878        /* Machine Tag methods */
    872879        function machinetags_getNamespaces ($predicate = NULL, $per_page = NULL, $page = NULL) {
    873             /* http://www.flickr.com/services/api/flickr.machinetags.getNamespaces.html */
     880            /* https://www.flickr.com/services/api/flickr.machinetags.getNamespaces.html */
    874881            return $this->call('flickr.machinetags.getNamespaces', array('predicate' => $predicate, 'per_page' => $per_page, 'page' => $page));
    875882        }
    876883
    877884        function machinetags_getPairs ($namespace = NULL, $predicate = NULL, $per_page = NULL, $page = NULL) {
    878             /* http://www.flickr.com/services/api/flickr.machinetags.getPairs.html */
     885            /* https://www.flickr.com/services/api/flickr.machinetags.getPairs.html */
    879886            return $this->call('flickr.machinetags.getPairs', array('namespace' => $namespace, 'predicate' => $predicate, 'per_page' => $per_page, 'page' => $page));
    880887        }
    881888
    882889        function machinetags_getPredicates ($namespace = NULL, $per_page = NULL, $page = NULL) {
    883             /* http://www.flickr.com/services/api/flickr.machinetags.getPredicates.html */
     890            /* https://www.flickr.com/services/api/flickr.machinetags.getPredicates.html */
    884891            return $this->call('flickr.machinetags.getPredicates', array('namespace' => $namespace, 'per_page' => $per_page, 'page' => $page));
    885892        }
    886        
     893
    887894        function machinetags_getRecentValues ($namespace = NULL, $predicate = NULL, $added_since = NULL) {
    888             /* http://www.flickr.com/services/api/flickr.machinetags.getRecentValues.html */
     895            /* https://www.flickr.com/services/api/flickr.machinetags.getRecentValues.html */
    889896            return $this->call('flickr.machinetags.getRecentValues', array('namespace' => $namespace, 'predicate' => $predicate, 'added_since' => $added_since));
    890897        }
    891898
    892899        function machinetags_getValues ($namespace, $predicate, $per_page = NULL, $page = NULL, $usage = NULL) {
    893             /* http://www.flickr.com/services/api/flickr.machinetags.getValues.html */
     900            /* https://www.flickr.com/services/api/flickr.machinetags.getValues.html */
    894901            return $this->call('flickr.machinetags.getValues', array('namespace' => $namespace, 'predicate' => $predicate, 'per_page' => $per_page, 'page' => $page, 'usage' => $usage));
    895902        }
    896        
     903
    897904        /* Panda methods */
    898905        function panda_getList () {
    899             /* http://www.flickr.com/services/api/flickr.panda.getList.html */
     906            /* https://www.flickr.com/services/api/flickr.panda.getList.html */
    900907            return $this->call('flickr.panda.getList', array());
    901908        }
    902909
    903910        function panda_getPhotos ($panda_name, $extras = NULL, $per_page = NULL, $page = NULL) {
    904             /* http://www.flickr.com/services/api/flickr.panda.getPhotos.html */
     911            /* https://www.flickr.com/services/api/flickr.panda.getPhotos.html */
    905912            return $this->call('flickr.panda.getPhotos', array('panda_name' => $panda_name, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    906913        }
    … …  
    908915        /* People methods */
    909916        function people_findByEmail ($find_email) {
    910             /* http://www.flickr.com/services/api/flickr.people.findByEmail.html */
     917            /* https://www.flickr.com/services/api/flickr.people.findByEmail.html */
    911918            $this->request("flickr.people.findByEmail", array("find_email"=>$find_email));
    912919            return $this->parsed_response ? $this->parsed_response['user'] : false;
    … …  
    914921
    915922        function people_findByUsername ($username) {
    916             /* http://www.flickr.com/services/api/flickr.people.findByUsername.html */
     923            /* https://www.flickr.com/services/api/flickr.people.findByUsername.html */
    917924            $this->request("flickr.people.findByUsername", array("username"=>$username));
    918925            return $this->parsed_response ? $this->parsed_response['user'] : false;
    … …  
    920927
    921928        function people_getInfo ($user_id) {
    922             /* http://www.flickr.com/services/api/flickr.people.getInfo.html */
     929            /* https://www.flickr.com/services/api/flickr.people.getInfo.html */
    923930            $this->request("flickr.people.getInfo", array("user_id"=>$user_id));
    924931            return $this->parsed_response ? $this->parsed_response['person'] : false;
    … …  
    937944             */
    938945
    939              /* http://www.flickr.com/services/api/flickr.people.getPhotos.html */
     946             /* https://www.flickr.com/services/api/flickr.people.getPhotos.html */
    940947            return $this->call('flickr.people.getPhotos', array_merge(array('user_id' => $user_id), $args));
    941948        }
    942949
    943950        function people_getPhotosOf ($user_id, $extras = NULL, $per_page = NULL, $page = NULL) {
    944             /* http://www.flickr.com/services/api/flickr.people.getPhotosOf.html */
     951            /* https://www.flickr.com/services/api/flickr.people.getPhotosOf.html */
    945952            return $this->call('flickr.people.getPhotosOf', array('user_id' => $user_id, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    946953        }
    947        
     954
    948955        function people_getPublicGroups ($user_id) {
    949             /* http://www.flickr.com/services/api/flickr.people.getPublicGroups.html */
     956            /* https://www.flickr.com/services/api/flickr.people.getPublicGroups.html */
    950957            $this->request("flickr.people.getPublicGroups", array("user_id"=>$user_id));
    951958            return $this->parsed_response ? $this->parsed_response['groups']['group'] : false;
    … …  
    953960
    954961        function people_getPublicPhotos ($user_id, $safe_search = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    955             /* http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html */
     962            /* https://www.flickr.com/services/api/flickr.people.getPublicPhotos.html */
    956963            return $this->call('flickr.people.getPublicPhotos', array('user_id' => $user_id, 'safe_search' => $safe_search, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    957964        }
    958965
    959966        function people_getUploadStatus () {
    960             /* http://www.flickr.com/services/api/flickr.people.getUploadStatus.html */
     967            /* https://www.flickr.com/services/api/flickr.people.getUploadStatus.html */
    961968            /* Requires Authentication */
    962969            $this->request("flickr.people.getUploadStatus");
    … …  
    967974        /* Photos Methods */
    968975        function photos_addTags ($photo_id, $tags) {
    969             /* http://www.flickr.com/services/api/flickr.photos.addTags.html */
     976            /* https://www.flickr.com/services/api/flickr.photos.addTags.html */
    970977            $this->request("flickr.photos.addTags", array("photo_id"=>$photo_id, "tags"=>$tags), TRUE);
    971978            return $this->parsed_response ? true : false;
    … …  
    973980
    974981        function photos_delete ($photo_id) {
    975             /* http://www.flickr.com/services/api/flickr.photos.delete.html */
     982            /* https://www.flickr.com/services/api/flickr.photos.delete.html */
    976983            $this->request("flickr.photos.delete", array("photo_id"=>$photo_id), TRUE);
    977984            return $this->parsed_response ? true : false;
    … …  
    979986
    980987        function photos_getAllContexts ($photo_id) {
    981             /* http://www.flickr.com/services/api/flickr.photos.getAllContexts.html */
     988            /* https://www.flickr.com/services/api/flickr.photos.getAllContexts.html */
    982989            $this->request("flickr.photos.getAllContexts", array("photo_id"=>$photo_id));
    983990            return $this->parsed_response ? $this->parsed_response : false;
    … …  
    985992
    986993        function photos_getContactsPhotos ($count = NULL, $just_friends = NULL, $single_photo = NULL, $include_self = NULL, $extras = NULL) {
    987             /* http://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html */
     994            /* https://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html */
    988995            $this->request("flickr.photos.getContactsPhotos", array("count"=>$count, "just_friends"=>$just_friends, "single_photo"=>$single_photo, "include_self"=>$include_self, "extras"=>$extras));
    989996            return $this->parsed_response ? $this->parsed_response['photos']['photo'] : false;
    … …  
    991998
    992999        function photos_getContactsPublicPhotos ($user_id, $count = NULL, $just_friends = NULL, $single_photo = NULL, $include_self = NULL, $extras = NULL) {
    993             /* http://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html */
     1000            /* https://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html */
    9941001            $this->request("flickr.photos.getContactsPublicPhotos", array("user_id"=>$user_id, "count"=>$count, "just_friends"=>$just_friends, "single_photo"=>$single_photo, "include_self"=>$include_self, "extras"=>$extras));
    9951002            return $this->parsed_response ? $this->parsed_response['photos']['photo'] : false;
    … …  
    9971004
    9981005        function photos_getContext ($photo_id, $num_prev = NULL, $num_next = NULL, $extras = NULL, $order_by = NULL) {
    999             /* http://www.flickr.com/services/api/flickr.photos.getContext.html */
     1006            /* https://www.flickr.com/services/api/flickr.photos.getContext.html */
    10001007            return $this->call('flickr.photos.getContext', array('photo_id' => $photo_id, 'num_prev' => $num_prev, 'num_next' => $num_next, 'extras' => $extras, 'order_by' => $order_by));
    10011008        }
    10021009
    10031010        function photos_getCounts ($dates = NULL, $taken_dates = NULL) {
    1004             /* http://www.flickr.com/services/api/flickr.photos.getCounts.html */
     1011            /* https://www.flickr.com/services/api/flickr.photos.getCounts.html */
    10051012            $this->request("flickr.photos.getCounts", array("dates"=>$dates, "taken_dates"=>$taken_dates));
    10061013            return $this->parsed_response ? $this->parsed_response['photocounts']['photocount'] : false;
    … …  
    10081015
    10091016        function photos_getExif ($photo_id, $secret = NULL) {
    1010             /* http://www.flickr.com/services/api/flickr.photos.getExif.html */
     1017            /* https://www.flickr.com/services/api/flickr.photos.getExif.html */
    10111018            $this->request("flickr.photos.getExif", array("photo_id"=>$photo_id, "secret"=>$secret));
    10121019            return $this->parsed_response ? $this->parsed_response['photo'] : false;
    10131020        }
    1014        
     1021
    10151022        function photos_getFavorites ($photo_id, $page = NULL, $per_page = NULL) {
    1016             /* http://www.flickr.com/services/api/flickr.photos.getFavorites.html */
     1023            /* https://www.flickr.com/services/api/flickr.photos.getFavorites.html */
    10171024            $this->request("flickr.photos.getFavorites", array("photo_id"=>$photo_id, "page"=>$page, "per_page"=>$per_page));
    10181025            return $this->parsed_response ? $this->parsed_response['photo'] : false;
    … …  
    10201027
    10211028        function photos_getInfo ($photo_id, $secret = NULL, $humandates = NULL, $privacy_filter = NULL, $get_contexts = NULL) {
    1022             /* http://www.flickr.com/services/api/flickr.photos.getInfo.html */
     1029            /* https://www.flickr.com/services/api/flickr.photos.getInfo.html */
    10231030            return $this->call('flickr.photos.getInfo', array('photo_id' => $photo_id, 'secret' => $secret, 'humandates' => $humandates, 'privacy_filter' => $privacy_filter, 'get_contexts' => $get_contexts));
    10241031        }
    1025        
     1032
    10261033        function photos_getNotInSet ($max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL, $privacy_filter = NULL, $media = NULL, $min_upload_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    1027             /* http://www.flickr.com/services/api/flickr.photos.getNotInSet.html */
     1034            /* https://www.flickr.com/services/api/flickr.photos.getNotInSet.html */
    10281035            return $this->call('flickr.photos.getNotInSet', array('max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date, 'privacy_filter' => $privacy_filter, 'media' => $media, 'min_upload_date' => $min_upload_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    10291036        }
    1030        
     1037
    10311038        function photos_getPerms ($photo_id) {
    1032             /* http://www.flickr.com/services/api/flickr.photos.getPerms.html */
     1039            /* https://www.flickr.com/services/api/flickr.photos.getPerms.html */
    10331040            $this->request("flickr.photos.getPerms", array("photo_id"=>$photo_id));
    10341041            return $this->parsed_response ? $this->parsed_response['perms'] : false;
    … …  
    10361043
    10371044        function photos_getRecent ($jump_to = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    1038             /* http://www.flickr.com/services/api/flickr.photos.getRecent.html */
     1045            /* https://www.flickr.com/services/api/flickr.photos.getRecent.html */
    10391046            if (is_array($extras)) {
    10401047                $extras = implode(",", $extras);
    … …  
    10441051
    10451052        function photos_getSizes ($photo_id) {
    1046             /* http://www.flickr.com/services/api/flickr.photos.getSizes.html */
     1053            /* https://www.flickr.com/services/api/flickr.photos.getSizes.html */
    10471054            $this->request("flickr.photos.getSizes", array("photo_id"=>$photo_id));
    10481055            return $this->parsed_response ? $this->parsed_response['sizes']['size'] : false;
    … …  
    10501057
    10511058        function photos_getUntagged ($min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL, $privacy_filter = NULL, $media = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    1052             /* http://www.flickr.com/services/api/flickr.photos.getUntagged.html */
     1059            /* https://www.flickr.com/services/api/flickr.photos.getUntagged.html */
    10531060            return $this->call('flickr.photos.getUntagged', array('min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date, 'privacy_filter' => $privacy_filter, 'media' => $media, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    10541061        }
    … …  
    10601067             * flickr.photos.search method requires at least one search parameter.
    10611068             */
    1062             /* http://www.flickr.com/services/api/flickr.photos.getWithGeoData.html */
     1069            /* https://www.flickr.com/services/api/flickr.photos.getWithGeoData.html */
    10631070            $this->request("flickr.photos.getWithGeoData", $args);
    10641071            return $this->parsed_response ? $this->parsed_response['photos'] : false;
    … …  
    10711078             * flickr.photos.search method requires at least one search parameter.
    10721079             */
    1073             /* http://www.flickr.com/services/api/flickr.photos.getWithoutGeoData.html */
     1080            /* https://www.flickr.com/services/api/flickr.photos.getWithoutGeoData.html */
    10741081            $this->request("flickr.photos.getWithoutGeoData", $args);
    10751082            return $this->parsed_response ? $this->parsed_response['photos'] : false;
    … …  
    10771084
    10781085        function photos_recentlyUpdated ($min_date, $extras = NULL, $per_page = NULL, $page = NULL) {
    1079             /* http://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html */
     1086            /* https://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html */
    10801087            return $this->call('flickr.photos.recentlyUpdated', array('min_date' => $min_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    10811088        }
    10821089
    10831090        function photos_removeTag ($tag_id) {
    1084             /* http://www.flickr.com/services/api/flickr.photos.removeTag.html */
     1091            /* https://www.flickr.com/services/api/flickr.photos.removeTag.html */
    10851092            $this->request("flickr.photos.removeTag", array("tag_id"=>$tag_id), TRUE);
    10861093            return $this->parsed_response ? true : false;
    … …  
    10991106             */
    11001107
    1101             /* http://www.flickr.com/services/api/flickr.photos.search.html */
    1102             $this->request("flickr.photos.search", $args);
    1103             return $this->parsed_response ? $this->parsed_response['photos'] : false;
     1108            /* https://www.flickr.com/services/api/flickr.photos.search.html */
     1109            $result = $this->request("flickr.photos.search", $args);
     1110            return ($this->parsed_response) ? $this->parsed_response['photos'] : false;
    11041111        }
    11051112
    11061113        function photos_setContentType ($photo_id, $content_type) {
    1107             /* http://www.flickr.com/services/api/flickr.photos.setContentType.html */
     1114            /* https://www.flickr.com/services/api/flickr.photos.setContentType.html */
    11081115            return $this->call('flickr.photos.setContentType', array('photo_id' => $photo_id, 'content_type' => $content_type));
    11091116        }
    1110        
     1117
    11111118        function photos_setDates ($photo_id, $date_posted = NULL, $date_taken = NULL, $date_taken_granularity = NULL) {
    1112             /* http://www.flickr.com/services/api/flickr.photos.setDates.html */
     1119            /* https://www.flickr.com/services/api/flickr.photos.setDates.html */
    11131120            $this->request("flickr.photos.setDates", array("photo_id"=>$photo_id, "date_posted"=>$date_posted, "date_taken"=>$date_taken, "date_taken_granularity"=>$date_taken_granularity), TRUE);
    11141121            return $this->parsed_response ? true : false;
    … …  
    11161123
    11171124        function photos_setMeta ($photo_id, $title, $description) {
    1118             /* http://www.flickr.com/services/api/flickr.photos.setMeta.html */
     1125            /* https://www.flickr.com/services/api/flickr.photos.setMeta.html */
    11191126            $this->request("flickr.photos.setMeta", array("photo_id"=>$photo_id, "title"=>$title, "description"=>$description), TRUE);
    11201127            return $this->parsed_response ? true : false;
    … …  
    11221129
    11231130        function photos_setPerms ($photo_id, $is_public, $is_friend, $is_family, $perm_comment, $perm_addmeta) {
    1124             /* http://www.flickr.com/services/api/flickr.photos.setPerms.html */
     1131            /* https://www.flickr.com/services/api/flickr.photos.setPerms.html */
    11251132            $this->request("flickr.photos.setPerms", array("photo_id"=>$photo_id, "is_public"=>$is_public, "is_friend"=>$is_friend, "is_family"=>$is_family, "perm_comment"=>$perm_comment, "perm_addmeta"=>$perm_addmeta), TRUE);
    11261133            return $this->parsed_response ? true : false;
    … …  
    11281135
    11291136        function photos_setSafetyLevel ($photo_id, $safety_level = NULL, $hidden = NULL) {
    1130             /* http://www.flickr.com/services/api/flickr.photos.setSafetyLevel.html */
     1137            /* https://www.flickr.com/services/api/flickr.photos.setSafetyLevel.html */
    11311138            return $this->call('flickr.photos.setSafetyLevel', array('photo_id' => $photo_id, 'safety_level' => $safety_level, 'hidden' => $hidden));
    11321139        }
    1133        
     1140
    11341141        function photos_setTags ($photo_id, $tags) {
    1135             /* http://www.flickr.com/services/api/flickr.photos.setTags.html */
     1142            /* https://www.flickr.com/services/api/flickr.photos.setTags.html */
    11361143            $this->request("flickr.photos.setTags", array("photo_id"=>$photo_id, "tags"=>$tags), TRUE);
    11371144            return $this->parsed_response ? true : false;
    … …  
    11401147        /* Photos - Comments Methods */
    11411148        function photos_comments_addComment ($photo_id, $comment_text) {
    1142             /* http://www.flickr.com/services/api/flickr.photos.comments.addComment.html */
     1149            /* https://www.flickr.com/services/api/flickr.photos.comments.addComment.html */
    11431150            $this->request("flickr.photos.comments.addComment", array("photo_id" => $photo_id, "comment_text"=>$comment_text), TRUE);
    11441151            return $this->parsed_response ? $this->parsed_response['comment'] : false;
    … …  
    11461153
    11471154        function photos_comments_deleteComment ($comment_id) {
    1148             /* http://www.flickr.com/services/api/flickr.photos.comments.deleteComment.html */
     1155            /* https://www.flickr.com/services/api/flickr.photos.comments.deleteComment.html */
    11491156            $this->request("flickr.photos.comments.deleteComment", array("comment_id" => $comment_id), TRUE);
    11501157            return $this->parsed_response ? true : false;
    … …  
    11521159
    11531160        function photos_comments_editComment ($comment_id, $comment_text) {
    1154             /* http://www.flickr.com/services/api/flickr.photos.comments.editComment.html */
     1161            /* https://www.flickr.com/services/api/flickr.photos.comments.editComment.html */
    11551162            $this->request("flickr.photos.comments.editComment", array("comment_id" => $comment_id, "comment_text"=>$comment_text), TRUE);
    11561163            return $this->parsed_response ? true : false;
    … …  
    11581165
    11591166        function photos_comments_getList ($photo_id, $min_comment_date = NULL, $max_comment_date = NULL, $page = NULL, $per_page = NULL, $include_faves = NULL) {
    1160             /* http://www.flickr.com/services/api/flickr.photos.comments.getList.html */
     1167            /* https://www.flickr.com/services/api/flickr.photos.comments.getList.html */
    11611168            return $this->call('flickr.photos.comments.getList', array('photo_id' => $photo_id, 'min_comment_date' => $min_comment_date, 'max_comment_date' => $max_comment_date, 'page' => $page, 'per_page' => $per_page, 'include_faves' => $include_faves));
    11621169        }
    1163        
     1170
    11641171        function photos_comments_getRecentForContacts ($date_lastcomment = NULL, $contacts_filter = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    1165             /* http://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html */
     1172            /* https://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html */
    11661173            return $this->call('flickr.photos.comments.getRecentForContacts', array('date_lastcomment' => $date_lastcomment, 'contacts_filter' => $contacts_filter, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    11671174        }
    … …  
    11691176        /* Photos - Geo Methods */
    11701177        function photos_geo_batchCorrectLocation ($lat, $lon, $accuracy, $place_id = NULL, $woe_id = NULL) {
    1171             /* http://www.flickr.com/services/api/flickr.photos.geo.batchCorrectLocation.html */
     1178            /* https://www.flickr.com/services/api/flickr.photos.geo.batchCorrectLocation.html */
    11721179            return $this->call('flickr.photos.geo.batchCorrectLocation', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'place_id' => $place_id, 'woe_id' => $woe_id));
    11731180        }
    11741181
    11751182        function photos_geo_correctLocation ($photo_id, $place_id = NULL, $woe_id = NULL) {
    1176             /* http://www.flickr.com/services/api/flickr.photos.geo.correctLocation.html */
     1183            /* https://www.flickr.com/services/api/flickr.photos.geo.correctLocation.html */
    11771184            return $this->call('flickr.photos.geo.correctLocation', array('photo_id' => $photo_id, 'place_id' => $place_id, 'woe_id' => $woe_id));
    11781185        }
    11791186
    11801187        function photos_geo_getLocation ($photo_id) {
    1181             /* http://www.flickr.com/services/api/flickr.photos.geo.getLocation.html */
     1188            /* https://www.flickr.com/services/api/flickr.photos.geo.getLocation.html */
    11821189            $this->request("flickr.photos.geo.getLocation", array("photo_id"=>$photo_id));
    11831190            return $this->parsed_response ? $this->parsed_response['photo'] : false;
    … …  
    11851192
    11861193        function photos_geo_getPerms ($photo_id) {
    1187             /* http://www.flickr.com/services/api/flickr.photos.geo.getPerms.html */
     1194            /* https://www.flickr.com/services/api/flickr.photos.geo.getPerms.html */
    11881195            $this->request("flickr.photos.geo.getPerms", array("photo_id"=>$photo_id));
    11891196            return $this->parsed_response ? $this->parsed_response['perms'] : false;
    11901197        }
    1191        
     1198
    11921199        function photos_geo_photosForLocation ($lat, $lon, $accuracy = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
    1193             /* http://www.flickr.com/services/api/flickr.photos.geo.photosForLocation.html */
     1200            /* https://www.flickr.com/services/api/flickr.photos.geo.photosForLocation.html */
    11941201            return $this->call('flickr.photos.geo.photosForLocation', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
    11951202        }
    11961203
    11971204        function photos_geo_removeLocation ($photo_id) {
    1198             /* http://www.flickr.com/services/api/flickr.photos.geo.removeLocation.html */
     1205            /* https://www.flickr.com/services/api/flickr.photos.geo.removeLocation.html */
    11991206            $this->request("flickr.photos.geo.removeLocation", array("photo_id"=>$photo_id), TRUE);
    12001207            return $this->parsed_response ? true : false;
    … …  
    12021209
    12031210        function photos_geo_setContext ($photo_id, $context) {
    1204             /* http://www.flickr.com/services/api/flickr.photos.geo.setContext.html */
     1211            /* https://www.flickr.com/services/api/flickr.photos.geo.setContext.html */
    12051212            return $this->call('flickr.photos.geo.setContext', array('photo_id' => $photo_id, 'context' => $context));
    12061213        }
    12071214
    12081215        function photos_geo_setLocation ($photo_id, $lat, $lon, $accuracy = NULL, $context = NULL, $bookmark_id = NULL) {
    1209             /* http://www.flickr.com/services/api/flickr.photos.geo.setLocation.html */
     1216            /* https://www.flickr.com/services/api/flickr.photos.geo.setLocation.html */
    12101217            return $this->call('flickr.photos.geo.setLocation', array('photo_id' => $photo_id, 'lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'context' => $context, 'bookmark_id' => $bookmark_id));
    12111218        }
    1212        
     1219
    12131220        function photos_geo_setPerms ($is_public, $is_contact, $is_friend, $is_family, $photo_id) {
    1214             /* http://www.flickr.com/services/api/flickr.photos.geo.setPerms.html */
     1221            /* https://www.flickr.com/services/api/flickr.photos.geo.setPerms.html */
    12151222            return $this->call('flickr.photos.geo.setPerms', array('is_public' => $is_public, 'is_contact' => $is_contact, 'is_friend' => $is_friend, 'is_family' => $is_family, 'photo_id' => $photo_id));
    12161223        }
    … …  
    12181225        /* Photos - Licenses Methods */
    12191226        function photos_licenses_getInfo () {
    1220             /* http://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html */
     1227            /* https://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html */
    12211228            $this->request("flickr.photos.licenses.getInfo");
    12221229            return $this->parsed_response ? $this->parsed_response['licenses']['license'] : false;
    … …  
    12241231
    12251232        function photos_licenses_setLicense ($photo_id, $license_id) {
    1226             /* http://www.flickr.com/services/api/flickr.photos.licenses.setLicense.html */
     1233            /* https://www.flickr.com/services/api/flickr.photos.licenses.setLicense.html */
    12271234            /* Requires Authentication */
    12281235            $this->request("flickr.photos.licenses.setLicense", array("photo_id"=>$photo_id, "license_id"=>$license_id), TRUE);
    … …  
    12321239        /* Photos - Notes Methods */
    12331240        function photos_notes_add ($photo_id, $note_x, $note_y, $note_w, $note_h, $note_text) {
    1234             /* http://www.flickr.com/services/api/flickr.photos.notes.add.html */
     1241            /* https://www.flickr.com/services/api/flickr.photos.notes.add.html */
    12351242            $this->request("flickr.photos.notes.add", array("photo_id" => $photo_id, "note_x" => $note_x, "note_y" => $note_y, "note_w" => $note_w, "note_h" => $note_h, "note_text" => $note_text), TRUE);
    12361243            return $this->parsed_response ? $this->parsed_response['note'] : false;
    … …  
    12381245
    12391246        function photos_notes_delete ($note_id) {
    1240             /* http://www.flickr.com/services/api/flickr.photos.notes.delete.html */
     1247            /* https://www.flickr.com/services/api/flickr.photos.notes.delete.html */
    12411248            $this->request("flickr.photos.notes.delete", array("note_id" => $note_id), TRUE);
    12421249            return $this->parsed_response ? true : false;
    … …  
    12441251
    12451252        function photos_notes_edit ($note_id, $note_x, $note_y, $note_w, $note_h, $note_text) {
    1246             /* http://www.flickr.com/services/api/flickr.photos.notes.edit.html */
     1253            /* https://www.flickr.com/services/api/flickr.photos.notes.edit.html */
    12471254            $this->request("flickr.photos.notes.edit", array("note_id" => $note_id, "note_x" => $note_x, "note_y" => $note_y, "note_w" => $note_w, "note_h" => $note_h, "note_text" => $note_text), TRUE);
    12481255            return $this->parsed_response ? true : false;
    … …  
    12511258        /* Photos - Transform Methods */
    12521259        function photos_transform_rotate ($photo_id, $degrees) {
    1253             /* http://www.flickr.com/services/api/flickr.photos.transform.rotate.html */
     1260            /* https://www.flickr.com/services/api/flickr.photos.transform.rotate.html */
    12541261            $this->request("flickr.photos.transform.rotate", array("photo_id" => $photo_id, "degrees" => $degrees), TRUE);
    12551262            return $this->parsed_response ? true : false;
    … …  
    12581265        /* Photos - People Methods */
    12591266        function photos_people_add ($photo_id, $user_id, $person_x = NULL, $person_y = NULL, $person_w = NULL, $person_h = NULL) {
    1260             /* http://www.flickr.com/services/api/flickr.photos.people.add.html */
     1267            /* https://www.flickr.com/services/api/flickr.photos.people.add.html */
    12611268            return $this->call('flickr.photos.people.add', array('photo_id' => $photo_id, 'user_id' => $user_id, 'person_x' => $person_x, 'person_y' => $person_y, 'person_w' => $person_w, 'person_h' => $person_h));
    12621269        }
    12631270
    12641271        function photos_people_delete ($photo_id, $user_id, $email = NULL) {
    1265             /* http://www.flickr.com/services/api/flickr.photos.people.delete.html */
     1272            /* https://www.flickr.com/services/api/flickr.photos.people.delete.html */
    12661273            return $this->call('flickr.photos.people.delete', array('photo_id' => $photo_id, 'user_id' => $user_id, 'email' => $email));
    12671274        }
    1268        
     1275
    12691276        function photos_people_deleteCoords ($photo_id, $user_id) {
    1270             /* http://www.flickr.com/services/api/flickr.photos.people.deleteCoords.html */
     1277            /* https://www.flickr.com/services/api/flickr.photos.people.deleteCoords.html */
    12711278            return $this->call('flickr.photos.people.deleteCoords', array('photo_id' => $photo_id, 'user_id' => $user_id));
    12721279        }
    12731280
    12741281        function photos_people_editCoords ($photo_id, $user_id, $person_x, $person_y, $person_w, $person_h, $email = NULL) {
    1275             /* http://www.flickr.com/services/api/flickr.photos.people.editCoords.html */
     1282            /* https://www.flickr.com/services/api/flickr.photos.people.editCoords.html */
    12761283            return $this->call('flickr.photos.people.editCoords', array('photo_id' => $photo_id, 'user_id' => $user_id, 'person_x' => $person_x, 'person_y' => $person_y, 'person_w' => $person_w, 'person_h' => $person_h, 'email' => $email));
    12771284        }
    1278        
     1285
    12791286        function photos_people_getList ($photo_id) {
    1280             /* http://www.flickr.com/services/api/flickr.photos.people.getList.html */
     1287            /* https://www.flickr.com/services/api/flickr.photos.people.getList.html */
    12811288            return $this->call('flickr.photos.people.getList', array('photo_id' => $photo_id));
    12821289        }
    1283        
     1290
    12841291        /* Photos - Upload Methods */
    12851292        function photos_upload_checkTickets ($tickets) {
    1286             /* http://www.flickr.com/services/api/flickr.photos.upload.checkTickets.html */
     1293            /* https://www.flickr.com/services/api/flickr.photos.upload.checkTickets.html */
    12871294            if (is_array($tickets)) {
    12881295                $tickets = implode(",", $tickets);
    … …  
    12941301        /* Photosets Methods */
    12951302        function photosets_addPhoto ($photoset_id, $photo_id) {
    1296             /* http://www.flickr.com/services/api/flickr.photosets.addPhoto.html */
     1303            /* https://www.flickr.com/services/api/flickr.photosets.addPhoto.html */
    12971304            $this->request("flickr.photosets.addPhoto", array("photoset_id" => $photoset_id, "photo_id" => $photo_id), TRUE);
    12981305            return $this->parsed_response ? true : false;
    … …  
    13001307
    13011308        function photosets_create ($title, $description, $primary_photo_id) {
    1302             /* http://www.flickr.com/services/api/flickr.photosets.create.html */
     1309            /* https://www.flickr.com/services/api/flickr.photosets.create.html */
    13031310            $this->request("flickr.photosets.create", array("title" => $title, "primary_photo_id" => $primary_photo_id, "description" => $description), TRUE);
    13041311            return $this->parsed_response ? $this->parsed_response['photoset'] : false;
    … …  
    13061313
    13071314        function photosets_delete ($photoset_id) {
    1308             /* http://www.flickr.com/services/api/flickr.photosets.delete.html */
     1315            /* https://www.flickr.com/services/api/flickr.photosets.delete.html */
    13091316            $this->request("flickr.photosets.delete", array("photoset_id" => $photoset_id), TRUE);
    13101317            return $this->parsed_response ? true : false;
    … …  
    13121319
    13131320        function photosets_editMeta ($photoset_id, $title, $description = NULL) {
    1314             /* http://www.flickr.com/services/api/flickr.photosets.editMeta.html */
     1321            /* https://www.flickr.com/services/api/flickr.photosets.editMeta.html */
    13151322            $this->request("flickr.photosets.editMeta", array("photoset_id" => $photoset_id, "title" => $title, "description" => $description), TRUE);
    13161323            return $this->parsed_response ? true : false;
    … …  
    13181325
    13191326        function photosets_editPhotos ($photoset_id, $primary_photo_id, $photo_ids) {
    1320             /* http://www.flickr.com/services/api/flickr.photosets.editPhotos.html */
     1327            /* https://www.flickr.com/services/api/flickr.photosets.editPhotos.html */
    13211328            $this->request("flickr.photosets.editPhotos", array("photoset_id" => $photoset_id, "primary_photo_id" => $primary_photo_id, "photo_ids" => $photo_ids), TRUE);
    13221329            return $this->parsed_response ? true : false;
    … …  
    13241331
    13251332        function photosets_getContext ($photo_id, $photoset_id, $num_prev = NULL, $num_next = NULL) {
    1326             /* http://www.flickr.com/services/api/flickr.photosets.getContext.html */
     1333            /* https://www.flickr.com/services/api/flickr.photosets.getContext.html */
    13271334            return $this->call('flickr.photosets.getContext', array('photo_id' => $photo_id, 'photoset_id' => $photoset_id, 'num_prev' => $num_prev, 'num_next' => $num_next));
    13281335        }
    1329        
     1336
    13301337        function photosets_getInfo ($photoset_id) {
    1331             /* http://www.flickr.com/services/api/flickr.photosets.getInfo.html */
     1338            /* https://www.flickr.com/services/api/flickr.photosets.getInfo.html */
    13321339            $this->request("flickr.photosets.getInfo", array("photoset_id" => $photoset_id));
    13331340            return $this->parsed_response ? $this->parsed_response['photoset'] : false;
    13341341        }
    13351342
    1336         function photosets_getList ($user_id = NULL) {
    1337             /* http://www.flickr.com/services/api/flickr.photosets.getList.html */
    1338             $this->request("flickr.photosets.getList", array("user_id" => $user_id));
     1343        function photosets_getList ($user_id = NULL, $page = NULL, $per_page = NULL, $primary_photo_extras = NULL) {
     1344            /* https://www.flickr.com/services/api/flickr.photosets.getList.html */
     1345            $this->request("flickr.photosets.getList", array("user_id" => $user_id, 'page' => $page, 'per_page' => $per_page, 'primary_photo_extras' => $primary_photo_extras));
    13391346            return $this->parsed_response ? $this->parsed_response['photosets'] : false;
    13401347        }
    13411348
    13421349        function photosets_getPhotos ($photoset_id, $extras = NULL, $privacy_filter = NULL, $per_page = NULL, $page = NULL, $media = NULL) {
    1343             /* http://www.flickr.com/services/api/flickr.photosets.getPhotos.html */
     1350            /* https://www.flickr.com/services/api/flickr.photosets.getPhotos.html */
    13441351            return $this->call('flickr.photosets.getPhotos', array('photoset_id' => $photoset_id, 'extras' => $extras, 'privacy_filter' => $privacy_filter, 'per_page' => $per_page, 'page' => $page, 'media' => $media));
    13451352        }
    13461353
    13471354        function photosets_orderSets ($photoset_ids) {
    1348             /* http://www.flickr.com/services/api/flickr.photosets.orderSets.html */
     1355            /* https://www.flickr.com/services/api/flickr.photosets.orderSets.html */
    13491356            if (is_array($photoset_ids)) {
    13501357                $photoset_ids = implode(",", $photoset_ids);
    … …  
    13551362
    13561363        function photosets_removePhoto ($photoset_id, $photo_id) {
    1357             /* http://www.flickr.com/services/api/flickr.photosets.removePhoto.html */
     1364            /* https://www.flickr.com/services/api/flickr.photosets.removePhoto.html */
    13581365            $this->request("flickr.photosets.removePhoto", array("photoset_id" => $photoset_id, "photo_id" => $photo_id), TRUE);
    13591366            return $this->parsed_response ? true : false;
    13601367        }
    1361        
     1368
    13621369        function photosets_removePhotos ($photoset_id, $photo_ids) {
    1363             /* http://www.flickr.com/services/api/flickr.photosets.removePhotos.html */
     1370            /* https://www.flickr.com/services/api/flickr.photosets.removePhotos.html */
    13641371            return $this->call('flickr.photosets.removePhotos', array('photoset_id' => $photoset_id, 'photo_ids' => $photo_ids));
    13651372        }
    1366        
     1373
    13671374        function photosets_reorderPhotos ($photoset_id, $photo_ids) {
    1368             /* http://www.flickr.com/services/api/flickr.photosets.reorderPhotos.html */
     1375            /* https://www.flickr.com/services/api/flickr.photosets.reorderPhotos.html */
    13691376            return $this->call('flickr.photosets.reorderPhotos', array('photoset_id' => $photoset_id, 'photo_ids' => $photo_ids));
    13701377        }
    1371        
     1378
    13721379        function photosets_setPrimaryPhoto ($photoset_id, $photo_id) {
    1373             /* http://www.flickr.com/services/api/flickr.photosets.setPrimaryPhoto.html */
     1380            /* https://www.flickr.com/services/api/flickr.photosets.setPrimaryPhoto.html */
    13741381            return $this->call('flickr.photosets.setPrimaryPhoto', array('photoset_id' => $photoset_id, 'photo_id' => $photo_id));
    13751382        }
    … …  
    13771384        /* Photosets Comments Methods */
    13781385        function photosets_comments_addComment ($photoset_id, $comment_text) {
    1379             /* http://www.flickr.com/services/api/flickr.photosets.comments.addComment.html */
     1386            /* https://www.flickr.com/services/api/flickr.photosets.comments.addComment.html */
    13801387            $this->request("flickr.photosets.comments.addComment", array("photoset_id" => $photoset_id, "comment_text"=>$comment_text), TRUE);
    13811388            return $this->parsed_response ? $this->parsed_response['comment'] : false;
    … …  
    13831390
    13841391        function photosets_comments_deleteComment ($comment_id) {
    1385             /* http://www.flickr.com/services/api/flickr.photosets.comments.deleteComment.html */
     1392            /* https://www.flickr.com/services/api/flickr.photosets.comments.deleteComment.html */
    13861393            $this->request("flickr.photosets.comments.deleteComment", array("comment_id" => $comment_id), TRUE);
    13871394            return $this->parsed_response ? true : false;
    … …  
    13891396
    13901397        function photosets_comments_editComment ($comment_id, $comment_text) {
    1391             /* http://www.flickr.com/services/api/flickr.photosets.comments.editComment.html */
     1398            /* https://www.flickr.com/services/api/flickr.photosets.comments.editComment.html */
    13921399            $this->request("flickr.photosets.comments.editComment", array("comment_id" => $comment_id, "comment_text"=>$comment_text), TRUE);
    13931400            return $this->parsed_response ? true : false;
    … …  
    13951402
    13961403        function photosets_comments_getList ($photoset_id) {
    1397             /* http://www.flickr.com/services/api/flickr.photosets.comments.getList.html */
     1404            /* https://www.flickr.com/services/api/flickr.photosets.comments.getList.html */
    13981405            $this->request("flickr.photosets.comments.getList", array("photoset_id"=>$photoset_id));
    13991406            return $this->parsed_response ? $this->parsed_response['comments'] : false;
    14001407        }
    1401        
     1408
    14021409        /* Places Methods */
    14031410        function places_find ($query) {
    1404             /* http://www.flickr.com/services/api/flickr.places.find.html */
     1411            /* https://www.flickr.com/services/api/flickr.places.find.html */
    14051412            return $this->call('flickr.places.find', array('query' => $query));
    14061413        }
    14071414
    14081415        function places_findByLatLon ($lat, $lon, $accuracy = NULL) {
    1409             /* http://www.flickr.com/services/api/flickr.places.findByLatLon.html */
     1416            /* https://www.flickr.com/services/api/flickr.places.findByLatLon.html */
    14101417            return $this->call('flickr.places.findByLatLon', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy));
    14111418        }
    14121419
    14131420        function places_getChildrenWithPhotosPublic ($place_id = NULL, $woe_id = NULL) {
    1414             /* http://www.flickr.com/services/api/flickr.places.getChildrenWithPhotosPublic.html */
     1421            /* https://www.flickr.com/services/api/flickr.places.getChildrenWithPhotosPublic.html */
    14151422            return $this->call('flickr.places.getChildrenWithPhotosPublic', array('place_id' => $place_id, 'woe_id' => $woe_id));
    14161423        }
    14171424
    14181425        function places_getInfo ($place_id = NULL, $woe_id = NULL) {
    1419             /* http://www.flickr.com/services/api/flickr.places.getInfo.html */
     1426            /* https://www.flickr.com/services/api/flickr.places.getInfo.html */
    14201427            return $this->call('flickr.places.getInfo', array('place_id' => $place_id, 'woe_id' => $woe_id));
    14211428        }
    14221429
    14231430        function places_getInfoByUrl ($url) {
    1424             /* http://www.flickr.com/services/api/flickr.places.getInfoByUrl.html */
     1431            /* https://www.flickr.com/services/api/flickr.places.getInfoByUrl.html */
    14251432            return $this->call('flickr.places.getInfoByUrl', array('url' => $url));
    14261433        }
    1427        
     1434
    14281435        function places_getPlaceTypes () {
    1429             /* http://www.flickr.com/services/api/flickr.places.getPlaceTypes.html */
     1436            /* https://www.flickr.com/services/api/flickr.places.getPlaceTypes.html */
    14301437            return $this->call('flickr.places.getPlaceTypes', array());
    14311438        }
    1432        
     1439
    14331440        function places_getShapeHistory ($place_id = NULL, $woe_id = NULL) {
    1434             /* http://www.flickr.com/services/api/flickr.places.getShapeHistory.html */
     1441            /* https://www.flickr.com/services/api/flickr.places.getShapeHistory.html */
    14351442            return $this->call('flickr.places.getShapeHistory', array('place_id' => $place_id, 'woe_id' => $woe_id));
    14361443        }
    14371444
    14381445        function places_getTopPlacesList ($place_type_id, $date = NULL, $woe_id = NULL, $place_id = NULL) {
    1439             /* http://www.flickr.com/services/api/flickr.places.getTopPlacesList.html */
     1446            /* https://www.flickr.com/services/api/flickr.places.getTopPlacesList.html */
    14401447            return $this->call('flickr.places.getTopPlacesList', array('place_type_id' => $place_type_id, 'date' => $date, 'woe_id' => $woe_id, 'place_id' => $place_id));
    14411448        }
    1442        
     1449
    14431450        function places_placesForBoundingBox ($bbox, $place_type = NULL, $place_type_id = NULL, $recursive = NULL) {
    1444             /* http://www.flickr.com/services/api/flickr.places.placesForBoundingBox.html */
     1451            /* https://www.flickr.com/services/api/flickr.places.placesForBoundingBox.html */
    14451452            return $this->call('flickr.places.placesForBoundingBox', array('bbox' => $bbox, 'place_type' => $place_type, 'place_type_id' => $place_type_id, 'recursive' => $recursive));
    14461453        }
    14471454
    14481455        function places_placesForContacts ($place_type = NULL, $place_type_id = NULL, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $contacts = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
    1449             /* http://www.flickr.com/services/api/flickr.places.placesForContacts.html */
     1456            /* https://www.flickr.com/services/api/flickr.places.placesForContacts.html */
    14501457            return $this->call('flickr.places.placesForContacts', array('place_type' => $place_type, 'place_type_id' => $place_type_id, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'contacts' => $contacts, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
    14511458        }
    14521459
    14531460        function places_placesForTags ($place_type_id, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $tags = NULL, $tag_mode = NULL, $machine_tags = NULL, $machine_tag_mode = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
    1454             /* http://www.flickr.com/services/api/flickr.places.placesForTags.html */
     1461            /* https://www.flickr.com/services/api/flickr.places.placesForTags.html */
    14551462            return $this->call('flickr.places.placesForTags', array('place_type_id' => $place_type_id, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'tags' => $tags, 'tag_mode' => $tag_mode, 'machine_tags' => $machine_tags, 'machine_tag_mode' => $machine_tag_mode, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
    14561463        }
    14571464
    14581465        function places_placesForUser ($place_type_id = NULL, $place_type = NULL, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
    1459             /* http://www.flickr.com/services/api/flickr.places.placesForUser.html */
     1466            /* https://www.flickr.com/services/api/flickr.places.placesForUser.html */
    14601467            return $this->call('flickr.places.placesForUser', array('place_type_id' => $place_type_id, 'place_type' => $place_type, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
    14611468        }
    1462        
     1469
    14631470        function places_resolvePlaceId ($place_id) {
    1464             /* http://www.flickr.com/services/api/flickr.places.resolvePlaceId.html */
     1471            /* https://www.flickr.com/services/api/flickr.places.resolvePlaceId.html */
    14651472            $rsp = $this->call('flickr.places.resolvePlaceId', array('place_id' => $place_id));
    14661473            return $rsp ? $rsp['location'] : $rsp;
    14671474        }
    1468        
     1475
    14691476        function places_resolvePlaceURL ($url) {
    1470             /* http://www.flickr.com/services/api/flickr.places.resolvePlaceURL.html */
     1477            /* https://www.flickr.com/services/api/flickr.places.resolvePlaceURL.html */
    14711478            $rsp = $this->call('flickr.places.resolvePlaceURL', array('url' => $url));
    14721479            return $rsp ? $rsp['location'] : $rsp;
    14731480        }
    1474        
     1481
    14751482        function places_tagsForPlace ($woe_id = NULL, $place_id = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
    1476             /* http://www.flickr.com/services/api/flickr.places.tagsForPlace.html */
     1483            /* https://www.flickr.com/services/api/flickr.places.tagsForPlace.html */
    14771484            return $this->call('flickr.places.tagsForPlace', array('woe_id' => $woe_id, 'place_id' => $place_id, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
    14781485        }
    … …  
    14801487        /* Prefs Methods */
    14811488        function prefs_getContentType () {
    1482             /* http://www.flickr.com/services/api/flickr.prefs.getContentType.html */
     1489            /* https://www.flickr.com/services/api/flickr.prefs.getContentType.html */
    14831490            $rsp = $this->call('flickr.prefs.getContentType', array());
    14841491            return $rsp ? $rsp['person'] : $rsp;
    14851492        }
    1486        
     1493
    14871494        function prefs_getGeoPerms () {
    1488             /* http://www.flickr.com/services/api/flickr.prefs.getGeoPerms.html */
     1495            /* https://www.flickr.com/services/api/flickr.prefs.getGeoPerms.html */
    14891496            return $this->call('flickr.prefs.getGeoPerms', array());
    14901497        }
    1491        
     1498
    14921499        function prefs_getHidden () {
    1493             /* http://www.flickr.com/services/api/flickr.prefs.getHidden.html */
     1500            /* https://www.flickr.com/services/api/flickr.prefs.getHidden.html */
    14941501            $rsp = $this->call('flickr.prefs.getHidden', array());
    14951502            return $rsp ? $rsp['person'] : $rsp;
    14961503        }
    1497        
     1504
    14981505        function prefs_getPrivacy () {
    1499             /* http://www.flickr.com/services/api/flickr.prefs.getPrivacy.html */
     1506            /* https://www.flickr.com/services/api/flickr.prefs.getPrivacy.html */
    15001507            $rsp = $this->call('flickr.prefs.getPrivacy', array());
    15011508            return $rsp ? $rsp['person'] : $rsp;
    15021509        }
    1503        
     1510
    15041511        function prefs_getSafetyLevel () {
    1505             /* http://www.flickr.com/services/api/flickr.prefs.getSafetyLevel.html */
     1512            /* https://www.flickr.com/services/api/flickr.prefs.getSafetyLevel.html */
    15061513            $rsp = $this->call('flickr.prefs.getSafetyLevel', array());
    15071514            return $rsp ? $rsp['person'] : $rsp;
    … …  
    15101517        /* Reflection Methods */
    15111518        function reflection_getMethodInfo ($method_name) {
    1512             /* http://www.flickr.com/services/api/flickr.reflection.getMethodInfo.html */
     1519            /* https://www.flickr.com/services/api/flickr.reflection.getMethodInfo.html */
    15131520            $this->request("flickr.reflection.getMethodInfo", array("method_name" => $method_name));
    15141521            return $this->parsed_response ? $this->parsed_response : false;
    … …  
    15161523
    15171524        function reflection_getMethods () {
    1518             /* http://www.flickr.com/services/api/flickr.reflection.getMethods.html */
     1525            /* https://www.flickr.com/services/api/flickr.reflection.getMethods.html */
    15191526            $this->request("flickr.reflection.getMethods");
    15201527            return $this->parsed_response ? $this->parsed_response['methods']['method'] : false;
    … …  
    15231530        /* Stats Methods */
    15241531        function stats_getCollectionDomains ($date, $collection_id = NULL, $per_page = NULL, $page = NULL) {
    1525             /* http://www.flickr.com/services/api/flickr.stats.getCollectionDomains.html */
     1532            /* https://www.flickr.com/services/api/flickr.stats.getCollectionDomains.html */
    15261533            return $this->call('flickr.stats.getCollectionDomains', array('date' => $date, 'collection_id' => $collection_id, 'per_page' => $per_page, 'page' => $page));
    15271534        }
    15281535
    15291536        function stats_getCollectionReferrers ($date, $domain, $collection_id = NULL, $per_page = NULL, $page = NULL) {
    1530             /* http://www.flickr.com/services/api/flickr.stats.getCollectionReferrers.html */
     1537            /* https://www.flickr.com/services/api/flickr.stats.getCollectionReferrers.html */
    15311538            return $this->call('flickr.stats.getCollectionReferrers', array('date' => $date, 'domain' => $domain, 'collection_id' => $collection_id, 'per_page' => $per_page, 'page' => $page));
    15321539        }
    15331540
    15341541        function stats_getCollectionStats ($date, $collection_id) {
    1535             /* http://www.flickr.com/services/api/flickr.stats.getCollectionStats.html */
     1542            /* https://www.flickr.com/services/api/flickr.stats.getCollectionStats.html */
    15361543            return $this->call('flickr.stats.getCollectionStats', array('date' => $date, 'collection_id' => $collection_id));
    15371544        }
    1538        
     1545
    15391546        function stats_getCSVFiles () {
    1540             /* http://www.flickr.com/services/api/flickr.stats.getCSVFiles.html */
     1547            /* https://www.flickr.com/services/api/flickr.stats.getCSVFiles.html */
    15411548            return $this->call('flickr.stats.getCSVFiles', array());
    15421549        }
    15431550
    15441551        function stats_getPhotoDomains ($date, $photo_id = NULL, $per_page = NULL, $page = NULL) {
    1545             /* http://www.flickr.com/services/api/flickr.stats.getPhotoDomains.html */
     1552            /* https://www.flickr.com/services/api/flickr.stats.getPhotoDomains.html */
    15461553            return $this->call('flickr.stats.getPhotoDomains', array('date' => $date, 'photo_id' => $photo_id, 'per_page' => $per_page, 'page' => $page));
    15471554        }
    15481555
    15491556        function stats_getPhotoReferrers ($date, $domain, $photo_id = NULL, $per_page = NULL, $page = NULL) {
    1550             /* http://www.flickr.com/services/api/flickr.stats.getPhotoReferrers.html */
     1557            /* https://www.flickr.com/services/api/flickr.stats.getPhotoReferrers.html */
    15511558            return $this->call('flickr.stats.getPhotoReferrers', array('date' => $date, 'domain' => $domain, 'photo_id' => $photo_id, 'per_page' => $per_page, 'page' => $page));
    15521559        }
    15531560
    15541561        function stats_getPhotosetDomains ($date, $photoset_id = NULL, $per_page = NULL, $page = NULL) {
    1555             /* http://www.flickr.com/services/api/flickr.stats.getPhotosetDomains.html */
     1562            /* https://www.flickr.com/services/api/flickr.stats.getPhotosetDomains.html */
    15561563            return $this->call('flickr.stats.getPhotosetDomains', array('date' => $date, 'photoset_id' => $photoset_id, 'per_page' => $per_page, 'page' => $page));
    15571564        }
    15581565
    15591566        function stats_getPhotosetReferrers ($date, $domain, $photoset_id = NULL, $per_page = NULL, $page = NULL) {
    1560             /* http://www.flickr.com/services/api/flickr.stats.getPhotosetReferrers.html */
     1567            /* https://www.flickr.com/services/api/flickr.stats.getPhotosetReferrers.html */
    15611568            return $this->call('flickr.stats.getPhotosetReferrers', array('date' => $date, 'domain' => $domain, 'photoset_id' => $photoset_id, 'per_page' => $per_page, 'page' => $page));
    15621569        }
    15631570
    15641571        function stats_getPhotosetStats ($date, $photoset_id) {
    1565             /* http://www.flickr.com/services/api/flickr.stats.getPhotosetStats.html */
     1572            /* https://www.flickr.com/services/api/flickr.stats.getPhotosetStats.html */
    15661573            return $this->call('flickr.stats.getPhotosetStats', array('date' => $date, 'photoset_id' => $photoset_id));
    15671574        }
    15681575
    15691576        function stats_getPhotoStats ($date, $photo_id) {
    1570             /* http://www.flickr.com/services/api/flickr.stats.getPhotoStats.html */
     1577            /* https://www.flickr.com/services/api/flickr.stats.getPhotoStats.html */
    15711578            return $this->call('flickr.stats.getPhotoStats', array('date' => $date, 'photo_id' => $photo_id));
    15721579        }
    15731580
    15741581        function stats_getPhotostreamDomains ($date, $per_page = NULL, $page = NULL) {
    1575             /* http://www.flickr.com/services/api/flickr.stats.getPhotostreamDomains.html */
     1582            /* https://www.flickr.com/services/api/flickr.stats.getPhotostreamDomains.html */
    15761583            return $this->call('flickr.stats.getPhotostreamDomains', array('date' => $date, 'per_page' => $per_page, 'page' => $page));
    15771584        }
    15781585
    15791586        function stats_getPhotostreamReferrers ($date, $domain, $per_page = NULL, $page = NULL) {
    1580             /* http://www.flickr.com/services/api/flickr.stats.getPhotostreamReferrers.html */
     1587            /* https://www.flickr.com/services/api/flickr.stats.getPhotostreamReferrers.html */
    15811588            return $this->call('flickr.stats.getPhotostreamReferrers', array('date' => $date, 'domain' => $domain, 'per_page' => $per_page, 'page' => $page));
    15821589        }
    15831590
    15841591        function stats_getPhotostreamStats ($date) {
    1585             /* http://www.flickr.com/services/api/flickr.stats.getPhotostreamStats.html */
     1592            /* https://www.flickr.com/services/api/flickr.stats.getPhotostreamStats.html */
    15861593            return $this->call('flickr.stats.getPhotostreamStats', array('date' => $date));
    15871594        }
    15881595
    15891596        function stats_getPopularPhotos ($date = NULL, $sort = NULL, $per_page = NULL, $page = NULL) {
    1590             /* http://www.flickr.com/services/api/flickr.stats.getPopularPhotos.html */
     1597            /* https://www.flickr.com/services/api/flickr.stats.getPopularPhotos.html */
    15911598            return $this->call('flickr.stats.getPopularPhotos', array('date' => $date, 'sort' => $sort, 'per_page' => $per_page, 'page' => $page));
    15921599        }
    15931600
    15941601        function stats_getTotalViews ($date = NULL) {
    1595             /* http://www.flickr.com/services/api/flickr.stats.getTotalViews.html */
     1602            /* https://www.flickr.com/services/api/flickr.stats.getTotalViews.html */
    15961603            return $this->call('flickr.stats.getTotalViews', array('date' => $date));
    15971604        }
    1598        
     1605
    15991606        /* Tags Methods */
    16001607        function tags_getClusterPhotos ($tag, $cluster_id) {
    1601             /* http://www.flickr.com/services/api/flickr.tags.getClusterPhotos.html */
     1608            /* https://www.flickr.com/services/api/flickr.tags.getClusterPhotos.html */
    16021609            return $this->call('flickr.tags.getClusterPhotos', array('tag' => $tag, 'cluster_id' => $cluster_id));
    16031610        }
    16041611
    16051612        function tags_getClusters ($tag) {
    1606             /* http://www.flickr.com/services/api/flickr.tags.getClusters.html */
     1613            /* https://www.flickr.com/services/api/flickr.tags.getClusters.html */
    16071614            return $this->call('flickr.tags.getClusters', array('tag' => $tag));
    16081615        }
    16091616
    16101617        function tags_getHotList ($period = NULL, $count = NULL) {
    1611             /* http://www.flickr.com/services/api/flickr.tags.getHotList.html */
     1618            /* https://www.flickr.com/services/api/flickr.tags.getHotList.html */
    16121619            $this->request("flickr.tags.getHotList", array("period" => $period, "count" => $count));
    16131620            return $this->parsed_response ? $this->parsed_response['hottags'] : false;
    … …  
    16151622
    16161623        function tags_getListPhoto ($photo_id) {
    1617             /* http://www.flickr.com/services/api/flickr.tags.getListPhoto.html */
     1624            /* https://www.flickr.com/services/api/flickr.tags.getListPhoto.html */
    16181625            $this->request("flickr.tags.getListPhoto", array("photo_id" => $photo_id));
    16191626            return $this->parsed_response ? $this->parsed_response['photo']['tags']['tag'] : false;
    … …  
    16211628
    16221629        function tags_getListUser ($user_id = NULL) {
    1623             /* http://www.flickr.com/services/api/flickr.tags.getListUser.html */
     1630            /* https://www.flickr.com/services/api/flickr.tags.getListUser.html */
    16241631            $this->request("flickr.tags.getListUser", array("user_id" => $user_id));
    16251632            return $this->parsed_response ? $this->parsed_response['who']['tags']['tag'] : false;
    … …  
    16271634
    16281635        function tags_getListUserPopular ($user_id = NULL, $count = NULL) {
    1629             /* http://www.flickr.com/services/api/flickr.tags.getListUserPopular.html */
     1636            /* https://www.flickr.com/services/api/flickr.tags.getListUserPopular.html */
    16301637            $this->request("flickr.tags.getListUserPopular", array("user_id" => $user_id, "count" => $count));
    16311638            return $this->parsed_response ? $this->parsed_response['who']['tags']['tag'] : false;
    … …  
    16331640
    16341641        function tags_getListUserRaw ($tag = NULL) {
    1635             /* http://www.flickr.com/services/api/flickr.tags.getListUserRaw.html */
     1642            /* https://www.flickr.com/services/api/flickr.tags.getListUserRaw.html */
    16361643            return $this->call('flickr.tags.getListUserRaw', array('tag' => $tag));
    16371644        }
    1638        
     1645
    16391646        function tags_getRelated ($tag) {
    1640             /* http://www.flickr.com/services/api/flickr.tags.getRelated.html */
     1647            /* https://www.flickr.com/services/api/flickr.tags.getRelated.html */
    16411648            $this->request("flickr.tags.getRelated", array("tag" => $tag));
    16421649            return $this->parsed_response ? $this->parsed_response['tags'] : false;
    … …  
    16441651
    16451652        function test_echo ($args = array()) {
    1646             /* http://www.flickr.com/services/api/flickr.test.echo.html */
     1653            /* https://www.flickr.com/services/api/flickr.test.echo.html */
    16471654            $this->request("flickr.test.echo", $args);
    16481655            return $this->parsed_response ? $this->parsed_response : false;
    … …  
    16501657
    16511658        function test_login () {
    1652             /* http://www.flickr.com/services/api/flickr.test.login.html */
     1659            /* https://www.flickr.com/services/api/flickr.test.login.html */
    16531660            $this->request("flickr.test.login");
    16541661            return $this->parsed_response ? $this->parsed_response['user'] : false;
    … …  
    16561663
    16571664        function urls_getGroup ($group_id) {
    1658             /* http://www.flickr.com/services/api/flickr.urls.getGroup.html */
     1665            /* https://www.flickr.com/services/api/flickr.urls.getGroup.html */
    16591666            $this->request("flickr.urls.getGroup", array("group_id"=>$group_id));
    16601667            return $this->parsed_response ? $this->parsed_response['group']['url'] : false;
    … …  
    16621669
    16631670        function urls_getUserPhotos ($user_id = NULL) {
    1664             /* http://www.flickr.com/services/api/flickr.urls.getUserPhotos.html */
     1671            /* https://www.flickr.com/services/api/flickr.urls.getUserPhotos.html */
    16651672            $this->request("flickr.urls.getUserPhotos", array("user_id"=>$user_id));
    16661673            return $this->parsed_response ? $this->parsed_response['user']['url'] : false;
    … …  
    16681675
    16691676        function urls_getUserProfile ($user_id = NULL) {
    1670             /* http://www.flickr.com/services/api/flickr.urls.getUserProfile.html */
     1677            /* https://www.flickr.com/services/api/flickr.urls.getUserProfile.html */
    16711678            $this->request("flickr.urls.getUserProfile", array("user_id"=>$user_id));
    16721679            return $this->parsed_response ? $this->parsed_response['user']['url'] : false;
    16731680        }
    1674        
     1681
    16751682        function urls_lookupGallery ($url) {
    1676             /* http://www.flickr.com/services/api/flickr.urls.lookupGallery.html */
     1683            /* https://www.flickr.com/services/api/flickr.urls.lookupGallery.html */
    16771684            return $this->call('flickr.urls.lookupGallery', array('url' => $url));
    16781685        }
    16791686
    16801687        function urls_lookupGroup ($url) {
    1681             /* http://www.flickr.com/services/api/flickr.urls.lookupGroup.html */
     1688            /* https://www.flickr.com/services/api/flickr.urls.lookupGroup.html */
    16821689            $this->request("flickr.urls.lookupGroup", array("url"=>$url));
    16831690            return $this->parsed_response ? $this->parsed_response['group'] : false;
    … …  
    16851692
    16861693        function urls_lookupUser ($url) {
    1687             /* http://www.flickr.com/services/api/flickr.photos.notes.edit.html */
     1694            /* https://www.flickr.com/services/api/flickr.photos.notes.edit.html */
    16881695            $this->request("flickr.urls.lookupUser", array("url"=>$url));
    16891696            return $this->parsed_response ? $this->parsed_response['user'] : false;
    … …  
    16961703        var $phpFlickr, $per_page, $method, $args, $results, $global_phpFlickr;
    16971704        var $total = null, $page = 0, $pages = null, $photos, $_extra = null;
    1698        
    1699        
     1705
     1706
    17001707        function phpFlickr_pager($phpFlickr, $method = null, $args = null, $per_page = 30) {
    17011708            $this->per_page = $per_page;
    … …  
    17041711            $this->set_phpFlickr($phpFlickr);
    17051712        }
    1706        
     1713
    17071714        function set_phpFlickr($phpFlickr) {
    17081715            if ( is_a($phpFlickr, 'phpFlickr') ) {
    … …  
    17151722            }
    17161723        }
    1717        
     1724
    17181725        function __sleep() {
    17191726            return array(
    … …  
    17251732            );
    17261733        }
    1727        
     1734
    17281735        function load($page) {
    17291736            $allowed_methods = array(
    … …  
    17321739            );
    17331740            if ( !in_array($this->method, array_keys($allowed_methods)) ) return false;
    1734            
     1741
    17351742            if ( $this->phpFlickr->cache ) {
    17361743                $min = ($page - 1) * $this->per_page;
    … …  
    17571764                        $this->total = $this->results['total'];
    17581765                        $this->pages = ceil($this->results['total'] / $this->per_page);
    1759                        
     1766
    17601767                        $this->args['page'] = floor($min/500) + 2;
    17611768                        $this->results = $this->phpFlickr->call($this->method, $this->args);
    … …  
    17751782                if ( $this->results ) {
    17761783                    $this->results = $this->results[$allowed_methods[$this->method]];
    1777                    
     1784
    17781785                    $this->photos = $this->results['photo'];
    17791786                    $this->total = $this->results['total'];
    … …  
    17851792            }
    17861793        }
    1787        
     1794
    17881795        function get($page = null) {
    17891796            if ( is_null($page) ) {
    … …  
    17991806            return array();
    18001807        }
    1801        
     1808
    18021809        function next() {
    18031810            $this->page++;
    … …  
    18091816            return array();
    18101817        }
    1811        
     1818
    18121819    }
    18131820}

  • wp2flickr/trunk/readme.txt

    r919244 r959871  
    55Requires at least: 3.8
    66Tested up to: 3.9.1
    7 Stable tag: 0.13
     7Stable tag: 0.14
    88
    99Uploads photos from WordPress posts to Flickr.
    … …  
    3131== Changelog ==
    3232
     33= 0.14 =
     34* Flickr HTTPS endpoints (CURL options and some regexpr un phpFlickr) 
     35
    3336= 0.13 =
    3437* Flickr HTTPS endpoints (Flickr API Going SSL-Only) 

  • wp2flickr/trunk/wp2flickr.php

    r919244 r959871  
    44    Plugin URI: http://wp2flickr.com/
    55    Description: upload photos from posts to flickr (standard media or YAPB)
    6     Version: 0.13
     6    Version: 0.14
    77    Author: Fran Sim&oacute;
    88    Author URI: http://fransimo.info/
Note: See TracChangeset for help on using the changeset viewer.