Changeset 1664767

Timestamp:

05/25/2017 02:37:58 PM (9 years ago)

Author:

GregLone

Message:

Move Login 2.5.2.

Location:

sf-move-login/trunk

Files:

• inc/activate.php (modified) (5 diffs)
• inc/admin.php (modified) (2 diffs)
• inc/classes/class-sfml-options.php (modified) (11 diffs)
• inc/functions/compat.php (modified) (1 diff)
• inc/functions/rewrite.php (modified) (6 diffs)
• inc/functions/settings-page.php (modified) (8 diffs)
• inc/functions/utilities.php (modified) (4 diffs)
• inc/redirections-and-dies.php (modified) (4 diffs)
• languages/sf-move-login-fr_FR.mo (modified) (previous)
• languages/sf-move-login-fr_FR.po (modified) (4 diffs)
• languages/sf-move-login.pot (added)
• readme.txt (modified) (2 diffs)
• sf-move-login.php (modified) (4 diffs)

sf-move-login/trunk/inc/activate.php

@@ -13 +13 @@
  */
 function sfml_activate() {
-    global $is_apache, $is_iis7;
-
-    $is_nginx = sfml_is_nginx();
-    $dies     = array();
+    $dies = array();
 
     // The plugin needs the request URI.
@@ -24 +21 @@
 
     // Apache.
-    if ( $is_apache ) {
+    if ( sfml_is_apache() ) {
         require_once( ABSPATH . WPINC . '/functions.php' );
 
@@ -32 +29 @@
     }
     // IIS7.
-    elseif ( $is_iis7 ) {
+    elseif ( sfml_is_iis7() ) {
         require_once( ABSPATH . 'wp-admin/includes/misc.php' );
 
@@ -40 +37 @@
     }
     // None.
-    elseif ( ! $is_iis7 && ! $is_apache && ! $is_nginx ) {
+    elseif ( ! sfml_is_iis7() && ! sfml_is_apache() && ! sfml_is_nginx() ) {
         $dies[] = 'error_unknown_server_conf';
     }
@@ -105 +102 @@
  */
 function sfml_notice_message( $message_id ) {
-    global $is_iis7;
     static $messages;
 
-    if ( ! isset( $messages ) ) {
-        $file = $is_iis7 ? '<code>web.config</code>' : '<code>.htaccess</code>';
-        $link = '<a href="' . esc_url( is_multisite() ? network_admin_url( 'settings.php?page=move-login' ) : admin_url( 'options-general.php?page=move-login' ) ) . '">Move Login</a>';
+    if ( isset( $messages ) ) {
+        return isset( $messages[ $message_id ] ) ? $messages[ $message_id ] : '';
+    }
 
-        $messages = array(
-            /** Translators: 1 is the plugin name. */
-            'error_no_request_uri'      => sprintf( __( 'It seems your server configuration prevents the plugin to work properly. %s won\'t work.', 'sf-move-login' ), '<strong>Move Login</strong>' ),
-            /** Translators: 1 is the plugin name. */
-            'error_no_mod_rewrite'      => sprintf( __( 'It seems the url rewrite module is not activated on your server. %s won\'t work.', 'sf-move-login' ), '<strong>Move Login</strong>' ),
-            /** Translators: 1, 2, and 3 are server technologies (Apache, Nginx, IIS7), 4 is the plugin name. */
-            'error_unknown_server_conf' => sprintf( __( 'It seems your server does not use %1$s, %2$s, nor %3$s. %4$s won\'t work.', 'sf-move-login' ), '<i>Apache</i>', '<i>Nginx</i>', '<i>IIS7</i>', '<strong>Move Login</strong>' ),
-            /** Translators: 1 is the plugin name, 2 is a file name, 3 is a "Move Login" link. */
-            'error_file_not_writable'   => sprintf( __( '%1$s needs access to the %2$s file. Please visit the %3$s settings page and copy/paste the given code into the %2$s file.', 'sf-move-login' ), '<strong>Move Login</strong>', $file, $link ),
-            /** Translators: 1 is a server technology (Nginx), 2 is a "Move Login" link, 3 is the plugin name. */
-            'updated_is_nginx'          => sprintf( __( 'It seems your server uses a %1$ system. You have to edit the rewrite rules by yourself in the configuration file. Please visit the %2$s settings page and take a look at the rewrite rules. %3$s is running but won\'t work correctly until you deal with those rewrite rules.', 'sf-move-login' ), '<i>Nginx</i>', $link, '<strong>Move Login</strong>' ),
-        );
-    }
+    $file = sfml_is_iis7() ? '<code>web.config</code>' : '<code>.htaccess</code>';
+    $link = '<a href="' . esc_url( is_multisite() ? network_admin_url( 'settings.php?page=move-login' ) : admin_url( 'options-general.php?page=move-login' ) ) . '">Move Login</a>';
+
+    $messages = array(
+        /** Translators: 1 is the plugin name. */
+        'error_no_request_uri'      => sprintf( __( 'It seems your server configuration prevents the plugin to work properly. %s won\'t work.', 'sf-move-login' ), '<strong>Move Login</strong>' ),
+        /** Translators: 1 is the plugin name. */
+        'error_no_mod_rewrite'      => sprintf( __( 'It seems the url rewrite module is not activated on your server. %s won\'t work.', 'sf-move-login' ), '<strong>Move Login</strong>' ),
+        /** Translators: 1, 2, and 3 are server technologies (Apache, Nginx, IIS7), 4 is the plugin name. */
+        'error_unknown_server_conf' => sprintf( __( 'It seems your server does not use %1$s, %2$s, nor %3$s. %4$s won\'t work.', 'sf-move-login' ), '<i>Apache</i>', '<i>Nginx</i>', '<i>IIS7</i>', '<strong>Move Login</strong>' ),
+        /** Translators: 1 is the plugin name, 2 is a file name, 3 is a "Move Login" link. */
+        'error_file_not_writable'   => sprintf( __( '%1$s needs access to the %2$s file. Please visit the %3$s settings page and copy/paste the given code into the %2$s file.', 'sf-move-login' ), '<strong>Move Login</strong>', $file, $link ),
+        /** Translators: 1 is a server technology (Nginx), 2 is a "Move Login" link, 3 is the plugin name. */
+        'updated_is_nginx'          => sprintf( __( 'It seems your server uses a %1$ system. You have to edit the rewrite rules by yourself in the configuration file. Please visit the %2$s settings page and take a look at the rewrite rules. %3$s is running but won\'t work correctly until you deal with those rewrite rules.', 'sf-move-login' ), '<i>Nginx</i>', $link, '<strong>Move Login</strong>' ),
+    );
 
     return isset( $messages[ $message_id ] ) ? $messages[ $message_id ] : '';

sf-move-login/trunk/inc/admin.php

@@ -327 +327 @@
  */
 function sfml_notices() {
-    global $is_apache, $is_iis7;
-
     // Get previous notices.
     $user_id = get_current_user_id();
@@ -341 +339 @@
     delete_transient( 'sfml_activation-' . $user_id );
 
-    $notices  = array();
-    $is_nginx = sfml_is_nginx();
+    $notices = array();
 
     // IIS7.
-    if ( $is_iis7 && ! sfml_can_write_file() ) {
+    if ( sfml_is_iis7() && ! sfml_can_write_file() ) {
         $notices[] = 'error_file_not_writable';
     }
     // Apache.
-    elseif ( $is_apache && ! sfml_can_write_file() ) {
+    elseif ( sfml_is_apache() && ! sfml_can_write_file() ) {
         $notices[] = 'error_file_not_writable';
     }
     // Nginx.
-    elseif ( $is_nginx ) {
+    elseif ( sfml_is_nginx() ) {
         $notices[] = 'updated_is_nginx';
     }

sf-move-login/trunk/inc/classes/class-sfml-options.php

@@ -11 +11 @@
 class SFML_Options extends SFML_Singleton {
 
-    const VERSION      = '1.2';
+    const VERSION      = '1.3';
     const OPTION_NAME  = 'sfml';
     const OPTION_GROUP = 'sfml_settings';
@@ -17 +17 @@
 
     /**
-     * Options.
+     * All options.
      *
      * @var (array)
@@ -24 +24 @@
 
     /**
-     * Default options.
+     * All default options.
      *
      * @var (array)
@@ -38 +38 @@
 
     /**
-     * Setting labels.
+     * Slug setting labels.
      *
      * @var (array)
-     */
-    protected $labels;
+     * @since 2.5.2 Renamed from $labels to $slug_labels.
+     */
+    protected $slug_labels;
 
 
@@ -57 +58 @@
     }
 
+
+    /**
+     * An improved version of `register_setting()`, that always exists and that works for network options.
+     */
+    protected function register_setting() {
+        global $new_whitelist_options;
+
+        $sanitize_callback = array( $this, 'sanitize_options' );
+
+        if ( ! is_multisite() ) {
+            if ( function_exists( 'register_setting' ) ) {
+                register_setting( static::OPTION_GROUP, static::OPTION_NAME, $sanitize_callback );
+                return;
+            }
+
+            $new_whitelist_options = isset( $new_whitelist_options ) && is_array( $new_whitelist_options ) ? $new_whitelist_options : array(); // WPCS: override ok.
+            $new_whitelist_options[ static::OPTION_GROUP ]   = isset( $new_whitelist_options[ static::OPTION_GROUP ] ) && is_array( $new_whitelist_options[ static::OPTION_GROUP ] ) ? $new_whitelist_options[ static::OPTION_GROUP ] : array();
+            $new_whitelist_options[ static::OPTION_GROUP ][] = static::OPTION_NAME;
+        } elseif ( is_admin() ) {
+            $whitelist = sfml_cache_data( 'new_whitelist_network_options' );
+            $whitelist = is_array( $whitelist ) ? $whitelist : array();
+            $whitelist[ static::OPTION_GROUP ]   = isset( $whitelist[ static::OPTION_GROUP ] ) ? $whitelist[ static::OPTION_GROUP ] : array();
+            $whitelist[ static::OPTION_GROUP ][] = static::OPTION_NAME;
+            sfml_cache_data( 'new_whitelist_network_options', $whitelist );
+        }
+
+        if ( $sanitize_callback ) {
+            add_filter( 'sanitize_option_' . static::OPTION_NAME, $sanitize_callback );
+        }
+    }
+
+
+    /*--------------------------------------------------------------------------------------------*/
+    /* !DEFAULT OPTIONS ========================================================================= */
+    /*--------------------------------------------------------------------------------------------*/
 
     /**
@@ -93 +129 @@
         }
 
-        // Options.
-        $this->options_default = array_merge( $this->options_default, array(
+        // Other options.
+        $this->options_default = array_merge( $this->options_default, $this->get_other_default_options() );
+
+        return $this->options_default;
+    }
+
+
+    /**
+     * Get "other" default options (the radio groups).
+     *
+     * @since 2.5.2
+     *
+     * @return (array)
+     */
+    public function get_other_default_options() {
+        return array(
             'deny_wp_login_access' => 1,
             'deny_admin_access'    => 0,
-        ) );
-
-        return $this->options_default;
-    }
-
+        );
+    }
+
+
+    /*--------------------------------------------------------------------------------------------*/
+    /* !GET OPTIONS ============================================================================= */
+    /*--------------------------------------------------------------------------------------------*/
 
     /**
@@ -115 +167 @@
         }
 
-        $this->options = array();
-        $old_options   = get_site_option( static::OPTION_NAME );
-        $defaults      = $this->get_default_options();
-
-        if ( is_array( $old_options ) ) {
-            $default_slugs = static::get_sub_options( 'slugs', $defaults );
-
+        $this->options   = array();
+        $raw_options     = get_site_option( static::OPTION_NAME );
+        $default_options = $this->get_default_options();
+
+        if ( is_array( $raw_options ) ) {
             // Add and escape slugs.
+            $default_slugs = static::get_sub_options( 'slugs', $default_options );
+
             foreach ( $default_slugs as $slug_key => $default_slug ) {
-                $this->options[ 'slugs.' . $slug_key ] = ! empty( $old_options[ 'slugs.' . $slug_key ] ) ? sanitize_title( $old_options[ 'slugs.' . $slug_key ], $default_slug, 'display' ) : $default_slug;
+                $this->options[ 'slugs.' . $slug_key ] = ! empty( $raw_options[ 'slugs.' . $slug_key ] ) ? sanitize_title( $raw_options[ 'slugs.' . $slug_key ], $default_slug, 'display' ) : $default_slug;
             }
 
             // Add and escape other options.
-            if ( isset( $defaults['deny_wp_login_access'] ) ) {
-                $this->options['deny_wp_login_access'] = isset( $old_options['deny_wp_login_access'] ) ? min( 3, max( 1, (int) $old_options['deny_wp_login_access'] ) ) : $defaults['deny_wp_login_access'];
-            }
-
-            if ( isset( $defaults['deny_admin_access'] ) ) {
-                $this->options['deny_admin_access'] = isset( $old_options['deny_admin_access'] ) ? min( 3, max( 0, (int) $old_options['deny_admin_access'] ) ) : $defaults['deny_admin_access'];
+            $default_options = $this->get_other_default_options();
+
+            foreach ( $default_options as $option_name => $default_value ) {
+                if ( ! isset( $raw_options[ $option_name ] ) ) {
+                    $this->options[ $option_name ] = $default_value;
+                    continue;
+                }
+
+                $choices                       = $this->get_field_labels( $option_name );
+                $this->options[ $option_name ] = (int) $raw_options[ $option_name ];
+
+                if ( ! isset( $choices[ $this->options[ $option_name ] ] ) ) {
+                    $this->options[ $option_name ] = $default_value;
+                }
             }
         } else {
-            $this->options = $defaults;
-        }
-
-        // Generic filter, change the values.
-        $options_tmp   = apply_filters( 'sfml_options', $this->options );
+            $this->options = $default_options;
+        }
+
+        $filtered_options = $this->options;
+
+        /**
+         * Filter the plugin options before retrieving them.
+         *
+         * @param (array) $filtered_options The plugin options.
+         */
+        $filtered_options = apply_filters( 'sfml_options', $filtered_options );
+
         // Make sure no keys have been added or removed.
-        $this->options = array_intersect_key( array_merge( $this->options, $options_tmp ), $this->options );
+        $this->options    = array_intersect_key( array_merge( $this->options, $filtered_options ), $this->options );
 
         return $this->options;
@@ -180 +247 @@
 
     /**
+     * Get sub-options.
+     *
+     * For example:
+     * static::get_sub_options( 'foo', array(
+     *     'option1'     => 'value1',
+     *     'foo.option2' => 'value2',
+     *     'foo.option3' => 'value3',
+     * ) );
+     * Will return:
+     * array(
+     *     'option2' => 'value2',
+     *     'option3' => 'value3',
+     * )
+     *
+     * @param (string) $name    The sub-option name.
+     * @param (array)  $options Array of options.
+     *
+     * @return (array)
+     */
+    public static function get_sub_options( $name, $options ) {
+        if ( ! $options || ! $name ) {
+            return array();
+        }
+
+        $options = (array) $options;
+
+        if ( isset( $options[ $name ] ) ) {
+            return $options[ $name ];
+        }
+
+        $group = array();
+        $name  = rtrim( $name, '.' ) . '.';
+
+        foreach ( $options as $k => $v ) {
+            if ( 0 === strpos( $k, $name ) ) {
+                $group[ substr( $k, strlen( $name ) ) ] = $v;
+            }
+        }
+
+        return ! empty( $group ) ? $group : null;
+    }
+
+
+    /*--------------------------------------------------------------------------------------------*/
+    /* !FIELD LABELS ==========+++=============================================================== */
+    /*--------------------------------------------------------------------------------------------*/
+
+    /**
+     * Get the possible choices for a specific option.
+     *
+     * @since 1.5.2
+     *
+     * @param (string) $option  The option name.
+     *
+     * @return (array)
+     */
+    public function get_field_labels( $option ) {
+        if ( 'slugs' === $option ) {
+            return $this->get_slug_field_labels();
+        }
+
+        $choices = array(
+            'deny_wp_login_access' => array(
+                1 => __( 'Display an error message', 'sf-move-login' ),
+                4 => __( 'Trigger a «Page not found» error', 'sf-move-login' ),
+                2 => __( 'Redirect to a "WordPress" «Page not found» error page', 'sf-move-login' ),
+                3 => __( 'Redirect to the home page', 'sf-move-login' ),
+            ),
+            'deny_admin_access'    => array(
+                0 => __( 'Do nothing, redirect to the new login page (not recommended)', 'sf-move-login' ),
+                1 => __( 'Display an error message', 'sf-move-login' ),
+                4 => __( 'Trigger a «Page not found» error', 'sf-move-login' ),
+                2 => __( 'Redirect to a "WordPress" «Page not found» error page', 'sf-move-login' ),
+                3 => __( 'Redirect to the home page', 'sf-move-login' ),
+            ),
+        );
+
+        $choices = isset( $choices[ $option ] ) ? $choices[ $option ] : array();
+
+        /**
+         * Filter the possible choices for a specific option.
+         *
+         * @param (array)  $choices The possible choices.
+         * @param (string) $option  The option name.
+         */
+        return apply_filters( 'sfml_option_choices', $choices, $option );
+    }
+
+
+    /**
      * Setting field labels for the slugs.
      *
@@ -187 +344 @@
         $this->maybe_clear_options_cache();
 
-        if ( isset( $this->labels ) ) {
-            return $this->labels;
-        }
-
-        $this->labels = array(
+        if ( isset( $this->slug_labels ) ) {
+            return $this->slug_labels;
+        }
+
+        $this->slug_labels = array(
             'login'        => __( 'Log in' ),
             'logout'       => __( 'Log out' ),
@@ -202 +359 @@
 
         if ( $new_actions ) {
-            $new_actions  = array_diff_key( $new_actions, $this->labels );
-            $this->labels = array_merge( $this->labels, $new_actions );
-        }
-
-        return $this->labels;
-    }
-
+            $new_actions       = array_diff_key( $new_actions, $this->slug_labels );
+            $this->slug_labels = array_merge( $this->slug_labels, $new_actions );
+        }
+
+        return $this->slug_labels;
+    }
+
+
+    /**
+     * Get custom labels (added by other plugins).
+     *
+     * @since 2.4
+     *
+     * @return (array)
+     */
+    public static function get_additional_labels() {
+        $new_actions = array();
+        /**
+         * Plugins can add their own actions.
+         *
+         * @param (array) $new_actions Custom actions.
+         */
+        return apply_filters( 'sfml_additional_slugs', $new_actions );
+    }
+
+
+    /*--------------------------------------------------------------------------------------------*/
+    /* !SANITIZATION ============================================================================ */
+    /*--------------------------------------------------------------------------------------------*/
+
+    /**
+     * Sanitize options on save.
+     *
+     * @param (array) $options Options to sanitize.
+     *
+     * @return (array)
+     */
+    public function sanitize_options( $options = array() ) {
+        $sanitized_options = array();
+        $old_options       = get_site_option( static::OPTION_NAME );
+        $errors            = array( 'forbidden' => array(), 'duplicates' => array() );
+
+        // Add and sanitize slugs.
+        $default_slugs = $this->get_default_options();
+        $default_slugs = static::get_sub_options( 'slugs', $default_slugs );
+        $exclude       = $this->get_other_actions();
+
+        foreach ( $default_slugs as $slug_key => $default_slug ) {
+
+            if ( isset( $exclude[ $slug_key ] ) ) {
+                $sanitized_options[ 'slugs.' . $slug_key ] = $exclude[ $slug_key ];
+                continue;
+            }
+
+            $sanitized_options[ 'slugs.' . $slug_key ] = false;
+
+            if ( ! empty( $options[ 'slugs.' . $slug_key ] ) ) {
+                $tmp_slug = sanitize_title( $options[ 'slugs.' . $slug_key ], $default_slug );
+
+                // 'postpass', 'retrievepassword' and 'rp' are forbidden.
+                if ( in_array( $tmp_slug, $exclude, true ) ) {
+                    $errors['forbidden'][] = $tmp_slug;
+                }
+                // Make sure the slug is not already set for another action.
+                elseif ( in_array( $tmp_slug, $sanitized_options, true ) ) {
+                    $errors['duplicates'][] = $tmp_slug;
+                }
+                // Yay!
+                else {
+                    $sanitized_options[ 'slugs.' . $slug_key ] = $tmp_slug;
+                }
+            }
+
+            // Fallback to old value or default value.
+            if ( ! $sanitized_options[ 'slugs.' . $slug_key ] ) {
+                if ( ! isset( $exclude[ $slug_key ] ) && ! empty( $old_options[ 'slugs.' . $slug_key ] ) ) {
+                    $sanitized_options[ 'slugs.' . $slug_key ] = sanitize_title( $old_options[ 'slugs.' . $slug_key ], $default_slug );
+                } else {
+                    $sanitized_options[ 'slugs.' . $slug_key ] = $default_slug;
+                }
+            }
+        }
+
+        // Add and sanitize other options.
+        $default_options = $this->get_other_default_options();
+
+        foreach ( $default_options as $option_name => $default_value ) {
+
+            if ( isset( $options[ $option_name ] ) ) {
+                $sanitized_options[ $option_name ] = (int) $options[ $option_name ];
+            } elseif ( isset( $old_options[ $option_name ] ) ) {
+                $sanitized_options[ $option_name ] = (int) $old_options[ $option_name ];
+            } else {
+                $sanitized_options[ $option_name ] = $default_value;
+                continue;
+            }
+
+            $choices = $this->get_field_labels( $option_name );
+
+            if ( ! isset( $choices[ $sanitized_options[ $option_name ] ] ) ) {
+                $sanitized_options[ $option_name ] = $default_value;
+            }
+        }
+
+        $filtered_options = $sanitized_options;
+
+        /**
+         * Filter the options after being sanitized.
+         *
+         * @param (array) $filtered_options The new options, sanitized.
+         * @param (array) $options          The submitted options.
+         */
+        $filtered_options  = apply_filters( 'sfml_sanitize_options', $filtered_options, $options );
+
+        // Make sure no keys have been removed.
+        $sanitized_options = array_merge( $sanitized_options, $filtered_options );
+
+        // Clear options cache.
+        $this->maybe_clear_options_cache( true );
+
+        // Add the rewrite rules to the `.htaccess`/`web.config` file.
+        $old_slugs = static::get_sub_options( 'slugs', $old_options );
+        $new_slugs = static::get_sub_options( 'slugs', $sanitized_options );
+
+        if ( $old_slugs !== $new_slugs ) {
+            sfml_include_rewrite_file();
+            sfml_write_rules( sfml_rules( $new_slugs ) );
+        }
+
+        // Trigger errors.
+        if ( is_admin() ) {
+            $errors['forbidden']  = array_unique( $errors['forbidden'] );
+            $errors['duplicates'] = array_unique( $errors['duplicates'] );
+
+            if ( $nbr_forbidden = count( $errors['forbidden'] ) ) {
+                /** Translators: %s is an URL slug name. */
+                add_settings_error( 'sfml_settings', 'forbidden-slugs', sprintf( _n( 'The slug %s is forbidden.', 'The slugs %s are forbidden.', $nbr_forbidden, 'sf-move-login' ), wp_sprintf( '<code>%l</code>', $errors['forbidden'] ) ) );
+            }
+            if ( ! empty( $errors['duplicates'] ) ) {
+                add_settings_error( 'sfml_settings', 'duplicates-slugs', __( 'The links can\'t have the same slugs.', 'sf-move-login' ) );
+            }
+        }
+
+        return $sanitized_options;
+    }
+
+
+    /*--------------------------------------------------------------------------------------------*/
+    /* !VARIOUS ================================================================================= */
+    /*--------------------------------------------------------------------------------------------*/
 
     /**
@@ -239 +539 @@
             $this->options_default = null;
             $this->slugs           = null;
-            $this->labels          = null;
+            $this->slug_labels     = null;
             remove_all_filters( static::OPTION_NAME . '_clear_options_cache' );
         }
     }
-
-
-    /**
-     * An improved version of `register_setting()`, that always exists and that works for network options.
-     */
-    protected function register_setting() {
-        global $new_whitelist_options;
-
-        $sanitize_callback = array( $this, 'sanitize_options' );
-
-        if ( ! is_multisite() ) {
-            if ( function_exists( 'register_setting' ) ) {
-                register_setting( static::OPTION_GROUP, static::OPTION_NAME, $sanitize_callback );
-                return;
-            }
-
-            $new_whitelist_options = isset( $new_whitelist_options ) && is_array( $new_whitelist_options ) ? $new_whitelist_options : array(); // WPCS: override ok.
-            $new_whitelist_options[ static::OPTION_GROUP ]   = isset( $new_whitelist_options[ static::OPTION_GROUP ] ) && is_array( $new_whitelist_options[ static::OPTION_GROUP ] ) ? $new_whitelist_options[ static::OPTION_GROUP ] : array();
-            $new_whitelist_options[ static::OPTION_GROUP ][] = static::OPTION_NAME;
-        } elseif ( is_admin() ) {
-            $whitelist = sfml_cache_data( 'new_whitelist_network_options' );
-            $whitelist = is_array( $whitelist ) ? $whitelist : array();
-            $whitelist[ static::OPTION_GROUP ]   = isset( $whitelist[ static::OPTION_GROUP ] ) ? $whitelist[ static::OPTION_GROUP ] : array();
-            $whitelist[ static::OPTION_GROUP ][] = static::OPTION_NAME;
-            sfml_cache_data( 'new_whitelist_network_options', $whitelist );
-        }
-
-        if ( $sanitize_callback ) {
-            add_filter( 'sanitize_option_' . static::OPTION_NAME, $sanitize_callback );
-        }
-    }
-
-
-    /**
-     * Sanitize options on save.
-     *
-     * @param (array) $options Options to sanitize.
-     *
-     * @return (array)
-     */
-    public function sanitize_options( $options = array() ) {
-        $errors            = array( 'forbidden' => array(), 'duplicates' => array() );
-        $old_options       = get_site_option( static::OPTION_NAME );
-        $default_options   = $this->get_default_options();
-        $sanitized_options = array();
-
-        // Add and sanitize slugs.
-        $default_slugs = static::get_sub_options( 'slugs', $default_options );
-        $exclude       = $this->get_other_actions();
-
-        foreach ( $default_slugs as $slug_key => $default_slug ) {
-
-            if ( isset( $exclude[ $slug_key ] ) ) {
-                $sanitized_options[ 'slugs.' . $slug_key ] = $exclude[ $slug_key ];
-                continue;
-            }
-
-            $sanitized_options[ 'slugs.' . $slug_key ] = false;
-
-            if ( ! empty( $options[ 'slugs.' . $slug_key ] ) ) {
-                $tmp_slug = sanitize_title( $options[ 'slugs.' . $slug_key ], $default_slug );
-
-                // 'postpass', 'retrievepassword' and 'rp' are forbidden.
-                if ( in_array( $tmp_slug, $exclude, true ) ) {
-                    $errors['forbidden'][] = $tmp_slug;
-                }
-                // Make sure the slug is not already set for another action.
-                elseif ( in_array( $tmp_slug, $sanitized_options, true ) ) {
-                    $errors['duplicates'][] = $tmp_slug;
-                }
-                // Yay!
-                else {
-                    $sanitized_options[ 'slugs.' . $slug_key ] = $tmp_slug;
-                }
-            }
-
-            // Fallback to old value or default value.
-            if ( ! $sanitized_options[ 'slugs.' . $slug_key ] ) {
-                if ( ! isset( $exclude[ $slug_key ] ) && ! empty( $old_options[ 'slugs.' . $slug_key ] ) ) {
-                    $sanitized_options[ 'slugs.' . $slug_key ] = sanitize_title( $old_options[ 'slugs.' . $slug_key ], $default_slug );
-                } else {
-                    $sanitized_options[ 'slugs.' . $slug_key ] = $default_slug;
-                }
-            }
-        }
-
-        // Add and sanitize other options.
-        if ( isset( $default_options['deny_wp_login_access'] ) ) {
-            if ( isset( $options['deny_wp_login_access'] ) ) {
-
-                $sanitized_options['deny_wp_login_access'] = min( 3, max( 1, (int) $options['deny_wp_login_access'] ) );
-
-            } elseif ( isset( $old_options['deny_wp_login_access'] ) ) {
-
-                $sanitized_options['deny_wp_login_access'] = min( 3, max( 1, (int) $old_options['deny_wp_login_access'] ) );
-
-            } else {
-                $sanitized_options['deny_wp_login_access'] = $default_options['deny_wp_login_access'];
-            }
-        }
-
-        if ( isset( $default_options['deny_admin_access'] ) ) {
-            if ( isset( $options['deny_admin_access'] ) ) {
-
-                $sanitized_options['deny_admin_access'] = min( 3, max( 0, (int) $options['deny_admin_access'] ) );
-
-            } elseif ( isset( $old_options['deny_admin_access'] ) ) {
-
-                $sanitized_options['deny_admin_access'] = min( 3, max( 0, (int) $old_options['deny_admin_access'] ) );
-
-            } else {
-                $sanitized_options['deny_admin_access'] = $default_options['deny_admin_access'];
-            }
-        }
-
-        /**
-         * Filter the options after being sanitized.
-         *
-         * @param (array) $sanitized_options The new options, sanitized.
-         * @param (array) $options           The submitted options.
-         */
-        $options_tmp       = apply_filters( 'sfml_sanitize_options', $sanitized_options, $options );
-        // Make sure no keys have been removed.
-        $sanitized_options = array_merge( $sanitized_options, $options_tmp );
-
-        // Clear options cache.
-        $this->maybe_clear_options_cache( true );
-
-        // Add the rewrite rules to the `.htaccess`/`web.config` file.
-        $old_slugs = static::get_sub_options( 'slugs', $old_options );
-        $new_slugs = static::get_sub_options( 'slugs', $sanitized_options );
-
-        if ( $old_slugs !== $new_slugs ) {
-            sfml_include_rewrite_file();
-            sfml_write_rules( sfml_rules( $new_slugs ) );
-        }
-
-        // Trigger errors.
-        if ( is_admin() ) {
-            $errors['forbidden']  = array_unique( $errors['forbidden'] );
-            $errors['duplicates'] = array_unique( $errors['duplicates'] );
-
-            if ( $nbr_forbidden = count( $errors['forbidden'] ) ) {
-                /** Translators: %s is an URL slug name. */
-                add_settings_error( 'sfml_settings', 'forbidden-slugs', sprintf( _n( 'The slug %s is forbidden.', 'The slugs %s are forbidden.', $nbr_forbidden, 'sf-move-login' ), wp_sprintf( '<code>%l</code>', $errors['forbidden'] ) ) );
-            }
-            if ( ! empty( $errors['duplicates'] ) ) {
-                add_settings_error( 'sfml_settings', 'duplicates-slugs', __( 'The links can\'t have the same slugs.', 'sf-move-login' ) );
-            }
-        }
-
-        return $sanitized_options;
-    }
-
-
-    /**
-     * Get sub-options.
-     *
-     * For example:
-     * static::get_sub_options( 'foo', array(
-     *     'option1'     => 'value1',
-     *     'foo.option2' => 'value2',
-     *     'foo.option3' => 'value3',
-     * ) );
-     * Will return:
-     * array(
-     *     'option2' => 'value2',
-     *     'option3' => 'value3',
-     * )
-     *
-     * @param (string) $name    The sub-option name.
-     * @param (array)  $options Array of options.
-     *
-     * @return (array)
-     */
-    public static function get_sub_options( $name, $options ) {
-        if ( ! $options || ! $name ) {
-            return array();
-        }
-
-        $options = (array) $options;
-
-        if ( isset( $options[ $name ] ) ) {
-            return $options[ $name ];
-        }
-
-        $group = array();
-        $name  = rtrim( $name, '.' ) . '.';
-
-        foreach ( $options as $k => $v ) {
-            if ( 0 === strpos( $k, $name ) ) {
-                $group[ substr( $k, strlen( $name ) ) ] = $v;
-            }
-        }
-
-        return ! empty( $group ) ? $group : null;
-    }
-
-
-    /**
-     * Get custom labels (added by other plugins).
-     *
-     * @since 2.4
-     *
-     * @return (array)
-     */
-    public static function get_additional_labels() {
-        $new_actions = array();
-        /**
-         * Plugins can add their own actions.
-         *
-         * @param (array) $new_actions Custom actions.
-         */
-        return apply_filters( 'sfml_additional_slugs', $new_actions );
-    }
 }

sf-move-login/trunk/inc/functions/compat.php

@@ -208 +208 @@
     }
 endif;
+
+
+if ( ! function_exists( 'do_action_deprecated' ) ) :
+    /**
+     * Fires functions attached to a deprecated action hook.
+     *
+     * When an action hook is deprecated, the do_action() call is replaced with do_action_deprecated(), which triggers a deprecation notice and then fires the original hook.
+     *
+     * @since 2.5.2
+     * @since WP 4.6.0
+     *
+     * @see _deprecated_hook()
+     *
+     * @param (string) $tag         The name of the action hook.
+     * @param (array)  $args        Array of additional function arguments to be passed to do_action().
+     * @param (string) $version     The version of WordPress that deprecated the hook.
+     * @param (string) $replacement Optional. The hook that should have been used.
+     * @param (string) $message     Optional. A message regarding the change.
+     */
+    function do_action_deprecated( $tag, $args, $version, $replacement = false, $message = null ) {
+        if ( ! has_action( $tag ) ) {
+            return;
+        }
+
+        _deprecated_hook( $tag, $version, $replacement, $message );
+
+        do_action_ref_array( $tag, $args );
+    }
+endif;
+
+
+if ( ! function_exists( '_deprecated_hook' ) ) :
+    /**
+     * Marks a deprecated action or filter hook as deprecated and throws a notice.
+     *
+     * Use the {@see 'deprecated_hook_run'} action to get the backtrace describing where the deprecated hook was called.
+     *
+     * Default behavior is to trigger a user error if `WP_DEBUG` is true.
+     *
+     * This function is called by the do_action_deprecated() and apply_filters_deprecated() functions, and so generally does not need to be called directly.
+     *
+     * @since 2.5.2
+     * @since WP 4.6.0
+     *
+     * @param (string) $hook        The hook that was used.
+     * @param (string) $version     The version of WordPress that deprecated the hook.
+     * @param (string) $replacement Optional. The hook that should have been used.
+     * @param (string) $message     Optional. A message regarding the change.
+     */
+    function _deprecated_hook( $hook, $version, $replacement = null, $message = null ) {
+        /**
+         * Fires when a deprecated hook is called.
+         *
+         * @since 2.5.2
+         * @since WP 4.6.0
+         *
+         * @param (string) $hook        The hook that was called.
+         * @param (string) $replacement The hook that should be used as a replacement.
+         * @param (string) $version     The version of WordPress that deprecated the argument used.
+         * @param (string) $message     A message regarding the change.
+         */
+        do_action( 'deprecated_hook_run', $hook, $replacement, $version, $message );
+
+        /**
+         * Filters whether to trigger deprecated hook errors.
+         *
+         * @since 2.5.2
+         * @since WP 4.6.0
+         *
+         * @param (bool) $trigger Whether to trigger deprecated hook errors. Requires `WP_DEBUG` to be defined true.
+         */
+        if ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) {
+            $message = empty( $message ) ? '' : ' ' . $message;
+            if ( ! is_null( $replacement ) ) {
+                /* Translators: 1: WordPress hook name, 2: version number, 3: alternative hook name. */
+                trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', 'sf-move-login' ), $hook, $version, $replacement ) . $message );
+            } else {
+                /* Translators: 1: WordPress hook name, 2: version number. */
+                trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', 'sf-move-login' ), $hook, $version ) . $message );
+            }
+        }
+    }
+endif;

sf-move-login/trunk/inc/functions/rewrite.php

@@ -46 +46 @@
  */
 function sfml_write_rules( $rules = null ) {
-    global $is_apache, $is_iis7;
-
     $rules = isset( $rules ) ? $rules : sfml_rules();
 
@@ -59 +57 @@
     }
     // Apache.
-    elseif ( $is_apache ) {
+    elseif ( sfml_is_apache() ) {
         $success = sfml_insert_apache_rewrite_rules( $rules );
     }
     // IIS.
-    elseif ( $is_iis7 ) {
+    elseif ( sfml_is_iis7() ) {
         $success = sfml_insert_iis7_rewrite_rules( $rules );
     }
@@ -99 +97 @@
  */
 function sfml_get_rewrite_bases() {
-    global $is_apache, $is_nginx, $is_iis7;
     static $bases;
 
@@ -119 +116 @@
 
     // Apache.
-    if ( $is_apache ) {
+    if ( sfml_is_apache() ) {
         /**
          * In the `*_from` fields, we don't add `$base` because we use `RewriteBase $base` in the rewrite rules.
@@ -145 +142 @@
 
     // Nginx.
-    if ( $is_nginx ) {
+    if ( sfml_is_nginx() ) {
         if ( $is_sub ) {
             // MultiSite by sub-folders.
@@ -167 +164 @@
 
     // IIS7.
-    if ( $is_iis7 ) {
+    if ( sfml_is_iis7() ) {
         $base     = ltrim( $base, '/' );     // No heading slash for IIS: '' or 'sub-dir/'.
         $site_dir = ltrim( $site_dir, '/' ); // No heading slash for IIS: '', 'wp-dir/', 'sub-dir/', or 'sub-dir/wp-dir/'.

sf-move-login/trunk/inc/functions/settings-page.php

@@ -12 +12 @@
  */
 function sfml_settings_fields() {
-    $labels   = SFML_Options::get_instance()->get_slug_field_labels();
+    $instance = SFML_Options::get_instance();
+    $labels   = $instance->get_field_labels( 'slugs' );
     $defaults = sfml_get_default_options();
     $options  = sfml_get_options();
@@ -57 +58 @@
             'value'     => $options['deny_wp_login_access'],
             'default'   => $defaults['deny_wp_login_access'],
-            'values'    => array(
-                1 => __( 'Display an error message', 'sf-move-login' ),
-                2 => __( 'Redirect to a «Page not found» error page', 'sf-move-login' ),
-                3 => __( 'Redirect to the home page', 'sf-move-login' ),
-            ),
+            'values'    => $instance->get_field_labels( 'deny_wp_login_access' ),
             'label'     => '<strong>' . __( 'When a logged out user attempts to access the old login page.', 'sf-move-login' ) . '</strong>',
         )
@@ -77 +74 @@
             'value'     => $options['deny_admin_access'],
             'default'   => $defaults['deny_admin_access'],
-            'values'    => array(
-                0 => __( 'Do nothing, redirect to the new login page (not recommended)', 'sf-move-login' ),
-                1 => __( 'Display an error message', 'sf-move-login' ),
-                2 => __( 'Redirect to a &laquo;Page not found&raquo; error page', 'sf-move-login' ),
-                3 => __( 'Redirect to the home page', 'sf-move-login' ),
-            ),
+            'values'    => $instance->get_field_labels( 'deny_admin_access' ),
             'label'     => '<strong>' . __( 'Instead of redirecting a logged out user to the new login page:', 'sf-move-login' ) . '</strong>',
         )
@@ -104 +96 @@
 
 /**
- * The settings page
+ * The settings page.
  */
 function sfml_settings_page() {
@@ -217 +209 @@
  */
 function sfml_rewrite_rules_textarea() {
-    global $is_apache, $is_iis7;
-
     sfml_include_rewrite_file();
 
-    $is_nginx = sfml_is_nginx();
-    $rules    = sfml_rules();
+    $rules = sfml_rules();
 
     // Message.
@@ -231 +220 @@
 
     // IIS.
-    if ( $is_iis7 ) {
+    if ( sfml_is_iis7() ) {
         $file          = 'web.config';
         $file_content  = implode( "\n", sfml_iis7_rewrite_rules( $rules ) );
@@ -246 +235 @@
     }
     // Nginx.
-    elseif ( $is_nginx ) {
+    elseif ( sfml_is_nginx() ) {
         $file          = 'nginx.conf';
         $file_content  = implode( "\n", sfml_nginx_rewrite_rules( $rules ) );
@@ -261 +250 @@
     }
     // Apache.
-    elseif ( $is_apache ) {
+    elseif ( sfml_is_apache() ) {
         $file          = '.htaccess';
         $file_content  = "\n# BEGIN SF Move Login\n";

sf-move-login/trunk/inc/functions/utilities.php

@@ -90 +90 @@
 
 /**
+ * Tell if the server runs Apache.
+ *
+ * @since 2.5.2
+ *
+ * @return (bool) True if the server runs Apache. False otherwize.
+ */
+function sfml_is_apache() {
+    global $is_apache;
+    static $is;
+
+    if ( isset( $is ) ) {
+        return $is;
+    }
+
+    if ( isset( $is_apache ) ) {
+        $is = (bool) $is_apache;
+    } else {
+        $is = ! empty( $_SERVER['SERVER_SOFTWARE'] ) && ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) !== false || strpos( $_SERVER['SERVER_SOFTWARE'], 'LiteSpeed' ) !== false );
+    }
+
+    /**
+     * Filters the value returned by `sfml_is_apache()`.
+     *
+     * @since 2.5.2
+     *
+     * @param (bool) $is True if the server runs Apache. False otherwize.
+     */
+    return apply_filters( 'sfml_is_apache', $is );
+}
+
+
+/**
+ * Tell if the server runs IIS7.
+ *
+ * @since 2.5.2
+ *
+ * @return (bool) True if the server runs IIS7. False otherwize.
+ */
+function sfml_is_iis7() {
+    global $is_iis7;
+    static $is;
+
+    if ( isset( $is ) ) {
+        return $is;
+    }
+
+    if ( isset( $is_iis7 ) ) {
+        $is = (bool) $is_iis7;
+    } else {
+        $is = ! sfml_is_apache() && ! empty( $_SERVER['SERVER_SOFTWARE'] ) && ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) !== false || strpos( $_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer' ) !== false );
+        $is = $is && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
+    }
+
+    /**
+     * Filters the value returned by `sfml_is_iis7()`.
+     *
+     * @since 2.5.2
+     *
+     * @param (bool) $is True if the server runs IIS7. False otherwize.
+     */
+    return apply_filters( 'sfml_is_iis7', $is );
+}
+
+
+/**
  * Tell if the server runs Nginx.
  *
@@ -96 +161 @@
 function sfml_is_nginx() {
     global $is_nginx;
-
-    if ( is_null( $is_nginx ) ) {
-        $is_nginx = ! empty( $_SERVER['SERVER_SOFTWARE'] ) && strpos( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) !== false;
-    }
-
-    return $is_nginx;
+    static $is;
+
+    if ( isset( $is ) ) {
+        return $is;
+    }
+
+    if ( isset( $is_nginx ) ) {
+        $is = (bool) $is_nginx;
+    } else {
+        $is = ! empty( $_SERVER['SERVER_SOFTWARE'] ) && strpos( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) !== false;
+    }
+
+    /**
+     * Filters the value returned by `sfml_is_nginx()`.
+     *
+     * @since 2.5.2
+     *
+     * @param (bool) $is True if the server runs Nginx. False otherwize.
+     */
+    return apply_filters( 'sfml_is_nginx', $is );
 }
 
@@ -342 +421 @@
  */
 function sfml_can_write_file() {
-    global $is_apache, $is_iis7;
-
     $home_path = sfml_get_home_path();
 
     // Apache.
-    if ( $is_apache ) {
+    if ( sfml_is_apache() ) {
         if ( ! got_mod_rewrite() ) {
             return false;
@@ -358 +435 @@
 
     // IIS7.
-    if ( $is_iis7 ) {
+    if ( sfml_is_iis7() ) {
         if ( ! iis7_supports_permalinks() ) {
             return false;

sf-move-login/trunk/inc/redirections-and-dies.php

@@ -99 +99 @@
     switch ( $do ) {
         case 2:
-            $redirect = home_url( '404' );
-            /**
-             * Filter the 404 page URL.
-             *
-             * @param (string) $redirect An URL that leads to a 404 response.
-             */
-            $redirect = apply_filters( 'sfml_404_error_page', $redirect );
-            wp_redirect( esc_url_raw( user_trailingslashit( $redirect ) ) );
+            wp_redirect( esc_url_raw( sfml_get_404_error_url() ) );
             exit;
         case 3:
             wp_redirect( esc_url_raw( user_trailingslashit( home_url() ) ) );
+            exit;
+        case 4:
+            sfml_maybe_trigger_404_error();
+            // Fallback in case headers were already sent.
+            wp_redirect( esc_url_raw( sfml_get_404_error_url() ) );
             exit;
         default:
@@ -162 +160 @@
     $redirect = false;
     /**
-     * If you want to trigger a custom action (redirect, message, die...), add it here.
+     * Filters the redirection location.
+     * You can also trigger a custom action, like a `wp_die()` with a custom message.
      *
      * @since 2.5
@@ -174 +173 @@
     }
 
-    if ( function_exists( 'do_action_deprecated' ) ) {
-        do_action_deprecated( 'sfml_wp_admin_error', array(), '2.5', 'sfml_login_redirect_location' );
-    } else {
-        /**
-         * If you want to trigger a custom action (redirect, message, die...), add it here.
-         * Don't forget to exit/die.
-         */
-        do_action( 'sfml_wp_admin_error' );
-    }
+    do_action_deprecated( 'sfml_wp_admin_error', array(), '2.5', 'sfml_login_redirect_location' );
 
     $do = sfml_get_deny_admin_access();
@@ -188 +179 @@
     switch ( $do ) {
         case 1:
-            sfml_lang_init();
             wp_die( __( 'Cheatin’ uh?', 'sf-move-login' ), __( 'Nope :)', 'sf-move-login' ), array( 'response' => 403 ) );
         case 2:
-            $redirect = home_url( '404' );
-            /** This filter is documented in inc/redirections-and-dies.php */
-            $redirect = apply_filters( 'sfml_404_error_page', $redirect );
-            return esc_url_raw( user_trailingslashit( $redirect ) );
+            return esc_url_raw( sfml_get_404_error_url() );
         case 3:
             return esc_url_raw( user_trailingslashit( home_url() ) );
-    }
-}
+        case 4:
+            sfml_maybe_trigger_404_error();
+            // Fallback in case headers were already sent.
+            return esc_url_raw( sfml_get_404_error_url() );
+        default:
+            return $location;
+    }
+}
+
+
+/**
+ * Trigger a 404 error if headers have not been sent yet.
+ * Be aware that if the headers have been sent, the request won't be killed: provide a fallback!
+ *
+ * @since 2.5.2
+ */
+function sfml_maybe_trigger_404_error() {
+    if ( headers_sent() ) {
+        return;
+    }
+
+    status_header( 404 );
+
+    $headers = wp_get_nocache_headers();
+    $headers['Content-Type'] = get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' );
+
+    foreach ( $headers as $name => $field_value ) {
+        @header( "{$name}: {$field_value}" );
+    }
+
+    exit;
+}
+
+
+/**
+ * Get the URL of the "WordPress" 404 error page we'll redirect to.
+ *
+ * @since 2.5.2
+ *
+ * @return (string) A URL.
+ */
+function sfml_get_404_error_url() {
+    global $wp_rewrite;
+
+    if ( $wp_rewrite && $wp_rewrite->using_permalinks() ) {
+        $redirect = user_trailingslashit( home_url( '404' ) );
+    } else {
+        $redirect = add_query_arg( 'p', '404', user_trailingslashit( home_url() ) );
+    }
+    /**
+     * Filter the 404 page URL.
+     *
+     * @param (string) $redirect An URL that leads to a 404 response.
+     */
+    return apply_filters( 'sfml_404_error_page', $redirect );
+}

sf-move-login/trunk/languages/sf-move-login-fr_FR.po

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Move Login 2.4.3\n"
+"Project-Id-Version: SF Move Login\n"
 "Report-Msgid-Bugs-To: Grégory Viguier <[email protected]>\n"
-"POT-Creation-Date: 2017-05-09 22:18+0200\n"
-"PO-Revision-Date: 2017-05-09 22:24+0200\n"
-"Last-Translator: WP Media <[email protected]>\n"
-"Language-Team: French (France)\n"
+"POT-Creation-Date: 2017-05-25 15:27+0200\n"
+"PO-Revision-Date: 2017-05-25 16:09+0200\n"
+"Last-Translator: Grégory Viguier <[email protected]>\n"
+"Language-Team: Grégory Viguier <[email protected]>\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.8.12\n"
 "X-Poedit-Basepath: ..\n"
-"X-Poedit-KeywordsList: _x:1,2c;__;_e;_ex:1,2c;_n:1,2;_nx:1,2;esc_html__;"
-"esc_html_e;_n_noop:1,2\n"
+"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Textdomain-Support: yes\n"
+"X-Poedit-WPHeader: sf-move-login.php\n"
 "X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: *.js\n"
 
 #. Translators: 1 is the plugin name.
-#: inc/activate.php:53
+#: inc/activate.php:50
 #, php-format
 msgid "%s has not been activated."
 msgstr "%s n&rsquo;a pas été activé."
 
-#: inc/activate.php:55
+#: inc/activate.php:52
 msgid "Error"
 msgstr "Erreur"
 
 #. Translators: 1 is the plugin name.
-#: inc/activate.php:116
+#: inc/activate.php:115
 #, php-format
-msgid ""
-"It seems your server configuration prevents the plugin to work properly. %s "
-"won't work."
-msgstr ""
-"Il semble que votre configuration serveur empêche l&rsquo;extension de "
-"fonctionner correctement. %s ne pourra pas fonctionner."
+msgid "It seems your server configuration prevents the plugin to work properly. %s won't work."
+msgstr "Il semble que votre configuration serveur empêche l&rsquo;extension de fonctionner correctement. %s ne pourra pas fonctionner."
 
 #. Translators: 1 is the plugin name.
-#: inc/activate.php:118
+#: inc/activate.php:117
 #, php-format
-msgid ""
-"It seems the url rewrite module is not activated on your server. %s won't "
-"work."
-msgstr ""
-"Il semble que le module de réécriture d&rsquo;url n&rsquo;est pas activé sur "
-"votre serveur. %s ne pourra pas fonctionner."
+msgid "It seems the url rewrite module is not activated on your server. %s won't work."
+msgstr "Il semble que le module de réécriture d&rsquo;url n&rsquo;est pas activé sur votre serveur. %s ne pourra pas fonctionner."
 
 #. Translators: 1, 2, and 3 are server technologies (Apache, Nginx, IIS7), 4 is the plugin name.
-#: inc/activate.php:120
+#: inc/activate.php:119
 #, php-format
-msgid ""
-"It seems your server does not use %1$s, %2$s, nor %3$s. %4$s won't work."
-msgstr ""
-"Il semble que votre serveur n&rsquo;utilise ni %1$s, %2$s, ou %3$s. %4$s ne "
-"pourra pas fonctionner."
+msgid "It seems your server does not use %1$s, %2$s, nor %3$s. %4$s won't work."
+msgstr "Il semble que votre serveur n&rsquo;utilise ni %1$s, %2$s, ou %3$s. %4$s ne pourra pas fonctionner."
 
 #. Translators: 1 is the plugin name, 2 is a file name, 3 is a "Move Login" link.
-#: inc/activate.php:122
+#: inc/activate.php:121
 #, php-format
-msgid ""
-"%1$s needs access to the %2$s file. Please visit the %3$s settings page and "
-"copy/paste the given code into the %2$s file."
-msgstr ""
-"%1$s a besoin d&rsquo;accéder au fichier %2$s. Veuillez vous rendre sur la "
-"page de réglages de %3$s et veuillez copier/coller le code fourni dans le "
-"fichier %2$s."
+msgid "%1$s needs access to the %2$s file. Please visit the %3$s settings page and copy/paste the given code into the %2$s file."
+msgstr "%1$s a besoin d&rsquo;accéder au fichier %2$s. Veuillez vous rendre sur la page de réglages de %3$s et veuillez copier/coller le code fourni dans le fichier %2$s."
 
 #. Translators: 1 is a server technology (Nginx), 2 is a "Move Login" link, 3 is the plugin name.
-#: inc/activate.php:124
+#: inc/activate.php:123
 #, php-format
-msgid ""
-"It seems your server uses a %1$ system. You have to edit the rewrite rules "
-"by yourself in the configuration file. Please visit the %2$s settings page "
-"and take a look at the rewrite rules. %3$s is running but won't work "
-"correctly until you deal with those rewrite rules."
-msgstr ""
-"Il semble que votre serveur utilise un système %1$s. Vous devez éditer les "
-"règles de réécriture par vous-même dans le fichier de configuration. "
-"Veuillez vous rendre sur la page de réglages de %2$s et jetez un œil aux "
-"règles de réécriture. %3$s fonctionne mais ne pourra pas le faire "
-"correctement tant que vous ne vous serez pas occupé de ces règles."
+msgid "It seems your server uses a %1$ system. You have to edit the rewrite rules by yourself in the configuration file. Please visit the %2$s settings page and take a look at the rewrite rules. %3$s is running but won't work correctly until you deal with those rewrite rules."
+msgstr "Il semble que votre serveur utilise un système %1$s. Vous devez éditer les règles de réécriture par vous-même dans le fichier de configuration. Veuillez vous rendre sur la page de réglages de %2$s et jetez un œil aux règles de réécriture. %3$s fonctionne mais ne pourra pas le faire correctement tant que vous ne vous serez pas occupé de ces règles."
 
 #: inc/admin.php:152 inc/functions/deprecated.php:87
-#: inc/redirections-and-dies.php:190
+#: inc/redirections-and-dies.php:181
 msgid "Cheatin&#8217; uh?"
 msgstr "Alors, on triche&nbsp;?"
 
+#: inc/classes/class-sfml-options.php:312
+#: inc/classes/class-sfml-options.php:319
+msgid "Display an error message"
+msgstr "Afficher un message d'erreur"
+
+#: inc/classes/class-sfml-options.php:313
+#: inc/classes/class-sfml-options.php:320
+msgid "Trigger a &laquo;Page not found&raquo; error"
+msgstr "Déclencher une erreur &laquo;&#160;Page non trouvée&#160;&raquo;"
+
+#: inc/classes/class-sfml-options.php:314
+#: inc/classes/class-sfml-options.php:321
+msgid "Redirect to a \"WordPress\" &laquo;Page not found&raquo; error page"
+msgstr "Rediriger vers une page d&rsquo;erreur &laquo;&#160;Page non trouvée&#160;&raquo; de WordPress"
+
+#: inc/classes/class-sfml-options.php:315
+#: inc/classes/class-sfml-options.php:322
+msgid "Redirect to the home page"
+msgstr "Rediriger vers la page d&rsquo;accueil"
+
+#: inc/classes/class-sfml-options.php:318
+msgid "Do nothing, redirect to the new login page (not recommended)"
+msgstr "Ne rien faire, rediriger vers la nouvelle page de connexion (non recommandé)"
+
 #. Translators: %s is an URL slug name.
-#: inc/classes/class-sfml-options.php:389
+#: inc/classes/class-sfml-options.php:497
 #, php-format
 msgid "The slug %s is forbidden."
@@ -100 +100 @@
 msgstr[1] "Les identifiants %s sont interdits."
 
-#: inc/classes/class-sfml-options.php:392
+#: inc/classes/class-sfml-options.php:500
 msgid "The links can't have the same slugs."
 msgstr "Les liens ne peuvent pas avoir les mêmes identifiants."
 
-#: inc/functions/deprecated.php:87 inc/redirections-and-dies.php:114
-#: inc/redirections-and-dies.php:190
+#. Translators: 1: WordPress hook name, 2: version number, 3: alternative hook name.
+#: inc/functions/compat.php:285
+#, php-format
+msgid "%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."
+msgstr "%1$s est <strong>déprécié</strong> depuis la version %2$s ! Utilisez %3$s à la place."
+
+#. Translators: 1: WordPress hook name, 2: version number.
+#: inc/functions/compat.php:288
+#, php-format
+msgid "%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."
+msgstr "%1$s est <strong>déprécié</strong> depuis la version %2$s, aucune alternative n&rsquo;est disponible."
+
+#: inc/functions/deprecated.php:87 inc/redirections-and-dies.php:112
+#: inc/redirections-and-dies.php:181
 msgid "Nope :)"
 msgstr "Raté :)"
 
-#: inc/functions/settings-page.php:19
+#: inc/functions/settings-page.php:20
 msgid "Choose your new URLs"
 msgstr "Choisissez vos nouvelles adresses"
 
-#: inc/functions/settings-page.php:20
+#: inc/functions/settings-page.php:21
 msgid "Access"
 msgstr "Accès"
 
-#: inc/functions/settings-page.php:42
+#: inc/functions/settings-page.php:43
 msgid "Only lowercase letters, digits, - and _"
 msgstr "Seulement des lettres minuscules, chiffres, - et _"
 
-#: inc/functions/settings-page.php:60 inc/functions/settings-page.php:81
-msgid "Display an error message"
-msgstr "Afficher un message d'erreur"
+#: inc/functions/settings-page.php:61
+msgid "When a logged out user attempts to access the old login page."
+msgstr "Quand un utilisateur non connecté tente d'accéder à l'ancienne page de connexion."
 
-#: inc/functions/settings-page.php:61 inc/functions/settings-page.php:82
-msgid "Redirect to a &laquo;Page not found&raquo; error page"
-msgstr ""
-"Rediriger vers une page d&rsquo;erreur &laquo;&#160;Page non trouvée&#160;"
-"&raquo;"
-
-#: inc/functions/settings-page.php:62 inc/functions/settings-page.php:83
-msgid "Redirect to the home page"
-msgstr "Rediriger vers la page d&rsquo;accueil"
-
-#: inc/functions/settings-page.php:64
-msgid "When a logged out user attempts to access the old login page."
-msgstr ""
-"Quand un utilisateur non connecté tente d'accéder à l'ancienne page de "
-"connexion."
-
-#: inc/functions/settings-page.php:71
+#: inc/functions/settings-page.php:68
 msgctxt "noun"
 msgid "Redirects"
 msgstr "Redirections"
 
-#: inc/functions/settings-page.php:80
-msgid "Do nothing, redirect to the new login page (not recommended)"
-msgstr ""
-"Ne rien faire, rediriger vers la nouvelle page de connexion (non recommandé)"
-
-#: inc/functions/settings-page.php:85
+#: inc/functions/settings-page.php:77
 msgid "Instead of redirecting a logged out user to the new login page:"
-msgstr ""
-"Plutôt que de rediriger un utilisateur non connecté vers la nouvelle page de "
-"connexion&nbsp;:"
+msgstr "Plutôt que de rediriger un utilisateur non connecté vers la nouvelle page de connexion&nbsp;:"
 
 #. Translators: %s is an option value.
-#: inc/functions/settings-page.php:167 inc/functions/settings-page.php:210
+#: inc/functions/settings-page.php:159 inc/functions/settings-page.php:202
 #, php-format
 msgctxt "default value"
@@ -165 +154 @@
 
 #. Translators: 1 is a file name, 2 is a file path, 3 and 4 are small parts of code.
-#: inc/functions/settings-page.php:240 inc/functions/settings-page.php:272
+#: inc/functions/settings-page.php:229 inc/functions/settings-page.php:261
 #, php-format
-msgid ""
-"If the plugin fails to add the new rewrite rules to your %1$s file, add the "
-"following to your %1$s file in %2$s, replacing other %3$s rules if they "
-"exist, <strong>above</strong> the line reading %4$s:"
-msgstr ""
-"Si l&rsquo;extension ne peut ajouter les nouvelles règles de réécriture à "
-"votre fichier %1$s, ajoutez les lignes suivantes à votre fichier %1$s dans "
-"%2$s, en remplacement des autres règles liées à %3$s si elles existent, "
-"<strong>au-dessus</strong> de la ligne %4$s&#160;:"
+msgid "If the plugin fails to add the new rewrite rules to your %1$s file, add the following to your %1$s file in %2$s, replacing other %3$s rules if they exist, <strong>above</strong> the line reading %4$s:"
+msgstr "Si l&rsquo;extension ne peut ajouter les nouvelles règles de réécriture à votre fichier %1$s, ajoutez les lignes suivantes à votre fichier %1$s dans %2$s, en remplacement des autres règles liées à %3$s si elles existent, <strong>au-dessus</strong> de la ligne %4$s&#160;:"
 
 #. Translators: 1 is a file name, 2 is a small part of code.
-#: inc/functions/settings-page.php:255
+#: inc/functions/settings-page.php:244
 #, php-format
-msgid ""
-"The plugin can't add the new rewrite rules to your %1$s file by itself, you "
-"will need to add them manually inside the %2$s block."
-msgstr ""
-"L&rsquo;extension ne peut ajouter les nouvelles règles de réécriture à votre "
-"fichier %1$s, vous devrez les ajouter manuellement à l&rsquo;intérieur du "
-"bloc %2$s."
+msgid "The plugin can't add the new rewrite rules to your %1$s file by itself, you will need to add them manually inside the %2$s block."
+msgstr "L&rsquo;extension ne peut ajouter les nouvelles règles de réécriture à votre fichier %1$s, vous devrez les ajouter manuellement à l&rsquo;intérieur du bloc %2$s."
 
 #. Translators: %s is a file name.
-#: inc/functions/settings-page.php:288
+#: inc/functions/settings-page.php:277
 #, php-format
 msgid "Your %s file is not writable."
@@ -195 +172 @@
 
 #. Translators: 1 is a constant name, 2 is a constant value.
-#: inc/functions/settings-page.php:296
+#: inc/functions/settings-page.php:285
 #, php-format
-msgid ""
-"The constant %1$s is defined to %2$s, the settings below won't take effect."
-msgstr ""
-"La constante %1$s est définie à %2$s, les réglages ci-dessous ne prendront "
-"pas effet."
+msgid "The constant %1$s is defined to %2$s, the settings below won't take effect."
+msgstr "La constante %1$s est définie à %2$s, les réglages ci-dessous ne prendront pas effet."
 
-#: inc/redirections-and-dies.php:114
+#: inc/redirections-and-dies.php:112
 msgid "No no no, the login form is not here."
 msgstr "Non non non, le formulaire de connexion ne se trouve pas ici."
 
 #. Translators: Description of the plugin/theme
-#: sf-move-login.php:92
+#. Description of the plugin/theme
+#: sf-move-login.php:93
 msgid "Change your login URL."
 msgstr "Changez l&rsquo;url de votre page de connexion."
-
-#~ msgid "Administration area"
-#~ msgstr "Zone d'administration"
-
-#~ msgid ""
-#~ "When a not connected user attempts to access the administration area."
-#~ msgstr ""
-#~ "Lorsqu&rsquo;un utilisateur non connecté tente d&rsquo;accéder à la zone "
-#~ "d&rsquo;administration."
-
-#~ msgid ""
-#~ "It seems your server does not use <i>Apache</i>, <i>Nginx</i>, nor "
-#~ "<i>IIS7</i>. <strong>Move Login</strong> won't work."
-#~ msgstr ""
-#~ "Il semble que votre serveur n&rsquo;utilise ni <i>Apache</i>, <i>Nginx</"
-#~ "i>, ou <i>IIS7</i>. <strong>Move Login</strong> ne pourra pas fonctionner."
-
-#~ msgid ""
-#~ "Change your login URL for something like <code>http://example.com/login</"
-#~ "code> and stop login brute force attempts."
-#~ msgstr ""
-#~ "Changez l&rsquo;url de votre page de connexion pour quelque chose comme "
-#~ "<code>http://example.com/login</code> et stoppez les tentatives de "
-#~ "connexion par brute force."

sf-move-login/trunk/readme.txt

@@ -68 +68 @@
 == Changelog ==
 
+= 2.5.2 =
+
+* 2017/05/25
+* New: a new option is available. Instead of redirecting to the a "WordPress" 404 error page, you can choose to directly trigger the 404 error. Pro: the user is not directed, the URL doesn't change. Con: the user sees the browser error page, it probably is ugly (but do we really care?).
+* Fixed the blank page that was displaying instead of redirecting the user to the new login URL.
+* Dev stuff: in case the plugin has trouble determining your server technology, take a look at `sfml_is_apache()`, `sfml_is_iis7()`, and `sfml_is_nginx()`: returned values can be filtered with a MU plugin.
+
 = 2.5.1 =
 
@@ -76 +83 @@
 
 * 2017/05/09
-* Some files from WordPress core were still able to redirect a logged out user to the new login URL. Now Move Login filters every redirection to prevent it.
+* New: some files from WordPress core were still able to redirect a logged out user to the new login URL. Now Move Login filters every redirection to prevent it.
+* Dev stuff: the hook `sfml_wp_admin_error` is now deprecated. Please use the filter `sfml_login_redirect_location` instead.
 
 = 2.4.3 =

sf-move-login/trunk/sf-move-login.php

@@ -4 +4 @@
  * Plugin URI: https://www.screenfeed.fr/plugin-wp/move-login/
  * Description: Change your login URL.
- * Version: 2.5.1
+ * Version: 2.5.2
  * Author: Grégory Viguier
  * Author URI: https://www.screenfeed.fr/
@@ -26 +26 @@
 /*------------------------------------------------------------------------------------------------*/
 
-define( 'SFML_VERSION',         '2.5.1' );
+define( 'SFML_VERSION',         '2.5.2' );
 define( 'SFML_FILE',            __FILE__ );
 define( 'SFML_PLUGIN_BASENAME', plugin_basename( SFML_FILE ) );
@@ -51 +51 @@
  */
 function sfml_init() {
+    sfml_lang_init();
+
     SFML_Options::get_instance();
 
@@ -73 +75 @@
 /*------------------------------------------------------------------------------------------------*/
 
-add_action( 'init', 'sfml_lang_init' );
 /**
  * Load translations.