Changeset 2974859

Timestamp:

10/04/2023 04:46:41 PM (10 months ago)

Author:

rafiq91

Message:

Update to version 7.7.3 from GitHub

Location:

directorist

Files:

• tags/7.7.3 (copied) (copied from directorist/trunk)
• tags/7.7.3/config.php (modified) (1 diff)
• tags/7.7.3/directorist-base.php (modified) (1 diff)
• tags/7.7.3/includes/classes/class-email.php (modified) (3 diffs)
• tags/7.7.3/includes/helper-functions.php (modified) (1 diff)
• tags/7.7.3/includes/rest-api/Version1/class-users-account-controller.php (modified) (9 diffs)
• tags/7.7.3/readme.txt (modified) (2 diffs)
• trunk/config.php (modified) (1 diff)
• trunk/directorist-base.php (modified) (1 diff)
• trunk/includes/classes/class-email.php (modified) (3 diffs)
• trunk/includes/helper-functions.php (modified) (1 diff)
• trunk/includes/rest-api/Version1/class-users-account-controller.php (modified) (9 diffs)
• trunk/readme.txt (modified) (2 diffs)

directorist/tags/7.7.3/config.php

@@ -1 +1 @@
 <?php
 // Plugin version.
-if ( ! defined( 'ATBDP_VERSION' ) ) {define( 'ATBDP_VERSION', '7.7.2' );}
+if ( ! defined( 'ATBDP_VERSION' ) ) {define( 'ATBDP_VERSION', '7.7.' );}
 // Plugin Folder Path.
 if ( ! defined( 'ATBDP_DIR' ) ) { define( 'ATBDP_DIR', plugin_dir_path( __FILE__ ) ); }

directorist/tags/7.7.3/directorist-base.php

@@ -4 +4 @@
  * Plugin URI: https://wpwax.com
  * Description: A comprehensive solution to create professional looking directory site of any kind. Like Yelp, Foursquare, etc.
- * Version: 7.7.2
+ * Version: 7.7.
  * Author: wpWax
  * Author URI: https://wpwax.com

directorist/tags/7.7.3/includes/classes/class-email.php

