Changeset 2322741

Timestamp:

06/12/2020 02:49:17 AM (6 years ago)

Author:

davejesch

Message:

• enhancement: Update .htaccess rules for Apache 2.4.
• enhancement: Check for minimum WPSiteSync version and disable plugin if WPSiteSync not found or not minimum version.

Location:

wpsitesync-for-http-authentication

Files:

• tags/1.0 (added)
• tags/1.0/.htaccess (added)
• tags/1.0/README.md (added)
• tags/1.0/classes (added)
• tags/1.0/classes/httpauthadmin.php (added)
• tags/1.0/index.php (added)
• tags/1.0/readme.txt (added)
• tags/1.0/wpsitesync-httpauth.php (added)
• trunk/.htaccess (modified) (1 diff)
• trunk/readme.txt (modified) (1 diff)
• trunk/wpsitesync-httpauth.php (modified) (3 diffs)

wpsitesync-for-http-authentication/trunk/.htaccess

@@ -1 @@
-<Files *.php>
-    Order Deny,Allow
-    deny from all
-</Files>
+# Apache 2.2
+<IfModule !mod_authz_core.c>
+    Satisfy Any
 
-<files ".(xml|css|jpe?g|png|gif|js|ttf|wof|eof)$">
-    Order Allow,Deny
-    Allow from all
-</files>
+    <Files *.php>
+        Require all denied
+    </Files>
+
+    <Files ~*.txt>
+        Order Deny,Allow
+        deny from all
+    </Files>
+
+    <files ".(xml|css|jpe?g|png|gif|js|ttf|wof|eof)$">
+        Order Allow,Deny
+        Allow from all
+    </files>
+</IfModule>
+
+
+# Apache 2.4
+<IfModule mod_authz_core.c>
+    Require all granted
+
+    <Files *.php>
+        Require all denied
+    </Files>
+
+    <Files ~*.txt>
+        Require all denied
+    </Files>
+
+    <files ".(xml|css|jpe?g|png|gif|js|ttf|wof|eof)$">
+        Require all granted
+    </files>
+</IfModule>

wpsitesync-for-http-authentication/trunk/readme.txt

@@ -56 +56 @@
 
 == Changelog ==
+= 1.1 - Jun 11, 2020 =
+* enhancement: Update .htaccess rules for Apache 2.4.
+* enhancement: Check for minimum WPSiteSync version and disable plugin if WPSiteSync not found or not minium version.
+
 = 1.0.0 - May 4, 2017 =
 Initial release to WordPress repository.

wpsitesync-for-http-authentication/trunk/wpsitesync-httpauth.php

@@ -6 +6 @@
 Author: WPSiteSync
 Author URI: http://serverpress.com
-Version: 1.0
+Version: 1.1
 Text Domain: wpsitesync-httpauth
 
@@ -23 +23 @@
     {
         add_action('spectrom_sync_init', array($this, 'init'));
+        if (is_admin())
+            add_action('wp_loaded', array($this, 'wp_loaded'));
     }
 
@@ -46 +48 @@
         }
         add_filter('spectrom_sync_api_arguments', array($this, 'filter_api_args'), 10, 2);
+    }
+
+    /**
+     * Called when WP is loaded so we can check if parent plugin is active.
+     */
+    public function wp_loaded()
+    {
+        if (is_admin() && !class_exists('WPSiteSyncContent', FALSE) && current_user_can('activate_plugins')) {
+            add_action('admin_notices', array($this, 'notice_requires_wpss'));
+            add_action('admin_init', array($this, 'disable_plugin'));
+        }
+    }
+
+    /**
+     * Displays the warning message stating that WPSiteSync is not present.
+     */
+    public function notice_requires_wpss()
+    {
+        $install = admin_url('plugin-install.php?tab=search&s=wpsitesync');
+        $activate = admin_url('plugins.php');
+        $msg = sprintf(__('The <em>WPSiteSync for HTTP Authentication</em> plugin requires the main <em>WPSiteSync for Content</em> plugin to be installed and activated. Please %1$sclick here</a> to install or %2$sclick here</a> to activate.', 'wpsitesync-httpauth'),
+                    '<a href="' . $install . '">',
+                    '<a href="' . $activate . '">');
+        $this->_show_notice($msg, 'notice-warning');
+    }
+
+    /**
+     * Helper method to display notices
+     * @param string $msg Message to display within notice
+     * @param string $class The CSS class used on the <div> wrapping the notice
+     * @param boolean $dismissable TRUE if message is to be dismissable; otherwise FALSE.
+     */
+    private function _show_notice($msg, $class = 'notice-success', $dismissable = FALSE)
+    {
+        echo '<div class="notice ', $class, ' ', ($dismissable ? 'is-dismissible' : ''), '">';
+        echo '<p>', $msg, '</p>';
+        echo '</div>';
+    }
+
+    /**
+     * Disables the plugin if WPSiteSync not installed
+     */
+    public function disable_plugin()
+    {
+        deactivate_plugins(plugin_basename(__FILE__));
     }