Changeset 3672480

Timestamp:

08/30/2026 11:51:52 AM (7 weeks ago)

Author:

sitehale

Message:

SiteHale 0.7.53

Location:

sitehale/trunk

Files:

• admin/class-sitehale-checkup.php (modified) (15 diffs)
• includes/class-sitehale-health.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• sitehale.php (modified) (2 diffs)

sitehale/trunk/admin/class-sitehale-checkup.php

@@ -334 +334 @@
                         'plain_permalinks' => ( '' === (string) get_option( 'permalink_structure' ) ),
                         'seo_plugin'      => self::active_seo_plugin(),
+                        'sitehale_seo'    => self::sitehale_renders(),
                         'core_sitemaps'   => (bool) $sitemaps,
                         // Block themes never declare title-tag support — core renders their
@@ -375 +376 @@
         }
 
+        /**
+         * Whether THIS plugin's SEO module is the one rendering here.
+         *
+         * ⚠️ Not "is SiteHale installed" — on this page it always is. The module
+         * ships dormant, and stays dormant on a site it was never switched over
+         * for: a wordpress.org install gets an admin-only plugin that renders
+         * nothing on the front end. Installed and rendering are different facts
+         * and only the second one belongs in a report about search results.
+         *
+         * Asking the renderer's own gate keeps one owner for that answer rather
+         * than a second copy of it here — the gate is not a plugin census either
+         * (it turns on the guard's "who is actually rendering" measurement), and a
+         * reimplementation would drift from it in exactly the cases it exists for.
+         *
+         * The bug this fixes: the SEO card shipped in 0.6.0 knowing only the five
+         * rivals above, so every client switched over to our own module read back
+         * as "No SEO plugin detected" — and graded `warn` for it — while SiteHale
+         * was writing its titles and descriptions.
+         *
+         * @return bool
+         */
+        public static function sitehale_renders() {
+                return class_exists( 'SiteHale_SEO_Head' ) && SiteHale_SEO_Head::should_render();
+        }
+
         public static function grade_seo( $data ) {
                 $status = 'ok';
@@ -388 +414 @@
                         $status = self::worst_of( $status, 'warn' );
                 }
