| @@ -7,9 +7,12 @@ | ||
| 7 | 7 | private $is_gallery_used = true; // TODO: Would be nice to detect if the gallery is actually used on the current page. |
| 8 | 8 | private $skeleton_handler; |
| 9 | 9 | private $pro_module = false; |
| 10 | 10 | |
| 11 | + public $preview_cutoff = 12; // Limit the number of images to show in the preview (for performance reasons) | |
| 12 | + | |
| 11 | 13 | private static $plugin_option_name = 'mgl_options'; |
| 14 | + private $pro; | |
| 12 | 15 | private $option_name = 'mgl_options'; |
| 13 | 16 | private $infinite_layouts = [ |
| 14 | 17 | 'tiles', |
| 15 | 18 | 'masonry', |
| @@ -20,8 +23,11 @@ | ||
| 20 | 23 | ]; |
| 21 | 24 | |
| 22 | 25 | private $rewrittenMwlData = []; |
| 23 | 26 | |
| 27 | + // Holds the image counts of the last preview render (used by the block editor). | |
| 28 | + public $last_preview_counts = [ 'total' => 0, 'shown' => 0 ]; | |
| 29 | + | |
| 24 | 30 | public function __construct() { |
| 25 | 31 | load_plugin_textdomain( MGL_DOMAIN, false, MGL_PATH . '/languages' ); |
| 26 | 32 | |
| 27 | 33 | //TODO: Move Skeleton into PRO |
| @@ -32,20 +38,23 @@ | ||
| 32 | 38 | // Initializes the classes needed |
| 33 | 39 | MeowKit_MGL_Helpers::is_rest() && new Meow_MGL_Rest( $this ); |
| 34 | 40 | |
| 35 | 41 | // The gallery build process should only be enabled if the request is non-asynchronous |
| 42 | + add_filter( 'wp_get_attachment_image_attributes', array( $this, 'wp_get_attachment_image_attributes' ), 25, 3 ); | |
| 43 | + | |
| 36 | 44 | if ( !MeowKit_MGL_Helpers::is_asynchronous_request() ) { |
| 37 | - add_filter( 'wp_get_attachment_image_attributes', array( $this, 'wp_get_attachment_image_attributes' ), 25, 3 ); | |
| 45 | + | |
| 38 | 46 | if ( is_admin() || $this->is_gallery_used ) { |
| 39 | 47 | new Meow_MGL_Run( $this ); |
| 40 | 48 | } |
| 41 | 49 | } |
| 42 | 50 | |
| 43 | - // Load the Pro version *after* loading the Run class due to the JS file was gatherd into one file. | |
| 51 | + // Load the Pro version *after* the Run class: both share the same JS bundle, and Run is | |
| 52 | + // the one registering it (the Pro class only localizes extra data on it). | |
| 44 | 53 | |
| 45 | 54 | $this->pro_module = class_exists( 'MeowPro_MGL_Core' ); |
| 46 | 55 | if ( $this->pro_module ) { |
| 47 | - new MeowPro_MGL_Core( $this ); | |
| 56 | + $this->pro = new MeowPro_MGL_Core( $this ); | |
| 48 | 57 | } else { |
| 49 | 58 | add_shortcode( 'meow-collection', array( $this, 'collection' ) ); |
| 50 | 59 | } |
| 51 | 60 | |
| @@ -57,8 +66,13 @@ | ||
| 57 | 66 | is_admin() && new Meow_MGL_Admin( $this ); |
| 58 | 67 | |
| 59 | 68 | global $wpmgl; |
| 60 | 69 | $wpmgl = $this; |
| 70 | + | |
| 71 | + if ( $this->pro_module ) { | |
| 72 | + global $wpmgl_pro; | |
| 73 | + $wpmgl_pro = $this->pro; | |
| 74 | + } | |
| 61 | 75 | } |
| 62 | 76 | |
| 63 | 77 | function collection() { |
| 64 | 78 | return "<b>Meow Collection</b>: This is only available in the Pro version. Please <a href='https://meowapps.com/products/meow-gallery-pro/'>upgrade to Meow Gallery Pro</a> to use this feature."; |
| @@ -63,8 +77,34 @@ | ||
| 63 | 77 | function collection() { |
| 64 | 78 | return "<b>Meow Collection</b>: This is only available in the Pro version. Please <a href='https://meowapps.com/products/meow-gallery-pro/'>upgrade to Meow Gallery Pro</a> to use this feature."; |
| 65 | 79 | } |
| 66 | 80 | |
| 81 | + // Gallery and collection IDs are plain identifiers (generate_uniqid(), stored as varchar). | |
| 82 | + // Anything else is rejected, and rejected rather than stripped: stripping could turn a crafted | |
| 83 | + // ID into a different existing one. Security: esc_attr() does NOT escape "]", so an ID coming | |
| 84 | + // from a request and concatenated into a shortcode string could close the tag and run | |
| 85 | + // arbitrary shortcodes. Keep IDs on this charset and never build a shortcode string from them. | |
| 86 | + public static function sanitize_id( $id ) { | |
| 87 | + if ( !is_scalar( $id ) ) { | |
| 88 | + return ''; | |
| 89 | + } | |
| 90 | + $id = (string) $id; | |
| 91 | + return preg_match( '/^[A-Za-z0-9_-]+$/', $id ) ? $id : ''; | |
| 92 | + } | |
| 93 | + | |
| 94 | + // Renders a collection from its ID. Deliberately calls the handler directly instead of going | |
| 95 | + // through do_shortcode(): there is no shortcode string to inject into that way. | |
| 96 | + public function render_collection( $id, $is_preview = false ) { | |
| 97 | + $id = self::sanitize_id( $id ); | |
| 98 | + if ( $id === '' ) { | |
| 99 | + return "<p class='meow-error'><b>Meow Gallery:</b> This collection ID is not valid.</p>"; | |
| 100 | + } | |
| 101 | + if ( $this->pro_module && $this->pro ) { | |
| 102 | + return $this->pro->collection( array( 'id' => $id ), $is_preview ); | |
| 103 | + } | |
| 104 | + return $this->collection(); | |
| 105 | + } | |
| 106 | + | |
| 67 | 107 | public function can_access_settings() { |
| 68 | 108 | return apply_filters( 'mgl_allow_setup', current_user_can( 'manage_options' ) ); |
| 69 | 109 | } |
| 70 | 110 | |
| @@ -89,11 +129,14 @@ | ||
| 89 | 129 | else if ( $this->gallery_layout === 'cascade' ) |
| 90 | 130 | $sizes = '80vw'; |
| 91 | 131 | else if ( $this->gallery_layout === 'justified' ) |
| 92 | 132 | $sizes = '(max-width: 800px) 80vw, 50vw'; |
| 133 | + | |
| 93 | 134 | $sizes = apply_filters( 'mgl_sizes', $sizes, $this->gallery_layout, $attachment, $attr ); |
| 135 | + | |
| 94 | 136 | if ( !empty( $sizes ) ) |
| 95 | 137 | $attr['sizes'] = $sizes; |
| 138 | + | |
| 96 | 139 | return $attr; |
| 97 | 140 | } |
| 98 | 141 | |
| 99 | 142 | function get_rewritten_mwl_data() { |
| @@ -99,8 +142,14 @@ | ||
| 99 | 142 | function get_rewritten_mwl_data() { |
| 100 | 143 | return $this->rewrittenMwlData; |
| 101 | 144 | } |
| 102 | 145 | |
| 146 | + // Get the IDs of the image attachments attached to the current post. | |
| 147 | + private function get_attached_image_ids() { | |
| 148 | + $attachments = get_attached_media( 'image' ); | |
| 149 | + return array_map( function( $x ) { return $x->ID; }, $attachments ); | |
| 150 | + } | |
| 151 | + | |
| 103 | 152 | function gallery( $atts, $options = [] ) { |
| 104 | 153 | $atts = apply_filters( 'shortcode_atts_gallery', $atts, null, $atts, 'gallery' ); |
| 105 | 154 | |
| 106 | 155 | $isPreview = isset( $options['isPreview'] ) ? $options['isPreview'] : false; |
| @@ -120,29 +169,33 @@ | ||
| 120 | 169 | if ( isset( $atts['meow'] ) && $atts['meow'] === 'false' ) { |
| 121 | 170 | return gallery_shortcode( $atts ); |
| 122 | 171 | } |
| 123 | 172 | |
| 124 | - // If the attributes contain "collection" then use the collection shortcode instead | |
| 173 | + // If the attributes contain "collection" then render that collection instead | |
| 125 | 174 | if ( isset( $atts['collection'] ) && !empty( $atts['collection'] ) ) { |
| 126 | - return do_shortcode( '[meow-collection id="' . $atts['collection'] . '"]' ); | |
| 175 | + return $this->render_collection( $atts['collection'] ); | |
| 127 | 176 | } |
| 128 | 177 | |
| 129 | 178 | $image_ids = array(); |
| 130 | 179 | $layout = ''; |
| 131 | 180 | |
| 132 | - if ( isset( $atts['id'] ) && isset( $atts['ids'] ) ) { | |
| 181 | + // All potential attributes that can be used to get the images for the gallery | |
| 182 | + $has_id = isset( $atts['id'] ) && !empty( $atts['id'] ); | |
| 183 | + $has_ids = isset( $atts['ids'] ) && !empty( $atts['ids'] ); | |
| 184 | + $has_include = isset( $atts['include'] ) && !empty( $atts['include'] ); | |
| 185 | + $has_tags = isset( $atts['tags'] ) && !empty( $atts['tags'] ); | |
| 186 | + $has_posts = isset( $atts['posts'] ) && !empty( $atts['posts'] ); | |
| 187 | + $has_latest_posts = isset( $atts['latest_posts'] ) && !empty( $atts['latest_posts'] ); | |
| 188 | + $has_attachments = isset( $atts['attachments'] ) && ( $atts['attachments'] === 'true' || $atts['attachments'] === true || $atts['attachments'] === 1 || $atts['attachments'] === '1' ); | |
| 133 | 189 | |
| 134 | - // Check if the ids are empty, then we can use the id | |
| 135 | - if ( empty( $atts['ids'] ) ) { | |
| 136 | - unset( $atts['ids'] ); | |
| 137 | - } else { | |
| 138 | - error_log( "⚠️ Meow Gallery: in gallery $atts[id] both 'id' and 'ids' attributes are used in the same shortcode. 'id' will be ignored." ); | |
| 139 | - } | |
| 190 | + if ( $has_id && $has_ids ) { | |
| 191 | + unset( $atts['ids'] ); | |
| 192 | + error_log( "⚠️ Meow Gallery: in gallery $atts[id] both 'id' and 'ids' attributes are used in the same shortcode. 'id' will be ignored." ); | |
| 140 | 193 | } |
| 141 | 194 | |
| 142 | 195 | // Get the IDs |
| 143 | 196 | #region media_ids |
| 144 | - if ( (isset( $atts['id'] ) && !empty($atts['id']) ) && !isset( $atts['ids'] ) ) { | |
| 197 | + if ( $has_id && !$has_ids ) { | |
| 145 | 198 | $shortcode_id = $atts['id']; |
| 146 | 199 | |
| 147 | 200 | try { |
| 148 | 201 | $shortcode = $this->get_gallery_by_id( $shortcode_id ); |
| @@ -147,9 +200,10 @@ | ||
| 147 | 200 | try { |
| 148 | 201 | $shortcode = $this->get_gallery_by_id( $shortcode_id ); |
| 149 | 202 | } |
| 150 | 203 | catch ( Exception $e ) { |
| 151 | - return "<p class='meow-error'><b>Meow Gallery:</b> This ID wasn't found in the Gallery Manager. (ID: $shortcode_id). " . $e->getMessage() . "</p>"; | |
| 204 | + $safe_id = esc_html( is_scalar( $shortcode_id ) ? $shortcode_id : '' ); | |
| 205 | + return "<p class='meow-error'><b>Meow Gallery:</b> This ID wasn't found in the Gallery Manager. (ID: $safe_id). " . esc_html( $e->getMessage() ) . "</p>"; | |
| 152 | 206 | } |
| 153 | 207 | |
| 154 | 208 | if ( !isset( $shortcode['medias'] ) || !isset( $shortcode['medias']['thumbnail_ids'])) { |
| 155 | 209 | return "<p class='meow-error'><b>Meow Gallery:</b> Thumbnail IDs not found.</p>"; |
| @@ -167,18 +221,32 @@ | ||
| 167 | 221 | |
| 168 | 222 | $atts = array_merge( $shortcode, $atts ); |
| 169 | 223 | } |
| 170 | 224 | |
| 171 | - if ( isset( $atts['ids'] ) ) { | |
| 225 | + // Real Media Library folder path (e.g. rml="2025/France/Tours"). | |
| 226 | + // Re-evaluated here (not only from the top) so it also works when the value | |
| 227 | + // comes from a saved gallery loaded via [gallery id="..."]. The logic lives | |
| 228 | + // in Meow_MGL_RML::get_image_ids() to keep this method clean. | |
| 229 | + $has_rml = isset( $atts['rml'] ) && !empty( $atts['rml'] ); | |
| 230 | + if ( $has_rml ) { | |
| 231 | + $rml_ids = Meow_MGL_RML::get_image_ids( $atts['rml'] ); | |
| 232 | + if ( is_wp_error( $rml_ids ) ) { | |
| 233 | + return "<p class='meow-error'><b>Meow Gallery:</b> " . esc_html( $rml_ids->get_error_message() ) . "</p>"; | |
| 234 | + } | |
| 235 | + $image_ids = implode( ',', $rml_ids ); | |
| 236 | + } | |
| 237 | + | |
| 238 | + if ( $has_ids ) { | |
| 172 | 239 | $image_ids = $atts['ids']; |
| 173 | 240 | } |
| 174 | - if ( isset( $atts['include'] ) ) { | |
| 241 | + | |
| 242 | + if ( $has_include ) { | |
| 175 | 243 | $image_ids = is_array( $atts['include'] ) ? implode( ',', $atts['include'] ) : $atts['include']; |
| 176 | 244 | $atts['include'] = $image_ids; |
| 177 | 245 | } |
| 178 | 246 | |
| 179 | 247 | // Tags support |
| 180 | - if ( isset( $atts['tags'] ) && !empty( $atts['tags'] ) ) { | |
| 248 | + if ( $has_tags ) { | |
| 181 | 249 | $tags = is_array( $atts['tags'] ) ? $atts['tags'] : array_map( 'trim', explode( ',', $atts['tags'] ) ); |
| 182 | 250 | |
| 183 | 251 | // Try multiple common taxonomies used for media tagging |
| 184 | 252 | $taxonomies_to_try = [ 'post_tag', 'media_tag', 'attachment_tag', 'attachment_category' ]; |
| @@ -223,9 +291,9 @@ | ||
| 223 | 291 | } |
| 224 | 292 | } |
| 225 | 293 | } |
| 226 | 294 | |
| 227 | - if ( isset( $atts['latest_posts'] ) ) { | |
| 295 | + if ( $has_latest_posts ) { | |
| 228 | 296 | $num_posts = intval( $atts['latest_posts'] ); |
| 229 | 297 | |
| 230 | 298 | if ( $num_posts > 0 ) { |
| 231 | 299 | |
| @@ -231,9 +299,9 @@ | ||
| 231 | 299 | |
| 232 | 300 | $latest_posts = get_posts( [ 'numberposts' => $num_posts ] ); |
| 233 | 301 | $latest_posts_ids = array_map( function( $x ) { return $x->ID; }, $latest_posts ); |
| 234 | 302 | |
| 235 | - if ( isset( $atts['posts'] ) ) { | |
| 303 | + if ( $has_posts ) { | |
| 236 | 304 | error_log( "⚠️ Meow Gallery: in gallery $atts[id] both 'latest_posts' and 'posts' attributes are used in the same shortcode. 'latest_posts' will be merged with 'posts'."); |
| 237 | 305 | $atts['posts'] = array_merge( $latest_posts_ids, explode(',', $atts['posts']) ); |
| 238 | 306 | } |
| 239 | 307 | else { |
| @@ -242,10 +310,17 @@ | ||
| 242 | 310 | } |
| 243 | 311 | |
| 244 | 312 | } |
| 245 | 313 | |
| 314 | + if( $has_attachments ) { | |
| 315 | + $attachmentIds = $this->get_attached_image_ids(); | |
| 316 | + if ( !empty( $attachmentIds ) ) { | |
| 317 | + $image_ids = implode( ',', $attachmentIds ); | |
| 318 | + } | |
| 319 | + } | |
| 320 | + | |
| 246 | 321 | $posts_ids = []; |
| 247 | - if (isset($atts['posts'])) { | |
| 322 | + if ( $has_posts ) { | |
| 248 | 323 | |
| 249 | 324 | $posts_ids = is_array( $atts['posts'] ) ? $atts['posts'] : explode( ',', $atts['posts'] ); |
| 250 | 325 | $featured_images = []; |
| 251 | 326 | |
| @@ -273,23 +348,32 @@ | ||
| 273 | 348 | $image_ids = implode( ',', $ids ); |
| 274 | 349 | |
| 275 | 350 | #endregion |
| 276 | 351 | |
| 277 | - // Use attached images if still empty | |
| 278 | - if ( empty( $image_ids ) ) { | |
| 279 | - $attachments = get_attached_media( 'image' ); | |
| 280 | - $attachmentIds = array_map( function($x) { return $x->ID; }, $attachments ); | |
| 352 | + // Fall back to the attachments of the current post if the gallery is empty and the option is enabled. | |
| 353 | + if ( empty( $image_ids ) && !$has_attachments && $this->get_option( 'use_attachments_on_empty', false ) ) { | |
| 354 | + $attachmentIds = $this->get_attached_image_ids(); | |
| 281 | 355 | if ( !empty( $attachmentIds ) ) { |
| 282 | 356 | $image_ids = implode( ',', $attachmentIds ); |
| 357 | + $has_attachments = true; | |
| 283 | 358 | } |
| 284 | - else { | |
| 285 | - return "<p class='meow-error'><b>Meow Gallery:</b> The gallery is empty.</p>"; | |
| 359 | + } | |
| 360 | + | |
| 361 | + // Use attached images if still empty | |
| 362 | + if ( empty( $image_ids ) ) { | |
| 363 | + | |
| 364 | + if( $has_attachments ) { | |
| 365 | + return "<p class='meow-error'><b>Meow Gallery:</b> No attached medias were found in the current post.</p>"; | |
| 286 | 366 | } |
| 367 | + | |
| 368 | + return "<p class='meow-error'><b>Meow Gallery:</b> The gallery is empty.</p>"; | |
| 287 | 369 | } |
| 288 | 370 | |
| 289 | 371 | if ( $isPreview ) { |
| 290 | 372 | $check = explode( ',', $image_ids ); |
| 291 | - $check = array_slice( $check, 0, 40 ); | |
| 373 | + $total = count( $check ); | |
| 374 | + $check = array_slice( $check, 0, $this->preview_cutoff ); | |
| 375 | + $this->last_preview_counts = [ 'total' => $total, 'shown' => count( $check ) ]; | |
| 292 | 376 | $image_ids = implode( ',', $check ); |
| 293 | 377 | } |
| 294 | 378 | |
| 295 | 379 | // Limit images on archive/listing pages (not viewing the full single post) |
| @@ -330,11 +414,14 @@ | ||
| 330 | 414 | if ( isset( $atts['order_by'] ) ) { |
| 331 | 415 | $orderby = $atts['order_by']; |
| 332 | 416 | } |
| 333 | 417 | |
| 334 | - if( strpos( $orderby, '-' ) === 0 ) { | |
| 335 | - $orderby = explode( '-', $orderby )[0]; | |
| 336 | - $order = explode( '-', $orderby )[1]; | |
| 418 | + if( strpos( $orderby, '-' ) != false ) { | |
| 419 | + $left = explode( '-', $orderby )[0]; | |
| 420 | + $right = explode( '-', $orderby )[1]; | |
| 421 | + | |
| 422 | + $orderby = $left; | |
| 423 | + $order = $right; | |
| 337 | 424 | } |
| 338 | 425 | |
| 339 | 426 | |
| 340 | 427 | $image_ids = explode( ',', $image_ids ); |
| @@ -428,14 +515,21 @@ | ||
| 428 | 515 | $data_gallery_images, |
| 429 | 516 | $data_atts |
| 430 | 517 | ); |
| 431 | 518 | |
| 432 | - // Run at /wp-includes/formatting.php on line 3501 | |
| 433 | - $textarr = preg_split( '/(<.*>)/U', $html , -1, PREG_SPLIT_DELIM_CAPTURE); | |
| 434 | - if ( $textarr === false ) { | |
| 435 | - $error = preg_last_error(); | |
| 436 | - error_log( "[MEOW GALLERY] Regex: " . preg_last_error_msg() . " (Code $error)" ); | |
| 437 | - return "<p class='meow-error'><b>Meow Gallery:</b> There was an error while building the gallery. Check your PHP Logs.</p>"; | |
| 519 | + // Run at /wp-includes/formatting.php on line 6037 | |
| 520 | + // WordPress returns early if the text is simple ASCII without emoji-like content, | |
| 521 | + // so we only need to check preg_split if WordPress would actually run it. | |
| 522 | + $needs_emoji_check = str_contains( $html, '&#x' ) || | |
| 523 | + !( ( function_exists( 'mb_check_encoding' ) && mb_check_encoding( $html, 'ASCII' ) ) || ! preg_match( '/[^\x00-\x7F]/', $html ) ); | |
| 524 | + | |
| 525 | + if ( $needs_emoji_check ) { | |
| 526 | + $textarr = preg_split( '/(<.*>)/U', $html , -1, PREG_SPLIT_DELIM_CAPTURE); | |
| 527 | + if ( $textarr === false ) { | |
| 528 | + $error = preg_last_error(); | |
| 529 | + error_log( "[MEOW GALLERY] Regex: " . preg_last_error_msg() . " (Code $error)" ); | |
| 530 | + return "<p class='meow-error'><b>Meow Gallery:</b> The gallery is too large for your Wordpress pcre.backtrack_limit, increase it in your server settings, or reduce your gallery size."; | |
| 531 | + } | |
| 438 | 532 | } |
| 439 | 533 | |
| 440 | 534 | //The Gallery Container is where the images in the right layout will be rendered. |
| 441 | 535 | $html .= '<div class="mgl-gallery-container"></div>'; |
| @@ -455,9 +549,11 @@ | ||
| 455 | 549 | |
| 456 | 550 | foreach ( $gallery_images as $image ) { |
| 457 | 551 | if ( !empty( $image['link_href'] ) ) { |
| 458 | 552 | // If there is a link, we will get the alt from the image id so we have a proper aria-label |
| 459 | - $aria = get_post_meta( $image['id'], '_wp_attachment_image_alt', true ); | |
| 553 | + $aria_label = __('Open image', MGL_DOMAIN); | |
| 554 | + $aria_value = esc_attr( get_post_meta( $image['id'], '_wp_attachment_image_alt', true ) ); | |
| 555 | + $aria = !empty( $aria_value ) ? $aria_label . ': ' . $aria_value : $aria_label; | |
| 460 | 556 | |
| 461 | 557 | $custom_link_classes = apply_filters( 'mgl_custom_link_classes', '', $image ); |
| 462 | 558 | $html .= '<a class="' . $custom_link_classes . '" href="' . $image['link_href'] . '" target="' . $image['link_target'] . '" rel="' . $image['link_rel'] . |
| 463 | 559 | '" aria-label="' . $aria . '">'; |
| @@ -615,8 +711,26 @@ | ||
| 615 | 711 | static function get_plugin_option_name() { |
| 616 | 712 | return self::$plugin_option_name; |
| 617 | 713 | } |
| 618 | 714 | |
| 715 | + // Tiles density, from the shortcode attributes when they set one, from the options otherwise. | |
| 716 | + // Shared by the front-end settings (Meow_MGL_Run) and the tiles CSS (Meow_MGL_Builders_Tiles). | |
| 717 | + static function get_tiles_density( $atts = [] ) { | |
| 718 | + if ( isset( $atts['density'] ) ) { | |
| 719 | + return array( | |
| 720 | + 'desktop' => $atts['density'], | |
| 721 | + 'tablet' => $atts['density'], | |
| 722 | + 'mobile' => $atts['density'], | |
| 723 | + ); | |
| 724 | + } | |
| 725 | + $options = get_option( self::$plugin_option_name, [] ); | |
| 726 | + return array( | |
| 727 | + 'desktop' => $options['tiles_density'] ?? 'high', | |
| 728 | + 'tablet' => $options['tiles_density_tablet'] ?? 'medium', | |
| 729 | + 'mobile' => $options['tiles_density_mobile'] ?? 'low', | |
| 730 | + ); | |
| 731 | + } | |
| 732 | + | |
| 619 | 733 | static function get_plugin_option( $option_name, $default = null ) { |
| 620 | 734 | $options = get_option( self::$plugin_option_name, null ); |
| 621 | 735 | if ( !empty( $options ) && array_key_exists( $option_name, $options ) ) { |
| 622 | 736 | return $options[$option_name]; |
| @@ -648,8 +762,10 @@ | ||
| 648 | 762 | 'animation' => false, |
| 649 | 763 | 'image_size' => 'srcset', |
| 650 | 764 | 'truncate_on_listing' => true, |
| 651 | 765 | 'truncate_count' => 4, |
| 766 | + 'use_attachments_on_empty' => false, | |
| 767 | + 'debug_logs' => false, | |
| 652 | 768 | |
| 653 | 769 | 'rendering_mode' => 'dom', // Can be 'dom' or 'js' |
| 654 | 770 | 'tiles_gutter' => 10, |
| 655 | 771 | 'tiles_gutter_tablet' => 10, |
| @@ -690,10 +806,13 @@ | ||
| 690 | 806 | |
| 691 | 807 | // Stylish effect options |
| 692 | 808 | 'stylish_enabled' => false, |
| 693 | 809 | 'stylish_border_radius' => 6, |
| 810 | + 'stylish_border_width' => 0, | |
| 811 | + 'stylish_border_color' => '#ffffff', | |
| 694 | 812 | 'stylish_shadow_opacity' => 0.08, |
| 695 | 813 | 'stylish_shadow_opacity_hover' => 0.12, |
| 814 | + 'stylish_hover_lift' => 2, | |
| 696 | 815 | 'stylish_transition_speed' => 250, |
| 697 | 816 | |
| 698 | 817 | //PRO OPTIONS |
| 699 | 818 | 'infinite' => false, |
| @@ -801,8 +920,16 @@ | ||
| 801 | 920 | |
| 802 | 921 | function get_gallery_images( array $image_ids, array $atts, string $layout, string $size, array $posts_ids = []) { |
| 803 | 922 | global $wpdb; |
| 804 | 923 | |
| 924 | + // Enable the image-attribute rewriting (and the 'mgl_sizes' filter) for the duration of this method. | |
| 925 | + // This matters when get_gallery_images() is called directly (e.g. infinite scroll via REST) without | |
| 926 | + // going through gallery(), which is what normally sets these on the initial page load. | |
| 927 | + $previous_gallery_process = $this->gallery_process; | |
| 928 | + $previous_gallery_layout = $this->gallery_layout; | |
| 929 | + $this->gallery_process = true; | |
| 930 | + $this->gallery_layout = $layout; | |
| 931 | + | |
| 805 | 932 | // Escape the array of IDs for SQL |
| 806 | 933 | $ids = array_map( 'intval', $image_ids ); |
| 807 | 934 | $ids_str = implode( ',', $ids ); |
| 808 | 935 | |
| @@ -840,9 +967,12 @@ | ||
| 840 | 967 | } |
| 841 | 968 | $ids = apply_filters( 'mgl_sort', $cleanIds, $images, $layout, $atts ); |
| 842 | 969 | |
| 843 | 970 | if ($layout === 'map') { |
| 844 | - return $this->get_map_images( $ids, $images, $atts ); | |
| 971 | + $map_result = $this->get_map_images( $ids, $images, $atts ); | |
| 972 | + $this->gallery_process = $previous_gallery_process; | |
| 973 | + $this->gallery_layout = $previous_gallery_layout; | |
| 974 | + return $map_result; | |
| 845 | 975 | } |
| 846 | 976 | |
| 847 | 977 | $result = []; |
| 848 | 978 | foreach ($ids as $index => $id) { |
| @@ -895,8 +1025,11 @@ | ||
| 895 | 1025 | |
| 896 | 1026 | $result[] = array_merge( $image, $mergedArray, $orientation ); |
| 897 | 1027 | } |
| 898 | 1028 | |
| 1029 | + $this->gallery_process = $previous_gallery_process; | |
| 1030 | + $this->gallery_layout = $previous_gallery_layout; | |
| 1031 | + | |
| 899 | 1032 | return $result; |
| 900 | 1033 | } |
| 901 | 1034 | |
| 902 | 1035 | private function get_image_class( $id, $layout, $noLightbox ) { |
| @@ -1105,8 +1238,60 @@ | ||
| 1105 | 1238 | } |
| 1106 | 1239 | } |
| 1107 | 1240 | |
| 1108 | 1241 | |
| 1242 | + /** | |
| 1243 | + * Reads the "medias" of a gallery. Only the ordered attachment IDs are stored (older versions | |
| 1244 | + * also stored their URLs and mime types, which are ignored: they were a copy of the Media | |
| 1245 | + * Library that went stale). This is also the shape that gets written back, and all the | |
| 1246 | + * front-end needs. The Admin uses hydrate_medias() to get the URLs to display. | |
| 1247 | + */ | |
| 1248 | + public static function normalize_medias( $medias ) { | |
| 1249 | + $ids = ( is_array( $medias ) && isset( $medias['thumbnail_ids'] ) && is_array( $medias['thumbnail_ids'] ) ) | |
| 1250 | + ? array_values( $medias['thumbnail_ids'] ) : []; | |
| 1251 | + | |
| 1252 | + return [ 'thumbnail_ids' => $ids ]; | |
| 1253 | + } | |
| 1254 | + | |
| 1255 | + /** | |
| 1256 | + * Adds the 'thumbnails' the Admin displays: one entry per ID, with its URLs and mime type | |
| 1257 | + * resolved from the Media Library. Never stale, and a deleted attachment simply gets empty | |
| 1258 | + * URLs (the Admin then shows a placeholder). Not used on the front-end, which only needs | |
| 1259 | + * the IDs. | |
| 1260 | + */ | |
| 1261 | + public static function hydrate_medias( $medias ) { | |
| 1262 | + $ids = self::normalize_medias( $medias )['thumbnail_ids']; | |
| 1263 | + | |
| 1264 | + // One query for all the attachments instead of one per thumbnail. _prime_post_caches() | |
| 1265 | + // only caches the attachments which exist, so anything still absent from the cache | |
| 1266 | + // afterwards is gone: it's skipped instead of being queried on every request. | |
| 1267 | + if ( !empty( $ids ) ) { | |
| 1268 | + _prime_post_caches( array_values( array_unique( array_map( 'intval', $ids ) ) ), false, true ); | |
| 1269 | + } | |
| 1270 | + | |
| 1271 | + $thumbnails = []; | |
| 1272 | + foreach ( $ids as $id ) { | |
| 1273 | + $thumbnail = [ 'id' => $id, 'url' => '', 'zoom_url' => '', 'mime' => '' ]; | |
| 1274 | + | |
| 1275 | + if ( !empty( $id ) && wp_cache_get( (int)$id, 'posts' ) ) { | |
| 1276 | + $mime = get_post_mime_type( $id ) ?: ''; | |
| 1277 | + // Same rule as the latest_photos endpoint: videos have no image sizes, so their | |
| 1278 | + // own URL is used for both the thumbnail and the zoom. | |
| 1279 | + $is_video = strpos( $mime, 'video' ) !== false; | |
| 1280 | + $url = $is_video ? wp_get_attachment_url( $id ) : wp_get_attachment_image_url( $id, 'thumbnail' ); | |
| 1281 | + $zoom = $is_video ? $url : wp_get_attachment_image_url( $id, 'large' ); | |
| 1282 | + | |
| 1283 | + $thumbnail['url'] = $url ?: ''; | |
| 1284 | + $thumbnail['zoom_url'] = $zoom ?: $thumbnail['url']; | |
| 1285 | + $thumbnail['mime'] = $mime; | |
| 1286 | + } | |
| 1287 | + | |
| 1288 | + $thumbnails[] = $thumbnail; | |
| 1289 | + } | |
| 1290 | + | |
| 1291 | + return [ 'thumbnail_ids' => $ids, 'thumbnails' => $thumbnails ]; | |
| 1292 | + } | |
| 1293 | + | |
| 1109 | 1294 | public function get_gallery_by_id( $id ) { |
| 1110 | 1295 | global $wpdb; |
| 1111 | 1296 | $shortcodes_table = $wpdb->prefix . 'mgl_gallery_shortcodes'; |
| 1112 | 1297 | $gallery = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $shortcodes_table WHERE id = %s", $id ), ARRAY_A ); |
| @@ -1113,9 +1298,9 @@ | ||
| 1113 | 1298 | |
| 1114 | 1299 | if ( !$gallery ) { |
| 1115 | 1300 | throw new Exception( __( 'Gallery not found.', MGL_DOMAIN )); |
| 1116 | 1301 | } |
| 1117 | - $gallery['medias'] = maybe_unserialize( $gallery['medias'] ); | |
| 1302 | + $gallery['medias'] = self::normalize_medias( maybe_unserialize( $gallery['medias'] ) ); | |
| 1118 | 1303 | $gallery['posts'] = $gallery['posts'] ? maybe_unserialize( $gallery['posts'] ) : null; |
| 1119 | 1304 | $gallery['tags'] = $gallery['tags'] ? unserialize( $gallery['tags'] ) : null; |
| 1120 | 1305 | |
| 1121 | 1306 | return $gallery; |
| @@ -1132,9 +1317,9 @@ | ||
| 1132 | 1317 | $galleries[$gallery['id']] = [ |
| 1133 | 1318 | 'name' => $gallery['name'], |
| 1134 | 1319 | 'description' => $gallery['description'], |
| 1135 | 1320 | 'layout' => $gallery['layout'], |
| 1136 | - 'medias' => maybe_unserialize( $gallery['medias'] ), | |
| 1321 | + 'medias' => self::normalize_medias( maybe_unserialize( $gallery['medias'] ) ), | |
| 1137 | 1322 | 'lead_image_id' => $gallery['lead_image_id'], |
| 1138 | 1323 | 'order_by' => $gallery['order_by'], |
| 1139 | 1324 | 'is_post_mode' => ( bool )$gallery['is_post_mode'], |
| 1140 | 1325 | 'dynamic_source' => $gallery['dynamic_source'], |
| @@ -1141,8 +1326,10 @@ | ||
| 1141 | 1326 | 'hero' => ( bool )$gallery['is_hero_mode'], |
| 1142 | 1327 | 'posts' => $gallery['posts'] ? maybe_unserialize( $gallery['posts'] ) : null, |
| 1143 | 1328 | 'latest_posts' => $gallery['latest_posts'], |
| 1144 | 1329 | 'tags' => $gallery['tags'] ? unserialize( $gallery['tags'] ) : null, |
| 1330 | + 'dynamic_source' => $gallery['dynamic_source'], | |
| 1331 | + 'rml' => $gallery['rml'] ?? null, | |
| 1145 | 1332 | 'updated' => strtotime( $gallery['updated_at'] ) |
| 1146 | 1333 | ]; |
| 1147 | 1334 | } |
| 1148 | 1335 | return $galleries; |
| @@ -1190,9 +1377,9 @@ | ||
| 1190 | 1377 | $shortcodes[$gallery['id']] = [ |
| 1191 | 1378 | 'name' => $gallery['name'], |
| 1192 | 1379 | 'description' => $gallery['description'], |
| 1193 | 1380 | 'layout' => $gallery['layout'], |
| 1194 | - 'medias' => maybe_unserialize( $gallery['medias'] ), | |
| 1381 | + 'medias' => self::hydrate_medias( maybe_unserialize( $gallery['medias'] ) ), | |
| 1195 | 1382 | 'lead_image_id' => $gallery['lead_image_id'], |
| 1196 | 1383 | 'order_by' => $gallery['order_by'], |
| 1197 | 1384 | 'is_post_mode' => ( bool )$gallery['is_post_mode'], |
| 1198 | 1385 | 'hero' => ( bool )$gallery['is_hero_mode'], |
| @@ -1199,8 +1386,9 @@ | ||
| 1199 | 1386 | 'posts' => $gallery['posts'] ? maybe_unserialize( $gallery['posts'] ) : null, |
| 1200 | 1387 | 'latest_posts' => $gallery['latest_posts'], |
| 1201 | 1388 | 'tags' => $gallery['tags'] ? unserialize( $gallery['tags'] ) : null, |
| 1202 | 1389 | 'dynamic_source' => $gallery['dynamic_source'], |
| 1390 | + 'rml' => $gallery['rml'] ?? null, | |
| 1203 | 1391 | 'rank' => intval( $gallery['pref_rank'] ?? 0 ), |
| 1204 | 1392 | 'updated' => strtotime( $gallery['updated_at'] ) |
| 1205 | 1393 | ]; |
| 1206 | 1394 | } |
| @@ -1210,8 +1398,39 @@ | ||
| 1210 | 1398 | 'galleries' => $shortcodes |
| 1211 | 1399 | ]; |
| 1212 | 1400 | } |
| 1213 | 1401 | |
| 1402 | + /** | |
| 1403 | + * Just the id => name pairs, for the selectors (the Gutenberg block). They only need the | |
| 1404 | + * names, so this avoids shipping every gallery's medias in the page and, unlike | |
| 1405 | + * get_galleries(), it isn't paginated: the selectors used to be capped at 10 entries. | |
| 1406 | + */ | |
| 1407 | + public function get_gallery_names() { | |
| 1408 | + global $wpdb; | |
| 1409 | + $shortcodes_table = $wpdb->prefix . 'mgl_gallery_shortcodes'; | |
| 1410 | + Meow_MGL_Migrations::check_db(); | |
| 1411 | + | |
| 1412 | + $names = []; | |
| 1413 | + $results = $wpdb->get_results( "SELECT id, name FROM $shortcodes_table ORDER BY name ASC", ARRAY_A ); | |
| 1414 | + foreach ( $results as $gallery ) { | |
| 1415 | + $names[$gallery['id']] = [ 'name' => $gallery['name'] ]; | |
| 1416 | + } | |
| 1417 | + return [ 'galleries' => $names ]; | |
| 1418 | + } | |
| 1419 | + | |
| 1420 | + public function get_collection_names() { | |
| 1421 | + global $wpdb; | |
| 1422 | + $collections_table = $wpdb->prefix . 'mgl_collections'; | |
| 1423 | + Meow_MGL_Migrations::check_db(); | |
| 1424 | + | |
| 1425 | + $names = []; | |
| 1426 | + $results = $wpdb->get_results( "SELECT id, name FROM $collections_table ORDER BY name ASC", ARRAY_A ); | |
| 1427 | + foreach ( $results as $collection ) { | |
| 1428 | + $names[$collection['id']] = [ 'name' => $collection['name'] ]; | |
| 1429 | + } | |
| 1430 | + return [ 'collections' => $names ]; | |
| 1431 | + } | |
| 1432 | + | |
| 1214 | 1433 | public function get_collection_by_id( $id ) { |
| 1215 | 1434 | global $wpdb; |
| 1216 | 1435 | $collections_table = $wpdb->prefix . 'mgl_collections'; |
| 1217 | 1436 | $shortcodes_table = $wpdb->prefix . 'mgl_gallery_shortcodes'; |
| @@ -1236,9 +1455,9 @@ | ||
| 1236 | 1455 | 'id' => $gallery['id'], |
| 1237 | 1456 | 'name' => $gallery['name'], |
| 1238 | 1457 | 'description' => $gallery['description'], |
| 1239 | 1458 | 'layout' => $gallery['layout'], |
| 1240 | - 'medias' => unserialize( $gallery['medias'] ), | |
| 1459 | + 'medias' => self::normalize_medias( maybe_unserialize( $gallery['medias'] ) ), | |
| 1241 | 1460 | 'lead_image_id' => $gallery['lead_image_id'], |
| 1242 | 1461 | 'order_by' => $gallery['order_by'], |
| 1243 | 1462 | 'is_post_mode' => ( bool )$gallery['is_post_mode'], |
| 1244 | 1463 | 'hero' => ( bool )$gallery['is_hero_mode'], |
| @@ -1298,9 +1517,9 @@ | ||
| 1298 | 1517 | 'id' => $gallery['id'], |
| 1299 | 1518 | 'name' => $gallery['name'], |
| 1300 | 1519 | 'description' => $gallery['description'], |
| 1301 | 1520 | 'layout' => $gallery['layout'], |
| 1302 | - 'medias' => unserialize( $gallery['medias'] ), | |
| 1521 | + 'medias' => self::hydrate_medias( maybe_unserialize( $gallery['medias'] ) ), | |
| 1303 | 1522 | 'lead_image_id' => $gallery['lead_image_id'], |
| 1304 | 1523 | 'order_by' => $gallery['order_by'], |
| 1305 | 1524 | 'is_post_mode' => ( bool )$gallery['is_post_mode'], |
| 1306 | 1525 | 'hero' => ( bool )$gallery['is_hero_mode'], |
