Version Description
- Enhancement: JS scripts are now conditionally loaded.
- Fixed display issue in perfecto lite themes.
- Added custom message when logged in users view a login and signup page.
- Added compatibility with peters login redirect.
- Fixed incorrect avatar size retrieval.
- Fixed Warning: array_reduce() expects parameter 1 to be array, null given.
See the changelog file for full change log information.
Download this release
Release Info
Developer | Collizo4sky |
Plugin | WP User Avatar |
Version | 3.1.7 |
Comparing to | |
See all releases |
Code changes from version 3.1.6 to 3.1.7
- assets/images/profilepressxmailoptin.png +0 -0
- changelog.txt +9 -1
- deprecated/wp-user-avatar/includes/class-wp-user-avatar-functions.php +0 -1
- languages/wp-user-avatar.pot +34 -26
- readme.txt +8 -15
- src/Classes/LoginAuth.php +5 -2
- src/Classes/UserAvatar.php +1 -1
- src/ContentProtection/ContentConditions.php +16 -8
- src/Functions/GlobalFunctions.php +23 -12
- src/RegisterScripts.php +13 -4
- src/ShortcodeParser/Builder/RegistrationFormBuilder.php +20 -17
- src/ShortcodeParser/FormProcessor.php +1 -3
- src/ShortcodeParser/LoginFormTag.php +13 -1
- src/ShortcodeParser/MyAccount/MyAccountTag.php +55 -45
- src/ShortcodeParser/RegistrationFormTag.php +14 -2
- src/Themes/DragDrop/Login/PerfectoLite.php +3 -4
- src/Themes/DragDrop/Registration/PerfectoLite.php +0 -1
- vendor/autoload.php +1 -1
- vendor/composer/InstalledVersions.php +2 -2
- vendor/composer/autoload_real.php +7 -7
- vendor/composer/autoload_static.php +4 -4
- vendor/composer/installed.php +2 -2
- wp-user-avatar.php +2 -2
assets/images/profilepressxmailoptin.png
CHANGED
Binary file
|
changelog.txt
CHANGED
@@ -1,4 +1,12 @@
|
|
1 |
-
= 3.1.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
* Fixed issue where name exist check prevented the form builder from saving.
|
3 |
|
4 |
= 3.1.5 =
|
1 |
+
= 3.1.7 =
|
2 |
+
* Enhancement: JS scripts are now conditionally loaded.
|
3 |
+
* Fixed display issue in perfecto lite themes.
|
4 |
+
* Added custom message when logged in users view a login and signup page.
|
5 |
+
* Added compatibility with peters login redirect.
|
6 |
+
* Fixed incorrect avatar size retrieval.
|
7 |
+
* Fixed Warning: array_reduce() expects parameter 1 to be array, null given.
|
8 |
+
|
9 |
+
= 3.1.6 =
|
10 |
* Fixed issue where name exist check prevented the form builder from saving.
|
11 |
|
12 |
= 3.1.5 =
|
deprecated/wp-user-avatar/includes/class-wp-user-avatar-functions.php
CHANGED
@@ -271,7 +271,6 @@ class WP_User_Avatar_Functions
|
|
271 |
$get_size = $size;
|
272 |
}
|
273 |
|
274 |
-
|
275 |
// User with no WPUA uses get_avatar
|
276 |
$avatar = get_avatar($id_or_email, $get_size);
|
277 |
// Remove width and height for non-numeric sizes
|
271 |
$get_size = $size;
|
272 |
}
|
273 |
|
|
|
274 |
// User with no WPUA uses get_avatar
|
275 |
$avatar = get_avatar($id_or_email, $get_size);
|
276 |
// Remove width and height for non-numeric sizes
|
languages/wp-user-avatar.pot
CHANGED
@@ -2,9 +2,9 @@
|
|
2 |
# This file is distributed under the same license as the ProfilePress package.
|
3 |
msgid ""
|
4 |
msgstr ""
|
5 |
-
"Project-Id-Version: ProfilePress 3.1.
|
6 |
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-user-avatar\n"
|
7 |
-
"POT-Creation-Date: 2021-06-
|
8 |
"MIME-Version: 1.0\n"
|
9 |
"Content-Type: text/plain; charset=UTF-8\n"
|
10 |
"Content-Transfer-Encoding: 8bit\n"
|
@@ -46,7 +46,7 @@ msgstr ""
|
|
46 |
#: deprecated/wp-user-avatar/includes/wpua-functions.php:78
|
47 |
#: deprecated/wp-user-avatar/includes/wpua-functions.php:131
|
48 |
#: src/Classes/ImageUploader.php:49
|
49 |
-
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:
|
50 |
msgid "Profile Picture"
|
51 |
msgstr ""
|
52 |
|
@@ -452,7 +452,7 @@ msgstr ""
|
|
452 |
#: src/Admin/SettingsPages/DragDropBuilder/Metabox.php:162
|
453 |
#: src/Admin/SettingsPages/DragDropBuilder/Metabox.php:223
|
454 |
#: src/Admin/SettingsPages/GeneralSettings.php:234
|
455 |
-
#: src/Functions/GlobalFunctions.php:
|
456 |
#: src/Functions/GlobalFunctions.php:1264
|
457 |
#: src/Functions/GlobalFunctions.php:1286
|
458 |
msgid "Select..."
|
@@ -1465,7 +1465,7 @@ msgid "New User Admin Notification"
|
|
1465 |
msgstr ""
|
1466 |
|
1467 |
#: src/Admin/SettingsPages/EmailSettings/EmailSettingsPage.php:80
|
1468 |
-
#: src/Functions/GlobalFunctions.php:
|
1469 |
msgid "[%s] New User Registration"
|
1470 |
msgstr ""
|
1471 |
|
@@ -3189,30 +3189,30 @@ msgid "Redirect URL"
|
|
3189 |
msgstr ""
|
3190 |
|
3191 |
#. translators: %s: User login.
|
3192 |
-
#: src/Functions/GlobalFunctions.php:
|
3193 |
msgid "Username: %s"
|
3194 |
msgstr ""
|
3195 |
|
3196 |
-
#: src/Functions/GlobalFunctions.php:
|
3197 |
msgid "To set your password, visit the following address:"
|
3198 |
msgstr ""
|
3199 |
|
3200 |
#. translators: Login details notification email subject. %s: Site title.
|
3201 |
-
#: src/Functions/GlobalFunctions.php:
|
3202 |
msgid "[%s] Login Details"
|
3203 |
msgstr ""
|
3204 |
|
3205 |
-
#: src/Functions/GlobalFunctions.php:
|
3206 |
msgid ""
|
3207 |
"It must be unique for each field, not a reserve text, in lowercase letters "
|
3208 |
"only with an underscore ( _ ) separating words e.g job_title"
|
3209 |
msgstr ""
|
3210 |
|
3211 |
-
#: src/Functions/GlobalFunctions.php:
|
3212 |
msgid "%s (WooCommerce Billing Address)"
|
3213 |
msgstr ""
|
3214 |
|
3215 |
-
#: src/Functions/GlobalFunctions.php:
|
3216 |
msgid "%s (WooCommerce Shipping Address)"
|
3217 |
msgstr ""
|
3218 |
|
@@ -4322,15 +4322,15 @@ msgstr ""
|
|
4322 |
msgid "Member Directory"
|
4323 |
msgstr ""
|
4324 |
|
4325 |
-
#: src/RegisterScripts.php:
|
4326 |
msgid "Are you sure?"
|
4327 |
msgstr ""
|
4328 |
|
4329 |
-
#: src/RegisterScripts.php:
|
4330 |
msgid "Deleting..."
|
4331 |
msgstr ""
|
4332 |
|
4333 |
-
#: src/RegisterScripts.php:
|
4334 |
msgid "An error occurred. Please try again."
|
4335 |
msgstr ""
|
4336 |
|
@@ -4477,9 +4477,9 @@ msgid "Get New Password"
|
|
4477 |
msgstr ""
|
4478 |
|
4479 |
#: src/ShortcodeParser/EditProfileTag.php:78
|
4480 |
-
#: src/ShortcodeParser/LoginFormTag.php:
|
4481 |
#: src/ShortcodeParser/PasswordResetTag.php:77
|
4482 |
-
#: src/ShortcodeParser/RegistrationFormTag.php:
|
4483 |
msgid ""
|
4484 |
"Form class not found. Please check if this ProfilePress form actually exist."
|
4485 |
msgstr ""
|
@@ -4488,7 +4488,7 @@ msgstr ""
|
|
4488 |
msgid "The password you entered is incorrect."
|
4489 |
msgstr ""
|
4490 |
|
4491 |
-
#: src/ShortcodeParser/FormProcessor.php:
|
4492 |
msgid "Authentication failed. Please try again"
|
4493 |
msgstr ""
|
4494 |
|
@@ -4513,6 +4513,10 @@ msgstr ""
|
|
4513 |
msgid "Profile"
|
4514 |
msgstr ""
|
4515 |
|
|
|
|
|
|
|
|
|
4516 |
#: src/ShortcodeParser/MemberDirectoryTag.php:46
|
4517 |
msgid "No member directory ID specified."
|
4518 |
msgstr ""
|
@@ -4523,29 +4527,29 @@ msgid ""
|
|
4523 |
"ProfilePress."
|
4524 |
msgstr ""
|
4525 |
|
4526 |
-
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:
|
4527 |
msgid "Dashboard"
|
4528 |
msgstr ""
|
4529 |
|
4530 |
-
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:
|
4531 |
msgid "Account Details"
|
4532 |
msgstr ""
|
4533 |
|
4534 |
-
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:
|
4535 |
#: src/ShortcodeParser/MyAccount/change-password.tmpl.php:25
|
4536 |
msgid "Change Password"
|
4537 |
msgstr ""
|
4538 |
|
4539 |
-
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:
|
4540 |
msgid "Logout"
|
4541 |
msgstr ""
|
4542 |
|
4543 |
-
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:
|
4544 |
#: src/ShortcodeParser/MyAccount/email-notifications.tmpl.php:14
|
4545 |
msgid "Email Notifications"
|
4546 |
msgstr ""
|
4547 |
|
4548 |
-
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:
|
4549 |
#: src/ShortcodeParser/MyAccount/edit-profile.tmpl.php:87
|
4550 |
msgid "Cover Image (min. width: 1000px)"
|
4551 |
msgstr ""
|
@@ -4615,7 +4619,11 @@ msgstr ""
|
|
4615 |
msgid "Save"
|
4616 |
msgstr ""
|
4617 |
|
4618 |
-
#: src/ShortcodeParser/RegistrationFormTag.php:
|
|
|
|
|
|
|
|
|
4619 |
msgid "Registration is disabled in this site."
|
4620 |
msgstr ""
|
4621 |
|
@@ -5411,9 +5419,9 @@ msgstr ""
|
|
5411 |
msgid "ProfilePress"
|
5412 |
msgstr ""
|
5413 |
|
5414 |
-
#. #-#-#-#-# wp-user-avatar.pot (ProfilePress 3.1.
|
5415 |
#. Plugin URI of the plugin/theme
|
5416 |
-
#. #-#-#-#-# wp-user-avatar.pot (ProfilePress 3.1.
|
5417 |
#. Author URI of the plugin/theme
|
5418 |
msgid "https://profilepress.net"
|
5419 |
msgstr ""
|
2 |
# This file is distributed under the same license as the ProfilePress package.
|
3 |
msgid ""
|
4 |
msgstr ""
|
5 |
+
"Project-Id-Version: ProfilePress 3.1.7\n"
|
6 |
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-user-avatar\n"
|
7 |
+
"POT-Creation-Date: 2021-06-17 17:13:12+00:00\n"
|
8 |
"MIME-Version: 1.0\n"
|
9 |
"Content-Type: text/plain; charset=UTF-8\n"
|
10 |
"Content-Transfer-Encoding: 8bit\n"
|
46 |
#: deprecated/wp-user-avatar/includes/wpua-functions.php:78
|
47 |
#: deprecated/wp-user-avatar/includes/wpua-functions.php:131
|
48 |
#: src/Classes/ImageUploader.php:49
|
49 |
+
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:503
|
50 |
msgid "Profile Picture"
|
51 |
msgstr ""
|
52 |
|
452 |
#: src/Admin/SettingsPages/DragDropBuilder/Metabox.php:162
|
453 |
#: src/Admin/SettingsPages/DragDropBuilder/Metabox.php:223
|
454 |
#: src/Admin/SettingsPages/GeneralSettings.php:234
|
455 |
+
#: src/Functions/GlobalFunctions.php:1236
|
456 |
#: src/Functions/GlobalFunctions.php:1264
|
457 |
#: src/Functions/GlobalFunctions.php:1286
|
458 |
msgid "Select..."
|
1465 |
msgstr ""
|
1466 |
|
1467 |
#: src/Admin/SettingsPages/EmailSettings/EmailSettingsPage.php:80
|
1468 |
+
#: src/Functions/GlobalFunctions.php:722 src/RegisterActivation/Base.php:89
|
1469 |
msgid "[%s] New User Registration"
|
1470 |
msgstr ""
|
1471 |
|
3189 |
msgstr ""
|
3190 |
|
3191 |
#. translators: %s: User login.
|
3192 |
+
#: src/Functions/GlobalFunctions.php:792
|
3193 |
msgid "Username: %s"
|
3194 |
msgstr ""
|
3195 |
|
3196 |
+
#: src/Functions/GlobalFunctions.php:793
|
3197 |
msgid "To set your password, visit the following address:"
|
3198 |
msgstr ""
|
3199 |
|
3200 |
#. translators: Login details notification email subject. %s: Site title.
|
3201 |
+
#: src/Functions/GlobalFunctions.php:801
|
3202 |
msgid "[%s] Login Details"
|
3203 |
msgstr ""
|
3204 |
|
3205 |
+
#: src/Functions/GlobalFunctions.php:1099
|
3206 |
msgid ""
|
3207 |
"It must be unique for each field, not a reserve text, in lowercase letters "
|
3208 |
"only with an underscore ( _ ) separating words e.g job_title"
|
3209 |
msgstr ""
|
3210 |
|
3211 |
+
#: src/Functions/GlobalFunctions.php:1220
|
3212 |
msgid "%s (WooCommerce Billing Address)"
|
3213 |
msgstr ""
|
3214 |
|
3215 |
+
#: src/Functions/GlobalFunctions.php:1224
|
3216 |
msgid "%s (WooCommerce Shipping Address)"
|
3217 |
msgstr ""
|
3218 |
|
4322 |
msgid "Member Directory"
|
4323 |
msgstr ""
|
4324 |
|
4325 |
+
#: src/RegisterScripts.php:72 src/RegisterScripts.php:122
|
4326 |
msgid "Are you sure?"
|
4327 |
msgstr ""
|
4328 |
|
4329 |
+
#: src/RegisterScripts.php:73
|
4330 |
msgid "Deleting..."
|
4331 |
msgstr ""
|
4332 |
|
4333 |
+
#: src/RegisterScripts.php:74
|
4334 |
msgid "An error occurred. Please try again."
|
4335 |
msgstr ""
|
4336 |
|
4477 |
msgstr ""
|
4478 |
|
4479 |
#: src/ShortcodeParser/EditProfileTag.php:78
|
4480 |
+
#: src/ShortcodeParser/LoginFormTag.php:75
|
4481 |
#: src/ShortcodeParser/PasswordResetTag.php:77
|
4482 |
+
#: src/ShortcodeParser/RegistrationFormTag.php:79
|
4483 |
msgid ""
|
4484 |
"Form class not found. Please check if this ProfilePress form actually exist."
|
4485 |
msgstr ""
|
4488 |
msgid "The password you entered is incorrect."
|
4489 |
msgstr ""
|
4490 |
|
4491 |
+
#: src/ShortcodeParser/FormProcessor.php:183
|
4492 |
msgid "Authentication failed. Please try again"
|
4493 |
msgstr ""
|
4494 |
|
4513 |
msgid "Profile"
|
4514 |
msgstr ""
|
4515 |
|
4516 |
+
#: src/ShortcodeParser/LoginFormTag.php:54
|
4517 |
+
msgid "You are already logged in."
|
4518 |
+
msgstr ""
|
4519 |
+
|
4520 |
#: src/ShortcodeParser/MemberDirectoryTag.php:46
|
4521 |
msgid "No member directory ID specified."
|
4522 |
msgstr ""
|
4527 |
"ProfilePress."
|
4528 |
msgstr ""
|
4529 |
|
4530 |
+
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:51
|
4531 |
msgid "Dashboard"
|
4532 |
msgstr ""
|
4533 |
|
4534 |
+
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:56
|
4535 |
msgid "Account Details"
|
4536 |
msgstr ""
|
4537 |
|
4538 |
+
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:63
|
4539 |
#: src/ShortcodeParser/MyAccount/change-password.tmpl.php:25
|
4540 |
msgid "Change Password"
|
4541 |
msgstr ""
|
4542 |
|
4543 |
+
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:70
|
4544 |
msgid "Logout"
|
4545 |
msgstr ""
|
4546 |
|
4547 |
+
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:79
|
4548 |
#: src/ShortcodeParser/MyAccount/email-notifications.tmpl.php:14
|
4549 |
msgid "Email Notifications"
|
4550 |
msgstr ""
|
4551 |
|
4552 |
+
#: src/ShortcodeParser/MyAccount/MyAccountTag.php:502
|
4553 |
#: src/ShortcodeParser/MyAccount/edit-profile.tmpl.php:87
|
4554 |
msgid "Cover Image (min. width: 1000px)"
|
4555 |
msgstr ""
|
4619 |
msgid "Save"
|
4620 |
msgstr ""
|
4621 |
|
4622 |
+
#: src/ShortcodeParser/RegistrationFormTag.php:51
|
4623 |
+
msgid "You are already registered."
|
4624 |
+
msgstr ""
|
4625 |
+
|
4626 |
+
#: src/ShortcodeParser/RegistrationFormTag.php:74
|
4627 |
msgid "Registration is disabled in this site."
|
4628 |
msgstr ""
|
4629 |
|
5419 |
msgid "ProfilePress"
|
5420 |
msgstr ""
|
5421 |
|
5422 |
+
#. #-#-#-#-# wp-user-avatar.pot (ProfilePress 3.1.7) #-#-#-#-#
|
5423 |
#. Plugin URI of the plugin/theme
|
5424 |
+
#. #-#-#-#-# wp-user-avatar.pot (ProfilePress 3.1.7) #-#-#-#-#
|
5425 |
#. Author URI of the plugin/theme
|
5426 |
msgid "https://profilepress.net"
|
5427 |
msgstr ""
|
readme.txt
CHANGED
@@ -5,7 +5,7 @@ Tags: user registration, user profile, registration form, membership, login form
|
|
5 |
Requires at least: 4.7
|
6 |
Requires PHP: 5.6
|
7 |
Tested up to: 5.7
|
8 |
-
Stable tag: 3.1.
|
9 |
License: GPLv2 or later
|
10 |
|
11 |
Modern membership plugin for user registration, login form, user profile, member directories & content restriction.
|
@@ -117,19 +117,12 @@ No. You can create and manage your forms, user profiles and member directories w
|
|
117 |
|
118 |
== Changelog ==
|
119 |
|
120 |
-
= 3.1.
|
121 |
-
*
|
122 |
-
|
123 |
-
|
124 |
-
* Added
|
125 |
-
*
|
126 |
-
* Fixed
|
127 |
-
* Fixed detected builder styling issues.
|
128 |
-
* Added default attribute to profile cpf shortcode.
|
129 |
-
* Added edit to form action links.
|
130 |
-
* Added filter to disable tinymce shortcode modal in post editor.
|
131 |
-
* Added notice when avatar display is disabled.
|
132 |
-
* Redirect myaccount page to login page when user not logged in.
|
133 |
-
* Switch shortcode redirection to html/js redirect method.
|
134 |
|
135 |
See the [changelog file](https://plugins.svn.wordpress.org/wp-user-avatar/trunk/changelog.txt) for full change log information.
|
5 |
Requires at least: 4.7
|
6 |
Requires PHP: 5.6
|
7 |
Tested up to: 5.7
|
8 |
+
Stable tag: 3.1.7
|
9 |
License: GPLv2 or later
|
10 |
|
11 |
Modern membership plugin for user registration, login form, user profile, member directories & content restriction.
|
117 |
|
118 |
== Changelog ==
|
119 |
|
120 |
+
= 3.1.7 =
|
121 |
+
* Enhancement: JS scripts are now conditionally loaded.
|
122 |
+
* Fixed display issue in perfecto lite themes.
|
123 |
+
* Added custom message when logged in users view a login and signup page.
|
124 |
+
* Added compatibility with peters login redirect.
|
125 |
+
* Fixed incorrect avatar size retrieval.
|
126 |
+
* Fixed Warning: array_reduce() expects parameter 1 to be array, null given.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
127 |
|
128 |
See the [changelog file](https://plugins.svn.wordpress.org/wp-user-avatar/trunk/changelog.txt) for full change log information.
|
src/Classes/LoginAuth.php
CHANGED
@@ -90,9 +90,12 @@ class LoginAuth
|
|
90 |
|
91 |
$login_redirect = esc_url_raw($redirect);
|
92 |
|
|
|
|
|
|
|
|
|
93 |
/** Setup a custom location of the builder */
|
94 |
-
|
95 |
-
$login_redirection = apply_filters('ppress_login_redirect', $login_redirect, $login_form_id, $user);
|
96 |
|
97 |
// if ajax, return the url to redirect to
|
98 |
if (self::is_ajax()) return $login_redirection;
|
90 |
|
91 |
$login_redirect = esc_url_raw($redirect);
|
92 |
|
93 |
+
$requested_redirect_to = isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '';
|
94 |
+
|
95 |
+
$login_redirection = apply_filters('login_redirect', $login_redirect, $requested_redirect_to, $user);
|
96 |
+
|
97 |
/** Setup a custom location of the builder */
|
98 |
+
$login_redirection = apply_filters('ppress_login_redirect', $login_redirection, $login_form_id, $user);
|
|
|
99 |
|
100 |
// if ajax, return the url to redirect to
|
101 |
if (self::is_ajax()) return $login_redirection;
|
src/Classes/UserAvatar.php
CHANGED
@@ -12,7 +12,7 @@ class UserAvatar
|
|
12 |
|
13 |
if (self::user_has_pp_avatar($id_or_email)) {
|
14 |
|
15 |
-
$args['url'] = self::get_pp_avatar_url($id_or_email);
|
16 |
|
17 |
} else {
|
18 |
/** WP User Avatar Adapter STARTS */
|
12 |
|
13 |
if (self::user_has_pp_avatar($id_or_email)) {
|
14 |
|
15 |
+
$args['url'] = self::get_pp_avatar_url($id_or_email, ppress_var($args, 'size'));
|
16 |
|
17 |
} else {
|
18 |
/** WP User Avatar Adapter STARTS */
|
src/ContentProtection/ContentConditions.php
CHANGED
@@ -416,22 +416,30 @@ class ContentConditions
|
|
416 |
|
417 |
public function postselect_field($name_attr, $savedValue = [])
|
418 |
{
|
419 |
-
$options =
|
420 |
-
$carry[$post_id] = get_the_title($post_id);
|
421 |
|
422 |
-
|
423 |
-
|
|
|
|
|
|
|
|
|
|
|
424 |
|
425 |
$this->select_field($name_attr, ['selected' => $savedValue, 'options' => $options]);
|
426 |
}
|
427 |
|
428 |
public function taxonomyselect_field($name_attr, $savedValue)
|
429 |
{
|
430 |
-
$options =
|
431 |
-
$carry[$term_id] = get_term($term_id)->name;
|
432 |
|
433 |
-
|
434 |
-
|
|
|
|
|
|
|
|
|
|
|
435 |
|
436 |
$this->select_field($name_attr, ['selected' => $savedValue, 'options' => $options]);
|
437 |
}
|
416 |
|
417 |
public function postselect_field($name_attr, $savedValue = [])
|
418 |
{
|
419 |
+
$options = [];
|
|
|
420 |
|
421 |
+
if (is_array($savedValue)) {
|
422 |
+
$options = array_reduce($savedValue, function ($carry, $post_id) {
|
423 |
+
$carry[$post_id] = get_the_title($post_id);
|
424 |
+
|
425 |
+
return $carry;
|
426 |
+
}, []);
|
427 |
+
}
|
428 |
|
429 |
$this->select_field($name_attr, ['selected' => $savedValue, 'options' => $options]);
|
430 |
}
|
431 |
|
432 |
public function taxonomyselect_field($name_attr, $savedValue)
|
433 |
{
|
434 |
+
$options = [];
|
|
|
435 |
|
436 |
+
if (is_array($savedValue)) {
|
437 |
+
$options = array_reduce($savedValue, function ($carry, $term_id) {
|
438 |
+
$carry[$term_id] = get_term($term_id)->name;
|
439 |
+
|
440 |
+
return $carry;
|
441 |
+
}, []);
|
442 |
+
}
|
443 |
|
444 |
$this->select_field($name_attr, ['selected' => $savedValue, 'options' => $options]);
|
445 |
}
|
src/Functions/GlobalFunctions.php
CHANGED
@@ -1,11 +1,9 @@
|
|
1 |
<?php
|
2 |
-
/** List of ProfilePress global helper functions */
|
3 |
|
4 |
use ProfilePress\Core\Admin\SettingsPages\MailOptin;
|
5 |
use ProfilePress\Core\Base;
|
6 |
use ProfilePress\Core\Classes\ExtensionManager as EM;
|
7 |
use ProfilePress\Core\Classes\FormRepository as FR;
|
8 |
-
use ProfilePress\Core\Classes\PPRESS_Session;
|
9 |
use ProfilePress\Core\Classes\PROFILEPRESS_sql as PROFILEPRESS_sql;
|
10 |
use ProfilePress\Core\Classes\SendEmail;
|
11 |
|
@@ -1238,19 +1236,21 @@ function ppress_custom_fields_key_value_pair($remove_default = false)
|
|
1238 |
$defined_custom_fields[''] = esc_html__('Select...', 'wp-user-avatar');
|
1239 |
}
|
1240 |
|
1241 |
-
|
1242 |
-
|
|
|
1243 |
|
1244 |
-
|
1245 |
-
|
1246 |
-
|
|
|
1247 |
}
|
1248 |
-
}
|
1249 |
|
1250 |
-
|
1251 |
-
|
1252 |
-
|
1253 |
-
|
|
|
1254 |
}
|
1255 |
}
|
1256 |
|
@@ -1429,4 +1429,15 @@ function ppress_content_http_redirect($myURL)
|
|
1429 |
Please wait while you are redirected...or
|
1430 |
<a href="<?php echo $myURL; ?>">Click Here</a> if you do not want to wait.
|
1431 |
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1432 |
}
|
1 |
<?php
|
|
|
2 |
|
3 |
use ProfilePress\Core\Admin\SettingsPages\MailOptin;
|
4 |
use ProfilePress\Core\Base;
|
5 |
use ProfilePress\Core\Classes\ExtensionManager as EM;
|
6 |
use ProfilePress\Core\Classes\FormRepository as FR;
|
|
|
7 |
use ProfilePress\Core\Classes\PROFILEPRESS_sql as PROFILEPRESS_sql;
|
8 |
use ProfilePress\Core\Classes\SendEmail;
|
9 |
|
1236 |
$defined_custom_fields[''] = esc_html__('Select...', 'wp-user-avatar');
|
1237 |
}
|
1238 |
|
1239 |
+
if (EM::is_premium()) {
|
1240 |
+
$db_custom_fields = PROFILEPRESS_sql::get_profile_custom_fields();
|
1241 |
+
$db_contact_infos = PROFILEPRESS_sql::get_contact_info_fields();
|
1242 |
|
1243 |
+
if ( ! empty($db_contact_infos)) {
|
1244 |
+
foreach ($db_contact_infos as $key => $value) {
|
1245 |
+
$defined_custom_fields[$key] = $value;
|
1246 |
+
}
|
1247 |
}
|
|
|
1248 |
|
1249 |
+
if ( ! empty($db_custom_fields)) {
|
1250 |
+
foreach ($db_custom_fields as $db_custom_field) {
|
1251 |
+
$field_key = $db_custom_field['field_key'];
|
1252 |
+
$defined_custom_fields[$field_key] = ppress_woocommerce_field_transform($field_key, $db_custom_field['label_name']);
|
1253 |
+
}
|
1254 |
}
|
1255 |
}
|
1256 |
|
1429 |
Please wait while you are redirected...or
|
1430 |
<a href="<?php echo $myURL; ?>">Click Here</a> if you do not want to wait.
|
1431 |
<?php
|
1432 |
+
}
|
1433 |
+
|
1434 |
+
function ppress_shortcode_exist_in_post($shortcode)
|
1435 |
+
{
|
1436 |
+
global $post;
|
1437 |
+
|
1438 |
+
if (isset($post->post_content) && has_shortcode($post->post_content, $shortcode)) {
|
1439 |
+
return true;
|
1440 |
+
}
|
1441 |
+
|
1442 |
+
return false;
|
1443 |
}
|
src/RegisterScripts.php
CHANGED
@@ -53,12 +53,20 @@ class RegisterScripts
|
|
53 |
$is_ajax_mode_disabled = ppress_get_setting('disable_ajax_mode') == 'yes' ? 'true' : 'false';
|
54 |
|
55 |
wp_enqueue_script('jquery');
|
56 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
57 |
|
58 |
wp_enqueue_script('ppress-flatpickr', PPRESS_ASSETS_URL . '/flatpickr/flatpickr.min.js', array('jquery'));
|
59 |
wp_enqueue_script('ppress-select2', PPRESS_ASSETS_URL . '/select2/select2.min.js', array('jquery'));
|
60 |
|
61 |
-
wp_enqueue_script('ppress-frontend-script', PPRESS_ASSETS_URL . "/js/frontend{$suffix}.js", ['jquery', 'ppress-flatpickr'], PPRESS_VERSION_NUMBER, true);
|
62 |
wp_localize_script('ppress-frontend-script', 'pp_ajax_form', [
|
63 |
'ajaxurl' => admin_url('admin-ajax.php'),
|
64 |
'confirm_delete' => esc_html__('Are you sure?', 'wp-user-avatar'),
|
@@ -68,7 +76,9 @@ class RegisterScripts
|
|
68 |
'disable_ajax_form' => apply_filters('ppress_disable_ajax_form', (string)$is_ajax_mode_disabled)
|
69 |
]);
|
70 |
|
71 |
-
|
|
|
|
|
72 |
|
73 |
do_action('ppress_enqueue_public_js');
|
74 |
}
|
@@ -83,7 +93,6 @@ class RegisterScripts
|
|
83 |
wp_enqueue_script('jquery-ui-draggable');
|
84 |
|
85 |
wp_enqueue_script('ppress-flatpickr', PPRESS_ASSETS_URL . '/flatpickr/flatpickr.min.js', array('jquery'));
|
86 |
-
|
87 |
wp_enqueue_script('ppress-select2', PPRESS_ASSETS_URL . '/select2/select2.min.js', array('jquery'));
|
88 |
|
89 |
if ( ! ppress_is_admin_page()) return;
|
53 |
$is_ajax_mode_disabled = ppress_get_setting('disable_ajax_mode') == 'yes' ? 'true' : 'false';
|
54 |
|
55 |
wp_enqueue_script('jquery');
|
56 |
+
|
57 |
+
if (isset($_GET['pp_preview_form']) ||
|
58 |
+
ppress_shortcode_exist_in_post('profilepress-registration') ||
|
59 |
+
ppress_shortcode_exist_in_post('profilepress-password-reset') ||
|
60 |
+
ppress_shortcode_exist_in_post('profilepress-edit-profile') ||
|
61 |
+
ppress_shortcode_exist_in_post('profilepress-my-account')
|
62 |
+
) {
|
63 |
+
wp_enqueue_script('password-strength-meter');
|
64 |
+
}
|
65 |
|
66 |
wp_enqueue_script('ppress-flatpickr', PPRESS_ASSETS_URL . '/flatpickr/flatpickr.min.js', array('jquery'));
|
67 |
wp_enqueue_script('ppress-select2', PPRESS_ASSETS_URL . '/select2/select2.min.js', array('jquery'));
|
68 |
|
69 |
+
wp_enqueue_script('ppress-frontend-script', PPRESS_ASSETS_URL . "/js/frontend{$suffix}.js", ['jquery', 'ppress-flatpickr', 'ppress-select2'], PPRESS_VERSION_NUMBER, true);
|
70 |
wp_localize_script('ppress-frontend-script', 'pp_ajax_form', [
|
71 |
'ajaxurl' => admin_url('admin-ajax.php'),
|
72 |
'confirm_delete' => esc_html__('Are you sure?', 'wp-user-avatar'),
|
76 |
'disable_ajax_form' => apply_filters('ppress_disable_ajax_form', (string)$is_ajax_mode_disabled)
|
77 |
]);
|
78 |
|
79 |
+
if (isset($_GET['pp_preview_form']) || ppress_shortcode_exist_in_post('profilepress-member-directory')) {
|
80 |
+
wp_enqueue_script('ppress-member-directory', PPRESS_ASSETS_URL . "/js/member-directory{$suffix}.js", ['jquery', 'jquery-masonry', 'ppress-select2', 'ppress-flatpickr'], PPRESS_VERSION_NUMBER, true);
|
81 |
+
}
|
82 |
|
83 |
do_action('ppress_enqueue_public_js');
|
84 |
}
|
93 |
wp_enqueue_script('jquery-ui-draggable');
|
94 |
|
95 |
wp_enqueue_script('ppress-flatpickr', PPRESS_ASSETS_URL . '/flatpickr/flatpickr.min.js', array('jquery'));
|
|
|
96 |
wp_enqueue_script('ppress-select2', PPRESS_ASSETS_URL . '/select2/select2.min.js', array('jquery'));
|
97 |
|
98 |
if ( ! ppress_is_admin_page()) return;
|
src/ShortcodeParser/Builder/RegistrationFormBuilder.php
CHANGED
@@ -150,26 +150,29 @@ class RegistrationFormBuilder
|
|
150 |
<div id="pp-pass-strength-result" <?php echo $attributes; ?>><?php _e('Strength indicator'); ?></div>
|
151 |
<script type="text/javascript">
|
152 |
var pass_strength = 0;
|
153 |
-
|
154 |
-
|
155 |
-
|
156 |
-
|
157 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
158 |
|
159 |
-
|
|
|
|
|
160 |
pp_checkPasswordStrength(password1, password2, strengthMeterId, submitButton, []);
|
161 |
-
}
|
162 |
-
);
|
163 |
-
|
164 |
-
// set a time delay to enable the checker function to initialize
|
165 |
-
setTimeout(function () {
|
166 |
-
pp_checkPasswordStrength(password1, password2, strengthMeterId, submitButton, []);
|
167 |
-
}, 500);
|
168 |
|
169 |
-
|
170 |
-
|
|
|
171 |
});
|
172 |
-
});
|
173 |
|
174 |
function pp_checkPasswordStrength($pass1, $pass2, $strengthResult, $submitButton, blacklistArray) {
|
175 |
var min_password_strength = <?php echo apply_filters('ppress_min_password_strength', 4); ?>;
|
@@ -183,7 +186,7 @@ class RegistrationFormBuilder
|
|
183 |
$strengthResult.removeClass('short bad good strong');
|
184 |
|
185 |
// Extend our blacklist array with those from the inputs & site data
|
186 |
-
blacklistArray = blacklistArray.concat(wp.passwordStrength.
|
187 |
|
188 |
// Get the password strength
|
189 |
var strength = wp.passwordStrength.meter(pass1, blacklistArray, pass2);
|
150 |
<div id="pp-pass-strength-result" <?php echo $attributes; ?>><?php _e('Strength indicator'); ?></div>
|
151 |
<script type="text/javascript">
|
152 |
var pass_strength = 0;
|
153 |
+
(function ($) {
|
154 |
+
$(document).on('ready', function () {
|
155 |
+
var password1 = $('input[name=reg_password]');
|
156 |
+
var password2 = $('input[name=reg_password2]');
|
157 |
+
var submitButton = $('input[name=reg_submit]');
|
158 |
+
var strengthMeterId = $('#pp-pass-strength-result');
|
159 |
+
|
160 |
+
$('body').on('keyup', 'input[name=reg_password], input[name=reg_password2]', function () {
|
161 |
+
pp_checkPasswordStrength(password1, password2, strengthMeterId, submitButton, []);
|
162 |
+
}
|
163 |
+
);
|
164 |
|
165 |
+
// set a time delay to enable the checker function to initialize
|
166 |
+
setTimeout(function () {
|
167 |
+
if (password1.val() === '') return;
|
168 |
pp_checkPasswordStrength(password1, password2, strengthMeterId, submitButton, []);
|
169 |
+
}, 500);
|
|
|
|
|
|
|
|
|
|
|
|
|
170 |
|
171 |
+
submitButton.click(function () {
|
172 |
+
$('input[name=pp_enforce_password_meter]').val(pass_strength);
|
173 |
+
});
|
174 |
});
|
175 |
+
})(jQuery);
|
176 |
|
177 |
function pp_checkPasswordStrength($pass1, $pass2, $strengthResult, $submitButton, blacklistArray) {
|
178 |
var min_password_strength = <?php echo apply_filters('ppress_min_password_strength', 4); ?>;
|
186 |
$strengthResult.removeClass('short bad good strong');
|
187 |
|
188 |
// Extend our blacklist array with those from the inputs & site data
|
189 |
+
blacklistArray = blacklistArray.concat(wp.passwordStrength.userInputDisallowedList());
|
190 |
|
191 |
// Get the password strength
|
192 |
var strength = wp.passwordStrength.meter(pass1, blacklistArray, pass2);
|
src/ShortcodeParser/FormProcessor.php
CHANGED
@@ -95,10 +95,8 @@ class FormProcessor
|
|
95 |
|
96 |
public function process_edit_profile_form()
|
97 |
{
|
98 |
-
global $post;
|
99 |
-
|
100 |
// check if the page being viewed contains the "edit profile" shortcode. if true, redirect to login page
|
101 |
-
if (
|
102 |
if ( ! is_user_logged_in()) {
|
103 |
wp_safe_redirect(ppress_login_url());
|
104 |
exit;
|
95 |
|
96 |
public function process_edit_profile_form()
|
97 |
{
|
|
|
|
|
98 |
// check if the page being viewed contains the "edit profile" shortcode. if true, redirect to login page
|
99 |
+
if (ppress_shortcode_exist_in_post('profilepress-edit-profile')) {
|
100 |
if ( ! is_user_logged_in()) {
|
101 |
wp_safe_redirect(ppress_login_url());
|
102 |
exit;
|
src/ShortcodeParser/LoginFormTag.php
CHANGED
@@ -41,11 +41,23 @@ class LoginFormTag extends FormProcessor
|
|
41 |
$container_div_start = sprintf('<div id="pp-login-%s-wrap" class="pp-form-container pp-login-form-wrap">', $id);
|
42 |
$container_div_end = '</div>';
|
43 |
|
44 |
-
|
45 |
'ppress_login_form',
|
46 |
$attribution_start . $css . $container_div_start . $login_error . $this->get_login_structure($id, $atts['redirect']) . $container_div_end . $attribution_end,
|
47 |
$id
|
48 |
);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
49 |
}
|
50 |
|
51 |
/**
|
41 |
$container_div_start = sprintf('<div id="pp-login-%s-wrap" class="pp-form-container pp-login-form-wrap">', $id);
|
42 |
$container_div_end = '</div>';
|
43 |
|
44 |
+
$login_form = apply_filters(
|
45 |
'ppress_login_form',
|
46 |
$attribution_start . $css . $container_div_start . $login_error . $this->get_login_structure($id, $atts['redirect']) . $container_div_end . $attribution_end,
|
47 |
$id
|
48 |
);
|
49 |
+
|
50 |
+
if ( ! isset($_GET['pp_preview_form']) && is_user_logged_in()) {
|
51 |
+
|
52 |
+
return apply_filters(
|
53 |
+
'ppress_login_form_already_loggedin_message',
|
54 |
+
wpautop(esc_html__('You are already logged in.', 'wp-user-avatar')),
|
55 |
+
$login_form,
|
56 |
+
$id
|
57 |
+
);
|
58 |
+
}
|
59 |
+
|
60 |
+
return $login_form;
|
61 |
}
|
62 |
|
63 |
/**
|
src/ShortcodeParser/MyAccount/MyAccountTag.php
CHANGED
@@ -13,6 +13,8 @@ class MyAccountTag extends FormProcessor
|
|
13 |
|
14 |
add_action('init', [$this, 'add_endpoints']);
|
15 |
|
|
|
|
|
16 |
if ( ! is_admin()) {
|
17 |
add_filter('query_vars', [$this, 'add_query_vars'], 99);
|
18 |
add_action('parse_request', [$this, 'parse_request'], 999999999);
|
@@ -25,6 +27,19 @@ class MyAccountTag extends FormProcessor
|
|
25 |
}
|
26 |
}
|
27 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
28 |
public static function myaccount_tabs()
|
29 |
{
|
30 |
static $cache = false;
|
@@ -408,68 +423,63 @@ class MyAccountTag extends FormProcessor
|
|
408 |
|
409 |
ob_start();
|
410 |
|
411 |
-
|
412 |
-
ppress_content_http_redirect(wp_login_url());
|
413 |
-
} else {
|
414 |
-
|
415 |
-
$user_id = get_current_user_id();
|
416 |
|
417 |
-
|
418 |
-
|
419 |
-
?>
|
420 |
-
<div id="profilepress-myaccount-wrapper">
|
421 |
-
<div class="profilepress-myaccount-row">
|
422 |
-
<div class="profilepress-myaccount-col-sm-3">
|
423 |
|
424 |
-
|
|
|
|
|
|
|
425 |
|
426 |
-
|
427 |
-
<a href="<?= ppress_get_frontend_profile_url($user_id) ?>">
|
428 |
-
<?= UserAvatar::get_avatar_img($user_id, 120); ?>
|
429 |
-
</a>
|
430 |
-
</div>
|
431 |
|
|
|
|
|
|
|
|
|
432 |
</div>
|
433 |
|
434 |
-
<div class="profilepress-myaccount-nav">
|
435 |
-
<?php foreach ($tabs as $key => $tab) :
|
436 |
-
?>
|
437 |
-
<a class="ppmyac-dashboard-item<?= self::is_endpoint($key) ? ' isactive' : ''; ?>" href="<?= $this->get_endpoint_url($key); ?>">
|
438 |
-
<i class="ppmyac-icons">
|
439 |
-
<?= isset($tab['icon']) ? $tab['icon'] : 'settings'; ?>
|
440 |
-
</i>
|
441 |
-
<?= $tab['title'] ?>
|
442 |
-
</a>
|
443 |
-
<?php endforeach; ?>
|
444 |
-
</div>
|
445 |
</div>
|
446 |
-
<div class="profilepress-myaccount-content">
|
447 |
-
<?php
|
448 |
|
449 |
-
|
450 |
-
|
451 |
-
|
452 |
-
|
453 |
-
|
454 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
455 |
|
456 |
-
|
457 |
|
458 |
-
|
459 |
|
460 |
-
|
461 |
-
}
|
462 |
}
|
463 |
}
|
|
|
464 |
|
465 |
-
|
466 |
-
|
467 |
-
</div>
|
468 |
</div>
|
469 |
</div>
|
|
|
470 |
|
471 |
-
|
472 |
-
}
|
473 |
|
474 |
return ob_get_clean();
|
475 |
}
|
13 |
|
14 |
add_action('init', [$this, 'add_endpoints']);
|
15 |
|
16 |
+
add_action('wp', [$this, 'redirect_non_logged_in_users']);
|
17 |
+
|
18 |
if ( ! is_admin()) {
|
19 |
add_filter('query_vars', [$this, 'add_query_vars'], 99);
|
20 |
add_action('parse_request', [$this, 'parse_request'], 999999999);
|
27 |
}
|
28 |
}
|
29 |
|
30 |
+
public function redirect_non_logged_in_users()
|
31 |
+
{
|
32 |
+
global $post;
|
33 |
+
|
34 |
+
// check if the page being viewed contains the "profilepress-my-account" shortcode. if true, redirect to login page
|
35 |
+
if (isset($post->post_content) && has_shortcode($post->post_content, 'profilepress-my-account')) {
|
36 |
+
if ( ! is_user_logged_in()) {
|
37 |
+
wp_safe_redirect(ppress_login_url());
|
38 |
+
exit;
|
39 |
+
}
|
40 |
+
}
|
41 |
+
}
|
42 |
+
|
43 |
public static function myaccount_tabs()
|
44 |
{
|
45 |
static $cache = false;
|
423 |
|
424 |
ob_start();
|
425 |
|
426 |
+
$user_id = get_current_user_id();
|
|
|
|
|
|
|
|
|
427 |
|
428 |
+
$tabs = $this->myaccount_tabs();
|
|
|
|
|
|
|
|
|
|
|
429 |
|
430 |
+
?>
|
431 |
+
<div id="profilepress-myaccount-wrapper">
|
432 |
+
<div class="profilepress-myaccount-row">
|
433 |
+
<div class="profilepress-myaccount-col-sm-3">
|
434 |
|
435 |
+
<div class="profilepress-myaccount-avatar-wrap">
|
|
|
|
|
|
|
|
|
436 |
|
437 |
+
<div class="profilepress-myaccount-avatar">
|
438 |
+
<a href="<?= ppress_get_frontend_profile_url($user_id) ?>">
|
439 |
+
<?= UserAvatar::get_avatar_img($user_id, 120); ?>
|
440 |
+
</a>
|
441 |
</div>
|
442 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
443 |
</div>
|
|
|
|
|
444 |
|
445 |
+
<div class="profilepress-myaccount-nav">
|
446 |
+
<?php foreach ($tabs as $key => $tab) :
|
447 |
+
?>
|
448 |
+
<a class="ppmyac-dashboard-item<?= self::is_endpoint($key) ? ' isactive' : ''; ?>" href="<?= $this->get_endpoint_url($key); ?>">
|
449 |
+
<i class="ppmyac-icons">
|
450 |
+
<?= isset($tab['icon']) ? $tab['icon'] : 'settings'; ?>
|
451 |
+
</i>
|
452 |
+
<?= $tab['title'] ?>
|
453 |
+
</a>
|
454 |
+
<?php endforeach; ?>
|
455 |
+
</div>
|
456 |
+
</div>
|
457 |
+
<div class="profilepress-myaccount-content">
|
458 |
+
<?php
|
459 |
+
|
460 |
+
if ( ! empty($wp->query_vars)) {
|
461 |
+
foreach ($wp->query_vars as $key => $value) {
|
462 |
+
// Ignore pagename param.
|
463 |
+
if ('pagename' === $key) {
|
464 |
+
continue;
|
465 |
+
}
|
466 |
|
467 |
+
$callback = self::get_tab_callback($key);
|
468 |
|
469 |
+
if (is_callable($callback)) {
|
470 |
|
471 |
+
return call_user_func($callback, $key);
|
|
|
472 |
}
|
473 |
}
|
474 |
+
}
|
475 |
|
476 |
+
require apply_filters('ppress_my_account_dashboard_template', dirname(__FILE__) . '/dashboard.tmpl.php');
|
477 |
+
?>
|
|
|
478 |
</div>
|
479 |
</div>
|
480 |
+
</div>
|
481 |
|
482 |
+
<?php
|
|
|
483 |
|
484 |
return ob_get_clean();
|
485 |
}
|
src/ShortcodeParser/RegistrationFormTag.php
CHANGED
@@ -38,11 +38,23 @@ class RegistrationFormTag extends FormProcessor
|
|
38 |
$container_div_start = sprintf('<div id="pp-registration-%s-wrap" class="pp-form-container pp-registration-form-wrapper">', $id);
|
39 |
$container_div_end = '</div>';
|
40 |
|
41 |
-
|
42 |
'ppress_registration_form',
|
43 |
$attribution_start . $css . $container_div_start . $registration_status . $registration_structure . $container_div_end . $attribution_end,
|
44 |
$id
|
45 |
);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
46 |
}
|
47 |
|
48 |
|
@@ -88,7 +100,7 @@ class RegistrationFormTag extends FormProcessor
|
|
88 |
|
89 |
$registration_structure .= '<input type="hidden" name="pp_current_url" value="' . ppress_get_current_url_query_string() . '">';
|
90 |
$registration_structure .= "<input type='hidden' name='signup_form_id' value='$id'>";
|
91 |
-
$registration_structure .= sprintf("<input type='hidden' name='signup_referrer_page' value='%s'>", !empty($referrer_url) ? $referrer_url : '');
|
92 |
|
93 |
$registration_structure = apply_filters('ppress_form_field_structure', $registration_structure, $id);
|
94 |
|
38 |
$container_div_start = sprintf('<div id="pp-registration-%s-wrap" class="pp-form-container pp-registration-form-wrapper">', $id);
|
39 |
$container_div_end = '</div>';
|
40 |
|
41 |
+
$registration_form = apply_filters(
|
42 |
'ppress_registration_form',
|
43 |
$attribution_start . $css . $container_div_start . $registration_status . $registration_structure . $container_div_end . $attribution_end,
|
44 |
$id
|
45 |
);
|
46 |
+
|
47 |
+
if ( ! isset($_GET['pp_preview_form']) && is_user_logged_in()) {
|
48 |
+
|
49 |
+
return apply_filters(
|
50 |
+
'ppress_signup_form_already_loggedin_message',
|
51 |
+
wpautop(esc_html__('You are already registered.', 'wp-user-avatar')),
|
52 |
+
$registration_form,
|
53 |
+
$id
|
54 |
+
);
|
55 |
+
}
|
56 |
+
|
57 |
+
return $registration_form;
|
58 |
}
|
59 |
|
60 |
|
100 |
|
101 |
$registration_structure .= '<input type="hidden" name="pp_current_url" value="' . ppress_get_current_url_query_string() . '">';
|
102 |
$registration_structure .= "<input type='hidden' name='signup_form_id' value='$id'>";
|
103 |
+
$registration_structure .= sprintf("<input type='hidden' name='signup_referrer_page' value='%s'>", ! empty($referrer_url) ? $referrer_url : '');
|
104 |
|
105 |
$registration_structure = apply_filters('ppress_form_field_structure', $registration_structure, $id);
|
106 |
|
src/Themes/DragDrop/Login/PerfectoLite.php
CHANGED
@@ -86,16 +86,15 @@ class PerfectoLite extends AbstractTheme
|
|
86 |
|
87 |
public function form_structure()
|
88 |
{
|
89 |
-
$fields
|
90 |
-
$button
|
91 |
-
$headline
|
92 |
|
93 |
return <<<HTML
|
94 |
[pp-form-wrapper class="perfecto"]
|
95 |
<div class="perfecto-heading">$headline</div>
|
96 |
$fields
|
97 |
$button
|
98 |
-
</div>
|
99 |
[/pp-form-wrapper]
|
100 |
HTML;
|
101 |
|
86 |
|
87 |
public function form_structure()
|
88 |
{
|
89 |
+
$fields = $this->field_listing();
|
90 |
+
$button = $this->form_submit_button();
|
91 |
+
$headline = $this->get_meta('perfectolite_login_headline');
|
92 |
|
93 |
return <<<HTML
|
94 |
[pp-form-wrapper class="perfecto"]
|
95 |
<div class="perfecto-heading">$headline</div>
|
96 |
$fields
|
97 |
$button
|
|
|
98 |
[/pp-form-wrapper]
|
99 |
HTML;
|
100 |
|
src/Themes/DragDrop/Registration/PerfectoLite.php
CHANGED
@@ -97,7 +97,6 @@ class PerfectoLite extends AbstractTheme
|
|
97 |
<div class="perfecto-heading">$headline</div>
|
98 |
$fields
|
99 |
$registration_button
|
100 |
-
</div>
|
101 |
[/pp-form-wrapper]
|
102 |
HTML;
|
103 |
|
97 |
<div class="perfecto-heading">$headline</div>
|
98 |
$fields
|
99 |
$registration_button
|
|
|
100 |
[/pp-form-wrapper]
|
101 |
HTML;
|
102 |
|
vendor/autoload.php
CHANGED
@@ -4,4 +4,4 @@
|
|
4 |
|
5 |
require_once __DIR__ . '/composer/autoload_real.php';
|
6 |
|
7 |
-
return
|
4 |
|
5 |
require_once __DIR__ . '/composer/autoload_real.php';
|
6 |
|
7 |
+
return ComposerAutoloaderInitb8ccebde2f0f0c5c17c736d9547cc8a5::getLoader();
|
vendor/composer/InstalledVersions.php
CHANGED
@@ -29,7 +29,7 @@ private static $installed = array (
|
|
29 |
'aliases' =>
|
30 |
array (
|
31 |
),
|
32 |
-
'reference' => '
|
33 |
'name' => '__root__',
|
34 |
),
|
35 |
'versions' =>
|
@@ -41,7 +41,7 @@ private static $installed = array (
|
|
41 |
'aliases' =>
|
42 |
array (
|
43 |
),
|
44 |
-
'reference' => '
|
45 |
),
|
46 |
'collizo4sky/persist-admin-notices-dismissal' =>
|
47 |
array (
|
29 |
'aliases' =>
|
30 |
array (
|
31 |
),
|
32 |
+
'reference' => '36bcea130d4dc61fd1feda3701cba01723d730fd',
|
33 |
'name' => '__root__',
|
34 |
),
|
35 |
'versions' =>
|
41 |
'aliases' =>
|
42 |
array (
|
43 |
),
|
44 |
+
'reference' => '36bcea130d4dc61fd1feda3701cba01723d730fd',
|
45 |
),
|
46 |
'collizo4sky/persist-admin-notices-dismissal' =>
|
47 |
array (
|
vendor/composer/autoload_real.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
|
3 |
// autoload_real.php @generated by Composer
|
4 |
|
5 |
-
class
|
6 |
{
|
7 |
private static $loader;
|
8 |
|
@@ -24,15 +24,15 @@ class ComposerAutoloaderInit5237e4f607c07e5bd3f7129db5736a43
|
|
24 |
|
25 |
require __DIR__ . '/platform_check.php';
|
26 |
|
27 |
-
spl_autoload_register(array('
|
28 |
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
29 |
-
spl_autoload_unregister(array('
|
30 |
|
31 |
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
32 |
if ($useStaticLoader) {
|
33 |
require __DIR__ . '/autoload_static.php';
|
34 |
|
35 |
-
call_user_func(\Composer\Autoload\
|
36 |
} else {
|
37 |
$map = require __DIR__ . '/autoload_namespaces.php';
|
38 |
foreach ($map as $namespace => $path) {
|
@@ -53,19 +53,19 @@ class ComposerAutoloaderInit5237e4f607c07e5bd3f7129db5736a43
|
|
53 |
$loader->register(true);
|
54 |
|
55 |
if ($useStaticLoader) {
|
56 |
-
$includeFiles = Composer\Autoload\
|
57 |
} else {
|
58 |
$includeFiles = require __DIR__ . '/autoload_files.php';
|
59 |
}
|
60 |
foreach ($includeFiles as $fileIdentifier => $file) {
|
61 |
-
|
62 |
}
|
63 |
|
64 |
return $loader;
|
65 |
}
|
66 |
}
|
67 |
|
68 |
-
function
|
69 |
{
|
70 |
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
71 |
require $file;
|
2 |
|
3 |
// autoload_real.php @generated by Composer
|
4 |
|
5 |
+
class ComposerAutoloaderInitb8ccebde2f0f0c5c17c736d9547cc8a5
|
6 |
{
|
7 |
private static $loader;
|
8 |
|
24 |
|
25 |
require __DIR__ . '/platform_check.php';
|
26 |
|
27 |
+
spl_autoload_register(array('ComposerAutoloaderInitb8ccebde2f0f0c5c17c736d9547cc8a5', 'loadClassLoader'), true, true);
|
28 |
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
29 |
+
spl_autoload_unregister(array('ComposerAutoloaderInitb8ccebde2f0f0c5c17c736d9547cc8a5', 'loadClassLoader'));
|
30 |
|
31 |
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
32 |
if ($useStaticLoader) {
|
33 |
require __DIR__ . '/autoload_static.php';
|
34 |
|
35 |
+
call_user_func(\Composer\Autoload\ComposerStaticInitb8ccebde2f0f0c5c17c736d9547cc8a5::getInitializer($loader));
|
36 |
} else {
|
37 |
$map = require __DIR__ . '/autoload_namespaces.php';
|
38 |
foreach ($map as $namespace => $path) {
|
53 |
$loader->register(true);
|
54 |
|
55 |
if ($useStaticLoader) {
|
56 |
+
$includeFiles = Composer\Autoload\ComposerStaticInitb8ccebde2f0f0c5c17c736d9547cc8a5::$files;
|
57 |
} else {
|
58 |
$includeFiles = require __DIR__ . '/autoload_files.php';
|
59 |
}
|
60 |
foreach ($includeFiles as $fileIdentifier => $file) {
|
61 |
+
composerRequireb8ccebde2f0f0c5c17c736d9547cc8a5($fileIdentifier, $file);
|
62 |
}
|
63 |
|
64 |
return $loader;
|
65 |
}
|
66 |
}
|
67 |
|
68 |
+
function composerRequireb8ccebde2f0f0c5c17c736d9547cc8a5($fileIdentifier, $file)
|
69 |
{
|
70 |
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
71 |
require $file;
|
vendor/composer/autoload_static.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
|
5 |
namespace Composer\Autoload;
|
6 |
|
7 |
-
class
|
8 |
{
|
9 |
public static $files = array (
|
10 |
'fda73876e8be17735f680f484cec1679' => __DIR__ . '/../..' . '/src/Functions/custom-settings-api.php',
|
@@ -286,9 +286,9 @@ class ComposerStaticInit5237e4f607c07e5bd3f7129db5736a43
|
|
286 |
public static function getInitializer(ClassLoader $loader)
|
287 |
{
|
288 |
return \Closure::bind(function () use ($loader) {
|
289 |
-
$loader->prefixLengthsPsr4 =
|
290 |
-
$loader->prefixDirsPsr4 =
|
291 |
-
$loader->classMap =
|
292 |
|
293 |
}, null, ClassLoader::class);
|
294 |
}
|
4 |
|
5 |
namespace Composer\Autoload;
|
6 |
|
7 |
+
class ComposerStaticInitb8ccebde2f0f0c5c17c736d9547cc8a5
|
8 |
{
|
9 |
public static $files = array (
|
10 |
'fda73876e8be17735f680f484cec1679' => __DIR__ . '/../..' . '/src/Functions/custom-settings-api.php',
|
286 |
public static function getInitializer(ClassLoader $loader)
|
287 |
{
|
288 |
return \Closure::bind(function () use ($loader) {
|
289 |
+
$loader->prefixLengthsPsr4 = ComposerStaticInitb8ccebde2f0f0c5c17c736d9547cc8a5::$prefixLengthsPsr4;
|
290 |
+
$loader->prefixDirsPsr4 = ComposerStaticInitb8ccebde2f0f0c5c17c736d9547cc8a5::$prefixDirsPsr4;
|
291 |
+
$loader->classMap = ComposerStaticInitb8ccebde2f0f0c5c17c736d9547cc8a5::$classMap;
|
292 |
|
293 |
}, null, ClassLoader::class);
|
294 |
}
|
vendor/composer/installed.php
CHANGED
@@ -6,7 +6,7 @@
|
|
6 |
'aliases' =>
|
7 |
array (
|
8 |
),
|
9 |
-
'reference' => '
|
10 |
'name' => '__root__',
|
11 |
),
|
12 |
'versions' =>
|
@@ -18,7 +18,7 @@
|
|
18 |
'aliases' =>
|
19 |
array (
|
20 |
),
|
21 |
-
'reference' => '
|
22 |
),
|
23 |
'collizo4sky/persist-admin-notices-dismissal' =>
|
24 |
array (
|
6 |
'aliases' =>
|
7 |
array (
|
8 |
),
|
9 |
+
'reference' => '36bcea130d4dc61fd1feda3701cba01723d730fd',
|
10 |
'name' => '__root__',
|
11 |
),
|
12 |
'versions' =>
|
18 |
'aliases' =>
|
19 |
array (
|
20 |
),
|
21 |
+
'reference' => '36bcea130d4dc61fd1feda3701cba01723d730fd',
|
22 |
),
|
23 |
'collizo4sky/persist-admin-notices-dismissal' =>
|
24 |
array (
|
wp-user-avatar.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Plugin Name: ProfilePress
|
4 |
* Plugin URI: https://profilepress.net
|
5 |
* Description: The modern WordPress membership and user profile plugin.
|
6 |
-
* Version: 3.1.
|
7 |
* Author: ProfilePress Team
|
8 |
* Author URI: https://profilepress.net
|
9 |
* Text Domain: wp-user-avatar
|
@@ -14,7 +14,7 @@
|
|
14 |
defined('ABSPATH') or die("No script kiddies please!");
|
15 |
|
16 |
define('PROFILEPRESS_SYSTEM_FILE_PATH', __FILE__);
|
17 |
-
define('PPRESS_VERSION_NUMBER', '3.1.
|
18 |
|
19 |
require __DIR__ . '/vendor/autoload.php';
|
20 |
|
3 |
* Plugin Name: ProfilePress
|
4 |
* Plugin URI: https://profilepress.net
|
5 |
* Description: The modern WordPress membership and user profile plugin.
|
6 |
+
* Version: 3.1.7
|
7 |
* Author: ProfilePress Team
|
8 |
* Author URI: https://profilepress.net
|
9 |
* Text Domain: wp-user-avatar
|
14 |
defined('ABSPATH') or die("No script kiddies please!");
|
15 |
|
16 |
define('PROFILEPRESS_SYSTEM_FILE_PATH', __FILE__);
|
17 |
+
define('PPRESS_VERSION_NUMBER', '3.1.7');
|
18 |
|
19 |
require __DIR__ . '/vendor/autoload.php';
|
20 |
|