Changeset 1908889

Timestamp:

07/13/2018 04:57:15 PM (8 years ago)

Author:

Ipstenu

Message:

REL 4.6.2 - Fix for Multisite. No functional code changes.

Location:

varnish-http-purge

Files:

• assets/icon.svg (deleted)
• tags/4.6.2 (copied) (copied from varnish-http-purge/trunk)
• tags/4.6.2/readme.txt (modified) (2 diffs)
• tags/4.6.2/settings.php (modified) (3 diffs)
• tags/4.6.2/varnish-http-purge.php (modified) (4 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/settings.php (modified) (3 diffs)
• trunk/varnish-http-purge.php (modified) (4 diffs)

varnish-http-purge/tags/4.6.2/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 4.9
-Stable tag: 4.6.1
+Stable tag: 4.6.2
 Requires PHP: 5.6
 
@@ -188 +188 @@
 
 == Changelog ==
+
+= 4.6.2 =
+
+* July 2018
+* Fixing some translation output.
+* Multisite fixes for settings pages.
+
+= 4.6.1 =
+
+* July 2018
+* Fix situation where purging wasn't (props @carlalexander)
 
 = 4.6.0 =

varnish-http-purge/tags/4.6.2/settings.php

@@ -67 +67 @@
      */
     public function register_settings() {
-        if ( ! is_multisite() || current_user_can( 'manage_network' ) ) {
-            // Development Mode Settings.
-            register_setting( 'vhp-settings-devmode', 'vhp_varnish_devmode', array( &$this, 'settings_devmode_sanitize' ) );
-            add_settings_section( 'vhp-settings-devmode-section', __( 'Development Mode Settings', 'varnish-http-purge' ), array( &$this, 'options_settings_devmode' ), 'varnish-devmode-settings' );
-            add_settings_field( 'varnish_devmode', __( 'Development Mode', 'varnish-http-purge' ), array( &$this, 'settings_devmode_callback' ), 'varnish-devmode-settings', 'vhp-settings-devmode-section' );
-
-            // IP Settings.
-            register_setting( 'vhp-settings-ip', 'vhp_varnish_ip', array( &$this, 'settings_ip_sanitize' ) );
-            add_settings_section( 'vhp-settings-ip-section', __( 'Configure Custom IP', 'varnish-http-purge' ), array( &$this, 'options_settings_ip' ), 'varnish-ip-settings' );
-            add_settings_field( 'varnish_ip', __( 'Set Custom IP', 'varnish-http-purge' ), array( &$this, 'settings_ip_callback' ), 'varnish-ip-settings', 'vhp-settings-ip-section' );
-        }
+        // Development Mode Settings.
+        register_setting( 'vhp-settings-devmode', 'vhp_varnish_devmode', array( &$this, 'settings_devmode_sanitize' ) );
+        add_settings_section( 'vhp-settings-devmode-section', __( 'Development Mode Settings', 'varnish-http-purge' ), array( &$this, 'options_settings_devmode' ), 'varnish-devmode-settings' );
+        add_settings_field( 'varnish_devmode', __( 'Development Mode', 'varnish-http-purge' ), array( &$this, 'settings_devmode_callback' ), 'varnish-devmode-settings', 'vhp-settings-devmode-section' );
+
+        // IP Settings.
+        register_setting( 'vhp-settings-ip', 'vhp_varnish_ip', array( &$this, 'settings_ip_sanitize' ) );
+        add_settings_section( 'vhp-settings-ip-section', __( 'Configure Custom IP', 'varnish-http-purge' ), array( &$this, 'options_settings_ip' ), 'varnish-ip-settings' );
+        add_settings_field( 'varnish_ip', __( 'Set Custom IP', 'varnish-http-purge' ), array( &$this, 'settings_ip_callback' ), 'varnish-ip-settings', 'vhp-settings-ip-section' );
     }
 
@@ -418 +416 @@
 
             <?php
-            if ( ! is_multisite() || current_user_can( 'manage_network' ) ) {
+            if ( ! is_multisite() ) {
                 ?>
                 <form action="options.php" method="POST" >
@@ -438 +436 @@
             } else {
                 ?>
-                <p><?php esc_html_e( 'Your account does not have access to configure settings. Please contact your site administrator.', 'varnish-http-purge' ); ?></p>
-                <?php
-            }
-            ?>
-
+                <p><?php esc_html_e( 'Editing these settings via the Dashboard is disabled on Multisite as incorrect edits can prevent your network from loading entirely. You can toggle debug mode globally using the admin toolbar option, and you should define your Varnish IP directly into your wp-config file for best results.', 'varnish-http-purge' ); ?></p>
+                <?php
+            }
+            ?>
         </div>
         <?php

varnish-http-purge/tags/4.6.2/varnish-http-purge.php

@@ -4 +4 @@
  * Plugin URI: https://halfelf.org/plugins/varnish-http-purge/
  * Description: Automatically empty cached pages when content on your site is modified.
- * Version: 4.6.1
+ * Version: 4.6.2
  * Author: Mika Epstein
  * Author URI: https://halfelf.org/
@@ -217 +217 @@
     public function require_pretty_permalinks_notice() {
         // translators: The URL should link to the permalinks page.
-        echo "<div id='message' class='error'><p>" . sprintf( esc_html__( 'Varnish HTTP Purge requires you to use custom permalinks. Please go to the <a href="%1$s">Permalinks Options Page</a> to configure them.', 'varnish-http-purge' ), esc_url( admin_url( 'options-permalink.php' ) ) ) . '</p></div>';
+        echo wp_kses_post( '<div id="message" class="error"><p>' . sprintf( __( 'Varnish HTTP Purge requires you to use custom permalinks. Please go to the <a href="%1$s">Permalinks Options Page</a> to configure them.', 'varnish-http-purge' ), esc_url( admin_url( 'options-permalink.php' ) ) ) . '</p></div>' );
     }
 
@@ -243 +243 @@
             $devmode = get_site_option( 'vhp_varnish_devmode', self::$devmode );
             $time    = human_time_diff( current_time( 'timestamp' ), $devmode['expire'] );
-            // translators: %1$s is the time until dev mode expires.
-            // translators: %2$s is a link to the Varnish settings pages.
-            $message = sprintf( __( 'Varnish HTTP Purge Development Mode is active for the next %1$s. You can disable this at the <a href="%2$s">Varnish Settings Page</a>.', 'varnish-http-purge' ), $time, esc_url( admin_url( 'admin.php?page=varnish-page' ) ) );
+            if ( ! is_multisite() ) {
+                // translators: %1$s is the time until dev mode expires.
+                // translators: %2$s is a link to the Varnish settings pages.
+                $message = sprintf( __( 'Varnish HTTP Purge Development Mode is active for the next %1$s. You can disable this at the <a href="%2$s">Varnish Settings Page</a>.', 'varnish-http-purge' ), $time, esc_url( admin_url( 'admin.php?page=varnish-page' ) ) );
+            } else {
+                // translators: %1$s is the time until dev mode expires.
+                $message = sprintf( __( 'Varnish HTTP Purge Development Mode is active for the next %1$s.', 'varnish-http-purge' ), $time );
+            }
         }
         echo '<div class="notice notice-warning"><p>' . wp_kses_post( $message ) . '</p></div>';
