Changeset 1734808
- Timestamp:
- 09/23/2017 06:42:11 PM (9 years ago)
- Location:
- awesome-flickr-gallery-plugin
- Files:
-
- 8 edited
- 1 copied
-
tags/3.5.6 (copied) (copied from awesome-flickr-gallery-plugin/trunk)
-
tags/3.5.6/README.txt (modified) (6 diffs)
-
tags/3.5.6/afg_admin_settings.php (modified) (2 diffs)
-
tags/3.5.6/afg_libs.php (modified) (1 diff)
-
tags/3.5.6/index.php (modified) (5 diffs)
-
trunk/README.txt (modified) (6 diffs)
-
trunk/afg_admin_settings.php (modified) (2 diffs)
-
trunk/afg_libs.php (modified) (1 diff)
-
trunk/index.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
awesome-flickr-gallery-plugin/tags/3.5.6/README.txt
r1438930 r1734808 4 4 Tags: awesome, gallery, flickr, photo, image, slideshow, colorbox, portfolio, group, photoset, yahoo, slider, thumbnail, images 5 5 Requires at least: 3.0 6 Tested up to: 4. 5.27 Stable tag: 3.5. 56 Tested up to: 4.8.2 7 Stable tag: 3.5.6 8 8 License: GPLv2 or later 9 9 … … 114 114 == Upgrade Notice == 115 115 116 = 3.5.6 = 117 [Bug Fix] Photoset not found error on gallery page 118 116 119 = 3.5.3 = 117 120 [MAJOR CHANGE] I had to remove the Highslide option from list of slideshows. Apparently it is not compatible with WordPress's set of rules for licensing. … … 137 140 138 141 = 3.3.1 = 139 [MAJOR CHANGE] Highslide had to be removed from Slideshow options as WordPress moderators objected about the same due to licensing issues. This update removes the Highslide option. If you are using Highslide, you will be migrated to use Colorbox instead. 142 [MAJOR CHANGE] Highslide had to be removed from Slideshow options as WordPress moderators objected about the same due to licensing issues. This update removes the Highslide option. If you are using Highslide, you will be migrated to use Colorbox instead. 140 143 141 144 = 3.3.0 = … … 205 208 206 209 = 3.0.5 = 207 [FEATURE] Select custom sizes for thumbnails in gallery. 210 [FEATURE] Select custom sizes for thumbnails in gallery. 208 211 [ENHANCEMENT] Flexibility to modify gallery CSS to get desired look 209 212 [ENHANCEMENT] Improved error reporting for better debuggability … … 307 310 308 311 = 3.3.1 = 309 * [MAJOR CHANGE] Highslide had to be removed from Slideshow options as WordPress moderators objected about the same due to licensing issues. This update removes the Highslide option. If you are using Highslide, you will be migrated to use Colorbox instead. 312 * [MAJOR CHANGE] Highslide had to be removed from Slideshow options as WordPress moderators objected about the same due to licensing issues. This update removes the Highslide option. If you are using Highslide, you will be migrated to use Colorbox instead. 310 313 311 314 = 3.3.0 = … … 375 378 376 379 = 3.0.5 = 377 * [Feature] Select custom sizes for thumbnails in gallery. 380 * [Feature] Select custom sizes for thumbnails in gallery. 378 381 * [Enhancement] Flexibility to modify gallery CSS to get desired look 379 382 * [Enhancement] Improved error reporting for better debuggability -
awesome-flickr-gallery-plugin/tags/3.5.6/afg_admin_settings.php
r1174039 r1734808 420 420 if (get_option('afg_flickr_token')) $rsp_obj = $pf->people_getPhotos(get_option('afg_user_id'), array('per_page' => 5, 'page' => 1)); 421 421 else $rsp_obj = $pf->people_getPublicPhotos(get_option('afg_user_id'), NULL, NULL, 5, 1); 422 if (!$rsp_obj) echo afg_error( );422 if (!$rsp_obj) echo afg_error($pf->error_msg); 423 423 else { 424 424 foreach($rsp_obj['photos']['photo'] as $photo) { … … 459 459 460 460 $message = "Just insert the code <strong><font color='steelblue'>[AFG_gallery]</font></strong> in any of your posts or pages to display the Awesome Flickr Gallery. 461 <br /><p style='text-align:center'><i>-- OR --</i></p>You can create a new Awesome Flickr Gallery with different settings on page <a href=' {$_SERVER['PHP_SELF']}?page=afg_add_gallery_page'>Add Galleries.";461 <br /><p style='text-align:center'><i>-- OR --</i></p>You can create a new Awesome Flickr Gallery with different settings on page <a href='" . get_admin_url() . "admin.php?page=afg_add_gallery_page'>Add Galleries."; 462 462 echo afg_box('Usage Instructions', $message); 463 463 -
awesome-flickr-gallery-plugin/tags/3.5.6/afg_libs.php
r1438930 r1734808 4 4 define('SITE_URL', site_url()); 5 5 define('DEBUG', false); 6 define('VERSION', '3.5. 5');6 define('VERSION', '3.5.6'); 7 7 8 8 $afg_sort_order_map = array( -
awesome-flickr-gallery-plugin/tags/3.5.6/index.php
r1438938 r1734808 4 4 Plugin URI: http://www.ronakg.com/projects/awesome-flickr-gallery-wordpress-plugin/ 5 5 Description: Awesome Flickr Gallery is a simple, fast and light plugin to create a gallery of your Flickr photos on your WordPress enabled website. This plugin aims at providing a simple yet customizable way to create stunning Flickr gallery. 6 Version: 3.5. 56 Version: 3.5.6 7 7 Author: Ronak Gandhi 8 8 Author URI: http://www.ronakg.com 9 9 License: GPL2 10 10 11 Copyright 201 4 Ronak Gandhi (email : ronak.gandhi@ronakg.com)11 Copyright 2017 Ronak Gandhi (email : me@ronakg.com) 12 12 13 13 This program is free software; you can redistribute it and/or modify … … 214 214 215 215 if (isset($photoset_id) && $photoset_id) { 216 $rsp_obj = $pf->photosets_get Info($photoset_id);217 if ($pf->error_code) return afg_error($pf->error_msg);218 $total_photos = $rsp_obj['photos '];216 $rsp_obj = $pf->photosets_getPhotos($photoset_id, NULL, 1, 1); 217 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 218 $total_photos = $rsp_obj['photoset']['total']; 219 219 } 220 220 else if (isset($gallery_id) && $gallery_id) { 221 221 $rsp_obj = $pf->galleries_getInfo($gallery_id); 222 if ($pf->error_code) return afg_error($pf->error_msg);222 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 223 223 $total_photos = $rsp_obj['gallery']['count_photos']['_content']; 224 224 } 225 225 else if (isset($group_id) && $group_id) { 226 226 $rsp_obj = $pf->groups_pools_getPhotos($group_id, NULL, NULL, NULL, NULL, 1, 1); 227 if ($pf->error_code) return afg_error($pf->error_msg);227 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 228 228 $total_photos = $rsp_obj['photos']['total']; 229 229 if ($total_photos > 500) $total_photos = 500; … … 231 231 else if (isset($tags) && $tags) { 232 232 $rsp_obj = $pf->photos_search(array('user_id'=>$user_id, 'tags'=>$tags, 'extras'=>$extras, 'per_page'=>1)); 233 if ($pf->error_code) return afg_error($pf->error_msg);233 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 234 234 $total_photos = $rsp_obj['photos']['total']; 235 235 } 236 236 else if (isset($popular) && $popular) { 237 237 $rsp_obj = $pf->photos_search(array('user_id'=>$user_id, 'sort'=>'interestingness-desc', 'extras'=>$extras, 'per_page'=>1)); 238 if ($pf->error_code) return afg_error($pf->error_msg);238 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 239 239 $total_photos = $rsp_obj['photos']['total']; 240 240 if ($total_photos > 500) $total_photos = 500; … … 242 242 else { 243 243 $rsp_obj = $pf->people_getInfo($user_id); 244 if ($pf->error_code) return afg_error($pf->error_msg);244 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 245 245 $total_photos = $rsp_obj['photos']['count']['_content']; 246 246 } … … 251 251 $flickr_api = 'photoset'; 252 252 $rsp_obj_total = $pf->photosets_getPhotos($photoset_id, $extras, NULL, 500, $i); 253 if ($pf->error_code) return afg_error($pf->error_msg);253 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 254 254 } 255 255 else if ($gallery_id) { 256 256 $rsp_obj_total = $pf->galleries_getPhotos($gallery_id, $extras, 500, $i); 257 if ($pf->error_code) return afg_error($pf->error_msg);257 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 258 258 } 259 259 else if ($group_id) { 260 260 $rsp_obj_total = $pf->groups_pools_getPhotos($group_id, NULL, NULL, NULL, $extras, 500, $i); 261 if ($pf->error_code) return afg_error($pf->error_msg);261 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 262 262 } 263 263 else if ($tags) { 264 264 $rsp_obj_total = $pf->photos_search(array('user_id'=>$user_id, 'tags'=>$tags, 'extras'=>$extras, 'per_page'=>500, 'page'=>$i)); 265 if ($pf->error_code) return afg_error($pf->error_msg);265 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 266 266 } 267 267 else if ($popular) { 268 268 $rsp_obj_total = $pf->photos_search(array('user_id'=>$user_id, 'sort'=>'interestingness-desc', 'extras'=>$extras, 'per_page'=>500, 'page'=>$i)); 269 if ($pf->error_code) return afg_error($pf->error_msg);269 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 270 270 } 271 271 else { 272 272 if (get_option('afg_flickr_token')) $rsp_obj_total = $pf->people_getPhotos($user_id, array('extras' => $extras, 'per_page' => 500, 'page' => $i)); 273 273 else $rsp_obj_total = $pf->people_getPublicPhotos($user_id, NULL, $extras, 500, $i); 274 if ($pf->error_code) return afg_error($pf->error_msg);274 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 275 275 } 276 276 $photos = array_merge($photos, $rsp_obj_total[$flickr_api]['photo']); -
awesome-flickr-gallery-plugin/trunk/README.txt
r1438930 r1734808 4 4 Tags: awesome, gallery, flickr, photo, image, slideshow, colorbox, portfolio, group, photoset, yahoo, slider, thumbnail, images 5 5 Requires at least: 3.0 6 Tested up to: 4. 5.27 Stable tag: 3.5. 56 Tested up to: 4.8.2 7 Stable tag: 3.5.6 8 8 License: GPLv2 or later 9 9 … … 114 114 == Upgrade Notice == 115 115 116 = 3.5.6 = 117 [Bug Fix] Photoset not found error on gallery page 118 116 119 = 3.5.3 = 117 120 [MAJOR CHANGE] I had to remove the Highslide option from list of slideshows. Apparently it is not compatible with WordPress's set of rules for licensing. … … 137 140 138 141 = 3.3.1 = 139 [MAJOR CHANGE] Highslide had to be removed from Slideshow options as WordPress moderators objected about the same due to licensing issues. This update removes the Highslide option. If you are using Highslide, you will be migrated to use Colorbox instead. 142 [MAJOR CHANGE] Highslide had to be removed from Slideshow options as WordPress moderators objected about the same due to licensing issues. This update removes the Highslide option. If you are using Highslide, you will be migrated to use Colorbox instead. 140 143 141 144 = 3.3.0 = … … 205 208 206 209 = 3.0.5 = 207 [FEATURE] Select custom sizes for thumbnails in gallery. 210 [FEATURE] Select custom sizes for thumbnails in gallery. 208 211 [ENHANCEMENT] Flexibility to modify gallery CSS to get desired look 209 212 [ENHANCEMENT] Improved error reporting for better debuggability … … 307 310 308 311 = 3.3.1 = 309 * [MAJOR CHANGE] Highslide had to be removed from Slideshow options as WordPress moderators objected about the same due to licensing issues. This update removes the Highslide option. If you are using Highslide, you will be migrated to use Colorbox instead. 312 * [MAJOR CHANGE] Highslide had to be removed from Slideshow options as WordPress moderators objected about the same due to licensing issues. This update removes the Highslide option. If you are using Highslide, you will be migrated to use Colorbox instead. 310 313 311 314 = 3.3.0 = … … 375 378 376 379 = 3.0.5 = 377 * [Feature] Select custom sizes for thumbnails in gallery. 380 * [Feature] Select custom sizes for thumbnails in gallery. 378 381 * [Enhancement] Flexibility to modify gallery CSS to get desired look 379 382 * [Enhancement] Improved error reporting for better debuggability -
awesome-flickr-gallery-plugin/trunk/afg_admin_settings.php
r1174039 r1734808 420 420 if (get_option('afg_flickr_token')) $rsp_obj = $pf->people_getPhotos(get_option('afg_user_id'), array('per_page' => 5, 'page' => 1)); 421 421 else $rsp_obj = $pf->people_getPublicPhotos(get_option('afg_user_id'), NULL, NULL, 5, 1); 422 if (!$rsp_obj) echo afg_error( );422 if (!$rsp_obj) echo afg_error($pf->error_msg); 423 423 else { 424 424 foreach($rsp_obj['photos']['photo'] as $photo) { … … 459 459 460 460 $message = "Just insert the code <strong><font color='steelblue'>[AFG_gallery]</font></strong> in any of your posts or pages to display the Awesome Flickr Gallery. 461 <br /><p style='text-align:center'><i>-- OR --</i></p>You can create a new Awesome Flickr Gallery with different settings on page <a href=' {$_SERVER['PHP_SELF']}?page=afg_add_gallery_page'>Add Galleries.";461 <br /><p style='text-align:center'><i>-- OR --</i></p>You can create a new Awesome Flickr Gallery with different settings on page <a href='" . get_admin_url() . "admin.php?page=afg_add_gallery_page'>Add Galleries."; 462 462 echo afg_box('Usage Instructions', $message); 463 463 -
awesome-flickr-gallery-plugin/trunk/afg_libs.php
r1438930 r1734808 4 4 define('SITE_URL', site_url()); 5 5 define('DEBUG', false); 6 define('VERSION', '3.5. 5');6 define('VERSION', '3.5.6'); 7 7 8 8 $afg_sort_order_map = array( -
awesome-flickr-gallery-plugin/trunk/index.php
r1438938 r1734808 4 4 Plugin URI: http://www.ronakg.com/projects/awesome-flickr-gallery-wordpress-plugin/ 5 5 Description: Awesome Flickr Gallery is a simple, fast and light plugin to create a gallery of your Flickr photos on your WordPress enabled website. This plugin aims at providing a simple yet customizable way to create stunning Flickr gallery. 6 Version: 3.5. 56 Version: 3.5.6 7 7 Author: Ronak Gandhi 8 8 Author URI: http://www.ronakg.com 9 9 License: GPL2 10 10 11 Copyright 201 4 Ronak Gandhi (email : ronak.gandhi@ronakg.com)11 Copyright 2017 Ronak Gandhi (email : me@ronakg.com) 12 12 13 13 This program is free software; you can redistribute it and/or modify … … 214 214 215 215 if (isset($photoset_id) && $photoset_id) { 216 $rsp_obj = $pf->photosets_get Info($photoset_id);217 if ($pf->error_code) return afg_error($pf->error_msg);218 $total_photos = $rsp_obj['photos '];216 $rsp_obj = $pf->photosets_getPhotos($photoset_id, NULL, 1, 1); 217 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 218 $total_photos = $rsp_obj['photoset']['total']; 219 219 } 220 220 else if (isset($gallery_id) && $gallery_id) { 221 221 $rsp_obj = $pf->galleries_getInfo($gallery_id); 222 if ($pf->error_code) return afg_error($pf->error_msg);222 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 223 223 $total_photos = $rsp_obj['gallery']['count_photos']['_content']; 224 224 } 225 225 else if (isset($group_id) && $group_id) { 226 226 $rsp_obj = $pf->groups_pools_getPhotos($group_id, NULL, NULL, NULL, NULL, 1, 1); 227 if ($pf->error_code) return afg_error($pf->error_msg);227 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 228 228 $total_photos = $rsp_obj['photos']['total']; 229 229 if ($total_photos > 500) $total_photos = 500; … … 231 231 else if (isset($tags) && $tags) { 232 232 $rsp_obj = $pf->photos_search(array('user_id'=>$user_id, 'tags'=>$tags, 'extras'=>$extras, 'per_page'=>1)); 233 if ($pf->error_code) return afg_error($pf->error_msg);233 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 234 234 $total_photos = $rsp_obj['photos']['total']; 235 235 } 236 236 else if (isset($popular) && $popular) { 237 237 $rsp_obj = $pf->photos_search(array('user_id'=>$user_id, 'sort'=>'interestingness-desc', 'extras'=>$extras, 'per_page'=>1)); 238 if ($pf->error_code) return afg_error($pf->error_msg);238 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 239 239 $total_photos = $rsp_obj['photos']['total']; 240 240 if ($total_photos > 500) $total_photos = 500; … … 242 242 else { 243 243 $rsp_obj = $pf->people_getInfo($user_id); 244 if ($pf->error_code) return afg_error($pf->error_msg);244 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 245 245 $total_photos = $rsp_obj['photos']['count']['_content']; 246 246 } … … 251 251 $flickr_api = 'photoset'; 252 252 $rsp_obj_total = $pf->photosets_getPhotos($photoset_id, $extras, NULL, 500, $i); 253 if ($pf->error_code) return afg_error($pf->error_msg);253 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 254 254 } 255 255 else if ($gallery_id) { 256 256 $rsp_obj_total = $pf->galleries_getPhotos($gallery_id, $extras, 500, $i); 257 if ($pf->error_code) return afg_error($pf->error_msg);257 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 258 258 } 259 259 else if ($group_id) { 260 260 $rsp_obj_total = $pf->groups_pools_getPhotos($group_id, NULL, NULL, NULL, $extras, 500, $i); 261 if ($pf->error_code) return afg_error($pf->error_msg);261 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 262 262 } 263 263 else if ($tags) { 264 264 $rsp_obj_total = $pf->photos_search(array('user_id'=>$user_id, 'tags'=>$tags, 'extras'=>$extras, 'per_page'=>500, 'page'=>$i)); 265 if ($pf->error_code) return afg_error($pf->error_msg);265 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 266 266 } 267 267 else if ($popular) { 268 268 $rsp_obj_total = $pf->photos_search(array('user_id'=>$user_id, 'sort'=>'interestingness-desc', 'extras'=>$extras, 'per_page'=>500, 'page'=>$i)); 269 if ($pf->error_code) return afg_error($pf->error_msg);269 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 270 270 } 271 271 else { 272 272 if (get_option('afg_flickr_token')) $rsp_obj_total = $pf->people_getPhotos($user_id, array('extras' => $extras, 'per_page' => 500, 'page' => $i)); 273 273 else $rsp_obj_total = $pf->people_getPublicPhotos($user_id, NULL, $extras, 500, $i); 274 if ($pf->error_code) return afg_error($pf->error_msg);274 if ($pf->error_code) return $disp_gallery . afg_error($pf->error_msg); 275 275 } 276 276 $photos = array_merge($photos, $rsp_obj_total[$flickr_api]['photo']);
Note: See TracChangeset
for help on using the changeset viewer.