@@ -78 +78 @@
             }
             if ( empty( $user ) ) {
-                $post_author_id = get_post_field( 'post_author', $listing_id );
+                $post_author_id = get_post_field( 'post_author', $listing_id );
                 $user = get_userdata( $post_author_id );
             } else {
@@ -954 +954 @@
 
             if ( 'bank_transfer' !== $gateway ) {
-                return false;   
+                return false;
             }
 
@@ -1087 +1087 @@
          * @return bool Whether the email was sent successfully or not.
          */
-        public function send_password_reset_pin_email( $listing_email ) {
-            $s = __( '[==SITE_NAME==] Password Reset PIN', 'directorist' );
-            $sub = str_replace( '==SITE_NAME==', get_option( 'blogname' ), $s );
-            $pin = random_int( 1000, 9999 );
-
-            $min = 15;
-            $expiration = 60 * $min; // In seconds
-
-            set_transient( "directorist_reset_pin_${listing_email}", $pin, $expiration );
-
-            $body    = $this->get_password_reset_pin_email_template();
-            $message = $this->replace_in_content( $body, $order_id = 0, $listing_id = 0, $user = null, $renewal = null, $pin );
-            $body    = atbdp_email_html( $sub, $message );
-
-            return $this->send_mail( $listing_email, $sub, $body, $this->get_email_headers() );
-
+        public function send_password_reset_pin_email( $user ) {
+            $subject    = esc_html( sprintf( __( '[%s] Password Reset PIN', 'directorist' ), get_option( 'blogname' ) ) );
+            $user_email = $user->user_email;
+            $pin_code   = directorist_generate_password_reset_pin_code( $user );
+            $body       = $this->get_password_reset_pin_email_template();
+            $message    = $this->replace_in_content( $body, 0, 0, $user, null, $pin_code );
+            $body       = atbdp_email_html( $subject, $message );
+
+            return $this->send_mail( $user_email, $subject, $body, $this->get_email_headers() );
         }
 

directorist/tags/7.7.3/includes/helper-functions.php

@@ -4120 +4120 @@
     return ( float ) $item;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

directorist/tags/7.7.3/includes/rest-api/Version1/class-users-account-controller.php

@@ -31 +31 @@
     public function register_routes() {
         // Send Password Reset PIN
-        register_rest_route( $this->namespace, '/' . $this->rest_base . '/send-password-reset-pin', array(
+register_rest_route( $this->namespace, '/' . $this->rest_base . '/send-password-reset-pin', array(
             'methods'             => WP_REST_Server::CREATABLE,
             'callback'            => array( $this, 'send_password_reset_pin' ),
@@ -46 +46 @@
 
         // Verify Password Reset PIN
-        register_rest_route( $this->namespace, '/' . $this->rest_base . '/verify-password-reset-pin', array(
+register_rest_route( $this->namespace, '/' . $this->rest_base . '/verify-password-reset-pin', array(
             'methods'             => WP_REST_Server::CREATABLE,
             'callback'            => array( $this, 'verify_password_reset_pin' ),
@@ -66 +66 @@
 
         // Rest user password.
-        register_rest_route( $this->namespace, '/' . $this->rest_base . '/reset-user-password', array(
+register_rest_route( $this->namespace, '/' . $this->rest_base . '/reset-user-password', array(
             'methods'             => WP_REST_Server::CREATABLE,
             'callback'            => array( $this, 'reset_user_password' ),
@@ -92 +92 @@
 
         // Change password.
-        register_rest_route( $this->namespace, '/' . $this->rest_base . '/change-password', array(
+register_rest_route( $this->namespace, '/' . $this->rest_base . '/change-password', array(
             'methods'             => WP_REST_Server::CREATABLE,
             'callback'            => array( $this, 'change_password' ),
@@ -168 +168 @@
 
     public function send_password_reset_pin( $request ) {
-        ATBDP()->email->send_password_reset_pin_email( $request['email'] );
-
-        $data = [
-            'success' => true,
-            'message' => __( 'Password reset code has been sent to given email.', 'directorist' ),
+        $user = $this->get_user_by_email( $request['email'] );
+
+        ATBDP()->email->send_password_reset_pin_email( $user );
+
+        $data = [
+            'success' => true,
+            'message' => __( 'Password reset code has been sent to your email.', 'directorist' ),
             'email'   => $request['email'],
         ];
@@ -182 +184 @@
 
     public function verify_password_reset_pin( $request ) {
-        $email        = $request['email'];
-        $password_pin = get_transient( "directorist_reset_pin_$email" );
-
-        if ( empty( $password_pin ) ) {
-            return new WP_Error( 'directorist_rest_password_rest_pin_expired', __( 'Given password reset pin has expired.', 'directorist' ), array( 'status' => 400 ) );
-        }
-
-        if ( $password_pin != $request['pin'] ) {
-            return new WP_Error( 'directorist_rest_password_rest_pin_invalid', __( 'Invalid password rest pin.', 'directorist' ), array( 'status' => 400 ) );
-        }
+        $is_valid = $this->validate_reset_pin_code( $request );
+
+        if ( is_wp_error( $is_valid ) ) {
+            return $is_valid;
+        }
 
         $data = [
@@ -204 +201 @@
 
     public function reset_user_password( $request ) {
-        $email        = $request['email'];
-        $user         = get_user_by( 'email', $email );
-        $password_pin = get_transient( "directorist_reset_pin_$email" );
-
-        if ( empty( $password_pin ) ) {
-            return new WP_Error( 'directorist_rest_password_rest_pin_expired', __( 'Your password reset pin has expired.', 'directorist' ), array( 'status' => 400 ) );
-        }
-
-        if ( $password_pin != $request['pin'] ) {
-            return new WP_Error( 'directorist_rest_password_rest_pin_invalid', __( 'Invalid password rest pin.', 'directorist' ), array( 'status' => 400 ) );
-        }
-
-        // Change Password
-        wp_set_password( $request['password'], $user->ID );
-
-        // Delete The PIN
-        delete_transient( "directorist_reset_pin_$email" );
+        $is_valid = $this->validate_reset_pin_code( $request );
+
+        if ( is_wp_error( $is_valid ) ) {
+            return $is_valid;
+        }
+
+        $user = $this->get_user_by_email( $request['email'] );
+
+        wp_set_password( $request['password'], $user->ID );
+
+        directorist_delete_password_reset_code_transient( $user );
+        delete_user_meta( $user->ID, 'directorist_pasword_reset_key' );
 
         $data = [
@@ -241 +233 @@
 
         // Change Password
-        wp_set_password( $request['new_password'], $user->ID );
+wp_set_password( $request['new_password'], $user->ID );
 
         $data = [
@@ -252 +244 @@
         return $response;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

directorist/tags/7.7.3/readme.txt

@@ -6 +6 @@
 Tested up to: 6.3
 Requires PHP: 7.0
-Stable tag: 7.7.2
+Stable tag: 7.7.
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -410 +410 @@
 
 == Changelog ==
+
+
+
+
 
 7.7.2 - Sep 12, 2023

directorist/trunk/config.php

@@ -1 +1 @@
 <?php
 // Plugin version.
-if ( ! defined( 'ATBDP_VERSION' ) ) {define( 'ATBDP_VERSION', '7.7.2' );}
+if ( ! defined( 'ATBDP_VERSION' ) ) {define( 'ATBDP_VERSION', '7.7.' );}
 // Plugin Folder Path.
 if ( ! defined( 'ATBDP_DIR' ) ) { define( 'ATBDP_DIR', plugin_dir_path( __FILE__ ) ); }

directorist/trunk/directorist-base.php

@@ -4 +4 @@
  * Plugin URI: https://wpwax.com
  * Description: A comprehensive solution to create professional looking directory site of any kind. Like Yelp, Foursquare, etc.
- * Version: 7.7.2
+ * Version: 7.7.
  * Author: wpWax
  * Author URI: https://wpwax.com

directorist/trunk/includes/classes/class-email.php

@@ -78 +78 @@
             }
             if ( empty( $user ) ) {
-                $post_author_id = get_post_field( 'post_author', $listing_id );
+                $post_author_id = get_post_field( 'post_author', $listing_id );
                 $user = get_userdata( $post_author_id );
             } else {
@@ -954 +954 @@
 
             if ( 'bank_transfer' !== $gateway ) {
-                return false;   
+                return false;
             }
 
@@ -1087 +1087 @@
          * @return bool Whether the email was sent successfully or not.
          */
-        public function send_password_reset_pin_email( $listing_email ) {
-            $s = __( '[==SITE_NAME==] Password Reset PIN', 'directorist' );
-            $sub = str_replace( '==SITE_NAME==', get_option( 'blogname' ), $s );
-            $pin = random_int( 1000, 9999 );
-
-            $min = 15;
-            $expiration = 60 * $min; // In seconds
-
-            set_transient( "directorist_reset_pin_${listing_email}", $pin, $expiration );
-
-            $body    = $this->get_password_reset_pin_email_template();
-            $message = $this->replace_in_content( $body, $order_id = 0, $listing_id = 0, $user = null, $renewal = null, $pin );
-            $body    = atbdp_email_html( $sub, $message );
-
-            return $this->send_mail( $listing_email, $sub, $body, $this->get_email_headers() );
-
+        public function send_password_reset_pin_email( $user ) {
+            $subject    = esc_html( sprintf( __( '[%s] Password Reset PIN', 'directorist' ), get_option( 'blogname' ) ) );
+            $user_email = $user->user_email;
+            $pin_code   = directorist_generate_password_reset_pin_code( $user );
+            $body       = $this->get_password_reset_pin_email_template();
+            $message    = $this->replace_in_content( $body, 0, 0, $user, null, $pin_code );
+            $body       = atbdp_email_html( $subject, $message );
+
+            return $this->send_mail( $user_email, $subject, $body, $this->get_email_headers() );
         }
 

directorist/trunk/includes/helper-functions.php

@@ -4120 +4120 @@
     return ( float ) $item;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

directorist/trunk/includes/rest-api/Version1/class-users-account-controller.php

@@ -31 +31 @@
     public function register_routes() {
         // Send Password Reset PIN
-        register_rest_route( $this->namespace, '/' . $this->rest_base . '/send-password-reset-pin', array(
+register_rest_route( $this->namespace, '/' . $this->rest_base . '/send-password-reset-pin', array(
             'methods'             => WP_REST_Server::CREATABLE,
             'callback'            => array( $this, 'send_password_reset_pin' ),
@@ -46 +46 @@
 
         // Verify Password Reset PIN
-        register_rest_route( $this->namespace, '/' . $this->rest_base . '/verify-password-reset-pin', array(
+register_rest_route( $this->namespace, '/' . $this->rest_base . '/verify-password-reset-pin', array(
             'methods'             => WP_REST_Server::CREATABLE,
             'callback'            => array( $this, 'verify_password_reset_pin' ),
@@ -66 +66 @@
 
         // Rest user password.
-        register_rest_route( $this->namespace, '/' . $this->rest_base . '/reset-user-password', array(
+register_rest_route( $this->namespace, '/' . $this->rest_base . '/reset-user-password', array(
             'methods'             => WP_REST_Server::CREATABLE,
             'callback'            => array( $this, 'reset_user_password' ),
@@ -92 +92 @@
 
         // Change password.
-        register_rest_route( $this->namespace, '/' . $this->rest_base . '/change-password', array(
+register_rest_route( $this->namespace, '/' . $this->rest_base . '/change-password', array(
             'methods'             => WP_REST_Server::CREATABLE,
             'callback'            => array( $this, 'change_password' ),
@@ -168 +168 @@
 
     public function send_password_reset_pin( $request ) {
-        ATBDP()->email->send_password_reset_pin_email( $request['email'] );
-
-        $data = [
-            'success' => true,
-            'message' => __( 'Password reset code has been sent to given email.', 'directorist' ),
+        $user = $this->get_user_by_email( $request['email'] );
+
+        ATBDP()->email->send_password_reset_pin_email( $user );
+
+        $data = [
+            'success' => true,
+            'message' => __( 'Password reset code has been sent to your email.', 'directorist' ),
             'email'   => $request['email'],
         ];
@@ -182 +184 @@
 
     public function verify_password_reset_pin( $request ) {
-        $email        = $request['email'];
-        $password_pin = get_transient( "directorist_reset_pin_$email" );
-
-        if ( empty( $password_pin ) ) {
-            return new WP_Error( 'directorist_rest_password_rest_pin_expired', __( 'Given password reset pin has expired.', 'directorist' ), array( 'status' => 400 ) );
-        }
-
-        if ( $password_pin != $request['pin'] ) {
-            return new WP_Error( 'directorist_rest_password_rest_pin_invalid', __( 'Invalid password rest pin.', 'directorist' ), array( 'status' => 400 ) );
-        }
+        $is_valid = $this->validate_reset_pin_code( $request );
+
+        if ( is_wp_error( $is_valid ) ) {
+            return $is_valid;
+        }
 
         $data = [
@@ -204 +201 @@
 
     public function reset_user_password( $request ) {
-        $email        = $request['email'];
-        $user         = get_user_by( 'email', $email );
-        $password_pin = get_transient( "directorist_reset_pin_$email" );
-
-        if ( empty( $password_pin ) ) {
-            return new WP_Error( 'directorist_rest_password_rest_pin_expired', __( 'Your password reset pin has expired.', 'directorist' ), array( 'status' => 400 ) );
-        }
-
-        if ( $password_pin != $request['pin'] ) {
-            return new WP_Error( 'directorist_rest_password_rest_pin_invalid', __( 'Invalid password rest pin.', 'directorist' ), array( 'status' => 400 ) );
-        }
-
-        // Change Password
-        wp_set_password( $request['password'], $user->ID );
-
-        // Delete The PIN
-        delete_transient( "directorist_reset_pin_$email" );
+        $is_valid = $this->validate_reset_pin_code( $request );
+
+        if ( is_wp_error( $is_valid ) ) {
+            return $is_valid;
+        }
+
+        $user = $this->get_user_by_email( $request['email'] );
+
+        wp_set_password( $request['password'], $user->ID );
+
+        directorist_delete_password_reset_code_transient( $user );
+        delete_user_meta( $user->ID, 'directorist_pasword_reset_key' );
 
         $data = [
@@ -241 +233 @@
 
         // Change Password
-        wp_set_password( $request['new_password'], $user->ID );
+wp_set_password( $request['new_password'], $user->ID );
 
         $data = [
@@ -252 +244 @@
         return $response;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

directorist/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.3
 Requires PHP: 7.0
-Stable tag: 7.7.2
+Stable tag: 7.7.
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -410 +410 @@
 
 == Changelog ==
+
+
+
+
 
 7.7.2 - Sep 12, 2023