SD merged

AyeCode · May 16, 2024 · 9394814 · 9394814
1 parent 553fc01
commit 9394814
Show file tree

Hide file tree

Showing 137 changed files with 79 additions and 142 deletions.
diff --git a/.wordpress-org/banner-1544x500.png b/.wordpress-org/banner-1544x500.png
diff --git a/.wordpress-org/banner-772x250.png b/.wordpress-org/banner-772x250.png
diff --git a/.wordpress-org/icon-128x128.jpg b/.wordpress-org/icon-128x128.jpg
diff --git a/.wordpress-org/icon-256x256.jpg b/.wordpress-org/icon-256x256.jpg
diff --git a/.wordpress-org/screenshot-1.png b/.wordpress-org/screenshot-1.png
diff --git a/.wordpress-org/screenshot-2.png b/.wordpress-org/screenshot-2.png
diff --git a/.wordpress-org/screenshot-3.png b/.wordpress-org/screenshot-3.png
diff --git a/.wordpress-org/screenshot-4.png b/.wordpress-org/screenshot-4.png
diff --git a/.wordpress-org/screenshot-5.png b/.wordpress-org/screenshot-5.png
diff --git a/.wordpress-org/screenshot-6.png b/.wordpress-org/screenshot-6.png
diff --git a/.wordpress-org/screenshot-7.png b/.wordpress-org/screenshot-7.png
diff --git a/assets/css/auth.css b/assets/css/auth.css
diff --git a/assets/css/block_editor.css b/assets/css/block_editor.css
diff --git a/assets/css/block_editor.css.map b/assets/css/block_editor.css.map
diff --git a/assets/css/gd_core_frontend.css b/assets/css/gd_core_frontend.css
diff --git a/assets/css/gd_core_frontend.css.map b/assets/css/gd_core_frontend.css.map
diff --git a/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/assets/css/images/ui-bg_flat_75_ffffff_40x100.png b/assets/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/assets/css/images/ui-bg_glass_65_ffffff_1x400.png b/assets/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/assets/css/images/ui-bg_glass_75_dadada_1x400.png b/assets/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png b/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/assets/css/images/ui-icons_222222_256x240.png b/assets/css/images/ui-icons_222222_256x240.png
diff --git a/assets/css/images/ui-icons_2e83ff_256x240.png b/assets/css/images/ui-icons_2e83ff_256x240.png
diff --git a/assets/css/images/ui-icons_454545_256x240.png b/assets/css/images/ui-icons_454545_256x240.png
diff --git a/assets/css/images/ui-icons_888888_256x240.png b/assets/css/images/ui-icons_888888_256x240.png
diff --git a/assets/css/images/ui-icons_cd0a0a_256x240.png b/assets/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/assets/css/style.css b/assets/css/style.css
diff --git a/assets/css/style.css.map b/assets/css/style.css.map
diff --git a/assets/images/404.png b/assets/images/404.png
diff --git a/assets/images/ajax-loader.gif b/assets/images/ajax-loader.gif
diff --git a/assets/images/arrow-img.png b/assets/images/arrow-img.png
diff --git a/assets/images/arrow.png b/assets/images/arrow.png
diff --git a/assets/images/arrow18x11.png b/assets/images/arrow18x11.png
diff --git a/assets/images/arrow_left.gif b/assets/images/arrow_left.gif
diff --git a/assets/images/arrow_left_over.gif b/assets/images/arrow_left_over.gif
diff --git a/assets/images/arrow_right.gif b/assets/images/arrow_right.gif
diff --git a/assets/images/arrow_right_over.gif b/assets/images/arrow_right_over.gif
diff --git a/assets/images/arrows.png b/assets/images/arrows.png
diff --git a/assets/images/arrows_down.png b/assets/images/arrows_down.png
diff --git a/assets/images/b_reply.png b/assets/images/b_reply.png
diff --git a/assets/images/bg_direction_nav.png b/assets/images/bg_direction_nav.png
diff --git a/assets/images/bg_jRatingInfos.png b/assets/images/bg_jRatingInfos.png
diff --git a/assets/images/block-placeholder-map.png b/assets/images/block-placeholder-map.png
diff --git a/assets/images/cal.gif b/assets/images/cal.gif
diff --git a/assets/images/chosen-sprite.png b/assets/images/chosen-sprite.png
diff --git a/assets/images/[email protected] b/assets/images/[email protected]
diff --git a/assets/images/classic-loader.gif b/assets/images/classic-loader.gif
diff --git a/assets/images/classic-map.png b/assets/images/classic-map.png
diff --git a/assets/images/close.gif b/assets/images/close.gif
diff --git a/assets/images/close_over.gif b/assets/images/close_over.gif
diff --git a/assets/images/comment_left.png b/assets/images/comment_left.png
diff --git a/assets/images/cross-img.png b/assets/images/cross-img.png
diff --git a/assets/images/delete.png b/assets/images/delete.png
diff --git a/assets/images/down-arrow18x11.png b/assets/images/down-arrow18x11.png
diff --git a/assets/images/downarrow-img.png b/assets/images/downarrow-img.png
diff --git a/assets/images/dummy-avatar-1.png b/assets/images/dummy-avatar-1.png
diff --git a/assets/images/dummy-avatar-2.png b/assets/images/dummy-avatar-2.png
diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico
diff --git a/assets/images/featured.png b/assets/images/featured.png
diff --git a/assets/images/fullscreen.png b/assets/images/fullscreen.png
diff --git a/assets/images/gd-logo-dark.png b/assets/images/gd-logo-dark.png
diff --git a/assets/images/gd-logo-grey.png b/assets/images/gd-logo-grey.png
diff --git a/assets/images/geo-logo.png b/assets/images/geo-logo.png
diff --git a/assets/images/geo-logoalter.png b/assets/images/geo-logoalter.png
diff --git a/assets/images/google-maps.jpg b/assets/images/google-maps.jpg
diff --git a/assets/images/gravatar.png b/assets/images/gravatar.png
diff --git a/assets/images/gravatar2.png b/assets/images/gravatar2.png
diff --git a/assets/images/i_clock.png b/assets/images/i_clock.png
diff --git a/assets/images/i_comment2.png b/assets/images/i_comment2.png
diff --git a/assets/images/i_fav.png b/assets/images/i_fav.png
diff --git a/assets/images/i_location_2.png b/assets/images/i_location_2.png
diff --git a/assets/images/i_phone.png b/assets/images/i_phone.png
diff --git a/assets/images/i_rss.png b/assets/images/i_rss.png
diff --git a/assets/images/i_website.png b/assets/images/i_website.png
diff --git a/assets/images/icon-address.png b/assets/images/icon-address.png
diff --git a/assets/images/icon-delete.png b/assets/images/icon-delete.png
diff --git a/assets/images/icon-edit.png b/assets/images/icon-edit.png
diff --git a/assets/images/icon-upgrade.png b/assets/images/icon-upgrade.png
diff --git a/assets/images/icondefault.png b/assets/images/icondefault.png
diff --git a/assets/images/leftarrow-img.png b/assets/images/leftarrow-img.png
diff --git a/assets/images/lightbox-blank.gif b/assets/images/lightbox-blank.gif
diff --git a/assets/images/lightbox-btn-close.gif b/assets/images/lightbox-btn-close.gif
diff --git a/assets/images/lightbox-btn-next.gif b/assets/images/lightbox-btn-next.gif
diff --git a/assets/images/lightbox-btn-prev.gif b/assets/images/lightbox-btn-prev.gif
diff --git a/assets/images/lightbox-ico-loading.gif b/assets/images/lightbox-ico-loading.gif
diff --git a/assets/images/loading.gif b/assets/images/loading.gif
diff --git a/assets/images/loading2.gif b/assets/images/loading2.gif
diff --git a/assets/images/loadingAnimation.gif b/assets/images/loadingAnimation.gif
diff --git a/assets/images/minus-white-icon.png b/assets/images/minus-white-icon.png
diff --git a/assets/images/move.png b/assets/images/move.png
diff --git a/assets/images/new.png b/assets/images/new.png
diff --git a/assets/images/next.png b/assets/images/next.png
diff --git a/assets/images/osm.jpg b/assets/images/osm.jpg
diff --git a/assets/images/pin.png b/assets/images/pin.png
diff --git a/assets/images/plus-white-icon.png b/assets/images/plus-white-icon.png
diff --git a/assets/images/rightarrow-img.png b/assets/images/rightarrow-img.png
diff --git a/assets/images/small.png b/assets/images/small.png
diff --git a/assets/images/spacer.gif b/assets/images/spacer.gif
diff --git a/assets/images/sprite.png b/assets/images/sprite.png
diff --git a/assets/images/stars.png b/assets/images/stars.png
diff --git a/assets/images/t-image1.png b/assets/images/t-image1.png
diff --git a/assets/images/t-image2.png b/assets/images/t-image2.png
diff --git a/assets/images/tab-seprator.jpg b/assets/images/tab-seprator.jpg
diff --git a/assets/images/transparent-bg.png b/assets/images/transparent-bg.png
diff --git a/assets/images/ui-bg_flat_75_ffffff_40x100.png b/assets/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/assets/images/ui-bg_glass_55_fbf9ee_1x400.png b/assets/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/assets/images/ui-bg_glass_65_ffffff_1x400.png b/assets/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/assets/images/ui-bg_glass_75_dadada_1x400.png b/assets/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/assets/images/ui-bg_glass_75_e6e6e6_1x400.png b/assets/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/assets/images/ui-bg_glass_95_fef1ec_1x400.png b/assets/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/assets/images/ui-icons_datepicker.png b/assets/images/ui-icons_datepicker.png
diff --git a/assets/images/ui-icons_datepicker_h.png b/assets/images/ui-icons_datepicker_h.png
diff --git a/assets/images/warning-icon.png b/assets/images/warning-icon.png
diff --git a/assets/images/x.png b/assets/images/x.png
diff --git a/assets/js/geodirectory.js b/assets/js/geodirectory.js
@@ -1614,7 +1614,7 @@ function geodir_animate_markers() {
 
 /**
  * Test if browser local storage is available.
- * 
+ *
  * @returns {boolean}
  */
 function geodir_is_localstorage() {
@@ -1972,4 +1972,4 @@ function geodir_init_listings_carousel(el, index) {
         $el.find(wEl).addClass('geodir-slides');
         geodir_init_slider($el.prop('id'));
     }
-}
+}
diff --git a/assets/leaflet/images/layers-2x.png b/assets/leaflet/images/layers-2x.png
diff --git a/assets/leaflet/images/layers.png b/assets/leaflet/images/layers.png
diff --git a/assets/leaflet/images/marker-icon-2x.png b/assets/leaflet/images/marker-icon-2x.png
diff --git a/assets/leaflet/images/marker-icon.png b/assets/leaflet/images/marker-icon.png
diff --git a/assets/leaflet/images/marker-shadow.png b/assets/leaflet/images/marker-shadow.png
diff --git a/assets/leaflet/routing/leaflet.routing.icons.png b/assets/leaflet/routing/leaflet.routing.icons.png
diff --git a/assets/leaflet/routing/routing-icon.png b/assets/leaflet/routing/routing-icon.png
diff --git a/includes/admin/images/t-image1.png b/includes/admin/images/t-image1.png
diff --git a/includes/admin/images/t-image2.png b/includes/admin/images/t-image2.png
diff --git a/includes/widgets/class-geodir-widget-post-title.php b/includes/widgets/class-geodir-widget-post-title.php
@@ -172,7 +172,7 @@ public function output( $instance = array(), $args = array(), $content = '' ) {
 		 * @param array $args Widget arguments.
 		 * @param object $this The GeoDir_Widget_Post_Title object.
 		 */
-		$title_tag = empty( $instance['tag'] ) ? 'h2' : apply_filters( 'geodir_widget_gd_post_title_tag', $tag, $instance, $args, $this );
+		$title_tag = apply_filters( 'geodir_widget_gd_post_title_tag', $tag, $instance, $args, $this );
 
 		$design_style = geodir_design_style();
 		$classes = '';
@@ -186,7 +186,7 @@ public function output( $instance = array(), $args = array(), $content = '' ) {
 			}
 
 			// wrapper class
-			$wrap_class = geodir_build_aui_class($instance);
+			$wrap_class = sd_build_aui_class($instance);
 			$classes .= " ".$wrap_class;
 
 			if ( !empty( $instance['text_color'] ) ) { $link_class .= "text-".sanitize_html_class($instance['text_color']); }

diff --git a/languages/geodirectory-en_US.mo b/languages/geodirectory-en_US.mo
diff --git a/readme.txt b/readme.txt
@@ -311,6 +311,7 @@ __WARNING: GDv2 is a significant update over GDv1 and may require manual work, s
 * Add to favorite action is not working - FIXED
 * Booking Availability field is not working properly with Fast AJAX - FIXED
 * GD > Post Meta post_type field support added - CHANGED
+* GD > Post title widget not respecting the GD > Listings SEO heading setting - FIXED
 
 = GeoDirectory v2.3.52 - 2024-05-09 =
 * AUI radio set should skip showing optgroup from option values - FIXED

diff --git a/vendor/ayecode/wp-super-duper/change-log.txt b/vendor/ayecode/wp-super-duper/change-log.txt
@@ -1,3 +1,7 @@
+= 1.1.40 - 2024-05-16 =
+* Block Visibility condition not working for CPT non-supported fields - FIXED
+* Block label dynamic name not working for containers - FIXED
+
 = 1.1.39 - 2024-04-18 =
 * Better block recovery - UPDATED
 

diff --git a/vendor/ayecode/wp-super-duper/icons/placeholder.png b/vendor/ayecode/wp-super-duper/icons/placeholder.png
diff --git a/vendor/ayecode/wp-super-duper/sd-functions.php b/vendor/ayecode/wp-super-duper/sd-functions.php
@@ -2614,6 +2614,10 @@ function sd_build_aui_class( $args ) {
 		}
 	}
 
