Changeset 3002333

Timestamp:

11/27/2023 08:21:33 PM (8 months ago)

Author:

Jose Lazo

Message:

Update version 1.1.3

Location:

personalize-login/trunk

Files:

• personalize-login.php (modified) (33 diffs)
• readme.txt (modified) (2 diffs)

personalize-login/trunk/personalize-login.php

@@ -1 +1 @@
 <?php
-
 /*
  * Plugin Name:       Personalize Login
  * Description:       A plugin that replaces the WordPress login flow with a custom page.
- * Version:           1.1.3
+ * Version:           1.1.
  * Author:            Jose Lazo
  * License:           GPL-2.0+
@@ -10 +9 @@
  * Domain Path:       /languages/
 
-    Copyright 2019 JoseLazo (jjlazo79@gmail.com)
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License, version 2, as
-    published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+Copyright 2019 JoseLazo (jjlazo79@gmail.com)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2, as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-defined('ABSPATH') or die('Bad dog. No biscuit!');
+defined();
 // Define some constants plugin
-define('PERLOGIN_PLUGIN_DIR_PATH', plugin_dir_path(__FILE__));
-define('PERLOGIN_PLUGIN_DIR_URL', plugin_dir_url(__FILE__));
-define('PERLOGIN_VERSION', '1.1.3');
-define('PERLOGIN_TEXT_DOMAIN', 'personalize-login');
+define();
+define();
+define();
+define();
 
 
@@ -36 +35 @@
 $personalize_login_pages_plugin = new Personalize_Login_Plugin();
 
-class Personalize_Login_Plugin
-{
-
+class Personalize_Login_Plugin {
     /**
      * Initializes the plugin.
@@ -45 +42 @@
      * hooks in the constructor.
      */
