Changeset 3771999 for wpide/trunk/App/App.php

Timestamp:

10/29/2026 03:41:15 AM (16 hours ago)

Author:

xplodedthemes

Message:

Update v3.6.0

File:

• wpide/trunk/App/App.php (modified) (8 diffs)

wpide/trunk/App/App.php

@@ -56 +56 @@
     public function activate() {
         $this->installDropIn();
+
+        \WPIDE\App\Services\Snippets\Schema::maybeInstall();
     }
 
@@ -114 +116 @@
     }
 
+    /**
+     * Whether the installed fatal-error-handler.php drop-in belongs to WPIDE.
+     */
+    public function isOwnDropIn(): bool
+    {
+        $file = CONTENT_DIR.'/'.FATAL_ERROR_DROPIN;
+
+        if(!is_readable($file)) {
+            return false;
+        }
+
+        $header = (string) file_get_contents($file, false, null, 0, 512);
+
+        return strpos($header, 'WPide - Fatal Error Handler - Drop-In') !== false;
+    }
+
     public function installDropIn() {
 
@@ -119 +137 @@
 
         if($fs->fileExists(FATAL_ERROR_DROPIN)) {
+
+            // Never replace a drop-in installed by another recovery provider.
+            if(!$this->isOwnDropIn()) {
+                update_option(FATAL_ERROR_DROPIN_VERSION_OPT.'_conflict', true);
+                return;
+            }
+
             $this->unInstallDropIn();
         }
@@ -125 +150 @@
 
         update_option(FATAL_ERROR_DROPIN_VERSION_OPT, FATAL_ERROR_DROPIN_VERSION);
+        delete_option(FATAL_ERROR_DROPIN_VERSION_OPT.'_conflict');
     }
 
@@ -131 +157 @@
         $fs = LocalFileSystem::load(CONTENT_DIR);
 
-        if($fs->fileExists(FATAL_ERROR_DROPIN)) {
+        if($fs->fileExists(FATAL_ERROR_DROPIN) && $this->isOwnDropIn()) {
             $fs->deleteFile(FATAL_ERROR_DROPIN);
         }
+    }
+
+    public function dropInConflictNotice() {
+
+        if(!get_option(FATAL_ERROR_DROPIN_VERSION_OPT.'_conflict') || !current_user_can('manage_options')) {
+            return;
+        }
+        ?>
+        <div class="notice notice-warning wpide-notice" data-slug="<?php echo esc_attr(SLUG); ?>">
+            <p><?php echo esc_html__('WPIDE did not install its file recovery drop-in because wp-content/fatal-error-handler.php belongs to another plugin. File recovery after a fatal error is unavailable until that file is removed.', 'wpide'); ?></p>
+        </div>
+        <?php
     }
 
@@ -149 +187 @@
             $this->installDropIn();
         }
+
+        add_action('admin_notices', [$this, 'dropInConflictNotice']);
 
         $this->loadTextDomain();
@@ -286 +326 @@
             ],
             [
+                'title' => __( 'Snippets', 'wpide' ),
+                'slug' => SLUG.'#/snippets',
+                'callback' => [$this, 'bootstrap'],
+                'position' => 30
+            ],
+            [
                 'title' => __( 'Settings', 'wpide' ),
                 'slug' => SLUG.'#/settings',
@@ -515 +561 @@
      * @since     1.0.0
      */
-    public function getExternalUrl(string $utm_content = null, string $url = null): string
+    public function getExternalUrl(?string $utm_content = null, ?string $url = null): string
     {