@@ -880 +885 @@
  * @since 4.0
  */
-require_once 'settings.php';
+// The settings PAGES aren't needed on the network admin page
+if ( ! is_network_admin() ) {
+    require_once 'settings.php';
+}
 require_once 'debug.php';
 

varnish-http-purge/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 4.9
-Stable tag: 4.6.1
+Stable tag: 4.6.2
 Requires PHP: 5.6
 
@@ -188 +188 @@
 
 == Changelog ==
+
+= 4.6.2 =
+
+* July 2018
+* Fixing some translation output.
+* Multisite fixes for settings pages.
+
+= 4.6.1 =
+
+* July 2018
+* Fix situation where purging wasn't (props @carlalexander)
 
 = 4.6.0 =

varnish-http-purge/trunk/settings.php

@@ -67 +67 @@
      */
     public function register_settings() {
-        if ( ! is_multisite() || current_user_can( 'manage_network' ) ) {
-            // Development Mode Settings.
-            register_setting( 'vhp-settings-devmode', 'vhp_varnish_devmode', array( &$this, 'settings_devmode_sanitize' ) );
-            add_settings_section( 'vhp-settings-devmode-section', __( 'Development Mode Settings', 'varnish-http-purge' ), array( &$this, 'options_settings_devmode' ), 'varnish-devmode-settings' );
-            add_settings_field( 'varnish_devmode', __( 'Development Mode', 'varnish-http-purge' ), array( &$this, 'settings_devmode_callback' ), 'varnish-devmode-settings', 'vhp-settings-devmode-section' );
-
-            // IP Settings.
-            register_setting( 'vhp-settings-ip', 'vhp_varnish_ip', array( &$this, 'settings_ip_sanitize' ) );
-            add_settings_section( 'vhp-settings-ip-section', __( 'Configure Custom IP', 'varnish-http-purge' ), array( &$this, 'options_settings_ip' ), 'varnish-ip-settings' );
-            add_settings_field( 'varnish_ip', __( 'Set Custom IP', 'varnish-http-purge' ), array( &$this, 'settings_ip_callback' ), 'varnish-ip-settings', 'vhp-settings-ip-section' );
-        }
+        // Development Mode Settings.
+        register_setting( 'vhp-settings-devmode', 'vhp_varnish_devmode', array( &$this, 'settings_devmode_sanitize' ) );
+        add_settings_section( 'vhp-settings-devmode-section', __( 'Development Mode Settings', 'varnish-http-purge' ), array( &$this, 'options_settings_devmode' ), 'varnish-devmode-settings' );
+        add_settings_field( 'varnish_devmode', __( 'Development Mode', 'varnish-http-purge' ), array( &$this, 'settings_devmode_callback' ), 'varnish-devmode-settings', 'vhp-settings-devmode-section' );
+
+        // IP Settings.
+        register_setting( 'vhp-settings-ip', 'vhp_varnish_ip', array( &$this, 'settings_ip_sanitize' ) );
+        add_settings_section( 'vhp-settings-ip-section', __( 'Configure Custom IP', 'varnish-http-purge' ), array( &$this, 'options_settings_ip' ), 'varnish-ip-settings' );
+        add_settings_field( 'varnish_ip', __( 'Set Custom IP', 'varnish-http-purge' ), array( &$this, 'settings_ip_callback' ), 'varnish-ip-settings', 'vhp-settings-ip-section' );
     }
 