-                if ( empty( $data['seo_plugin'] ) ) {
+                // Who owns meta rendering, for the reader. Our own module answers this
+                // first: when it renders, the guard is clear, so no rival is rendering
+                // even on the clients that still carry one installed.
+                $engine = ! empty( $data['sitehale_seo'] ) ? 'SiteHale' : (string) $data['seo_plugin'];
+                if ( '' === $engine ) {
                         $status = self::worst_of( $status, 'warn' );
                 }
@@ -396 +426 @@
 
                 // Who serves the sitemap, and where. Every major SEO plugin replaces
-                // core's /wp-sitemap.xml with its own /sitemap.xml.
+                // core's /wp-sitemap.xml with its own /sitemap.xml. ⚠️ Keyed on the
+                // RIVAL, deliberately, not on $engine: our own module keeps core's
+                // sitemap and filters it (SiteHale_SEO_Sitemap), so a switched-over
+                // site serves /wp-sitemap.xml and reporting /sitemap.xml would send
+                // the reader to a redirect at best.
                 $sitemap_url = '';
                 if ( ! empty( $data['seo_plugin'] ) ) {
@@ -411 +445 @@
                         'noindex'          => $noindex,
                         'plain_permalinks' => ! empty( $data['plain_permalinks'] ),
-                        'seo_plugin'       => (string) $data['seo_plugin'],
+                        'seo_plugin'       => $engine,
                         'sitemap_url'      => $sitemap_url,
                         'title_tag'        => ! empty( $data['title_tag'] ),
@@ -745 +779 @@
         }
 
-        protected static function card_close( $pitch ) {
-                if ( $pitch && ! SiteHale_Connect::is_connected() ) {
-                        echo '<p style="margin:12px 0 0;padding-top:10px;border-top:1px solid #f0f0f1;color:#646970;font-size:12px;"><span class="dashicons dashicons-heart" style="font-size:14px;width:14px;height:14px;color:#2563EB;"></span> ' . esc_html( $pitch ) . '</p>';
+        /**
+         * Who ACTS on each card's findings, by plan. Not who reports them — this
+         * page reports all of it to everyone, free included.
+         *
+         * 'fix'   SiteHale does the work. Nothing for the owner to do.
+         * 'watch' SiteHale watches and alerts a human. The fix is still someone's,
+         *         and saying otherwise on a client's own dashboard would be the
+         *         false all-clear this plugin exists to prevent.
+         *
+         * `upsell` is the line a CARE client sees on a card only Managed acts on.
+         * It is the one place a paying client is sold anything, and it is honest:
+         * those two cards really are the Managed labor, not a feature gate.
+         *
+         * ⚠️ Environment EOL is deliberately absent. A PHP or database version
+         * lives in the hosting account and no plan of ours changes it — see the
+         * note the Updates card prints for itself.
+         *
+         * @return array
+         */
+        protected static function coverage() {
+                return array(
+                        'cron'    => array( 'care' => 'watch', 'managed' => 'watch' ),
+                        'errors'  => array( 'care' => 'watch', 'managed' => 'watch' ),
+                        'db'      => array(
+                                'care'    => 'watch',
+                                'managed' => 'fix',
+                                'upsell'  => __( 'Managed adds database optimization and verified weekly backups, applied for you.', 'sitehale' ),
+                        ),
+                        'updates' => array(
+                                'care'    => 'watch',
+                                'managed' => 'fix',
+                                'upsell'  => __( 'Managed applies these updates for you, staging-tested first when they are risky.', 'sitehale' ),
+                        ),
+                        'seo'     => array( 'care' => 'fix', 'managed' => 'fix' ),
+                        'admins'  => array( 'care' => 'watch', 'managed' => 'watch' ),
+                        'mail'    => array( 'care' => 'watch', 'managed' => 'watch' ),
+                        'history' => array( 'care' => 'watch', 'managed' => 'watch' ),
+                );
+        }
+
+        /**
+         * The footer line: on a free site the pitch, on a paying one the answer to
+         * "so is somebody dealing with this?".
+         *
+         * ⚠️ Gated on the PLAN, never on the connection. Connecting is free and
+         * provisions nothing, so a connected-but-unactivated site is not being
+         * watched by anyone — it needs the pitch like any other free site. This
+         * line used to check `SiteHale_Connect::is_connected()` and those sites
+         * silently got no footer at all, which is the mistake
+         * `SiteHale_Reports::active_plan()` documents in its own docblock.
+         *
+         * @param string $pitch Free-tier line for this card.
+         * @param string $key   Coverage key, '' for a card nobody acts on.
+         * @return string
+         */
+        protected static function coverage_line( $pitch, $key ) {
+                $plan = class_exists( 'SiteHale_Reports' ) ? SiteHale_Reports::active_plan() : '';
+                if ( '' === $plan ) {
+                        return (string) $pitch;
+                }
+                $cov = self::coverage();
+                if ( '' === $key || ! isset( $cov[ $key ][ $plan ] ) ) {
+                        return '';
+                }
+                $label = class_exists( 'SiteHale_Health' ) ? SiteHale_Health::plan_label() : $plan;
+
+                // A Care client on a Managed-only card: tell them who acts, which is
+                // nobody yet, rather than implying we already do.
+                if ( 'care' === $plan && ! empty( $cov[ $key ]['upsell'] ) && 'fix' === $cov[ $key ]['managed'] ) {
+                        /* translators: 1: what Managed adds, 2: the site's current plan */
+                        return sprintf( __( '%1$s Your plan: %2$s.', 'sitehale' ), $cov[ $key ]['upsell'], $label );
+                }
+
+                if ( 'fix' === $cov[ $key ][ $plan ] ) {
+                        /* translators: %s: the site's plan */
+                        return sprintf( __( 'SiteHale is handling this for you — nothing to do here. Your plan: %s.', 'sitehale' ), $label );
+                }
+                /* translators: %s: the site's plan */
+                return sprintf( __( 'SiteHale is watching this and alerts a human if it changes. Your plan: %s.', 'sitehale' ), $label );
+        }
+
+        protected static function card_close( $pitch, $key = '' ) {
+                $line = self::coverage_line( $pitch, $key );
+                if ( '' !== $line ) {
+                        echo '<p style="margin:12px 0 0;padding-top:10px;border-top:1px solid #f0f0f1;color:#646970;font-size:12px;"><span class="dashicons dashicons-heart" style="font-size:14px;width:14px;height:14px;color:#2563EB;"></span> ' . esc_html( $line ) . '</p>';
                 }
                 echo '</div>';
@@ -877 +993 @@
                                 );
                         }
-                        self::card_close( __( 'SiteHale watches cron health on your site every day, automatically — and alerts a human when it dies.', 'sitehale' ) );
+                        self::card_close( __( 'SiteHale watches cron health on your site every day, automatically — and alerts a human when it dies.', 'sitehale' ), 'cron' );
 
                         /* ---- PHP errors ---- */
@@ -971 +1087 @@
                                 }
                         }