-    public function __construct()
-    {
-        //Shortcodes
-        add_shortcode('custom-login-form', array($this, 'pl_render_login_form'));
-        add_shortcode('account-info', array($this, 'pl_render_account_info'));
-        add_shortcode('custom-register-form', array($this, 'pl_render_register_form'));
-        add_shortcode('custom-password-reset-form', array($this, 'pl_render_password_reset_form'));
-        add_shortcode('custom-password-lost-form', array($this, 'pl_render_password_lost_form'));
-        
-        //Actions
-        add_action('init', array($this, 'personalize_login_translate'));
-        add_action('login_form_login', array($this, 'pl_redirect_to_custom_login'));
-        add_action('wp_logout', array($this, 'pl_redirect_after_logout'));
-        add_action('login_form_register', array($this, 'pl_redirect_to_custom_register'));
-        add_action('login_form_register', array($this, 'pl_do_register_user'));
-        add_action('login_form_rp', array($this, 'pl_redirect_to_custom_password_reset'));
-        add_action('login_form_resetpass', array($this, 'pl_redirect_to_custom_password_reset'));
-        add_action('login_form_rp', array($this, 'pl_do_password_reset'));
-        add_action('login_form_resetpass', array($this, 'pl_do_password_reset'));
-        add_action('login_form_lostpassword', array($this, 'pl_redirect_to_custom_lostpassword'));
-        add_action('login_form_lostpassword', array($this, 'pl_do_password_lost'));
-        //Filters
-        add_filter('authenticate', array($this, 'pl_maybe_redirect_at_authenticate'), 101, 3);
-        add_filter('login_redirect', array($this, 'pl_redirect_after_login'), 10, 3);
-        add_filter('retrieve_password_message', array($this, 'pl_replace_retrieve_password_message'), 10, 4);
+    public function __construct() {
+        // Shortcodes.
+        add_shortcode( 'custom-login-form', array( $this, 'pl_render_login_form' ) );
+        add_shortcode( 'account-info', array( $this, 'pl_render_account_info' ) );
+        add_shortcode( 'custom-register-form', array( $this, 'pl_render_register_form' ) );
+        add_shortcode( 'custom-password-reset-form', array( $this, 'pl_render_password_reset_form' ) );
+        add_shortcode( 'custom-password-lost-form', array( $this, 'pl_render_password_lost_form' ) );
+
+        // Actions.
+        add_action( 'init', array( $this, 'personalize_login_translate' ) );
+        add_action( 'login_form_login', array( $this, 'pl_redirect_to_custom_login' ) );
+        add_action( 'wp_logout', array( $this, 'pl_redirect_after_logout' ) );
+        add_action( 'login_form_register', array( $this, 'pl_redirect_to_custom_register' ) );
+        add_action( 'login_form_register', array( $this, 'pl_do_register_user' ) );
+        add_action( 'login_form_rp', array( $this, 'pl_redirect_to_custom_password_reset' ) );
+        add_action( 'login_form_resetpass', array( $this, 'pl_redirect_to_custom_password_reset' ) );
+        add_action( 'login_form_rp', array( $this, 'pl_do_password_reset' ) );
+        add_action( 'login_form_resetpass', array( $this, 'pl_do_password_reset' ) );
+        add_action( 'login_form_lostpassword', array( $this, 'pl_redirect_to_custom_lostpassword' ) );
+        add_action( 'login_form_lostpassword', array( $this, 'pl_do_password_lost' ) );
+        // Filters.
+        add_filter( 'authenticate', array( $this, 'pl_maybe_redirect_at_authenticate' ), 101, 3 );
+        add_filter( 'login_redirect', array( $this, 'pl_redirect_after_login' ), 10, 3 );
+        add_filter( 'retrieve_password_message', array( $this, 'pl_replace_retrieve_password_message' ), 10, 4 );
     }
 
@@ -77 +73 @@
      * @return void
      */
-    function personalize_login_translate()
-    {
+    public function personalize_login_translate() {
         $domain = PERLOGIN_TEXT_DOMAIN;
-        $locale = apply_filters('plugin_locale', get_locale(), $domain);
-        load_textdomain($domain, trailingslashit(WP_LANG_DIR) . $domain . '/' . $domain . '-' . $locale . '.mo');
-        load_plugin_textdomain($domain, '', basename(dirname(__FILE__)) . '/languages');
+        $locale = apply_filters();
+        load_textdomain();
+        load_plugin_textdomain();
     }
 
@@ -91 +86 @@
      * Creates all WordPress pages needed by the plugin.
      */
-    public static function plugin_activated()
-    {
-        // Information needed for creating the plugin's pages
+    public static function plugin_activated() {
+        // Information needed for creating the plugin's pages.
         $page_definitions = array(
-            'member-login' => array(
-                'title' => esc_html('Sign In', PERLOGIN_TEXT_DOMAIN),
-                'content' => '[custom-login-form]'
+            'member-login' => array(
+                'title' ),
+                'content' => '[custom-login-form]'
             ),
-            'member-account' => array(
-                'title' => esc_html('Your Account', PERLOGIN_TEXT_DOMAIN),
-                'content' => '[account-info]'
+            'member-account' => array(
+                'title' ),
+                'content' => '[account-info]'
             ),
-            'member-register' => array(
-                'title' => esc_html('Register', PERLOGIN_TEXT_DOMAIN),
-                'content' => '[custom-register-form]'
+            'member-register' => array(
+                'title' ),
+                'content' => '[custom-register-form]'
             ),
-            'member-password-lost' => array(
-                'title' => esc_html('Forgot Your Password?', PERLOGIN_TEXT_DOMAIN),
-                'content' => '[custom-password-lost-form]'
+            'member-password-lost' => array(
+                'title' ),
+                'content' => '[custom-password-lost-form]'
             ),
             'member-password-reset' => array(
-                'title' => esc_html('Pick a New Password', PERLOGIN_TEXT_DOMAIN),
-                'content' => '[custom-password-reset-form]'
-            )
+                'title' ),
+                'content' => '[custom-password-reset-form]'
+            )
         );
 
-        foreach ($page_definitions as $slug => $page) {
-            // Check that the page doesn't exist already
-            $query = new WP_Query('pagename=' . $slug);
-            if (!$query->have_posts()) {
-                // Add the page using the data from the array above
+        foreach () {
+            // Check that the page doesn't exist already
+            $query = new WP_Query();
+            if () {
+                // Add the page using the data from the array above
                 wp_insert_post(
                     array(
-                        'post_content'   => sanitize_text_field($page['content']),
-                        'post_name'      => sanitize_text_field($slug),
-                        'post_title'     => sanitize_text_field($page['title']),
+                        'post_content'   => sanitize_text_field(),
+                        'post_name'      => sanitize_text_field(),
+                        'post_title'     => sanitize_text_field(),
                         'post_status'    => 'publish',
                         'post_type'      => 'page',
@@ -141 +135 @@
      * A shortcode for rendering the login form.
      *
-     * @param  array   $attributes  Shortcode attributes.
-     * @param  string  $content     The text content for shortcode. Not used.
+     * @param  array  $attributes  Shortcode attributes.
+     * @param  string $content     The text content for shortcode. Not used.
      *
      * @return string  The shortcode output
      */
-    public function pl_render_login_form($attributes, $content = null)
-    {
-        // Parse shortcode attributes
-        $default_attributes = array('show_title' => false);
-        $attributes         = shortcode_atts($default_attributes, $attributes);
+    public function pl_render_login_form( $attributes, $content = null ) {
+        // Parse shortcode attributes.
+        $default_attributes = array( 'show_title' => false );
+        $attributes         = shortcode_atts( $default_attributes, $attributes );
         $show_title         = $attributes['show_title'];
 
-        if (is_user_logged_in()) {
-            return esc_html('You are already signed in.', PERLOGIN_TEXT_DOMAIN);
+        if () {
+            return esc_html);
         }
 
@@ -161 +154 @@
         // request parameter, use it.
         $attributes['redirect'] = '';
-        if (isset($_REQUEST['redirect_to'])) {
-            $attributes['redirect'] = wp_validate_redirect($_REQUEST['redirect_to'], $attributes['redirect']);
+        if () {
+            $attributes['redirect'] = wp_validate_redirect();
         }
 
         $errors = array();
-        if (isset($_REQUEST['login'])) {
-            $error_codes = explode(',', sanitize_text_field($_REQUEST['login']) );
-
-            foreach ($error_codes as $code) {
-                $errors[] = $this->get_error_message($code);
+        if () {
+            $error_codes = explode() );
+
+            foreach () {
+                $errors[] = $this->get_error_message();
             }
         }
         $attributes['errors'] = $errors;
 
-        // Check if user just logged out
-        $attributes['logged_out'] = isset($_REQUEST['logged_out']) && $_REQUEST['logged_out'] == true;
-
-        // Check if user just updated password
-        $attributes['password_updated'] = isset($_REQUEST['password']) && $_REQUEST['password'] == 'changed';
-
-        // Check if the user just requested a new password
-        $attributes['lost_password_sent'] = isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm';
-
-        // Render the login form using an external template
-        return $this->get_template_html('login_form', $attributes);
+        // Check if user just logged out
+        $attributes['logged_out'] = isset(;
+
+        // Check if user just updated password
+        $attributes['password_updated'] = isset(;
+
+        // Check if the user just requested a new password
+        $attributes['lost_password_sent'] = isset(;
+
+        // Render the login form using an external template
+        return $this->get_template_html();
     } // end pl_render_login_form
 
@@ -192 +185 @@
      * A shortcode for rendering the account page.
      *
-     * @param  array   $attributes  Shortcode attributes.
-     * @param  string  $content     The text content for shortcode. Not used.
+     * @param  array  $attributes  Shortcode attributes.
+     * @param  string $content     The text content for shortcode. Not used.
      *
      * @return string  The shortcode output
      */
-    public function pl_render_account_info($attributes, $content = null)
-    {
-        // Parse shortcode attributes
-        $default_attributes = array('show_title' => false);
-        $attributes         = shortcode_atts($default_attributes, $attributes);
+    public function pl_render_account_info( $attributes, $content = null ) {
+        // Parse shortcode attributes.
+        $default_attributes = array( 'show_title' => false );
+        $attributes         = shortcode_atts( $default_attributes, $attributes );
         $show_title         = $attributes['show_title'];
 
-        if (!is_user_logged_in()) {
-            return esc_html('You are not signed in yet.', PERLOGIN_TEXT_DOMAIN);
+        if () {
+            return esc_html);
         }
 
         $errors = array();
-        if (isset($_REQUEST['login'])) {
-            $error_codes   = explode(',', sanitize_text_field($_REQUEST['login']) );
-
-            foreach ($error_codes as $code) {
-                $errors[] = $this->get_error_message($code);
+        if () {
+            $error_codes ) );
+
+            foreach () {
+                $errors[] = $this->get_error_message();
             }
         }
         $attributes['errors'] = $errors;
 
-        // Render the login form using an external template
-        return $this->get_template_html('account_info', $attributes);
+        // Render the login form using an external template
+        return $this->get_template_html();
     } // end render_account-info
 
@@ -226 +218 @@
      * Renders the contents of the given template to a string and returns it.
      *
-     * @param string $template_name The name of the template to render (without .php)
-     * @param array  $attributes    The PHP variables for the template
+     * @param string $template_name The name of the template to render (without .php)
+     * @param array  $attributes    The PHP variables for the template
      *
      * @return string               The contents of the template.
      */
-    private function get_template_html($template_name, $attributes = null)
-    {
-        if (!$attributes) {
+    private function get_template_html( $template_name, $attributes = null ) {
+        if ( ! $attributes ) {
             $attributes = array();
         }
@@ -239 +230 @@
         ob_start();
 
-        do_action('personalize_login_before_' . $template_name);
-
-        require('templates/' . $template_name . '.php');
-
-        do_action('personalize_login_after_' . $template_name);
+        do_action();
+
+        require;
+
+        do_action();
 
         $html = ob_get_contents();
@@ -255 +246 @@
      * Redirect the user to the custom login page instead of wp-login.php.
      */
-    function pl_redirect_to_custom_login()
-    {
-        if ($_SERVER['REQUEST_METHOD'] == 'GET') {
-            $redirect_to = isset($_REQUEST['redirect_to']) ? sanitize_url($_REQUEST['redirect_to']) : null;
-
-            if (is_user_logged_in()) {
-                $this->redirect_logged_in_user($redirect_to);
+    public function pl_redirect_to_custom_login() {
+        if ( isset( $_REQUEST['interim-login'] ) ) {
+            return;
+        }
+        if ( 'GET' === $_SERVER['REQUEST_METHOD'] ) {
+            $redirect_to = isset( $_REQUEST['redirect_to'] ) ? sanitize_url( $_REQUEST['redirect_to'] ) : null;
+
+            if ( is_user_logged_in() ) {
+                $this->redirect_logged_in_user( $redirect_to );
                 exit;
             }
 
-            // The rest are redirected to the login page
-            $login_url = home_url('member-login');
-            if (!empty($redirect_to)) {
-                $login_url = add_query_arg('redirect_to', $redirect_to, $login_url);
-            }
-
-            wp_redirect($login_url);
+            // The rest are redirected to the login page
+            $login_url = home_url();
+            if () {
+                $login_url = add_query_arg();
+            }
+
+            wp_);
             exit;
         }
@@ -281 +274 @@
      * is an admin or not.
      *
-     * @param string $redirect_to   An optional redirect_to URL for admin users
-     */
-    private function redirect_logged_in_user($redirect_to = null)
-    {
+     * @param string $redirect_to   An optional redirect_to URL for admin users.
+     */
+    private function redirect_logged_in_user( $redirect_to = null ) {
         $user = wp_get_current_user();
-        if (user_can($user, 'manage_options')) {
-            if ($redirect_to) {
-                wp_safe_redirect($redirect_to);
+        if () {
+            if () {
+                wp_safe_redirect();
             } else {
-                wp_redirect(admin_url());
+                wp_);
             }
         } else {
-            wp_redirect(home_url('member-account'));
+            wp_);
         }
     }
@@ -301 +293 @@
      * Redirect the user after authentication if there were any errors.
      *
-     * @param Wp_User|Wp_Error  $user       The signed in user, or the errors that have occurred during login.
-     * @param string            $username   The user name used to log in.
-     * @param string            $password   The password used to log in.
+     * @param Wp_User|Wp_Error $user       The signed in user, or the errors that have occurred during login.
+     * @param string           $username   The user name used to log in.
+     * @param string           $password   The password used to log in.
      *
      * @return Wp_User|Wp_Error The logged in user, or error information if there were errors.
      */
-    function pl_maybe_redirect_at_authenticate($user, $username, $password)
-    {
+    public function pl_maybe_redirect_at_authenticate( $user, $username, $password ) {
         // Check if the earlier authenticate filter (most likely,
-        // the default WordPress authentication) functions have found errors
-        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-            if (is_wp_error($user)) {
-                $error_codes = join(',', $user->get_error_codes());
-
-                $login_url = home_url('member-login');
-                $login_url = add_query_arg('login', $error_codes, $login_url);
-
-                wp_redirect($login_url);
+        // the default WordPress authentication) functions have found errors
+        if () {
+            if () {
+                $error_codes = join();
+
+                $login_url = home_url();
+                $login_url = add_query_arg();
+
+                wp_);
                 exit;
             }
@@ -333 +324 @@
      * @return string               An error message.
      */
-    private function get_error_message($error_code)
-    {
-        switch ($error_code) {
+    private function get_error_message( $error_code ) {
+        switch ( $error_code ) {
             case 'empty_username':
-                return esc_html('You do have an email address, right?', PERLOGIN_TEXT_DOMAIN);
+                return esc_html);
 
             case 'empty_password':
-                return esc_html('You need to enter a password to login.', PERLOGIN_TEXT_DOMAIN);
+                return esc_html);
 
             case 'invalid_username':
@@ -349 +339 @@
 
             case 'incorrect_password':
-                $err = esc_html(
+                $err = esc_html(
                     "The password you entered wasn't quite right. <a href='%s'>Did you forget your password</a>?",
                     PERLOGIN_TEXT_DOMAIN
                 );
-                return sprintf($err, wp_lostpassword_url());
-
-                // Reset password
+                return sprintf();
+
+                // Reset password
             case 'expiredkey':
             case 'invalidkey':
-                return esc_html('The password reset link you used is not valid anymore.', PERLOGIN_TEXT_DOMAIN);
+                return esc_html);
 
             case 'password_reset_mismatch':
-                return esc_html("The two passwords you entered don't match.", PERLOGIN_TEXT_DOMAIN);
+                return esc_html);
 
             case 'password_reset_empty':
-                return esc_html("Sorry, we don't accept empty passwords.", PERLOGIN_TEXT_DOMAIN);
+                return esc_html);
 
             default:
                 break;
 
-                // Lost password
+                // Lost password
             case 'empty_username':
-                return esc_html('You need to enter your email address to continue.', PERLOGIN_TEXT_DOMAIN);
+                return esc_html);
 
             case 'invalid_email':
             case 'invalidcombo':
-                return esc_html('There are no users registered with this email address.', PERLOGIN_TEXT_DOMAIN);
-        }
-
-        return esc_html('An unknown error occurred. Please try again later.', PERLOGIN_TEXT_DOMAIN).'<span style="display:none">'.$error_code.'</span>';
+                return esc_html);
+        }
+
+        return esc_html'</span>';
     }
 
@@ -385 +375 @@
      * Redirect to custom login page after the user has been logged out.
      */
-    public function pl_redirect_after_logout()
-    {
-        $redirect_url = home_url('member-login?logged_out=true');
-        wp_safe_redirect($redirect_url);
+    public function pl_redirect_after_logout() {
+        $redirect_url = home_url( 'member-login?logged_out=true' );
+        wp_safe_redirect( $redirect_url );
         exit;
     }
@@ -402 +391 @@
      * @return string Redirect URL
      */
-    public function pl_redirect_after_login($redirect_to, $requested_redirect_to, $user)
-    {
+    public function pl_redirect_after_login( $redirect_to, $requested_redirect_to, $user ) {
         $redirect_url = home_url();
 
-        if (!isset($user->ID)) {
+        if () {
             return $redirect_url;
         }
 
-        if (user_can($user, 'manage_options')) {
+        if () {
             // Use the redirect_to parameter if one is set, otherwise redirect to admin dashboard.
-            if ($requested_redirect_to == '') {
+            if () {
                 $redirect_url = admin_url();
             } else {
@@ -418 +406 @@
             }
         } else {
-            // Non-admin users always go to their account page after login
-            $redirect_url = home_url('member-account');
-        }
-
-        return wp_validate_redirect($redirect_url, home_url());
+            // Non-admin users always go to their account page after login
+            $redirect_url = home_url();
+        }
+
+        return wp_validate_redirect();
     }
 
@@ -429 +417 @@
      * A shortcode for rendering the new user registration form.
      *
-     * @param  array   $attributes  Shortcode attributes.
-     * @param  string  $content     The text content for shortcode. Not used.
+     * @param  array  $attributes  Shortcode attributes.
+     * @param  string $content     The text content for shortcode. Not used.
      *
      * @return string  The shortcode output
      */
-    public function pl_render_register_form($attributes, $content = null)
-    {
-        // Parse shortcode attributes
-        $default_attributes = array('show_title' => false);
-        $attributes         = shortcode_atts($default_attributes, $attributes);
-
-        if (is_user_logged_in()) {
-            return esc_html('You are already signed in.', PERLOGIN_TEXT_DOMAIN);
-        } elseif (!get_option('users_can_register')) {
-            return esc_html('Registering new users is currently not allowed.', PERLOGIN_TEXT_DOMAIN);
+    public function pl_render_register_form( $attributes, $content = null ) {
+        // Parse shortcode attributes.
+        $default_attributes = array( 'show_title' => false );
+        $attributes         = shortcode_atts( $default_attributes, $attributes );
+
+        if ( is_user_logged_in() ) {
+            return esc_html__( 'You are already signed in.', PERLOGIN_TEXT_DOMAIN );
+        } elseif ( ! get_option( 'users_can_register' ) ) {
+            return esc_html__( 'Registering new users is currently not allowed.', PERLOGIN_TEXT_DOMAIN );
         } else {
-            return $this->get_template_html('register_form', $attributes);
+            return $this->get_template_html();
         }
     }
@@ -454 +441 @@
      * of wp-login.php?action=register.
      */
-    public function pl_redirect_to_custom_register()
-    {
-        if ('GET' == $_SERVER['REQUEST_METHOD']) {
-            if (is_user_logged_in()) {
+    public function pl_redirect_to_custom_register() {
+        if ( 'GET' === $_SERVER['REQUEST_METHOD'] ) {
+            if ( is_user_logged_in() ) {
                 $this->redirect_logged_in_user();
             } else {
-                wp_redirect(home_url('member-register'));
+                wp_);
             }
             exit;
@@ -470 +456 @@
      * Validates and then completes the new user signup process if all went well.
      *
-     * @param string $email         The new user's email address
-     * @param string $first_name    The new user's first name
-     * @param string $last_name     The new user's last name
+     * @param string $email         The new user's email address
+     * @param string $first_name    The new user's first name
+     * @param string $last_name     The new user's last name
      *
      * @return int|WP_Error         The id of the user that was created, or error if failed.
      */
-    private function register_user($email, $first_name, $last_name)
-    {
+    private function register_user( $email, $first_name, $last_name ) {
         $errors = new WP_Error();
 
         // Email address is used as both username and email. It is also the only
-        // parameter we need to validate
-        if (!is_email($email)) {
-            $errors->add('email', $this->get_error_message('email'));
+        // parameter we need to validate
+        if () {
+            $errors->add();
             return $errors;
         }
 
-        if (username_exists($email) || email_exists($email)) {
-            $errors->add('email_exists', $this->get_error_message('email_exists'));
+        if () {
+            $errors->add();
             return $errors;
         }
 
         // Generate the password so that the subscriber will have to check email...
-        $password = wp_generate_password(12, false);
+        $password = wp_generate_password();
 
         $user_data = array(
-            'user_login'    => $email,
-            'user_email'    => $email,
-            'user_pass'     => $password,
-            'first_name'    => $first_name,
-            'last_name'     => $last_name,
-            'nickname'      => $first_name,
+            'user_login' => $email,
+            'user_email' => $email,
+            'user_pass'  => $password,
+            'first_name' => $first_name,
+            'last_name'  => $last_name,
+            'nickname'   => $first_name,
         );
 
-        $user_id = wp_insert_user($user_data);
-        wp_new_user_notification($user_id, $password);
+        $user_id = wp_insert_user();
+        wp_new_user_notification();
 
         return $user_id;
@@ -517 +502 @@
      * when accessed through the registration action.
      */
-    public function pl_do_register_user()
-    {
-        if ('POST' == $_SERVER['REQUEST_METHOD']) {
-            $redirect_url = home_url('member-register');
-
-            if (!get_option('users_can_register')) {
-                // Registration closed, display error
-                $redirect_url = add_query_arg('register-errors', 'closed', $redirect_url);
+    public function pl_do_register_user() {
+        if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
+            $redirect_url = home_url( 'member-register' );
+
+            if ( ! get_option( 'users_can_register' ) ) {
+                // Registration closed, display error.
+                $redirect_url = add_query_arg( 'register-errors', 'closed', $redirect_url );
             } else {
-                $email      = sanitize_email($_POST['email']);
-                $first_name = sanitize_text_field($_POST['first_name']);
-                $last_name  = sanitize_text_field($_POST['last_name']);
-
-                $result = $this->register_user($email, $first_name, $last_name);
-
-                if (is_wp_error($result)) {
-                    // Parse errors into a string and append as parameter to redirect
-                    $errors       = join(',', $result->get_error_codes());
-                    $redirect_url = add_query_arg('register-errors', $errors, $redirect_url);
+                $email      = sanitize_email();
+                $first_name = sanitize_text_field();
+                $last_name  = sanitize_text_field();
+
+                $result = $this->register_user();
+
+                if () {
+                    // Parse errors into a string and append as parameter to redirect
+                    $errors       = join();
+                    $redirect_url = add_query_arg();
                 } else {
                     // Success, redirect to login page.
-                    $redirect_url = home_url('member-login');
-                    $redirect_url = add_query_arg('registered', $email, $redirect_url);
+                    $redirect_url = home_url();
+                    $redirect_url = add_query_arg();
                 }
             }
 
-            wp_redirect($redirect_url);
+            wp_);
             exit;
         }
@@ -553 +537 @@
      * if there are errors.
      */
-    public function pl_redirect_to_custom_password_reset()
-    {
-        if ('GET' == $_SERVER['REQUEST_METHOD']) {
-            // Verify key / login combo
-            $user = check_password_reset_key($_REQUEST['key'], sanitize_text_field($_REQUEST['login']));
-            if (!$user || is_wp_error($user)) {
-                if ($user && $user->get_error_code() === 'expired_key') {
-                    wp_redirect(home_url('member-login?login=expiredkey'));
+    public function pl_redirect_to_custom_password_reset() {
+        if ( 'GET' === $_SERVER['REQUEST_METHOD'] ) {
+            // Verify key / login combo.
+            $user = check_password_reset_key( $_REQUEST['key'], sanitize_text_field( $_REQUEST['login'] ) );
+            if ( ! $user || is_wp_error( $user ) ) {
+                if ( $user && $user->get_error_code() === 'expired_key' ) {
+                    wp_safe_redirect( home_url( 'member-login?login=expiredkey' ) );
                 } else {
-                    wp_redirect(home_url('member-login?login=invalidkey'));
+                    wp_);
                 }
                 exit;
             }
 
-            $redirect_url = home_url('member-password-reset');
-            $redirect_url = add_query_arg('login', esc_attr($_REQUEST['login']), $redirect_url);
-            $redirect_url = add_query_arg('key', esc_attr($_REQUEST['key']), $redirect_url);
-
-            wp_redirect($redirect_url);
+            $redirect_url = home_url();
+            $redirect_url = add_query_arg();
+            $redirect_url = add_query_arg();
+
+            wp_);
             exit;
         }
@@ -580 +563 @@
      * A shortcode for rendering the form used to reset a user's password.
      *
-     * @param  array   $attributes  Shortcode attributes.
-     * @param  string  $content     The text content for shortcode. Not used.
+     * @param  array  $attributes  Shortcode attributes.
+     * @param  string $content     The text content for shortcode. Not used.
      *
      * @return string  The shortcode output
      */
-    public function pl_render_password_reset_form($attributes, $content = null)
-    {
-        // Parse shortcode attributes
-        $default_attributes = array('show_title' => false);
-        $attributes = shortcode_atts($default_attributes, $attributes);
-
-        if (is_user_logged_in()) {
-            return esc_html('You are already signed in.', PERLOGIN_TEXT_DOMAIN);
+    public function pl_render_password_reset_form( $attributes, $content = null ) {
+        // Parse shortcode attributes.
+        $default_attributes = array( 'show_title' => false );
+        $attributes         = shortcode_atts( $default_attributes, $attributes );
+
+        if ( is_user_logged_in() ) {
+            return esc_html( 'You are already signed in.', PERLOGIN_TEXT_DOMAIN );
+        } elseif ( isset( $_REQUEST['login'] ) && isset( $_REQUEST['key'] ) ) {
+                $attributes['login'] = sanitize_text_field( $_REQUEST['login'] );
+                $attributes['key']   = sanitize_text_field( $_REQUEST['key'] );
+
+                // Error messages.
+                $errors = array();
+            if ( isset( $_REQUEST['error'] ) ) {
+                $error_codes = explode( ',', $_REQUEST['error'] );
+
+                foreach ( $error_codes as $code ) {
+                    $errors[] = $this->get_error_message( $code );
+                }
+            }
+                $attributes['errors'] = $errors;
+
+                return $this->get_template_html( 'password_reset_form', $attributes );
         } else {
-            if (isset($_REQUEST['login']) && isset($_REQUEST['key'])) {
-                $attributes['login'] = sanitize_text_field($_REQUEST['login']);
-                $attributes['key']   = sanitize_text_field($_REQUEST['key']);
-
-                // Error messages
-                $errors = array();
-                if (isset($_REQUEST['error'])) {
-                    $error_codes = explode(',', $_REQUEST['error']);
-
-                    foreach ($error_codes as $code) {
-                        $errors[] = $this->get_error_message($code);
-                    }
-                }
-                $attributes['errors'] = $errors;
-
-                return $this->get_template_html('password_reset_form', $attributes);
-            } else {
-                return esc_html('Invalid password reset link.', PERLOGIN_TEXT_DOMAIN);
-            }
+            return esc_html( 'Invalid password reset link.', PERLOGIN_TEXT_DOMAIN );
         }
     }
@@ -620 +600 @@
      * A shortcode for rendering the form used to initiate the password reset.
      *
-     * @param  array   $attributes  Shortcode attributes.
-     * @param  string  $content     The text content for shortcode. Not used.
+     * @param  array  $attributes  Shortcode attributes.
+     * @param  string $content     The text content for shortcode. Not used.
      *
      * @return string  The shortcode output
      */
-    public function pl_render_password_lost_form($attributes, $content = null)
-    {
-        // Parse shortcode attributes
-        $default_attributes = array('show_title' => false);
-        $attributes = shortcode_atts($default_attributes, $attributes);
-
-        // Retrieve possible errors from request parameters
+    public function pl_render_password_lost_form( $attributes, $content = null ) {
+        // Parse shortcode attributes.
+        $default_attributes = array( 'show_title' => false );
+        $attributes         = shortcode_atts( $default_attributes, $attributes );
+
+        // Retrieve possible errors from request parameters.
         $attributes['errors'] = array();
-        if (isset($_REQUEST['errors'])) {
-            $error_codes = explode(',', $_REQUEST['errors']);
-
-            foreach ($error_codes as $error_code) {
-                $attributes['errors'][] = $this->get_error_message($error_code);
-            }
-        }
-
-        if (is_user_logged_in()) {
-            return esc_html('You are already signed in.', PERLOGIN_TEXT_DOMAIN);
+        if () {
+            $error_codes = explode();
+
+            foreach () {
+                $attributes['errors'][] = $this->get_error_message();
+            }
+        }
+
+        if () {
+            return esc_html);
         } else {
-            return $this->get_template_html('password_lost_form', $attributes);
+            return $this->get_template_html();
         }
     }
@@ -652 +631 @@
      * Resets the user's password if the password reset form was submitted.
      */
-    public function pl_do_password_reset()
-    {
-        if ('POST' == $_SERVER['REQUEST_METHOD']) {
-            $rp_key   = sanitize_text_field($_REQUEST['rp_key']);
-            $rp_login = sanitize_text_field($_REQUEST['rp_login']);
-
-            $user = check_password_reset_key($rp_key, $rp_login);
-
-            if (!$user || is_wp_error($user)) {
-                if ($user && $user->get_error_code() === 'expired_key') {
-                    wp_redirect(home_url('member-login?login=expiredkey'));
+    public function pl_do_password_reset() {
+        if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
+            $rp_key   = sanitize_text_field( $_REQUEST['rp_key'] );
+            $rp_login = sanitize_text_field( $_REQUEST['rp_login'] );
+
+            $user = check_password_reset_key( $rp_key, $rp_login );
+
+            if ( ! $user || is_wp_error( $user ) ) {
+                if ( $user && $user->get_error_code() === 'expired_key' ) {
+                    wp_safe_redirect( home_url( 'member-login?login=expiredkey' ) );
                 } else {
-                    wp_redirect(home_url('member-login?login=invalidkey'));
+                    wp_);
                 }
                 exit;
             }
 
-            if (isset($_POST['pass1'])) {
-                if ($_POST['pass1'] != $_POST['pass2']) {
-                    // Passwords don't match
-                    $redirect_url = home_url('member-password-reset');
-
-                    $redirect_url = add_query_arg('key', $rp_key, $redirect_url);
-                    $redirect_url = add_query_arg('login', $rp_login, $redirect_url);
-                    $redirect_url = add_query_arg('error', 'password_reset_mismatch', $redirect_url);
-
-                    wp_redirect($redirect_url);
+            if () {
+                if () {
+                    // Passwords don't match
+                    $redirect_url = home_url();
+
+                    $redirect_url = add_query_arg();
+                    $redirect_url = add_query_arg();
+                    $redirect_url = add_query_arg();
+
+                    wp_);
                     exit;
                 }
 
-                if (empty($_POST['pass1'])) {
-                    // Password is empty
-                    $redirect_url = home_url('member-password-reset');
-
-                    $redirect_url = add_query_arg('key', $rp_key, $redirect_url);
-                    $redirect_url = add_query_arg('login', $rp_login, $redirect_url);
-                    $redirect_url = add_query_arg('error', 'password_reset_empty', $redirect_url);
-
-                    wp_redirect($redirect_url);
+                if () {
+                    // Password is empty
+                    $redirect_url = home_url();
+
+                    $redirect_url = add_query_arg();
+                    $redirect_url = add_query_arg();
+                    $redirect_url = add_query_arg();
+
+                    wp_);
                     exit;
                 }
 
-                // Parameter checks OK, reset password
-                reset_password($user, sanitize_text_field($_POST['pass1']));
-                wp_redirect(home_url('member-login?password=changed'));
+                // Parameter checks OK, reset password
+                reset_password();
+                wp_);
             } else {
-                echo "Invalid request.";
+                echo ;
             }
 
@@ -710 +688 @@
      * wp-login.php?action=lostpassword.
      */
-    public function pl_redirect_to_custom_lostpassword()
-    {
-        if ('GET' == $_SERVER['REQUEST_METHOD']) {
-            if (is_user_logged_in()) {
+    public function pl_redirect_to_custom_lostpassword() {
+        if ( 'GET' === $_SERVER['REQUEST_METHOD'] ) {
+            if ( is_user_logged_in() ) {
                 $this->redirect_logged_in_user();
                 exit;
             }
 
-            wp_redirect(home_url('member-password-lost'));
+            wp_);
             exit;
         }
@@ -727 +704 @@
      * Initiates password reset.
      */
-    public function pl_do_password_lost()
-    {
-        if ('POST' == $_SERVER['REQUEST_METHOD']) {
+    public function pl_do_password_lost() {
+        if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
             $errors = retrieve_password();
-            if (is_wp_error($errors)) {
-                // Errors found
-                $redirect_url = home_url('member-password-lost');
-                $redirect_url = add_query_arg('errors', join(',', $errors->get_error_codes()), $redirect_url);
+            if () {
+                // Errors found
+                $redirect_url = home_url();
+                $redirect_url = add_query_arg();
             } else {
-                // Email sent
-                $redirect_url = home_url('member-login');
-                $redirect_url = add_query_arg('checkemail', 'confirm', $redirect_url);
-            }
-
-            wp_redirect($redirect_url);
+                // Email sent
+                $redirect_url = home_url();
+                $redirect_url = add_query_arg();
+            }
+
+            wp_);
             exit;
         }
@@ -758 +734 @@
      * @return string   The mail message to send.
      */
-    public function pl_replace_retrieve_password_message($message, $key, $user_login, $user_data)
-    {
-        // Create new message
-        $msg  = esc_html('Hello!', PERLOGIN_TEXT_DOMAIN) . "\r\n\r\n";
-        $msg .= sprintf(esc_html('You asked us to reset your password for your account using the email address %s.', PERLOGIN_TEXT_DOMAIN), $user_login) . "\r\n\r\n";
-        $msg .= esc_html("If this was a mistake, or you didn't ask for a password reset, just ignore this email and nothing will happen.", PERLOGIN_TEXT_DOMAIN) . "\r\n\r\n";
-        $msg .= esc_html('To reset your password, visit the following address:', PERLOGIN_TEXT_DOMAIN) . "\r\n\r\n";
-        $msg .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n\r\n";
-        $msg .= esc_html('Thanks!', PERLOGIN_TEXT_DOMAIN) . "\r\n";
+    public function pl_replace_retrieve_password_message( $message, $key, $user_login, $user_data ) {
+        // Create new message.
+        $msg  = esc_html( 'Hello!', PERLOGIN_TEXT_DOMAIN ) . "\r\n\r\n";
+        $msg .= sprintf( esc_html( 'You asked us to reset your password for your account using the email address %s.', PERLOGIN_TEXT_DOMAIN ), $user_login ) . "\r\n\r\n";
+        $msg .= esc_html( "If this was a mistake, or you didn't ask for a password reset, just ignore this email and nothing will happen.", PERLOGIN_TEXT_DOMAIN ) . "\r\n\r\n";
+        $msg .= esc_html( 'To reset your password, visit the following address:', PERLOGIN_TEXT_DOMAIN ) . "\r\n\r\n";
+        $msg .= site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . "\r\n\r\n";
+        $msg .= esc_html( 'Thanks!', PERLOGIN_TEXT_DOMAIN ) . "\r\n";
 
         return $msg;
@@ -772 +747 @@
 }
 
-// Create the custom pages at plugin activation
-register_activation_hook(__FILE__, array('Personalize_Login_Plugin', 'plugin_activated'));
-
-
-// Initialize the plugin menu
-// add_action('admin_menu', array(new PLogin_Options_Page, "admin_menu"));
+// Create the custom pages at plugin activation.
+register_activation_hook( __FILE__, array( 'Personalize_Login_Plugin', 'plugin_activated' ) );
 
 /**
  * Class for registering a new settings page under Settings.
  */
-class PLogin_Options_Page
-{
+class PLogin_Options_Page
+
 
     /**
      * Constructor.
      */
-    function __construct()
-    {
-        //Actions
-        add_action('admin_menu', array($this, 'admin_menu'));
+    public function __construct() {
+        // Actions.
+        add_action( 'admin_menu', array( $this, 'admin_menu' ) );
     }
 
@@ -797 +767 @@
      * Registers a new settings page under Settings.
      */
-    function admin_menu()
-    {
+    public function admin_menu() {
         add_options_page(
-            esc_html('Personalize Login Settings', PERLOGIN_TEXT_DOMAIN),
-            esc_html('Personalize Login Settings Menu', PERLOGIN_TEXT_DOMAIN),
+            esc_html),
+            esc_html),
             'manage_options',
             'options_page_plogin_menu',
             array(
                 $this,
-                'settings_page'
+                'settings_page'
             )
         );
@@ -814 +783 @@
      * Settings page display callback.
      */
-    function settings_page()
-    {
-?>
+    public function settings_page() {
+        ?>
         <!-- <div class="wrap">
-                <?php // screen_icon();
+                <?php
+                // screen_icon();
                 ?>
-                <h2><?php // esc_html_e('PLogin Plugin Options', PERLOGIN_TEXT_DOMAIN);
-                    ?></h2>
-                <form method="post" action="options.php">
-                    <?php // settings_fields('plogin_options_group');
+                <h2>
+                <?php
+                // esc_html_e('PLogin Plugin Options', PERLOGIN_TEXT_DOMAIN);
+                ?>
+                    </h2>
+                <form method="post" action="options.php">
+                    
+                    <?php
+                    // submit_button();
                     ?>
-                    <h3><?php // esc_html_e('Look options', PERLOGIN_TEXT_DOMAIN);
-                        ?></h3>
-                    <p><?php // esc_html_e('Login page', PERLOGIN_TEXT_DOMAIN);
-                        ?></p>
-                    <table>
-                        <tr valign="top">
-                            <th scope="row"><label for="plogin_image_login"><?php // esc_html_e('Image login', PERLOGIN_TEXT_DOMAIN);
-                                                                            ?></label></th>
-                            <td><input type="file" id="plogin_image_login" name="plogin_image_login" value="<?php // echo get_option('plogin_image_login');
-                                                                                                            ?>" /></td>
-                        </tr>
-                        <tr valign="top">
-                            <th scope="row"><label for="plogin_text_before_login"><?php // esc_html_e('Text before login form', PERLOGIN_TEXT_DOMAIN);
-                                                                                    ?></label></th>
-                            <td><input type="text" id="plogin_text_before_login" name="plogin_text_before_login" value="<?php // echo get_option('plogin_text_before_login');
-                                                                                                                        ?>" /></td>
-                        </tr>
-                        <tr valign="top">
-                            <th scope="row"><label for="plogin_text_after_login"><?php // esc_html_e('Text after login form', PERLOGIN_TEXT_DOMAIN);
-                                                                                    ?></label></th>
-                            <td><input type="text" id="plogin_text_after_login" name="plogin_text_after_login" value="<?php // echo get_option('plogin_text_after_login');
-                                                                                                                        ?>" /></td>
-                        </tr>
-                    </table>
-                    <p><?php // esc_html_e('Register page', PERLOGIN_TEXT_DOMAIN);
-                        ?></p>
-                    <table>
-                        <tr valign="top">
-                            <th scope="row"><label for="plogin_image_register"><?php // esc_html_e('Image register', PERLOGIN_TEXT_DOMAIN);
-                                                                                ?></label></th>
-                            <td><input type="file" id="plogin_image_register" name="plogin_image_register" value="<?php // echo get_option('plogin_image_register');
-                                                                                                                    ?>" /></td>
-                        </tr>
-                        <tr valign="top">
-                            <th scope="row"><label for="plogin_text_before_register"><?php // esc_html_e('Text before register form', PERLOGIN_TEXT_DOMAIN);
-                                                                                        ?></label></th>
-                            <td><input type="text" id="plogin_text_before_register" name="plogin_text_before_register" value="<?php // echo get_option('plogin_text_before_register');
-                                                                                                                                ?>" /></td>
-                        </tr>
-                        <tr valign="top">
-                            <th scope="row"><label for="plogin_text_after_register"><?php // esc_html_e('Text after register form', PERLOGIN_TEXT_DOMAIN);
-                                                                                    ?></label></th>
-                            <td><input type="text" id="plogin_text_after_register" name="plogin_text_after_register" value="<?php // echo get_option('plogin_text_after_register');
-                                                                                                                            ?>" /></td>
-                        </tr>
-                    </table>
-                    <?php // submit_button();
-                    ?>
-                </form>
-            </div> -->
-<?php
+                </form>
+            </div> -->
+        <?php
     }
 }

personalize-login/trunk/readme.txt

@@ -3 +3 @@
 Tags: login, log in, signin, sig in, register, password, reset password, custom login, personalize login
 Requires at least: 4.2
-Tested up to: 6.3
-Stable tag: 1.1.3
+Tested up to: 6.
+Stable tag: 1.1.
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -38 +38 @@
 == Changelog ==
 
+
+
+
+
 = 1.1.3 =
 Tested 6.3