@@ -418 +416 @@
 
             <?php
-            if ( ! is_multisite() || current_user_can( 'manage_network' ) ) {
+            if ( ! is_multisite() ) {
                 ?>
                 <form action="options.php" method="POST" >
@@ -438 +436 @@
             } else {
                 ?>
-                <p><?php esc_html_e( 'Your account does not have access to configure settings. Please contact your site administrator.', 'varnish-http-purge' ); ?></p>
-                <?php
-            }
-            ?>
-
+                <p><?php esc_html_e( 'Editing these settings via the Dashboard is disabled on Multisite as incorrect edits can prevent your network from loading entirely. You can toggle debug mode globally using the admin toolbar option, and you should define your Varnish IP directly into your wp-config file for best results.', 'varnish-http-purge' ); ?></p>
+                <?php
+            }
+            ?>
         </div>
         <?php

varnish-http-purge/trunk/varnish-http-purge.php

@@ -4 +4 @@
  * Plugin URI: https://halfelf.org/plugins/varnish-http-purge/
  * Description: Automatically empty cached pages when content on your site is modified.
- * Version: 4.6.1
+ * Version: 4.6.2
  * Author: Mika Epstein
  * Author URI: https://halfelf.org/
@@ -217 +217 @@
     public function require_pretty_permalinks_notice() {
         // translators: The URL should link to the permalinks page.
-        echo "<div id='message' class='error'><p>" . sprintf( esc_html__( 'Varnish HTTP Purge requires you to use custom permalinks. Please go to the <a href="%1$s">Permalinks Options Page</a> to configure them.', 'varnish-http-purge' ), esc_url( admin_url( 'options-permalink.php' ) ) ) . '</p></div>';
+        echo wp_kses_post( '<div id="message" class="error"><p>' . sprintf( __( 'Varnish HTTP Purge requires you to use custom permalinks. Please go to the <a href="%1$s">Permalinks Options Page</a> to configure them.', 'varnish-http-purge' ), esc_url( admin_url( 'options-permalink.php' ) ) ) . '</p></div>' );
     }
 
@@ -243 +243 @@
             $devmode = get_site_option( 'vhp_varnish_devmode', self::$devmode );
             $time    = human_time_diff( current_time( 'timestamp' ), $devmode['expire'] );
-            // translators: %1$s is the time until dev mode expires.
-            // translators: %2$s is a link to the Varnish settings pages.
-            $message = sprintf( __( 'Varnish HTTP Purge Development Mode is active for the next %1$s. You can disable this at the <a href="%2$s">Varnish Settings Page</a>.', 'varnish-http-purge' ), $time, esc_url( admin_url( 'admin.php?page=varnish-page' ) ) );
+            if ( ! is_multisite() ) {
+                // translators: %1$s is the time until dev mode expires.
+                // translators: %2$s is a link to the Varnish settings pages.
+                $message = sprintf( __( 'Varnish HTTP Purge Development Mode is active for the next %1$s. You can disable this at the <a href="%2$s">Varnish Settings Page</a>.', 'varnish-http-purge' ), $time, esc_url( admin_url( 'admin.php?page=varnish-page' ) ) );
+            } else {
+                // translators: %1$s is the time until dev mode expires.
+                $message = sprintf( __( 'Varnish HTTP Purge Development Mode is active for the next %1$s.', 'varnish-http-purge' ), $time );
+            }
         }
         echo '<div class="notice notice-warning"><p>' . wp_kses_post( $message ) . '</p></div>';
@@ -880 +885 @@
  * @since 4.0
  */
-require_once 'settings.php';
+// The settings PAGES aren't needed on the network admin page
+if ( ! is_network_admin() ) {
+    require_once 'settings.php';
+}
 require_once 'debug.php';