From 713c7fd4f0236328ff3068d89736596ea0054a91 Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Wed, 21 Aug 2024 10:50:27 -0400 Subject: [PATCH] Use filtered wp_lostpassword_url() method instead of calling the filtering function directly. --- includes/class.llms.person.handler.php | 13 ++----------- includes/emails/class.llms.email.reset.password.php | 5 +---- .../controllers/class.llms.controller.account.php | 12 +----------- ...class.llms.notification.view.student.welcome.php | 2 +- .../class-llms-test-controller-account.php | 4 ++-- 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/includes/class.llms.person.handler.php b/includes/class.llms.person.handler.php index 99373a561f..47efa3aa9d 100644 --- a/includes/class.llms.person.handler.php +++ b/includes/class.llms.person.handler.php @@ -86,7 +86,6 @@ protected static function find_password_fields( $location ) { } return $fields; - } /** @@ -120,7 +119,7 @@ public static function generate_username( $email ) { while ( username_exists( $username ) ) { $username = $orig_username . $i; - $i++; + ++$i; } @@ -133,7 +132,6 @@ public static function generate_username( $email ) { * @param string $email User's email address which was used to generate the username. */ return apply_filters( 'lifterlms_generated_username', $username, $email ); - } /** @@ -196,13 +194,12 @@ public static function get_login_fields( $layout = 'columns' ) { 'columns' => ( 'columns' == $layout ) ? 3 : 6, 'id' => 'llms_lost_password', 'last_column' => true, - 'description' => '' . __( 'Lost your password?', 'lifterlms' ) . '', + 'description' => '' . __( 'Lost your password?', 'lifterlms' ) . '', 'type' => 'html', 'wrapper_classes' => 'align-right', ), ) ); - } /** @@ -264,7 +261,6 @@ public static function get_lost_password_fields() { ), ) ); - } /** @@ -313,7 +309,6 @@ private static function get_password_fields() { ); return $fields; - } /** @@ -381,7 +376,6 @@ public static function get_password_reset_fields( $key = '', $login = '' ) { * set of fields is generated programmatically. */ return apply_filters( 'llms_password_reset_fields', $fields, $key, $login, $location ); - } /** @@ -483,7 +477,6 @@ public static function login( $data ) { } return $signon->ID; - } /** @@ -533,7 +526,6 @@ protected static function validate_login_fields( $data ) { * @param array $data User submitted login data. */ return apply_filters( 'llms_after_user_login_data_validation', $valid, $data ); - } /** @@ -551,5 +543,4 @@ public static function get_available_fields( $screen = 'registration', $data = a _deprecated_function( 'LLMS_Person_Handler::get_available_fields()', '5.0.0', 'LLMS_Forms::get_form_fields()' ); return LLMS_Forms::instance()->get_form_fields( $screen ); } - } diff --git a/includes/emails/class.llms.email.reset.password.php b/includes/emails/class.llms.email.reset.password.php index 17e556e94f..390277ab7e 100644 --- a/includes/emails/class.llms.email.reset.password.php +++ b/includes/emails/class.llms.email.reset.password.php @@ -41,7 +41,6 @@ public function init( $args = array() ) { '{user_login}' => $args['login_display'], ) ); - } /** @@ -60,7 +59,7 @@ public function get_body_content( $data ) { 'key' => $data['key'], 'login' => rawurlencode( $data['user']->user_login ), ), - llms_lostpassword_url() + wp_lostpassword_url() ) ); @@ -72,7 +71,5 @@ public function get_body_content( $data ) { ) ); return ob_get_clean(); - } - } diff --git a/includes/forms/controllers/class.llms.controller.account.php b/includes/forms/controllers/class.llms.controller.account.php index 847fdba1e0..4967d4ed52 100644 --- a/includes/forms/controllers/class.llms.controller.account.php +++ b/includes/forms/controllers/class.llms.controller.account.php @@ -37,7 +37,6 @@ public function __construct() { add_action( 'init', array( $this, 'reset_password' ) ); add_action( 'init', array( $this, 'cancel_subscription' ) ); add_action( 'init', array( $this, 'redeem_voucher' ) ); - } /** @@ -88,7 +87,6 @@ public function cancel_subscription() { * @param integer $uid The WP_User ID the student who cancelled the subscription. */ do_action( 'llms_subscription_cancelled_by_student', $order, $uid ); - } /** @@ -135,7 +133,6 @@ public function update() { llms_redirect_and_exit( apply_filters( 'lifterlms_update_account_redirect', llms_get_endpoint_url( 'edit-account', '', llms_get_page_url( 'myaccount' ) ) ) ); } - } /** @@ -247,7 +244,6 @@ public function lost_password() { // Success. llms_add_notice( __( 'Check your e-mail for the confirmation link.', 'lifterlms' ) ); return true; - } /** @@ -275,7 +271,6 @@ public function redeem_voucher() { llms_add_notice( __( 'Voucher redeemed successfully!', 'lifterlms' ), 'success' ); return true; - } /** @@ -306,7 +301,6 @@ public function reset_password() { // Success. llms_add_notice( __( 'Your password has been updated.', 'lifterlms' ) ); llms_redirect_and_exit( add_query_arg( 'password-reset', 1, llms_get_page_url( 'myaccount' ) ) ); - } /** @@ -377,7 +371,6 @@ private function reset_password_handler() { do_action( 'llms_user_password_reset', $user ); return true; - } /** @@ -403,9 +396,8 @@ public function reset_password_link_redirect() { ( new LLMS_Cache_Helper() )->maybe_no_cache(); llms_set_password_reset_cookie( $val ); - llms_redirect_and_exit( add_query_arg( 'reset-pass', 1, llms_lostpassword_url() ) ); + llms_redirect_and_exit( add_query_arg( 'reset-pass', 1, wp_lostpassword_url() ) ); } - } /** @@ -452,9 +444,7 @@ protected function validate_password_reset( $posted_data ) { } return true; - } - } return new LLMS_Controller_Account(); diff --git a/includes/notifications/views/class.llms.notification.view.student.welcome.php b/includes/notifications/views/class.llms.notification.view.student.welcome.php index 60c6eed9f6..98cf7bb1ed 100644 --- a/includes/notifications/views/class.llms.notification.view.student.welcome.php +++ b/includes/notifications/views/class.llms.notification.view.student.welcome.php @@ -100,7 +100,7 @@ protected function set_merge_data( $code ) { break; case '{{PASSWORD_RESET_URL}}': - $code = llms_lostpassword_url(); + $code = wp_lostpassword_url(); break; case '{{SITE_TITLE}}': diff --git a/tests/phpunit/unit-tests/controllers/class-llms-test-controller-account.php b/tests/phpunit/unit-tests/controllers/class-llms-test-controller-account.php index 9db8708b4d..aacbe067d6 100644 --- a/tests/phpunit/unit-tests/controllers/class-llms-test-controller-account.php +++ b/tests/phpunit/unit-tests/controllers/class-llms-test-controller-account.php @@ -914,7 +914,7 @@ public function test_reset_password_link_redirect_success_fake_user() { ) ); $this->expectException( LLMS_Unit_Test_Exception_Redirect::class ); - $this->expectExceptionMessage( add_query_arg( 'reset-pass', 1, llms_lostpassword_url() ) . ' [302] YES' ); + $this->expectExceptionMessage( add_query_arg( 'reset-pass', 1, wp_lostpassword_url() ) . ' [302] YES' ); try { @@ -950,7 +950,7 @@ public function test_reset_password_link_redirect_success_real_user() { ) ); $this->expectException( LLMS_Unit_Test_Exception_Redirect::class ); - $this->expectExceptionMessage( add_query_arg( 'reset-pass', 1, llms_lostpassword_url() ) . ' [302] YES' ); + $this->expectExceptionMessage( add_query_arg( 'reset-pass', 1, wp_lostpassword_url() ) . ' [302] YES' ); try {