Changeset 28824


Ignore:
Timestamp:
06/28/14 11:56:32 (5 years ago)
Author:
mistic100
Message:

update phpFlickr lib

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/flickr2piwigo/include/phpFlickr/phpFlickr.php

    r16063 r28824  
    11<?php 
    2 /* phpFlickr Class 3.1 
     2/* phpFlickr 
    33 * Written by Dan Coulter (dan@dancoulter.com) 
    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  * Modified on June 25th 2012 by Mistic (http://www.strangeplanet.fr) : 
    17  *    - add get_biggest_size() method 
    18  *    - update buildPhotoURL() methos with all available sizes 
     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/>. 
    1918 * 
    20  */  
     19 */ 
    2120if ( !class_exists('phpFlickr') ) { 
    2221        if (session_id() == "") { 
     
    2726                var $api_key; 
    2827                var $secret; 
    29                  
    30                 var $rest_endpoint = 'http://api.flickr.com/services/rest/'; 
    31                 var $upload_endpoint = 'http://api.flickr.com/services/upload/'; 
    32                 var $replace_endpoint = 'http://api.flickr.com/services/replace/'; 
     28 
     29                var $rest_endpoint = 'https://api.flickr.com/services/rest/'; 
     30                var $upload_endpoint = 'https://up.flickr.com/services/upload/'; 
     31                var $replace_endpoint = 'https://up.flickr.com/services/replace/'; 
    3332                var $req; 
    3433                var $response; 
     
    6261                function phpFlickr ($api_key, $secret = NULL, $die_on_error = false) { 
    6362                        //The API Key must be set before any calls can be made.  You can 
    64                         //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 
    6564                        $this->api_key = $api_key; 
    6665                        $this->secret = $secret; 
     
    8382                        if ($type == 'db') { 
    8483                                if ( preg_match('|mysql://([^:]*):([^@]*)@([^/]*)/(.*)|', $connection, $matches) ) { 
    85                                         //Array ( [0] => mysql://user:password@server/database [1] => user [2] => password [3] => server [4] => database )  
    86                                         $db = mysql_connect($matches[3], $matches[1], $matches[2]); 
    87                                         mysql_select_db($matches[4], $db); 
    88                                          
     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 
    8988                                        /* 
    9089                                         * If high performance is crucial, you can easily comment 
    9190                                         * out this query once you've created your database table. 
    9291                                         */ 
    93                                         mysql_query(" 
     92                                        mysqli_query($db, " 
    9493                                                CREATE TABLE IF NOT EXISTS `$table` ( 
    9594                                                        `request` CHAR( 35 ) NOT NULL , 
     
    9796                                                        `expiration` DATETIME NOT NULL , 
    9897                                                        INDEX ( `request` ) 
    99                                                 ) TYPE = MYISAM 
    100                                         ", $db); 
    101                                          
    102                                         $result = mysql_query("SELECT COUNT(*) FROM $table", $db); 
    103                                         $result = mysql_fetch_row($result); 
     98                                                ) 
     99                                        "); 
     100 
     101                                        $result = mysqli_query($db, "SELECT COUNT(*) FROM $table"); 
     102                                        $result = mysqli_fetch_row($result); 
    104103                                        if ( $result[0] > $this->max_cache_rows ) { 
    105                                                 mysql_query("DELETE FROM $table WHERE expiration < DATE_SUB(NOW(), INTERVAL $cache_expire second)", $db); 
    106                                                 mysql_query('OPTIMIZE TABLE ' . $this->cache_table, $db); 
     104                                                mysqli_query($db, "DELETE FROM $table WHERE expiration < DATE_SUB(NOW(), INTERVAL $cache_expire second)"); 
     105                                                mysqli_query($db, 'OPTIMIZE TABLE ' . $this->cache_table); 
    107106                                        } 
    108107                                        $this->cache = 'db'; 
     
    143142                        $this->cache_request = $request; 
    144143                        if ($this->cache == 'db') { 
    145                                 $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); 
    146                                 if ( mysql_num_rows($result) ) { 
    147                                         $result = mysql_fetch_assoc($result); 
     144                                $result = mysqli_query($this->cache_db, "SELECT response FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "' AND DATE_SUB(NOW(), INTERVAL " . (int) $this->cache_expire . " SECOND) < expiration"); 
     145                                if ( mysqli_num_rows($result) ) { 
     146                                        $result = mysqli_fetch_assoc($result); 
    148147                                        return $result['response']; 
    149148                                } else { 
     
    176175                        if ($this->cache == 'db') { 
    177176                                //$this->cache_db->query("DELETE FROM $this->cache_table WHERE request = '$reqhash'"); 
    178                                 $result = mysql_query("SELECT COUNT(*) FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "'", $this->cache_db); 
    179                                 $result = mysql_fetch_row($result); 
     177                                $result = mysqli_query($this->cache_db, "SELECT COUNT(*) FROM " . $this->cache_table . " WHERE request = '" . $reqhash . "'"); 
     178                                $result = mysqli_fetch_row($result); 
    180179                                if ( $result[0] ) { 
    181180                                        $sql = "UPDATE " . $this->cache_table . " SET response = '" . str_replace("'", "''", $response) . "', expiration = '" . strftime("%Y-%m-%d %H:%M:%S") . "' WHERE request = '" . $reqhash . "'"; 
    182                                         mysql_query($sql, $this->cache_db); 
     181                                        mysqli_query($this->cache_db, $sql); 
    183182                                } else { 
    184183                                        $sql = "INSERT INTO " . $this->cache_table . " (request, response, expiration) VALUES ('$reqhash', '" . str_replace("'", "''", $response) . "', '" . strftime("%Y-%m-%d %H:%M:%S") . "')"; 
    185                                         mysql_query($sql, $this->cache_db); 
     184                                        mysqli_query($this->cache_db, $sql); 
    186185                                } 
    187186                        } elseif ($this->cache == "fs") { 
     
    196195                        return false; 
    197196                } 
    198                  
     197 
    199198                function setCustomPost ( $function ) { 
    200199                        $this->custom_post = $function; 
    201200                } 
    202                  
     201 
    203202                function post ($data, $type = null) { 
    204203                        if ( is_null($type) ) { 
    205204                                $url = $this->rest_endpoint; 
    206205                        } 
    207                          
     206 
    208207                        if ( !is_null($this->custom_post) ) { 
    209208                                return call_user_func($this->custom_post, $url, $data); 
    210209                        } 
    211                          
    212                         if ( !preg_match("|http://(.*?)(/.*)|", $url, $matches) ) { 
     210 
     211                        if ( !preg_match("|https://(.*?)(/.*)|", $url, $matches) ) { 
    213212                                die('There was some problem figuring out your endpoint'); 
    214213                        } 
    215                          
     214 
    216215                        if ( function_exists('curl_init') ) { 
    217216                                // Has curl. Use it! 
     
    228227                                } 
    229228                                $data = implode('&', $data); 
    230                          
     229 
    231230                                $fp = @pfsockopen($matches[1], 80); 
    232231                                if (!$fp) { 
     
    263262                        return $response; 
    264263                } 
    265                  
     264 
    266265                function request ($command, $args = array(), $nocache = false) 
    267266                { 
     
    296295                                $this->cache($args, $this->response); 
    297296                        } 
    298                          
     297 
    299298                        /* 
    300299                         * Uncomment this line (and comment out the next one) if you're doing large queries 
     
    356355 
    357356                /* These functions are front ends for the flickr calls */ 
    358     function get_biggest_size($image_id, $limit='original') 
    359     { 
    360       $sizes = array( 
    361         "square"     => "Square", 
    362         "square_75"  => "Square", 
    363         "square_150" => "Large Square", 
    364         "thumbnail"  => "Thumbnail", 
    365         "small"      => "Small", 
    366         "small_240"  => "Small", 
    367         "small_320"  => "Small 320", 
    368         "medium"     => "Medium", 
    369         "medium_500" => "Medium", 
    370         "medium_640" => "Medium 640", 
    371         "medium_800" => "Medium 800", 
    372         "large"      => "Large", 
    373         "large_1024" => "Large", 
    374         "large_1600" => "Large 1600", 
    375         "large_2048" => "Large 2048", 
    376         "original"   => "Original", 
    377         ); 
    378          
    379       if (!array_key_exists($limit, $sizes)) $limit = 'medium'; 
    380       $limit = array_search($limit, array_keys($sizes)); 
    381        
    382       $img_sizes = $this->photos_getSizes($image_id); 
    383       $img_sizes = array_reverse($img_sizes); 
    384        
    385       foreach ($img_sizes as $size) 
    386       { 
    387         if ($limit >= array_search($size['label'], array_values($sizes))) 
    388         { 
    389           return $size['source']; 
    390         } 
    391       } 
    392        
    393       return null; 
    394     } 
    395  
     357                function get_biggest_size($image_id, $limit='original') 
     358                { 
     359                        $sizes = array( 
     360                                "square"     => "Square", 
     361                                "square_75"  => "Square", 
     362                                "square_150" => "Large Square", 
     363                                "thumbnail"  => "Thumbnail", 
     364                                "small"      => "Small", 
     365                                "small_240"  => "Small", 
     366                                "small_320"  => "Small 320", 
     367                                "medium"     => "Medium", 
     368                                "medium_500" => "Medium", 
     369                                "medium_640" => "Medium 640", 
     370                                "medium_800" => "Medium 800", 
     371                                "large"      => "Large", 
     372                                "large_1024" => "Large", 
     373                                "large_1600" => "Large 1600", 
     374                                "large_2048" => "Large 2048", 
     375                                "original"   => "Original", 
     376                                ); 
     377 
     378                        if (!array_key_exists($limit, $sizes)) $limit = 'medium'; 
     379                        $limit = array_search($limit, array_keys($sizes)); 
     380 
     381                        $img_sizes = $this->photos_getSizes($image_id); 
     382                        $img_sizes = array_reverse($img_sizes); 
     383 
     384                        foreach ($img_sizes as $size) 
     385                        { 
     386                                if ($limit >= array_search($size['label'], array_values($sizes))) 
     387                                { 
     388                                        return $size['source']; 
     389                                } 
     390                        } 
     391 
     392                        return null; 
     393                } 
     394                 
    396395                function buildPhotoURL ($photo, $size = "Medium") { 
    397396                        //receives an array (can use the individual photo data returned 
     
    399398                        //file size exists) 
    400399                        $sizes = array( 
    401         "square" => "_s", 
    402         "square_75" => "_s", 
    403         "square_150" => "_q", 
    404         "thumbnail" => "_t", 
    405         "small" => "_m", 
    406         "small_240" => "_m", 
    407         "small_320" => "_n", 
    408         "medium" => "", 
    409         "medium_500" => "", 
    410         "medium_640" => "_z", 
    411         "medium_800" => "_c", 
    412         "large" => "_b", 
    413         "large_1024" => "_b", 
    414         "large_1600" => "_h", 
    415         "large_2048" => "_k", 
    416         "original" => "_o", 
     400                                "square" => "_s", 
     401                                "square_75" => "_s", 
     402                                "square_150" => "_q", 
     403                                "thumbnail" => "_t", 
     404                                "small" => "_m", 
     405                                "small_240" => "_m", 
     406                                "small_320" => "_n", 
     407                                "medium" => "", 
     408                                "medium_500" => "", 
     409                                "medium_640" => "_z", 
     410                                "medium_800" => "_c", 
     411                                "large" => "_b", 
     412                                "large_1024" => "_b", 
     413                                "large_1600" => "_h", 
     414                                "large_2048" => "_k", 
     415                                "original" => "_o", 
    417416                        ); 
    418                          
     417 
    419418                        $size = strtolower($size); 
    420419                        if (!array_key_exists($size, $sizes)) { 
    421420                                $size = "medium"; 
    422421                        } 
    423                          
     422 
    424423                        if ($size == "original") { 
    425                                 $url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['originalsecret'] . "_o" . "." . $photo['originalformat']; 
     424                                $url = "https://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['originalsecret'] . "_o" . "." . $photo['originalformat']; 
    426425                        } else { 
    427                                 $url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . $sizes[$size] . ".jpg"; 
     426                                $url = "https://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . $sizes[$size] . ".jpg"; 
    428427                        } 
    429428                        return $url; 
    430                 } 
    431  
    432                 function getFriendlyGeodata ($lat, $lon) { 
    433                         /* I've added this method to get the friendly geodata (i.e. 'in New York, NY') that the 
    434                          * website provides, but isn't available in the API. I'm providing this service as long 
    435                          * as it doesn't flood my server with requests and crash it all the time. 
    436                          */ 
    437                         return unserialize(file_get_contents('http://phpflickr.com/geodata/?format=php&lat=' . $lat . '&lon=' . $lon)); 
    438429                } 
    439430 
     
    466457                                $photo = realpath($photo); 
    467458                                $args['photo'] = '@' . $photo; 
    468                                  
     459 
    469460 
    470461                                $curl = curl_init($this->upload_endpoint); 
     
    475466                                $this->response = $response; 
    476467                                curl_close($curl); 
    477                                  
     468 
    478469                                $rsp = explode("\n", $response); 
    479470                                foreach ($rsp as $line) { 
     
    528519                                $photo = realpath($photo); 
    529520                                $args['photo'] = '@' . $photo; 
    530                                  
     521 
    531522 
    532523                                $curl = curl_init($this->upload_endpoint); 
     
    537528                                $this->response = $response; 
    538529                                curl_close($curl); 
    539                                  
     530 
    540531                                $rsp = explode("\n", $response); 
    541532                                foreach ($rsp as $line) { 
    542                                         if (ereg('<err code="([0-9]+)" msg="(.*)"', $line, $match)) { 
     533                                        if (preg_match('/<err code="([0-9]+)" msg="(.*)"/', $line, $match)) { 
    543534                                                if ($this->die_on_error) 
    544535                                                        die("The Flickr API returned the following error: #{$match[1]} - {$match[2]}"); 
     
    549540                                                        return false; 
    550541                                                } 
    551                                         } elseif (ereg("<ticketid>(.*)</", $line, $match)) { 
     542                                        } elseif (preg_match("/<ticketid>(.*)</", $line, $match)) { 
    552543                                                $this->error_code = false; 
    553544                                                $this->error_msg = false; 
     
    589580                                $photo = realpath($photo); 
    590581                                $args['photo'] = '@' . $photo; 
    591                                  
     582 
    592583 
    593584                                $curl = curl_init($this->replace_endpoint); 
     
    598589                                $this->response = $response; 
    599590                                curl_close($curl); 
    600                                  
     591 
    601592                                if ($async == 1) 
    602593                                        $find = 'ticketid'; 
     
    638629                                } 
    639630                                $api_sig = md5($this->secret . "api_key" . $this->api_key . "perms" . $perms); 
    640                                  
     631 
    641632                                if ($this->service == "23") { 
    642633                                        header("Location: http://www.23hq.com/services/auth/?api_key=" . $this->api_key . "&perms=" . $perms . "&api_sig=". $api_sig); 
    643634                                } else { 
    644                                         header("Location: http://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&perms=" . $perms . "&api_sig=". $api_sig); 
     635                                        header("Location: https://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&perms=" . $perms . "&api_sig=". $api_sig); 
    645636                                } 
    646637                                exit; 
     
    650641                                $rsp = $this->auth_checkToken(); 
    651642                                if ($this->error_code !== false) { 
    652           // file_put_contents('et2.txt', $this->error_msg); 
    653643                                        unset($_SESSION['phpFlickr_auth_token']); 
    654644                                        $this->auth($perms, $remember_uri); 
     
    657647                                return $rsp['perms']; 
    658648                        } 
     649                } 
     650 
     651                function auth_url($frob, $perms = 'read') { 
     652                        $sig = md5(sprintf('%sapi_key%sfrob%sperms%s', $this->secret, $this->api_key, $frob, $perms)); 
     653                        return sprintf('https://flickr.com/services/auth/?api_key=%s&perms=%s&frob=%s&api_sig=%s', $this->api_key, $perms, $frob, $sig); 
    659654                } 
    660655 
     
    685680                /* Activity methods */ 
    686681                function activity_userComments ($per_page = NULL, $page = NULL) { 
    687                         /* http://www.flickr.com/services/api/flickr.activity.userComments.html */ 
     682                        /* https://www.flickr.com/services/api/flickr.activity.userComments.html */ 
    688683                        $this->request('flickr.activity.userComments', array("per_page" => $per_page, "page" => $page)); 
    689684                        return $this->parsed_response ? $this->parsed_response['items']['item'] : false; 
     
    691686 
    692687                function activity_userPhotos ($timeframe = NULL, $per_page = NULL, $page = NULL) { 
    693                         /* http://www.flickr.com/services/api/flickr.activity.userPhotos.html */ 
     688                        /* https://www.flickr.com/services/api/flickr.activity.userPhotos.html */ 
    694689                        $this->request('flickr.activity.userPhotos', array("timeframe" => $timeframe, "per_page" => $per_page, "page" => $page)); 
    695690                        return $this->parsed_response ? $this->parsed_response['items']['item'] : false; 
     
    698693                /* Authentication methods */ 
    699694                function auth_checkToken () { 
    700                         /* http://www.flickr.com/services/api/flickr.auth.checkToken.html */ 
     695                        /* https://www.flickr.com/services/api/flickr.auth.checkToken.html */ 
    701696                        $this->request('flickr.auth.checkToken'); 
    702697                        return $this->parsed_response ? $this->parsed_response['auth'] : false; 
     
    704699 
    705700                function auth_getFrob () { 
    706                         /* http://www.flickr.com/services/api/flickr.auth.getFrob.html */ 
     701                        /* https://www.flickr.com/services/api/flickr.auth.getFrob.html */ 
    707702                        $this->request('flickr.auth.getFrob'); 
    708703                        return $this->parsed_response ? $this->parsed_response['frob'] : false; 
     
    710705 
    711706                function auth_getFullToken ($mini_token) { 
    712                         /* http://www.flickr.com/services/api/flickr.auth.getFullToken.html */ 
     707                        /* https://www.flickr.com/services/api/flickr.auth.getFullToken.html */ 
    713708                        $this->request('flickr.auth.getFullToken', array('mini_token'=>$mini_token)); 
    714709                        return $this->parsed_response ? $this->parsed_response['auth'] : false; 
     
    716711 
    717712                function auth_getToken ($frob) { 
    718                         /* http://www.flickr.com/services/api/flickr.auth.getToken.html */ 
     713                        /* https://www.flickr.com/services/api/flickr.auth.getToken.html */ 
    719714                        $this->request('flickr.auth.getToken', array('frob'=>$frob)); 
    720715                        $_SESSION['phpFlickr_auth_token'] = $this->parsed_response['auth']['token']; 
     
    724719                /* Blogs methods */ 
    725720                function blogs_getList ($service = NULL) { 
    726                         /* http://www.flickr.com/services/api/flickr.blogs.getList.html */ 
     721                        /* https://www.flickr.com/services/api/flickr.blogs.getList.html */ 
    727722                        $rsp = $this->call('flickr.blogs.getList', array('service' => $service)); 
    728723                        return $rsp['blogs']['blog']; 
    729724                } 
    730                  
     725 
    731726                function blogs_getServices () { 
    732                         /* http://www.flickr.com/services/api/flickr.blogs.getServices.html */ 
     727                        /* https://www.flickr.com/services/api/flickr.blogs.getServices.html */ 
    733728                        return $this->call('flickr.blogs.getServices', array()); 
    734729                } 
    735730 
    736731                function blogs_postPhoto ($blog_id = NULL, $photo_id, $title, $description, $blog_password = NULL, $service = NULL) { 
    737                         /* http://www.flickr.com/services/api/flickr.blogs.postPhoto.html */ 
     732                        /* https://www.flickr.com/services/api/flickr.blogs.postPhoto.html */ 
    738733                        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)); 
    739734                } 
     
    741736                /* Collections Methods */ 
    742737                function collections_getInfo ($collection_id) { 
    743                         /* http://www.flickr.com/services/api/flickr.collections.getInfo.html */ 
     738                        /* https://www.flickr.com/services/api/flickr.collections.getInfo.html */ 
    744739                        return $this->call('flickr.collections.getInfo', array('collection_id' => $collection_id)); 
    745740                } 
    746741 
    747742                function collections_getTree ($collection_id = NULL, $user_id = NULL) { 
    748                         /* http://www.flickr.com/services/api/flickr.collections.getTree.html */ 
     743                        /* https://www.flickr.com/services/api/flickr.collections.getTree.html */ 
    749744                        return $this->call('flickr.collections.getTree', array('collection_id' => $collection_id, 'user_id' => $user_id)); 
    750745                } 
    751                  
     746 
    752747                /* Commons Methods */ 
    753748                function commons_getInstitutions () { 
    754                         /* http://www.flickr.com/services/api/flickr.commons.getInstitutions.html */ 
     749                        /* https://www.flickr.com/services/api/flickr.commons.getInstitutions.html */ 
    755750                        return $this->call('flickr.commons.getInstitutions', array()); 
    756751                } 
    757                  
     752 
    758753                /* Contacts Methods */ 
    759754                function contacts_getList ($filter = NULL, $page = NULL, $per_page = NULL) { 
    760                         /* http://www.flickr.com/services/api/flickr.contacts.getList.html */ 
     755                        /* https://www.flickr.com/services/api/flickr.contacts.getList.html */ 
    761756                        $this->request('flickr.contacts.getList', array('filter'=>$filter, 'page'=>$page, 'per_page'=>$per_page)); 
    762757                        return $this->parsed_response ? $this->parsed_response['contacts'] : false; 
     
    764759 
    765760                function contacts_getPublicList ($user_id, $page = NULL, $per_page = NULL) { 
    766                         /* http://www.flickr.com/services/api/flickr.contacts.getPublicList.html */ 
     761                        /* https://www.flickr.com/services/api/flickr.contacts.getPublicList.html */ 
    767762                        $this->request('flickr.contacts.getPublicList', array('user_id'=>$user_id, 'page'=>$page, 'per_page'=>$per_page)); 
    768763                        return $this->parsed_response ? $this->parsed_response['contacts'] : false; 
    769764                } 
    770                  
     765 
    771766                function contacts_getListRecentlyUploaded ($date_lastupload = NULL, $filter = NULL) { 
    772                         /* http://www.flickr.com/services/api/flickr.contacts.getListRecentlyUploaded.html */ 
     767                        /* https://www.flickr.com/services/api/flickr.contacts.getListRecentlyUploaded.html */ 
    773768                        return $this->call('flickr.contacts.getListRecentlyUploaded', array('date_lastupload' => $date_lastupload, 'filter' => $filter)); 
    774769                } 
     
    776771                /* Favorites Methods */ 
    777772                function favorites_add ($photo_id) { 
    778                         /* http://www.flickr.com/services/api/flickr.favorites.add.html */ 
     773                        /* https://www.flickr.com/services/api/flickr.favorites.add.html */ 
    779774                        $this->request('flickr.favorites.add', array('photo_id'=>$photo_id), TRUE); 
    780775                        return $this->parsed_response ? true : false; 
     
    782777 
    783778                function favorites_getList ($user_id = NULL, $jump_to = NULL, $min_fave_date = NULL, $max_fave_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) { 
    784                         /* http://www.flickr.com/services/api/flickr.favorites.getList.html */ 
     779                        /* https://www.flickr.com/services/api/flickr.favorites.getList.html */ 
    785780                        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)); 
    786781                } 
    787                  
     782 
    788783                function favorites_getPublicList ($user_id, $jump_to = NULL, $min_fave_date = NULL, $max_fave_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) { 
    789                         /* http://www.flickr.com/services/api/flickr.favorites.getPublicList.html */ 
     784                        /* https://www.flickr.com/services/api/flickr.favorites.getPublicList.html */ 
    790785                        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)); 
    791786                } 
    792                  
     787 
    793788                function favorites_remove ($photo_id, $user_id = NULL) { 
    794                         /* http://www.flickr.com/services/api/flickr.favorites.remove.html */ 
     789                        /* https://www.flickr.com/services/api/flickr.favorites.remove.html */ 
    795790                        $this->request("flickr.favorites.remove", array('photo_id' => $photo_id, 'user_id' => $user_id), TRUE); 
    796791                        return $this->parsed_response ? true : false; 
     
    799794                /* Galleries Methods */ 
    800795                function galleries_addPhoto ($gallery_id, $photo_id, $comment = NULL) { 
    801                         /* http://www.flickr.com/services/api/flickr.galleries.addPhoto.html */ 
     796                        /* https://www.flickr.com/services/api/flickr.galleries.addPhoto.html */ 
    802797                        return $this->call('flickr.galleries.addPhoto', array('gallery_id' => $gallery_id, 'photo_id' => $photo_id, 'comment' => $comment)); 
    803798                } 
    804                  
     799 
    805800                function galleries_create ($title, $description, $primary_photo_id = NULL) { 
    806                         /* http://www.flickr.com/services/api/flickr.galleries.create.html */ 
     801                        /* https://www.flickr.com/services/api/flickr.galleries.create.html */ 
    807802                        return $this->call('flickr.galleries.create', array('title' => $title, 'description' => $description, 'primary_photo_id' => $primary_photo_id)); 
    808803                } 
    809804 
    810805                function galleries_editMeta ($gallery_id, $title, $description = NULL) { 
    811                         /* http://www.flickr.com/services/api/flickr.galleries.editMeta.html */ 
     806                        /* https://www.flickr.com/services/api/flickr.galleries.editMeta.html */ 
    812807                        return $this->call('flickr.galleries.editMeta', array('gallery_id' => $gallery_id, 'title' => $title, 'description' => $description)); 
    813808                } 
    814809 
    815810                function galleries_editPhoto ($gallery_id, $photo_id, $comment) { 
    816                         /* http://www.flickr.com/services/api/flickr.galleries.editPhoto.html */ 
     811                        /* https://www.flickr.com/services/api/flickr.galleries.editPhoto.html */ 
    817812                        return $this->call('flickr.galleries.editPhoto', array('gallery_id' => $gallery_id, 'photo_id' => $photo_id, 'comment' => $comment)); 
    818813                } 
    819814 
    820815                function galleries_editPhotos ($gallery_id, $primary_photo_id, $photo_ids) { 
    821                         /* http://www.flickr.com/services/api/flickr.galleries.editPhotos.html */ 
     816                        /* https://www.flickr.com/services/api/flickr.galleries.editPhotos.html */ 
    822817                        return $this->call('flickr.galleries.editPhotos', array('gallery_id' => $gallery_id, 'primary_photo_id' => $primary_photo_id, 'photo_ids' => $photo_ids)); 
    823818                } 
    824819 
    825820                function galleries_getInfo ($gallery_id) { 
    826                         /* http://www.flickr.com/services/api/flickr.galleries.getInfo.html */ 
     821                        /* https://www.flickr.com/services/api/flickr.galleries.getInfo.html */ 
    827822                        return $this->call('flickr.galleries.getInfo', array('gallery_id' => $gallery_id)); 
    828823                } 
    829824 
    830825                function galleries_getList ($user_id, $per_page = NULL, $page = NULL) { 
    831                         /* http://www.flickr.com/services/api/flickr.galleries.getList.html */ 
     826                        /* https://www.flickr.com/services/api/flickr.galleries.getList.html */ 
    832827                        return $this->call('flickr.galleries.getList', array('user_id' => $user_id, 'per_page' => $per_page, 'page' => $page)); 
    833828                } 
    834829 
    835830                function galleries_getListForPhoto ($photo_id, $per_page = NULL, $page = NULL) { 
    836                         /* http://www.flickr.com/services/api/flickr.galleries.getListForPhoto.html */ 
     831                        /* https://www.flickr.com/services/api/flickr.galleries.getListForPhoto.html */ 
    837832                        return $this->call('flickr.galleries.getListForPhoto', array('photo_id' => $photo_id, 'per_page' => $per_page, 'page' => $page)); 
    838833                } 
    839                          
     834 
    840835                function galleries_getPhotos ($gallery_id, $extras = NULL, $per_page = NULL, $page = NULL) { 
    841                         /* http://www.flickr.com/services/api/flickr.galleries.getPhotos.html */ 
     836                        /* https://www.flickr.com/services/api/flickr.galleries.getPhotos.html */ 
    842837                        return $this->call('flickr.galleries.getPhotos', array('gallery_id' => $gallery_id, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page)); 
    843838                } 
     
    845840                /* Groups Methods */ 
    846841                function groups_browse ($cat_id = NULL) { 
    847                         /* http://www.flickr.com/services/api/flickr.groups.browse.html */ 
     842                        /* https://www.flickr.com/services/api/flickr.groups.browse.html */ 
    848843                        $this->request("flickr.groups.browse", array("cat_id"=>$cat_id)); 
    849844                        return $this->parsed_response ? $this->parsed_response['category'] : false; 
     
    851846 
    852847                function groups_getInfo ($group_id, $lang = NULL) { 
    853                         /* http://www.flickr.com/services/api/flickr.groups.getInfo.html */ 
     848                        /* https://www.flickr.com/services/api/flickr.groups.getInfo.html */ 
    854849                        return $this->call('flickr.groups.getInfo', array('group_id' => $group_id, 'lang' => $lang)); 
    855850                } 
    856851 
    857852                function groups_search ($text, $per_page = NULL, $page = NULL) { 
    858                         /* http://www.flickr.com/services/api/flickr.groups.search.html */ 
     853                        /* https://www.flickr.com/services/api/flickr.groups.search.html */ 
    859854                        $this->request("flickr.groups.search", array("text"=>$text,"per_page"=>$per_page,"page"=>$page)); 
    860855                        return $this->parsed_response ? $this->parsed_response['groups'] : false; 
     
    863858                /* Groups Members Methods */ 
    864859                function groups_members_getList ($group_id, $membertypes = NULL, $per_page = NULL, $page = NULL) { 
    865                         /* http://www.flickr.com/services/api/flickr.groups.members.getList.html */ 
     860                        /* https://www.flickr.com/services/api/flickr.groups.members.getList.html */ 
    866861                        return $this->call('flickr.groups.members.getList', array('group_id' => $group_id, 'membertypes' => $membertypes, 'per_page' => $per_page, 'page' => $page)); 
    867862                } 
    868                  
     863 
    869864                /* Groups Pools Methods */ 
    870865                function groups_pools_add ($photo_id, $group_id) { 
    871                         /* http://www.flickr.com/services/api/flickr.groups.pools.add.html */ 
     866                        /* https://www.flickr.com/services/api/flickr.groups.pools.add.html */ 
    872867                        $this->request("flickr.groups.pools.add", array("photo_id"=>$photo_id, "group_id"=>$group_id), TRUE); 
    873868                        return $this->parsed_response ? true : false; 
     
    875870 
    876871                function groups_pools_getContext ($photo_id, $group_id, $num_prev = NULL, $num_next = NULL) { 
    877                         /* http://www.flickr.com/services/api/flickr.groups.pools.getContext.html */ 
     872                        /* https://www.flickr.com/services/api/flickr.groups.pools.getContext.html */ 
    878873                        return $this->call('flickr.groups.pools.getContext', array('photo_id' => $photo_id, 'group_id' => $group_id, 'num_prev' => $num_prev, 'num_next' => $num_next)); 
    879874                } 
    880                  
     875 
    881876                function groups_pools_getGroups ($page = NULL, $per_page = NULL) { 
    882                         /* http://www.flickr.com/services/api/flickr.groups.pools.getGroups.html */ 
     877                        /* https://www.flickr.com/services/api/flickr.groups.pools.getGroups.html */ 
    883878                        $this->request("flickr.groups.pools.getGroups", array('page'=>$page, 'per_page'=>$per_page)); 
    884879                        return $this->parsed_response ? $this->parsed_response['groups'] : false; 
     
    886881 
    887882                function groups_pools_getPhotos ($group_id, $tags = NULL, $user_id = NULL, $jump_to = NULL, $extras = NULL, $per_page = NULL, $page = NULL) { 
    888                         /* http://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html */ 
     883                        /* https://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html */ 
    889884                        if (is_array($extras)) { 
    890885                                $extras = implode(",", $extras); 
     
    894889 
    895890                function groups_pools_remove ($photo_id, $group_id) { 
    896                         /* http://www.flickr.com/services/api/flickr.groups.pools.remove.html */ 
     891                        /* https://www.flickr.com/services/api/flickr.groups.pools.remove.html */ 
    897892                        $this->request("flickr.groups.pools.remove", array("photo_id"=>$photo_id, "group_id"=>$group_id), TRUE); 
    898893                        return $this->parsed_response ? true : false; 
     
    901896                /* Interestingness methods */ 
    902897                function interestingness_getList ($date = NULL, $use_panda = NULL, $extras = NULL, $per_page = NULL, $page = NULL) { 
    903                         /* http://www.flickr.com/services/api/flickr.interestingness.getList.html */ 
     898                        /* https://www.flickr.com/services/api/flickr.interestingness.getList.html */ 
    904899                        if (is_array($extras)) { 
    905900                                $extras = implode(",", $extras); 
     
    911906                /* Machine Tag methods */ 
    912907                function machinetags_getNamespaces ($predicate = NULL, $per_page = NULL, $page = NULL) { 
    913                         /* http://www.flickr.com/services/api/flickr.machinetags.getNamespaces.html */ 
     908                        /* https://www.flickr.com/services/api/flickr.machinetags.getNamespaces.html */ 
    914909                        return $this->call('flickr.machinetags.getNamespaces', array('predicate' => $predicate, 'per_page' => $per_page, 'page' => $page)); 
    915910                } 
    916911 
    917912                function machinetags_getPairs ($namespace = NULL, $predicate = NULL, $per_page = NULL, $page = NULL) { 
    918                         /* http://www.flickr.com/services/api/flickr.machinetags.getPairs.html */ 
     913                        /* https://www.flickr.com/services/api/flickr.machinetags.getPairs.html */ 
    919914                        return $this->call('flickr.machinetags.getPairs', array('namespace' => $namespace, 'predicate' => $predicate, 'per_page' => $per_page, 'page' => $page)); 
    920915                } 
    921916 
    922917                function machinetags_getPredicates ($namespace = NULL, $per_page = NULL, $page = NULL) { 
    923                         /* http://www.flickr.com/services/api/flickr.machinetags.getPredicates.html */ 
     918                        /* https://www.flickr.com/services/api/flickr.machinetags.getPredicates.html */ 
    924919                        return $this->call('flickr.machinetags.getPredicates', array('namespace' => $namespace, 'per_page' => $per_page, 'page' => $page)); 
    925920                } 
    926                  
     921 
    927922                function machinetags_getRecentValues ($namespace = NULL, $predicate = NULL, $added_since = NULL) { 
    928                         /* http://www.flickr.com/services/api/flickr.machinetags.getRecentValues.html */ 
     923                        /* https://www.flickr.com/services/api/flickr.machinetags.getRecentValues.html */ 
    929924                        return $this->call('flickr.machinetags.getRecentValues', array('namespace' => $namespace, 'predicate' => $predicate, 'added_since' => $added_since)); 
    930925                } 
    931926 
    932927                function machinetags_getValues ($namespace, $predicate, $per_page = NULL, $page = NULL, $usage = NULL) { 
    933                         /* http://www.flickr.com/services/api/flickr.machinetags.getValues.html */ 
     928                        /* https://www.flickr.com/services/api/flickr.machinetags.getValues.html */ 
    934929                        return $this->call('flickr.machinetags.getValues', array('namespace' => $namespace, 'predicate' => $predicate, 'per_page' => $per_page, 'page' => $page, 'usage' => $usage)); 
    935930                } 
    936                  
     931 
    937932                /* Panda methods */ 
    938933                function panda_getList () { 
    939                         /* http://www.flickr.com/services/api/flickr.panda.getList.html */ 
     934                        /* https://www.flickr.com/services/api/flickr.panda.getList.html */ 
    940935                        return $this->call('flickr.panda.getList', array()); 
    941936                } 
    942937 
    943938                function panda_getPhotos ($panda_name, $extras = NULL, $per_page = NULL, $page = NULL) { 
    944                         /* http://www.flickr.com/services/api/flickr.panda.getPhotos.html */ 
     939                        /* https://www.flickr.com/services/api/flickr.panda.getPhotos.html */ 
    945940                        return $this->call('flickr.panda.getPhotos', array('panda_name' => $panda_name, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page)); 
    946941                } 
     
    948943                /* People methods */ 
    949944                function people_findByEmail ($find_email) { 
    950                         /* http://www.flickr.com/services/api/flickr.people.findByEmail.html */ 
     945                        /* https://www.flickr.com/services/api/flickr.people.findByEmail.html */ 
    951946                        $this->request("flickr.people.findByEmail", array("find_email"=>$find_email)); 
    952947                        return $this->parsed_response ? $this->parsed_response['user'] : false; 
     
    954949 
    955950                function people_findByUsername ($username) { 
    956                         /* http://www.flickr.com/services/api/flickr.people.findByUsername.html */ 
     951                        /* https://www.flickr.com/services/api/flickr.people.findByUsername.html */ 
    957952                        $this->request("flickr.people.findByUsername", array("username"=>$username)); 
    958953                        return $this->parsed_response ? $this->parsed_response['user'] : false; 
     
    960955 
    961956                function people_getInfo ($user_id) { 
    962                         /* http://www.flickr.com/services/api/flickr.people.getInfo.html */ 
     957                        /* https://www.flickr.com/services/api/flickr.people.getInfo.html */ 
    963958                        $this->request("flickr.people.getInfo", array("user_id"=>$user_id)); 
    964959                        return $this->parsed_response ? $this->parsed_response['person'] : false; 
     
    977972                         */ 
    978973 
    979                          /* http://www.flickr.com/services/api/flickr.people.getPhotos.html */ 
     974                         /* https://www.flickr.com/services/api/flickr.people.getPhotos.html */ 
    980975                        return $this->call('flickr.people.getPhotos', array_merge(array('user_id' => $user_id), $args)); 
    981976                } 
    982977 
    983978                function people_getPhotosOf ($user_id, $extras = NULL, $per_page = NULL, $page = NULL) { 
    984                         /* http://www.flickr.com/services/api/flickr.people.getPhotosOf.html */ 
     979                        /* https://www.flickr.com/services/api/flickr.people.getPhotosOf.html */ 
    985980                        return $this->call('flickr.people.getPhotosOf', array('user_id' => $user_id, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page)); 
    986981                } 
    987                  
     982 
    988983                function people_getPublicGroups ($user_id) { 
    989                         /* http://www.flickr.com/services/api/flickr.people.getPublicGroups.html */ 
     984                        /* https://www.flickr.com/services/api/flickr.people.getPublicGroups.html */ 
    990985                        $this->request("flickr.people.getPublicGroups", array("user_id"=>$user_id)); 
    991986                        return $this->parsed_response ? $this->parsed_response['groups']['group'] : false; 
     
    993988 
    994989                function people_getPublicPhotos ($user_id, $safe_search = NULL, $extras = NULL, $per_page = NULL, $page = NULL) { 
    995                         /* http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html */ 
     990                        /* https://www.flickr.com/services/api/flickr.people.getPublicPhotos.html */ 
    996991                        return $this->call('flickr.people.getPublicPhotos', array('user_id' => $user_id, 'safe_search' => $safe_search, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page)); 
    997992                } 
    998993 
    999994                function people_getUploadStatus () { 
    1000                         /* http://www.flickr.com/services/api/flickr.people.getUploadStatus.html */ 
     995                        /* https://www.flickr.com/services/api/flickr.people.getUploadStatus.html */ 
    1001996                        /* Requires Authentication */ 
    1002997                        $this->request("flickr.people.getUploadStatus"); 
     
    10071002                /* Photos Methods */ 
    10081003                function photos_addTags ($photo_id, $tags) { 
    1009                         /* http://www.flickr.com/services/api/flickr.photos.addTags.html */ 
     1004                        /* https://www.flickr.com/services/api/flickr.photos.addTags.html */ 
    10101005                        $this->request("flickr.photos.addTags", array("photo_id"=>$photo_id, "tags"=>$tags), TRUE); 
    10111006                        return $this->parsed_response ? true : false; 
     
    10131008 
    10141009                function photos_delete ($photo_id) { 
    1015                         /* http://www.flickr.com/services/api/flickr.photos.delete.html */ 
     1010                        /* https://www.flickr.com/services/api/flickr.photos.delete.html */ 
    10161011                        $this->request("flickr.photos.delete", array("photo_id"=>$photo_id), TRUE); 
    10171012                        return $this->parsed_response ? true : false; 
     
    10191014 
    10201015                function photos_getAllContexts ($photo_id) { 
    1021                         /* http://www.flickr.com/services/api/flickr.photos.getAllContexts.html */ 
     1016                        /* https://www.flickr.com/services/api/flickr.photos.getAllContexts.html */ 
    10221017                        $this->request("flickr.photos.getAllContexts", array("photo_id"=>$photo_id)); 
    10231018                        return $this->parsed_response ? $this->parsed_response : false; 
     
    10251020 
    10261021                function photos_getContactsPhotos ($count = NULL, $just_friends = NULL, $single_photo = NULL, $include_self = NULL, $extras = NULL) { 
    1027                         /* http://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html */ 
     1022                        /* https://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html */ 
    10281023                        $this->request("flickr.photos.getContactsPhotos", array("count"=>$count, "just_friends"=>$just_friends, "single_photo"=>$single_photo, "include_self"=>$include_self, "extras"=>$extras)); 
    10291024                        return $this->parsed_response ? $this->parsed_response['photos']['photo'] : false; 
     
    10311026 
    10321027                function photos_getContactsPublicPhotos ($user_id, $count = NULL, $just_friends = NULL, $single_photo = NULL, $include_self = NULL, $extras = NULL) { 
    1033                         /* http://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html */ 
     1028                        /* https://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html */ 
    10341029                        $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)); 
    10351030                        return $this->parsed_response ? $this->parsed_response['photos']['photo'] : false; 
     
    10371032 
    10381033                function photos_getContext ($photo_id, $num_prev = NULL, $num_next = NULL, $extras = NULL, $order_by = NULL) { 
    1039                         /* http://www.flickr.com/services/api/flickr.photos.getContext.html */ 
     1034                        /* https://www.flickr.com/services/api/flickr.photos.getContext.html */ 
    10401035                        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)); 
    10411036                } 
    10421037 
    10431038                function photos_getCounts ($dates = NULL, $taken_dates = NULL) { 
    1044                         /* http://www.flickr.com/services/api/flickr.photos.getCounts.html */ 
     1039                        /* https://www.flickr.com/services/api/flickr.photos.getCounts.html */ 
    10451040                        $this->request("flickr.photos.getCounts", array("dates"=>$dates, "taken_dates"=>$taken_dates)); 
    10461041                        return $this->parsed_response ? $this->parsed_response['photocounts']['photocount'] : false; 
     
    10481043 
    10491044                function photos_getExif ($photo_id, $secret = NULL) { 
    1050                         /* http://www.flickr.com/services/api/flickr.photos.getExif.html */ 
     1045                        /* https://www.flickr.com/services/api/flickr.photos.getExif.html */ 
    10511046                        $this->request("flickr.photos.getExif", array("photo_id"=>$photo_id, "secret"=>$secret)); 
    10521047                        return $this->parsed_response ? $this->parsed_response['photo'] : false; 
    10531048                } 
    1054                  
     1049 
    10551050                function photos_getFavorites ($photo_id, $page = NULL, $per_page = NULL) { 
    1056                         /* http://www.flickr.com/services/api/flickr.photos.getFavorites.html */ 
     1051                        /* https://www.flickr.com/services/api/flickr.photos.getFavorites.html */ 
    10571052                        $this->request("flickr.photos.getFavorites", array("photo_id"=>$photo_id, "page"=>$page, "per_page"=>$per_page)); 
    10581053                        return $this->parsed_response ? $this->parsed_response['photo'] : false; 
     
    10601055 
    10611056                function photos_getInfo ($photo_id, $secret = NULL, $humandates = NULL, $privacy_filter = NULL, $get_contexts = NULL) { 
    1062                         /* http://www.flickr.com/services/api/flickr.photos.getInfo.html */ 
     1057                        /* https://www.flickr.com/services/api/flickr.photos.getInfo.html */ 
    10631058                        return $this->call('flickr.photos.getInfo', array('photo_id' => $photo_id, 'secret' => $secret, 'humandates' => $humandates, 'privacy_filter' => $privacy_filter, 'get_contexts' => $get_contexts)); 
    10641059                } 
    1065                  
     1060 
    10661061                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) { 
    1067                         /* http://www.flickr.com/services/api/flickr.photos.getNotInSet.html */ 
     1062                        /* https://www.flickr.com/services/api/flickr.photos.getNotInSet.html */ 
    10681063                        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)); 
    10691064                } 
    1070                  
     1065 
    10711066                function photos_getPerms ($photo_id) { 
    1072                         /* http://www.flickr.com/services/api/flickr.photos.getPerms.html */ 
     1067                        /* https://www.flickr.com/services/api/flickr.photos.getPerms.html */ 
    10731068                        $this->request("flickr.photos.getPerms", array("photo_id"=>$photo_id)); 
    10741069                        return $this->parsed_response ? $this->parsed_response['perms'] : false; 
     
    10761071 
    10771072                function photos_getRecent ($jump_to = NULL, $extras = NULL, $per_page = NULL, $page = NULL) { 
    1078                         /* http://www.flickr.com/services/api/flickr.photos.getRecent.html */ 
     1073                        /* https://www.flickr.com/services/api/flickr.photos.getRecent.html */ 
    10791074                        if (is_array($extras)) { 
    10801075                                $extras = implode(",", $extras); 
     
    10841079 
    10851080                function photos_getSizes ($photo_id) { 
    1086                         /* http://www.flickr.com/services/api/flickr.photos.getSizes.html */ 
     1081                        /* https://www.flickr.com/services/api/flickr.photos.getSizes.html */ 
    10871082                        $this->request("flickr.photos.getSizes", array("photo_id"=>$photo_id)); 
    10881083                        return $this->parsed_response ? $this->parsed_response['sizes']['size'] : false; 
     
    10901085 
    10911086                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) { 
    1092                         /* http://www.flickr.com/services/api/flickr.photos.getUntagged.html */ 
     1087                        /* https://www.flickr.com/services/api/flickr.photos.getUntagged.html */ 
    10931088                        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)); 
    10941089                } 
     
    11001095                         * flickr.photos.search method requires at least one search parameter. 
    11011096                         */ 
    1102                         /* http://www.flickr.com/services/api/flickr.photos.getWithGeoData.html */ 
     1097                        /* https://www.flickr.com/services/api/flickr.photos.getWithGeoData.html */ 
    11031098                        $this->request("flickr.photos.getWithGeoData", $args); 
    11041099                        return $this->parsed_response ? $this->parsed_response['photos'] : false; 
     
    11111106                         * flickr.photos.search method requires at least one search parameter. 
    11121107                         */ 
    1113                         /* http://www.flickr.com/services/api/flickr.photos.getWithoutGeoData.html */ 
     1108                        /* https://www.flickr.com/services/api/flickr.photos.getWithoutGeoData.html */ 
    11141109                        $this->request("flickr.photos.getWithoutGeoData", $args); 
    11151110                        return $this->parsed_response ? $this->parsed_response['photos'] : false; 
     
    11171112 
    11181113                function photos_recentlyUpdated ($min_date, $extras = NULL, $per_page = NULL, $page = NULL) { 
    1119                         /* http://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html */ 
     1114                        /* https://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html */ 
    11201115                        return $this->call('flickr.photos.recentlyUpdated', array('min_date' => $min_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page)); 
    11211116                } 
    11221117 
    11231118                function photos_removeTag ($tag_id) { 
    1124                         /* http://www.flickr.com/services/api/flickr.photos.removeTag.html */ 
     1119                        /* https://www.flickr.com/services/api/flickr.photos.removeTag.html */ 
    11251120                        $this->request("flickr.photos.removeTag", array("tag_id"=>$tag_id), TRUE); 
    11261121                        return $this->parsed_response ? true : false; 
     
    11391134                         */ 
    11401135 
    1141                         /* http://www.flickr.com/services/api/flickr.photos.search.html */ 
     1136                        /* https://www.flickr.com/services/api/flickr.photos.search.html */ 
    11421137                        $this->request("flickr.photos.search", $args); 
    11431138                        return $this->parsed_response ? $this->parsed_response['photos'] : false; 
     
    11451140 
    11461141                function photos_setContentType ($photo_id, $content_type) { 
    1147                         /* http://www.flickr.com/services/api/flickr.photos.setContentType.html */ 
     1142                        /* https://www.flickr.com/services/api/flickr.photos.setContentType.html */ 
    11481143                        return $this->call('flickr.photos.setContentType', array('photo_id' => $photo_id, 'content_type' => $content_type)); 
    11491144                } 
    1150                  
     1145 
    11511146                function photos_setDates ($photo_id, $date_posted = NULL, $date_taken = NULL, $date_taken_granularity = NULL) { 
    1152                         /* http://www.flickr.com/services/api/flickr.photos.setDates.html */ 
     1147                        /* https://www.flickr.com/services/api/flickr.photos.setDates.html */ 
    11531148                        $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); 
    11541149                        return $this->parsed_response ? true : false; 
     
    11561151 
    11571152                function photos_setMeta ($photo_id, $title, $description) { 
    1158                         /* http://www.flickr.com/services/api/flickr.photos.setMeta.html */ 
     1153                        /* https://www.flickr.com/services/api/flickr.photos.setMeta.html */ 
    11591154                        $this->request("flickr.photos.setMeta", array("photo_id"=>$photo_id, "title"=>$title, "description"=>$description), TRUE); 
    11601155                        return $this->parsed_response ? true : false; 
     
    11621157 
    11631158                function photos_setPerms ($photo_id, $is_public, $is_friend, $is_family, $perm_comment, $perm_addmeta) { 
    1164                         /* http://www.flickr.com/services/api/flickr.photos.setPerms.html */ 
     1159                        /* https://www.flickr.com/services/api/flickr.photos.setPerms.html */ 
    11651160                        $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); 
    11661161                        return $this->parsed_response ? true : false; 
     
    11681163 
    11691164                function photos_setSafetyLevel ($photo_id, $safety_level = NULL, $hidden = NULL) { 
    1170                         /* http://www.flickr.com/services/api/flickr.photos.setSafetyLevel.html */ 
     1165                        /* https://www.flickr.com/services/api/flickr.photos.setSafetyLevel.html */ 
    11711166                        return $this->call('flickr.photos.setSafetyLevel', array('photo_id' => $photo_id, 'safety_level' => $safety_level, 'hidden' => $hidden)); 
    11721167                } 
    1173                  
     1168 
    11741169                function photos_setTags ($photo_id, $tags) { 
    1175                         /* http://www.flickr.com/services/api/flickr.photos.setTags.html */ 
     1170                        /* https://www.flickr.com/services/api/flickr.photos.setTags.html */ 
    11761171                        $this->request("flickr.photos.setTags", array("photo_id"=>$photo_id, "tags"=>$tags), TRUE); 
    11771172                        return $this->parsed_response ? true : false; 
     
    11801175                /* Photos - Comments Methods */ 
    11811176                function photos_comments_addComment ($photo_id, $comment_text) { 
    1182                         /* http://www.flickr.com/services/api/flickr.photos.comments.addComment.html */ 
     1177                        /* https://www.flickr.com/services/api/flickr.photos.comments.addComment.html */ 
    11831178                        $this->request("flickr.photos.comments.addComment", array("photo_id" => $photo_id, "comment_text"=>$comment_text), TRUE); 
    11841179                        return $this->parsed_response ? $this->parsed_response['comment'] : false; 
     
    11861181 
    11871182                function photos_comments_deleteComment ($comment_id) { 
    1188                         /* http://www.flickr.com/services/api/flickr.photos.comments.deleteComment.html */ 
     1183                        /* https://www.flickr.com/services/api/flickr.photos.comments.deleteComment.html */ 
    11891184                        $this->request("flickr.photos.comments.deleteComment", array("comment_id" => $comment_id), TRUE); 
    11901185                        return $this->parsed_response ? true : false; 
     
    11921187 
    11931188                function photos_comments_editComment ($comment_id, $comment_text) { 
    1194                         /* http://www.flickr.com/services/api/flickr.photos.comments.editComment.html */ 
     1189                        /* https://www.flickr.com/services/api/flickr.photos.comments.editComment.html */ 
    11951190                        $this->request("flickr.photos.comments.editComment", array("comment_id" => $comment_id, "comment_text"=>$comment_text), TRUE); 
    11961191                        return $this->parsed_response ? true : false; 
     
    11981193 
    11991194                function photos_comments_getList ($photo_id, $min_comment_date = NULL, $max_comment_date = NULL, $page = NULL, $per_page = NULL, $include_faves = NULL) { 
    1200                         /* http://www.flickr.com/services/api/flickr.photos.comments.getList.html */ 
     1195                        /* https://www.flickr.com/services/api/flickr.photos.comments.getList.html */ 
    12011196                        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)); 
    12021197                } 
    1203                  
     1198 
    12041199                function photos_comments_getRecentForContacts ($date_lastcomment = NULL, $contacts_filter = NULL, $extras = NULL, $per_page = NULL, $page = NULL) { 
    1205                         /* http://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html */ 
     1200                        /* https://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html */ 
    12061201                        return $this->call('flickr.photos.comments.getRecentForContacts', array('date_lastcomment' => $date_lastcomment, 'contacts_filter' => $contacts_filter, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page)); 
    12071202                } 
     
    12091204                /* Photos - Geo Methods */ 
    12101205                function photos_geo_batchCorrectLocation ($lat, $lon, $accuracy, $place_id = NULL, $woe_id = NULL) { 
    1211                         /* http://www.flickr.com/services/api/flickr.photos.geo.batchCorrectLocation.html */ 
     1206                        /* https://www.flickr.com/services/api/flickr.photos.geo.batchCorrectLocation.html */ 
    12121207                        return $this->call('flickr.photos.geo.batchCorrectLocation', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'place_id' => $place_id, 'woe_id' => $woe_id)); 
    12131208                } 
    12141209 
    12151210                function photos_geo_correctLocation ($photo_id, $place_id = NULL, $woe_id = NULL) { 
    1216                         /* http://www.flickr.com/services/api/flickr.photos.geo.correctLocation.html */ 
     1211                        /* https://www.flickr.com/services/api/flickr.photos.geo.correctLocation.html */ 
    12171212                        return $this->call('flickr.photos.geo.correctLocation', array('photo_id' => $photo_id, 'place_id' => $place_id, 'woe_id' => $woe_id)); 
    12181213                } 
    12191214 
    12201215                function photos_geo_getLocation ($photo_id) { 
    1221                         /* http://www.flickr.com/services/api/flickr.photos.geo.getLocation.html */ 
     1216                        /* https://www.flickr.com/services/api/flickr.photos.geo.getLocation.html */ 
    12221217                        $this->request("flickr.photos.geo.getLocation", array("photo_id"=>$photo_id)); 
    12231218                        return $this->parsed_response ? $this->parsed_response['photo'] : false; 
     
    12251220 
    12261221                function photos_geo_getPerms ($photo_id) { 
    1227                         /* http://www.flickr.com/services/api/flickr.photos.geo.getPerms.html */ 
     1222                        /* https://www.flickr.com/services/api/flickr.photos.geo.getPerms.html */ 
    12281223                        $this->request("flickr.photos.geo.getPerms", array("photo_id"=>$photo_id)); 
    12291224                        return $this->parsed_response ? $this->parsed_response['perms'] : false; 
    12301225                } 
    1231                  
     1226 
    12321227                function photos_geo_photosForLocation ($lat, $lon, $accuracy = NULL, $extras = NULL, $per_page = NULL, $page = NULL) { 
    1233                         /* http://www.flickr.com/services/api/flickr.photos.geo.photosForLocation.html */ 
     1228                        /* https://www.flickr.com/services/api/flickr.photos.geo.photosForLocation.html */ 
    12341229                        return $this->call('flickr.photos.geo.photosForLocation', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page)); 
    12351230                } 
    12361231 
    12371232                function photos_geo_removeLocation ($photo_id) { 
    1238                         /* http://www.flickr.com/services/api/flickr.photos.geo.removeLocation.html */ 
     1233                        /* https://www.flickr.com/services/api/flickr.photos.geo.removeLocation.html */ 
    12391234                        $this->request("flickr.photos.geo.removeLocation", array("photo_id"=>$photo_id), TRUE); 
    12401235                        return $this->parsed_response ? true : false; 
     
    12421237 
    12431238                function photos_geo_setContext ($photo_id, $context) { 
    1244                         /* http://www.flickr.com/services/api/flickr.photos.geo.setContext.html */ 
     1239                        /* https://www.flickr.com/services/api/flickr.photos.geo.setContext.html */ 
    12451240                        return $this->call('flickr.photos.geo.setContext', array('photo_id' => $photo_id, 'context' => $context)); 
    12461241                } 
    12471242 
    12481243                function photos_geo_setLocation ($photo_id, $lat, $lon, $accuracy = NULL, $context = NULL, $bookmark_id = NULL) { 
    1249                         /* http://www.flickr.com/services/api/flickr.photos.geo.setLocation.html */ 
     1244                        /* https://www.flickr.com/services/api/flickr.photos.geo.setLocation.html */ 
    12501245                        return $this->call('flickr.photos.geo.setLocation', array('photo_id' => $photo_id, 'lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'context' => $context, 'bookmark_id' => $bookmark_id)); 
    12511246                } 
    1252                  
     1247 
    12531248                function photos_geo_setPerms ($is_public, $is_contact, $is_friend, $is_family, $photo_id) { 
    1254                         /* http://www.flickr.com/services/api/flickr.photos.geo.setPerms.html */ 
     1249                        /* https://www.flickr.com/services/api/flickr.photos.geo.setPerms.html */ 
    12551250                        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)); 
    12561251                } 
     
    12581253                /* Photos - Licenses Methods */ 
    12591254                function photos_licenses_getInfo () { 
    1260                         /* http://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html */ 
     1255                        /* https://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html */ 
    12611256                        $this->request("flickr.photos.licenses.getInfo"); 
    12621257                        return $this->parsed_response ? $this->parsed_response['licenses']['license'] : false; 
     
    12641259 
    12651260                function photos_licenses_setLicense ($photo_id, $license_id) { 
    1266                         /* http://www.flickr.com/services/api/flickr.photos.licenses.setLicense.html */ 
     1261                        /* https://www.flickr.com/services/api/flickr.photos.licenses.setLicense.html */ 
    12671262                        /* Requires Authentication */ 
    12681263                        $this->request("flickr.photos.licenses.setLicense", array("photo_id"=>$photo_id, "license_id"=>$license_id), TRUE); 
     
    12721267                /* Photos - Notes Methods */ 
    12731268                function photos_notes_add ($photo_id, $note_x, $note_y, $note_w, $note_h, $note_text) { 
    1274                         /* http://www.flickr.com/services/api/flickr.photos.notes.add.html */ 
     1269                        /* https://www.flickr.com/services/api/flickr.photos.notes.add.html */ 
    12751270                        $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); 
    12761271                        return $this->parsed_response ? $this->parsed_response['note'] : false; 
     
    12781273 
    12791274                function photos_notes_delete ($note_id) { 
    1280                         /* http://www.flickr.com/services/api/flickr.photos.notes.delete.html */ 
     1275                        /* https://www.flickr.com/services/api/flickr.photos.notes.delete.html */ 
    12811276                        $this->request("flickr.photos.notes.delete", array("note_id" => $note_id), TRUE); 
    12821277                        return $this->parsed_response ? true : false; 
     
    12841279 
    12851280                function photos_notes_edit ($note_id, $note_x, $note_y, $note_w, $note_h, $note_text) { 
    1286                         /* http://www.flickr.com/services/api/flickr.photos.notes.edit.html */ 
     1281                        /* https://www.flickr.com/services/api/flickr.photos.notes.edit.html */ 
    12871282                        $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); 
    12881283                        return $this->parsed_response ? true : false; 
     
    12911286                /* Photos - Transform Methods */ 
    12921287                function photos_transform_rotate ($photo_id, $degrees) { 
    1293                         /* http://www.flickr.com/services/api/flickr.photos.transform.rotate.html */ 
     1288                        /* https://www.flickr.com/services/api/flickr.photos.transform.rotate.html */ 
    12941289                        $this->request("flickr.photos.transform.rotate", array("photo_id" => $photo_id, "degrees" => $degrees), TRUE); 
    12951290                        return $this->parsed_response ? true : false; 
     
    12981293                /* Photos - People Methods */ 
    12991294                function photos_people_add ($photo_id, $user_id, $person_x = NULL, $person_y = NULL, $person_w = NULL, $person_h = NULL) { 
    1300                         /* http://www.flickr.com/services/api/flickr.photos.people.add.html */ 
     1295                        /* https://www.flickr.com/services/api/flickr.photos.people.add.html */ 
    13011296                        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)); 
    13021297                } 
    13031298 
    13041299                function photos_people_delete ($photo_id, $user_id, $email = NULL) { 
    1305                         /* http://www.flickr.com/services/api/flickr.photos.people.delete.html */ 
     1300                        /* https://www.flickr.com/services/api/flickr.photos.people.delete.html */ 
    13061301                        return $this->call('flickr.photos.people.delete', array('photo_id' => $photo_id, 'user_id' => $user_id, 'email' => $email)); 
    13071302                } 
    1308                  
     1303 
    13091304                function photos_people_deleteCoords ($photo_id, $user_id) { 
    1310                         /* http://www.flickr.com/services/api/flickr.photos.people.deleteCoords.html */ 
     1305                        /* https://www.flickr.com/services/api/flickr.photos.people.deleteCoords.html */ 
    13111306                        return $this->call('flickr.photos.people.deleteCoords', array('photo_id' => $photo_id, 'user_id' => $user_id)); 
    13121307                } 
    13131308 
    13141309                function photos_people_editCoords ($photo_id, $user_id, $person_x, $person_y, $person_w, $person_h, $email = NULL) { 
    1315                         /* http://www.flickr.com/services/api/flickr.photos.people.editCoords.html */ 
     1310                        /* https://www.flickr.com/services/api/flickr.photos.people.editCoords.html */ 
    13161311                        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)); 
    13171312                } 
    1318                  
     1313 
    13191314                function photos_people_getList ($photo_id) { 
    1320                         /* http://www.flickr.com/services/api/flickr.photos.people.getList.html */ 
     1315                        /* https://www.flickr.com/services/api/flickr.photos.people.getList.html */ 
    13211316                        return $this->call('flickr.photos.people.getList', array('photo_id' => $photo_id)); 
    13221317                } 
    1323                  
     1318 
    13241319                /* Photos - Upload Methods */ 
    13251320                function photos_upload_checkTickets ($tickets) { 
    1326                         /* http://www.flickr.com/services/api/flickr.photos.upload.checkTickets.html */ 
     1321                        /* https://www.flickr.com/services/api/flickr.photos.upload.checkTickets.html */ 
    13271322                        if (is_array($tickets)) { 
    13281323                                $tickets = implode(",", $tickets); 
     
    13341329                /* Photosets Methods */ 
    13351330                function photosets_addPhoto ($photoset_id, $photo_id) { 
    1336                         /* http://www.flickr.com/services/api/flickr.photosets.addPhoto.html */ 
     1331                        /* https://www.flickr.com/services/api/flickr.photosets.addPhoto.html */ 
    13371332                        $this->request("flickr.photosets.addPhoto", array("photoset_id" => $photoset_id, "photo_id" => $photo_id), TRUE); 
    13381333                        return $this->parsed_response ? true : false; 
     
    13401335 
    13411336                function photosets_create ($title, $description, $primary_photo_id) { 
    1342                         /* http://www.flickr.com/services/api/flickr.photosets.create.html */ 
     1337                        /* https://www.flickr.com/services/api/flickr.photosets.create.html */ 
    13431338                        $this->request("flickr.photosets.create", array("title" => $title, "primary_photo_id" => $primary_photo_id, "description" => $description), TRUE); 
    13441339                        return $this->parsed_response ? $this->parsed_response['photoset'] : false; 
     
    13461341 
    13471342                function photosets_delete ($photoset_id) { 
    1348                         /* http://www.flickr.com/services/api/flickr.photosets.delete.html */ 
     1343                        /* https://www.flickr.com/services/api/flickr.photosets.delete.html */ 
    13491344                        $this->request("flickr.photosets.delete", array("photoset_id" => $photoset_id), TRUE); 
    13501345                        return $this->parsed_response ? true : false; 
     
    13521347 
    13531348                function photosets_editMeta ($photoset_id, $title, $description = NULL) { 
    1354                         /* http://www.flickr.com/services/api/flickr.photosets.editMeta.html */ 
     1349                        /* https://www.flickr.com/services/api/flickr.photosets.editMeta.html */ 
    13551350                        $this->request("flickr.photosets.editMeta", array("photoset_id" => $photoset_id, "title" => $title, "description" => $description), TRUE); 
    13561351                        return $this->parsed_response ? true : false; 
     
    13581353 
    13591354                function photosets_editPhotos ($photoset_id, $primary_photo_id, $photo_ids) { 
    1360                         /* http://www.flickr.com/services/api/flickr.photosets.editPhotos.html */ 
     1355                        /* https://www.flickr.com/services/api/flickr.photosets.editPhotos.html */ 
    13611356                        $this->request("flickr.photosets.editPhotos", array("photoset_id" => $photoset_id, "primary_photo_id" => $primary_photo_id, "photo_ids" => $photo_ids), TRUE); 
    13621357                        return $this->parsed_response ? true : false; 
     
    13641359 
    13651360                function photosets_getContext ($photo_id, $photoset_id, $num_prev = NULL, $num_next = NULL) { 
    1366                         /* http://www.flickr.com/services/api/flickr.photosets.getContext.html */ 
     1361                        /* https://www.flickr.com/services/api/flickr.photosets.getContext.html */ 
    13671362                        return $this->call('flickr.photosets.getContext', array('photo_id' => $photo_id, 'photoset_id' => $photoset_id, 'num_prev' => $num_prev, 'num_next' => $num_next)); 
    13681363                } 
    1369                  
     1364 
    13701365                function photosets_getInfo ($photoset_id) { 
    1371                         /* http://www.flickr.com/services/api/flickr.photosets.getInfo.html */ 
     1366                        /* https://www.flickr.com/services/api/flickr.photosets.getInfo.html */ 
    13721367                        $this->request("flickr.photosets.getInfo", array("photoset_id" => $photoset_id)); 
    13731368                        return $this->parsed_response ? $this->parsed_response['photoset'] : false; 
    13741369                } 
    13751370 
    1376                 function photosets_getList ($user_id = NULL) { 
    1377                         /* http://www.flickr.com/services/api/flickr.photosets.getList.html */ 
    1378                         $this->request("flickr.photosets.getList", array("user_id" => $user_id)); 
     1371                function photosets_getList ($user_id = NULL, $page = NULL, $per_page = NULL, $primary_photo_extras = NULL) { 
     1372                        /* https://www.flickr.com/services/api/flickr.photosets.getList.html */ 
     1373                        $this->request("flickr.photosets.getList", array("user_id" => $user_id, 'page' => $page, 'per_page' => $per_page, 'primary_photo_extras' => $primary_photo_extras)); 
    13791374                        return $this->parsed_response ? $this->parsed_response['photosets'] : false; 
    13801375                } 
    13811376 
    13821377                function photosets_getPhotos ($photoset_id, $extras = NULL, $privacy_filter = NULL, $per_page = NULL, $page = NULL, $media = NULL) { 
    1383                         /* http://www.flickr.com/services/api/flickr.photosets.getPhotos.html */ 
     1378                        /* https://www.flickr.com/services/api/flickr.photosets.getPhotos.html */ 
    13841379                        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)); 
    13851380                } 
    13861381 
    13871382                function photosets_orderSets ($photoset_ids) { 
    1388                         /* http://www.flickr.com/services/api/flickr.photosets.orderSets.html */ 
     1383                        /* https://www.flickr.com/services/api/flickr.photosets.orderSets.html */ 
    13891384                        if (is_array($photoset_ids)) { 
    13901385                                $photoset_ids = implode(",", $photoset_ids); 
     
    13951390 
    13961391                function photosets_removePhoto ($photoset_id, $photo_id) { 
    1397                         /* http://www.flickr.com/services/api/flickr.photosets.removePhoto.html */ 
     1392                        /* https://www.flickr.com/services/api/flickr.photosets.removePhoto.html */ 
    13981393                        $this->request("flickr.photosets.removePhoto", array("photoset_id" => $photoset_id, "photo_id" => $photo_id), TRUE); 
    13991394                        return $this->parsed_response ? true : false; 
    14001395                } 
    1401                  
     1396 
    14021397                function photosets_removePhotos ($photoset_id, $photo_ids) { 
    1403                         /* http://www.flickr.com/services/api/flickr.photosets.removePhotos.html */ 
     1398                        /* https://www.flickr.com/services/api/flickr.photosets.removePhotos.html */ 
    14041399                        return $this->call('flickr.photosets.removePhotos', array('photoset_id' => $photoset_id, 'photo_ids' => $photo_ids)); 
    14051400                } 
    1406                  
     1401 
    14071402                function photosets_reorderPhotos ($photoset_id, $photo_ids) { 
    1408                         /* http://www.flickr.com/services/api/flickr.photosets.reorderPhotos.html */ 
     1403                        /* https://www.flickr.com/services/api/flickr.photosets.reorderPhotos.html */ 
    14091404                        return $this->call('flickr.photosets.reorderPhotos', array('photoset_id' => $photoset_id, 'photo_ids' => $photo_ids)); 
    14101405                } 
    1411                  
     1406 
    14121407                function photosets_setPrimaryPhoto ($photoset_id, $photo_id) { 
    1413                         /* http://www.flickr.com/services/api/flickr.photosets.setPrimaryPhoto.html */ 
     1408                        /* https://www.flickr.com/services/api/flickr.photosets.setPrimaryPhoto.html */ 
    14141409                        return $this->call('flickr.photosets.setPrimaryPhoto', array('photoset_id' => $photoset_id, 'photo_id' => $photo_id)); 
    14151410                } 
     
    14171412                /* Photosets Comments Methods */ 
    14181413                function photosets_comments_addComment ($photoset_id, $comment_text) { 
    1419                         /* http://www.flickr.com/services/api/flickr.photosets.comments.addComment.html */ 
     1414                        /* https://www.flickr.com/services/api/flickr.photosets.comments.addComment.html */ 
    14201415                        $this->request("flickr.photosets.comments.addComment", array("photoset_id" => $photoset_id, "comment_text"=>$comment_text), TRUE); 
    14211416                        return $this->parsed_response ? $this->parsed_response['comment'] : false; 
     
    14231418 
    14241419                function photosets_comments_deleteComment ($comment_id) { 
    1425                         /* http://www.flickr.com/services/api/flickr.photosets.comments.deleteComment.html */ 
     1420                        /* https://www.flickr.com/services/api/flickr.photosets.comments.deleteComment.html */ 
    14261421                        $this->request("flickr.photosets.comments.deleteComment", array("comment_id" => $comment_id), TRUE); 
    14271422                        return $this->parsed_response ? true : false; 
     
    14291424 
    14301425                function photosets_comments_editComment ($comment_id, $comment_text) { 
    1431                         /* http://www.flickr.com/services/api/flickr.photosets.comments.editComment.html */ 
     1426                        /* https://www.flickr.com/services/api/flickr.photosets.comments.editComment.html */ 
    14321427                        $this->request("flickr.photosets.comments.editComment", array("comment_id" => $comment_id, "comment_text"=>$comment_text), TRUE); 
    14331428                        return $this->parsed_response ? true : false; 
     
    14351430 
    14361431                function photosets_comments_getList ($photoset_id) { 
    1437                         /* http://www.flickr.com/services/api/flickr.photosets.comments.getList.html */ 
     1432                        /* https://www.flickr.com/services/api/flickr.photosets.comments.getList.html */ 
    14381433                        $this->request("flickr.photosets.comments.getList", array("photoset_id"=>$photoset_id)); 
    14391434                        return $this->parsed_response ? $this->parsed_response['comments'] : false; 
    14401435                } 
    1441                  
     1436 
    14421437                /* Places Methods */ 
    14431438                function places_find ($query) { 
    1444                         /* http://www.flickr.com/services/api/flickr.places.find.html */ 
     1439                        /* https://www.flickr.com/services/api/flickr.places.find.html */ 
    14451440                        return $this->call('flickr.places.find', array('query' => $query)); 
    14461441                } 
    14471442 
    14481443                function places_findByLatLon ($lat, $lon, $accuracy = NULL) { 
    1449                         /* http://www.flickr.com/services/api/flickr.places.findByLatLon.html */ 
     1444                        /* https://www.flickr.com/services/api/flickr.places.findByLatLon.html */ 
    14501445                        return $this->call('flickr.places.findByLatLon', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy)); 
    14511446                } 
    14521447 
    14531448                function places_getChildrenWithPhotosPublic ($place_id = NULL, $woe_id = NULL) { 
    1454                         /* http://www.flickr.com/services/api/flickr.places.getChildrenWithPhotosPublic.html */ 
     1449                        /* https://www.flickr.com/services/api/flickr.places.getChildrenWithPhotosPublic.html */ 
    14551450                        return $this->call('flickr.places.getChildrenWithPhotosPublic', array('place_id' => $place_id, 'woe_id' => $woe_id)); 
    14561451                } 
    14571452 
    14581453                function places_getInfo ($place_id = NULL, $woe_id = NULL) { 
    1459                         /* http://www.flickr.com/services/api/flickr.places.getInfo.html */ 
     1454                        /* https://www.flickr.com/services/api/flickr.places.getInfo.html */ 
    14601455                        return $this->call('flickr.places.getInfo', array('place_id' => $place_id, 'woe_id' => $woe_id)); 
    14611456                } 
    14621457 
    14631458                function places_getInfoByUrl ($url) { 
    1464                         /* http://www.flickr.com/services/api/flickr.places.getInfoByUrl.html */ 
     1459                        /* https://www.flickr.com/services/api/flickr.places.getInfoByUrl.html */ 
    14651460                        return $this->call('flickr.places.getInfoByUrl', array('url' => $url)); 
    14661461                } 
    1467                  
     1462 
    14681463                function places_getPlaceTypes () { 
    1469                         /* http://www.flickr.com/services/api/flickr.places.getPlaceTypes.html */ 
     1464                        /* https://www.flickr.com/services/api/flickr.places.getPlaceTypes.html */ 
    14701465                        return $this->call('flickr.places.getPlaceTypes', array()); 
    14711466                } 
    1472                  
     1467 
    14731468                function places_getShapeHistory ($place_id = NULL, $woe_id = NULL) { 
    1474                         /* http://www.flickr.com/services/api/flickr.places.getShapeHistory.html */ 
     1469                        /* https://www.flickr.com/services/api/flickr.places.getShapeHistory.html */ 
    14751470                        return $this->call('flickr.places.getShapeHistory', array('place_id' => $place_id, 'woe_id' => $woe_id)); 
    14761471                } 
    14771472 
    14781473                function places_getTopPlacesList ($place_type_id, $date = NULL, $woe_id = NULL, $place_id = NULL) { 
    1479                         /* http://www.flickr.com/services/api/flickr.places.getTopPlacesList.html */ 
     1474                        /* https://www.flickr.com/services/api/flickr.places.getTopPlacesList.html */ 
    14801475                        return $this->call('flickr.places.getTopPlacesList', array('place_type_id' => $place_type_id, 'date' => $date, 'woe_id' => $woe_id, 'place_id' => $place_id)); 
    14811476                } 
    1482                  
     1477 
    14831478                function places_placesForBoundingBox ($bbox, $place_type = NULL, $place_type_id = NULL, $recursive = NULL) { 
    1484                         /* http://www.flickr.com/services/api/flickr.places.placesForBoundingBox.html */ 
     1479                        /* https://www.flickr.com/services/api/flickr.places.placesForBoundingBox.html */ 
    14851480                        return $this->call('flickr.places.placesForBoundingBox', array('bbox' => $bbox, 'place_type' => $place_type, 'place_type_id' => $place_type_id, 'recursive' => $recursive)); 
    14861481                } 
    14871482 
    14881483                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) { 
    1489                         /* http://www.flickr.com/services/api/flickr.places.placesForContacts.html */ 
     1484                        /* https://www.flickr.com/services/api/flickr.places.placesForContacts.html */ 
    14901485                        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)); 
    14911486                } 
    14921487 
    14931488                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) { 
    1494                         /* http://www.flickr.com/services/api/flickr.places.placesForTags.html */ 
     1489                        /* https://www.flickr.com/services/api/flickr.places.placesForTags.html */ 
    14951490                        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)); 
    14961491                } 
    14971492 
    14981493                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) { 
    1499                         /* http://www.flickr.com/services/api/flickr.places.placesForUser.html */ 
     1494                        /* https://www.flickr.com/services/api/flickr.places.placesForUser.html */ 
    15001495                        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)); 
    15011496                } 
    1502                  
     1497 
    15031498                function places_resolvePlaceId ($place_id) { 
    1504                         /* http://www.flickr.com/services/api/flickr.places.resolvePlaceId.html */ 
     1499                        /* https://www.flickr.com/services/api/flickr.places.resolvePlaceId.html */ 
    15051500                        $rsp = $this->call('flickr.places.resolvePlaceId', array('place_id' => $place_id)); 
    15061501                        return $rsp ? $rsp['location'] : $rsp; 
    15071502                } 
    1508                  
     1503 
    15091504                function places_resolvePlaceURL ($url) { 
    1510                         /* http://www.flickr.com/services/api/flickr.places.resolvePlaceURL.html */ 
     1505                        /* https://www.flickr.com/services/api/flickr.places.resolvePlaceURL.html */ 
    15111506                        $rsp = $this->call('flickr.places.resolvePlaceURL', array('url' => $url)); 
    15121507                        return $rsp ? $rsp['location'] : $rsp; 
    15131508                } 
    1514                  
     1509 
    15151510                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) { 
    1516                         /* http://www.flickr.com/services/api/flickr.places.tagsForPlace.html */ 
     1511                        /* https://www.flickr.com/services/api/flickr.places.tagsForPlace.html */ 
    15171512                        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)); 
    15181513                } 
     
    15201515                /* Prefs Methods */ 
    15211516                function prefs_getContentType () { 
    1522                         /* http://www.flickr.com/services/api/flickr.prefs.getContentType.html */ 
     1517                        /* https://www.flickr.com/services/api/flickr.prefs.getContentType.html */ 
    15231518                        $rsp = $this->call('flickr.prefs.getContentType', array()); 
    15241519                        return $rsp ? $rsp['person'] : $rsp; 
    15251520                } 
    1526                  
     1521 
    15271522                function prefs_getGeoPerms () { 
    1528                         /* http://www.flickr.com/services/api/flickr.prefs.getGeoPerms.html */ 
     1523                        /* https://www.flickr.com/services/api/flickr.prefs.getGeoPerms.html */ 
    15291524                        return $this->call('flickr.prefs.getGeoPerms', array()); 
    15301525                } 
    1531                  
     1526 
    15321527                function prefs_getHidden () { 
    1533                         /* http://www.flickr.com/services/api/flickr.prefs.getHidden.html */ 
     1528                        /* https://www.flickr.com/services/api/flickr.prefs.getHidden.html */ 
    15341529                        $rsp = $this->call('flickr.prefs.getHidden', array()); 
    15351530                        return $rsp ? $rsp['person'] : $rsp; 
    15361531                } 
    1537                  
     1532 
    15381533                function prefs_getPrivacy () { 
    1539                         /* http://www.flickr.com/services/api/flickr.prefs.getPrivacy.html */ 
     1534                        /* https://www.flickr.com/services/api/flickr.prefs.getPrivacy.html */ 
    15401535                        $rsp = $this->call('flickr.prefs.getPrivacy', array()); 
    15411536                        return $rsp ? $rsp['person'] : $rsp; 
    15421537                } 
    1543                  
     1538 
    15441539                function prefs_getSafetyLevel () { 
    1545                         /* http://www.flickr.com/services/api/flickr.prefs.getSafetyLevel.html */ 
     1540                        /* https://www.flickr.com/services/api/flickr.prefs.getSafetyLevel.html */ 
    15461541                        $rsp = $this->call('flickr.prefs.getSafetyLevel', array()); 
    15471542                        return $rsp ? $rsp['person'] : $rsp; 
     
    15501545                /* Reflection Methods */ 
    15511546                function reflection_getMethodInfo ($method_name) { 
    1552                         /* http://www.flickr.com/services/api/flickr.reflection.getMethodInfo.html */ 
     1547                        /* https://www.flickr.com/services/api/flickr.reflection.getMethodInfo.html */ 
    15531548                        $this->request("flickr.reflection.getMethodInfo", array("method_name" => $method_name)); 
    15541549                        return $this->parsed_response ? $this->parsed_response : false; 
     
    15561551 
    15571552                function reflection_getMethods () { 
    1558                         /* http://www.flickr.com/services/api/flickr.reflection.getMethods.html */ 
     1553                        /* https://www.flickr.com/services/api/flickr.reflection.getMethods.html */ 
    15591554                        $this->request("flickr.reflection.getMethods"); 
    15601555                        return $this->parsed_response ? $this->parsed_response['methods']['method'] : false; 
     
    15631558                /* Stats Methods */ 
    15641559                function stats_getCollectionDomains ($date, $collection_id = NULL, $per_page = NULL, $page = NULL) { 
    1565                         /* http://www.flickr.com/services/api/flickr.stats.getCollectionDomains.html */ 
     1560                        /* https://www.flickr.com/services/api/flickr.stats.getCollectionDomains.html */ 
    15661561                        return $this->call('flickr.stats.getCollectionDomains', array('date' => $date, 'collection_id' => $collection_id, 'per_page' => $per_page, 'page' => $page)); 
    15671562                } 
    15681563 
    15691564                function stats_getCollectionReferrers ($date, $domain, $collection_id = NULL, $per_page = NULL, $page = NULL) { 
    1570                         /* http://www.flickr.com/services/api/flickr.stats.getCollectionReferrers.html */ 
     1565                        /* https://www.flickr.com/services/api/flickr.stats.getCollectionReferrers.html */ 
    15711566                        return $this->call('flickr.stats.getCollectionReferrers', array('date' => $date, 'domain' => $domain, 'collection_id' => $collection_id, 'per_page' => $per_page, 'page' => $page)); 
    15721567                } 
    15731568 
    15741569                function stats_getCollectionStats ($date, $collection_id) { 
    1575                         /* http://www.flickr.com/services/api/flickr.stats.getCollectionStats.html */ 
     1570                        /* https://www.flickr.com/services/api/flickr.stats.getCollectionStats.html */ 
    15761571                        return $this->call('flickr.stats.getCollectionStats', array('date' => $date, 'collection_id' => $collection_id)); 
    15771572                } 
    1578                  
     1573 
    15791574                function stats_getCSVFiles () { 
    1580                         /* http://www.flickr.com/services/api/flickr.stats.getCSVFiles.html */ 
     1575                        /* https://www.flickr.com/services/api/flickr.stats.getCSVFiles.html */ 
    15811576                        return $this->call('flickr.stats.getCSVFiles', array()); 
    15821577                } 
    15831578 
    15841579                function stats_getPhotoDomains ($date, $photo_id = NULL, $per_page = NULL, $page = NULL) { 
    1585                         /* http://www.flickr.com/services/api/flickr.stats.getPhotoDomains.html */ 
     1580                        /* https://www.flickr.com/services/api/flickr.stats.getPhotoDomains.html */ 
    15861581                        return $this->call('flickr.stats.getPhotoDomains', array('date' => $date, 'photo_id' => $photo_id, 'per_page' => $per_page, 'page' => $page)); 
    15871582                } 
    15881583 
    15891584                function stats_getPhotoReferrers ($date, $domain, $photo_id = NULL, $per_page = NULL, $page = NULL) { 
    1590                         /* http://www.flickr.com/services/api/flickr.stats.getPhotoReferrers.html */ 
     1585                        /* https://www.flickr.com/services/api/flickr.stats.getPhotoReferrers.html */ 
    15911586                        return $this->call('flickr.stats.getPhotoReferrers', array('date' => $date, 'domain' => $domain, 'photo_id' => $photo_id, 'per_page' => $per_page, 'page' => $page)); 
    15921587                } 
    15931588 
    15941589                function stats_getPhotosetDomains ($date, $photoset_id = NULL, $per_page = NULL, $page = NULL) { 
    1595                         /* http://www.flickr.com/services/api/flickr.stats.getPhotosetDomains.html */ 
     1590                        /* https://www.flickr.com/services/api/flickr.stats.getPhotosetDomains.html */ 
    15961591                        return $this->call('flickr.stats.getPhotosetDomains', array('date' => $date, 'photoset_id' => $photoset_id, 'per_page' => $per_page, 'page' => $page)); 
    15971592                } 
    15981593 
    15991594                function stats_getPhotosetReferrers ($date, $domain, $photoset_id = NULL, $per_page = NULL, $page = NULL) { 
    1600                         /* http://www.flickr.com/services/api/flickr.stats.getPhotosetReferrers.html */ 
     1595                        /* https://www.flickr.com/services/api/flickr.stats.getPhotosetReferrers.html */ 
    16011596                        return $this->call('flickr.stats.getPhotosetReferrers', array('date' => $date, 'domain' => $domain, 'photoset_id' => $photoset_id, 'per_page' => $per_page, 'page' => $page)); 
    16021597                } 
    16031598 
    16041599                function stats_getPhotosetStats ($date, $photoset_id) { 
    1605                         /* http://www.flickr.com/services/api/flickr.stats.getPhotosetStats.html */ 
     1600                        /* https://www.flickr.com/services/api/flickr.stats.getPhotosetStats.html */ 
    16061601                        return $this->call('flickr.stats.getPhotosetStats', array('date' => $date, 'photoset_id' => $photoset_id)); 
    16071602                } 
    16081603 
    16091604                function stats_getPhotoStats ($date, $photo_id) { 
    1610                         /* http://www.flickr.com/services/api/flickr.stats.getPhotoStats.html */ 
     1605                        /* https://www.flickr.com/services/api/flickr.stats.getPhotoStats.html */ 
    16111606                        return $this->call('flickr.stats.getPhotoStats', array('date' => $date, 'photo_id' => $photo_id)); 
    16121607                } 
    16131608 
    16141609                function stats_getPhotostreamDomains ($date, $per_page = NULL, $page = NULL) { 
    1615                         /* http://www.flickr.com/services/api/flickr.stats.getPhotostreamDomains.html */ 
     1610                        /* https://www.flickr.com/services/api/flickr.stats.getPhotostreamDomains.html */ 
    16161611                        return $this->call('flickr.stats.getPhotostreamDomains', array('date' => $date, 'per_page' => $per_page, 'page' => $page)); 
    16171612                } 
    16181613 
    16191614                function stats_getPhotostreamReferrers ($date, $domain, $per_page = NULL, $page = NULL) { 
    1620                         /* http://www.flickr.com/services/api/flickr.stats.getPhotostreamReferrers.html */ 
     1615                        /* https://www.flickr.com/services/api/flickr.stats.getPhotostreamReferrers.html */ 
    16211616                        return $this->call('flickr.stats.getPhotostreamReferrers', array('date' => $date, 'domain' => $domain, 'per_page' => $per_page, 'page' => $page)); 
    16221617                } 
    16231618 
    16241619                function stats_getPhotostreamStats ($date) { 
    1625                         /* http://www.flickr.com/services/api/flickr.stats.getPhotostreamStats.html */ 
     1620                        /* https://www.flickr.com/services/api/flickr.stats.getPhotostreamStats.html */ 
    16261621                        return $this->call('flickr.stats.getPhotostreamStats', array('date' => $date)); 
    16271622                } 
    16281623 
    16291624                function stats_getPopularPhotos ($date = NULL, $sort = NULL, $per_page = NULL, $page = NULL) { 
    1630                         /* http://www.flickr.com/services/api/flickr.stats.getPopularPhotos.html */ 
     1625                        /* https://www.flickr.com/services/api/flickr.stats.getPopularPhotos.html */ 
    16311626                        return $this->call('flickr.stats.getPopularPhotos', array('date' => $date, 'sort' => $sort, 'per_page' => $per_page, 'page' => $page)); 
    16321627                } 
    16331628 
    16341629                function stats_getTotalViews ($date = NULL) { 
    1635                         /* http://www.flickr.com/services/api/flickr.stats.getTotalViews.html */ 
     1630                        /* https://www.flickr.com/services/api/flickr.stats.getTotalViews.html */ 
    16361631                        return $this->call('flickr.stats.getTotalViews', array('date' => $date)); 
    16371632                } 
    1638                  
     1633 
    16391634                /* Tags Methods */ 
    16401635                function tags_getClusterPhotos ($tag, $cluster_id) { 
    1641                         /* http://www.flickr.com/services/api/flickr.tags.getClusterPhotos.html */ 
     1636                        /* https://www.flickr.com/services/api/flickr.tags.getClusterPhotos.html */ 
    16421637                        return $this->call('flickr.tags.getClusterPhotos', array('tag' => $tag, 'cluster_id' => $cluster_id)); 
    16431638                } 
    16441639 
    16451640                function tags_getClusters ($tag) { 
    1646                         /* http://www.flickr.com/services/api/flickr.tags.getClusters.html */ 
     1641                        /* https://www.flickr.com/services/api/flickr.tags.getClusters.html */ 
    16471642                        return $this->call('flickr.tags.getClusters', array('tag' => $tag)); 
    16481643                } 
    16491644 
    16501645                function tags_getHotList ($period = NULL, $count = NULL) { 
    1651                         /* http://www.flickr.com/services/api/flickr.tags.getHotList.html */ 
     1646                        /* https://www.flickr.com/services/api/flickr.tags.getHotList.html */ 
    16521647                        $this->request("flickr.tags.getHotList", array("period" => $period, "count" => $count)); 
    16531648                        return $this->parsed_response ? $this->parsed_response['hottags'] : false; 
     
    16551650 
    16561651                function tags_getListPhoto ($photo_id) { 
    1657                         /* http://www.flickr.com/services/api/flickr.tags.getListPhoto.html */ 
     1652                        /* https://www.flickr.com/services/api/flickr.tags.getListPhoto.html */ 
    16581653                        $this->request("flickr.tags.getListPhoto", array("photo_id" => $photo_id)); 
    16591654                        return $this->parsed_response ? $this->parsed_response['photo']['tags']['tag'] : false; 
     
    16611656 
    16621657                function tags_getListUser ($user_id = NULL) { 
    1663                         /* http://www.flickr.com/services/api/flickr.tags.getListUser.html */ 
     1658                        /* https://www.flickr.com/services/api/flickr.tags.getListUser.html */ 
    16641659                        $this->request("flickr.tags.getListUser", array("user_id" => $user_id)); 
    16651660                        return $this->parsed_response ? $this->parsed_response['who']['tags']['tag'] : false; 
     
    16671662 
    16681663                function tags_getListUserPopular ($user_id = NULL, $count = NULL) { 
    1669                         /* http://www.flickr.com/services/api/flickr.tags.getListUserPopular.html */ 
     1664                        /* https://www.flickr.com/services/api/flickr.tags.getListUserPopular.html */ 
    16701665                        $this->request("flickr.tags.getListUserPopular", array("user_id" => $user_id, "count" => $count)); 
    16711666                        return $this->parsed_response ? $this->parsed_response['who']['tags']['tag'] : false; 
     
    16731668 
    16741669                function tags_getListUserRaw ($tag = NULL) { 
    1675                         /* http://www.flickr.com/services/api/flickr.tags.getListUserRaw.html */ 
     1670                        /* https://www.flickr.com/services/api/flickr.tags.getListUserRaw.html */ 
    16761671                        return $this->call('flickr.tags.getListUserRaw', array('tag' => $tag)); 
    16771672                } 
    1678                  
     1673 
    16791674                function tags_getRelated ($tag) { 
    1680                         /* http://www.flickr.com/services/api/flickr.tags.getRelated.html */ 
     1675                        /* https://www.flickr.com/services/api/flickr.tags.getRelated.html */ 
    16811676                        $this->request("flickr.tags.getRelated", array("tag" => $tag)); 
    16821677                        return $this->parsed_response ? $this->parsed_response['tags'] : false; 
     
    16841679 
    16851680                function test_echo ($args = array()) { 
    1686                         /* http://www.flickr.com/services/api/flickr.test.echo.html */ 
     1681                        /* https://www.flickr.com/services/api/flickr.test.echo.html */ 
    16871682                        $this->request("flickr.test.echo", $args); 
    16881683                        return $this->parsed_response ? $this->parsed_response : false; 
     
    16901685 
    16911686                function test_login () { 
    1692                         /* http://www.flickr.com/services/api/flickr.test.login.html */ 
     1687                        /* https://www.flickr.com/services/api/flickr.test.login.html */ 
    16931688                        $this->request("flickr.test.login"); 
    16941689                        return $this->parsed_response ? $this->parsed_response['user'] : false; 
     
    16961691 
    16971692                function urls_getGroup ($group_id) { 
    1698                         /* http://www.flickr.com/services/api/flickr.urls.getGroup.html */ 
     1693                        /* https://www.flickr.com/services/api/flickr.urls.getGroup.html */ 
    16991694                        $this->request("flickr.urls.getGroup", array("group_id"=>$group_id)); 
    17001695                        return $this->parsed_response ? $this->parsed_response['group']['url'] : false; 
     
    17021697 
    17031698                function urls_getUserPhotos ($user_id = NULL) { 
    1704                         /* http://www.flickr.com/services/api/flickr.urls.getUserPhotos.html */ 
     1699                        /* https://www.flickr.com/services/api/flickr.urls.getUserPhotos.html */ 
    17051700                        $this->request("flickr.urls.getUserPhotos", array("user_id"=>$user_id)); 
    17061701                        return $this->parsed_response ? $this->parsed_response['user']['url'] : false; 
     
    17081703 
    17091704                function urls_getUserProfile ($user_id = NULL) { 
    1710                         /* http://www.flickr.com/services/api/flickr.urls.getUserProfile.html */ 
     1705                        /* https://www.flickr.com/services/api/flickr.urls.getUserProfile.html */ 
    17111706                        $this->request("flickr.urls.getUserProfile", array("user_id"=>$user_id)); 
    17121707                        return $this->parsed_response ? $this->parsed_response['user']['url'] : false; 
    17131708                } 
    1714                  
     1709 
    17151710                function urls_lookupGallery ($url) { 
    1716                         /* http://www.flickr.com/services/api/flickr.urls.lookupGallery.html */ 
     1711                        /* https://www.flickr.com/services/api/flickr.urls.lookupGallery.html */ 
    17171712                        return $this->call('flickr.urls.lookupGallery', array('url' => $url)); 
    17181713                } 
    17191714 
    17201715                function urls_lookupGroup ($url) { 
    1721                         /* http://www.flickr.com/services/api/flickr.urls.lookupGroup.html */ 
     1716                        /* https://www.flickr.com/services/api/flickr.urls.lookupGroup.html */ 
    17221717                        $this->request("flickr.urls.lookupGroup", array("url"=>$url)); 
    17231718                        return $this->parsed_response ? $this->parsed_response['group'] : false; 
     
    17251720 
    17261721                function urls_lookupUser ($url) { 
    1727                         /* http://www.flickr.com/services/api/flickr.photos.notes.edit.html */ 
     1722                        /* https://www.flickr.com/services/api/flickr.photos.notes.edit.html */ 
    17281723                        $this->request("flickr.urls.lookupUser", array("url"=>$url)); 
    17291724                        return $this->parsed_response ? $this->parsed_response['user'] : false; 
     
    17361731                var $phpFlickr, $per_page, $method, $args, $results, $global_phpFlickr; 
    17371732                var $total = null, $page = 0, $pages = null, $photos, $_extra = null; 
    1738                  
    1739                  
     1733 
     1734 
    17401735                function phpFlickr_pager($phpFlickr, $method = null, $args = null, $per_page = 30) { 
    17411736                        $this->per_page = $per_page; 
     
    17441739                        $this->set_phpFlickr($phpFlickr); 
    17451740                } 
    1746                  
     1741 
    17471742                function set_phpFlickr($phpFlickr) { 
    17481743                        if ( is_a($phpFlickr, 'phpFlickr') ) { 
     
    17551750                        } 
    17561751                } 
    1757                  
     1752 
    17581753                function __sleep() { 
    17591754                        return array( 
     
    17651760                        ); 
    17661761                } 
    1767                  
     1762 
    17681763                function load($page) { 
    17691764                        $allowed_methods = array( 
     
    17721767                        ); 
    17731768                        if ( !in_array($this->method, array_keys($allowed_methods)) ) return false; 
    1774                          
     1769 
    17751770                        if ( $this->phpFlickr->cache ) { 
    17761771                                $min = ($page - 1) * $this->per_page; 
     
    17971792                                                $this->total = $this->results['total']; 
    17981793                                                $this->pages = ceil($this->results['total'] / $this->per_page); 
    1799                                                  
     1794 
    18001795                                                $this->args['page'] = floor($min/500) + 2; 
    18011796                                                $this->results = $this->phpFlickr->call($this->method, $this->args); 
     
    18151810                                if ( $this->results ) { 
    18161811                                        $this->results = $this->results[$allowed_methods[$this->method]]; 
    1817                                          
     1812 
    18181813                                        $this->photos = $this->results['photo']; 
    18191814                                        $this->total = $this->results['total']; 
     
    18251820                        } 
    18261821                } 
    1827                  
     1822 
    18281823                function get($page = null) { 
    18291824                        if ( is_null($page) ) { 
     
    18391834                        return array(); 
    18401835                } 
    1841                  
     1836 
    18421837                function next() { 
    18431838                        $this->page++; 
     
    18491844                        return array(); 
    18501845                } 
    1851                  
     1846 
    18521847        } 
    18531848} 
Note: See TracChangeset for help on using the changeset viewer.