-                        self::card_close( __( 'Fatal errors often never email anyone. SiteHale reads these logs weekly and reports the signatures that repeat.', 'sitehale' ) );
+                        self::card_close( __( 'Fatal errors often never email anyone. SiteHale reads these logs weekly and reports the signatures that repeat.', 'sitehale' ), 'errors' );
 
                         /* ---- Database health ---- */
@@ -1006 +1122 @@
                                 )
                         );
-                        self::card_close( __( 'SiteHale runs this exact report monthly on every client site, plus weekly verified database backups.', 'sitehale' ) );
+                        self::card_close( __( 'SiteHale runs this exact report monthly on every client site, plus weekly verified database backups.', 'sitehale' ), 'db' );
 
                         /* ---- Updates + environment EOL ---- */
@@ -1037 +1153 @@
                                 echo '<p style="font-weight:600;">' . esc_html( $row['label'] ) . '</p>';
                         }
+                        if ( $updates['eol'] && class_exists( 'SiteHale_Reports' ) && SiteHale_Reports::is_watched() ) {
+                                // ⚠️ Said out loud on purpose. Everything else on this card is
+                                // something a plan acts on, so silence here reads as "they have
+                                // it" — and a PHP or database version lives in the hosting
+                                // account, where no automation of ours reaches. g2computers has
+                                // sat on an EOL database for exactly this reason: it needs the
+                                // client and their host, not us.
+                                echo '<p style="color:#646970;font-size:13px;">' . esc_html__( 'PHP and database versions are set in your hosting account. SiteHale reports them, but changing one is a job for your host — ask them to move you to a supported version.', 'sitehale' ) . '</p>';
+                        }
                         if ( ! $updates['eol'] ) {
                                 printf(
@@ -1050 +1175 @@
                                 );
                         }
-                        self::card_close( __( 'SiteHale tracks updates weekly and stages risky plugin updates on a copy of the site before they ever touch production.', 'sitehale' ) );
+                        self::card_close( __( 'SiteHale tracks updates weekly and stages risky plugin updates on a copy of the site before they ever touch production.', 'sitehale' ), 'updates' );
 
                         /* ---- SEO basics (v0.6) ---- */
@@ -1092 +1217 @@
                                 echo '<p style="color:#646970;font-size:13px;">' . esc_html__( 'The site tagline is empty or still the WordPress default — on many themes it shows in the browser title and in search results.', 'sitehale' ) . '</p>';
                         }
-                        self::card_close( __( 'SiteHale runs full SEO audits monthly — titles, descriptions, keywords, broken links, and rankings from Google Search Console — and fixes what it finds.', 'sitehale' ) );
+                        self::card_close( __( 'SiteHale runs full SEO audits monthly — titles, descriptions, keywords, broken links, and rankings from Google Search Console — and fixes what it finds.', 'sitehale' ), 'seo' );
 
                         /* ---- Administrators ---- */
@@ -1110 +1235 @@
                         echo '</p>';
                         echo '<p>' . esc_html__( 'If any of these names surprises you, investigate now — a new administrator you did not create is the classic sign of a compromise.', 'sitehale' ) . '</p>';
-                        self::card_close( __( 'SiteHale keeps a baseline of this list and alerts the moment a new administrator appears.', 'sitehale' ) );
+                        self::card_close( __( 'SiteHale keeps a baseline of this list and alerts the moment a new administrator appears.', 'sitehale' ), 'admins' );
 
                         /* ---- Mail test ---- */
@@ -1122 +1247 @@
                         </form>
                         <?php
