Changeset 3745311

Timestamp:

10/14/2026 04:50:54 AM (3 days ago)

Author:

zubbin

Message:

Release 2.2.16 via Zubbin admin publisher

Location:

zubbin-uptime-node

Files:

• tags/2.2.16 (copied) (copied from zubbin-uptime-node/trunk )
• tags/2.2.16/includes/admin.php (modified) (6 diffs)
• tags/2.2.16/includes/class-zubbin-uptime-api-client.php (modified) (1 diff)
• tags/2.2.16/readme.txt (modified) (2 diffs)
• tags/2.2.16/zubbin-uptime-node.php (modified) (2 diffs)
• trunk/includes/admin.php (modified) (6 diffs)
• trunk/includes/class-zubbin-uptime-api-client.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/zubbin-uptime-node.php (modified) (2 diffs)

zubbin-uptime-node/tags/2.2.16/includes/admin.php

@@ -18 +18 @@
     add_action('admin_post_zubbin_un_start_checkout', [__CLASS__, 'start_checkout']);
     add_action('admin_post_zubbin_un_open_portal', [__CLASS__, 'open_portal']);
+    add_action('admin_post_zubbin_un_open_dashboard', [__CLASS__, 'open_dashboard']);
   }
 
@@ -33 +34 @@
     add_action("admin_post_zubbin_un_start_checkout", [__CLASS__, "start_checkout"]);
     add_action("admin_post_zubbin_un_open_portal", [__CLASS__, "open_portal"]);
+    add_action("admin_post_zubbin_un_open_dashboard", [__CLASS__, "open_dashboard"]);
   }
   /**
@@ -110 +112 @@
     echo '<span style="display:inline-flex;align-items:center;padding:8px 14px;border-radius:999px;background:#eff6ff;color:#1d4ed8;font-weight:800;">' . esc_html($planName) . '</span>';
     echo '<span style="font-size:13px;color:#64748b;font-weight:700;">' . esc_html($statusMeta) . '</span>';
+    if ($connected) self::dashboard_button(__('Open my Z UpTime dashboard', 'zubbin-uptime-node'), false);
     echo '</div>';
 
@@ -128 +131 @@
       echo '<div style="margin:16px 0;padding:16px 18px;border:1px solid #fcd34d;background:#fffbeb;border-radius:12px;">';
       echo '<div style="font-weight:800;color:#92400e;margin-bottom:6px;">This site is monitoring, but not yet linked to your account</div>';
-      echo '<div style="color:#78350f;">Enter this claim code in your Z UpTime dashboard to take ownership:</div>';
+      echo '<div style="color:#78350f;margin-bottom:10px;">Create your free account and open your dashboard in one click:</div>';
+      self::dashboard_button(__('Create my account & open dashboard', 'zubbin-uptime-node'), true);
+      echo '<div style="color:#78350f;margin-top:12px;">Already have an account? Enter this claim code in your Z UpTime dashboard:</div>';
       echo '<div style="margin:10px 0;font-size:22px;font-weight:900;letter-spacing:.12em;color:#1f2937;">' . esc_html($claimCode) . '</div>';
       if ($connectUrl !== '') {
@@ -134 +139 @@
       }
       echo ' <span style="color:#92400e;font-size:13px;">…or paste your registration token under <strong>Settings</strong> for instant ownership.</span>';
+      echo '</div>';
+    }
+
+    if ($siteStatus === 'pending_upgrade') {
+      echo '<div style="margin:16px 0;padding:16px 18px;border:1px solid #fcd34d;background:#fffbeb;border-radius:12px;">';
+      echo '<div style="font-weight:800;color:#92400e;margin-bottom:6px;">' . esc_html__('Connected — upgrade to start monitoring', 'zubbin-uptime-node') . '</div>';
+      echo '<div style="color:#78350f;margin-bottom:10px;">' . esc_html__('This site is linked to your Z UpTime account, but your plan\'s site limit is already reached, so it is not being monitored yet. Upgrade your plan and monitoring starts automatically.', 'zubbin-uptime-node') . '</div>';
+      self::dashboard_button(__('Open my dashboard to upgrade', 'zubbin-uptime-node'), true);
       echo '</div>';
     }
@@ -1794 +1807 @@
   }
 
+  /** A small admin-post form: only administrators see it, and it carries a nonce. */
+  static function dashboard_button($label, $primary = true) {
+    echo '<form method="post" action="' . esc_url(admin_url('admin-post.php')) . '" style="display:inline-block;margin:0;">';
+    echo '<input type="hidden" name="action" value="zubbin_un_open_dashboard" />';
+    wp_nonce_field('zubbin_un_open_dashboard');
+    echo '<button type="submit" class="button' . ($primary ? ' button-primary' : '') . '">' . esc_html($label) . '</button>';
+    echo '</form>';
+  }
+
+  /**
+   * "Open my Z UpTime dashboard". Only an administrator can press it, which is
+   * the proof of ownership the server needs to create an account for an unclaimed
+   * site. For a site that already has an account, the server emails that account
+   * a sign-in link instead — it never logs anyone straight into an existing account.
+   */
+  static function open_dashboard() {
+    if (!current_user_can('manage_options')) wp_die('Forbidden');
+    check_admin_referer('zubbin_un_open_dashboard');
+
+    $back = admin_url('admin.php?page=zubbin_un');
+    $s = ZUBBIN_UN_Settings::get();
+    if (!ZUBBIN_UN_Settings::paired($s)) {
+      set_transient('zubbin_un_flash_notice', ['type' => 'warning', 'message' => __('This site is not connected to Z UpTime yet. Use the Onboarding tab first.', 'zubbin-uptime-node')], 60);
+      wp_safe_redirect($back);
+      exit;
+    }
+
+    $user = wp_get_current_user();
+    $r = Zubbin_Uptime_Api_Client::dashboard_link((string) $user->user_email, (string) $user->display_name);
+    $body = is_array($r['body'] ?? null) ? $r['body'] : [];
+
+    // Keep the ownership state the server reports (e.g. unclaimed → active).
+    if (!empty($body['status'])) {
+      $status = sanitize_text_field((string) $body['status']);
+      $update = ['site_status' => $status];
+      if ($status !== 'unclaimed') $update['claim_code'] = '';
+      ZUBBIN_UN_Settings::save($update);
+    }
+
+    if (($body['action'] ?? '') === 'redirect' && !empty($body['url'])) {
+      $target = esc_url_raw((string) $body['url']);
+      $host = wp_parse_url($target, PHP_URL_HOST);
+      if ($host) {
+        add_filter('allowed_redirect_hosts', function ($hosts) use ($host) {
+          if (!in_array($host, $hosts, true)) $hosts[] = $host;
+          return $hosts;
+        });
+      }
+      wp_safe_redirect($target);
+      exit;
+    }
+
+    $ok = !empty($body['success']);
+    $msg = (string) ($body['message'] ?? $body['error'] ?? '');
+    if ($msg === '') {
+      $msg = $ok
+        ? __('Check your email for a sign-in link.', 'zubbin-uptime-node')
+        : sprintf(
+            /* translators: %s: HTTP status */
+            __('Could not reach Z UpTime (HTTP %s). Please try again in a minute.', 'zubbin-uptime-node'),
+            (string) (int) ($r['status'] ?? 0)
+          );
+    }
+    set_transient('zubbin_un_flash_notice', ['type' => $ok ? 'success' : 'warning', 'message' => $msg], 60);
+    wp_safe_redirect($back);
+    exit;
+  }
+
   static function open_portal() {
     if (!current_user_can('manage_options')) wp_die('Forbidden');

zubbin-uptime-node/tags/2.2.16/includes/class-zubbin-uptime-api-client.php

@@ -392 +392 @@
             'billing_period' => $cadence === 'yearly' ? 'yearly' : 'monthly',
             'return_url' => admin_url('admin.php?page=zubbin_un&tab=upgrade'),
+        ]);
+    }
+
+    /**
+     * Ask Z UpTime for a way into the customer dashboard on behalf of the logged-in
+     * WordPress administrator. The server either returns a one-time login URL (a new
+     * account was just created for this site) or emails a sign-in link to the
+     * account that owns the site.
+     */
+    public static function dashboard_link(string $adminEmail, string $adminName): array
+    {
+        $settings = self::settings();
+
+        return self::request('POST', '/api/wp/portal-link', [
+            'site_token'  => (string) ($settings['site_token'] ?? ''),
+            'admin_email' => $adminEmail,
+            'admin_name'  => $adminName,
         ]);
     }

zubbin-uptime-node/tags/2.2.16/readme.txt

@@ -3 +3 @@
 Tags: uptime, uptime monitoring, site health, monitoring, security
 Requires at least: 6.0
-Tested up to: 7.0
+Tested up to: 7.1
 Requires PHP: 8.0
-Stable tag: 2.2.15
+Stable tag: 2.2.16
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -91 +91 @@
 
 == Changelog ==
+
+= 2.2.16 =
+* New: "Open my Z UpTime dashboard" button in the plugin screen. For a site that is not linked to an account yet it
+  creates your free account and opens the dashboard in one click — no claim code to copy.
+* New: if your plan's site limit is reached, the site is still linked to your account and the plugin says so, with a
+  link to upgrade. Previously it was left unlinked.
+* Tested up to WordPress 7.1.
 
 = 2.2.15 =

zubbin-uptime-node/tags/2.2.16/zubbin-uptime-node.php

@@ -3 +3 @@
  * Plugin Name: Z UpTime by Zubbin – Uptime & Site Health Monitoring
  * Description: WordPress site connector for the Zubbin monitoring platform. Sends heartbeat and inventory data to Zubbin for uptime and health monitoring.
- * Version: 2.2.15
+ * Version: 2.2.16
  * Author: Zubbin
  * Text Domain: zubbin-uptime-node
@@ -15 +15 @@
 if (!defined('ABSPATH')) exit;
 
-define('ZUBBIN_UN_VERSION', '2.2.15');
+define('ZUBBIN_UN_VERSION', '2.2.16');
 
 // Can be overridden in wp-config.php:

zubbin-uptime-node/trunk/includes/admin.php

@@ -18 +18 @@
     add_action('admin_post_zubbin_un_start_checkout', [__CLASS__, 'start_checkout']);
     add_action('admin_post_zubbin_un_open_portal', [__CLASS__, 'open_portal']);
+    add_action('admin_post_zubbin_un_open_dashboard', [__CLASS__, 'open_dashboard']);
   }
 
@@ -33 +34 @@
     add_action("admin_post_zubbin_un_start_checkout", [__CLASS__, "start_checkout"]);
     add_action("admin_post_zubbin_un_open_portal", [__CLASS__, "open_portal"]);
+    add_action("admin_post_zubbin_un_open_dashboard", [__CLASS__, "open_dashboard"]);
   }
   /**
@@ -110 +112 @@
     echo '<span style="display:inline-flex;align-items:center;padding:8px 14px;border-radius:999px;background:#eff6ff;color:#1d4ed8;font-weight:800;">' . esc_html($planName) . '</span>';
     echo '<span style="font-size:13px;color:#64748b;font-weight:700;">' . esc_html($statusMeta) . '</span>';
+    if ($connected) self::dashboard_button(__('Open my Z UpTime dashboard', 'zubbin-uptime-node'), false);
     echo '</div>';
 
@@ -128 +131 @@
       echo '<div style="margin:16px 0;padding:16px 18px;border:1px solid #fcd34d;background:#fffbeb;border-radius:12px;">';
       echo '<div style="font-weight:800;color:#92400e;margin-bottom:6px;">This site is monitoring, but not yet linked to your account</div>';
-      echo '<div style="color:#78350f;">Enter this claim code in your Z UpTime dashboard to take ownership:</div>';
+      echo '<div style="color:#78350f;margin-bottom:10px;">Create your free account and open your dashboard in one click:</div>';
+      self::dashboard_button(__('Create my account & open dashboard', 'zubbin-uptime-node'), true);
+      echo '<div style="color:#78350f;margin-top:12px;">Already have an account? Enter this claim code in your Z UpTime dashboard:</div>';
       echo '<div style="margin:10px 0;font-size:22px;font-weight:900;letter-spacing:.12em;color:#1f2937;">' . esc_html($claimCode) . '</div>';
       if ($connectUrl !== '') {
@@ -134 +139 @@
       }
       echo ' <span style="color:#92400e;font-size:13px;">…or paste your registration token under <strong>Settings</strong> for instant ownership.</span>';
+      echo '</div>';
+    }
+
+    if ($siteStatus === 'pending_upgrade') {
+      echo '<div style="margin:16px 0;padding:16px 18px;border:1px solid #fcd34d;background:#fffbeb;border-radius:12px;">';
+      echo '<div style="font-weight:800;color:#92400e;margin-bottom:6px;">' . esc_html__('Connected — upgrade to start monitoring', 'zubbin-uptime-node') . '</div>';
+      echo '<div style="color:#78350f;margin-bottom:10px;">' . esc_html__('This site is linked to your Z UpTime account, but your plan\'s site limit is already reached, so it is not being monitored yet. Upgrade your plan and monitoring starts automatically.', 'zubbin-uptime-node') . '</div>';
+      self::dashboard_button(__('Open my dashboard to upgrade', 'zubbin-uptime-node'), true);
       echo '</div>';
     }
@@ -1794 +1807 @@
   }
 
+  /** A small admin-post form: only administrators see it, and it carries a nonce. */
+  static function dashboard_button($label, $primary = true) {
+    echo '<form method="post" action="' . esc_url(admin_url('admin-post.php')) . '" style="display:inline-block;margin:0;">';
+    echo '<input type="hidden" name="action" value="zubbin_un_open_dashboard" />';
+    wp_nonce_field('zubbin_un_open_dashboard');
+    echo '<button type="submit" class="button' . ($primary ? ' button-primary' : '') . '">' . esc_html($label) . '</button>';
+    echo '</form>';
+  }
+
+  /**
+   * "Open my Z UpTime dashboard". Only an administrator can press it, which is
+   * the proof of ownership the server needs to create an account for an unclaimed
+   * site. For a site that already has an account, the server emails that account
+   * a sign-in link instead — it never logs anyone straight into an existing account.
+   */
+  static function open_dashboard() {
+    if (!current_user_can('manage_options')) wp_die('Forbidden');
+    check_admin_referer('zubbin_un_open_dashboard');
+
+    $back = admin_url('admin.php?page=zubbin_un');
+    $s = ZUBBIN_UN_Settings::get();
+    if (!ZUBBIN_UN_Settings::paired($s)) {
+      set_transient('zubbin_un_flash_notice', ['type' => 'warning', 'message' => __('This site is not connected to Z UpTime yet. Use the Onboarding tab first.', 'zubbin-uptime-node')], 60);
+      wp_safe_redirect($back);
+      exit;
+    }
+
+    $user = wp_get_current_user();
+    $r = Zubbin_Uptime_Api_Client::dashboard_link((string) $user->user_email, (string) $user->display_name);
+    $body = is_array($r['body'] ?? null) ? $r['body'] : [];
+
+    // Keep the ownership state the server reports (e.g. unclaimed → active).
+    if (!empty($body['status'])) {
+      $status = sanitize_text_field((string) $body['status']);
+      $update = ['site_status' => $status];
+      if ($status !== 'unclaimed') $update['claim_code'] = '';
+      ZUBBIN_UN_Settings::save($update);
+    }
+
+    if (($body['action'] ?? '') === 'redirect' && !empty($body['url'])) {
+      $target = esc_url_raw((string) $body['url']);
+      $host = wp_parse_url($target, PHP_URL_HOST);
+      if ($host) {
+        add_filter('allowed_redirect_hosts', function ($hosts) use ($host) {
+          if (!in_array($host, $hosts, true)) $hosts[] = $host;
+          return $hosts;
+        });
+      }
+      wp_safe_redirect($target);
+      exit;
+    }
+
+    $ok = !empty($body['success']);
+    $msg = (string) ($body['message'] ?? $body['error'] ?? '');
+    if ($msg === '') {
+      $msg = $ok
+        ? __('Check your email for a sign-in link.', 'zubbin-uptime-node')
+        : sprintf(
+            /* translators: %s: HTTP status */
+            __('Could not reach Z UpTime (HTTP %s). Please try again in a minute.', 'zubbin-uptime-node'),
+            (string) (int) ($r['status'] ?? 0)
+          );
+    }
+    set_transient('zubbin_un_flash_notice', ['type' => $ok ? 'success' : 'warning', 'message' => $msg], 60);
+    wp_safe_redirect($back);
+    exit;
+  }
+
   static function open_portal() {
     if (!current_user_can('manage_options')) wp_die('Forbidden');

zubbin-uptime-node/trunk/includes/class-zubbin-uptime-api-client.php

@@ -392 +392 @@
             'billing_period' => $cadence === 'yearly' ? 'yearly' : 'monthly',
             'return_url' => admin_url('admin.php?page=zubbin_un&tab=upgrade'),
+        ]);
+    }
+
+    /**
+     * Ask Z UpTime for a way into the customer dashboard on behalf of the logged-in
+     * WordPress administrator. The server either returns a one-time login URL (a new
+     * account was just created for this site) or emails a sign-in link to the
+     * account that owns the site.
+     */
+    public static function dashboard_link(string $adminEmail, string $adminName): array
+    {
+        $settings = self::settings();
+
+        return self::request('POST', '/api/wp/portal-link', [
+            'site_token'  => (string) ($settings['site_token'] ?? ''),
+            'admin_email' => $adminEmail,
+            'admin_name'  => $adminName,
         ]);
     }

zubbin-uptime-node/trunk/readme.txt

@@ -3 +3 @@
 Tags: uptime, uptime monitoring, site health, monitoring, security
 Requires at least: 6.0
-Tested up to: 7.0
+Tested up to: 7.1
 Requires PHP: 8.0
-Stable tag: 2.2.15
+Stable tag: 2.2.16
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -91 +91 @@
 
 == Changelog ==
+
+= 2.2.16 =
+* New: "Open my Z UpTime dashboard" button in the plugin screen. For a site that is not linked to an account yet it
+  creates your free account and opens the dashboard in one click — no claim code to copy.
+* New: if your plan's site limit is reached, the site is still linked to your account and the plugin says so, with a
+  link to upgrade. Previously it was left unlinked.
+* Tested up to WordPress 7.1.
 
 = 2.2.15 =

zubbin-uptime-node/trunk/zubbin-uptime-node.php

@@ -3 +3 @@
  * Plugin Name: Z UpTime by Zubbin – Uptime & Site Health Monitoring
  * Description: WordPress site connector for the Zubbin monitoring platform. Sends heartbeat and inventory data to Zubbin for uptime and health monitoring.
- * Version: 2.2.15
+ * Version: 2.2.16
  * Author: Zubbin
  * Text Domain: zubbin-uptime-node
@@ -15 +15 @@
 if (!defined('ABSPATH')) exit;
 
-define('ZUBBIN_UN_VERSION', '2.2.15');
+define('ZUBBIN_UN_VERSION', '2.2.16');
 
 // Can be overridden in wp-config.php: