10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- pre 2.0.44 commit;

Browse Source
This commit is contained in:
nikitasinelnikov
2019-04-14 21:26:04 +03:00
parent f0dd12b5d3
commit 99474abfd5
6 changed files with 909 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-fields.php
+19 -2
View File
@@ -580,9 +580,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
* @return mixed
*/
function field_value( $key, $default = false, $data = null ) {
if ( isset( $_SESSION ) && isset( $_SESSION['um_social_profile'][ $key ] ) && isset( $this->set_mode ) && $this->set_mode == 'register' )
if ( isset( $_SESSION ) && isset( $_SESSION['um_social_profile'][ $key ] ) && isset( $this->set_mode ) && $this->set_mode == 'register' ) {
return $_SESSION['um_social_profile'][ $key ];
}
$value = '';
$type = ( isset( $data['type'] ) ) ? $data['type'] : '';
// preview in backend
@@ -787,7 +789,22 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}
return isset( $value ) ? $value : '';
/**
* UM hook
*
* @type filter
* @title um_field_value
* @description Change field value
* @input_vars
* [{"var":"$value","type":"string","desc":"Field Value"},
* {"var":"$key","type":"string","desc":"Field Key"},,
* {"var":"$type","type":"string","desc":"Field Type"}
* {"var":"$default","type":"string","desc":"Field Default Value"},
* {"var":"$data","type":"array","desc":"Field Data"}]
* @usage add_filter( 'um_field_value', 'function_name', 10, 5 );
*/
return apply_filters( 'um_field_value', $value, $default, $key, $type, $data );
}
includes/core/class-members.php
+14 -14
View File
@@ -441,9 +441,9 @@ if ( ! class_exists( 'um\core\Members' ) ) {
do_action( 'um_user_after_query', $query_args, $users );
$array['users'] = isset( $users->results ) && ! empty( $users->results ) ? array_unique( $users->results ) : array();
$array['users'] = ! empty( $users->results ) ? $users->results : array();
$array['total_users'] = (isset( $max_users ) && $max_users && $max_users <= $users->total_users ) ? $max_users : $users->total_users;
$array['total_users'] = ( isset( $max_users ) && $max_users && $max_users <= $users->total_users ) ? $max_users : $users->total_users;
$array['page'] = $members_page;
@@ -458,7 +458,7 @@ if ( ! class_exists( 'um\core\Members' ) ) {
$array['users_per_page'] = $array['users'];
for( $i = $array['page']; $i <= $array['page'] + 2; $i++ ) {
for ( $i = $array['page']; $i <= $array['page'] + 2; $i++ ) {
if ( $i <= $array['total_pages'] ) {
$pages_to_show[] = $i;
}
@@ -468,7 +468,7 @@ if ( ! class_exists( 'um\core\Members' ) ) {
$pages_needed = 5 - count( $pages_to_show );
for ( $c = $array['page']; $c >= $array['page'] - 2; $c-- ) {
if ( !in_array( $c, $pages_to_show ) && $c > 0 ) {
if ( ! in_array( $c, $pages_to_show ) && $c > 0 ) {
$pages_to_add[] = $c;
}
}
@@ -500,15 +500,15 @@ if ( ! class_exists( 'um\core\Members' ) ) {
} else {
if ( isset( $pages_to_show ) && count( $pages_to_show ) < 5 ) {
if ( max($pages_to_show) - $array['page'] >= 2 ) {
$pages_to_show[] = max($pages_to_show) + 1;
if ( max( $pages_to_show ) - $array['page'] >= 2 ) {
$pages_to_show[] = max( $pages_to_show ) + 1;
if ( count( $pages_to_show ) < 5 ) {
$pages_to_show[] = max($pages_to_show) + 1;
$pages_to_show[] = max( $pages_to_show ) + 1;
}
} else if ( $array['page'] - min($pages_to_show) >= 2 ) {
$pages_to_show[] = min($pages_to_show) - 1;
} elseif ( $array['page'] - min( $pages_to_show ) >= 2 ) {
$pages_to_show[] = min( $pages_to_show ) - 1;
if ( count( $pages_to_show ) < 5 ) {
$pages_to_show[] = min($pages_to_show) - 1;
$pages_to_show[] = min( $pages_to_show ) - 1;
}
}
}
@@ -526,14 +526,14 @@ if ( ! class_exists( 'um\core\Members' ) ) {
if ( isset( $array['pages_to_show'] ) ) {
if ( $array['total_pages'] < count( $array['pages_to_show'] ) ) {
foreach( $array['pages_to_show'] as $k => $v ) {
foreach ( $array['pages_to_show'] as $k => $v ) {
if ( $v > $array['total_pages'] ) unset( $array['pages_to_show'][$k] );
}
}
foreach( $array['pages_to_show'] as $k => $v ) {
if ( (int)$v <= 0 ) {
unset( $array['pages_to_show'][$k] );
foreach ( $array['pages_to_show'] as $k => $v ) {
if ( (int) $v <= 0 ) {
unset( $array['pages_to_show'][ $k ] );
}
}
includes/core/class-permalinks.php
+7 -2
View File
@@ -132,8 +132,13 @@ if ( ! class_exists( 'um\core\Permalinks' ) ) {
function get_current_url( $no_query_params = false ) {
//use WP native function for fill $_SERVER variables by correct values
wp_fix_server_vars();
$host = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : 'localhost';
//check if WP-CLI there isn't set HTTP_HOST, use localhost instead
if ( defined( 'WP_CLI' ) && WP_CLI ) {
$host = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : 'localhost';
} else {
$host = $_SERVER['HTTP_HOST'];
}
$page_url = ( is_ssl() ? 'https://' : 'http://' ) . $host . $_SERVER['REQUEST_URI'];
if ( $no_query_params == true ) {
includes/um-short-functions.php
+23 -22
View File
@@ -2143,8 +2143,8 @@ function um_user( $data, $attrs = null ) {
$value = maybe_unserialize( $value );
if (in_array( $data, array( 'role', 'gender' ) )) {
if (is_array( $value )) {
if ( in_array( $data, array( 'role', 'gender' ) ) ) {
if ( is_array( $value ) ) {
$value = implode( ",", $value );
}
@@ -2157,7 +2157,7 @@ function um_user( $data, $attrs = null ) {
case 'user_email':
$user_email_in_meta = get_user_meta( um_user( 'ID' ), 'user_email', true );
if ($user_email_in_meta) {
if ( $user_email_in_meta ) {
delete_user_meta( um_user( 'ID' ), 'user_email' );
}
@@ -2203,7 +2203,7 @@ function um_user( $data, $attrs = null ) {
case 'full_name':
if (um_user( 'first_name' ) && um_user( 'last_name' )) {
if ( um_user( 'first_name' ) && um_user( 'last_name' ) ) {
$full_name = um_user( 'first_name' ) . ' ' . um_user( 'last_name' );
} else {
$full_name = um_user( 'display_name' );
@@ -2212,7 +2212,7 @@ function um_user( $data, $attrs = null ) {
$full_name = UM()->validation()->safe_name_in_url( $full_name );
// update full_name changed
if (um_profile( $data ) !== $full_name) {
if ( um_profile( $data ) !== $full_name ) {
update_user_meta( um_user( 'ID' ), 'full_name', $full_name );
}
@@ -2224,7 +2224,7 @@ function um_user( $data, $attrs = null ) {
$f_and_l_initial = '';
if (um_user( 'first_name' ) && um_user( 'last_name' )) {
if ( um_user( 'first_name' ) && um_user( 'last_name' ) ) {
$initial = um_user( 'last_name' );
$f_and_l_initial = um_user( 'first_name' ) . ' ' . $initial[0];
} else {
@@ -2249,47 +2249,46 @@ function um_user( $data, $attrs = null ) {
$name = '';
if ($op == 'default') {
if ( $op == 'default' ) {
$name = um_profile( 'display_name' );
}
if ($op == 'nickname') {
if ( $op == 'nickname' ) {
$name = um_profile( 'nickname' );
}
if ($op == 'full_name') {
if (um_user( 'first_name' ) && um_user( 'last_name' )) {
if ( $op == 'full_name' ) {
if ( um_user( 'first_name' ) && um_user( 'last_name' ) ) {
$name = um_user( 'first_name' ) . ' ' . um_user( 'last_name' );
} else {
$name = um_profile( $data );
}
if (!$name) {
if ( ! $name ) {
$name = um_user( 'user_login' );
}
}
if ($op == 'sur_name') {
if (um_user( 'first_name' ) && um_user( 'last_name' )) {
if ( $op == 'sur_name' ) {
if ( um_user( 'first_name' ) && um_user( 'last_name' ) ) {
$name = um_user( 'last_name' ) . ' ' . um_user( 'first_name' );
} else {
$name = um_profile( $data );
}
}
if ($op == 'first_name') {
if (um_user( 'first_name' )) {
if ( $op == 'first_name' ) {
if ( um_user( 'first_name' ) ) {
$name = um_user( 'first_name' );
} else {
$name = um_profile( $data );
}
}
if ($op == 'username') {
if ( $op == 'username' ) {
$name = um_user( 'user_login' );
}
if ($op == 'initial_name') {
if ( $op == 'initial_name' ) {
if (um_user( 'first_name' ) && um_user( 'last_name' )) {
$initial = um_user( 'last_name' );
$name = um_user( 'first_name' ) . ' ' . $initial[0];
@@ -2298,8 +2297,8 @@ function um_user( $data, $attrs = null ) {
}
}
if ($op == 'initial_name_f') {
if (um_user( 'first_name' ) && um_user( 'last_name' )) {
if ( $op == 'initial_name_f' ) {
if ( um_user( 'first_name' ) && um_user( 'last_name' ) ) {
$initial = um_user( 'first_name' );
$name = $initial[0] . ' ' . um_user( 'last_name' );
} else {
@@ -2315,7 +2314,7 @@ function um_user( $data, $attrs = null ) {
foreach ( $fields as $field ) {
if ( um_profile( $field ) ) {
$name .= um_profile( $field ) . ' ';
} elseif ( um_user( $field ) && $field != 'display_name' ) {
} elseif ( um_user( $field ) && $field != 'display_name' && $field != 'full_name' ) {
$name .= um_user( $field ) . ' ';
}
}
@@ -2426,7 +2425,9 @@ function um_user( $data, $attrs = null ) {
*/
$cover_uri = apply_filters( 'um_user_cover_photo_uri__filter', $cover_uri, $is_default, $attrs );
return $cover_uri ? '<img src="' . esc_attr( $cover_uri ) . '" alt="" />' : '';
$alt = um_profile( 'nickname' );
return $cover_uri ? '<img src="' . esc_attr( $cover_uri ) . '" alt="' . esc_attr( $alt ) . '" />' : '';
break;
languages/ultimate-member-en_US.po
+840 -828
View File
File diff suppressed because it is too large Load Diff
readme.txt
+6
View File
@@ -135,12 +135,18 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
= 2.0.44: April xx, 2019 =
* Enhancements:
- Added automatically template saver when you upgrade your theme
* Bugfixes:
- Added nocache headers to reset password form
- Email templates saving to child theme, if parent theme already has email template files
- Email templates locate in the default plugin folder with active WPML
- Form builder with some predefined form fields, which had different keys/metakeys (currently use the same)
- Logout redirect with active WPML
- Fixed $_SERVER usage when WP-CLI using
- Extended integration for UM field value
- um_user function avoid loop when 'display name' and 'full name' used
* Deprecated:
- "Is Account page?" and "Is User page?" options for WPML integration ( because WPML translations works properly )