From 837f1f9bfc78d0071604e4d017d37c86c676d67c Mon Sep 17 00:00:00 2001
From: bipoza <bipoza@gmail.com>
Date: Fri, 11 Oct 2024 12:30:40 +0200
Subject: [PATCH] Change path to rewrite-rule

---
 admin.php            | 55 +++++++++++++++++++++++++++++
 check-connection.php | 10 +++---
 index.php            |  2 ++
 utils.php            |  9 +++++
 wp-uptime.php        | 83 ++++++++++----------------------------------
 5 files changed, 91 insertions(+), 68 deletions(-)
 create mode 100644 admin.php
 create mode 100644 index.php
 create mode 100644 utils.php

diff --git a/admin.php b/admin.php
new file mode 100644
index 0000000..d7289ce
--- /dev/null
+++ b/admin.php
@@ -0,0 +1,55 @@
+<?php
+
+
+add_action('admin_menu', 'wp_uptime_menu');
+function wp_uptime_menu()
+{
+    add_options_page('WP Uptime Settings', 'WP Uptime', 'manage_options', 'wp-uptime-settings', 'wp_uptime_settings_page');
+}
+
+function wp_uptime_settings_page()
+{
+    $url = get_site_url(null, get_option_or_value("wp_uptime_endpoint_path", 'ok') . '/');
+?>
+    <div class="wrap">
+        <h1>WP Uptime Settings</h1>
+        <h3>
+            Editable non-cached monitorization path for Wordpress
+        </h3>
+        <p>Monitorization path: <a href="<?php echo $url ?>" target="_blank"><?php echo $url ?></a></p>
+        <form method="post" action="options.php">
+            <?php settings_fields('wp_uptime_settings'); ?>
+            <?php do_settings_sections('wp-uptime-settings'); ?>
+            <table class="form-table">
+                <tr valign="top">
+                    <th scope="row">Endpoint path</th>
+                    <td><input type="text" name="wp_uptime_endpoint_path"
+                            value="<?php echo esc_attr(get_option_or_value('wp_uptime_endpoint_path', 'ok')); ?>"></td>
+                </tr>
+                <tr valign="top">
+                    <th scope="row">OK response value</th>
+                    <td>
+                        <?php echo "<textarea name='wp_uptime_response_value'>" . esc_attr(get_option_or_value('wp_uptime_response_value', 'OK')) . '</textarea>'; ?>
+                    </td>
+                </tr>
+            </table>
+            <?php submit_button(); ?>
+        </form>
+    </div>
+<?php
+}
+
+add_action('admin_init', 'wp_uptime_settings');
+
+function wp_uptime_settings()
+{
+    register_setting('wp_uptime_settings', 'wp_uptime_endpoint_path');
+    register_setting('wp_uptime_settings', 'wp_uptime_response_value');
+}
+
+register_uninstall_hook(__FILE__, 'wp_uptime_uninstall');
+function wp_uptime_uninstall()
+{
+    delete_option('wp_uptime_endpoint_path');
+    delete_option('wp_uptime_response_value');
+}
diff --git a/check-connection.php b/check-connection.php
index 245a90b..24e0229 100644
--- a/check-connection.php
+++ b/check-connection.php
@@ -1,12 +1,14 @@
 <?php
 global $wpdb;
-$result = $wpdb->check_connection();
 
-
-if ($result) {
+// Check the connection:
+if (!$wpdb->check_connection($allow_bail = false)) {
+    die(__("No DB connection"));
+} else {
     header('Content-Type: text/plain; charset=utf-8');
     header('Cache-Control: no-cache, no-store, must-revalidate');
     header('Pragma: no-cache');
     header('Expires: 0');
     echo get_option_or_value("wp_uptime_response_value", 'OK');
-}
\ No newline at end of file
+}
+exit;
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..cf879a5
--- /dev/null
+++ b/index.php
@@ -0,0 +1,2 @@
+<?php
+# Silence is golden.
\ No newline at end of file
diff --git a/utils.php b/utils.php
new file mode 100644
index 0000000..b35f91e
--- /dev/null
+++ b/utils.php
@@ -0,0 +1,9 @@
+<?php
+function get_option_or_value($key, $default_value)
+{
+    $response = get_option($key);
+    if (!$response) {
+        $response = $default_value;
+    }
+    return $response;
+}
diff --git a/wp-uptime.php b/wp-uptime.php
index 5dc8a14..5c569b2 100644
--- a/wp-uptime.php
+++ b/wp-uptime.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * WP Uptime
  *