-                        self::card_close( __( 'SiteHale probes deliverability weekly and confirms actual arrival in a real inbox — not just that WordPress accepted the message.', 'sitehale' ) );
+                        self::card_close( __( 'SiteHale probes deliverability weekly and confirms actual arrival in a real inbox — not just that WordPress accepted the message.', 'sitehale' ), 'mail' );
 
                         /* ---- Email this checkup (v0.4) ---- */
@@ -1178 +1303 @@
                                 </table>
                                 <?php
-                                self::card_close( __( 'SiteHale clients get this watching continuously — with a human on the alerts, not a table you have to remember to read.', 'sitehale' ) );
+                                self::card_close( __( 'SiteHale clients get this watching continuously — with a human on the alerts, not a table you have to remember to read.', 'sitehale' ), 'history' );
                         endif;
 

sitehale/trunk/includes/class-sitehale-health.php

@@ -280 +280 @@
         }
 
-        protected static function plan_label() {
-                $plan = get_option( 'sitehale_plan', '' );
+        /**
+         * The site's plan, for a human.
+         *
+         * ⚠️ Derives from `SiteHale_Reports::active_plan()` rather than reading
+         * the option itself. It used to carry its own copy of the two-signal rule
+         * (option, else "a stored report proves Care"), which is the same
+         * procedure written twice — and the Site Checkup footer now names this
+         * plan to a client, so a label that drifted from the plan the rest of the
+         * plugin acts on would be worse than a wrong word.
+         *
+         * Public because the Checkup prints it; behaviour is unchanged.
+         *
+         * @return string
+         */
+        public static function plan_label() {
+                $plan = class_exists( 'SiteHale_Reports' ) ? SiteHale_Reports::active_plan() : '';
                 if ( 'managed' === $plan ) {
                         return __( 'Managed', 'sitehale' );
                 }
-                if ( 'care' === $plan || ( class_exists( 'SiteHale_Reports' ) && SiteHale_Reports::index() ) ) {
+                if ( 'care' === $plan ) {
                         return __( 'Care', 'sitehale' );
                 }

sitehale/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 0.7.52
+Stable tag: 0.7.53
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -130 +130 @@
 == Upgrade Notice ==
 
+= 0.7.53 =
+Fixes Site Checkup reporting "No SEO plugin detected" on sites whose SEO is managed by SiteHale itself, and each section now says who acts on what it finds. Sites using another SEO plugin, or none, read exactly as before.
+
 = 0.7.51 =
 Housekeeping only: no change to how the plugin behaves. Shops keep their review stars in search results when SiteHale manages their SEO, and a product with no reviews publishes no rating rather than a zero-star one.
@@ -172 +175 @@
 
 == Changelog ==
+
+= 0.7.53 =
+* Site Checkup now recognises SiteHale itself as the SEO plugin on a site whose SEO it manages. Sites switched over to SiteHale were told "No SEO plugin detected" — and had the SEO section marked as needing attention for it — while SiteHale was writing their titles and descriptions. Sites using another SEO plugin, or none, are unaffected and read exactly as before.
+* Site Checkup now tells you who acts on each finding. On a Care or Managed site each section says whether SiteHale is handling it for you or watching it and alerting a human, so a section marked "Needs attention" no longer reads as a job waiting on you when it isn't. The status itself is unchanged — it still describes your site, not your plan.
+* An end-of-life PHP or database version now says plainly that it is set in your hosting account and your host has to change it. No plan of ours can.
+* Fixes the free-plan footer disappearing on a site that had connected to SiteHale but was never activated. Connecting is free and provisions nothing, so those sites are on the free plan and should read like it.
 
 = 0.7.52 =

sitehale/trunk/sitehale.php

@@ -4 +4 @@
  * Plugin URI:        https://sitehale.com/how-it-works/
  * Description:       Free Site Checkup (cron, PHP errors, database, updates, admins, SEO basics, disk, mail) plus the companion to the SiteHale managed care service. Sends nothing anywhere until you click Connect.
- * Version:           0.7.52
+ * Version:           0.7.53
  * Requires at least: 5.7
  * Requires PHP:      7.4
@@ -30 +30 @@
 }
 
-define( 'SITEHALE_VERSION', '0.7.52' );
+define( 'SITEHALE_VERSION', '0.7.53' );
 define( 'SITEHALE_PLUGIN_FILE', __FILE__ );
 define( 'SITEHALE_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );