diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d60308..11acaf7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - php: ["7.4", "8.1"] + php: ["7.0", "7.4", "8.1"] steps: - uses: actions/checkout@v4 @@ -85,6 +85,13 @@ jobs: working-directory: src run: bash tests/install-wp-tests.sh wordpress_test root root 127.0.0.1 ${{ matrix.wordpress }} true + - name: Install WordPress test polyfills + run: | + mkdir -p /tmp/wordpress-test-tools + composer require --working-dir=/tmp/wordpress-test-tools --no-interaction --no-progress yoast/phpunit-polyfills:^4.0 phpunit/phpunit:^9.6 + - name: Run tests working-directory: src + env: + WP_TESTS_PHPUNIT_POLYFILLS_PATH: /tmp/wordpress-test-tools/vendor/yoast/phpunit-polyfills run: phpunit diff --git a/CHANGELOG b/CHANGELOG index 5146f29..772366b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,12 @@ # Changelog +## Unreleased + +* FIX: Resolve Plugin Check findings while preserving existing markup and customization hooks +* FIX: Support open-house timezone conversion on WordPress 4.7 through 5.2 +* IMPROVE: Bundle the existing fallback listing photo and use cached WordPress counts for Legacy Pages +* REQUIRE: WordPress 4.7 or later; PHP 7.0.27 or later remains supported + ## 3.3.0 * FIX: Escape API error messages to prevent reflected cross-site scripting on listing pages diff --git a/src/assets/img/default-property.jpg b/src/assets/img/default-property.jpg new file mode 100644 index 0000000..1015402 Binary files /dev/null and b/src/assets/img/default-property.jpg differ diff --git a/src/phpunit.xml b/src/phpunit.xml index 44f0fdb..9fa13ad 100644 --- a/src/phpunit.xml +++ b/src/phpunit.xml @@ -7,7 +7,7 @@ convertWarningsToExceptions="true" > - + ./tests/ diff --git a/src/readme.txt b/src/readme.txt index 704c56a..6d8df45 100644 --- a/src/readme.txt +++ b/src/readme.txt @@ -2,8 +2,9 @@ Author: SimplyRETS Contributors: SimplyRETS Tags: real estate, idx, mls, rets, reso web api -Requires at least: 3.0.1 -Tested up to: 7.0 +Requires at least: 4.7 +Requires PHP: 7.0.27 +Tested up to: 7.1 Stable tag: 3.3.0 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -235,6 +236,13 @@ listing sidebar widget. == Changelog == += Unreleased = + +* FIX: Resolve Plugin Check findings while preserving existing markup and customization hooks +* FIX: Support open-house timezone conversion on WordPress 4.7 through 5.2 +* IMPROVE: Bundle the existing fallback listing photo and use cached WordPress counts for Legacy Pages +* REQUIRE: WordPress 4.7 or later; PHP 7.0.27 or later remains supported + = 3.3.0 = * FIX: Escape API error messages to prevent reflected cross-site scripting on listing pages diff --git a/src/simply-rets-admin.php b/src/simply-rets-admin.php index 950b3e4..a009f8d 100644 --- a/src/simply-rets-admin.php +++ b/src/simply-rets-admin.php @@ -19,19 +19,24 @@ class SrAdminSettings { + public static function invalidateLegacyPageCounts() { + SimplyRetsSetup::invalidateLegacyPageCounts(); + } + public static function canManageLegacyPages() { $post_type = get_post_type_object('sr-listings'); return $post_type && current_user_can('manage_options') && current_user_can($post_type->cap->edit_posts); } public static function hasLegacyPages() { - global $wpdb; // Look for persisted posts only, including drafts, private pages and trash. // Automatic drafts are editor placeholders; dynamic routes are not stored. - return $wpdb->get_var($wpdb->prepare( - "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_status NOT IN (%s, %s) LIMIT 1", - 'sr-listings', 'auto-draft', 'inherit' - )) !== null; + foreach (wp_count_posts('sr-listings') as $status => $count) { + if ($status !== 'auto-draft' && $status !== 'inherit' && $count > 0) { + return true; + } + } + return false; } public static function legacyPagesSettingsUrl() { diff --git a/src/simply-rets-openhouses.php b/src/simply-rets-openhouses.php index f6f158d..38d4aa6 100644 --- a/src/simply-rets-openhouses.php +++ b/src/simply-rets-openhouses.php @@ -12,6 +12,28 @@ class SimplyRetsOpenHouses { + /** Get the site's timezone on WordPress versions before and after 5.3. */ + private static function siteTimezone() { + if (function_exists('wp_timezone')) { + return wp_timezone(); + } + + $timezone_string = get_option('timezone_string'); + if (!$timezone_string) { + $offset = (float) get_option('gmt_offset'); + $hours = (int) $offset; + $minutes = ($offset - $hours) * 60; + $timezone_string = sprintf( + '%s%02d:%02d', + $offset < 0 ? '-' : '+', + abs($hours), + abs($minutes) + ); + } + + return new DateTimeZone($timezone_string); + } + /** * Get open house data for a listingId. * Return an empty array if no openhouses exist. @@ -41,7 +63,8 @@ public static function getOpenHouseDateTimes($openhouse) { */ // 1. Get the setting. - $timezone_setting = get_option("sr_date_default_timezone", wp_timezone()); + $site_timezone = self::siteTimezone(); + $timezone_setting = get_option("sr_date_default_timezone", $site_timezone); $timezone_name_string = ''; // 2. Reliably get the timezone *string* name @@ -50,7 +73,7 @@ public static function getOpenHouseDateTimes($openhouse) { } elseif (is_string($timezone_setting) && !empty($timezone_setting)) { $timezone_name_string = $timezone_setting; } else { - $timezone_name_string = wp_timezone_string(); + $timezone_name_string = timezone_name_get($site_timezone); } // 3. Create a DateTimeZone object from the string @@ -59,7 +82,7 @@ public static function getOpenHouseDateTimes($openhouse) { // 4. Validation if ($display_time_zone_object === false) { // Fall back to the default WP timezone object - $display_time_zone_object = wp_timezone(); + $display_time_zone_object = $site_timezone; } // 5. Create DateTime objects FROM the UTC string. @@ -225,12 +248,12 @@ class="sr-photo"
- < class="sr-listing-address"> + < class="sr-listing-address"> - - > + >
diff --git a/src/simply-rets-renderer.php b/src/simply-rets-renderer.php index 5689cc6..551459d 100644 --- a/src/simply-rets-renderer.php +++ b/src/simply-rets-renderer.php @@ -1994,7 +1994,7 @@ public static function renderSearchForm($atts) {
- < class="sr-search-heading">Advanced Listings Search> + < class="sr-search-heading">Advanced Listings Search>
@@ -2177,7 +2177,7 @@ public static function renderSearchForm($atts) { ?>
- < class="sr-search-heading">Search Listings> + < class="sr-search-heading">Search Listings> diff --git a/src/simply-rets-setup.php b/src/simply-rets-setup.php index f0a899d..fac9f30 100644 --- a/src/simply-rets-setup.php +++ b/src/simply-rets-setup.php @@ -9,6 +9,12 @@ class SimplyRetsSetup { + public static function invalidateLegacyPageCounts() { + // Core clears counts on status transitions, but not every deletion or + // post-type change. Follow post cache invalidation for both cases. + wp_cache_delete('posts-sr-listings', 'counts'); + } + public static function srActivate() { SimplyRetsSetup::srRegisterPostType(); SimplyRetsApiClient::srUpdateAdvSearchOptions(); diff --git a/src/simply-rets-utils.php b/src/simply-rets-utils.php index 749ec9b..9ea19b2 100644 --- a/src/simply-rets-utils.php +++ b/src/simply-rets-utils.php @@ -527,8 +527,7 @@ public static function mkMLSText() { class SrListing { - public static $default_photo = - "https://s3-us-west-2.amazonaws.com/simplyrets/trial/properties/defprop.jpg"; + public static $default_photo = ''; public static function normalizeListingPhotoUrl($url) { $force_https = get_option("sr_listing_force_image_https", false); @@ -595,6 +594,9 @@ public static function getBathroomsDisplay( } +// Initialize the public URL once so existing integrations can still override it. +SrListing::$default_photo = plugins_url('assets/img/default-property.jpg', __FILE__); + class SrMessages { public static function noResultsMsg($response) { diff --git a/src/simply-rets.php b/src/simply-rets.php index c4e7277..08f672e 100644 --- a/src/simply-rets.php +++ b/src/simply-rets.php @@ -5,6 +5,8 @@ Description: Show your Real Estate listings on your Wordpress site. SimplyRETS provides a very simple set up and full control over your listings. Author: SimplyRETS Version: 3.3.0 +Requires at least: 4.7 +Requires PHP: 7.0.27 License: GNU General Public License v3 or later Copyright (c) SimplyRETS 2014 - 2026 @@ -36,6 +38,8 @@ require_once(plugin_dir_path(__FILE__) . 'simply-rets-contact-form.php'); require_once(plugin_dir_path(__FILE__) . 'simply-rets-analytics.php'); +// Post counts must also stay fresh for cron, REST and command-line writes. +add_action('clean_post_cache', array('SimplyRetsSetup', 'invalidateLegacyPageCounts')); if (is_admin()) { require_once(plugin_dir_path(__FILE__) . 'simply-rets-admin.php'); diff --git a/src/tests/bootstrap.php b/src/tests/bootstrap.php index 2965117..38c2fd9 100644 --- a/src/tests/bootstrap.php +++ b/src/tests/bootstrap.php @@ -1,11 +1,17 @@ factory->user->create(array('role' => $role)); wp_set_current_user($user_id); @@ -101,6 +105,34 @@ public function testSynthesizedListingRoutesDoNotTriggerTransition() { } } + public function testCachedCountsFollowStatusChangesAndCustomStatuses() { + global $wp_post_statuses; + register_post_status('sr-custom', array('public' => true)); + try { + $this->assertFalse(SrAdminSettings::hasLegacyPages()); + $post_id = $this->factory->post->create(array('post_type' => 'sr-listings', 'post_status' => 'auto-draft')); + $this->assertFalse(SrAdminSettings::hasLegacyPages()); + foreach (array('sr-custom', 'draft', 'private', 'trash') as $status) { + wp_update_post(array('ID' => $post_id, 'post_status' => $status)); + $this->assertTrue(SrAdminSettings::hasLegacyPages(), $status); + // Repeated reads exercise WordPress's cached counts. + $this->assertTrue(SrAdminSettings::hasLegacyPages(), $status . ' cached'); + } + wp_update_post(array('ID' => $post_id, 'post_status' => 'inherit')); + $this->assertFalse(SrAdminSettings::hasLegacyPages()); + wp_update_post(array('ID' => $post_id, 'post_status' => 'publish')); + $this->assertTrue(SrAdminSettings::hasLegacyPages()); + wp_update_post(array('ID' => $post_id, 'post_type' => 'page')); + $this->assertFalse(SrAdminSettings::hasLegacyPages()); + wp_update_post(array('ID' => $post_id, 'post_type' => 'sr-listings')); + $this->assertTrue(SrAdminSettings::hasLegacyPages()); + wp_delete_post($post_id, true); + $this->assertFalse(SrAdminSettings::hasLegacyPages()); + } finally { + unset($wp_post_statuses['sr-custom']); + } + } + public function testNoticeAndTabRequireSettingsAndPageEditingPermissions() { $this->factory->post->create(array('post_type' => 'sr-listings')); foreach (array('subscriber', 'editor') as $role) { diff --git a/src/tests/test-plugin-check-compatibility.php b/src/tests/test-plugin-check-compatibility.php new file mode 100644 index 0000000..d3d3a72 --- /dev/null +++ b/src/tests/test-plugin-check-compatibility.php @@ -0,0 +1,122 @@ + $start, + 'endTime' => gmdate('Y-m-d\TH:i:s\Z', strtotime($start) + 7200), + 'listing' => (object) array( + 'mlsId' => 123, + 'listingId' => 'MLS123', + 'listPrice' => 250000, + 'internetAddressDisplay' => true, + 'photos' => array(), + 'address' => (object) array('full' => '123 Main St', 'city' => 'Austin', 'state' => 'TX', 'postalCode' => '78701'), + 'property' => (object) array('bedrooms' => 2, 'bathrooms' => 2, 'bathsFull' => 2, 'area' => 1000), + 'mls' => (object) array('status' => 'Active', 'area' => ''), + 'geo' => (object) array('county' => ''), + 'office' => (object) array('name' => 'Example Office'), + 'agent' => (object) array('firstName' => 'Example', 'lastName' => 'Agent'), + ), + ); + } + + public function testSiteTimezoneKeepsDaylightSavingRules() { + delete_option('sr_date_default_timezone'); + update_option('timezone_string', 'America/Chicago'); + $winter = SimplyRetsOpenHouses::getOpenHouseDateTimes($this->openHouse()); + $summer = SimplyRetsOpenHouses::getOpenHouseDateTimes($this->openHouse('2026-07-11T21:00:00Z')); + $this->assertSame('3:00pm - 5:00pm', $winter['time']); + $this->assertSame('4:00pm - 6:00pm', $summer['time']); + } + + public function testSiteTimezoneSupportsFractionalOffsets() { + delete_option('sr_date_default_timezone'); + update_option('timezone_string', ''); + foreach (array('5.75' => '2:45am - 4:45am', '-3.5' => '5:30pm - 7:30pm', '0' => '9:00pm - 11:00pm') as $offset => $expected) { + update_option('gmt_offset', $offset); + $times = SimplyRetsOpenHouses::getOpenHouseDateTimes($this->openHouse()); + $this->assertSame('' . $expected . '', $times['time']); + } + } + + public function testConfiguredTimezoneOverridesSiteTimezone() { + update_option('timezone_string', 'America/Chicago'); + foreach (array('UTC', new DateTimeZone('UTC')) as $timezone) { + update_option('sr_date_default_timezone', $timezone); + $times = SimplyRetsOpenHouses::getOpenHouseDateTimes($this->openHouse()); + $this->assertSame('9:00pm - 11:00pm', $times['time']); + } + foreach (array('', false, 'Invalid/Timezone') as $timezone) { + update_option('sr_date_default_timezone', $timezone); + // PHP warns about the deliberately invalid timezone before falling back. + $times = @SimplyRetsOpenHouses::getOpenHouseDateTimes($this->openHouse()); + $this->assertSame('3:00pm - 5:00pm', $times['time']); + } + } + + public function testSearchHeadingFiltersPreserveTagsAndFormInterfaces() { + foreach (array('h2', 'div', 'h3 onclick="alert(1)"', '<>', '') as $raw_tag) { + $filter = function() use ($raw_tag) { return $raw_tag; }; + add_filter('simplyrets_search_heading_tag', $filter); + try { + $tag = tag_escape($raw_tag); + $tag = $tag ? $tag : 'h3'; + foreach (array(false, true) as $advanced) { + $markup = SimplyRetsRenderer::renderSearchForm(array('advanced' => $advanced ? 'true' : 'false')); + $text = $advanced ? 'Advanced Listings Search' : 'Search Listings'; + $this->assertStringContainsString('<' . $tag . ' class="sr-search-heading">' . $text . '', $markup); + $this->assertStringContainsString('name="sr-listings" value="sr-search"', $markup); + $this->assertStringNotContainsString('onclick=', $markup); + } + } finally { + remove_filter('simplyrets_search_heading_tag', $filter); + } + } + } + + public function testOpenHouseHeadingFilterPreservesTagsAndListingWrapper() { + foreach (array('h2', 'div', 'h4 onclick="alert(1)"', '<>', '') as $raw_tag) { + $filter = function() use ($raw_tag) { return $raw_tag; }; + add_filter('simplyrets_listing_heading_tag', $filter); + try { + $tag = tag_escape($raw_tag); + $tag = $tag ? $tag : 'h4'; + $markup = SimplyRetsOpenHouses::openHouseSearchResultMarkup($this->openHouse(), array()); + $this->assertStringContainsString('<' . $tag . ' class="sr-listing-address">', $markup); + $this->assertStringContainsString('', $markup); + $this->assertStringContainsString('class="sr-listing-data-wrapper"', $markup); + $this->assertStringNotContainsString('onclick=', $markup); + } finally { + remove_filter('simplyrets_listing_heading_tag', $filter); + } + } + } + + public function testFallbackPhotoIsBundledAndRemainsOverridable() { + $listing = $this->openHouse()->listing; + $default_photo = SrListing::$default_photo; + $this->assertSame(plugins_url('assets/img/default-property.jpg', dirname(dirname(__FILE__)) . '/simply-rets-utils.php'), $default_photo); + $this->assertFileExists(dirname(__FILE__) . '/../assets/img/default-property.jpg'); + try { + foreach (array($default_photo, 'https://example.com/custom-placeholder.jpg') as $url) { + SrListing::$default_photo = $url; + $this->assertSame($url, SrListing::mainPhotoOrDefault($listing)); + $gallery = SimplyRetsRenderer::srDetailsGallery($listing); + $this->assertSame("", $gallery['markup']); + $this->assertSame('', $gallery['more']); + } + $listing->photos = array('http://example.com/listing.jpg'); + update_option('sr_listing_force_image_https', false); + $this->assertSame('http://example.com/listing.jpg', SrListing::mainPhotoOrDefault($listing)); + update_option('sr_listing_force_image_https', true); + $this->assertSame('https://example.com/listing.jpg', SrListing::mainPhotoOrDefault($listing)); + } finally { + SrListing::$default_photo = $default_photo; + } + } +} diff --git a/src/tests/test-post-count-cache.php b/src/tests/test-post-count-cache.php new file mode 100644 index 0000000..ce72ea2 --- /dev/null +++ b/src/tests/test-post-count-cache.php @@ -0,0 +1,31 @@ +assertFalse(is_admin()); + $this->assertFalse(has_action('admin_notices', array('SrAdminSettings', 'legacyPagesNotice'))); + + $post_id = $this->factory->post->create(array( + 'post_type' => 'sr-listings', + 'post_status' => 'publish', + )); + $this->assertSame(1, (int) wp_count_posts('sr-listings')->publish); + + // Post-type changes keep the status unchanged, so core's status + // transition invalidation does not refresh the cached counts. + wp_update_post(array('ID' => $post_id, 'post_type' => 'page')); + $this->assertSame('publish', get_post_status($post_id)); + $this->assertSame(0, (int) wp_count_posts('sr-listings')->publish); + + wp_update_post(array('ID' => $post_id, 'post_type' => 'sr-listings')); + $this->assertSame(1, (int) wp_count_posts('sr-listings')->publish); + + wp_delete_post($post_id, true); + $this->assertSame(0, (int) wp_count_posts('sr-listings')->publish); + } +}