+	if ( ! empty( $classes ) ) {
+		$classes = array_unique( array_filter( array_map( 'trim', $classes ) ) );
+	}
+
 	return implode( ' ', $classes );
 }
 
@@ -2753,7 +2757,7 @@ function sd_build_hover_styles( $args, $is_preview = false ) {
 }
 
 /**
- * Try to get a CSS color varibale for a given value.
+ * Try to get a CSS color variable for a given value.
  *
  * @param $var
  *
@@ -3371,6 +3375,7 @@ function sd_block_check_rule_gd_field( $rule ) {
 		if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
 			$address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
 			$field = array();
+			$empty_field = false;
 
 			$standard_fields = sd_visibility_gd_standard_fields();
 
@@ -3389,7 +3394,7 @@ function sd_block_check_rule_gd_field( $rule ) {
 				}
 
 				if ( empty( $field ) ) {
-					return false;
+					$empty_field = true;
 				}
 			}
 
@@ -3410,7 +3415,7 @@ function sd_block_check_rule_gd_field( $rule ) {
 			$is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
 			$is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
 
-			$match_value = isset($find_post->{$match_field}) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
+			$match_value = isset( $find_post->{$match_field} ) && empty( $empty_field ) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
 			$match_found = $match_field === '' ? true : false;
 
 			if ( ! $match_found ) {
@@ -3457,6 +3462,45 @@ function sd_block_check_rule_gd_field( $rule ) {
 			}
 
 			$match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
+		} else {
+			$field = array();
+
+			// Parse search.
+			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+
+			$match_value = '';
+			$match_found = $match_field === '' ? true : false;
+
+			if ( ! $match_found ) {
+				switch ( $args['condition'] ) {
+					case 'is_equal':
+						$match_found = (bool) ( $search != '' && $match_value == $search );
+						break;
+					case 'is_not_equal':
+						$match_found = (bool) ( $search != '' && $match_value != $search );
+						break;
+					case 'is_greater_than':
+						$match_found = false;
+						break;
+					case 'is_less_than':
+						$match_found = false;
+						break;
+					case 'is_empty':
+						$match_found = true;
+						break;
+					case 'is_not_empty':
+						$match_found = false;
+						break;
+					case 'is_contains':
+						$match_found = false;
+						break;
+					case 'is_not_contains':
+						$match_found = false;
+						break;
+				}
+			}
+
+			$match_found = apply_filters( 'geodir_post_badge_check_match_found_empty', $match_found, $args, $find_post );
 		}
 	}
 

diff --git a/vendor/ayecode/wp-super-duper/wp-super-duper.php b/vendor/ayecode/wp-super-duper/wp-super-duper.php
@@ -5,7 +5,7 @@
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-    define( 'SUPER_DUPER_VER', '1.1.39' );
+    define( 'SUPER_DUPER_VER', '1.1.40' );
 
     /**
      * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
@@ -2484,7 +2484,7 @@ function sd_get_class_build_keys(){
                         },
                         __experimentalLabel( attributes, { context } ) {
                             var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
-                            var metadata_name = attributes && attributes.metadata && attributes.metadata.name ? attributes.metadata.name : '<?php echo esc_attr( addslashes( $this->options['name'] ) ); ?>';
+                            var metadata_name = attributes && attributes.metadata && attributes.metadata.name ? attributes.metadata.name : '';
                             var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr( addslashes( $this->options['name'] ) ) . "'"; ?>;
                             return metadata_name ? metadata_name + visibility_html  : label_name + visibility_html;
                         },

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -246,24 +246,24 @@
         },
         {
             "name": "ayecode/wp-super-duper",
-            "version": "1.1.39",
-            "version_normalized": "1.1.39.0",
+            "version": "1.1.40",
+            "version_normalized": "1.1.40.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AyeCode/wp-super-duper.git",
-                "reference": "b6d557cee33213e8b775d4ec595209bab4b8c440"
+                "reference": "dec351e70c34f843bb9edfc7f2a4a1a54ca1f877"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/b6d557cee33213e8b775d4ec595209bab4b8c440",
-                "reference": "b6d557cee33213e8b775d4ec595209bab4b8c440",
+                "url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/dec351e70c34f843bb9edfc7f2a4a1a54ca1f877",
+                "reference": "dec351e70c34f843bb9edfc7f2a4a1a54ca1f877",
                 "shasum": ""
             },
             "require": {
                 "composer/installers": "~1.0",
                 "php": ">=5.3.0"
             },
-            "time": "2024-04-18T10:11:36+00:00",
+            "time": "2024-05-16T12:49:17+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -295,7 +295,7 @@
             ],
             "support": {
                 "issues": "https://github.com/AyeCode/wp-super-duper/issues",
-                "source": "https://github.com/AyeCode/wp-super-duper/tree/1.1.39"
+                "source": "https://github.com/AyeCode/wp-super-duper/tree/1.1.40"
             },
             "install-path": "../ayecode/wp-super-duper"
         },

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'ayecode/geodirectory',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'ad2064f097572c4e645f7463d6e0e74ef853be2b',
+        'reference' => '553fc019b888363de87b0f341d2817c780b26cd7',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -22,7 +22,7 @@
         'ayecode/geodirectory' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'ad2064f097572c4e645f7463d6e0e74ef853be2b',
+            'reference' => '553fc019b888363de87b0f341d2817c780b26cd7',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -65,9 +65,9 @@
             'dev_requirement' => false,
         ),
         'ayecode/wp-super-duper' => array(
-            'pretty_version' => '1.1.39',
-            'version' => '1.1.39.0',
-            'reference' => 'b6d557cee33213e8b775d4ec595209bab4b8c440',
+            'pretty_version' => '1.1.40',
+            'version' => '1.1.40.0',
+            'reference' => 'dec351e70c34f843bb9edfc7f2a4a1a54ca1f877',
             'type' => 'library',
             'install_path' => __DIR__ . '/../ayecode/wp-super-duper',
             'aliases' => array(),