@@ -11,7 +12,7 @@
  * Plugin Name: WP Uptime
  * Plugin URI:  https://github.com/codesyntax/wp-uptime
  * Description: Editable non-cached monitorization path for Wordpress.
- * Version:     3.0.1
+ * Version:     4.0.0
  * Author:      CodeSyntax
  * Author URI:  https://codesyntax.com
  * Text Domain: wp-uptime
@@ -19,81 +20,35 @@
  * License URI: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-function get_option_or_value($key, $default_value)
-{
-    $response = get_option($key);
-    if (!$response) {
-        $response = $default_value;
-    }
-    return $response;
-}
-
-
+require_once plugin_dir_path(__FILE__) . 'admin.php';
+require_once plugin_dir_path(__FILE__) . 'utils.php';
 
-add_action('init', 'wpUptimeFeed');
-function wpUptimeFeed()
+function wp_uptime_query_var($public_query_vars)
 {
-    add_feed(get_option_or_value("wp_uptime_endpoint_path", 'ok'), 'wpUptimeResponse');
-    global $wp_rewrite;
-    $wp_rewrite->flush_rules();
+    $public_query_vars[] = "wp_uptime";
+    return $public_query_vars;
 }
 
-function wpUptimeResponse()
+function wp_uptime_request($wp)
 {
-    include('check-connection.php');
-}
-
-add_action('admin_menu', 'wp_uptime_menu');
-function wp_uptime_menu()
-{
-    add_options_page('WP Uptime Settings', 'WP Uptime', 'manage_options', 'wp-uptime-settings', 'wp_uptime_settings_page');
+    if (isset($wp->query_vars["wp_uptime"]) && "true" === $wp->query_vars["wp_uptime"]) {
+        include('check-connection.php');
+    }
 }
 
-function wp_uptime_settings_page()
+function wp_uptime_endpoint_rewrite()
 {
-    $url = get_site_url(null, get_option_or_value("wp_uptime_endpoint_path", 'ok') . '/');
-
+    add_rewrite_rule("^" . get_option_or_value("wp_uptime_endpoint_path", 'ok') . "$", "index.php?wp_uptime=true", "top");
 
-    ?>
-    <div class="wrap">
-        <h1>WP Uptime Settings</h1>
-        <h3>
-            Editable non-cached monitorization path for Wordpress
-        </h3>
-        <p>Monitorization path: <a href="<?php echo $url ?>" target="_blank"><?php echo $url ?></a></p>
-        <form method="post" action="options.php">
-            <?php settings_fields('wp_uptime_settings'); ?>
-            <?php do_settings_sections('wp-uptime-settings'); ?>
-            <table class="form-table">
-                <tr valign="top">
-                    <th scope="row">Endpoint path</th>
-                    <td><input type="text" name="wp_uptime_endpoint_path"
-                            value="<?php echo esc_attr(get_option_or_value('wp_uptime_endpoint_path', 'ok')); ?>"></td>
-                </tr>
-                <tr valign="top">
-                    <th scope="row">OK response value</th>
-                    <td>
-                        <?php echo "<textarea name='wp_uptime_response_value'>" . esc_attr(get_option_or_value('wp_uptime_response_value', 'OK')) . '</textarea>'; ?>
-                    </td>
-                </tr>
-            </table>
-            <?php submit_button(); ?>
-        </form>
-    </div>
-    <?php
+    flush_rewrite_rules();
 }
 
-add_action('admin_init', 'wp_uptime_settings');
 
-function wp_uptime_settings()
+function run_wp_uptime_endpoint()
 {
-    register_setting('wp_uptime_settings', 'wp_uptime_endpoint_path');
-    register_setting('wp_uptime_settings', 'wp_uptime_response_value');
+    add_filter("query_vars", "wp_uptime_query_var", 10, 1);
+    add_action("parse_request", "wp_uptime_request", 10, 1);
+    add_action("init", "wp_uptime_endpoint_rewrite", 10);
 }
 
-register_uninstall_hook(__FILE__, 'wp_uptime_uninstall');
-function wp_uptime_uninstall()
-{
-    delete_option('wp_uptime_endpoint_path');
-    delete_option('wp_uptime_response_value');
-}
\ No newline at end of file
+run_wp_uptime_endpoint();