| - - | -
- um_user_public_key ) ) { ?>
- - - -
- um_user_public_key; ?> - - - |
-
|---|
| + + | +
+ um_user_public_key ) ) { ?>
+ + + +
+ um_user_public_key; ?> + + + |
+
|---|
'; + /** + * Get last send time + * + * @return mixed|void + */ + private function get_last_send() { + return get_option( 'um_tracking_last_send' ); + } - printf( __( 'Thanks for installing %s! The core plugin is free but we also sell extensions which allow us to continue developing and supporting the plugin full time. If you subscribe to our mailing list (no spam) we will email you a 20%% discount code which you can use to purchase the extensions bundle.', 'ultimate-member' ), ultimatemember_plugin_name, 'https://ultimatemember.com/core-extensions-bundle/' ); - echo '
'; + /** + * Send a report + * + * @param bool $override + */ + public function send_checkin( $override = false ) { - echo '' . __( 'Subscribe to mailing list', 'ultimate-member' ) . ''; - echo ' ' . __( 'No thanks', 'ultimate-member' ) . '
'; + + printf( __( 'Thanks for installing %s! The core plugin is free but we also sell extensions which allow us to continue developing and supporting the plugin full time. If you subscribe to our mailing list (no spam) we will email you a 20%% discount code which you can use to purchase the extensions bundle.', 'ultimate-member' ), ultimatemember_plugin_name, 'https://ultimatemember.com/core-extensions-bundle/' ); + + echo '
'; + + echo '' . __( 'Subscribe to mailing list', 'ultimate-member' ) . ''; + echo ' ' . __( 'No thanks', 'ultimate-member' ) . '
>
-
-
-
-
+ | - | - - | -
|---|
>
+
+
+
+
$val) {
- $new[$key] = $this->toArray($val);
- }
- } else {
- $new = $obj;
- }
-
- return $new;
- }
-
- function get_cached_data( $user_id ) {
-
- $disallow_cache = UM()->options()->get( 'um_profile_object_cache_stop' );
- if( $disallow_cache ){
- return '';
- }
-
- if ( is_numeric( $user_id ) && $user_id > 0 ) {
- $find_user = get_option("um_cache_userdata_{$user_id}");
- if ( $find_user ) {
- /**
- * UM hook
- *
- * @type filter
- * @title um_user_permissions_filter
- * @description Change User Permissions
- * @input_vars
- * [{"var":"$permissions","type":"array","desc":"User Permissions"},
- * {"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $find_user = apply_filters( 'um_user_permissions_filter', $find_user, $user_id );
- return $find_user;
- }
- }
- return '';
- }
-
- function setup_cache( $user_id, $profile ) {
-
- $disallow_cache = UM()->options()->get( 'um_profile_object_cache_stop' );
- if( $disallow_cache ){
- return '';
- }
-
- update_option( "um_cache_userdata_{$user_id}", $profile, false );
- }
-
- function remove_cache( $user_id ) {
- delete_option( "um_cache_userdata_{$user_id}" );
- }
+ /**
+ * Remove cached queue from Users backend
+ */
+ function remove_cached_queue() {
+ delete_option( 'um_cached_users_queue' );
+ }
- /**
- * @function set()
- *
- * @description This method lets you set a user. For example, to retrieve a profile or anything related to that user.
- *
- * @usage user->set( $user_id, $clean = false ); ?>
- *
- * @param $user_id (numeric) (optional) Which user to retrieve. A numeric user ID
- * @param $clean (boolean) (optional) Should be true or false. Basically, if you did not provide a user ID It will set the current logged in user as a profile
- *
- * @returns This API method does not return anything. It sets user profile and permissions and allow you to retrieve any details for that user.
- *
- * @example The following example makes you set a user and retrieve their display name after that using the user API.
+ /**
+ * Converts object to array
+ *
+ * @param $obj
+ *
+ * @return array
+ */
+ function toArray( $obj ) {
+ if ( is_object( $obj ) ) $obj = (array)$obj;
+ if ( is_array( $obj ) ) {
+ $new = array();
+ foreach ( $obj as $key => $val ) {
+ $new[ $key ] = $this->toArray( $val );
+ }
+ } else {
+ $new = $obj;
+ }
- user->set( 12 );
- $display_name = $ultimatemember->user->profile['display_name']; // Should print user display name
- ?>
+ /**
+ * @param $user_id
+ *
+ * @return mixed|string|void
+ */
+ function get_cached_data( $user_id ) {
- *
- *
- */
- function set( $user_id = null, $clean = false ) {
- if ( isset( $this->profile ) ) {
- unset( $this->profile );
- }
+ $disallow_cache = UM()->options()->get( 'um_profile_object_cache_stop' );
+ if( $disallow_cache ){
+ return '';
+ }
- if ( $user_id ) {
- $this->id = $user_id;
- } elseif ( is_user_logged_in() && $clean == false ) {
- $this->id = get_current_user_id();
- } else {
- $this->id = 0;
- }
+ if ( is_numeric( $user_id ) && $user_id > 0 ) {
+ $find_user = get_option("um_cache_userdata_{$user_id}");
+ if ( $find_user ) {
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_user_permissions_filter
+ * @description Change User Permissions
+ * @input_vars
+ * [{"var":"$permissions","type":"array","desc":"User Permissions"},
+ * {"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $find_user = apply_filters( 'um_user_permissions_filter', $find_user, $user_id );
+ return $find_user;
+ }
+ }
+ return '';
+ }
- if ( $this->get_cached_data( $this->id ) ) {
- $this->profile = $this->get_cached_data( $this->id );
- } else {
- if ( $user_id ) {
+ /**
+ * @param $user_id
+ * @param $profile
+ */
+ function setup_cache( $user_id, $profile ) {
- $this->id = $user_id;
- $this->usermeta = get_user_meta( $user_id );
- $this->data = get_userdata( $this->id );
+ $disallow_cache = UM()->options()->get( 'um_profile_object_cache_stop' );
+ if ( $disallow_cache ) {
+ return;
+ }
- } elseif ( is_user_logged_in() && $clean == false ) {
+ update_option( "um_cache_userdata_{$user_id}", $profile, false );
+ }
- $this->id = get_current_user_id();
- $this->usermeta = get_user_meta($this->id);
- $this->data = get_userdata($this->id);
- } else {
+ /**
+ * @param $user_id
+ */
+ function remove_cache( $user_id ) {
+ delete_option( "um_cache_userdata_{$user_id}" );
+ }
- $this->id = 0;
- $this->usermeta = null;
- $this->data = null;
- }
+ /**
+ * This method lets you set a user. For example, to retrieve a profile or anything related to that user.
+ *
+ * @usage user()->set( $user_id, $clean = false ); ?>
+ *
+ * @param null|int $user_id Which user to retrieve. A numeric user ID
+ * @param bool $clean Should be true or false. Basically, if you did not provide a user ID It will set the current logged in user as a profile
+ *
+ * @example The following example makes you set a user and retrieve their display name after that using the user API.
- // we have a user, populate a profile
- if ( $this->id && $this->toArray( $this->data ) ) {
+ data = $this->toArray( $this->data );
+ UM()->user()->set( 12 );
+ $display_name = UM()->user()->profile['display_name']; // Should print user display name
- foreach ( $this->data as $k=>$v ) {
- if ( $k == 'roles') {
- $this->profile['wp_roles'] = implode(',',$v);
- } else if ( is_array( $v ) ) {
- foreach($v as $k2 => $v2){
- $this->profile[$k2] = $v2;
- }
- } else {
- $this->profile[$k] = $v;
- }
- }
+ ?>
+ *
+ */
+ function set( $user_id = null, $clean = false ) {
+ if ( isset( $this->profile ) ) {
+ unset( $this->profile );
+ }
- // add account status
- if ( !isset( $this->usermeta['account_status'][0] ) ) {
- $this->usermeta['account_status'][0] = 'approved';
- }
+ if ( $user_id ) {
+ $this->id = $user_id;
+ } elseif ( is_user_logged_in() && $clean == false ) {
+ $this->id = get_current_user_id();
+ } else {
+ $this->id = 0;
+ }
- if ( $this->usermeta['account_status'][0] == 'approved' ) {
- $this->usermeta['account_status_name'][0] = __('Approved','ultimate-member');
- }
+ if ( $this->get_cached_data( $this->id ) ) {
+ $this->profile = $this->get_cached_data( $this->id );
+ } else {
- if ( $this->usermeta['account_status'][0] == 'awaiting_email_confirmation' ) {
- $this->usermeta['account_status_name'][0] = __('Awaiting E-mail Confirmation','ultimate-member');
- }
+ if ( $user_id ) {
- if ( $this->usermeta['account_status'][0] == 'awaiting_admin_review' ) {
- $this->usermeta['account_status_name'][0] = __('Pending Review','ultimate-member');
- }
+ $this->id = $user_id;
+ $this->usermeta = get_user_meta( $user_id );
+ $this->data = get_userdata( $this->id );
- if ( $this->usermeta['account_status'][0] == 'rejected' ) {
- $this->usermeta['account_status_name'][0] = __('Membership Rejected','ultimate-member');
- }
+ } elseif ( is_user_logged_in() && $clean == false ) {
- if ( $this->usermeta['account_status'][0] == 'inactive' ) {
- $this->usermeta['account_status_name'][0] = __('Membership Inactive','ultimate-member');
- }
+ $this->id = get_current_user_id();
+ $this->usermeta = get_user_meta($this->id);
+ $this->data = get_userdata($this->id);
- // add user meta
- foreach( $this->usermeta as $k=>$v ) {
- if ( $k == 'display_name') continue;
- $this->profile[$k] = $v[0];
- }
+ } else {
- // add permissions
- $user_role = UM()->roles()->get_priority_user_role( $this->id );
- $this->profile['role'] = $user_role;
- $this->profile['roles'] = UM()->roles()->get_all_user_roles( $this->id );
+ $this->id = 0;
+ $this->usermeta = null;
+ $this->data = null;
- $role_meta = UM()->roles()->role_data( $user_role );
- /**
- * UM hook
- *
- * @type filter
- * @title um_user_permissions_filter
- * @description Change User Permissions
- * @input_vars
- * [{"var":"$permissions","type":"array","desc":"User Permissions"},
- * {"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $role_meta = apply_filters( 'um_user_permissions_filter', $role_meta, $this->id );
+ }
- /*$role_meta = array_map( function( $key, $item ) {
+ // we have a user, populate a profile
+ if ( $this->id && $this->toArray( $this->data ) ) {
+
+ // add user data
+ $this->data = $this->toArray( $this->data );
+
+ foreach ( $this->data as $k=>$v ) {
+ if ( $k == 'roles') {
+ $this->profile['wp_roles'] = implode(',',$v);
+ } else if ( is_array( $v ) ) {
+ foreach($v as $k2 => $v2){
+ $this->profile[$k2] = $v2;
+ }
+ } else {
+ $this->profile[$k] = $v;
+ }
+ }
+
+ // add account status
+ if ( !isset( $this->usermeta['account_status'][0] ) ) {
+ $this->usermeta['account_status'][0] = 'approved';
+ }
+
+ if ( $this->usermeta['account_status'][0] == 'approved' ) {
+ $this->usermeta['account_status_name'][0] = __('Approved','ultimate-member');
+ }
+
+ if ( $this->usermeta['account_status'][0] == 'awaiting_email_confirmation' ) {
+ $this->usermeta['account_status_name'][0] = __('Awaiting E-mail Confirmation','ultimate-member');
+ }
+
+ if ( $this->usermeta['account_status'][0] == 'awaiting_admin_review' ) {
+ $this->usermeta['account_status_name'][0] = __('Pending Review','ultimate-member');
+ }
+
+ if ( $this->usermeta['account_status'][0] == 'rejected' ) {
+ $this->usermeta['account_status_name'][0] = __('Membership Rejected','ultimate-member');
+ }
+
+ if ( $this->usermeta['account_status'][0] == 'inactive' ) {
+ $this->usermeta['account_status_name'][0] = __('Membership Inactive','ultimate-member');
+ }
+
+ // add user meta
+ foreach( $this->usermeta as $k=>$v ) {
+ if ( $k == 'display_name') continue;
+ $this->profile[$k] = $v[0];
+ }
+
+ // add permissions
+ $user_role = UM()->roles()->get_priority_user_role( $this->id );
+ $this->profile['role'] = $user_role;
+ $this->profile['roles'] = UM()->roles()->get_all_user_roles( $this->id );
+
+ $role_meta = UM()->roles()->role_data( $user_role );
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_user_permissions_filter
+ * @description Change User Permissions
+ * @input_vars
+ * [{"var":"$permissions","type":"array","desc":"User Permissions"},
+ * {"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $role_meta = apply_filters( 'um_user_permissions_filter', $role_meta, $this->id );
+
+ /*$role_meta = array_map( function( $key, $item ) {
if ( strpos( $key, '_um_' ) === 0 )
$key = str_replace( '_um_', '', $key );
return array( $key => $item );
}, array_keys( $role_meta ), $role_meta );*/
- $this->profile = array_merge( $this->profile, (array)$role_meta );
-
- $this->profile['super_admin'] = ( is_super_admin( $this->id ) ) ? 1 : 0;
-
- // clean profile
- $this->clean();
-
- // Setup cache
- $this->setup_cache( $this->id, $this->profile );
-
- }
-
- }
-
- }
-
- /***
- *** @reset user data
- ***/
- function reset( $clean = false ){
- $this->set(0, $clean);
- }
-
- /***
- *** @Clean user profile
- ***/
- function clean(){
- foreach($this->profile as $key => $value){
- foreach($this->banned_keys as $ban){
- if (strstr($key, $ban) || is_numeric($key) )
- unset($this->profile[$key]);
- }
- }
- }
-
- /**
- * @function auto_login()
- *
- * @description This method lets you auto sign-in a user to your site.
- *
- * @usage user->auto_login( $user_id, $rememberme = false ); ?>
- *
- * @param $user_id (numeric) (required) Which user ID to sign in automatically
- * @param $rememberme (boolean) (optional) Should be true or false. If you want the user sign in session to use cookies, use true
- *
- * @returns Sign in the specified user automatically.
- *
- * @example The following example lets you sign in a user automatically by their ID.
-
- user->auto_login( 2 ); ?>
-
- *
- *
- * @example The following example lets you sign in a user automatically by their ID and makes the plugin remember their session.
-
- user->auto_login( 10, true ); ?>
-
- *
- *
- */
- function auto_login( $user_id, $rememberme = 0 ) {
-
- wp_set_current_user( $user_id );
-
- wp_set_auth_cookie( $user_id, $rememberme );
-
- $user = get_user_by('ID', $user_id );
-
- do_action( 'wp_login', $user->user_login, $user );
-
- }
-
- /***
- *** @Set user's registration details
- ***/
- function set_registration_details( $submitted ) {
-
- if ( isset( $submitted['user_pass'] ) ) {
- unset( $submitted['user_pass'] );
- }
-
- if ( isset( $submitted['user_password'] ) ) {
- unset( $submitted['user_password'] );
- }
-
- if ( isset( $submitted['confirm_user_password'] ) ) {
- unset( $submitted['confirm_user_password'] );
- }
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_before_save_filter_submitted
- * @description Change submitted data before save usermeta "submitted" on registration process
- * @input_vars
- * [{"var":"$submitted","type":"array","desc":"Submitted data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $submitted = apply_filters( 'um_before_save_filter_submitted', $submitted );
-
- /**
- * UM hook
- *
- * @type action
- * @title um_before_save_registration_details
- * @description Action on user registration before save details
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$submitted","type":"array","desc":"Registration form submitted"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_before_save_registration_details', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( 'um_before_save_registration_details', $this->id, $submitted );
-
- update_user_meta( $this->id, 'submitted', $submitted );
-
- $this->update_profile( $submitted );
- /**
- * UM hook
- *
- * @type action
- * @title um_after_save_registration_details
- * @description Action on user registration after save details
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$submitted","type":"array","desc":"Registration form submitted"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_after_save_registration_details', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( 'um_after_save_registration_details', $this->id, $submitted );
-
- }
-
-
- /**
- * A plain version of password
- *
- * @param $plain
- */
- function set_plain_password( $plain ) {
- update_user_meta( $this->id, '_um_cool_but_hard_to_guess_plain_pw', $plain );
- }
-
-
- /**
- * Set last login for new registered users
- */
- function set_last_login() {
- update_user_meta( $this->id, '_um_last_login', current_time( 'timestamp' ) );
- }
-
-
- /**
- * Set user's account status
- *
- * @param $status
- */
- function set_status( $status ) {
-
- /**
- * UM hook
- *
- * @type action
- * @title um_when_status_is_set
- * @description Action on user status changed
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_when_status_is_set', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_when_status_is_set', um_user( 'ID' ) );
-
- $this->profile['account_status'] = $status;
-
- $this->update_usermeta_info( 'account_status' );
-
- /**
- * UM hook
- *
- * @type action
- * @title um_after_user_status_is_changed_hook
- * @description Action after user status changed
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_after_user_status_is_changed_hook', 'function_name', 10 );
- * @example
- *
- */
- do_action( 'um_after_user_status_is_changed_hook' );
-
- /**
- * UM hook
- *
- * @type action
- * @title um_after_user_status_is_changed
- * @description Action after user status changed
- * @input_vars
- * [{"var":"$status","type":"string","desc":"User Status"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_after_user_status_is_changed', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_after_user_status_is_changed', $status );
-
- }
-
- /***
- *** @Set user's hash for password reset
- ***/
- function password_reset_hash(){
- $this->profile['reset_pass_hash'] = UM()->validation()->generate();
- $this->update_usermeta_info('reset_pass_hash');
-
- }
-
- /***
- *** @Set user's hash
- ***/
- function assign_secretkey() {
- /**
- * UM hook
- *
- * @type action
- * @title um_before_user_hash_is_changed
- * @description Action before user hash is changed
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_before_user_hash_is_changed', 'function_name', 10 );
- * @example
- *
- */
- do_action( 'um_before_user_hash_is_changed' );
-
- $this->profile['account_secret_hash'] = UM()->validation()->generate();
- $this->update_usermeta_info( 'account_secret_hash' );
- /**
- * UM hook
- *
- * @type action
- * @title um_after_user_hash_is_changed
- * @description Action after user hash is changed
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_after_user_hash_is_changed', 'function_name', 10 );
- * @example
- *
- */
- do_action( 'um_after_user_hash_is_changed' );
-
- }
-
- /***
- *** @password reset email
- ***/
- function password_reset(){
- $this->password_reset_hash();
- UM()->mail()->send( um_user('user_email'), 'resetpw_email' );
- }
-
-
- /***
- *** @password changed email
- ***/
- function password_changed(){
- UM()->mail()->send( um_user('user_email'), 'changedpw_email' );
- }
-
- /**
- * @function approve()
- *
- * @description This method approves a user membership and sends them an optional welcome/approval e-mail.
- *
- * @usage user->approve(); ?>
- *
- * @returns Approves a user membership.
- *
- * @example Approve a pending user and allow him to sign-in to your site.
-
- user->approve();
-
- ?>
-
- *
- *
- */
- function approve(){
- $user_id = um_user('ID');
- delete_option( "um_cache_userdata_{$user_id}" );
-
- if ( um_user('account_status') == 'awaiting_admin_review' ) {
- $this->password_reset_hash();
- UM()->mail()->send( um_user('user_email'), 'approved_email' );
-
- } else {
- $this->password_reset_hash();
- UM()->mail()->send( um_user('user_email'), 'welcome_email');
- }
-
- $this->set_status('approved');
- $this->delete_meta('account_secret_hash');
- $this->delete_meta('_um_cool_but_hard_to_guess_plain_pw');
-
- /**
- * UM hook
- *
- * @type action
- * @title um_after_user_is_approved
- * @description Action after user was approved
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_after_user_is_approved', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_after_user_is_approved', um_user( 'ID' ) );
- }
-
- /***
- *** @pending email
- ***/
- function email_pending() {
- $this->assign_secretkey();
- $this->set_status('awaiting_email_confirmation');
- UM()->mail()->send( um_user('user_email'), 'checkmail_email' );
- }
-
- /**
- * @function pending()
- *
- * @description This method puts a user under manual review by administrator and sends them an optional e-mail.
- *
- * @usage user->pending(); ?>
- *
- * @returns Puts a user under review and sends them an email optionally.
- *
- * @example An example of putting a user pending manual review
-
- user->pending();
-
- ?>
-
- *
- *
- */
- function pending() {
- $this->set_status( 'awaiting_admin_review' );
- UM()->mail()->send( um_user( 'user_email' ), 'pending_email' );
- }
-
- /**
- * @function reject()
- *
- * @description This method rejects a user membership and sends them an optional e-mail.
- *
- * @usage user->reject(); ?>
- *
- * @returns Rejects a user membership.
- *
- * @example Reject a user membership example
-
- user->reject();
-
- ?>
-
- *
- *
- */
- function reject(){
- $this->set_status('rejected');
- UM()->mail()->send( um_user('user_email'), 'rejected_email' );
- }
-
- /**
- * @function deactivate()
- *
- * @description This method deactivates a user membership and sends them an optional e-mail.
- *
- * @usage user->deactivate(); ?>
- *
- * @returns Deactivates a user membership.
- *
- * @example Deactivate a user membership with the following example
-
- user->deactivate();
-
- ?>
-
- *
- *
- */
- function deactivate(){
- $this->set_status( 'inactive' );
- /**
- * UM hook
- *
- * @type action
- * @title um_after_user_is_inactive
- * @description Action after user was inactive
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_after_user_is_inactive', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_after_user_is_inactive', um_user( 'ID' ) );
-
- UM()->mail()->send( um_user( 'user_email' ), 'inactive_email' );
- }
-
-
- /***
- *** @delete user
- ***/
- function delete( $send_mail = true ) {
- /**
- * UM hook
- *
- * @type action
- * @title um_delete_user_hook
- * @description On delete user
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_delete_user_hook', 'function_name', 10 );
- * @example
- *
- */
- do_action( 'um_delete_user_hook' );
- /**
- * UM hook
- *
- * @type action
- * @title um_delete_user
- * @description On delete user
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_delete_user', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_delete_user', um_user( 'ID' ) );
-
- // send email notifications
- if ( $send_mail ) {
- UM()->mail()->send( um_user('user_email'), 'deletion_email' );
- UM()->mail()->send( um_admin_email(), 'notification_deletion', array('admin' => true ) );
- }
-
- // remove uploads
- UM()->files()->remove_dir( um_user_uploads_dir() );
-
- // remove user
- if ( is_multisite() ) {
-
- if ( !function_exists('wpmu_delete_user') ) {
- require_once( ABSPATH . 'wp-admin/includes/ms.php' );
- }
-
- wpmu_delete_user( $this->id );
-
- } else {
-
- if ( !function_exists('wp_delete_user') ) {
- require_once( ABSPATH . 'wp-admin/includes/user.php' );
- }
-
- wp_delete_user( $this->id );
-
- }
-
- }
-
- /**
- * @function get_role()
- *
- * @description This method gets a user role in slug format. e.g. member
- *
- * @usage user->get_role(); ?>
- *
- * @returns The user role's slug.
- *
- * @example Do something if the user's role is paid-member
-
- user->get_role() == 'paid-member' ) {
- // Show this to paid customers
- } else {
- // You are a free member
- }
-
- ?>
-
- *
- *
- */
- function get_role() {
- if ( ! empty( $this->profile['role'] ) ) {
- return $this->profile['role'];
- } else {
- if ( $this->profile['wp_roles'] == 'administrator' ) {
- return 'admin';
- } else {
- return 'member';
- }
- }
- }
-
-
- /***
- *** @Update one key in user meta
- ***/
- function update_usermeta_info( $key ) {
- // delete the key first just in case
- delete_user_meta( $this->id, $key );
- update_user_meta( $this->id, $key, $this->profile[$key] );
- }
-
- /**
- * @function delete_meta()
- *
- * @description This method can be used to delete user's meta key.
- *
- * @usage user->delete_meta( $key ); ?>
- *
- * @param $key (string) (required) The meta field key to remove from user
- *
- * @returns This method will not return anything. The specified meta key will be deleted from database for the specified user.
- *
- * @example Delete user's age field
-
- user->delete_meta( 'age' );
-
- ?>
-
- *
- *
- */
- function delete_meta( $key ){
- delete_user_meta( $this->id, $key );
- }
-
-
- /***
- *** @Get admin actions for individual user
- ***/
- function get_admin_actions() {
- $items = array();
- $actions = array();
- /**
- * UM hook
- *
- * @type filter
- * @title um_admin_user_actions_hook
- * @description Extend admin actions for each user
- * @input_vars
- * [{"var":"$actions","type":"array","desc":"Actions for user"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $actions = apply_filters('um_admin_user_actions_hook', $actions );
- if ( !isset( $actions ) || empty( $actions ) ) return false;
- foreach($actions as $id => $arr ) {
- $url = add_query_arg('um_action', $id );
- $url = add_query_arg('uid', um_profile_id(), $url );
- $items[] = '' . $arr['label'] . '';
- }
- return $items;
- }
-
- /**
- * @function is_private_profile()
- *
- * @description This method checks if give user profile is private.
- *
- * @usage user->is_private_profile( $user_id ); ?>
- *
- * @param $user_id (numeric) (required) A user ID must be passed to check if the user profile is private
- *
- * @returns Returns true if user profile is private and false if user profile is public.
- *
- * @example This example display a specific user's name If his profile is public
-
- user->is_private_profile( 60 );
- if ( !$is_private ) {
- echo 'User is public and his name is ' . um_user('display_name');
- }
-
- ?>
-
- *
- *
- */
- function is_private_profile( $user_id ) {
- $privacy = get_user_meta( $user_id, 'profile_privacy', true );
- if ( $privacy == __('Only me','ultimate-member') ) {
- return true;
- }
- return false;
- }
-
- /**
- * @function is_approved()
- *
- * @description This method can be used to determine If a certain user is approved or not.
- *
- * @usage user->is_approved( $user_id ); ?>
- *
- * @param $user_id (numeric) (required) The user ID to check approval status for
- *
- * @returns True if user is approved and false if user is not approved.
- *
- * @example Do something If a user's membership is approved
-
- user->is_approved( 55 ) {
- // User account is approved
- } else {
- // User account is not approved
- }
-
- ?>
-
- *
- *
- */
- function is_approved( $user_id ) {
- $status = get_user_meta( $user_id, 'account_status', true );
- if ( $status == 'approved' || $status == '' ) {
- return true;
- }
- return false;
- }
-
- /***
- *** @Is private
- ***/
- function is_private_case( $user_id, $case ) {
- $privacy = get_user_meta( $user_id, 'profile_privacy', true );
-
- if ( $privacy == $case ) {
- /**
- * UM hook
- *
- * @type filter
- * @title um_is_private_filter_hook
- * @description Change user privacy
- * @input_vars
- * [{"var":"$is_private","type":"bool","desc":"Is user private"},
- * {"var":"$privacy","type":"bool","desc":"Profile Privacy"},
- * {"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $bool = apply_filters( 'um_is_private_filter_hook', false, $privacy, $user_id );
- return $bool;
- }
-
- return false;
- }
-
- /***
- *** @update files
- ***/
- function update_files( $changes ) {
-
- foreach( $changes as $key => $uri ) {
- $src = um_is_temp_upload( $uri );
- UM()->files()->new_user_upload( $this->id, $src, $key );
- }
-
- }
-
-
- /***
- *** @update profile
- ***/
- function update_profile( $changes ) {
-
- $args['ID'] = $this->id;
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_before_update_profile
- * @description Change update profile changes data
- * @input_vars
- * [{"var":"$changes","type":"array","desc":"User Profile Changes"},
- * {"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $changes = apply_filters('um_before_update_profile', $changes, $this->id );
-
- // save or update profile meta
- foreach ( $changes as $key => $value ) {
- if ( ! in_array( $key, $this->update_user_keys ) ) {
-
- update_user_meta( $this->id, $key, $value );
-
- } else {
-
- $args[$key] = esc_attr( $changes[$key] );
-
- }
-
- }
- // update user
- if ( count( $args ) > 1 ) {
- global $wp_roles;
- $um_roles = get_option( 'um_roles' );
-
- if ( ! empty( $um_roles ) ) {
- $role_keys = array_map( function( $item ) {
- return 'um_' . $item;
- }, get_option( 'um_roles' ) );
- } else {
- $role_keys = array();
- }
-
- $exclude_roles = array_diff( array_keys( $wp_roles->roles ), array_merge( $role_keys, array( 'subscriber' ) ) );
-
- if ( isset( $args['role'] ) && in_array( $args['role'], $exclude_roles ) ) {
- unset( $args['role'] );
- }
-
- wp_update_user( $args );
- }
-
- }
-
- /***
- *** @user exists by meta key and value
- ***/
- function user_has_metadata( $key, $value ) {
-
- $value = UM()->validation()->safe_name_in_url( $value );
-
- $ids = get_users(array( 'fields' => 'ID', 'meta_key' => $key,'meta_value' => $value,'meta_compare' => '=') );
- if ( !isset( $ids ) || empty( $ids ) ) return false;
- foreach( $ids as $k => $id ) {
- if ( $id == um_user('ID') ){
- unset( $ids[$k] );
- } else {
- $duplicates[] = $id;
- }
- }
- if ( isset( $duplicates ) && !empty( $duplicates ) )
- return count( $duplicates );
- return false;
- }
-
-
- /***
- *** @user exists by name
- ***/
- function user_exists_by_name( $value ) {
-
- // Permalink base
- $permalink_base = UM()->options()->get( 'permalink_base' );
-
- $raw_value = $value;
- $value = UM()->validation()->safe_name_in_url( $value );
- $value = um_clean_user_basename( $value );
-
- // Search by Profile Slug
- $args = array(
- "fields" => array("ID"),
- 'meta_query' => array(
- 'relation' => 'OR',
- array(
- 'key' => 'um_user_profile_url_slug_'.$permalink_base,
- 'value' => strtolower( $raw_value ),
- 'compare' => '='
-
- )
-
- )
- );
-
-
- $ids = new \WP_User_Query( $args );
-
- if( $ids->total_users > 0 ){
- $um_user_query = current( $ids->get_results() );
- return $um_user_query->ID;
- }
-
- // Search by Display Name or ID
- $args = array(
- "fields" => array("ID"),
- "search" => $value,
- 'search_columns' => array( 'display_name','ID' )
- );
-
- $ids = new \WP_User_Query( $args );
-
- if( $ids->total_users > 0 ){
- $um_user_query = current( $ids->get_results() );
- return $um_user_query->ID;
- }
-
-
- // Search By User Login
- $value = str_replace(".", "_", $value );
- $value = str_replace(" ", "", $value );
-
- $args = array(
- "fields" => array("ID"),
- "search" => $value,
- 'search_columns' => array(
- 'user_login',
- )
- );
-
- $ids = new \WP_User_Query( $args );
-
- if( $ids->total_users > 0 ){
- $um_user_query = current( $ids->get_results() );
- return $um_user_query->ID;
- }
-
- return false;
- }
-
-
- /**
- * @function user_exists_by_id()
- *
- * @description This method checks if a user exists or not in your site based on the user ID.
- *
- * @usage user->user_exists_by_id( $user_id ); ?>
- *
- * @param $user_id (numeric) (required) A user ID must be passed to check if the user exists
- *
- * @returns Returns true if user exists and false if user does not exist.
- *
- * @example Basic Usage
-
- user->user_exists_by_id( 15 );
- if ( $boolean ) {
- // That user exists
- }
-
- ?>
-
- *
- *
- */
- function user_exists_by_id( $user_id ) {
- $aux = get_userdata( intval( $user_id ) );
- if($aux==false){
- return false;
- } else {
- return $user_id;
- }
- }
-
-
- /**
- * @function user_exists_by_email_as_username()
- *
- * @description This method checks if a user exists or not in your site based on the user email as username
- *
- * @usage user->user_exists_by_email_as_username( $slug ); ?>
- *
- * @param $slug (string) (required) A user slug must be passed to check if the user exists
- *
- * @returns Returns true if user exists and false if user does not exist.
- *
- * @example Basic Usage
-
- user->user_exists_by_email_as_username( 'calumgmail-com' );
- if ( $boolean ) {
- // That user exists
- }
-
- ?>
-
- *
- *
- */
- function user_exists_by_email_as_username( $slug ){
-
- $user_id = false;
-
- $ids = get_users( array( 'fields' => 'ID', 'meta_key' => 'um_email_as_username_'.$slug ) );
- if ( isset( $ids[0] ) && ! empty( $ids[0] ) ){
- $user_id = $ids[0];
- }
-
- return $user_id;
- }
-
-
- /**
- * Set gravatar hash id
- *
- * @param $user_id
- * @return string
- */
- function set_gravatar( $user_id ) {
-
- um_fetch_user( $user_id );
- $email_address = um_user( 'user_email' );
- $hash_email_address = '';
-
- if ( $email_address ) {
- $hash_email_address = md5( $email_address );
- $this->profile['synced_gravatar_hashed_id'] = $hash_email_address;
- $this->update_usermeta_info( 'synced_gravatar_hashed_id' );
- }
-
- return $hash_email_address;
- }
-
- }
+ $this->profile = array_merge( $this->profile, (array)$role_meta );
+
+ $this->profile['super_admin'] = ( is_super_admin( $this->id ) ) ? 1 : 0;
+
+ // clean profile
+ $this->clean();
+
+ // Setup cache
+ $this->setup_cache( $this->id, $this->profile );
+
+ }
+
+ }
+
+ }
+
+
+ /**
+ * Reset user data
+ *
+ * @param bool $clean
+ */
+ function reset( $clean = false ){
+ $this->set(0, $clean);
+ }
+
+
+ /**
+ * Clean user profile
+ */
+ function clean() {
+ foreach($this->profile as $key => $value){
+ foreach($this->banned_keys as $ban){
+ if (strstr($key, $ban) || is_numeric($key) )
+ unset($this->profile[$key]);
+ }
+ }
+ }
+
+
+ /**
+ * This method lets you auto sign-in a user to your site.
+ *
+ * @usage user()->auto_login( $user_id, $rememberme = false ); ?>
+ *
+ * @param int $user_id Which user ID to sign in automatically
+ * @param int|bool $rememberme Should be true or false. If you want the user sign in session to use cookies, use true
+ *
+ * @example The following example lets you sign in a user automatically by their ID.
+
+ user()->auto_login( 2 ); ?>
+ *
+ *
+ * @example The following example lets you sign in a user automatically by their ID and makes the plugin remember their session.
+
+ user()->auto_login( 10, true ); ?>
+ *
+ */
+ function auto_login( $user_id, $rememberme = 0 ) {
+
+ wp_set_current_user( $user_id );
+
+ wp_set_auth_cookie( $user_id, $rememberme );
+
+ $user = get_user_by('ID', $user_id );
+
+ do_action( 'wp_login', $user->user_login, $user );
+
+ }
+
+
+ /**
+ * Set user's registration details
+ *
+ * @param $submitted
+ */
+ function set_registration_details( $submitted ) {
+
+ if ( isset( $submitted['user_pass'] ) ) {
+ unset( $submitted['user_pass'] );
+ }
+
+ if ( isset( $submitted['user_password'] ) ) {
+ unset( $submitted['user_password'] );
+ }
+
+ if ( isset( $submitted['confirm_user_password'] ) ) {
+ unset( $submitted['confirm_user_password'] );
+ }
+
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_before_save_filter_submitted
+ * @description Change submitted data before save usermeta "submitted" on registration process
+ * @input_vars
+ * [{"var":"$submitted","type":"array","desc":"Submitted data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $submitted = apply_filters( 'um_before_save_filter_submitted', $submitted );
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_before_save_registration_details
+ * @description Action on user registration before save details
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$submitted","type":"array","desc":"Registration form submitted"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_before_save_registration_details', 'function_name', 10, 2 );
+ * @example
+ *
+ */
+ do_action( 'um_before_save_registration_details', $this->id, $submitted );
+
+ update_user_meta( $this->id, 'submitted', $submitted );
+
+ $this->update_profile( $submitted );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_after_save_registration_details
+ * @description Action on user registration after save details
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$submitted","type":"array","desc":"Registration form submitted"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_after_save_registration_details', 'function_name', 10, 2 );
+ * @example
+ *
+ */
+ do_action( 'um_after_save_registration_details', $this->id, $submitted );
+
+ }
+
+
+ /**
+ * A plain version of password
+ *
+ * @param $plain
+ */
+ function set_plain_password( $plain ) {
+ update_user_meta( $this->id, '_um_cool_but_hard_to_guess_plain_pw', $plain );
+ }
+
+
+ /**
+ * Set last login for new registered users
+ */
+ function set_last_login() {
+ update_user_meta( $this->id, '_um_last_login', current_time( 'timestamp' ) );
+ }
+
+
+ /**
+ * Set user's account status
+ *
+ * @param $status
+ */
+ function set_status( $status ) {
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_when_status_is_set
+ * @description Action on user status changed
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_when_status_is_set', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_when_status_is_set', um_user( 'ID' ) );
+
+ $this->profile['account_status'] = $status;
+
+ $this->update_usermeta_info( 'account_status' );
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_after_user_status_is_changed_hook
+ * @description Action after user status changed
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_after_user_status_is_changed_hook', 'function_name', 10 );
+ * @example
+ *
+ */
+ do_action( 'um_after_user_status_is_changed_hook' );
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_after_user_status_is_changed
+ * @description Action after user status changed
+ * @input_vars
+ * [{"var":"$status","type":"string","desc":"User Status"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_after_user_status_is_changed', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_after_user_status_is_changed', $status );
+
+ }
+
+
+ /**
+ * Set user's hash for password reset
+ */
+ function password_reset_hash() {
+ $this->profile['reset_pass_hash'] = UM()->validation()->generate();
+ $this->update_usermeta_info('reset_pass_hash');
+ }
+
+
+ /**
+ * Set user's hash
+ */
+ function assign_secretkey() {
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_before_user_hash_is_changed
+ * @description Action before user hash is changed
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_before_user_hash_is_changed', 'function_name', 10 );
+ * @example
+ *
+ */
+ do_action( 'um_before_user_hash_is_changed' );
+
+ $this->profile['account_secret_hash'] = UM()->validation()->generate();
+ $this->update_usermeta_info( 'account_secret_hash' );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_after_user_hash_is_changed
+ * @description Action after user hash is changed
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_after_user_hash_is_changed', 'function_name', 10 );
+ * @example
+ *
+ */
+ do_action( 'um_after_user_hash_is_changed' );
+ }
+
+
+ /**
+ * Password reset email
+ */
+ function password_reset() {
+ $this->password_reset_hash();
+ UM()->mail()->send( um_user('user_email'), 'resetpw_email' );
+ }
+
+
+ /**
+ * Password changed email
+ */
+ function password_changed(){
+ UM()->mail()->send( um_user('user_email'), 'changedpw_email' );
+ }
+
+
+ /**
+ * This method approves a user membership and sends them an optional welcome/approval e-mail.
+ *
+ * @usage user()->approve(); ?>
+ *
+ * @example Approve a pending user and allow him to sign-in to your site.
+
+ user()->approve();
+
+ ?>
+ *
+ */
+ function approve() {
+ $user_id = um_user('ID');
+ delete_option( "um_cache_userdata_{$user_id}" );
+
+ if ( um_user('account_status') == 'awaiting_admin_review' ) {
+ $this->password_reset_hash();
+ UM()->mail()->send( um_user('user_email'), 'approved_email' );
+
+ } else {
+ $this->password_reset_hash();
+ UM()->mail()->send( um_user('user_email'), 'welcome_email');
+ }
+
+ $this->set_status('approved');
+ $this->delete_meta('account_secret_hash');
+ $this->delete_meta('_um_cool_but_hard_to_guess_plain_pw');
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_after_user_is_approved
+ * @description Action after user was approved
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_after_user_is_approved', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_after_user_is_approved', um_user( 'ID' ) );
+ }
+
+
+ /**
+ * Pending email
+ */
+ function email_pending() {
+ $this->assign_secretkey();
+ $this->set_status('awaiting_email_confirmation');
+ UM()->mail()->send( um_user('user_email'), 'checkmail_email' );
+ }
+
+
+ /**
+ * This method puts a user under manual review by administrator and sends them an optional e-mail.
+ *
+ * @usage user()->pending(); ?>
+ *
+ * @example An example of putting a user pending manual review
+
+ user()->pending();
+
+ ?>
+ *
+ */
+ function pending() {
+ $this->set_status( 'awaiting_admin_review' );
+ UM()->mail()->send( um_user( 'user_email' ), 'pending_email' );
+ }
+
+
+ /**
+ * This method rejects a user membership and sends them an optional e-mail.
+ *
+ * @usage user()->reject(); ?>
+ *
+ * @example Reject a user membership example
+
+ user()->reject();
+
+ ?>
+
+ *
+ */
+ function reject() {
+ $this->set_status('rejected');
+ UM()->mail()->send( um_user('user_email'), 'rejected_email' );
+ }
+
+
+ /**
+ * This method deactivates a user membership and sends them an optional e-mail.
+ *
+ * @usage user()->deactivate(); ?>
+ *
+ * @example Deactivate a user membership with the following example
+
+ user->deactivate();
+
+ ?>
+ *
+ */
+ function deactivate() {
+ $this->set_status( 'inactive' );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_after_user_is_inactive
+ * @description Action after user was inactive
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_after_user_is_inactive', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_after_user_is_inactive', um_user( 'ID' ) );
+
+ UM()->mail()->send( um_user( 'user_email' ), 'inactive_email' );
+ }
+
+
+ /**
+ * Delete user
+ *
+ * @param bool $send_mail
+ */
+ function delete( $send_mail = true ) {
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_delete_user_hook
+ * @description On delete user
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_delete_user_hook', 'function_name', 10 );
+ * @example
+ *
+ */
+ do_action( 'um_delete_user_hook' );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_delete_user
+ * @description On delete user
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_delete_user', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_delete_user', um_user( 'ID' ) );
+
+ // send email notifications
+ if ( $send_mail ) {
+ UM()->mail()->send( um_user('user_email'), 'deletion_email' );
+ UM()->mail()->send( um_admin_email(), 'notification_deletion', array('admin' => true ) );
+ }
+
+ // remove uploads
+ UM()->files()->remove_dir( um_user_uploads_dir() );
+
+ // remove user
+ if ( is_multisite() ) {
+
+ if ( !function_exists('wpmu_delete_user') ) {
+ require_once( ABSPATH . 'wp-admin/includes/ms.php' );
+ }
+
+ wpmu_delete_user( $this->id );
+
+ } else {
+
+ if ( !function_exists('wp_delete_user') ) {
+ require_once( ABSPATH . 'wp-admin/includes/user.php' );
+ }
+
+ wp_delete_user( $this->id );
+
+ }
+
+ }
+
+
+ /**
+ * This method gets a user role in slug format. e.g. member
+ *
+ * @usage user()->get_role(); ?>
+ *
+ * @return string
+ *
+ * @example Do something if the user's role is paid-member
+
+ user()->get_role() == 'paid-member' ) {
+ // Show this to paid customers
+ } else {
+ // You are a free member
+ }
+
+ ?>
+ *
+ */
+ function get_role() {
+ if ( ! empty( $this->profile['role'] ) ) {
+ return $this->profile['role'];
+ } else {
+ if ( $this->profile['wp_roles'] == 'administrator' ) {
+ return 'admin';
+ } else {
+ return 'member';
+ }
+ }
+ }
+
+
+ /**
+ * Update one key in user meta
+ *
+ * @param $key
+ */
+ function update_usermeta_info( $key ) {
+ // delete the key first just in case
+ delete_user_meta( $this->id, $key );
+ update_user_meta( $this->id, $key, $this->profile[$key] );
+ }
+
+
+ /**
+ * This method can be used to delete user's meta key.
+ *
+ * @usage user()->delete_meta( $key ); ?>
+ *
+ * @param string $key The meta field key to remove from user
+ *
+ * @example Delete user's age field
+
+ user()->delete_meta( 'age' );
+
+ ?>
+
+ *
+ */
+ function delete_meta( $key ){
+ delete_user_meta( $this->id, $key );
+ }
+
+
+ /**
+ * Get admin actions for individual user
+ *
+ * @return array|bool
+ */
+ function get_admin_actions() {
+ $items = array();
+ $actions = array();
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_admin_user_actions_hook
+ * @description Extend admin actions for each user
+ * @input_vars
+ * [{"var":"$actions","type":"array","desc":"Actions for user"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $actions = apply_filters('um_admin_user_actions_hook', $actions );
+ if ( !isset( $actions ) || empty( $actions ) ) return false;
+ foreach($actions as $id => $arr ) {
+ $url = add_query_arg('um_action', $id );
+ $url = add_query_arg('uid', um_profile_id(), $url );
+ $items[] = '' . $arr['label'] . '';
+ }
+ return $items;
+ }
+
+
+ /**
+ * This method checks if give user profile is private.
+ *
+ * @usage user()->is_private_profile( $user_id ); ?>
+ *
+ * @param int $user_id A user ID must be passed to check if the user profile is private
+ *
+ * @return bool
+ *
+ * @example This example display a specific user's name If his profile is public
+
+ user()->is_private_profile( 60 );
+ if ( ! $is_private ) {
+ echo 'User is public and his name is ' . um_user('display_name');
+ }
+
+ ?>
+ *
+ */
+ function is_private_profile( $user_id ) {
+ $privacy = get_user_meta( $user_id, 'profile_privacy', true );
+ if ( $privacy == __('Only me','ultimate-member') ) {
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * This method can be used to determine If a certain user is approved or not.
+ *
+ * @usage user()->is_approved( $user_id ); ?>
+ *
+ * @param int $user_id The user ID to check approval status for
+ *
+ * @return bool
+ *
+ * @example Do something If a user's membership is approved
+
+ user()->is_approved( 55 ) {
+ // User account is approved
+ } else {
+ // User account is not approved
+ }
+
+ ?>
+ *
+ */
+ function is_approved( $user_id ) {
+ $status = get_user_meta( $user_id, 'account_status', true );
+ if ( $status == 'approved' || $status == '' ) {
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * Is private
+ *
+ * @param $user_id
+ * @param $case
+ *
+ * @return bool|mixed|void
+ */
+ function is_private_case( $user_id, $case ) {
+ $privacy = get_user_meta( $user_id, 'profile_privacy', true );
+
+ if ( $privacy == $case ) {
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_is_private_filter_hook
+ * @description Change user privacy
+ * @input_vars
+ * [{"var":"$is_private","type":"bool","desc":"Is user private"},
+ * {"var":"$privacy","type":"bool","desc":"Profile Privacy"},
+ * {"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $bool = apply_filters( 'um_is_private_filter_hook', false, $privacy, $user_id );
+ return $bool;
+ }
+
+ return false;
+ }
+
+
+ /**
+ * Update files
+ *
+ * @param $changes
+ */
+ function update_files( $changes ) {
+
+ foreach ( $changes as $key => $uri ) {
+ $src = um_is_temp_upload( $uri );
+ UM()->files()->new_user_upload( $this->id, $src, $key );
+ }
+
+ }
+
+
+ /**
+ * Update profile
+ *
+ * @param $changes
+ */
+ function update_profile( $changes ) {
+
+ $args['ID'] = $this->id;
+
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_before_update_profile
+ * @description Change update profile changes data
+ * @input_vars
+ * [{"var":"$changes","type":"array","desc":"User Profile Changes"},
+ * {"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $changes = apply_filters('um_before_update_profile', $changes, $this->id );
+
+ // save or update profile meta
+ foreach ( $changes as $key => $value ) {
+ if ( ! in_array( $key, $this->update_user_keys ) ) {
+
+ update_user_meta( $this->id, $key, $value );
+
+ } else {
+
+ $args[$key] = esc_attr( $changes[$key] );
+
+ }
+
+ }
+ // update user
+ if ( count( $args ) > 1 ) {
+ global $wp_roles;
+ $um_roles = get_option( 'um_roles' );
+
+ if ( ! empty( $um_roles ) ) {
+ $role_keys = array_map( function( $item ) {
+ return 'um_' . $item;
+ }, get_option( 'um_roles' ) );
+ } else {
+ $role_keys = array();
+ }
+
+ $exclude_roles = array_diff( array_keys( $wp_roles->roles ), array_merge( $role_keys, array( 'subscriber' ) ) );
+
+ if ( isset( $args['role'] ) && in_array( $args['role'], $exclude_roles ) ) {
+ unset( $args['role'] );
+ }
+
+ wp_update_user( $args );
+ }
+
+ }
+
+
+ /**
+ * User exists by meta key and value
+ *
+ * @param $key
+ * @param $value
+ *
+ * @return bool|int
+ */
+ function user_has_metadata( $key, $value ) {
+
+ $value = UM()->validation()->safe_name_in_url( $value );
+
+ $ids = get_users(array( 'fields' => 'ID', 'meta_key' => $key,'meta_value' => $value,'meta_compare' => '=') );
+ if ( !isset( $ids ) || empty( $ids ) ) return false;
+ foreach( $ids as $k => $id ) {
+ if ( $id == um_user('ID') ){
+ unset( $ids[$k] );
+ } else {
+ $duplicates[] = $id;
+ }
+ }
+ if ( isset( $duplicates ) && !empty( $duplicates ) )
+ return count( $duplicates );
+ return false;
+ }
+
+
+ /**
+ * User exists by name
+ *
+ * @param $value
+ *
+ * @return bool
+ */
+ function user_exists_by_name( $value ) {
+
+ // Permalink base
+ $permalink_base = UM()->options()->get( 'permalink_base' );
+
+ $raw_value = $value;
+ $value = UM()->validation()->safe_name_in_url( $value );
+ $value = um_clean_user_basename( $value );
+
+ // Search by Profile Slug
+ $args = array(
+ "fields" => array("ID"),
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'um_user_profile_url_slug_'.$permalink_base,
+ 'value' => strtolower( $raw_value ),
+ 'compare' => '='
+
+ )
+
+ )
+ );
+
+
+ $ids = new \WP_User_Query( $args );
+
+ if( $ids->total_users > 0 ){
+ $um_user_query = current( $ids->get_results() );
+ return $um_user_query->ID;
+ }
+
+ // Search by Display Name or ID
+ $args = array(
+ "fields" => array("ID"),
+ "search" => $value,
+ 'search_columns' => array( 'display_name','ID' )
+ );
+
+ $ids = new \WP_User_Query( $args );
+
+ if( $ids->total_users > 0 ){
+ $um_user_query = current( $ids->get_results() );
+ return $um_user_query->ID;
+ }
+
+
+ // Search By User Login
+ $value = str_replace(".", "_", $value );
+ $value = str_replace(" ", "", $value );
+
+ $args = array(
+ "fields" => array("ID"),
+ "search" => $value,
+ 'search_columns' => array(
+ 'user_login',
+ )
+ );
+
+ $ids = new \WP_User_Query( $args );
+
+ if( $ids->total_users > 0 ){
+ $um_user_query = current( $ids->get_results() );
+ return $um_user_query->ID;
+ }
+
+ return false;
+ }
+
+
+ /**
+ * This method checks if a user exists or not in your site based on the user ID.
+ *
+ * @usage user()->user_exists_by_id( $user_id ); ?>
+ *
+ * @param int $user_id A user ID must be passed to check if the user exists
+ *
+ * @return bool|int
+ *
+ * @example Basic Usage
+
+ user()->user_exists_by_id( 15 );
+ if ( $boolean ) {
+ // That user exists
+ }
+
+ ?>
+
+ *
+ */
+ function user_exists_by_id( $user_id ) {
+ $aux = get_userdata( intval( $user_id ) );
+ if( $aux == false ) {
+ return false;
+ } else {
+ return $user_id;
+ }
+ }
+
+
+ /**
+ * This method checks if a user exists or not in your site based on the user email as username
+ *
+ * @param string $slug A user slug must be passed to check if the user exists
+ *
+ * @usage user()->user_exists_by_email_as_username( $slug ); ?>
+ *
+ * @return bool
+ *
+ * @example Basic Usage
+
+ user()->user_exists_by_email_as_username( 'calumgmail-com' );
+ if ( $boolean ) {
+ // That user exists
+ }
+
+ ?>
+ */
+ function user_exists_by_email_as_username( $slug ) {
+
+ $user_id = false;
+
+ $ids = get_users( array( 'fields' => 'ID', 'meta_key' => 'um_email_as_username_'.$slug ) );
+ if ( isset( $ids[0] ) && ! empty( $ids[0] ) ){
+ $user_id = $ids[0];
+ }
+
+ return $user_id;
+ }
+
+
+ /**
+ * Set gravatar hash id
+ *
+ * @param $user_id
+ * @return string
+ */
+ function set_gravatar( $user_id ) {
+
+ um_fetch_user( $user_id );
+ $email_address = um_user( 'user_email' );
+ $hash_email_address = '';
+
+ if ( $email_address ) {
+ $hash_email_address = md5( $email_address );
+ $this->profile['synced_gravatar_hashed_id'] = $hash_email_address;
+ $this->update_usermeta_info( 'synced_gravatar_hashed_id' );
+ }
+
+ return $hash_email_address;
+ }
+
+ }
}
\ No newline at end of file
diff --git a/includes/core/um-actions-core.php b/includes/core/um-actions-core.php
index 8d83c265..2c85e9cb 100644
--- a/includes/core/um-actions-core.php
+++ b/includes/core/um-actions-core.php
@@ -1,108 +1,119 @@
-user()->user_exists_by_id( $_REQUEST['uid'] ) ) return false;
-
- if ( isset( $_REQUEST['uid'] ) ) {
- if ( is_super_admin( $_REQUEST['uid'] ) )
- wp_die( __( 'Super administrators can not be modified.','ultimate-member' ) );
- }
- if ( isset( $_REQUEST['um_action'] ) && $_REQUEST['um_action'] != "edit" && ! current_user_can( 'edit_users' ) ) {
- wp_die( __( 'You do not have enough permissions to do that.','ultimate-member') );
+/**
+ * Processes the requests of UM actions
+ *
+ */
+function um_action_request_process() {
+ if ( is_admin() ) {
+ return;
+ }
+ if ( ! is_user_logged_in() ) {
+ return;
+ }
+ if ( ! isset( $_REQUEST['um_action'] ) ) {
+ return;
+ }
+ if ( isset( $_REQUEST['uid'] ) && ! UM()->user()->user_exists_by_id( $_REQUEST['uid'] ) ) {
+ return;
+ }
+
+ if ( isset( $_REQUEST['uid'] ) ) {
+ if ( is_super_admin( $_REQUEST['uid'] ) ) {
+ wp_die( __( 'Super administrators can not be modified.','ultimate-member' ) );
}
+ }
- if ( isset( $_REQUEST['uid'] ) ) {
- $uid = $_REQUEST['uid'];
- }
+ if ( isset( $_REQUEST['um_action'] ) && $_REQUEST['um_action'] != "edit" && ! current_user_can( 'edit_users' ) ) {
+ wp_die( __( 'You do not have enough permissions to do that.','ultimate-member') );
+ }
+
+ if ( isset( $_REQUEST['uid'] ) ) {
+ $uid = $_REQUEST['uid'];
+ }
- switch ( $_REQUEST['um_action'] ) {
+ switch ( $_REQUEST['um_action'] ) {
- default:
- $uid = isset( $_REQUEST['uid'] ) ? $_REQUEST['uid'] : 0;
- /**
- * UM hook
- *
- * @type action
- * @title um_action_user_request_hook
- * @description Integration for user actions
- * @input_vars
- * [{"var":"$action","type":"string","desc":"Action for user"},
- * {"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_action_user_request_hook', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( 'um_action_user_request_hook', $_REQUEST['um_action'], $uid );
- break;
+ default:
+ $uid = isset( $_REQUEST['uid'] ) ? $_REQUEST['uid'] : 0;
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_action_user_request_hook
+ * @description Integration for user actions
+ * @input_vars
+ * [{"var":"$action","type":"string","desc":"Action for user"},
+ * {"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_action_user_request_hook', 'function_name', 10, 2 );
+ * @example
+ *
+ */
+ do_action( 'um_action_user_request_hook', $_REQUEST['um_action'], $uid );
+ break;
- case 'edit':
- UM()->fields()->editing = true;
- if ( !um_can_edit_my_profile() ) {
- $url = um_edit_my_profile_cancel_uri();
- exit( wp_redirect( $url ) );
- }
- break;
+ case 'edit':
+ UM()->fields()->editing = true;
+ if ( !um_can_edit_my_profile() ) {
+ $url = um_edit_my_profile_cancel_uri();
+ exit( wp_redirect( $url ) );
+ }
+ break;
- case 'um_switch_user':
- if ( !current_user_can('delete_users') ) return;
- UM()->user()->auto_login( $_REQUEST['uid'] );
- exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
- break;
+ case 'um_switch_user':
+ if ( !current_user_can('delete_users') ) {
+ return;
+ }
+ UM()->user()->auto_login( $_REQUEST['uid'] );
+ exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
+ break;
- case 'um_reject_membership':
- um_fetch_user( $uid );
- UM()->user()->reject();
- exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
- break;
+ case 'um_reject_membership':
+ um_fetch_user( $uid );
+ UM()->user()->reject();
+ exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
+ break;
- case 'um_approve_membership':
- case 'um_reenable':
- um_fetch_user( $uid );
- UM()->user()->approve();
- exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
- break;
+ case 'um_approve_membership':
+ case 'um_reenable':
+ um_fetch_user( $uid );
+ UM()->user()->approve();
+ exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
+ break;
- case 'um_put_as_pending':
- um_fetch_user( $uid );
- UM()->user()->pending();
- exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
- break;
+ case 'um_put_as_pending':
+ um_fetch_user( $uid );
+ UM()->user()->pending();
+ exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
+ break;
- case 'um_resend_activation':
- um_fetch_user( $uid );
- UM()->user()->email_pending();
- exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
- break;
+ case 'um_resend_activation':
+ um_fetch_user( $uid );
+ UM()->user()->email_pending();
+ exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
+ break;
- case 'um_deactivate':
- um_fetch_user( $uid );
- UM()->user()->deactivate();
- exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
- break;
+ case 'um_deactivate':
+ um_fetch_user( $uid );
+ UM()->user()->deactivate();
+ exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
+ break;
- case 'um_delete':
- if ( ! UM()->roles()->um_current_user_can( 'delete', $uid ) ) wp_die( __('You do not have permission to delete this user.','ultimate-member') );
- um_fetch_user( $uid );
- UM()->user()->delete();
- exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
- break;
+ case 'um_delete':
+ if ( ! UM()->roles()->um_current_user_can( 'delete', $uid ) ) wp_die( __('You do not have permission to delete this user.','ultimate-member') );
+ um_fetch_user( $uid );
+ UM()->user()->delete();
+ exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
+ break;
- }
- }
\ No newline at end of file
+ }
+}
+add_action( 'init', 'um_action_request_process', 10 );
\ No newline at end of file
diff --git a/includes/core/um-actions-form.php b/includes/core/um-actions-form.php
index 7f134cd4..8050be80 100644
--- a/includes/core/um-actions-form.php
+++ b/includes/core/um-actions-form.php
@@ -1,736 +1,745 @@
-options()->get('blocked_emails');
- if ( !$emails )
- return;
+/**
+ * Error handling: blocked emails
+ *
+ * @param $args
+ */
+function um_submit_form_errors_hook__blockedemails( $args ) {
+ $emails = UM()->options()->get( 'blocked_emails' );
+ if ( ! $emails )
+ return;
- $emails = array_map("rtrim", explode("\n", $emails));
+ $emails = array_map("rtrim", explode("\n", $emails));
- if ( isset( $args['user_email'] ) && is_email( $args['user_email'] ) ) {
+ if ( isset( $args['user_email'] ) && is_email( $args['user_email'] ) ) {
- $domain = explode('@', $args['user_email'] );
- $check_domain = str_replace($domain[0], '*', $args['user_email']);
+ $domain = explode('@', $args['user_email'] );
+ $check_domain = str_replace($domain[0], '*', $args['user_email']);
- if ( in_array( $args['user_email'], $emails ) )
- exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_email') ) ) );
+ if ( in_array( $args['user_email'], $emails ) )
+ exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_email') ) ) );
- if ( in_array( $check_domain, $emails ) )
- exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_domain') ) ) );
-
- }
-
- if ( isset( $args['username'] ) && is_email( $args['username'] ) ) {
-
- $domain = explode('@', $args['username'] );
- $check_domain = str_replace($domain[0], '*', $args['username']);
-
- if ( in_array( $args['username'], $emails ) )
- exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_email') ) ) );
-
- if ( in_array( $check_domain, $emails ) )
- exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_domain') ) ) );
-
- }
+ if ( in_array( $check_domain, $emails ) )
+ exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_domain') ) ) );
}
- /***
- *** @Error handling: blocked IPs
- ***/
- add_action('um_submit_form_errors_hook__blockedips', 'um_submit_form_errors_hook__blockedips', 10);
- function um_submit_form_errors_hook__blockedips($args){
- $ips = UM()->options()->get('blocked_ips');
- if ( !$ips )
- return;
+ if ( isset( $args['username'] ) && is_email( $args['username'] ) ) {
- $ips = array_map("rtrim", explode("\n", $ips));
- $user_ip = um_user_ip();
+ $domain = explode('@', $args['username'] );
+ $check_domain = str_replace($domain[0], '*', $args['username']);
- foreach($ips as $ip) {
- $ip = str_replace('*','',$ip);
- if ( !empty( $ip ) && strpos($user_ip, $ip) === 0) {
- exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_ip') ) ) );
- }
- }
- }
+ if ( in_array( $args['username'], $emails ) )
+ exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_email') ) ) );
- /***
- *** @Error handling: blocked words during sign up
- ***/
- add_action('um_submit_form_errors_hook__blockedwords', 'um_submit_form_errors_hook__blockedwords', 10);
- function um_submit_form_errors_hook__blockedwords($args){
- $form_id = $args['form_id'];
- $mode = $args['mode'];
- $fields = unserialize( $args['custom_fields'] );
-
- $words = UM()->options()->get('blocked_words');
- if ( $words != '' ) {
-
- $words = array_map("rtrim", explode("\n", $words));
- if( isset( $fields ) && ! empty( $fields ) && is_array( $fields ) ){
- foreach( $fields as $key => $array ) {
- if ( isset($array['validate']) && in_array( $array['validate'], array('unique_username','unique_email','unique_username_or_email') ) ) {
- if ( ! UM()->form()->has_error( $key ) && isset( $args[$key] ) && in_array( $args[$key], $words ) ) {
- UM()->form()->add_error( $key, __('You are not allowed to use this word as your username.','ultimate-member') );
- }
- }
- }
- }
-
- }
+ if ( in_array( $check_domain, $emails ) )
+ exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_domain') ) ) );
}
+}
+add_action( 'um_submit_form_errors_hook__blockedemails', 'um_submit_form_errors_hook__blockedemails', 10 );
- /***
- *** @Error handling
- ***/
- add_action('um_submit_form_errors_hook', 'um_submit_form_errors_hook', 10);
- function um_submit_form_errors_hook( $args ){
- $form_id = $args['form_id'];
- $mode = $args['mode'];
+/**
+ * Error handling: blocked IPs
+ *
+ * @param $args
+ */
+function um_submit_form_errors_hook__blockedips($args){
+ $ips = UM()->options()->get('blocked_ips');
+ if ( !$ips )
+ return;
- $fields = unserialize( $args['custom_fields'] );
-
- if ( $mode == 'register' ) {
-
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook__registration
- * @description Submit registration form validation
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook__registration', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( "um_submit_form_errors_hook__registration", $args );
+ $ips = array_map("rtrim", explode("\n", $ips));
+ $user_ip = um_user_ip();
+ foreach($ips as $ip) {
+ $ip = str_replace('*','',$ip);
+ if ( !empty( $ip ) && strpos($user_ip, $ip) === 0) {
+ exit( wp_redirect( esc_url( add_query_arg('err', 'blocked_ip') ) ) );
}
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook__blockedips
- * @description Submit form validation
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook__blockedips', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( "um_submit_form_errors_hook__blockedips", $args );
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook__blockedemails
- * @description Submit form validation
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook__blockedemails', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( "um_submit_form_errors_hook__blockedemails", $args );
-
- if ( $mode == 'login' ) {
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook_login
- * @description Submit login form validation
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook_login', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_submit_form_errors_hook_login', $args );
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook_logincheck
- * @description Submit login form validation
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook_logincheck', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_submit_form_errors_hook_logincheck', $args );
-
- } else {
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook_
- * @description Submit form validation
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook_', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_submit_form_errors_hook_', $args );
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook__blockedwords
- * @description Submit form validation
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook__blockedwords', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( "um_submit_form_errors_hook__blockedwords", $args );
-
- }
-
}
+}
+add_action( 'um_submit_form_errors_hook__blockedips', 'um_submit_form_errors_hook__blockedips', 10 );
- /***
- *** @Error processing hook : standard
- ***/
- add_action('um_submit_form_errors_hook_', 'um_submit_form_errors_hook_', 10);
- function um_submit_form_errors_hook_( $args ){
- $form_id = $args['form_id'];
- $mode = $args['mode'];
- $fields = unserialize( $args['custom_fields'] );
- $um_profile_photo = um_profile('profile_photo');
- if ( get_post_meta( $form_id, '_um_profile_photo_required', true ) && ( empty( $args['profile_photo'] ) && empty( $um_profile_photo ) ) ) {
- UM()->form()->add_error('profile_photo', sprintf(__('%s is required.','ultimate-member'), 'Profile Photo' ) );
- }
+/**
+ * Error handling: blocked words during sign up
+ *
+ * @param $args
+ */
+function um_submit_form_errors_hook__blockedwords( $args ) {
+ $form_id = $args['form_id'];
+ $mode = $args['mode'];
+ $fields = unserialize( $args['custom_fields'] );
-
- if ( ! empty( $fields ) ) {
+ $words = UM()->options()->get('blocked_words');
+ if ( $words != '' ) {
+
+ $words = array_map("rtrim", explode("\n", $words));
+ if ( ! empty( $fields ) && is_array( $fields ) ) {
foreach ( $fields as $key => $array ) {
+ if ( isset($array['validate']) && in_array( $array['validate'], array('unique_username','unique_email','unique_username_or_email') ) ) {
+ if ( ! UM()->form()->has_error( $key ) && isset( $args[$key] ) && in_array( $args[$key], $words ) ) {
+ UM()->form()->add_error( $key, __('You are not allowed to use this word as your username.','ultimate-member') );
+ }
+ }
+ }
+ }
- if ( isset( $array['public'] ) && -2 == $array['public'] && ! empty( $array['roles'] ) && is_user_logged_in() ) {
- $current_user_roles = um_user( 'roles' );
- if ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $array['roles'] ) ) <= 0 ) {
- continue;
- }
- }
+ }
+}
+add_action( 'um_submit_form_errors_hook__blockedwords', 'um_submit_form_errors_hook__blockedwords', 10 );
- /**
- * UM hook
- *
- * @type filter
- * @title um_get_custom_field_array
- * @description Extend custom field data on submit form error
- * @input_vars
- * [{"var":"$array","type":"array","desc":"Field data"},
- * {"var":"$fields","type":"array","desc":"All fields"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $array = apply_filters( 'um_get_custom_field_array', $array, $fields );
- if ( ! empty( $array['conditions'] ) ) {
- foreach ( $array['conditions'] as $condition ) {
- list( $visibility, $parent_key, $op, $parent_value ) = $condition;
+/**
+ * Error handling
+ *
+ * @param $args
+ */
+function um_submit_form_errors_hook( $args ) {
+ $form_id = $args['form_id'];
- if ( ! isset( $args[ $parent_key ] ) )
- continue;
+ $mode = $args['mode'];
- $cond_value = ( $fields[ $parent_key ]['type'] == 'radio' ) ? $args[ $parent_key ][0] : $args[ $parent_key ];
+ $fields = unserialize( $args['custom_fields'] );
- if ( $visibility == 'hide' ) {
- if ( $op == 'empty' ) {
- if ( empty( $cond_value ) ) {
- continue 2;
- }
- } elseif ( $op == 'not empty' ) {
- if ( ! empty( $cond_value ) ) {
- continue 2;
- }
- } elseif ( $op == 'equals to' ) {
- if ( $cond_value == $parent_value ) {
- continue 2;
- }
- } elseif ( $op == 'not equals' ) {
- if ( $cond_value != $parent_value ) {
- continue 2;
- }
- } elseif ( $op == 'greater than' ) {
- if ( $cond_value > $op ) {
- continue 2;
- }
- } elseif ( $op == 'less than' ) {
- if ( $cond_value < $op ) {
- continue 2;
- }
- } elseif ( $op == 'contains' ) {
- if ( strstr( $cond_value, $parent_value ) ) {
- continue 2;
- }
- }
- } elseif ( $visibility == 'show' ) {
- if ( $op == 'empty' ) {
- if ( ! empty( $cond_value ) ) {
- continue 2;
- }
- } elseif ( $op == 'not empty' ) {
- if ( empty( $cond_value ) ) {
- continue 2;
- }
- } elseif ( $op == 'equals to' ) {
- if ( $cond_value != $parent_value ) {
- continue 2;
- }
- } elseif ( $op == 'not equals' ) {
- if ( $cond_value == $parent_value ) {
- continue 2;
- }
- } elseif ( $op == 'greater than' ) {
- if ( $cond_value <= $op ) {
- continue 2;
- }
- } elseif ( $op == 'less than' ) {
- if ( $cond_value >= $op ) {
- continue 2;
- }
- } elseif ( $op == 'contains' ) {
- if ( ! strstr( $cond_value, $parent_value ) ) {
- continue 2;
- }
- }
+ if ( $mode == 'register' ) {
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook__registration
+ * @description Submit registration form validation
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook__registration', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( "um_submit_form_errors_hook__registration", $args );
+
+ }
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook__blockedips
+ * @description Submit form validation
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook__blockedips', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( "um_submit_form_errors_hook__blockedips", $args );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook__blockedemails
+ * @description Submit form validation
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook__blockedemails', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( "um_submit_form_errors_hook__blockedemails", $args );
+
+ if ( $mode == 'login' ) {
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook_login
+ * @description Submit login form validation
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook_login', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_submit_form_errors_hook_login', $args );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook_logincheck
+ * @description Submit login form validation
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook_logincheck', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_submit_form_errors_hook_logincheck', $args );
+
+ } else {
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook_
+ * @description Submit form validation
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook_', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_submit_form_errors_hook_', $args );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook__blockedwords
+ * @description Submit form validation
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook__blockedwords', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( "um_submit_form_errors_hook__blockedwords", $args );
+
+ }
+
+}
+add_action( 'um_submit_form_errors_hook', 'um_submit_form_errors_hook', 10 );
+
+
+/**
+ * Error processing hook : standard
+ *
+ * @param $args
+ */
+function um_submit_form_errors_hook_( $args ) {
+ $form_id = $args['form_id'];
+ $mode = $args['mode'];
+ $fields = unserialize( $args['custom_fields'] );
+ $um_profile_photo = um_profile('profile_photo');
+
+ if ( get_post_meta( $form_id, '_um_profile_photo_required', true ) && ( empty( $args['profile_photo'] ) && empty( $um_profile_photo ) ) ) {
+ UM()->form()->add_error('profile_photo', sprintf(__('%s is required.','ultimate-member'), 'Profile Photo' ) );
+ }
+
+ if ( ! empty( $fields ) ) {
+ foreach ( $fields as $key => $array ) {
+
+ if ( isset( $array['public'] ) && -2 == $array['public'] && ! empty( $array['roles'] ) && is_user_logged_in() ) {
+ $current_user_roles = um_user( 'roles' );
+ if ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $array['roles'] ) ) <= 0 ) {
+ continue;
+ }
+ }
+
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_get_custom_field_array
+ * @description Extend custom field data on submit form error
+ * @input_vars
+ * [{"var":"$array","type":"array","desc":"Field data"},
+ * {"var":"$fields","type":"array","desc":"All fields"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $array = apply_filters( 'um_get_custom_field_array', $array, $fields );
+
+ if ( ! empty( $array['conditions'] ) ) {
+ foreach ( $array['conditions'] as $condition ) {
+ list( $visibility, $parent_key, $op, $parent_value ) = $condition;
+
+ if ( ! isset( $args[ $parent_key ] ) )
+ continue;
+
+ $cond_value = ( $fields[ $parent_key ]['type'] == 'radio' ) ? $args[ $parent_key ][0] : $args[ $parent_key ];
+
+ if ( $visibility == 'hide' ) {
+ if ( $op == 'empty' ) {
+ if ( empty( $cond_value ) ) {
+ continue 2;
+ }
+ } elseif ( $op == 'not empty' ) {
+ if ( ! empty( $cond_value ) ) {
+ continue 2;
+ }
+ } elseif ( $op == 'equals to' ) {
+ if ( $cond_value == $parent_value ) {
+ continue 2;
+ }
+ } elseif ( $op == 'not equals' ) {
+ if ( $cond_value != $parent_value ) {
+ continue 2;
+ }
+ } elseif ( $op == 'greater than' ) {
+ if ( $cond_value > $op ) {
+ continue 2;
+ }
+ } elseif ( $op == 'less than' ) {
+ if ( $cond_value < $op ) {
+ continue 2;
+ }
+ } elseif ( $op == 'contains' ) {
+ if ( strstr( $cond_value, $parent_value ) ) {
+ continue 2;
+ }
}
- }
- }
-
- if ( isset( $array['type'] ) && $array['type'] == 'checkbox' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) ) {
- UM()->form()->add_error($key, sprintf(__('%s is required.','ultimate-member'), $array['title'] ) );
- }
-
- if ( isset( $array['type'] ) && $array['type'] == 'radio' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) && !in_array($key, array('role_radio','role_select') ) ) {
- UM()->form()->add_error($key, sprintf(__('%s is required.','ultimate-member'), $array['title'] ) );
- }
-
- if ( isset( $array['type'] ) && $array['type'] == 'multiselect' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) && !in_array($key, array('role_radio','role_select') ) ) {
- UM()->form()->add_error($key, sprintf(__('%s is required.','ultimate-member'), $array['title'] ) );
- }
-
- if ( $key == 'role_select' || $key == 'role_radio' ) {
- if ( isset( $array['required'] ) && $array['required'] == 1 && ( !isset( $args['role'] ) || empty( $args['role'] ) ) ) {
- UM()->form()->add_error('role', __('Please specify account type.','ultimate-member') );
- }
- }
-
- /**
- * UM hook
- *
- * @type action
- * @title um_add_error_on_form_submit_validation
- * @description Submit form validation
- * @input_vars
- * [{"var":"$field","type":"array","desc":"Field Data"},
- * {"var":"$key","type":"string","desc":"Field Key"},
- * {"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_add_error_on_form_submit_validation', 'function_name', 10, 3 );
- * @example
- *
- */
- do_action( 'um_add_error_on_form_submit_validation', $array, $key, $args );
-
- if ( isset( $args[$key] ) ) {
-
- if ( isset( $array['required'] ) && $array['required'] == 1 ) {
- if ( ! isset( $args[$key] ) || $args[$key] == '' || $args[$key] == 'empty_file') {
- if( empty( $array['label'] ) ) {
- UM()->form()->add_error($key, __('This field is required','ultimate-member') );
- } else {
- UM()->form()->add_error($key, sprintf( __('%s is required','ultimate-member'), $array['label'] ) );
+ } elseif ( $visibility == 'show' ) {
+ if ( $op == 'empty' ) {
+ if ( ! empty( $cond_value ) ) {
+ continue 2;
+ }
+ } elseif ( $op == 'not empty' ) {
+ if ( empty( $cond_value ) ) {
+ continue 2;
+ }
+ } elseif ( $op == 'equals to' ) {
+ if ( $cond_value != $parent_value ) {
+ continue 2;
+ }
+ } elseif ( $op == 'not equals' ) {
+ if ( $cond_value == $parent_value ) {
+ continue 2;
+ }
+ } elseif ( $op == 'greater than' ) {
+ if ( $cond_value <= $op ) {
+ continue 2;
+ }
+ } elseif ( $op == 'less than' ) {
+ if ( $cond_value >= $op ) {
+ continue 2;
+ }
+ } elseif ( $op == 'contains' ) {
+ if ( ! strstr( $cond_value, $parent_value ) ) {
+ continue 2;
}
}
}
+ }
+ }
- if ( isset( $array['max_words'] ) && $array['max_words'] > 0 ) {
- if ( str_word_count( $args[$key] ) > $array['max_words'] ) {
+ if ( isset( $array['type'] ) && $array['type'] == 'checkbox' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) ) {
+ UM()->form()->add_error($key, sprintf(__('%s is required.','ultimate-member'), $array['title'] ) );
+ }
+
+ if ( isset( $array['type'] ) && $array['type'] == 'radio' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) && !in_array($key, array('role_radio','role_select') ) ) {
+ UM()->form()->add_error($key, sprintf(__('%s is required.','ultimate-member'), $array['title'] ) );
+ }
+
+ if ( isset( $array['type'] ) && $array['type'] == 'multiselect' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) && !in_array($key, array('role_radio','role_select') ) ) {
+ UM()->form()->add_error($key, sprintf(__('%s is required.','ultimate-member'), $array['title'] ) );
+ }
+
+ if ( $key == 'role_select' || $key == 'role_radio' ) {
+ if ( isset( $array['required'] ) && $array['required'] == 1 && ( !isset( $args['role'] ) || empty( $args['role'] ) ) ) {
+ UM()->form()->add_error('role', __('Please specify account type.','ultimate-member') );
+ }
+ }
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_add_error_on_form_submit_validation
+ * @description Submit form validation
+ * @input_vars
+ * [{"var":"$field","type":"array","desc":"Field Data"},
+ * {"var":"$key","type":"string","desc":"Field Key"},
+ * {"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_add_error_on_form_submit_validation', 'function_name', 10, 3 );
+ * @example
+ *
+ */
+ do_action( 'um_add_error_on_form_submit_validation', $array, $key, $args );
+
+ if ( isset( $args[$key] ) ) {
+
+ if ( isset( $array['required'] ) && $array['required'] == 1 ) {
+ if ( ! isset( $args[$key] ) || $args[$key] == '' || $args[$key] == 'empty_file') {
+ if( empty( $array['label'] ) ) {
+ UM()->form()->add_error($key, __('This field is required','ultimate-member') );
+ } else {
+ UM()->form()->add_error($key, sprintf( __('%s is required','ultimate-member'), $array['label'] ) );
+ }
+ }
+ }
+
+ if ( isset( $array['max_words'] ) && $array['max_words'] > 0 ) {
+ if ( str_word_count( $args[$key] ) > $array['max_words'] ) {
UM()->form()->add_error($key, sprintf(__('You are only allowed to enter a maximum of %s words','ultimate-member'), $array['max_words']) );
- }
}
+ }
- if ( isset( $array['min_chars'] ) && $array['min_chars'] > 0 ) {
- if ( $args[$key] && strlen( utf8_decode( $args[$key] ) ) < $array['min_chars'] ) {
+ if ( isset( $array['min_chars'] ) && $array['min_chars'] > 0 ) {
+ if ( $args[$key] && strlen( utf8_decode( $args[$key] ) ) < $array['min_chars'] ) {
UM()->form()->add_error($key, sprintf(__('Your %s must contain at least %s characters','ultimate-member'), $array['label'], $array['min_chars']) );
- }
}
+ }
- if ( isset( $array['max_chars'] ) && $array['max_chars'] > 0 ) {
- if ( $args[$key] && strlen( utf8_decode( $args[$key] ) ) > $array['max_chars'] ) {
+ if ( isset( $array['max_chars'] ) && $array['max_chars'] > 0 ) {
+ if ( $args[$key] && strlen( utf8_decode( $args[$key] ) ) > $array['max_chars'] ) {
UM()->form()->add_error($key, sprintf(__('Your %s must contain less than %s characters','ultimate-member'), $array['label'], $array['max_chars']) );
- }
}
+ }
- $profile_show_html_bio = UM()->options()->get('profile_show_html_bio');
+ $profile_show_html_bio = UM()->options()->get('profile_show_html_bio');
- if( $profile_show_html_bio == 1 && $key !== "description" ){
- if ( isset( $array['html'] ) && $array['html'] == 0 ) {
- if ( wp_strip_all_tags( $args[$key] ) != trim( $args[$key] ) ) {
- UM()->form()->add_error($key, __('You can not use HTML tags here','ultimate-member') );
- }
+ if( $profile_show_html_bio == 1 && $key !== "description" ){
+ if ( isset( $array['html'] ) && $array['html'] == 0 ) {
+ if ( wp_strip_all_tags( $args[$key] ) != trim( $args[$key] ) ) {
+ UM()->form()->add_error($key, __('You can not use HTML tags here','ultimate-member') );
}
}
+ }
- if ( isset( $array['force_good_pass'] ) && $array['force_good_pass'] == 1 ) {
- if ( ! UM()->validation()->strong_pass( $args[$key] ) ) {
+ if ( isset( $array['force_good_pass'] ) && $array['force_good_pass'] == 1 ) {
+ if ( ! UM()->validation()->strong_pass( $args[$key] ) ) {
UM()->form()->add_error($key, __('Your password must contain at least one lowercase letter, one capital letter and one number','ultimate-member') );
- }
}
+ }
- if ( isset( $array['force_confirm_pass'] ) && $array['force_confirm_pass'] == 1 ) {
- if ( $args[ 'confirm_' . $key] == '' && ! UM()->form()->has_error($key) ) {
+ if ( isset( $array['force_confirm_pass'] ) && $array['force_confirm_pass'] == 1 ) {
+ if ( $args[ 'confirm_' . $key] == '' && ! UM()->form()->has_error($key) ) {
UM()->form()->add_error( 'confirm_' . $key , __('Please confirm your password','ultimate-member') );
- }
- if ( $args[ 'confirm_' . $key] != $args[$key] && !UM()->form()->has_error($key) ) {
+ }
+ if ( $args[ 'confirm_' . $key] != $args[$key] && !UM()->form()->has_error($key) ) {
UM()->form()->add_error( 'confirm_' . $key , __('Your passwords do not match','ultimate-member') );
- }
}
+ }
- if ( isset( $array['min_selections'] ) && $array['min_selections'] > 0 ) {
- if ( ( !isset($args[$key]) ) || ( isset( $args[$key] ) && is_array($args[$key]) && count( $args[$key] ) < $array['min_selections'] ) ) {
+ if ( isset( $array['min_selections'] ) && $array['min_selections'] > 0 ) {
+ if ( ( !isset($args[$key]) ) || ( isset( $args[$key] ) && is_array($args[$key]) && count( $args[$key] ) < $array['min_selections'] ) ) {
UM()->form()->add_error($key, sprintf(__('Please select at least %s choices','ultimate-member'), $array['min_selections'] ) );
- }
}
+ }
- if ( isset( $array['max_selections'] ) && $array['max_selections'] > 0 ) {
- if ( isset( $args[$key] ) && is_array($args[$key]) && count( $args[$key] ) > $array['max_selections'] ) {
+ if ( isset( $array['max_selections'] ) && $array['max_selections'] > 0 ) {
+ if ( isset( $args[$key] ) && is_array($args[$key]) && count( $args[$key] ) > $array['max_selections'] ) {
UM()->form()->add_error($key, sprintf(__('You can only select up to %s choices','ultimate-member'), $array['max_selections'] ) );
- }
}
+ }
- if ( isset( $array['min'] ) && is_numeric( $args[ $key ] ) ) {
- if ( isset( $args[ $key ] ) && $args[ $key ] < $array['min'] ) {
- UM()->form()->add_error( $key, sprintf(__('Minimum number limit is %s','ultimate-member'), $array['min'] ) );
- }
- }
+ if ( isset( $array['min'] ) && is_numeric( $args[ $key ] ) ) {
+ if ( isset( $args[ $key ] ) && $args[ $key ] < $array['min'] ) {
+ UM()->form()->add_error( $key, sprintf(__('Minimum number limit is %s','ultimate-member'), $array['min'] ) );
+ }
+ }
- if ( isset( $array['max'] ) && is_numeric( $args[ $key ] ) ) {
- if ( isset( $args[ $key ] ) && $args[ $key ] > $array['max'] ) {
- UM()->form()->add_error( $key, sprintf(__('Maximum number limit is %s','ultimate-member'), $array['max'] ) );
- }
- }
+ if ( isset( $array['max'] ) && is_numeric( $args[ $key ] ) ) {
+ if ( isset( $args[ $key ] ) && $args[ $key ] > $array['max'] ) {
+ UM()->form()->add_error( $key, sprintf(__('Maximum number limit is %s','ultimate-member'), $array['max'] ) );
+ }
+ }
- if ( isset( $array['validate'] ) && !empty( $array['validate'] ) ) {
+ if ( isset( $array['validate'] ) && !empty( $array['validate'] ) ) {
- switch( $array['validate'] ) {
+ switch( $array['validate'] ) {
- case 'custom':
- $custom = $array['custom_validate'];
- /**
- * UM hook
- *
- * @type action
- * @title um_custom_field_validation_{$custom}
- * @description Submit form validation for custom field
- * @input_vars
- * [{"var":"$key","type":"string","desc":"Field Key"},
- * {"var":"$field","type":"array","desc":"Field Data"},
- * {"var":"$args","type":"array","desc":"Form Arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_custom_field_validation_{$custom}', 'function_name', 10, 3 );
- * @example
- *
- */
- do_action( "um_custom_field_validation_{$custom}", $key, $array, $args );
- break;
+ case 'custom':
+ $custom = $array['custom_validate'];
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_custom_field_validation_{$custom}
+ * @description Submit form validation for custom field
+ * @input_vars
+ * [{"var":"$key","type":"string","desc":"Field Key"},
+ * {"var":"$field","type":"array","desc":"Field Data"},
+ * {"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_custom_field_validation_{$custom}', 'function_name', 10, 3 );
+ * @example
+ *
+ */
+ do_action( "um_custom_field_validation_{$custom}", $key, $array, $args );
+ break;
- case 'numeric':
- if ( $args[$key] && !is_numeric( $args[$key] ) ) {
- UM()->form()->add_error($key, __('Please enter numbers only in this field','ultimate-member') );
- }
- break;
+ case 'numeric':
+ if ( $args[$key] && !is_numeric( $args[$key] ) ) {
+ UM()->form()->add_error($key, __('Please enter numbers only in this field','ultimate-member') );
+ }
+ break;
- case 'phone_number':
- if ( ! UM()->validation()->is_phone_number( $args[$key] ) ) {
- UM()->form()->add_error($key, __('Please enter a valid phone number','ultimate-member') );
- }
- break;
+ case 'phone_number':
+ if ( ! UM()->validation()->is_phone_number( $args[$key] ) ) {
+ UM()->form()->add_error($key, __('Please enter a valid phone number','ultimate-member') );
+ }
+ break;
- case 'youtube_url':
- if ( ! UM()->validation()->is_url( $args[$key], 'youtube.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'youtube_url':
+ if ( ! UM()->validation()->is_url( $args[$key], 'youtube.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'soundcloud_url':
- if ( ! UM()->validation()->is_url( $args[$key], 'soundcloud.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'soundcloud_url':
+ if ( ! UM()->validation()->is_url( $args[$key], 'soundcloud.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'facebook_url':
- if ( ! UM()->validation()->is_url( $args[$key], 'facebook.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'facebook_url':
+ if ( ! UM()->validation()->is_url( $args[$key], 'facebook.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'twitter_url':
- if ( ! UM()->validation()->is_url( $args[$key], 'twitter.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'twitter_url':
+ if ( ! UM()->validation()->is_url( $args[$key], 'twitter.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'instagram_url':
- if ( ! UM()->validation()->is_url( $args[$key], 'instagram.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'instagram_url':
+ if ( ! UM()->validation()->is_url( $args[$key], 'instagram.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'google_url':
- if ( ! UM()->validation()->is_url( $args[$key], 'plus.google.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'google_url':
+ if ( ! UM()->validation()->is_url( $args[$key], 'plus.google.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'linkedin_url':
- if ( ! UM()->validation()->is_url( $args[$key], 'linkedin.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'linkedin_url':
+ if ( ! UM()->validation()->is_url( $args[$key], 'linkedin.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'vk_url':
- if ( ! UM()->validation()->is_url( $args[$key], 'vk.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'vk_url':
+ if ( ! UM()->validation()->is_url( $args[$key], 'vk.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'url':
- if ( ! UM()->validation()->is_url( $args[$key] ) ) {
- UM()->form()->add_error($key, __('Please enter a valid URL','ultimate-member') );
- }
- break;
+ case 'url':
+ if ( ! UM()->validation()->is_url( $args[$key] ) ) {
+ UM()->form()->add_error($key, __('Please enter a valid URL','ultimate-member') );
+ }
+ break;
- case 'skype':
- if ( ! UM()->validation()->is_url( $args[$key], 'skype.com' ) ) {
- UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
- }
- break;
+ case 'skype':
+ if ( ! UM()->validation()->is_url( $args[$key], 'skype.com' ) ) {
+ UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
+ }
+ break;
- case 'unique_username':
+ case 'unique_username':
- if ( $args[$key] == '' ) {
- UM()->form()->add_error($key, __('You must provide a username','ultimate-member') );
- } else if ( $mode == 'register' && username_exists( sanitize_user( $args[$key] ) ) ) {
- UM()->form()->add_error($key, __('Your username is already taken','ultimate-member') );
- } else if ( is_email( $args[$key] ) ) {
- UM()->form()->add_error($key, __('Username cannot be an email','ultimate-member') );
- } else if ( ! UM()->validation()->safe_username( $args[$key] ) ) {
- UM()->form()->add_error($key, __('Your username contains invalid characters','ultimate-member') );
+ if ( $args[$key] == '' ) {
+ UM()->form()->add_error($key, __('You must provide a username','ultimate-member') );
+ } else if ( $mode == 'register' && username_exists( sanitize_user( $args[$key] ) ) ) {
+ UM()->form()->add_error($key, __('Your username is already taken','ultimate-member') );
+ } else if ( is_email( $args[$key] ) ) {
+ UM()->form()->add_error($key, __('Username cannot be an email','ultimate-member') );
+ } else if ( ! UM()->validation()->safe_username( $args[$key] ) ) {
+ UM()->form()->add_error($key, __('Your username contains invalid characters','ultimate-member') );
+ }
+
+ break;
+
+ case 'unique_username_or_email':
+
+ if ( $args[$key] == '' ) {
+ UM()->form()->add_error($key, __('You must provide a username','ultimate-member') );
+ } else if ( $mode == 'register' && username_exists( sanitize_user( $args[$key] ) ) ) {
+ UM()->form()->add_error($key, __('Your username is already taken','ultimate-member') );
+ } else if ( $mode == 'register' && email_exists( $args[$key] ) ) {
+ UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') );
+ } else if ( ! UM()->validation()->safe_username( $args[$key] ) ) {
+ UM()->form()->add_error($key, __('Your username contains invalid characters','ultimate-member') );
+ }
+
+ break;
+
+ case 'unique_email':
+
+ $args[ $key ] = trim( $args[ $key ] );
+
+ if ( in_array( $key, array('user_email') ) ) {
+
+ if( ! isset( $args['user_id'] ) ){
+ $args['user_id'] = um_get_requested_user();
}
- break;
+ $email_exists = email_exists( $args[ $key ] );
- case 'unique_username_or_email':
-
- if ( $args[$key] == '' ) {
- UM()->form()->add_error($key, __('You must provide a username','ultimate-member') );
- } else if ( $mode == 'register' && username_exists( sanitize_user( $args[$key] ) ) ) {
- UM()->form()->add_error($key, __('Your username is already taken','ultimate-member') );
- } else if ( $mode == 'register' && email_exists( $args[$key] ) ) {
- UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') );
- } else if ( ! UM()->validation()->safe_username( $args[$key] ) ) {
- UM()->form()->add_error($key, __('Your username contains invalid characters','ultimate-member') );
+ if ( $args[ $key ] == '' && in_array( $key, array('user_email') ) ) {
+ UM()->form()->add_error( $key, __('You must provide your email','ultimate-member') );
+ } else if ( in_array( $mode, array('register') ) && $email_exists ) {
+ UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') );
+ } else if ( in_array( $mode, array('profile') ) && $email_exists && $email_exists != $args['user_id'] ) {
+ UM()->form()->add_error( $key, __('This email is already linked to an existing account','ultimate-member') );
+ } else if ( !is_email( $args[ $key ] ) ) {
+ UM()->form()->add_error( $key, __('This is not a valid email','ultimate-member') );
+ } else if ( ! UM()->validation()->safe_username( $args[ $key ] ) ) {
+ UM()->form()->add_error( $key, __('Your email contains invalid characters','ultimate-member') );
}
- break;
+ } else {
- case 'unique_email':
-
- $args[ $key ] = trim( $args[ $key ] );
-
- if ( in_array( $key, array('user_email') ) ) {
-
- if( ! isset( $args['user_id'] ) ){
- $args['user_id'] = um_get_requested_user();
- }
-
- $email_exists = email_exists( $args[ $key ] );
-
- if ( $args[ $key ] == '' && in_array( $key, array('user_email') ) ) {
- UM()->form()->add_error( $key, __('You must provide your email','ultimate-member') );
- } else if ( in_array( $mode, array('register') ) && $email_exists ) {
- UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') );
- } else if ( in_array( $mode, array('profile') ) && $email_exists && $email_exists != $args['user_id'] ) {
- UM()->form()->add_error( $key, __('This email is already linked to an existing account','ultimate-member') );
- } else if ( !is_email( $args[ $key ] ) ) {
- UM()->form()->add_error( $key, __('This is not a valid email','ultimate-member') );
- } else if ( ! UM()->validation()->safe_username( $args[ $key ] ) ) {
- UM()->form()->add_error( $key, __('Your email contains invalid characters','ultimate-member') );
- }
-
- } else {
-
- if ( $args[ $key ] != '' && !is_email( $args[ $key ] ) ) {
- UM()->form()->add_error( $key, __('This is not a valid email','ultimate-member') );
- } else if ( $args[ $key ] != '' && email_exists( $args[ $key ] ) ) {
- UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') );
- } else if ( $args[ $key ] != '' ) {
+ if ( $args[ $key ] != '' && !is_email( $args[ $key ] ) ) {
+ UM()->form()->add_error( $key, __('This is not a valid email','ultimate-member') );
+ } else if ( $args[ $key ] != '' && email_exists( $args[ $key ] ) ) {
+ UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') );
+ } else if ( $args[ $key ] != '' ) {
- $users = get_users('meta_value='.$args[ $key ]);
+ $users = get_users('meta_value='.$args[ $key ]);
- foreach ( $users as $user ) {
- if( $user->ID != $args['user_id'] ){
- UM()->form()->add_error( $key, __('This email is already linked to an existing account','ultimate-member') );
- }
+ foreach ( $users as $user ) {
+ if( $user->ID != $args['user_id'] ){
+ UM()->form()->add_error( $key, __('This email is already linked to an existing account','ultimate-member') );
}
+ }
- }
-
}
- break;
+ }
- case 'unique_value':
+ break;
- if ( $args[$key] != '' ) {
+ case 'unique_value':
- $args_unique_meta = array(
- 'meta_key' => $key,
- 'meta_value' => $args[ $key ],
- 'compare' => '=',
- 'exclude' => array( $args['user_id'] ),
- );
+ if ( $args[$key] != '' ) {
- $meta_key_exists = get_users( $args_unique_meta );
+ $args_unique_meta = array(
+ 'meta_key' => $key,
+ 'meta_value' => $args[ $key ],
+ 'compare' => '=',
+ 'exclude' => array( $args['user_id'] ),
+ );
- if ( $meta_key_exists ) {
- UM()->form()->add_error( $key , __('You must provide a unique value','ultimate-member') );
- }
+ $meta_key_exists = get_users( $args_unique_meta );
+
+ if ( $meta_key_exists ) {
+ UM()->form()->add_error( $key , __('You must provide a unique value','ultimate-member') );
}
+ }
break;
- case 'alphabetic':
+ case 'alphabetic':
- if ( $args[$key] != '' ) {
+ if ( $args[$key] != '' ) {
- if( ! ctype_alpha( str_replace(' ', '', $args[$key] ) ) ){
- UM()->form()->add_error( $key , __('You must provide alphabetic letters','ultimate-member') );
- }
+ if( ! ctype_alpha( str_replace(' ', '', $args[$key] ) ) ){
+ UM()->form()->add_error( $key , __('You must provide alphabetic letters','ultimate-member') );
}
+ }
break;
- case 'lowercase':
+ case 'lowercase':
- if ( $args[$key] != '' ) {
+ if ( $args[$key] != '' ) {
- if( ! ctype_lower( str_replace(' ', '',$args[$key] ) ) ){
- UM()->form()->add_error( $key , __('You must provide lowercase letters.','ultimate-member') );
- }
+ if( ! ctype_lower( str_replace(' ', '',$args[$key] ) ) ){
+ UM()->form()->add_error( $key , __('You must provide lowercase letters.','ultimate-member') );
}
+ }
break;
- }
-
}
}
- if ( isset( $args['description'] ) ) {
+ }
+
+ if ( isset( $args['description'] ) ) {
- $max_chars = UM()->options()->get('profile_bio_maxchars');
- $profile_show_bio = UM()->options()->get('profile_show_bio');
+ $max_chars = UM()->options()->get('profile_bio_maxchars');
+ $profile_show_bio = UM()->options()->get('profile_show_bio');
- if( $profile_show_bio ){
- if ( strlen( utf8_decode( $args['description'] ) ) > $max_chars && $max_chars ) {
- UM()->form()->add_error('description', sprintf(__('Your user description must contain less than %s characters','ultimate-member'), $max_chars ) );
- }
+ if( $profile_show_bio ){
+ if ( strlen( utf8_decode( $args['description'] ) ) > $max_chars && $max_chars ) {
+ UM()->form()->add_error('description', sprintf(__('Your user description must contain less than %s characters','ultimate-member'), $max_chars ) );
}
-
}
- } // end if ( isset in args array )
- }
- }
\ No newline at end of file
+ }
+
+ } // end if ( isset in args array )
+ }
+}
+add_action( 'um_submit_form_errors_hook_', 'um_submit_form_errors_hook_', 10 );
\ No newline at end of file
diff --git a/includes/core/um-actions-global.php b/includes/core/um-actions-global.php
index 542a186b..5bfc9b05 100644
--- a/includes/core/um-actions-global.php
+++ b/includes/core/um-actions-global.php
@@ -1,57 +1,64 @@
-
-
+/**
+ * Adds a form identifier to form
+ *
+ * @param $args
+ */
+function um_add_form_identifier( $args ) {
+ ?>
+
- echo '';
+
- ?>
-
- | + | + + | +
|---|
- - -
- - - - - - - - ++ + +
+ + + + form()->add_error( 'username', __('Please enter your username or email','ultimate-member') ); - } + if ( isset( $args['username'] ) && $args['username'] == '' ) { + UM()->form()->add_error( 'username', __('Please enter your username or email','ultimate-member') ); + } - if ( isset( $args['user_login'] ) && $args['user_login'] == '' ) { - UM()->form()->add_error( 'user_login', __('Please enter your username','ultimate-member') ); - } + if ( isset( $args['user_login'] ) && $args['user_login'] == '' ) { + UM()->form()->add_error( 'user_login', __('Please enter your username','ultimate-member') ); + } - if ( isset( $args['user_email'] ) && $args['user_email'] == '' ) { - UM()->form()->add_error( 'user_email', __('Please enter your email','ultimate-member') ); - } + if ( isset( $args['user_email'] ) && $args['user_email'] == '' ) { + UM()->form()->add_error( 'user_email', __('Please enter your email','ultimate-member') ); + } - if ( isset( $args['username'] ) ) { - $field = 'username'; - if ( is_email( $args['username'] ) ) { - $is_email = true; - $data = get_user_by('email', $args['username'] ); - $user_name = (isset ( $data->user_login ) ) ? $data->user_login : null; - } else { - $user_name = $args['username']; - } - } else if ( isset( $args['user_email'] ) ) { - $field = 'user_email'; - $is_email = true; - $data = get_user_by('email', $args['user_email'] ); - $user_name = (isset ( $data->user_login ) ) ? $data->user_login : null; + if ( isset( $args['username'] ) ) { + $field = 'username'; + if ( is_email( $args['username'] ) ) { + $is_email = true; + $data = get_user_by('email', $args['username'] ); + $user_name = (isset ( $data->user_login ) ) ? $data->user_login : null; } else { - $field = 'user_login'; - $user_name = $args['user_login']; + $user_name = $args['username']; } + } else if ( isset( $args['user_email'] ) ) { + $field = 'user_email'; + $is_email = true; + $data = get_user_by('email', $args['user_email'] ); + $user_name = (isset ( $data->user_login ) ) ? $data->user_login : null; + } else { + $field = 'user_login'; + $user_name = $args['user_login']; + } - if ( !username_exists( $user_name ) ) { - if ( $is_email ) { - UM()->form()->add_error( $field, __(' Sorry, we can\'t find an account with that email address','ultimate-member') ); - } else { - UM()->form()->add_error( $field, __(' Sorry, we can\'t find an account with that username','ultimate-member') ); - } + if ( !username_exists( $user_name ) ) { + if ( $is_email ) { + UM()->form()->add_error( $field, __(' Sorry, we can\'t find an account with that email address','ultimate-member') ); } else { - if ( $args['user_password'] == '' ) { - UM()->form()->add_error( 'user_password', __('Please enter your password','ultimate-member') ); - } + UM()->form()->add_error( $field, __(' Sorry, we can\'t find an account with that username','ultimate-member') ); } - - $user = get_user_by( 'login', $user_name ); - if ( $user && wp_check_password( $args['user_password'], $user->data->user_pass, $user->ID) ) { - UM()->login()->auth_id = username_exists( $user_name ); - } else { - UM()->form()->add_error( 'user_password', __('Password is incorrect. Please try again.','ultimate-member') ); - } - - $user = apply_filters( 'authenticate', null, $user_name, $args['user_password'] ); - - $authenticate_user = apply_filters( 'wp_authenticate_user', $user_name, $args['user_password'] ); - - // @since 4.18 replacement for 'wp_login_failed' action hook - // see WP function wp_authenticate() - $ignore_codes = array('empty_username', 'empty_password'); - - if ( is_wp_error( $user ) && ! in_array( $user->get_error_code(), $ignore_codes ) ) { - - UM()->form()->add_error( $user->get_error_code(), __( $user->get_error_message() ,'ultimate-member') ); - } - - if( is_wp_error( $authenticate_user ) && ! in_array( $authenticate_user->get_error_code(), $ignore_codes ) ){ - - UM()->form()->add_error( $authenticate_user->get_error_code(), __( $authenticate_user->get_error_message() ,'ultimate-member') ); - - } - - // if there is an error notify wp - if( UM()->form()->has_error( $field ) || UM()->form()->has_error( $user_password ) || UM()->form()->count_errors() > 0 ) { - do_action( 'wp_login_failed', $user_name ); + } else { + if ( $args['user_password'] == '' ) { + UM()->form()->add_error( 'user_password', __('Please enter your password','ultimate-member') ); } } - /** - * Display the login errors from other plugins - */ - add_action( 'um_before_login_fields', 'um_display_login_errors' ); - function um_display_login_errors( $args ) { - $error = ''; + $user = get_user_by( 'login', $user_name ); + if ( $user && wp_check_password( $args['user_password'], $user->data->user_pass, $user->ID) ) { + UM()->login()->auth_id = username_exists( $user_name ); + } else { + UM()->form()->add_error( 'user_password', __('Password is incorrect. Please try again.','ultimate-member') ); + } + + $user = apply_filters( 'authenticate', null, $user_name, $args['user_password'] ); + + $authenticate_user = apply_filters( 'wp_authenticate_user', $user_name, $args['user_password'] ); + + // @since 4.18 replacement for 'wp_login_failed' action hook + // see WP function wp_authenticate() + $ignore_codes = array('empty_username', 'empty_password'); + + if ( is_wp_error( $user ) && ! in_array( $user->get_error_code(), $ignore_codes ) ) { + + UM()->form()->add_error( $user->get_error_code(), __( $user->get_error_message() ,'ultimate-member') ); + } + + if( is_wp_error( $authenticate_user ) && ! in_array( $authenticate_user->get_error_code(), $ignore_codes ) ){ + + UM()->form()->add_error( $authenticate_user->get_error_code(), __( $authenticate_user->get_error_message() ,'ultimate-member') ); + + } + + // if there is an error notify wp + if( UM()->form()->has_error( $field ) || UM()->form()->has_error( $user_password ) || UM()->form()->count_errors() > 0 ) { + do_action( 'wp_login_failed', $user_name ); + } +} +add_action( 'um_submit_form_errors_hook_login', 'um_submit_form_errors_hook_login', 10 ); + + +/** + * Display the login errors from other plugins + * + * @param $args + */ +function um_display_login_errors( $args ) { + $error = ''; - if( UM()->form()->count_errors() > 0 ) { - $errors = UM()->form()->errors; - // hook for other plugins to display error - $error_keys = array_keys( $errors ); + if( UM()->form()->count_errors() > 0 ) { + $errors = UM()->form()->errors; + // hook for other plugins to display error + $error_keys = array_keys( $errors ); } if( isset( $args['custom_fields'] ) ){ @@ -116,339 +120,364 @@ if ( ! defined( 'ABSPATH' ) ) exit; } } } +add_action( 'um_before_login_fields', 'um_display_login_errors' ); - /*** - *** @login checks thru the frontend login - ***/ - add_action('um_submit_form_errors_hook_logincheck', 'um_submit_form_errors_hook_logincheck', 9999 ); - function um_submit_form_errors_hook_logincheck($args){ - // Logout if logged in - if ( is_user_logged_in() ) { - wp_logout(); - } - $user_id = ( isset( UM()->login()->auth_id ) ) ? UM()->login()->auth_id : ''; - um_fetch_user( $user_id ); +/** + * Login checks thru the frontend login + * + * @param $args + */ +function um_submit_form_errors_hook_logincheck( $args ) { + // Logout if logged in + if ( is_user_logged_in() ) { + wp_logout(); + } - $status = um_user('account_status'); // account status - switch( $status ) { + $user_id = ( isset( UM()->login()->auth_id ) ) ? UM()->login()->auth_id : ''; + um_fetch_user( $user_id ); - // If user can't login to site... - case 'inactive': - case 'awaiting_admin_review': - case 'awaiting_email_confirmation': - case 'rejected': - um_reset_user(); - exit( wp_redirect( add_query_arg( 'err', esc_attr( $status ), UM()->permalinks()->get_current_url() ) ) ); - break; + $status = um_user('account_status'); // account status + switch( $status ) { - } - - if ( isset( $args['form_id'] ) && $args['form_id'] == UM()->shortcodes()->core_login_form() && UM()->form()->errors && !isset( $_POST[ UM()->honeypot ] ) ) { - exit( wp_redirect( um_get_core_page('login') ) ); - } + // If user can't login to site... + case 'inactive': + case 'awaiting_admin_review': + case 'awaiting_email_confirmation': + case 'rejected': + um_reset_user(); + exit( wp_redirect( add_query_arg( 'err', esc_attr( $status ), UM()->permalinks()->get_current_url() ) ) ); + break; } - /*** - *** @store last login timestamp - ***/ - add_action('um_on_login_before_redirect', 'um_store_lastlogin_timestamp', 10, 1); - function um_store_lastlogin_timestamp( $user_id ) { - update_user_meta( $user_id, '_um_last_login', current_time( 'timestamp' ) ); + if ( isset( $args['form_id'] ) && $args['form_id'] == UM()->shortcodes()->core_login_form() && UM()->form()->errors && !isset( $_POST[ UM()->honeypot ] ) ) { + exit( wp_redirect( um_get_core_page('login') ) ); } - add_action( 'wp_login', 'um_store_lastlogin_timestamp_' ); - function um_store_lastlogin_timestamp_( $login ) { - $user = get_user_by('login',$login); - um_store_lastlogin_timestamp( $user->ID ); +} +add_action( 'um_submit_form_errors_hook_logincheck', 'um_submit_form_errors_hook_logincheck', 9999 ); + + +/** + * Store last login timestamp + * + * @param $user_id + */ +function um_store_lastlogin_timestamp( $user_id ) { + update_user_meta( $user_id, '_um_last_login', current_time( 'timestamp' ) ); +} +add_action( 'um_on_login_before_redirect', 'um_store_lastlogin_timestamp', 10, 1 ); + + +/** + * @param $login + */ +function um_store_lastlogin_timestamp_( $login ) { + $user = get_user_by( 'login', $login ); + um_store_lastlogin_timestamp( $user->ID ); +} +add_action( 'wp_login', 'um_store_lastlogin_timestamp_' ); + + +/** + * Login user process + * + * @param array $args + */ +function um_user_login( $args ) { + extract( $args ); + + $rememberme = ( isset( $args['rememberme'] ) && 1 == $args['rememberme'] && isset( $_REQUEST['rememberme'] ) ) ? 1 : 0; + + if ( ( UM()->options()->get('deny_admin_frontend_login') && ! isset( $_GET['provider'] ) ) && strrpos( um_user('wp_roles' ), 'administrator' ) !== false ) { + wp_die( __('This action has been prevented for security measures.','ultimate-member') ); } + UM()->user()->auto_login( um_user( 'ID' ), $rememberme ); + /** - * Login user process + * UM hook * - * @param array $args + * @type action + * @title um_on_login_before_redirect + * @description Hook that runs after successful login and before user is redirected + * @input_vars + * [{"var":"$user_id","type":"int","desc":"User ID"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_on_login_before_redirect', 'function_name', 10, 1 ); + * @example + * */ - function um_user_login( $args ) { - extract( $args ); + do_action( 'um_on_login_before_redirect', um_user( 'ID' ) ); - $rememberme = ( isset( $args['rememberme'] ) && 1 == $args['rememberme'] && isset( $_REQUEST['rememberme'] ) ) ? 1 : 0; - - if ( ( UM()->options()->get('deny_admin_frontend_login') && ! isset( $_GET['provider'] ) ) && strrpos( um_user('wp_roles' ), 'administrator' ) !== false ) { - wp_die( __('This action has been prevented for security measures.','ultimate-member') ); - } - - UM()->user()->auto_login( um_user( 'ID' ), $rememberme ); - - /** - * UM hook - * - * @type action - * @title um_on_login_before_redirect - * @description Hook that runs after successful login and before user is redirected - * @input_vars - * [{"var":"$user_id","type":"int","desc":"User ID"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_on_login_before_redirect', 'function_name', 10, 1 ); - * @example - * - */ - do_action( 'um_on_login_before_redirect', um_user( 'ID' ) ); - - // Priority redirect - if ( ! empty( $args['redirect_to'] ) ) { - exit( wp_redirect( $args['redirect_to'] ) ); - } - - // Role redirect - $after_login = um_user( 'after_login' ); - if ( empty( $after_login ) ) - exit( wp_redirect( um_user_profile_url() ) ); - - switch( $after_login ) { - - case 'redirect_admin': - exit( wp_redirect( admin_url() ) ); - break; - - case 'redirect_url': - /** - * UM hook - * - * @type filter - * @title um_login_redirect_url - * @description Change redirect URL after successful login - * @input_vars - * [{"var":"$url","type":"string","desc":"Redirect URL"}, - * {"var":"$id","type":"int","desc":"User ID"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * - */ - $redirect_url = apply_filters( 'um_login_redirect_url', um_user( 'login_redirect_url' ), um_user( 'ID' ) ); - exit( wp_redirect( $redirect_url ) ); - break; - - case 'refresh': - exit( wp_redirect( UM()->permalinks()->get_current_url() ) ); - break; - - case 'redirect_profile': - default: - exit( wp_redirect( um_user_profile_url() ) ); - break; - - } + // Priority redirect + if ( ! empty( $args['redirect_to'] ) ) { + exit( wp_redirect( $args['redirect_to'] ) ); } - add_action( 'um_user_login', 'um_user_login', 10 ); + // Role redirect + $after_login = um_user( 'after_login' ); + if ( empty( $after_login ) ) + exit( wp_redirect( um_user_profile_url() ) ); - /*** - *** @form processing - ***/ - add_action( 'um_submit_form_login', 'um_submit_form_login', 10 ); - function um_submit_form_login( $args ) { + switch( $after_login ) { - if ( ! isset( UM()->form()->errors ) ) { + case 'redirect_admin': + exit( wp_redirect( admin_url() ) ); + break; + + case 'redirect_url': /** * UM hook * - * @type action - * @title um_user_login - * @description Hook that runs after successful submit login form + * @type filter + * @title um_login_redirect_url + * @description Change redirect URL after successful login * @input_vars - * [{"var":"$args","type":"array","desc":"Form data"}] + * [{"var":"$url","type":"string","desc":"Redirect URL"}, + * {"var":"$id","type":"int","desc":"User ID"}] * @change_log * ["Since: 2.0"] - * @usage add_action( 'um_user_login', 'function_name', 10, 1 ); + * @usage + * * @example * */ - do_action( 'um_user_login', $args ); - } + $redirect_url = apply_filters( 'um_login_redirect_url', um_user( 'login_redirect_url' ), um_user( 'ID' ) ); + exit( wp_redirect( $redirect_url ) ); + break; + case 'refresh': + exit( wp_redirect( UM()->permalinks()->get_current_url() ) ); + break; + + case 'redirect_profile': + default: + exit( wp_redirect( um_user_profile_url() ) ); + break; + + } +} +add_action( 'um_user_login', 'um_user_login', 10 ); + + +/** + * Form processing + * + * @param $args + */ +function um_submit_form_login( $args ) { + + if ( ! isset( UM()->form()->errors ) ) { /** * UM hook * * @type action - * @title um_user_login_extra_hook + * @title um_user_login * @description Hook that runs after successful submit login form * @input_vars * [{"var":"$args","type":"array","desc":"Form data"}] * @change_log * ["Since: 2.0"] - * @usage add_action( 'um_user_login_extra_hook', 'function_name', 10, 1 ); + * @usage add_action( 'um_user_login', 'function_name', 10, 1 ); * @example * */ - do_action( 'um_user_login_extra_hook', $args ); + do_action( 'um_user_login', $args ); } - /*** - *** @Show the submit button - ***/ - add_action('um_after_login_fields', 'um_add_submit_button_to_login', 1000); - function um_add_submit_button_to_login($args){ - // DO NOT add when reviewing user's details - if ( UM()->user()->preview == true && is_admin() ) return; + /** + * UM hook + * + * @type action + * @title um_user_login_extra_hook + * @description Hook that runs after successful submit login form + * @input_vars + * [{"var":"$args","type":"array","desc":"Form data"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_user_login_extra_hook', 'function_name', 10, 1 ); + * @example + * + */ + do_action( 'um_user_login_extra_hook', $args ); +} +add_action( 'um_submit_form_login', 'um_submit_form_login', 10 ); - $primary_btn_word = $args['primary_btn_word']; - /** - * UM hook - * - * @type filter - * @title um_login_form_button_one - * @description Change Login Form Primary button - * @input_vars - * [{"var":"$primary_btn_word","type":"string","desc":"Button text"}, - * {"var":"$args","type":"array","desc":"Login Form arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * - */ - $primary_btn_word = apply_filters('um_login_form_button_one', $primary_btn_word, $args ); - $secondary_btn_word = $args['secondary_btn_word']; - /** - * UM hook - * - * @type filter - * @title um_login_form_button_two - * @description Change Login Form Secondary button - * @input_vars - * [{"var":"$secondary_btn_word","type":"string","desc":"Button text"}, - * {"var":"$args","type":"array","desc":"Login Form arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * - */ - $secondary_btn_word = apply_filters('um_login_form_button_two', $secondary_btn_word, $args ); +/** + * Show the submit button + * + * @param $args + */ +function um_add_submit_button_to_login( $args ) { + // DO NOT add when reviewing user's details + if ( UM()->user()->preview == true && is_admin() ) return; - $secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('register'); - /** - * UM hook - * - * @type filter - * @title um_login_form_button_two_url - * @description Change Login Form Secondary button URL - * @input_vars - * [{"var":"$secondary_btn_url","type":"string","desc":"Button URL"}, - * {"var":"$args","type":"array","desc":"Login Form arguments"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * - */ - $secondary_btn_url = apply_filters('um_login_form_button_two_url', $secondary_btn_url, $args ); + $primary_btn_word = $args['primary_btn_word']; + /** + * UM hook + * + * @type filter + * @title um_login_form_button_one + * @description Change Login Form Primary button + * @input_vars + * [{"var":"$primary_btn_word","type":"string","desc":"Button text"}, + * {"var":"$args","type":"array","desc":"Login Form arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage + * + * @example + * + */ + $primary_btn_word = apply_filters('um_login_form_button_one', $primary_btn_word, $args ); - ?> + $secondary_btn_word = $args['secondary_btn_word']; + /** + * UM hook + * + * @type filter + * @title um_login_form_button_two + * @description Change Login Form Secondary button + * @input_vars + * [{"var":"$secondary_btn_word","type":"string","desc":"Button text"}, + * {"var":"$args","type":"array","desc":"Login Form arguments"}] + * @change_log + * ["Since: 2.0"] + * @usage + * + * @example + * + */ + $secondary_btn_word = apply_filters('um_login_form_button_two', $secondary_btn_word, $args ); -
+ $secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('register');
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_login_form_button_two_url
+ * @description Change Login Form Secondary button URL
+ * @input_vars
+ * [{"var":"$secondary_btn_url","type":"string","desc":"Button URL"},
+ * {"var":"$args","type":"array","desc":"Login Form arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $secondary_btn_url = apply_filters('um_login_form_button_two_url', $secondary_btn_url, $args ); ?>
- fields()->checkbox('rememberme', __('Keep me signed in','ultimate-member') );
- echo '';
- } ?>
+
-
-
+ * @example
+ *
*/
- add_action('um_pre_directory_shortcode', 'um_pre_directory_shortcode');
- function um_pre_directory_shortcode($args) {
- extract( $args );
+ $search_filters = apply_filters( 'um_frontend_member_search_filters', $search_filters );
- UM()->members()->results = UM()->members()->get_members( $args );
+ if ( $args['search'] == 1 && is_array( $search_filters ) ) { // search on
- }
-
- /**
- * Member Directory Header
- */
- add_action('um_members_directory_head', 'um_members_directory_head');
- function um_members_directory_head( $args ) {
- extract( $args );
-
- if ( isset($_REQUEST['um_search']) ) {
- $is_filtering = 1;
- } else if ( UM()->is_filtering == 1 ) {
- $is_filtering = 1;
- } else {
- $is_filtering = 0;
- }
-
- if ( um_members('header') && $is_filtering && um_members('users_per_page') ) { ?>
-
-
-
+ fields()->checkbox('rememberme', __('Keep me signed in','ultimate-member') );
+ echo '';
+ } ?>
+
+
-
+
-
+
-
+
+
+
+
+
+
+/**
+ * Show Fields
+ *
+ * @param $args
+ */
+function um_add_login_fields($args){
+ echo UM()->fields()->display( 'login', $args );
+}
+add_action('um_main_login_fields', 'um_add_login_fields', 100);
-
-
- fields()->display( 'login', $args );
- }
-
- /**
- * Remove authenticate filter
- * @uses 'wp_authenticate_username_password_before'
- */
- add_action('wp_authenticate_username_password_before','um_auth_username_password_before',10,3);
- function um_auth_username_password_before( $user, $username, $password ){
- remove_filter( 'authenticate', 'wp_authenticate_username_password', 20 );
- }
+/**
+ * Remove authenticate filter
+ * @uses 'wp_authenticate_username_password_before'
+ *
+ * @param $user
+ * @param $username
+ * @param $password
+ */
+function um_auth_username_password_before( $user, $username, $password ) {
+ remove_filter( 'authenticate', 'wp_authenticate_username_password', 20 );
+}
+add_action( 'wp_authenticate_username_password_before', 'um_auth_username_password_before', 10, 3 );
\ No newline at end of file
diff --git a/includes/core/um-actions-members.php b/includes/core/um-actions-members.php
index d58a3765..7c451fa4 100644
--- a/includes/core/um-actions-members.php
+++ b/includes/core/um-actions-members.php
@@ -1,150 +1,155 @@
- $testfilter ){
- if ($testfilter && !in_array( $testfilter, (array)$search_filters ) ) {
- $search_filters[] = $testfilter;
- }
+ if ( isset($args['search_fields']) ) {
+ foreach( $args['search_fields'] as $k => $testfilter ){
+ if ($testfilter && !in_array( $testfilter, (array)$search_filters ) ) {
+ $search_filters[] = $testfilter;
}
}
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_frontend_member_search_filters
- * @description Extend Member Directory Search filter
- * @input_vars
- * [{"var":"$search_filters","type":"array","desc":"Search Filters"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $search_filters = apply_filters( 'um_frontend_member_search_filters', $search_filters );
-
- if ( $args['search'] == 1 && is_array( $search_filters ) ) { // search on
-
- $current_user_roles = um_user( 'roles' );
- if ( ! empty( $args['roles_can_search'] ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $args['roles_can_search'] ) ) <= 0 ) ) {
- return;
- }
-
- $count = count( $search_filters ); ?>
-
-
-
-
-
-
-
-
-
- '; UM()->members()->show_filter( $filter ); echo '
';
-
- }
-
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 1 ) ? um_members('header') : um_members('header_single'); ?>
-
-
+
+
+
+
+
+
+
+ '; UM()->members()->show_filter( $filter ); echo '
';
+
+ }
+
+ ?>
+
+
+
+
+
+
+
+
+
+ 1 ) { // needs pagination
+ }
+}
+add_action( 'um_members_directory_search', 'um_members_directory_search' );
+
+
+/**
+ * Pre-display Member Directory
+ *
+ * @param $args
+ */
+function um_pre_directory_shortcode( $args ) {
+ extract( $args );
+ UM()->members()->results = UM()->members()->get_members( $args );
+}
+add_action( 'um_pre_directory_shortcode', 'um_pre_directory_shortcode' );
+
+
+/**
+ * Member Directory Header
+ *
+ * @param $args
+ */
+function um_members_directory_head( $args ) {
+ extract( $args );
+
+ if ( isset($_REQUEST['um_search']) ) {
+ $is_filtering = 1;
+ } else if ( UM()->is_filtering == 1 ) {
+ $is_filtering = 1;
+ } else {
+ $is_filtering = 0;
+ }
+
+ if ( um_members('header') && $is_filtering && um_members('users_per_page') ) { ?>
+
+
+
+
+
+ 1 ) { // needs pagination
?>
@@ -153,11 +158,11 @@ if ( ! defined( 'ABSPATH' ) ) exit;
-
+
@@ -165,60 +170,63 @@ if ( ! defined( 'ABSPATH' ) ) exit;
';
+ if ( ! empty( $_REQUEST['redirect_to'] ) ) {
+ $url = $_REQUEST['redirect_to'];
+ echo '';
- } elseif ( ! empty( $args['after_login'] ) ) {
+ } elseif ( ! empty( $args['after_login'] ) ) {
- switch ( $args['after_login'] ) {
+ switch ( $args['after_login'] ) {
- case 'redirect_admin':
- $url = admin_url();
- break;
+ case 'redirect_admin':
+ $url = admin_url();
+ break;
- case 'redirect_profile':
- $url = um_user_profile_url();
- break;
+ case 'redirect_profile':
+ $url = um_user_profile_url();
+ break;
- case 'redirect_url':
- $url = $args['redirect_url'];
- break;
+ case 'redirect_url':
+ $url = $args['redirect_url'];
+ break;
- case 'refresh':
+ case 'refresh':
- $url = UM()->permalinks()->get_current_url();
+ $url = UM()->permalinks()->get_current_url();
- break;
+ break;
- }
+ }
- }
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_browser_url_redirect_to__filter
- * @description Add redirect to field to form and change URL for it
- * @input_vars
- * [{"var":"$url","type":"string","desc":"Redirect to URL"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $url = apply_filters( 'um_browser_url_redirect_to__filter', $url );
- if ( ! empty( $url ) ) {
- echo '';
- }
-
}
-
- /***
- *** @add a notice to form
- ***/
- add_action( 'um_before_form', 'um_add_update_notice', 500 );
- function um_add_update_notice( $args ) {
- extract($args);
-
- $output = '';
- $err = '';
- $success = '';
-
- if ( isset( $_REQUEST['updated'] ) && !empty( $_REQUEST['updated'] ) && ! UM()->form()->errors ) {
- switch( $_REQUEST['updated'] ) {
-
- default:
- /**
- * UM hook
- *
- * @type filter
- * @title um_custom_success_message_handler
- * @description Add custom success message
- * @input_vars
- * [{"var":"$success","type":"string","desc":"Message"},
- * {"var":"$updated","type":"array","desc":"Updated data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $success = apply_filters( "um_custom_success_message_handler", $success, $_REQUEST['updated'] );
- break;
-
- case 'account':
- $success = __('Your account was updated successfully.','ultimate-member');
- break;
-
- case 'password_changed':
- $success = __('You have successfully changed your password.','ultimate-member');
- break;
-
- case 'account_active':
- $success = __('Your account is now active! You can login.','ultimate-member');
- break;
-
- }
+
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_browser_url_redirect_to__filter
+ * @description Add redirect to field to form and change URL for it
+ * @input_vars
+ * [{"var":"$url","type":"string","desc":"Redirect to URL"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $url = apply_filters( 'um_browser_url_redirect_to__filter', $url );
+ if ( ! empty( $url ) ) {
+ echo '';
+ }
+
+}
+add_action( 'um_after_form_fields', 'um_browser_url_redirect_to' );
+
+
+/**
+ * Add a notice to form
+ *
+ * @param $args
+ */
+function um_add_update_notice( $args ) {
+ extract( $args );
+
+ $output = '';
+ $err = '';
+ $success = '';
+
+ if ( isset( $_REQUEST['updated'] ) && !empty( $_REQUEST['updated'] ) && ! UM()->form()->errors ) {
+ switch ( $_REQUEST['updated'] ) {
+ default:
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_custom_success_message_handler
+ * @description Add custom success message
+ * @input_vars
+ * [{"var":"$success","type":"string","desc":"Message"},
+ * {"var":"$updated","type":"array","desc":"Updated data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $success = apply_filters( "um_custom_success_message_handler", $success, $_REQUEST['updated'] );
+ break;
+
+ case 'account':
+ $success = __('Your account was updated successfully.','ultimate-member');
+ break;
+
+ case 'password_changed':
+ $success = __('You have successfully changed your password.','ultimate-member');
+ break;
+
+ case 'account_active':
+ $success = __('Your account is now active! You can login.','ultimate-member');
+ break;
+
}
-
- if ( isset( $_REQUEST['err'] ) && !empty( $_REQUEST['err'] ) && ! UM()->form()->errors ) {
- switch( $_REQUEST['err'] ) {
-
- default:
- /**
- * UM hook
- *
- * @type filter
- * @title um_custom_error_message_handler
- * @description Add custom error message
- * @input_vars
- * [{"var":"$error","type":"string","desc":"Error message"},
- * {"var":"$request_error","type":"array","desc":"Error data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $err = apply_filters( "um_custom_error_message_handler", $err, $_REQUEST['err'] );
- if ( !$err )
- $err = __( 'An error has been encountered', 'ultimate-member' );
- break;
-
- case 'registration_disabled':
- $err = __('Registration is currently disabled','ultimate-member');
- break;
-
- case 'blocked_email':
- $err = __('This email address has been blocked.','ultimate-member');
- break;
-
- case 'blocked_domain':
- $err = __('We do not accept registrations from that domain.','ultimate-member');
- break;
-
- case 'blocked_ip':
- $err = __('Your IP address has been blocked.','ultimate-member');
- break;
-
- case 'inactive':
- $err = __('Your account has been disabled.','ultimate-member');
- break;
-
- case 'awaiting_admin_review':
- $err = __('Your account has not been approved yet.','ultimate-member');
- break;
-
- case 'awaiting_email_confirmation':
- $err = __('Your account is awaiting e-mail verification.','ultimate-member');
- break;
-
- case 'rejected':
- $err = __('Your membership request has been rejected.','ultimate-member');
- break;
-
- }
+ }
+
+ if ( isset( $_REQUEST['err'] ) && !empty( $_REQUEST['err'] ) && ! UM()->form()->errors ) {
+ switch( $_REQUEST['err'] ) {
+
+ default:
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_custom_error_message_handler
+ * @description Add custom error message
+ * @input_vars
+ * [{"var":"$error","type":"string","desc":"Error message"},
+ * {"var":"$request_error","type":"array","desc":"Error data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $err = apply_filters( "um_custom_error_message_handler", $err, $_REQUEST['err'] );
+ if ( !$err )
+ $err = __( 'An error has been encountered', 'ultimate-member' );
+ break;
+
+ case 'registration_disabled':
+ $err = __('Registration is currently disabled','ultimate-member');
+ break;
+
+ case 'blocked_email':
+ $err = __('This email address has been blocked.','ultimate-member');
+ break;
+
+ case 'blocked_domain':
+ $err = __('We do not accept registrations from that domain.','ultimate-member');
+ break;
+
+ case 'blocked_ip':
+ $err = __('Your IP address has been blocked.','ultimate-member');
+ break;
+
+ case 'inactive':
+ $err = __('Your account has been disabled.','ultimate-member');
+ break;
+
+ case 'awaiting_admin_review':
+ $err = __('Your account has not been approved yet.','ultimate-member');
+ break;
+
+ case 'awaiting_email_confirmation':
+ $err = __('Your account is awaiting e-mail verification.','ultimate-member');
+ break;
+
+ case 'rejected':
+ $err = __('Your membership request has been rejected.','ultimate-member');
+ break;
+
}
-
- if ( isset( $err ) && !empty( $err ) ) {
- $output .= ' 1 ) ? um_members('header') : um_members('header_single'); ?>
+
+ ' . $err . '
'; - } - - if ( isset( $success ) && !empty( $success ) ) { - $output .= '' . $success . '
'; - } - - echo $output; - - } \ No newline at end of file + } + + if ( isset( $err ) && !empty( $err ) ) { + $output .= '' . $err . '
'; + } + + if ( isset( $success ) && !empty( $success ) ) { + $output .= '' . $success . '
'; + } + + echo $output; +} +add_action( 'um_before_form', 'um_add_update_notice', 500 ); \ No newline at end of file diff --git a/includes/core/um-actions-password.php b/includes/core/um-actions-password.php index a6c76914..876ca53c 100644 --- a/includes/core/um-actions-password.php +++ b/includes/core/um-actions-password.php @@ -1,340 +1,361 @@ - $val ) { - if( strstr( $key, "username_b") ){ - $user = trim( $val ); - } - } - - if ( username_exists( $user ) ) { - $data = get_user_by( 'login', $user ); - $user_email = $data->user_email; - } else if( email_exists( $user ) ) { - $data = get_user_by( 'email', $user ); - $user_email = $user; + foreach ( $_POST as $key => $val ) { + if( strstr( $key, "username_b") ){ + $user = trim( $val ); } - - UM()->password()->reset_request['user_id'] = $data->ID; - UM()->password()->reset_request['user_email'] = $user_email; - - um_fetch_user( $data->ID ); - - UM()->user()->password_reset(); - - um_reset_user(); - } - /*** - *** @process a change request - ***/ - add_action('um_change_password_process_hook','um_change_password_process_hook'); - function um_change_password_process_hook( $args ) { - extract( $args ); - - wp_set_password( $args['user_password'], $args['user_id'] ); - - delete_user_meta( $args['user_id'], 'reset_pass_hash'); - delete_user_meta( $args['user_id'], 'reset_pass_hash_token'); - delete_user_meta( $args['user_id'], 'password_rst_attempts'); - - /** - * UM hook - * - * @type action - * @title um_after_changing_user_password - * @description Hook that runs after user change their password - * @input_vars - * [{"var":"$user_id","type":"int","desc":"User ID"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_after_changing_user_password', 'function_name', 10, 1 ); - * @example - * - */ - do_action( 'um_after_changing_user_password', $args['user_id'] ); - - - if ( is_user_logged_in() ) { - wp_logout(); - } - - exit( wp_redirect( um_get_core_page('login', 'password_changed') ) ); - + if ( username_exists( $user ) ) { + $data = get_user_by( 'login', $user ); + $user_email = $data->user_email; + } else if( email_exists( $user ) ) { + $data = get_user_by( 'email', $user ); + $user_email = $user; } + UM()->password()->reset_request['user_id'] = $data->ID; + UM()->password()->reset_request['user_email'] = $user_email; + + um_fetch_user( $data->ID ); + + UM()->user()->password_reset(); + + um_reset_user(); + +} +add_action( 'um_reset_password_process_hook', 'um_reset_password_process_hook' ); + + +/** + * Process a change request + * + * @param $args + */ +function um_change_password_process_hook( $args ) { + extract( $args ); + + wp_set_password( $args['user_password'], $args['user_id'] ); + + delete_user_meta( $args['user_id'], 'reset_pass_hash'); + delete_user_meta( $args['user_id'], 'reset_pass_hash_token'); + delete_user_meta( $args['user_id'], 'password_rst_attempts'); + /** - * Overrides password changed notification + * UM hook * + * @type action + * @title um_after_changing_user_password + * @description Hook that runs after user change their password + * @input_vars + * [{"var":"$user_id","type":"int","desc":"User ID"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_after_changing_user_password', 'function_name', 10, 1 ); + * @example + * */ - add_action( 'send_password_change_email','um_send_password_change_email', 10, 1 ); - function um_send_password_change_email( $args ) { + do_action( 'um_after_changing_user_password', $args['user_id'] ); - if ( ! is_array( $args ) ) - return false; - /** - * @var $user_id - */ - extract( $args ); + if ( is_user_logged_in() ) { + wp_logout(); + } - if ( ! isset( $user_id ) ) - return false; + exit( wp_redirect( um_get_core_page('login', 'password_changed') ) ); +} +add_action( 'um_change_password_process_hook','um_change_password_process_hook' ); - um_fetch_user( $user_id ); - UM()->user()->password_changed(); - - um_reset_user(); +/** + * Overrides password changed notification + * + * @param $args + * + * @return bool + */ +function um_send_password_change_email( $args ) { + if ( ! is_array( $args ) ) return false; - } - /*** - *** @This is executed after changing password - ***/ - add_action('um_after_changing_user_password','um_after_changing_user_password'); - function um_after_changing_user_password( $user_id ) { + /** + * @var $user_id + */ + extract( $args ); - } + if ( ! isset( $user_id ) ) + return false; - /*** - *** @Error handler: reset password - ***/ - add_action('um_reset_password_errors_hook','um_reset_password_errors_hook'); - function um_reset_password_errors_hook( $args ) { + um_fetch_user( $user_id ); - if ( $_POST[ UM()->honeypot ] != '' ) - wp_die('Hello, spam bot!','ultimate-member'); + UM()->user()->password_changed(); - $form_timestamp = trim($_POST['timestamp']); - $live_timestamp = current_time( 'timestamp' ); + um_reset_user(); - if ( $form_timestamp == '' && UM()->options()->get( 'enable_timebot' ) == 1 ) - wp_die( __('Hello, spam bot!','ultimate-member') ); + return false; +} +add_action( 'send_password_change_email','um_send_password_change_email', 10, 1 ); - if ( $live_timestamp - $form_timestamp < 3 && UM()->options()->get( 'enable_timebot' ) == 1 ) - wp_die( __('Whoa, slow down! You\'re seeing this message because you tried to submit a form too fast and we think you might be a spam bot. If you are a real human being please wait a few seconds before submitting the form. Thanks!','ultimate-member') ); + +/** + * This is executed after changing password + * + * @param $user_id + */ +function um_after_changing_user_password( $user_id ) { + +} +add_action( 'um_after_changing_user_password', 'um_after_changing_user_password' ); + + +/** + * Error handler: reset password + * + * @param $args + */ +function um_reset_password_errors_hook( $args ) { + + if ( $_POST[ UM()->honeypot ] != '' ) + wp_die('Hello, spam bot!','ultimate-member'); + + $form_timestamp = trim($_POST['timestamp']); + $live_timestamp = current_time( 'timestamp' ); + + if ( $form_timestamp == '' && UM()->options()->get( 'enable_timebot' ) == 1 ) + wp_die( __('Hello, spam bot!','ultimate-member') ); + + if ( $live_timestamp - $form_timestamp < 3 && UM()->options()->get( 'enable_timebot' ) == 1 ) + wp_die( __('Whoa, slow down! You\'re seeing this message because you tried to submit a form too fast and we think you might be a spam bot. If you are a real human being please wait a few seconds before submitting the form. Thanks!','ultimate-member') ); - $user = ""; + $user = ""; - foreach ( $_POST as $key => $val ) { - if( strstr( $key, "username_b") ){ - $user = trim( $val ); - } - } - - if ( empty( $user ) ) { - UM()->form()->add_error('username_b', __('Please provide your username or email','ultimate-member') ); + foreach ( $_POST as $key => $val ) { + if( strstr( $key, "username_b") ){ + $user = trim( $val ); } + } - if ( ( !is_email( $user ) && !username_exists( $user ) ) || ( is_email( $user ) && !email_exists( $user ) ) ) { - UM()->form()->add_error('username_b', __('We can\'t find an account registered with that address or username','ultimate-member') ); + if ( empty( $user ) ) { + UM()->form()->add_error('username_b', __('Please provide your username or email','ultimate-member') ); + } + + if ( ( !is_email( $user ) && !username_exists( $user ) ) || ( is_email( $user ) && !email_exists( $user ) ) ) { + UM()->form()->add_error('username_b', __('We can\'t find an account registered with that address or username','ultimate-member') ); + } else { + + if ( is_email( $user ) ) { + $user_id = email_exists( $user ); } else { + $user_id = username_exists( $user ); + } - if ( is_email( $user ) ) { - $user_id = email_exists( $user ); + $attempts = (int)get_user_meta( $user_id, 'password_rst_attempts', true ); + $is_admin = user_can( intval( $user_id ),'manage_options' ); + + if ( UM()->options()->get( 'enable_reset_password_limit' ) ) { // if reset password limit is set + + if ( UM()->options()->get( 'disable_admin_reset_password_limit' ) && $is_admin ) { + // Triggers this when a user has admin capabilities and when reset password limit is disabled for admins } else { - $user_id = username_exists( $user ); - } - - $attempts = (int)get_user_meta( $user_id, 'password_rst_attempts', true ); - $is_admin = user_can( intval( $user_id ),'manage_options' ); - - if ( UM()->options()->get( 'enable_reset_password_limit' ) ) { // if reset password limit is set - - if ( UM()->options()->get( 'disable_admin_reset_password_limit' ) && $is_admin ) { - // Triggers this when a user has admin capabilities and when reset password limit is disabled for admins + $limit = UM()->options()->get( 'reset_password_limit_number' ); + if ( $attempts >= $limit ) { + UM()->form()->add_error('username_b', __('You have reached the limit for requesting password change for this user already. Contact support if you cannot open the email','ultimate-member') ); } else { - $limit = UM()->options()->get( 'reset_password_limit_number' ); - if ( $attempts >= $limit ) { - UM()->form()->add_error('username_b', __('You have reached the limit for requesting password change for this user already. Contact support if you cannot open the email','ultimate-member') ); - } else { - update_user_meta( $user_id, 'password_rst_attempts', $attempts + 1 ); - } + update_user_meta( $user_id, 'password_rst_attempts', $attempts + 1 ); } - - } - } - - } - - /*** - *** @Error handler: changing password - ***/ - add_action('um_change_password_errors_hook','um_change_password_errors_hook'); - function um_change_password_errors_hook( $args ) { - if ( isset( $_POST[ UM()->honeypot ] ) && $_POST[ UM()->honeypot ] != '' ){ - wp_die('Hello, spam bot!','ultimate-member'); - } - - $form_timestamp = trim($_POST['timestamp']); - $live_timestamp = current_time( 'timestamp' ); - - if ( $form_timestamp == '' && UM()->options()->get( 'enable_timebot' ) == 1 ) - wp_die( __('Hello, spam bot!','ultimate-member') ); - - if ( $live_timestamp - $form_timestamp < 3 && UM()->options()->get( 'enable_timebot' ) == 1 ) { - wp_die( __('Whoa, slow down! You\'re seeing this message because you tried to submit a form too fast and we think you might be a spam bot. If you are a real human being please wait a few seconds before submitting the form. Thanks!','ultimate-member') ); - } - - $reset_pass_hash = ''; - - if( isset( $_REQUEST['act'] ) && $_REQUEST['act'] == 'reset_password' && um_is_core_page('password-reset') ){ - $reset_pass_hash = get_user_meta( $args['user_id'], 'reset_pass_hash', true ); - - } - - if( !is_user_logged_in() && isset( $args ) && ! um_is_core_page('password-reset') || - is_user_logged_in() && isset( $args['user_id'] ) && $args['user_id'] != get_current_user_id() || - !is_user_logged_in() && isset( $_REQUEST['hash'] ) && $reset_pass_hash != $_REQUEST['hash'] && um_is_core_page('password-reset') - ){ - wp_die( __( 'This is not possible for security reasons.','ultimate-member') ); - } - - if ( isset( $args['user_password'] ) && empty( $args['user_password'] ) ) { - UM()->form()->add_error('user_password', __('You must enter a new password','ultimate-member') ); - } - - if ( UM()->options()->get( 'reset_require_strongpass' ) ) { - - if ( strlen( utf8_decode( $args['user_password'] ) ) < 8 ) { - UM()->form()->add_error('user_password', __('Your password must contain at least 8 characters','ultimate-member') ); - } - - if ( strlen( utf8_decode( $args['user_password'] ) ) > 30 ) { - UM()->form()->add_error('user_password', __('Your password must contain less than 30 characters','ultimate-member') ); - } - - if ( ! UM()->validation()->strong_pass( $args['user_password'] ) ) { - UM()->form()->add_error('user_password', __('Your password must contain at least one lowercase letter, one capital letter and one number','ultimate-member') ); } } + } - if ( isset( $args['confirm_user_password'] ) && empty( $args['confirm_user_password'] ) ) { - UM()->form()->add_error('confirm_user_password', __('You must confirm your new password','ultimate-member') ); +} +add_action( 'um_reset_password_errors_hook', 'um_reset_password_errors_hook' ); + + +/** + * Error handler: changing password + * + * @param $args + */ +function um_change_password_errors_hook( $args ) { + if ( isset( $_POST[ UM()->honeypot ] ) && $_POST[ UM()->honeypot ] != '' ){ + wp_die('Hello, spam bot!','ultimate-member'); + } + + $form_timestamp = trim($_POST['timestamp']); + $live_timestamp = current_time( 'timestamp' ); + + if ( $form_timestamp == '' && UM()->options()->get( 'enable_timebot' ) == 1 ) + wp_die( __('Hello, spam bot!','ultimate-member') ); + + if ( $live_timestamp - $form_timestamp < 3 && UM()->options()->get( 'enable_timebot' ) == 1 ) { + wp_die( __('Whoa, slow down! You\'re seeing this message because you tried to submit a form too fast and we think you might be a spam bot. If you are a real human being please wait a few seconds before submitting the form. Thanks!','ultimate-member') ); + } + + $reset_pass_hash = ''; + + if( isset( $_REQUEST['act'] ) && $_REQUEST['act'] == 'reset_password' && um_is_core_page('password-reset') ){ + $reset_pass_hash = get_user_meta( $args['user_id'], 'reset_pass_hash', true ); + + } + + if( !is_user_logged_in() && isset( $args ) && ! um_is_core_page('password-reset') || + is_user_logged_in() && isset( $args['user_id'] ) && $args['user_id'] != get_current_user_id() || + !is_user_logged_in() && isset( $_REQUEST['hash'] ) && $reset_pass_hash != $_REQUEST['hash'] && um_is_core_page('password-reset') + ){ + wp_die( __( 'This is not possible for security reasons.','ultimate-member') ); + } + + if ( isset( $args['user_password'] ) && empty( $args['user_password'] ) ) { + UM()->form()->add_error('user_password', __('You must enter a new password','ultimate-member') ); + } + + if ( UM()->options()->get( 'reset_require_strongpass' ) ) { + + if ( strlen( utf8_decode( $args['user_password'] ) ) < 8 ) { + UM()->form()->add_error('user_password', __('Your password must contain at least 8 characters','ultimate-member') ); } - if ( isset( $args['user_password'] ) && isset( $args['confirm_user_password'] ) && $args['user_password'] != $args['confirm_user_password'] ) { - UM()->form()->add_error('confirm_user_password', __('Your passwords do not match','ultimate-member') ); + if ( strlen( utf8_decode( $args['user_password'] ) ) > 30 ) { + UM()->form()->add_error('user_password', __('Your password must contain less than 30 characters','ultimate-member') ); + } + + if ( ! UM()->validation()->strong_pass( $args['user_password'] ) ) { + UM()->form()->add_error('user_password', __('Your password must contain at least one lowercase letter, one capital letter and one number','ultimate-member') ); } } - /*** - *** @hidden fields - ***/ - add_action('um_change_password_page_hidden_fields','um_change_password_page_hidden_fields'); - function um_change_password_page_hidden_fields( $args ) { - - ?> - - - - - - form()->add_error('confirm_user_password', __('You must confirm your new password','ultimate-member') ); } - /*** - *** @hidden fields - ***/ - add_action('um_reset_password_page_hidden_fields','um_reset_password_page_hidden_fields'); - function um_reset_password_page_hidden_fields( $args ) { - - ?> - - - - form()->add_error('confirm_user_password', __('Your passwords do not match','ultimate-member') ); } - /*** - *** @form content - ***/ - add_action('um_reset_password_form', 'um_reset_password_form'); - function um_reset_password_form($args) { +} +add_action( 'um_change_password_errors_hook', 'um_change_password_errors_hook' ); - $fields = UM()->builtin()->get_specific_fields('password_reset_text,username_b'); ?> - $data ) { - $output .= UM()->fields()->edit_field( $key, $data ); - } echo $output; ?> +/** + * Hidden fields + * + * @param $args + */ +function um_change_password_page_hidden_fields( $args ) { + ?> - - */ - do_action( 'um_after_password_reset_fields', $args ); ?> + -
+
-
+
-
+/**
+ * Hidden fields
+ *
+ * @param $args
+ */
+function um_reset_password_page_hidden_fields( $args ) {
+ ?>
-
- }
+ builtin()->get_specific_fields('user_password'); ?>
+/**
+ * Form content
+ *
+ * @param $args
+ */
+function um_reset_password_form( $args ) {
- $data ) {
- $output .= UM()->fields()->edit_field( $key, $data );
- }echo $output; ?>
+ $fields = UM()->builtin()->get_specific_fields('password_reset_text,username_b'); ?>
-
+ $data ) {
+ $output .= UM()->fields()->edit_field( $key, $data );
+ } echo $output; ?>
-
+
+ */
+ do_action( 'um_after_password_reset_fields', $args ); ?>
-
+
- }
+
+
+ builtin()->get_specific_fields('user_password'); ?>
+
+ $data ) {
+ $output .= UM()->fields()->edit_field( $key, $data );
+ }echo $output; ?>
+
+
-
+
-
+
+
+
+
+
+
+
+ fields()->editing == 1 && UM()->fields()->set_mode == 'profile' && UM()->user()->target_id) { ?>
+/**
+ * If editing another user
+ *
+ * @param $args
+ */
+function um_editing_user_id_input( $args ) {
+ if ( UM()->fields()->editing == 1 && UM()->fields()->set_mode == 'profile' && UM()->user()->target_id ) { ?>
-
+
- options()->get( 'profile_desc' ) );
+ $user_id = um_user( 'ID' );
+ $url = um_user_profile_url();
+
+ if (um_profile( 'profile_photo' )) {
+ $avatar = um_user_uploads_uri() . um_profile( 'profile_photo' );
+ } else {
+ $avatar = um_get_default_avatar_uri();
}
+
+ um_reset_user(); ?>
+
+
+
+
+
+
+
+
+
+ options()->get( 'profile_desc' ) );
- $user_id = um_user( 'ID' );
- $url = um_user_profile_url();
+ $default_cover = UM()->options()->get( 'default_cover' );
- if (um_profile( 'profile_photo' )) {
- $avatar = um_user_uploads_uri() . um_profile( 'profile_photo' );
- } else {
- $avatar = um_get_default_avatar_uri();
- }
-
- um_reset_user(); ?>
-
-
-
-
-
-
-
-
-
- options()->get( 'default_cover' );
-
- $overlay = '
+ $overlay = '';
- ?>
+ ?>
-
-
-
- */
- do_action( 'um_cover_area_content', um_profile_id() );
- if ( UM()->fields()->editing ) {
-
- $items = array(
- '' . __( 'Change cover photo', 'ultimate-member' ) . '',
- '' . __( 'Remove', 'ultimate-member' ) . '',
- '' . __( 'Cancel', 'ultimate-member' ) . '',
- );
-
- echo UM()->profile()->new_ui( 'bc', 'div.um-cover', 'click', $items );
-
- }
-
- UM()->fields()->add_hidden_field( 'cover_photo' );
-
- echo $overlay; ?>
-
-
+
-
-
-
- mobile()->isMobile()) {
- if (UM()->mobile()->isTablet()) {
- echo um_user( 'cover_photo', 1000 );
- } else {
- echo um_user( 'cover_photo', 300 );
- }
- } else {
- echo um_user( 'cover_photo', 1000 );
- }
-
- ?>
-
- ';
-
- } else {
-
- if (!isset( UM()->user()->cannot_edit )) { ?>
-
-
-
-
-
-
-
-
+ */
+ do_action( 'um_cover_area_content', um_profile_id() );
+ if ( UM()->fields()->editing ) {
- }
+ $items = array(
+ '' . __( 'Change cover photo', 'ultimate-member' ) . '',
+ '' . __( 'Remove', 'ultimate-member' ) . '',
+ '' . __( 'Cancel', 'ultimate-member' ) . '',
+ );
+
+ echo UM()->profile()->new_ui( 'bc', 'div.um-cover', 'click', $items );
+
+ }
+
+ UM()->fields()->add_hidden_field( 'cover_photo' );
+
+ echo $overlay; ?>
+
+
+
+ ';
- UM()->fields()->show_social_urls();
- echo '';
- }
+/**
+ * Show social links as icons below profile name
+ *
+ * @param $args
+ */
+function um_social_links_icons( $args ) {
+ if ( ! empty( $args['show_social_links'] ) ) {
+
+ echo '
+
+
+
+ mobile()->isMobile()) {
+ if (UM()->mobile()->isTablet()) {
+ echo um_user( 'cover_photo', 1000 );
+ } else {
+ echo um_user( 'cover_photo', 300 );
+ }
+ } else {
+ echo um_user( 'cover_photo', 1000 );
+ }
+
+ ?>
+
+ ';
+
+ } else {
+
+ if (!isset( UM()->user()->cannot_edit )) { ?>
+
+
+
+
+
+
+
+ ';
+ UM()->fields()->show_social_urls();
+ echo '
';
+
+ }
+}
+add_action( 'um_after_profile_header_name_args', 'um_social_links_icons', 50 );
+
+
+/**
+ * Profile header
+ *
+ * @param $args
+ */
+function um_profile_header( $args ) {
+ $classes = null;
+
+ if (!$args['cover_enabled']) {
+ $classes .= ' no-cover';
}
- /***
- *** @profile header
- ***/
- add_action( 'um_profile_header', 'um_profile_header', 9 );
- function um_profile_header( $args ) {
- $classes = null;
+ $default_size = str_replace( 'px', '', $args['photosize'] );
- if (!$args['cover_enabled']) {
- $classes .= ' no-cover';
- }
-
- $default_size = str_replace( 'px', '', $args['photosize'] );
-
- $overlay = '
+ $overlay = '';
- ?>
+ ?>
-
+
+
+ fields()->editing == false ) {
+ UM()->fields()->viewing = 1;
+
+ if ( um_get_requested_user() ) {
+ if ( ! um_can_view_profile( um_get_requested_user() ) && ! um_is_myprofile() )
+ um_redirect_home();
+
+ if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) )
+ UM()->user()->cannot_edit = 1;
+
+ um_fetch_user( um_get_requested_user() );
+ } else {
+ if ( ! is_user_logged_in() )
+ um_redirect_home();
+
+ if ( ! um_user( 'can_edit_profile' ) )
+ UM()->user()->cannot_edit = 1;
+ }
}
- /***
- *** @Show the submit button (highest priority)
- ***/
- add_action( 'um_after_profile_fields', 'um_add_submit_button_to_profile', 1000 );
- function um_add_submit_button_to_profile( $args ) {
- // DO NOT add when reviewing user's details
- if (UM()->user()->preview == true && is_admin()) return;
+ if ( $mode == 'profile' && UM()->fields()->editing == true ) {
+ UM()->fields()->editing = 1;
- // only when editing
- if (UM()->fields()->editing == false) return;
+ if ( um_get_requested_user() ) {
+ if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) ) {
+ um_redirect_home();
+ }
+ um_fetch_user( um_get_requested_user() );
+ }
+
+ }
+
+}
+add_action( 'um_pre_profile_shortcode', 'um_pre_profile_shortcode' );
+
+
+/**
+ * Display the edit profile icon
+ *
+ * @param $args
+ */
+function um_add_edit_icon( $args ) {
+ $output = '';
+
+ if (!is_user_logged_in()) return; // not allowed for guests
+
+ if (isset( UM()->user()->cannot_edit ) && UM()->user()->cannot_edit == 1) return; // do not proceed if user cannot edit
+
+ if (UM()->fields()->editing == true) {
?>
-
+
+
+ */
+ do_action( 'um_pre_header_editprofile', $args ); ?>
+
+
+
- fields()->editing == false) {
- UM()->fields()->viewing = 1;
-
- if ( um_get_requested_user() ) {
- if ( ! um_can_view_profile( um_get_requested_user() ) && ! um_is_myprofile() )
- um_redirect_home();
-
- if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) )
- UM()->user()->cannot_edit = 1;
-
- um_fetch_user( um_get_requested_user() );
- } else {
- if ( ! is_user_logged_in() )
- um_redirect_home();
-
- if ( ! um_user( 'can_edit_profile' ) )
- UM()->user()->cannot_edit = 1;
- }
+ fields()->is_error( 'profile_photo' ) ) {
+ echo UM()->fields()->field_error( UM()->fields()->show_error( 'profile_photo' ), 'force_show' );
}
- if ($mode == 'profile' && UM()->fields()->editing == true) {
- UM()->fields()->editing = 1;
-
- if (um_get_requested_user()) {
- if (!UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() )) um_redirect_home();
- um_fetch_user( um_get_requested_user() );
- }
-
- }
-
- }
-
- /***
- *** @display the edit profile icon
- ***/
- add_action( 'um_pre_header_editprofile', 'um_add_edit_icon' );
- function um_add_edit_icon( $args ) {
- $output = '';
-
- if (!is_user_logged_in()) return; // not allowed for guests
-
- if (isset( UM()->user()->cannot_edit ) && UM()->user()->cannot_edit == 1) return; // do not proceed if user cannot edit
-
- if (UM()->fields()->editing == true) {
-
- ?>
-
-
-
-
-
-
+
+
- */
- do_action( 'um_pre_header_editprofile', $args ); ?>
-
+
+ if (!isset( UM()->user()->cannot_edit )) {
-
+ UM()->fields()->add_hidden_field( 'profile_photo' );
- user()->cannot_edit )) {
+ $items = array(
+ '' . __( 'Upload photo', 'ultimate-member' ) . '',
+ '' . __( 'Cancel', 'ultimate-member' ) . '',
+ );
- UM()->fields()->add_hidden_field( 'profile_photo' );
-
- if (!um_profile( 'profile_photo' )) { // has profile photo
-
- $items = array(
- '' . __( 'Upload photo', 'ultimate-member' ) . '',
- '' . __( 'Cancel', 'ultimate-member' ) . '',
- );
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_user_photo_menu_view
- * @description Change user photo on menu view
- * @input_vars
- * [{"var":"$items","type":"array","desc":"User Photos"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $items = apply_filters( 'um_user_photo_menu_view', $items );
-
- echo UM()->profile()->new_ui( 'bc', 'div.um-profile-photo', 'click', $items );
-
- } else if (UM()->fields()->editing == true) {
-
- $items = array(
- '' . __( 'Change photo', 'ultimate-member' ) . '',
- '' . __( 'Remove photo', 'ultimate-member' ) . '',
- '' . __( 'Cancel', 'ultimate-member' ) . '',
- );
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_user_photo_menu_edit
- * @description Change user photo on menu edit
- * @input_vars
- * [{"var":"$items","type":"array","desc":"User Photos"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $items = apply_filters( 'um_user_photo_menu_edit', $items );
-
- echo UM()->profile()->new_ui( 'bc', 'div.um-profile-photo', 'click', $items );
-
- }
-
- }
-
- ?>
-
-
-
-
+
+
- fields()->is_error( 'profile_photo' ) ) {
- echo UM()->fields()->field_error( UM()->fields()->show_error( 'profile_photo' ), 'force_show' );
- }
+
+
+
+
+ fields()->viewing == true && um_user( 'description' ) && $args['show_bio']) { ?>
+
+
+
+ fields()->editing == true && $args['show_bio']) { ?>
+
+
+
+
+
+
+
+
+
+
*/
- do_action( 'um_after_header_info', um_user( 'ID' ), $args ); ?>
+ do_action( 'um_after_header_meta', um_user( 'ID' ), $args ); ?>
-
-
-
-
- '' . __( 'Edit Profile', 'ultimate-member' ) . '',
- 'myaccount' => '' . __( 'My Account', 'ultimate-member' ) . '',
- 'logout' => '' . __( 'Logout', 'ultimate-member' ) . '',
- 'cancel' => '' . __( 'Cancel', 'ultimate-member' ) . '',
- );
-
- $cancel = $items['cancel'];
-
- if (!um_is_myprofile()) {
-
- $actions = UM()->user()->get_admin_actions();
-
- unset( $items['myaccount'] );
- unset( $items['logout'] );
- unset( $items['cancel'] );
-
- if (is_array( $actions )) {
- $items = array_merge( $items, $actions );
- }
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_profile_edit_menu_items
- * @description Edit menu items on profile page
- * @input_vars
- * [{"var":"$items","type":"array","desc":"User Menu"},
- * {"var":"$user_id","type":"int","desc":"Profile ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $items = apply_filters( 'um_profile_edit_menu_items', $items, um_profile_id() );
-
- $items['cancel'] = $cancel;
-
- } else {
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_myprofile_edit_menu_items
- * @description Edit menu items on my profile page
- * @input_vars
- * [{"var":"$items","type":"array","desc":"User Menu"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $items = apply_filters( 'um_myprofile_edit_menu_items', $items );
-
- }
-
- UM()->profile()->new_ui( $args['header_menu'], 'div.um-profile-edit', 'click', $items );
-
- ?>
-
-
-
- fields()->editing == true) {
-
- echo UM()->fields()->display( 'profile', $args );
-
- } else {
-
- UM()->fields()->viewing = true;
-
- echo UM()->fields()->display_view( 'profile', $args );
-
- }
-
- }
-
- /***
- *** @form processing
- ***/
- add_action( 'um_submit_form_profile', 'um_submit_form_profile', 10 );
- function um_submit_form_profile( $args ) {
- if ( isset( UM()->form()->errors ) )
- return false;
-
/**
* UM hook
*
* @type action
- * @title um_user_edit_profile
- * @description Run on successful submit profile form
+ * @title um_after_header_info
+ * @description Insert after header info some content
* @input_vars
- * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$args","type":"array","desc":"Form Arguments"}]
* @change_log
* ["Since: 2.0"]
- * @usage add_action( 'um_user_edit_profile', 'function_name', 10, 1 );
+ * @usage add_action( 'um_after_header_info', 'function_name', 10, 2 );
* @example
*
*/
- do_action( 'um_user_edit_profile', $args );
+ do_action( 'um_after_header_info', um_user( 'ID' ), $args ); ?>
+
+
+
-
+
-
+
-
+
-
+
+ $items = array(
+ 'editprofile' => '' . __( 'Edit Profile', 'ultimate-member' ) . '',
+ 'myaccount' => '' . __( 'My Account', 'ultimate-member' ) . '',
+ 'logout' => '' . __( 'Logout', 'ultimate-member' ) . '',
+ 'cancel' => '' . __( 'Cancel', 'ultimate-member' ) . '',
+ );
+
+ $cancel = $items['cancel'];
+
+ if (!um_is_myprofile()) {
+
+ $actions = UM()->user()->get_admin_actions();
+
+ unset( $items['myaccount'] );
+ unset( $items['logout'] );
+ unset( $items['cancel'] );
+
+ if (is_array( $actions )) {
+ $items = array_merge( $items, $actions );
+ }
+
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_profile_edit_menu_items
+ * @description Edit menu items on profile page
+ * @input_vars
+ * [{"var":"$items","type":"array","desc":"User Menu"},
+ * {"var":"$user_id","type":"int","desc":"Profile ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $items = apply_filters( 'um_profile_edit_menu_items', $items, um_profile_id() );
+
+ $items['cancel'] = $cancel;
+
+ } else {
+
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_myprofile_edit_menu_items
+ * @description Edit menu items on my profile page
+ * @input_vars
+ * [{"var":"$items","type":"array","desc":"User Menu"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $items = apply_filters( 'um_myprofile_edit_menu_items', $items );
+
+ }
+
+ UM()->profile()->new_ui( $args['header_menu'], 'div.um-profile-edit', 'click', $items );
+
+ ?>
+
+
fields()->editing == true ) {
+
+ echo UM()->fields()->display( 'profile', $args );
+
+ } else {
+
+ UM()->fields()->viewing = true;
+
+ echo UM()->fields()->display_view( 'profile', $args );
+
+ }
+
+}
+add_action( 'um_main_profile_fields', 'um_add_profile_fields', 100 );
+
+
+/**
+ * Form processing
+ *
+ * @param $args
+ */
+function um_submit_form_profile( $args ) {
+ if ( isset( UM()->form()->errors ) ) {
+ return;
+ }
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_user_edit_profile
+ * @description Run on successful submit profile form
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_user_edit_profile', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( 'um_user_edit_profile', $args );
+}
+add_action( 'um_submit_form_profile', 'um_submit_form_profile', 10 );
+
+
+/**
+ * Show the submit button (highest priority)
+ *
+ * @param $args
+ */
+function um_add_submit_button_to_profile( $args ) {
+ // DO NOT add when reviewing user's details
+ if (UM()->user()->preview == true && is_admin()) return;
+
+ // only when editing
+ if (UM()->fields()->editing == false) return;
+
+ ?>
+
+
+
+
-
+
$tab ) {
@@ -1402,8 +1431,8 @@ function um_before_user_upload( $user_id, $arr_files ) {
$old_filename = um_user( $key );
if ( basename( $filename ) != basename( um_user( $key ) ) ||
- in_array( $old_filename, array( basename( um_user( $key ) ), basename( $filename ) ) ) ||
- $filename == 'empty_file' ) {
+ in_array( $old_filename, array( basename( um_user( $key ) ), basename( $filename ) ) ) ||
+ $filename == 'empty_file' ) {
$path = UM()->files()->upload_basedir;
delete_user_meta( $user_id, $old_filename );
diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php
index f6fdcbf2..14be2d80 100644
--- a/includes/core/um-actions-register.php
+++ b/includes/core/um-actions-register.php
@@ -1,710 +1,723 @@
-user()->approve();
+}
+add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook', 10, 2 );
+
+
+/**
+ * Account needs email validation
+ *
+ * @param $user_id
+ * @param $args
+ */
+function um_post_registration_checkmail_hook( $user_id, $args ) {
+ um_fetch_user( $user_id );
+
+ UM()->user()->email_pending();
+}
+add_action( 'um_post_registration_checkmail_hook', 'um_post_registration_checkmail_hook', 10, 2 );
+
+
+/**
+ * Account needs admin review
+ *
+ * @param $user_id
+ * @param $args
+ */
+function um_post_registration_pending_hook( $user_id, $args ) {
+ um_fetch_user( $user_id );
+
+ UM()->user()->pending();
+}
+add_action('um_post_registration_pending_hook', 'um_post_registration_pending_hook', 10, 2);
+
+
+/**
+ * After insert a new user
+ * run at frontend and backend
+ *
+ * @param $user_id
+ * @param $args
+ */
+function um_after_insert_user( $user_id, $args ) {
+ //clear Users cached queue
+ UM()->user()->remove_cached_queue();
+
+ if ( ! empty( $args['submitted'] ) ) {
um_fetch_user( $user_id );
-
- UM()->user()->approve();
+ UM()->user()->set_registration_details( $args['submitted'] );
}
/**
- * Account needs email validation
- */
- add_action('um_post_registration_checkmail_hook', 'um_post_registration_checkmail_hook', 10, 2);
- function um_post_registration_checkmail_hook($user_id, $args){
- um_fetch_user( $user_id );
-
- UM()->user()->email_pending();
- }
-
- /**
- * Account needs admin review
- */
- add_action('um_post_registration_pending_hook', 'um_post_registration_pending_hook', 10, 2);
- function um_post_registration_pending_hook($user_id, $args){
- um_fetch_user( $user_id );
-
- UM()->user()->pending();
- }
-
-
- /**
- * After insert a new user
- * run at frontend and backend
+ * UM hook
*
- * @param $user_id
- * @param $args
+ * @type action
+ * @title um_registration_set_extra_data
+ * @description Hook that runs after insert user to DB and there you can set any extra details
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$args","type":"array","desc":"Form data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_registration_set_extra_data', 'function_name', 10, 2 );
+ * @example
+ *
*/
- function um_after_insert_user( $user_id, $args ) {
- //clear Users cached queue
- UM()->user()->remove_cached_queue();
-
- if ( ! empty( $args['submitted'] ) ) {
- um_fetch_user( $user_id );
- UM()->user()->set_registration_details( $args['submitted'] );
- }
-
- /**
- * UM hook
- *
- * @type action
- * @title um_registration_set_extra_data
- * @description Hook that runs after insert user to DB and there you can set any extra details
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$args","type":"array","desc":"Form data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_registration_set_extra_data', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( 'um_registration_set_extra_data', $user_id, $args );
-
- /**
- * UM hook
- *
- * @type action
- * @title um_registration_complete
- * @description After complete UM user registration. Redirects handlers at 100 priority, you can add some info before redirects
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$args","type":"array","desc":"Form data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_registration_complete', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( 'um_registration_complete', $user_id, $args );
- }
- add_action( 'um_user_register', 'um_after_insert_user', 10, 2 );
-
-
- /**
- * Send notification about registration
- *
- * @param $user_id
- * @param $args
- */
- function um_send_registration_notification( $user_id, $args ) {
- um_fetch_user( $user_id );
-
- if ( um_user( 'status' ) != 'pending' ) {
- UM()->mail()->send( um_admin_email(), 'notification_new_user', array( 'admin' => true ) );
- } else {
- UM()->mail()->send( um_admin_email(), 'notification_review', array( 'admin' => true ) );
- }
- }
- add_action( 'um_registration_complete', 'um_send_registration_notification', 10, 2 );
-
-
- /**
- * Check user status and redirect it after registration
- *
- * @param $user_id
- * @param $args
- */
- function um_check_user_status( $user_id, $args ) {
- $status = um_user( 'status' );
-
- /**
- * UM hook
- *
- * @type action
- * @title um_post_registration_{$status}_hook
- * @description After complete UM user registration.
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$args","type":"array","desc":"Form data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_post_registration_{$status}_hook', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( "um_post_registration_{$status}_hook", $user_id, $args );
-
- if ( ! is_admin() ) {
-
- do_action( "track_{$status}_user_registration" );
-
- // Priority redirect
- if ( isset( $args['redirect_to'] ) ) {
- exit( wp_redirect( urldecode( $args['redirect_to'] ) ) );
- }
-
- if ( $status == 'approved' ) {
-
- UM()->user()->auto_login( $user_id );
- UM()->user()->generate_profile_slug( $user_id );
-
- /**
- * UM hook
- *
- * @type action
- * @title um_registration_after_auto_login
- * @description After complete UM user registration and autologin.
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_registration_after_auto_login', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( 'um_registration_after_auto_login', $user_id );
-
- if ( um_user( 'auto_approve_act' ) == 'redirect_url' && um_user( 'auto_approve_url' ) !== '' ) {
- exit( wp_redirect( um_user( 'auto_approve_url' ) ) );
- }
-
- if ( um_user( 'auto_approve_act' ) == 'redirect_profile' ) {
- exit( wp_redirect( um_user_profile_url() ) );
- }
-
- }
-
- if ( $status != 'approved' ) {
-
- if ( um_user( $status . '_action' ) == 'redirect_url' && um_user( $status . '_url' ) != '' ) {
- /**
- * UM hook
- *
- * @type filter
- * @title um_registration_pending_user_redirect
- * @description Change redirect URL for pending user after registration
- * @input_vars
- * [{"var":"$url","type":"string","desc":"Redirect URL"},
- * {"var":"$status","type":"string","desc":"User status"},
- * {"var":"$user_id","type":"int","desc":"User ID"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $redirect_url = apply_filters( 'um_registration_pending_user_redirect', um_user( $status . '_url' ), $status, um_user( 'ID' ) );
-
- exit( wp_redirect( $redirect_url ) );
- }
-
- if ( um_user( $status . '_action' ) == 'show_message' && um_user( $status . '_message' ) != '' ) {
-
- $url = UM()->permalinks()->get_current_url();
- $url = add_query_arg( 'message', esc_attr( $status ), $url );
- //add only priority role to URL
- $url = add_query_arg( 'um_role', esc_attr( um_user( 'role' ) ), $url );
- $url = add_query_arg( 'um_form_id', esc_attr( $args['form_id'] ), $url );
-
- exit( wp_redirect( $url ) );
- }
-
- }
-
- }
-
- }
- add_action( 'um_registration_complete', 'um_check_user_status', 100, 2 );
-
+ do_action( 'um_registration_set_extra_data', $user_id, $args );
/**
- * Registration form submit handler
+ * UM hook
*
- * @param $args
- * @return bool|int|WP_Error
+ * @type action
+ * @title um_registration_complete
+ * @description After complete UM user registration. Redirects handlers at 100 priority, you can add some info before redirects
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$args","type":"array","desc":"Form data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_registration_complete', 'function_name', 10, 2 );
+ * @example
+ *
*/
- function um_submit_form_register( $args ) {
- if ( isset( UM()->form()->errors ) )
- return false;
+ do_action( 'um_registration_complete', $user_id, $args );
+}
+add_action( 'um_user_register', 'um_after_insert_user', 10, 2 );
- /**
- * UM hook
- *
- * @type filter
- * @title um_add_user_frontend_submitted
- * @description Extend user data on registration form submit
- * @input_vars
- * [{"var":"$submitted","type":"array","desc":"Registration data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $args = apply_filters( 'um_add_user_frontend_submitted', $args );
- extract( $args );
+/**
+ * Send notification about registration
+ *
+ * @param $user_id
+ * @param $args
+ */
+function um_send_registration_notification( $user_id, $args ) {
+ um_fetch_user( $user_id );
- if ( isset( $username ) && ! isset( $user_login ) ) {
- $user_login = $username;
+ if ( um_user( 'status' ) != 'pending' ) {
+ UM()->mail()->send( um_admin_email(), 'notification_new_user', array( 'admin' => true ) );
+ } else {
+ UM()->mail()->send( um_admin_email(), 'notification_review', array( 'admin' => true ) );
+ }
+}
+add_action( 'um_registration_complete', 'um_send_registration_notification', 10, 2 );
+
+
+/**
+ * Check user status and redirect it after registration
+ *
+ * @param $user_id
+ * @param $args
+ */
+function um_check_user_status( $user_id, $args ) {
+ $status = um_user( 'status' );
+
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_post_registration_{$status}_hook
+ * @description After complete UM user registration.
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$args","type":"array","desc":"Form data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_post_registration_{$status}_hook', 'function_name', 10, 2 );
+ * @example
+ *
+ */
+ do_action( "um_post_registration_{$status}_hook", $user_id, $args );
+
+ if ( ! is_admin() ) {
+
+ do_action( "track_{$status}_user_registration" );
+
+ // Priority redirect
+ if ( isset( $args['redirect_to'] ) ) {
+ exit( wp_redirect( urldecode( $args['redirect_to'] ) ) );
}
- if ( ! empty( $first_name ) && ! empty( $last_name ) && ! isset( $user_login ) ) {
+ if ( $status == 'approved' ) {
- if ( UM()->options()->get( 'permalink_base' ) == 'name' ) {
- $user_login = rawurlencode( strtolower( str_replace( " ", ".", $first_name . " " . $last_name ) ) );
- } elseif ( UM()->options()->get( 'permalink_base' ) == 'name_dash' ) {
- $user_login = rawurlencode( strtolower( str_replace( " ", "-", $first_name . " " . $last_name ) ) );
- } elseif ( UM()->options()->get( 'permalink_base' ) == 'name_plus' ) {
- $user_login = strtolower( str_replace( " ", "+", $first_name . " " . $last_name ) );
- } else {
- $user_login = strtolower( str_replace( " ", "", $first_name . " " . $last_name ) );
- }
+ UM()->user()->auto_login( $user_id );
+ UM()->user()->generate_profile_slug( $user_id );
- // if full name exists
- $count = 1;
- while ( username_exists( $user_login ) ) {
- $user_login .= $count;
- $count++;
- }
- }
-
- if ( ! isset( $user_login ) && isset( $user_email ) && $user_email ) {
- $user_login = $user_email;
- }
-
- $unique_userID = UM()->query()->count_users() + 1;
-
- if ( ! isset( $user_login ) || strlen( $user_login ) > 30 && ! is_email( $user_login ) ) {
- $user_login = 'user' . $unique_userID;
- }
-
- if ( isset( $username ) && is_email( $username ) ) {
- $user_email = $username;
- }
-
- if ( ! isset( $user_password ) ) {
- $user_password = UM()->validation()->generate( 8 );
- }
-
- if ( ! isset( $user_email ) ) {
- $site_url = @$_SERVER['SERVER_NAME'];
- $user_email = 'nobody' . $unique_userID . '@' . $site_url;
/**
* UM hook
*
- * @type filter
- * @title um_user_register_submitted__email
- * @description Change user default email if it's empty on registration
+ * @type action
+ * @title um_registration_after_auto_login
+ * @description After complete UM user registration and autologin.
* @input_vars
- * [{"var":"$user_email","type":"string","desc":"Default email"}]
+ * [{"var":"$user_id","type":"int","desc":"User ID"}]
* @change_log
* ["Since: 2.0"]
- * @usage
- *
+ * @usage add_action( 'um_registration_after_auto_login', 'function_name', 10, 1 );
* @example
*
*/
- $user_email = apply_filters( 'um_user_register_submitted__email', $user_email );
+ do_action( 'um_registration_after_auto_login', $user_id );
+
+ if ( um_user( 'auto_approve_act' ) == 'redirect_url' && um_user( 'auto_approve_url' ) !== '' ) {
+ exit( wp_redirect( um_user( 'auto_approve_url' ) ) );
+ }
+
+ if ( um_user( 'auto_approve_act' ) == 'redirect_profile' ) {
+ exit( wp_redirect( um_user_profile_url() ) );
+ }
+
}
- $credentials = array(
- 'user_login' => $user_login,
- 'user_password' => $user_password,
- 'user_email' => trim( $user_email ),
- );
+ if ( $status != 'approved' ) {
- $args['submitted'] = array_merge( $args['submitted'], $credentials );
- $args = array_merge( $args, $credentials );
+ if ( um_user( $status . '_action' ) == 'redirect_url' && um_user( $status . '_url' ) != '' ) {
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_registration_pending_user_redirect
+ * @description Change redirect URL for pending user after registration
+ * @input_vars
+ * [{"var":"$url","type":"string","desc":"Redirect URL"},
+ * {"var":"$status","type":"string","desc":"User status"},
+ * {"var":"$user_id","type":"int","desc":"User ID"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $redirect_url = apply_filters( 'um_registration_pending_user_redirect', um_user( $status . '_url' ), $status, um_user( 'ID' ) );
- /**
- * UM hook
- *
- * @type filter
- * @title um_registration_user_role
- * @description Change user role on registration process
- * @input_vars
- * [{"var":"$role","type":"string","desc":"User role"},
- * {"var":"$submitted","type":"array","desc":"Registration data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $user_role = apply_filters( 'um_registration_user_role', UM()->form()->assigned_role( UM()->form()->form_id ), $args );
+ exit( wp_redirect( $redirect_url ) );
+ }
- $userdata = array(
- 'user_login' => $user_login,
- 'user_pass' => $user_password,
- 'user_email' => $user_email,
- 'role' => $user_role,
- );
- $user_id = wp_insert_user( $userdata );
+ if ( um_user( $status . '_action' ) == 'show_message' && um_user( $status . '_message' ) != '' ) {
- /**
- * UM hook
- *
- * @type action
- * @title um_user_register
- * @description After complete UM user registration.
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$args","type":"array","desc":"Form data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_user_register', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( 'um_user_register', $user_id, $args );
+ $url = UM()->permalinks()->get_current_url();
+ $url = add_query_arg( 'message', esc_attr( $status ), $url );
+ //add only priority role to URL
+ $url = add_query_arg( 'um_role', esc_attr( um_user( 'role' ) ), $url );
+ $url = add_query_arg( 'um_form_id', esc_attr( $args['form_id'] ), $url );
- return $user_id;
- }
- add_action( 'um_submit_form_register', 'um_submit_form_register', 10 );
+ exit( wp_redirect( $url ) );
+ }
-
- /**
- * Register user with predefined role in options
- */
- add_action( 'um_after_register_fields', 'um_add_user_role' );
- function um_add_user_role( $args ) {
-
- if ( isset( $args['custom_fields']['role_select'] ) || isset( $args['custom_fields']['role_radio'] ) ) return;
-
- $use_custom_settings = get_post_meta( $args['form_id'], '_um_register_use_custom_settings', true );
-
- if ( ! empty( $args['role'] ) && $use_custom_settings ) {
- $role = $args['role'];
- } else if( ! $use_custom_settings ) {
- $role = get_option( 'default_role' );
- }
-
- if( empty( $role ) ) return;
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_register_hidden_role_field
- * @description Display hidden role field
- * @input_vars
- * [{"var":"$role","type":"string","desc":"Hidden user role"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $role = apply_filters('um_register_hidden_role_field', $role );
- if( $role ){
- echo '';
}
}
+}
+add_action( 'um_registration_complete', 'um_check_user_status', 100, 2 );
+
+
+/**
+ * Registration form submit handler
+ *
+ * @param $args
+ * @return bool|int|WP_Error
+ */
+function um_submit_form_register( $args ) {
+ if ( isset( UM()->form()->errors ) )
+ return false;
+
/**
- * Show the submit button
+ * UM hook
+ *
+ * @type filter
+ * @title um_add_user_frontend_submitted
+ * @description Extend user data on registration form submit
+ * @input_vars
+ * [{"var":"$submitted","type":"array","desc":"Registration data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
*/
- add_action('um_after_register_fields', 'um_add_submit_button_to_register', 1000);
- function um_add_submit_button_to_register($args){
- // DO NOT add when reviewing user's details
- if ( isset( UM()->user()->preview ) && UM()->user()->preview == true && is_admin() ) return;
+ $args = apply_filters( 'um_add_user_frontend_submitted', $args );
- $primary_btn_word = $args['primary_btn_word'];
+ extract( $args );
+
+ if ( isset( $username ) && ! isset( $user_login ) ) {
+ $user_login = $username;
+ }
+
+ if ( ! empty( $first_name ) && ! empty( $last_name ) && ! isset( $user_login ) ) {
+
+ if ( UM()->options()->get( 'permalink_base' ) == 'name' ) {
+ $user_login = rawurlencode( strtolower( str_replace( " ", ".", $first_name . " " . $last_name ) ) );
+ } elseif ( UM()->options()->get( 'permalink_base' ) == 'name_dash' ) {
+ $user_login = rawurlencode( strtolower( str_replace( " ", "-", $first_name . " " . $last_name ) ) );
+ } elseif ( UM()->options()->get( 'permalink_base' ) == 'name_plus' ) {
+ $user_login = strtolower( str_replace( " ", "+", $first_name . " " . $last_name ) );
+ } else {
+ $user_login = strtolower( str_replace( " ", "", $first_name . " " . $last_name ) );
+ }
+
+ // if full name exists
+ $count = 1;
+ while ( username_exists( $user_login ) ) {
+ $user_login .= $count;
+ $count++;
+ }
+ }
+
+ if ( ! isset( $user_login ) && isset( $user_email ) && $user_email ) {
+ $user_login = $user_email;
+ }
+
+ $unique_userID = UM()->query()->count_users() + 1;
+
+ if ( ! isset( $user_login ) || strlen( $user_login ) > 30 && ! is_email( $user_login ) ) {
+ $user_login = 'user' . $unique_userID;
+ }
+
+ if ( isset( $username ) && is_email( $username ) ) {
+ $user_email = $username;
+ }
+
+ if ( ! isset( $user_password ) ) {
+ $user_password = UM()->validation()->generate( 8 );
+ }
+
+ if ( ! isset( $user_email ) ) {
+ $site_url = @$_SERVER['SERVER_NAME'];
+ $user_email = 'nobody' . $unique_userID . '@' . $site_url;
/**
* UM hook
*
* @type filter
- * @title um_register_form_button_one
- * @description Change Register Form Primary button
+ * @title um_user_register_submitted__email
+ * @description Change user default email if it's empty on registration
* @input_vars
- * [{"var":"$primary_btn_word","type":"string","desc":"Button text"},
- * {"var":"$args","type":"array","desc":"Registration Form arguments"}]
+ * [{"var":"$user_email","type":"string","desc":"Default email"}]
* @change_log
* ["Since: 2.0"]
* @usage
- *
+ *
* @example
*
*/
- $primary_btn_word = apply_filters('um_register_form_button_one', $primary_btn_word, $args );
+ $user_email = apply_filters( 'um_user_register_submitted__email', $user_email );
+ }
- $secondary_btn_word = $args['secondary_btn_word'];
- /**
- * UM hook
- *
- * @type filter
- * @title um_register_form_button_two
- * @description Change Registration Form Secondary button
- * @input_vars
- * [{"var":"$secondary_btn_word","type":"string","desc":"Button text"},
- * {"var":"$args","type":"array","desc":"Registration Form arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $secondary_btn_word = apply_filters('um_register_form_button_two', $secondary_btn_word, $args );
+ $credentials = array(
+ 'user_login' => $user_login,
+ 'user_password' => $user_password,
+ 'user_email' => trim( $user_email ),
+ );
- $secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('login');
- /**
- * UM hook
- *
- * @type filter
- * @title um_register_form_button_two_url
- * @description Change Registration Form Secondary button URL
- * @input_vars
- * [{"var":"$secondary_btn_url","type":"string","desc":"Button URL"},
- * {"var":"$args","type":"array","desc":"Registration Form arguments"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $secondary_btn_url = apply_filters('um_register_form_button_two_url', $secondary_btn_url, $args );
+ $args['submitted'] = array_merge( $args['submitted'], $credentials );
+ $args = array_merge( $args, $credentials );
- ?>
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_registration_user_role
+ * @description Change user role on registration process
+ * @input_vars
+ * [{"var":"$role","type":"string","desc":"User role"},
+ * {"var":"$submitted","type":"array","desc":"Registration data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $user_role = apply_filters( 'um_registration_user_role', UM()->form()->assigned_role( UM()->form()->form_id ), $args );
- 
';
-
- }else if( empty( $avatar ) ){
- $default_avatar_uri = um_get_default_avatar_uri();
-
- $avatar = '
';
+ $default = get_option( 'avatar_default', 'mystery' );
+ if ( $default == 'gravatar_default' ) {
+ $default = '';
}
- return $avatar;
-
+ $rating = get_option('avatar_rating');
+ if ( !empty( $rating ) ) {
+ $rating = "&r={$rating}";
+ }
+
+ if ( UM()->options()->get('use_gravatars') && ! um_user('synced_profile_photo') && ! $has_profile_photo ){
+ $avatar_url = um_get_domain_protocol().'gravatar.com/avatar/'.um_user('synced_gravatar_hashed_id');
+ $avatar_url = add_query_arg('s',400, $avatar_url);
+ $gravatar_type = UM()->options()->get( 'use_um_gravatar_default_builtin_image' );
+
+ if ( $gravatar_type == 'default' ) {
+ if ( UM()->options()->get( 'use_um_gravatar_default_image' ) ) {
+ $avatar_url = add_query_arg('d', um_get_default_avatar_uri(), $avatar_url );
+ }
+ } else {
+ $avatar_url = add_query_arg('d', $gravatar_type, $avatar_url );
+ }
+
+ }
+
+ $avatar = '';
+
+ }else if( empty( $avatar ) ){
+ $default_avatar_uri = um_get_default_avatar_uri();
+
+ $avatar = '';
}
+ return $avatar;
+}
+add_filter( 'get_avatar', 'um_get_avatar', 99999, 5 );
\ No newline at end of file
diff --git a/includes/core/um-filters-commenting.php b/includes/core/um-filters-commenting.php
index 17a21078..acadc17f 100644
--- a/includes/core/um-filters-commenting.php
+++ b/includes/core/um-filters-commenting.php
@@ -1,34 +1,37 @@
-user_id ) && ! empty( $comment->user_id ) ){
- if ( isset( UM()->user()->cached_user[ $comment->user_id ] ) && UM()->user()->cached_user[ $comment->user_id ] ) {
+ if( isset( $comment->user_id ) && ! empty( $comment->user_id ) ){
+ if ( isset( UM()->user()->cached_user[ $comment->user_id ] ) && UM()->user()->cached_user[ $comment->user_id ] ) {
- $return = '' . UM()->user()->cached_user[$comment->user_id]['name'] . '';
+ $return = '' . UM()->user()->cached_user[$comment->user_id]['name'] . '';
- } else {
+ } else {
- um_fetch_user( $comment->user_id );
+ um_fetch_user( $comment->user_id );
- UM()->user()->cached_user[ $comment->user_id ] = array('url' => um_user_profile_url(), 'name' => um_user('display_name') );
- $return = '' . UM()->user()->cached_user[$comment->user_id]['name'] . '';
+ UM()->user()->cached_user[ $comment->user_id ] = array('url' => um_user_profile_url(), 'name' => um_user('display_name') );
+ $return = '' . UM()->user()->cached_user[$comment->user_id]['name'] . '';
- um_reset_user();
+ um_reset_user();
- }
- }
-
- return $return;
+ }
}
-
\ No newline at end of file
+ return $return;
+}
+
+add_filter('get_comment_author_link', 'um_comment_link_to_profile', 10000, 3 );
\ No newline at end of file
diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php
index af8d0e7f..e68498ce 100644
--- a/includes/core/um-filters-fields.php
+++ b/includes/core/um-filters-fields.php
@@ -1,118 +1,162 @@
-options()->get( 'form_asterisk' );
- if ( $asterisk && isset( $data['required'] ) && $data['required'] == 1 )
- $label = $label . '*';
+ $asterisk = UM()->options()->get( 'form_asterisk' );
+ if ( $asterisk && isset( $data['required'] ) && $data['required'] == 1 )
+ $label = $label . '*';
- return $label;
+ return $label;
+}
+add_filter( 'um_edit_label_all_fields', 'um_edit_label_all_fields', 10, 2 );
+
+
+/**
+ * Outputs a soundcloud track
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return string|void
+ */
+function um_profile_field_filter_hook__soundcloud_track( $value, $data ) {
+
+ if ( !is_numeric( $value ) ) {
+ return __( 'Invalid soundcloud track ID', 'ultimate-member' );
}
- /***
- *** @outputs a soundcloud track
- ***/
- add_filter('um_profile_field_filter_hook__soundcloud_track', 'um_profile_field_filter_hook__soundcloud_track', 99, 2);
- function um_profile_field_filter_hook__soundcloud_track( $value, $data ) {
-
- if ( !is_numeric( $value ) ) {
- return __('Invalid soundcloud track ID','ultimate-member');
- }
-
- $value = '
+ $userdata = array(
+ 'user_login' => $user_login,
+ 'user_pass' => $user_password,
+ 'user_email' => $user_email,
+ 'role' => $user_role,
+ );
+ $user_id = wp_insert_user( $userdata );
-
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_user_register
+ * @description After complete UM user registration.
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$args","type":"array","desc":"Form data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_user_register', 'function_name', 10, 2 );
+ * @example
+ *
+ */
+ do_action( 'um_user_register', $user_id, $args );
+
+ return $user_id;
+}
+add_action( 'um_submit_form_register', 'um_submit_form_register', 10 );
+
+
+/**
+ * Register user with predefined role in options
+ *
+ * @param $args
+ */
+function um_add_user_role( $args ) {
+
+ if ( isset( $args['custom_fields']['role_select'] ) || isset( $args['custom_fields']['role_radio'] ) ) return;
+
+ $use_custom_settings = get_post_meta( $args['form_id'], '_um_register_use_custom_settings', true );
+
+ $role = apply_filters( 'um_registration_user_role', UM()->form()->assigned_role( UM()->form()->form_id ), $args );
+
+ if ( empty( $role ) ) return;
+
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_register_hidden_role_field
+ * @description Display hidden role field
+ * @input_vars
+ * [{"var":"$role","type":"string","desc":"Hidden user role"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $role = apply_filters( 'um_register_hidden_role_field', $role );
+ if ( $role ) {
+ echo '';
+ }
+
+}
+add_action( 'um_after_register_fields', 'um_add_user_role', 10, 1 );
+
+
+/**
+ * Show the submit button
+ *
+ * @param $args
+ */
+function um_add_submit_button_to_register( $args ) {
+ // DO NOT add when reviewing user's details
+ if ( isset( UM()->user()->preview ) && UM()->user()->preview == true && is_admin() ) return;
+
+ $primary_btn_word = $args['primary_btn_word'];
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_register_form_button_one
+ * @description Change Register Form Primary button
+ * @input_vars
+ * [{"var":"$primary_btn_word","type":"string","desc":"Button text"},
+ * {"var":"$args","type":"array","desc":"Registration Form arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $primary_btn_word = apply_filters('um_register_form_button_one', $primary_btn_word, $args );
+
+ $secondary_btn_word = $args['secondary_btn_word'];
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_register_form_button_two
+ * @description Change Registration Form Secondary button
+ * @input_vars
+ * [{"var":"$secondary_btn_word","type":"string","desc":"Button text"},
+ * {"var":"$args","type":"array","desc":"Registration Form arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $secondary_btn_word = apply_filters('um_register_form_button_two', $secondary_btn_word, $args );
+
+ $secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('login');
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_register_form_button_two_url
+ * @description Change Registration Form Secondary button URL
+ * @input_vars
+ * [{"var":"$secondary_btn_url","type":"string","desc":"Button URL"},
+ * {"var":"$args","type":"array","desc":"Registration Form arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $secondary_btn_url = apply_filters('um_register_form_button_two_url', $secondary_btn_url, $args ); ?>
+
+
+
- fields()->display( 'register', $args );
- }
-
-
- /**
- * Saving files to register a new user, if there are fields with files
- */
- add_action( 'um_registration_set_extra_data', 'um_registration_save_files', 10, 2 );
- function um_registration_save_files( $user_id, $args ) {
+/**
+ * Show Fields
+ *
+ * @param $args
+ */
+function um_add_register_fields( $args ){
+ echo UM()->fields()->display( 'register', $args );
+}
+add_action( 'um_main_register_fields', 'um_add_register_fields', 100 );
- if ( empty( $args['custom_fields'] ) )
- return;
- $files = array();
+/**
+ * Saving files to register a new user, if there are fields with files
+ *
+ * @param $user_id
+ * @param $args
+ */
+function um_registration_save_files( $user_id, $args ) {
- $fields = unserialize( $args['custom_fields'] );
+ if ( empty( $args['custom_fields'] ) )
+ return;
- // loop through fields
- if ( isset( $fields ) && is_array( $fields ) ) {
+ $files = array();
- foreach ( $fields as $key => $array ) {
+ $fields = unserialize( $args['custom_fields'] );
- if ( isset( $args['submitted'][$key] ) ) {
+ // loop through fields
+ if ( isset( $fields ) && is_array( $fields ) ) {
- if ( isset( $fields[$key]['type'] ) && in_array( $fields[$key]['type'], array( 'image', 'file' ) ) &&
- ( um_is_temp_upload( $args['submitted'][$key] ) || $args['submitted'][$key] == 'empty_file' )
- ) {
+ foreach ( $fields as $key => $array ) {
- $files[$key] = $args['submitted'][$key];
+ if ( isset( $args['submitted'][$key] ) ) {
+
+ if ( isset( $fields[$key]['type'] ) && in_array( $fields[$key]['type'], array( 'image', 'file' ) ) &&
+ ( um_is_temp_upload( $args['submitted'][$key] ) || $args['submitted'][$key] == 'empty_file' )
+ ) {
+
+ $files[$key] = $args['submitted'][$key];
- }
}
}
}
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_user_pre_updating_files_array
- * @description Change submitted files before register new user
- * @input_vars
- * [{"var":"$files","type":"array","desc":"Profile data files"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $files = apply_filters( 'um_user_pre_updating_files_array', $files );
-
- if ( !empty( $files ) ) {
- /**
- * UM hook
- *
- * @type action
- * @title um_before_user_upload
- * @description Before file uploaded on complete UM user registration.
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$files","type":"array","desc":"Files data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_before_user_upload', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( 'um_before_user_upload', $user_id, $files );
- UM()->user()->update_files( $files );
- /**
- * UM hook
- *
- * @type action
- * @title um_after_user_upload
- * @description After complete UM user registration and file uploaded.
- * @input_vars
- * [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$files","type":"array","desc":"Files data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_after_user_upload', 'function_name', 10, 2 );
- * @example
- *
- */
- do_action( 'um_after_user_upload', $user_id, $files );
- }
}
/**
- * Update user Full Name
+ * UM hook
*
- * @profile name update
- *
- * @param $user_id
- * @param $args
+ * @type filter
+ * @title um_user_pre_updating_files_array
+ * @description Change submitted files before register new user
+ * @input_vars
+ * [{"var":"$files","type":"array","desc":"Profile data files"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
*/
- function um_registration_set_profile_full_name( $user_id, $args ) {
+ $files = apply_filters( 'um_user_pre_updating_files_array', $files );
+
+ if ( !empty( $files ) ) {
/**
* UM hook
*
* @type action
- * @title um_update_profile_full_name
- * @description On update user profile change full name
+ * @title um_before_user_upload
+ * @description Before file uploaded on complete UM user registration.
* @input_vars
* [{"var":"$user_id","type":"int","desc":"User ID"},
- * {"var":"$args","type":"array","desc":"Form data"}]
+ * {"var":"$files","type":"array","desc":"Files data"}]
* @change_log
* ["Since: 2.0"]
- * @usage add_action( 'um_update_profile_full_name', 'function_name', 10, 2 );
+ * @usage add_action( 'um_before_user_upload', 'function_name', 10, 2 );
* @example
*
*/
- do_action( 'um_update_profile_full_name', $user_id, $args );
+ do_action( 'um_before_user_upload', $user_id, $files );
+ UM()->user()->update_files( $files );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_after_user_upload
+ * @description After complete UM user registration and file uploaded.
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$files","type":"array","desc":"Files data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_after_user_upload', 'function_name', 10, 2 );
+ * @example
+ *
+ */
+ do_action( 'um_after_user_upload', $user_id, $files );
}
+}
+add_action( 'um_registration_set_extra_data', 'um_registration_save_files', 10, 2 );
- add_action( 'um_registration_set_extra_data', 'um_registration_set_profile_full_name', 10, 2 );
\ No newline at end of file
+
+/**
+ * Update user Full Name
+ *
+ * @profile name update
+ *
+ * @param $user_id
+ * @param $args
+ */
+function um_registration_set_profile_full_name( $user_id, $args ) {
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_update_profile_full_name
+ * @description On update user profile change full name
+ * @input_vars
+ * [{"var":"$user_id","type":"int","desc":"User ID"},
+ * {"var":"$args","type":"array","desc":"Form data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_update_profile_full_name', 'function_name', 10, 2 );
+ * @example
+ *
+ */
+ do_action( 'um_update_profile_full_name', $user_id, $args );
+}
+add_action( 'um_registration_set_extra_data', 'um_registration_set_profile_full_name', 10, 2 );
\ No newline at end of file
diff --git a/includes/core/um-actions-save-profile.php b/includes/core/um-actions-save-profile.php
index c59f8923..e479d3df 100644
--- a/includes/core/um-actions-save-profile.php
+++ b/includes/core/um-actions-save-profile.php
@@ -1,70 +1,69 @@
-options()->get( 'display_name' );
-
- if ( ! isset( $user_id ) || empty( $user_id ) ) {
- $user = get_user_by( 'email', $changes['user_email'] );
- um_fetch_user( $user->ID );
- $user_id = $user->ID;
- }
-
- switch ( $option ) {
- default:
- break;
- case 'full_name':
- $update_name = get_user_meta( $user_id, 'first_name', true ) . ' ' . get_user_meta( $user_id, 'last_name', true );
- break;
- case 'sur_name':
- $fname = get_user_meta( $user_id, 'first_name', true );
- $lname = get_user_meta( $user_id, 'last_name', true );
- $update_name = $lname . ' ' . $fname;
- break;
- case 'initial_name':
- $fname = get_user_meta( $user_id, 'first_name', true );
- $lname = get_user_meta( $user_id, 'last_name', true );
- $update_name = $fname . ' ' . ( !empty( $lname ) ? $lname[0] : '' );
- break;
- case 'initial_name_f':
- $fname = get_user_meta( $user_id, 'first_name', true );
- $lname = get_user_meta( $user_id, 'last_name', true );
- $update_name = ( !empty($fname) ? $fname[0] : '' ) . ' ' . $lname;
- break;
- case 'nickname':
- $update_name = get_user_meta( $user_id, 'nickname', true );
- break;
+/**
+ * Profile name update
+ *
+ * @param $user_id
+ * @param $changes
+ */
+function um_update_profile_full_name( $user_id, $changes ) {
+ // Sync display name changes
+ $option = UM()->options()->get( 'display_name' );
+
+ if ( ! isset( $user_id ) || empty( $user_id ) ) {
+ $user = get_user_by( 'email', $changes['user_email'] );
+ um_fetch_user( $user->ID );
+ $user_id = $user->ID;
+ }
+
+ switch ( $option ) {
+ default:
+ break;
+ case 'full_name':
+ $update_name = get_user_meta( $user_id, 'first_name', true ) . ' ' . get_user_meta( $user_id, 'last_name', true );
+ break;
+ case 'sur_name':
+ $fname = get_user_meta( $user_id, 'first_name', true );
+ $lname = get_user_meta( $user_id, 'last_name', true );
+ $update_name = $lname . ' ' . $fname;
+ break;
+ case 'initial_name':
+ $fname = get_user_meta( $user_id, 'first_name', true );
+ $lname = get_user_meta( $user_id, 'last_name', true );
+ $update_name = $fname . ' ' . ( !empty( $lname ) ? $lname[0] : '' );
+ break;
+ case 'initial_name_f':
+ $fname = get_user_meta( $user_id, 'first_name', true );
+ $lname = get_user_meta( $user_id, 'last_name', true );
+ $update_name = ( !empty($fname) ? $fname[0] : '' ) . ' ' . $lname;
+ break;
+ case 'nickname':
+ $update_name = get_user_meta( $user_id, 'nickname', true );
+ break;
+ }
+
+ if ( isset( $update_name ) ) {
+
+ $arr_user = array( 'ID' => $user_id, 'display_name' => $update_name );
+ $return = wp_update_user( $arr_user );
+
+ if( is_wp_error( $return ) ) {
+ wp_die( '' . var_export( array( 'message' => $return->get_error_message(), 'dump' => $arr_user, 'changes' => $changes ), true ) . '' ); } - if ( isset( $update_name ) ) { - - $arr_user = array( 'ID' => $user_id, 'display_name' => $update_name ); - $return = wp_update_user( $arr_user ); + } - if( is_wp_error( $return ) ) { - wp_die( '
' . var_export( array( 'message' => $return->get_error_message(), 'dump' => $arr_user, 'changes' => $changes ), true ) . '' ); - } - + if ( isset( $changes['first_name'] ) && isset( $changes['last_name'] ) ) { - } + $full_name = UM()->user()->profile['display_name']; + $full_name = UM()->validation()->safe_name_in_url( $full_name ); - if ( isset( $changes['first_name'] ) && isset( $changes['last_name'] ) ) { - - $full_name = UM()->user()->profile['display_name']; - $full_name = UM()->validation()->safe_name_in_url( $full_name ); + update_user_meta( UM()->user()->id, 'full_name', $full_name ); - update_user_meta( UM()->user()->id, 'full_name', $full_name ); + } - - } - - // regenerate slug - UM()->user()->generate_profile_slug( $user_id ); - } \ No newline at end of file + // regenerate slug + UM()->user()->generate_profile_slug( $user_id ); +} +add_action( 'um_update_profile_full_name', 'um_update_profile_full_name', 10, 2 ); \ No newline at end of file diff --git a/includes/core/um-filters-account.php b/includes/core/um-filters-account.php index 2a2ed8ec..f1087fbd 100644 --- a/includes/core/um-filters-account.php +++ b/includes/core/um-filters-account.php @@ -1,66 +1,62 @@ - + * @example + * */ - add_filter('um_account_secure_fields','um_account_secure_fields', 10, 2); - function um_account_secure_fields( $fields, $tab_key ){ - /** - * UM hook - * - * @type filter - * @title um_account_secure_fields__enabled - * @description Active account secure fields - * @input_vars - * [{"var":"$enabled","type":"string","desc":"Enable secure account fields"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * - */ - $secure = apply_filters( 'um_account_secure_fields__enabled', true ); + $secure = apply_filters( 'um_account_secure_fields__enabled', true ); - if( ! $secure ) return $fields; + if( ! $secure ) return $fields; - - if( isset( UM()->account()->register_fields ) && ! isset( UM()->account()->register_fields[ $tab_key ] ) ){ - UM()->account()->register_fields[ $tab_key ] = $fields; - } - - - - return $fields; + if( isset( UM()->account()->register_fields ) && ! isset( UM()->account()->register_fields[ $tab_key ] ) ){ + UM()->account()->register_fields[ $tab_key ] = $fields; } - /** - * Disables first and last name fields in account page - * @param array $fields - * @return array - * @uses um_get_field__first_name, um_get_field__last_name - */ - add_filter("um_get_field__first_name","um_account_disable_name_fields", 10 ,1 ); - add_filter("um_get_field__last_name","um_account_disable_name_fields", 10 ,1 ); - function um_account_disable_name_fields( $fields ){ - if( ! UM()->options()->get( "account_name_disable" ) ) return $fields; + return $fields; +} +add_filter( 'um_account_secure_fields', 'um_account_secure_fields', 10, 2 ); - if( um_is_core_page("account") ){ - $fields['disabled'] = 'disabled="disabled"'; - } - return $fields; - } \ No newline at end of file +/** + * Disables first and last name fields in account page + * @param array $fields + * @return array + * @uses um_get_field__first_name, um_get_field__last_name + */ +function um_account_disable_name_fields( $fields ){ + if( ! UM()->options()->get( "account_name_disable" ) ) return $fields; + + if ( um_is_core_page("account") ) { + $fields['disabled'] = 'disabled="disabled"'; + } + + return $fields; +} +add_filter( "um_get_field__first_name","um_account_disable_name_fields", 10 ,1 ); +add_filter( "um_get_field__last_name","um_account_disable_name_fields", 10 ,1 ); \ No newline at end of file diff --git a/includes/core/um-filters-avatars.php b/includes/core/um-filters-avatars.php index 77e22db1..715e8aec 100644 --- a/includes/core/um-filters-avatars.php +++ b/includes/core/um-filters-avatars.php @@ -1,103 +1,104 @@ -ID; + elseif ( is_object( $id_or_email ) && ! empty( $id_or_email->user_id ) ) + $user_id = (int) $id_or_email->user_id; + if ( empty( $user_id ) ) + return $avatar; + + um_fetch_user( $user_id ); + + $avatar = um_user('profile_photo', $size); + /** - * Get user UM avatars - * @param string $avatar - * @param string $id_or_email - * @param string $size - * @param string $avatar_class - * @param string $default - * @param string $alt - * @hooks filter `get_avatar` - * @return string returns avatar in image html elements + * UM hook + * + * @type filter + * @title um_avatar_image_alternate_text + * @description Change avatar image alt + * @input_vars + * [{"var":"$avatar_alt","type":"string","desc":"Image alternate text. Display name by default"}] + * @change_log + * ["Since: 2.0"] + * @usage + * + * @example + * */ - add_filter('get_avatar', 'um_get_avatar', 99999, 5); - function um_get_avatar($avatar = '', $id_or_email='', $size = '96', $avatar_class = '', $default = '', $alt = '') { + $image_alt = apply_filters( "um_avatar_image_alternate_text", um_user("display_name") ); - if ( is_numeric($id_or_email) ) - $user_id = (int) $id_or_email; - elseif ( is_string( $id_or_email ) && ( $user = get_user_by( 'email', $id_or_email ) ) ) - $user_id = $user->ID; - elseif ( is_object( $id_or_email ) && ! empty( $id_or_email->user_id ) ) - $user_id = (int) $id_or_email->user_id; - if ( empty( $user_id ) ) - return $avatar; + if ( ! $avatar && UM()->options()->get( 'use_gravatars' ) ) { - um_fetch_user( $user_id ); - - $avatar = um_user('profile_photo', $size); - - /** - * UM hook - * - * @type filter - * @title um_avatar_image_alternate_text - * @description Change avatar image alt - * @input_vars - * [{"var":"$avatar_alt","type":"string","desc":"Image alternate text. Display name by default"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * - */ - $image_alt = apply_filters( "um_avatar_image_alternate_text", um_user("display_name") ); - - if ( ! $avatar && UM()->options()->get( 'use_gravatars' ) ) { - - $default = get_option( 'avatar_default', 'mystery' ); - if ( $default == 'gravatar_default' ) { - $default = ''; - } - - $rating = get_option('avatar_rating'); - if ( !empty( $rating ) ) { - $rating = "&r={$rating}"; - } - - if ( UM()->options()->get('use_gravatars') && ! um_user('synced_profile_photo') && ! $has_profile_photo ){ - $avatar_url = um_get_domain_protocol().'gravatar.com/avatar/'.um_user('synced_gravatar_hashed_id'); - $avatar_url = add_query_arg('s',400, $avatar_url); - $gravatar_type = UM()->options()->get( 'use_um_gravatar_default_builtin_image' ); - - if ( $gravatar_type == 'default' ) { - if ( UM()->options()->get( 'use_um_gravatar_default_image' ) ) { - $avatar_url = add_query_arg('d', um_get_default_avatar_uri(), $avatar_url ); - } - } else { - $avatar_url = add_query_arg('d', $gravatar_type, $avatar_url ); - } - - } - - $avatar = '
+ $value = '
';
- return $value;
- }
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__soundcloud_track', 'um_profile_field_filter_hook__soundcloud_track', 99, 2 );
- /***
- *** @outputs a youtube video
- ***/
- add_filter('um_profile_field_filter_hook__youtube_video', 'um_profile_field_filter_hook__youtube_video', 99, 2);
- function um_profile_field_filter_hook__youtube_video( $value, $data ) {
- if( empty( $value ) ){
- return '';
- }
- $value = ( strstr( $value, 'http') || strstr( $value, '://' ) ) ? um_youtube_id_from_url( $value ) : $value;
- $value = '
+
+/**
+ * Outputs a youtube video
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return bool|string
+ */
+function um_profile_field_filter_hook__youtube_video( $value, $data ) {
+ if( empty( $value ) ){
+ return '';
+ }
+ $value = ( strstr( $value, 'http') || strstr( $value, '://' ) ) ? um_youtube_id_from_url( $value ) : $value;
+ $value = '
';
- return $value;
+ return $value;
+ }
+add_filter( 'um_profile_field_filter_hook__youtube_video', 'um_profile_field_filter_hook__youtube_video', 99, 2 );
+
+
+/**
+ * Outputs a vimeo video
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return int|string
+ */
+function um_profile_field_filter_hook__vimeo_video( $value, $data ) {
+ if ( empty( $value ) ) {
+ return '';
}
- /***
- *** @outputs a vimeo video
- ***/
- add_filter('um_profile_field_filter_hook__vimeo_video', 'um_profile_field_filter_hook__vimeo_video', 99, 2);
- function um_profile_field_filter_hook__vimeo_video( $value, $data ) {
- if( empty( $value ) ){
- return '';
- }
-
- $value = ( !is_numeric( $value ) ) ? (int) substr(parse_url($value, PHP_URL_PATH), 1) : $value;
- $value = '
+ $value = ( !is_numeric( $value ) ) ? (int) substr(parse_url($value, PHP_URL_PATH), 1) : $value;
+ $value = '
';
- return $value;
- }
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__vimeo_video', 'um_profile_field_filter_hook__vimeo_video', 99, 2 );
- /***
- *** @outputs a google map
- ***/
- add_filter('um_profile_field_filter_hook__googlemap', 'um_profile_field_filter_hook__googlemap', 99, 2);
- function um_profile_field_filter_hook__googlemap( $value, $data ) {
- $value = '
';
} else {
- $value = '';
+
+ if ( strpos($value, 'http://') !== 0 ) {
+ $value = 'http://' . $value;
+ }
+ $data['url_target'] = ( isset( $data['url_target'] ) ) ? $data['url_target'] : '_blank';
+ $value = ''.$alt.'';
+
}
- return $value;
}
- /***
- *** @global
- ***/
- add_filter('um_profile_field_filter_hook__', 'um_profile_field_filter_hook__', 99, 3 );
- function um_profile_field_filter_hook__( $value, $data, $type = '' ) {
- if ( !$value ) return '';
+ if ( !is_array( $value ) ) {
+ if ( is_email( $value ) )
+ $value = ''.$value.'';
+ } else {
+ $value = implode(', ', $value);
+ }
- if ( ( isset( $data['validate'] ) && $data['validate'] != '' && strstr( $data['validate'], 'url' ) ) || ( isset( $data['type'] ) && $data['type'] == 'url' ) ) {
- $alt = ( isset( $data['url_text'] ) && !empty( $data['url_text'] ) ) ? $data['url_text'] : $value;
- $url_rel = ( isset( $data['url_rel'] ) && $data['url_rel'] == 'nofollow' ) ? 'rel="nofollow"' : '';
- if( !strstr( $value, 'http' )
- && !strstr( $value, '://' )
- && !strstr( $value, 'www.' )
- && !strstr( $value, '.com' )
- && !strstr( $value, '.net' )
- && !strstr( $value, '.org' )
- ) {
- if ( $data['validate'] == 'soundcloud_url' ) $value = 'https://soundcloud.com/' . $value;
- if ( $data['validate'] == 'youtube_url' ) $value = 'https://youtube.com/user/' . $value;
- if ( $data['validate'] == 'facebook_url' ) $value = 'https://facebook.com/' . $value;
- if ( $data['validate'] == 'twitter_url' ) $value = 'https://twitter.com/' . $value;
- if ( $data['validate'] == 'linkedin_url' ) $value = 'https://linkedin.com/' . $value;
- if ( $data['validate'] == 'skype' ) $value = $value;
- if ( $data['validate'] == 'googleplus_url' ) $value = 'https://plus.google.com/' . $value;
- if ( $data['validate'] == 'instagram_url' ) $value = 'https://instagram.com/' . $value;
- if ( $data['validate'] == 'vk_url' ) $value = 'https://vk.com/' . $value;
- }
+ $value = str_replace('https://https://','https://',$value);
+ $value = str_replace('http://https://','https://',$value);
+ //$value = UM()->shortcodes()->emotize( $value );
+ return $value;
- if ( isset( $data['validate'] ) && $data['validate'] == 'skype' ) {
+}
+add_filter( 'um_profile_field_filter_hook__', 'um_profile_field_filter_hook__', 99, 3 );
- $value = $value;
- } else {
+/**
+ * Get form fields
+ *
+ * @param $array
+ *
+ * @return mixed|string
+ */
+function um_get_form_fields( $array ) {
- if ( strpos($value, 'http://') !== 0 ) {
- $value = 'http://' . $value;
+ $form_id = (isset ( UM()->fields()->set_id ) ) ? UM()->fields()->set_id : null;
+ $mode = (isset( UM()->fields()->set_mode ) ) ? UM()->fields()->set_mode : null;
+
+ if ( $form_id && $mode ) {
+ $array = UM()->query()->get_attr('custom_fields', $form_id );
+ } else {
+ $array = '';
+ }
+
+ return $array;
+
+}
+add_filter( 'um_get_form_fields', 'um_get_form_fields', 99 );
+
+
+/**
+ * Validate conditional logic
+ *
+ * @param $array
+ * @param $fields
+ * @return mixed
+ */
+function um_get_custom_field_array( $array, $fields ) {
+
+ if ( isset( $array['conditions'] ) ) {
+ for ( $a = 0; $a < count( $array['conditions'] ); $a++ ) {
+ if ( isset( $array['conditional_value'] ) || isset( $array['conditional_value' . $a] ) ) {
+ foreach ( $array['conditions'] as $key => $value ) {
+ $condition_metakey = $fields[ $value[1] ]['metakey'];
+
+ if ( isset( $_POST[ $condition_metakey ] ) ) {
+ $cond_value = ( $fields[ $value[1] ]['type'] == 'radio' ) ? $_POST[ $condition_metakey ][0] : $_POST[ $condition_metakey ];
+
+ if ( isset( $array['conditional_value'] ) && $cond_value !== $array['conditional_value'] ) {
+ $array['required'] = 0;
+ } elseif ( isset( $array['conditional_value'.$a] ) && $cond_value !== $array['conditional_value'.$a] ) {
+ $array['required'] = 0;
+ }
+ }
}
- $data['url_target'] = ( isset( $data['url_target'] ) ) ? $data['url_target'] : '_blank';
- $value = ''.$alt.'';
-
}
-
}
+ }
- if ( !is_array( $value ) ) {
- if ( is_email( $value ) )
- $value = ''.$value.'';
- } else {
- $value = implode(', ', $value);
- }
+ return $array;
+}
+add_filter( 'um_get_custom_field_array', 'um_get_custom_field_array', 99, 2 );
- $value = str_replace('https://https://','https://',$value);
- $value = str_replace('http://https://','https://',$value);
- //$value = UM()->shortcodes()->emotize( $value );
+
+/**
+ * Force fields to use UTF-8 encoding
+ *
+ * @param mixed $value
+ * @param array $data
+ * @param string $type
+ *
+ * @return mixed
+ */
+function um_force_utf8_fields( $value, $data, $type = '' ) {
+
+ if( ! UM()->options()->get('um_force_utf8_strings') )
return $value;
- }
-
- /***
- *** @get form fields
- ***/
- add_filter('um_get_form_fields', 'um_get_form_fields', 99);
- function um_get_form_fields( $array ) {
-
- $form_id = (isset ( UM()->fields()->set_id ) ) ? UM()->fields()->set_id : null;
- $mode = (isset( UM()->fields()->set_mode ) ) ? UM()->fields()->set_mode : null;
-
- if ( $form_id && $mode ) {
- $array = UM()->query()->get_attr('custom_fields', $form_id );
- } else {
- $array = '';
- }
-
- return $array;
-
- }
-
-
- /**
- * Validate conditional logic
- *
- * @param $array
- * @param $fields
- * @return mixed
- */
- function um_get_custom_field_array( $array, $fields ) {
-
- if ( isset( $array['conditions'] ) ) {
- for ( $a = 0; $a < count( $array['conditions'] ); $a++ ) {
- if ( isset( $array['conditional_value'] ) || isset( $array['conditional_value' . $a] ) ) {
- foreach ( $array['conditions'] as $key => $value ) {
- $condition_metakey = $fields[ $value[1] ]['metakey'];
-
- if ( isset( $_POST[ $condition_metakey ] ) ) {
- $cond_value = ( $fields[ $value[1] ]['type'] == 'radio' ) ? $_POST[ $condition_metakey ][0] : $_POST[ $condition_metakey ];
-
- if ( isset( $array['conditional_value'] ) && $cond_value !== $array['conditional_value'] ) {
- $array['required'] = 0;
- } elseif ( isset( $array['conditional_value'.$a] ) && $cond_value !== $array['conditional_value'.$a] ) {
- $array['required'] = 0;
- }
- }
- }
- }
- }
- }
-
- return $array;
- }
- add_filter( 'um_get_custom_field_array', 'um_get_custom_field_array', 99, 2 );
-
-
- /**
- * Force fields to use UTF-8 encoding
- * @param mixed $value
- * @param array $data
- * @return mixed
- * @uses hook filter: um_profile_field_filter_hook__
- */
- add_filter('um_profile_field_filter_hook__','um_force_utf8_fields', 9, 3 );
- function um_force_utf8_fields( $value, $data, $type = '' ) {
-
- if( ! UM()->options()->get('um_force_utf8_strings') )
- return $value;
-
$value = um_force_utf8_string( $value );
return $value;
}
+add_filter('um_profile_field_filter_hook__','um_force_utf8_fields', 9, 3 );
- /**
- * Filter profile data value
- * @param mixed $value
- * @return mixed
- * @uses hook filter: um_is_selected_filter_value
- */
- add_filter('um_is_selected_filter_value','um_is_selected_filter_value',1,9);
- add_filter('um_select_dropdown_dynamic_option_value','um_is_selected_filter_value',1,10);
- function um_is_selected_filter_value( $value ){
- if ( ! UM()->options()->get('um_force_utf8_strings') )
- return $value;
-
- $value = um_force_utf8_string( $value );
+/**
+ * Filter profile data value
+ * @param mixed $value
+ * @return mixed
+ * @uses hook filter: um_is_selected_filter_value
+ */
+function um_is_selected_filter_value( $value ) {
+ if ( ! UM()->options()->get('um_force_utf8_strings') )
return $value;
- }
- /**
- * Filter select dropdown to use UTF-8 encoding
- * @param array $options
- * @param array $data
- * @return $options
- * @uses hook filter: um_select_dropdown_dynamic_options
- */
- add_filter('um_select_dropdown_dynamic_options','um_select_dropdown_dynamic_options_to_utf8',2,10);
- function um_select_dropdown_dynamic_options_to_utf8( $options, $data ){
- if ( ! UM()->options()->get( 'um_force_utf8_strings' ) )
- return $options;
+ $value = um_force_utf8_string( $value );
- foreach ( $options as $key => $value ) {
- $options[ $key ] = um_force_utf8_string( $value );
-
- }
+ return $value;
+}
+add_filter( 'um_is_selected_filter_value','um_is_selected_filter_value', 1, 9 );
+add_filter( 'um_select_dropdown_dynamic_option_value','um_is_selected_filter_value', 1, 10 );
+/**
+ * Filter select dropdown to use UTF-8 encoding
+ *
+ * @param array $options
+ * @param array $data
+ * @return array
+ * @uses hook filter: um_select_dropdown_dynamic_options
+ */
+function um_select_dropdown_dynamic_options_to_utf8( $options, $data ){
+ if ( ! UM()->options()->get( 'um_force_utf8_strings' ) )
return $options;
+
+ foreach ( $options as $key => $value ) {
+ $options[ $key ] = um_force_utf8_string( $value );
}
-
- /**
- * Filter non-UTF8 strings
- * @param string $value
- * @return string
- * @uses hook filter: um_field_non_utf8_value
- */
- add_filter( 'um_field_non_utf8_value', 'um_field_non_utf8_value' );
- function um_field_non_utf8_value( $value ) {
+ return $options;
+}
+add_filter( 'um_select_dropdown_dynamic_options','um_select_dropdown_dynamic_options_to_utf8', 2, 10 );
- if ( function_exists( 'mb_detect_encoding' ) ) {
- $encoding = mb_detect_encoding( $value, 'utf-8, iso-8859-1, ascii', true );
- if ( strcasecmp( $encoding, 'UTF-8' ) !== 0 ) {
- $value = iconv( $encoding, 'utf-8', $value );
- }
- }
- return $value;
- }
-
+/**
+ * Filter non-UTF8 strings
+ * @param string $value
+ * @return string
+ * @uses hook filter: um_field_non_utf8_value
+ */
+function um_field_non_utf8_value( $value ) {
- /**
- * Returns dropdown/multi-select options from a callback function
- * @param $options array
- * @param $data array
- * @return $options array
- * @uses hook filter: um_select_dropdown_dynamic_options, um_multiselect_options
- */
- add_filter('um_select_dropdown_dynamic_options','um_select_dropdown_dynamic_callback_options', 10, 2);
- add_filter('um_multiselect_options','um_select_dropdown_dynamic_callback_options', 10, 2);
- function um_select_dropdown_dynamic_callback_options( $options, $data ){
-
- if( isset( $data['custom_dropdown_options_source'] ) && ! empty( $data['custom_dropdown_options_source'] ) ){
-
- if( function_exists( $data['custom_dropdown_options_source'] ) ){
- $options = call_user_func( $data['custom_dropdown_options_source'] );
- }
- }
-
- return $options;
- }
-
- /**
- *
- * Pair dropdown/multi-select options from a callback function
- * @param $value string
- * @param $type string
- * @param $data array
- * @return $value string
- * @uses hook filter: um_profile_field_filter_hook__
- */
- add_filter('um_profile_field_filter_hook__select','um_option_match_callback_view_field', 10, 2);
- add_filter('um_profile_field_filter_hook__multiselect','um_option_match_callback_view_field', 10, 2);
- add_filter('um_field_select_default_value','um_option_match_callback_view_field', 10, 2);
- add_filter('um_field_multiselect_default_value','um_option_match_callback_view_field', 10, 2);
- function um_option_match_callback_view_field( $value, $data ){
- if( ! empty( $data['custom_dropdown_options_source'] ) ){
- return UM()->fields()->get_option_value_from_callback( $value, $data, $data['type'] );
+ if ( function_exists( 'mb_detect_encoding' ) ) {
+ $encoding = mb_detect_encoding( $value, 'utf-8, iso-8859-1, ascii', true );
+ if ( strcasecmp( $encoding, 'UTF-8' ) !== 0 ) {
+ $value = iconv( $encoding, 'utf-8', $value );
}
+ }
- return $value;
- }
+ return $value;
+}
+add_filter( 'um_field_non_utf8_value', 'um_field_non_utf8_value' );
- /**
- * Apply textdomain in select/multi-select options
- * @param $value string
- * @param $type string
- * @param $data array
- * @return $value string
- * @uses hook filters: um_profile_field_filter_hook__select, um_profile_field_filter_hook__multiselect
- */
- add_filter('um_profile_field_filter_hook__select','um_profile_field__select_translate', 10, 2);
- add_filter('um_profile_field_filter_hook__multiselect','um_profile_field__select_translate', 10, 2);
- function um_profile_field__select_translate( $value, $data ){
- if( empty( $value ) ) return $value;
+/**
+ * Returns dropdown/multi-select options from a callback function
+ * @param $options array
+ * @param $data array
+ * @return array
+ * @uses hook filter: um_select_dropdown_dynamic_options, um_multiselect_options
+ */
+function um_select_dropdown_dynamic_callback_options( $options, $data ) {
- $options = explode(", ", $value );
- $arr_options = array();
- if( is_array( $options ) ){
- foreach ( $options as $item ) {
- $arr_options[] = __( $item, 'ultimate-member' );
- }
- }
+ if( isset( $data['custom_dropdown_options_source'] ) && ! empty( $data['custom_dropdown_options_source'] ) ){
- $value = implode(", ", $arr_options);
+ if( function_exists( $data['custom_dropdown_options_source'] ) ){
+ $options = call_user_func( $data['custom_dropdown_options_source'] );
+ }
+ }
- return $value;
- }
+ return $options;
+}
+add_filter( 'um_select_dropdown_dynamic_options','um_select_dropdown_dynamic_callback_options', 10, 2 );
+add_filter( 'um_multiselect_options','um_select_dropdown_dynamic_callback_options', 10, 2 );
+
+
+/**
+ * Pair dropdown/multi-select options from a callback function
+ *
+ * @param $value string
+ * @param $data array
+ * @return string
+ * @uses hook filter: um_profile_field_filter_hook__
+ */
+
+function um_option_match_callback_view_field( $value, $data ) {
+ if( ! empty( $data['custom_dropdown_options_source'] ) ){
+ return UM()->fields()->get_option_value_from_callback( $value, $data, $data['type'] );
+ }
+
+ return $value;
+}
+add_filter('um_profile_field_filter_hook__select','um_option_match_callback_view_field', 10, 2);
+add_filter('um_profile_field_filter_hook__multiselect','um_option_match_callback_view_field', 10, 2);
+add_filter('um_field_select_default_value','um_option_match_callback_view_field', 10, 2);
+add_filter('um_field_multiselect_default_value','um_option_match_callback_view_field', 10, 2);
+
+
+/**
+ * Apply textdomain in select/multi-select options
+ *
+ * @param $value string
+ * @param $data array
+ * @return string
+ * @uses hook filters: um_profile_field_filter_hook__select, um_profile_field_filter_hook__multiselect
+ */
+
+function um_profile_field__select_translate( $value, $data ) {
+
+ if ( empty( $value ) ) return $value;
+
+ $options = explode(", ", $value );
+ $arr_options = array();
+ if( is_array( $options ) ){
+ foreach ( $options as $item ) {
+ $arr_options[] = __( $item, 'ultimate-member' );
+ }
+ }
+
+ $value = implode(", ", $arr_options);
+
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__select','um_profile_field__select_translate', 10, 2 );
+add_filter( 'um_profile_field_filter_hook__multiselect','um_profile_field__select_translate', 10, 2 );
/**
@@ -488,39 +571,40 @@ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) {
}
add_filter( 'um_profile_field_filter_hook__','um_profile_field_filter_xss_validation', 10, 3 );
- /**
- * add role_select and role_radio to the $post_form
- * It is necessary for that if on these fields the conditional logic
- * @param $post_form array
- * @param $mode
- *
- * @return $post_form
- * @uses hook filters: um_submit_form_data
- */
- function um_submit_form_data_role_fields( $post_form, $mode ) {
- $custom_fields = unserialize( $post_form['custom_fields'] );
- if ( ! empty( $post_form['role'] ) && array_key_exists( 'role_select', $custom_fields ) ) {
- $post_form['role_select'] = $post_form['role'];
- }
- if (! empty( $post_form['role'] ) && array_key_exists( 'role_radio', $custom_fields ) ) {
- $post_form['role_radio'] = $post_form['role'];
- }
- return $post_form;
+/**
+ * add role_select and role_radio to the $post_form
+ * It is necessary for that if on these fields the conditional logic
+ * @param $post_form array
+ * @param $mode
+ *
+ * @return $post_form
+ * @uses hook filters: um_submit_form_data
+ */
+function um_submit_form_data_role_fields( $post_form, $mode ) {
+ $custom_fields = unserialize( $post_form['custom_fields'] );
+ if ( ! empty( $post_form['role'] ) && array_key_exists( 'role_select', $custom_fields ) ) {
+ $post_form['role_select'] = $post_form['role'];
}
- add_filter( 'um_submit_form_data', 'um_submit_form_data_role_fields', 10, 2 );
-
-
- /**
- * Cleaning on XSS injection for url editing field
- * @param $value string
- * @param $key string
- *
- * @return string $value
- * @uses hook filters: um_edit_url_field_value
- */
- function um_edit_url_field_value( $value, $key ) {
- $value = esc_attr( $value );
- return $value;
+ if (! empty( $post_form['role'] ) && array_key_exists( 'role_radio', $custom_fields ) ) {
+ $post_form['role_radio'] = $post_form['role'];
}
- add_filter( 'um_edit_url_field_value', 'um_edit_url_field_value', 10, 2 );
\ No newline at end of file
+
+ return $post_form;
+}
+add_filter( 'um_submit_form_data', 'um_submit_form_data_role_fields', 10, 2 );
+
+
+/**
+ * Cleaning on XSS injection for url editing field
+ * @param $value string
+ * @param $key string
+ *
+ * @return string $value
+ * @uses hook filters: um_edit_url_field_value
+ */
+function um_edit_url_field_value( $value, $key ) {
+ $value = esc_attr( $value );
+ return $value;
+}
+add_filter( 'um_edit_url_field_value', 'um_edit_url_field_value', 10, 2 );
\ No newline at end of file
diff --git a/includes/core/um-filters-files.php b/includes/core/um-filters-files.php
index 166846e8..7b431016 100644
--- a/includes/core/um-filters-files.php
+++ b/includes/core/um-filters-files.php
@@ -1,13 +1,13 @@
-options()->get( 'wpadmin_allow_ips' );
-
- if ( !$ips )
- return $allowed;
-
- $ips = array_map("rtrim", explode("\n", $ips));
- $user_ip = um_user_ip();
-
- if ( in_array( $user_ip, $ips ) )
- $allowed = 1;
+/**
+ * Filter to allow whitelisted IP to access the wp-admin login
+ *
+ * @param $allowed
+ *
+ * @return int
+ */
+function um_whitelisted_wpadmin_access( $allowed ) {
+ $ips = UM()->options()->get( 'wpadmin_allow_ips' );
+ if ( !$ips )
return $allowed;
- }
-
- /***
- *** @filter to customize errors
- ***/
- add_filter('login_message', 'um_custom_wp_err_messages');
- function um_custom_wp_err_messages( $message ) {
+ $ips = array_map("rtrim", explode("\n", $ips));
+ $user_ip = um_user_ip();
- if ( isset( $_REQUEST['err'] ) && !empty( $_REQUEST['err'] ) ) {
- switch( $_REQUEST['err'] ) {
- case 'blocked_email':
- $err = __('This email address has been blocked.','ultimate-member');
- break;
- case 'blocked_ip':
- $err = __('Your IP address has been blocked.','ultimate-member');
- break;
- }
- }
+ if ( in_array( $user_ip, $ips ) )
+ $allowed = 1;
- if ( isset( $err ) ) {
- $message = '
+
+/**
+ * Outputs a google map
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return string
+ */
+function um_profile_field_filter_hook__googlemap( $value, $data ) {
+ $value = '
';
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__googlemap', 'um_profile_field_filter_hook__googlemap', 99, 2 );
+
+
+/**
+ * User's registration date
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return false|int|string
+ */
+
+function um_profile_field_filter_hook__user_registered( $value, $data ) {
+ $value = strtotime($value);
+ $value = sprintf(__('Joined %s','ultimate-member'), date_i18n('F d, Y', $value) );
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__user_registered', 'um_profile_field_filter_hook__user_registered', 99, 2 );
+
+
+/**
+ * Last login date
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return string
+ */
+function um_profile_field_filter_hook__last_login( $value, $data ) {
+ $value = sprintf( __('Last login: %s','ultimate-member'), um_user_last_login( um_user('ID') ) );
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__last_login', 'um_profile_field_filter_hook__last_login', 99, 2 );
+add_filter( 'um_profile_field_filter_hook___um_last_login', 'um_profile_field_filter_hook__last_login', 99, 2 );
+
+
+/**
+ * URLs in textarea
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return mixed|string|void
+ */
+function um_profile_field_filter_hook__textarea( $value, $data ) {
+ if ( isset( $data ) && isset( $data['html'] ) && $data['html'] == 1 )
return $value;
- }
- /***
- *** @user's registration date
- ***/
- add_filter('um_profile_field_filter_hook__user_registered', 'um_profile_field_filter_hook__user_registered', 99, 2);
- function um_profile_field_filter_hook__user_registered( $value, $data ) {
- $value = strtotime($value);
- $value = sprintf(__('Joined %s','ultimate-member'), date_i18n('F d, Y', $value) );
- return $value;
- }
+ $value = esc_textarea( $value );
+ $value = preg_replace('$(https?://[a-z0-9_./?=&#-]+)(?![^<>]*>)$i', ' $1 ', $value." ");
+ $value = preg_replace('$(www\.[a-z0-9_./?=&#-]+)(?![^<>]*>)$i', '$1 ', $value." ");
+ $value = wpautop($value);
- /***
- *** @last login date
- ***/
- add_filter('um_profile_field_filter_hook__last_login', 'um_profile_field_filter_hook__last_login', 99, 2);
- add_filter('um_profile_field_filter_hook___um_last_login', 'um_profile_field_filter_hook__last_login', 99, 2);
- function um_profile_field_filter_hook__last_login( $value, $data ) {
-
- $value = sprintf( __('Last login: %s','ultimate-member'), um_user_last_login( um_user('ID') ) );
-
- return $value;
- }
-
- /***
- *** @urls in textarea
- ***/
- add_filter('um_profile_field_filter_hook__textarea', 'um_profile_field_filter_hook__textarea', 99, 2);
- function um_profile_field_filter_hook__textarea( $value, $data ) {
- if ( isset( $data ) && isset( $data['html'] ) && $data['html'] == 1 )
- return $value;
-
- $value = esc_textarea( $value );
- $value = preg_replace('$(https?://[a-z0-9_./?=&#-]+)(?![^<>]*>)$i', ' $1 ', $value." ");
- $value = preg_replace('$(www\.[a-z0-9_./?=&#-]+)(?![^<>]*>)$i', '$1 ', $value." ");
- $value = wpautop($value);
-
- return $value;
- }
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__textarea', 'um_profile_field_filter_hook__textarea', 99, 2 );
/***
@@ -132,44 +176,59 @@ if ( ! defined( 'ABSPATH' ) ) exit;
}*/
- /***
- *** @time
- ***/
- add_filter('um_profile_field_filter_hook__time', 'um_profile_field_filter_hook__time', 99, 2);
- function um_profile_field_filter_hook__time( $value, $data ) {
+/**
+ * Time field
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return mixed|string
+ */
+function um_profile_field_filter_hook__time( $value, $data ) {
+ $value = UM()->datetime()->format( $value, $data['format'] );
+
+ $value = str_replace('am', 'a.m.', $value );
+ $value = str_replace('pm', 'p.m.', $value );
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__time', 'um_profile_field_filter_hook__time', 99, 2 );
+
+
+/**
+ * Date field
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return string
+ */
+function um_profile_field_filter_hook__date( $value, $data ) {
+ if ( $data['pretty_format'] == 1 ) {
+ $value = UM()->datetime()->get_age( $value );
+ } else {
$value = UM()->datetime()->format( $value, $data['format'] );
-
- $value = str_replace('am', 'a.m.', $value );
- $value = str_replace('pm', 'p.m.', $value );
- return $value;
}
- /***
- *** @date
- ***/
- add_filter('um_profile_field_filter_hook__date', 'um_profile_field_filter_hook__date', 99, 2);
- function um_profile_field_filter_hook__date( $value, $data ) {
- if ( $data['pretty_format'] == 1 ) {
- $value = UM()->datetime()->get_age( $value );
- } else {
- $value = UM()->datetime()->format( $value, $data['format'] );
- }
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__date', 'um_profile_field_filter_hook__date', 99, 2 );
- return $value;
- }
- /***
- *** @file
- ***/
- add_filter('um_profile_field_filter_hook__file', 'um_profile_field_filter_hook__file', 99, 2);
- function um_profile_field_filter_hook__file( $value, $data ) {
- $uri = um_user_uploads_uri() . $value;
- $extension = pathinfo( $uri, PATHINFO_EXTENSION);
+/**
+ * File field
+ * @param $value
+ * @param $data
+ *
+ * @return string|void
+ */
+function um_profile_field_filter_hook__file( $value, $data ) {
+ $uri = um_user_uploads_uri() . $value;
+ $extension = pathinfo( $uri, PATHINFO_EXTENSION);
- if ( !file_exists( um_user_uploads_dir() . $value ) ) {
- $value = __('This file has been removed.');
- } else {
- $value = '';
+ } else {
+ $value = '';
+ }
+
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__image', 'um_profile_field_filter_hook__image', 99, 2 );
+
+/**
+ * Global sanitize
+ *
+ * @param $value
+ * @param $data
+ * @param string $type
+ *
+ * @return string
+ */
+function um_profile_field_filter_hook__( $value, $data, $type = '' ) {
+ if ( !$value ) return '';
+
+ if ( ( isset( $data['validate'] ) && $data['validate'] != '' && strstr( $data['validate'], 'url' ) ) || ( isset( $data['type'] ) && $data['type'] == 'url' ) ) {
+ $alt = ( isset( $data['url_text'] ) && !empty( $data['url_text'] ) ) ? $data['url_text'] : $value;
+ $url_rel = ( isset( $data['url_rel'] ) && $data['url_rel'] == 'nofollow' ) ? 'rel="nofollow"' : '';
+ if( !strstr( $value, 'http' )
+ && !strstr( $value, '://' )
+ && !strstr( $value, 'www.' )
+ && !strstr( $value, '.com' )
+ && !strstr( $value, '.net' )
+ && !strstr( $value, '.org' )
+ ) {
+ if ( $data['validate'] == 'soundcloud_url' ) $value = 'https://soundcloud.com/' . $value;
+ if ( $data['validate'] == 'youtube_url' ) $value = 'https://youtube.com/user/' . $value;
+ if ( $data['validate'] == 'facebook_url' ) $value = 'https://facebook.com/' . $value;
+ if ( $data['validate'] == 'twitter_url' ) $value = 'https://twitter.com/' . $value;
+ if ( $data['validate'] == 'linkedin_url' ) $value = 'https://linkedin.com/' . $value;
+ if ( $data['validate'] == 'skype' ) $value = $value;
+ if ( $data['validate'] == 'googleplus_url' ) $value = 'https://plus.google.com/' . $value;
+ if ( $data['validate'] == 'instagram_url' ) $value = 'https://instagram.com/' . $value;
+ if ( $data['validate'] == 'vk_url' ) $value = 'https://vk.com/' . $value;
+ }
+
+ if ( isset( $data['validate'] ) && $data['validate'] == 'skype' ) {
+
+ $value = $value;
- // if value is an image tag
- if( preg_match( '/\
';
- } else if ( file_exists( um_user_uploads_dir() . $value ) ) {
- $value = '
+ if ( !file_exists( um_user_uploads_dir() . $value ) ) {
+ $value = __('This file has been removed.');
+ } else {
+ $value = '';
- }
-
- return $value;
}
- /***
- *** @image
- ***/
- add_filter('um_profile_field_filter_hook__image', 'um_profile_field_filter_hook__image', 99, 2);
- function um_profile_field_filter_hook__image( $value, $data ) {
- $uri = um_user_uploads_uri() . $value;
- $title = ( isset( $data['title'] ) ) ? $data['title'] : __('Untitled photo');
+ return $value;
+}
+add_filter( 'um_profile_field_filter_hook__file', 'um_profile_field_filter_hook__file', 99, 2 );
+
+
+/**
+ * Image field
+ *
+ * @param $value
+ * @param $data
+ *
+ * @return string
+ */
+function um_profile_field_filter_hook__image( $value, $data ) {
+ $uri = um_user_uploads_uri() . $value;
+ $title = ( isset( $data['title'] ) ) ? $data['title'] : __('Untitled photo');
+
+ // if value is an image tag
+ if( preg_match( '/\
';
+ } else if ( file_exists( um_user_uploads_dir() . $value ) ) {
+ $value = ''.$err.'
';
+ return $allowed;
+}
+add_filter( 'um_whitelisted_wpadmin_access', 'um_whitelisted_wpadmin_access' );
+
+
+/**
+ * Filter to customize errors
+ *
+ * @param $message
+ *
+ * @return string
+ */
+function um_custom_wp_err_messages( $message ) {
+
+ if ( isset( $_REQUEST['err'] ) && !empty( $_REQUEST['err'] ) ) {
+ switch( $_REQUEST['err'] ) {
+ case 'blocked_email':
+ $err = __('This email address has been blocked.','ultimate-member');
+ break;
+ case 'blocked_ip':
+ $err = __('Your IP address has been blocked.','ultimate-member');
+ break;
}
-
- return $message;
}
-
- /***
- *** @check for blocked ip
- ***/
- add_filter('authenticate', 'um_wp_form_errors_hook_ip_test', 10, 3);
- function um_wp_form_errors_hook_ip_test( $user, $username, $password ) {
- if ( ! empty( $username ) ) {
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook__blockedips
- * @description Hook that runs after user reset their password
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook__blockedips', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( "um_submit_form_errors_hook__blockedips", $args = array() );
- /**
- * UM hook
- *
- * @type action
- * @title um_submit_form_errors_hook__blockedemails
- * @description Hook that runs after user reset their password
- * @input_vars
- * [{"var":"$args","type":"array","desc":"Form data"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_submit_form_errors_hook__blockedemails', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( "um_submit_form_errors_hook__blockedemails", $args = array( 'username' => $username ) );
+
+ if ( isset( $err ) ) {
+ $message = ''.$err.'
';
+ }
+
+ return $message;
+}
+add_filter( 'login_message', 'um_custom_wp_err_messages' );
+
+
+/**
+ * Check for blocked ip
+ *
+ * @param $user
+ * @param $username
+ * @param $password
+ *
+ * @return mixed
+ */
+function um_wp_form_errors_hook_ip_test( $user, $username, $password ) {
+ if ( ! empty( $username ) ) {
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook__blockedips
+ * @description Hook that runs after user reset their password
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook__blockedips', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( "um_submit_form_errors_hook__blockedips", $args = array() );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_submit_form_errors_hook__blockedemails
+ * @description Hook that runs after user reset their password
+ * @input_vars
+ * [{"var":"$args","type":"array","desc":"Form data"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_submit_form_errors_hook__blockedemails', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( "um_submit_form_errors_hook__blockedemails", $args = array( 'username' => $username ) );
- }
-
- return $user;
}
-
- /***
- *** @login checks thru the wordpress admin login
- ***/
- add_filter('authenticate', 'um_wp_form_errors_hook_logincheck', 50, 3);
- function um_wp_form_errors_hook_logincheck( $user, $username, $password ) {
-
- do_action('wp_authenticate_username_password_before', $user, $username, $password );
-
- if ( isset( $user->ID ) ) {
-
- um_fetch_user( $user->ID );
- $status = um_user('account_status');
- switch( $status ) {
- case 'inactive':
- return new WP_Error( $status, __('Your account has been disabled.','ultimate-member') );
- break;
- case 'awaiting_admin_review':
- return new WP_Error( $status, __('Your account has not been approved yet.','ultimate-member') );
- break;
- case 'awaiting_email_confirmation':
- return new WP_Error( $status, __('Your account is awaiting e-mail verification.','ultimate-member') );
- break;
- case 'rejected':
- return new WP_Error( $status, __('Your membership request has been rejected.','ultimate-member') );
- break;
- }
-
+ return $user;
+}
+add_filter( 'authenticate', 'um_wp_form_errors_hook_ip_test', 10, 3 );
+
+
+/**
+ * Login checks thru the wordpress admin login
+ *
+ * @param $user
+ * @param $username
+ * @param $password
+ *
+ * @return WP_Error|WP_User
+ */
+function um_wp_form_errors_hook_logincheck( $user, $username, $password ) {
+
+ do_action( 'wp_authenticate_username_password_before', $user, $username, $password );
+
+ if ( isset( $user->ID ) ) {
+
+ um_fetch_user( $user->ID );
+ $status = um_user('account_status');
+
+ switch( $status ) {
+ case 'inactive':
+ return new WP_Error( $status, __('Your account has been disabled.','ultimate-member') );
+ break;
+ case 'awaiting_admin_review':
+ return new WP_Error( $status, __('Your account has not been approved yet.','ultimate-member') );
+ break;
+ case 'awaiting_email_confirmation':
+ return new WP_Error( $status, __('Your account is awaiting e-mail verification.','ultimate-member') );
+ break;
+ case 'rejected':
+ return new WP_Error( $status, __('Your membership request has been rejected.','ultimate-member') );
+ break;
}
- return wp_authenticate_username_password( $user, $username, $password );
+ }
- }
\ No newline at end of file
+ return wp_authenticate_username_password( $user, $username, $password );
+
+}
+add_filter( 'authenticate', 'um_wp_form_errors_hook_logincheck', 50, 3 );
\ No newline at end of file
diff --git a/includes/core/um-filters-members.php b/includes/core/um-filters-members.php
index cd10449e..3f780466 100644
--- a/includes/core/um-filters-members.php
+++ b/includes/core/um-filters-members.php
@@ -1,462 +1,488 @@
-permalinks()->get_query_array();
+ $arr_columns = array();
- $query = UM()->permalinks()->get_query_array();
- $arr_columns = array();
-
- foreach ( UM()->members()->core_search_fields as $key ) {
- if ( ! empty( $query[ $key ] ) ) {
- $arr_columns[] = $key;
- $query_args['search'] = '*' . $query[ $key ] .'*';
- }
+ foreach ( UM()->members()->core_search_fields as $key ) {
+ if ( ! empty( $query[ $key ] ) ) {
+ $arr_columns[] = $key;
+ $query_args['search'] = '*' . $query[ $key ] .'*';
}
-
- if ( ! empty( $arr_columns ) )
- $query_args['search_columns'] = $arr_columns;
-
- return $query_args;
}
- /**
- * Remove users we do not need to show in directory
- *
- * @param $query_args
- * @param $args
- *
- * @return mixed
- */
- function um_remove_special_users_from_list( $query_args, $args ) {
- extract( $args );
+ if ( ! empty( $arr_columns ) )
+ $query_args['search_columns'] = $arr_columns;
- $query_args['meta_query']['relation'] = 'AND';
+ return $query_args;
+}
+add_filter( 'um_prepare_user_query_args', 'um_search_usernames_emails', 51, 2 );
- if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) ) {
- $query_args['meta_query'][] = array(
- 'key' => 'account_status',
- 'value' => 'approved',
- 'compare' => '='
- );
+/**
+ * Remove users we do not need to show in directory
+ *
+ * @param $query_args
+ * @param $args
+ *
+ * @return mixed
+ */
+function um_remove_special_users_from_list( $query_args, $args ) {
+ extract( $args );
- }
+ $query_args['meta_query']['relation'] = 'AND';
- if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) || UM()->options()->get( 'account_hide_in_directory' ) ) {
- $query_args['meta_query'][] = array(
- "relation" => "OR",
+ if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) ) {
+
+ $query_args['meta_query'][] = array(
+ 'key' => 'account_status',
+ 'value' => 'approved',
+ 'compare' => '='
+ );
+
+ }
+
+ if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) || UM()->options()->get( 'account_hide_in_directory' ) ) {
+ $query_args['meta_query'][] = array(
+ "relation" => "OR",
+ array(
+ 'key' => 'hide_in_members',
+ 'value' => '',
+ 'compare' => 'NOT EXISTS'
+ ),
+ array(
+ "relation" => "AND",
array(
'key' => 'hide_in_members',
- 'value' => '',
- 'compare' => 'NOT EXISTS'
+ 'value' => __('Yes','ultimate-member'),
+ 'compare' => 'NOT LIKE'
),
array(
- "relation" => "AND",
- array(
- 'key' => 'hide_in_members',
- 'value' => __('Yes','ultimate-member'),
- 'compare' => 'NOT LIKE'
- ),
- array(
- 'key' => 'hide_in_members',
- 'value' => 'Yes',
- 'compare' => 'NOT LIKE'
- ),
+ 'key' => 'hide_in_members',
+ 'value' => 'Yes',
+ 'compare' => 'NOT LIKE'
),
- );
- }
-
- $roles = um_user( 'can_view_roles' );
- if ( UM()->roles()->um_user_can( 'can_view_all' ) && ! empty( $roles ) ) {
-
- $roles = maybe_unserialize( $roles );
-
- if ( ! empty( $roles ) ) {
- if ( ! empty( $query_args['role__in'] ) ) {
- $query_args['role__in'] = array_intersect( $query_args['role__in'], $roles );
- } else {
- $query_args['role__in'] = $roles;
- }
- }
-
- }
-
- return $query_args;
+ ),
+ );
}
- /***
- *** @adds search parameters
- ***/
- function um_add_search_to_query( $query_args, $args ){
- extract( $args );
+ $roles = um_user( 'can_view_roles' );
+ if ( UM()->roles()->um_user_can( 'can_view_all' ) && ! empty( $roles ) ) {
- if ( isset( $_REQUEST['um_search'] ) ) {
+ $roles = maybe_unserialize( $roles );
- $query = UM()->permalinks()->get_query_array();
-
- // if searching
- if ( isset( $query['search'] ) ) {
- $query_args['search'] = '*' . um_filter_search( $query['search'] ) . '*';
- unset( $query['search'] );
+ if ( ! empty( $roles ) ) {
+ if ( ! empty( $query_args['role__in'] ) ) {
+ $query_args['role__in'] = array_intersect( $query_args['role__in'], $roles );
+ } else {
+ $query_args['role__in'] = $roles;
}
+ }
- if ( $query && is_array( $query ) ) {
- foreach ( $query as $field => $value ) {
+ }
- if ( in_array( $field, array( 'members_page' ) ) ) continue;
+ return $query_args;
+}
+add_filter( 'um_prepare_user_query_args', 'um_remove_special_users_from_list', 99, 2 );
- $serialize_value = serialize( strval( $value ) );
+
+/**
+ * Adds search parameters
+ *
+ * @param $query_args
+ * @param $args
+ *
+ * @return mixed|void
+ */
+function um_add_search_to_query( $query_args, $args ){
+ extract( $args );
+
+ if ( isset( $_REQUEST['um_search'] ) ) {
+
+ $query = UM()->permalinks()->get_query_array();
+
+ // if searching
+ if ( isset( $query['search'] ) ) {
+ $query_args['search'] = '*' . um_filter_search( $query['search'] ) . '*';
+ unset( $query['search'] );
+ }
+
+ if ( $query && is_array( $query ) ) {
+ foreach ( $query as $field => $value ) {
+
+ if ( in_array( $field, array( 'members_page' ) ) ) continue;
+
+ $serialize_value = serialize( strval( $value ) );
- if ( $value && $field != 'um_search' && $field != 'page_id' ) {
+ if ( $value && $field != 'um_search' && $field != 'page_id' ) {
- if ( strstr( $field, 'role_' ) )
- $field = 'role';
+ if ( strstr( $field, 'role_' ) )
+ $field = 'role';
- if ( ! in_array( $field, UM()->members()->core_search_fields ) ) {
+ if ( ! in_array( $field, UM()->members()->core_search_fields ) ) {
- if ( 'role' == $field ) {
- $query_args['role__in'] = trim( $value );
- } else {
- $field_query = array(
- array(
- 'key' => $field,
- 'value' => trim( $value ),
- 'compare' => '=',
- ),
- array(
- 'key' => $field,
- 'value' => trim( $value ),
- 'compare' => 'LIKE',
- ),
- array(
- 'key' => $field,
- 'value' => trim( $serialize_value ),
- 'compare' => 'LIKE',
- ),
- 'relation' => 'OR',
- );
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_query_args_{$field}__filter
- * @description Change field's query for search at Members Directory
- * @input_vars
- * [{"var":"$field_query","type":"array","desc":"Field query"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $field_query = apply_filters( "um_query_args_{$field}__filter", $field_query );
- $query_args['meta_query'][] = $field_query;
- }
+ if ( 'role' == $field ) {
+ $query_args['role__in'] = trim( $value );
+ } else {
+ $field_query = array(
+ array(
+ 'key' => $field,
+ 'value' => trim( $value ),
+ 'compare' => '=',
+ ),
+ array(
+ 'key' => $field,
+ 'value' => trim( $value ),
+ 'compare' => 'LIKE',
+ ),
+ array(
+ 'key' => $field,
+ 'value' => trim( $serialize_value ),
+ 'compare' => 'LIKE',
+ ),
+ 'relation' => 'OR',
+ );
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_query_args_{$field}__filter
+ * @description Change field's query for search at Members Directory
+ * @input_vars
+ * [{"var":"$field_query","type":"array","desc":"Field query"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $field_query = apply_filters( "um_query_args_{$field}__filter", $field_query );
+ $query_args['meta_query'][] = $field_query;
}
}
}
+
+ }
+ }
+
+ }
+
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_query_args_filter
+ * @description Change query for search at Members Directory
+ * @input_vars
+ * [{"var":"$query_args","type":"array","desc":"Query Arguments"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $query_args = apply_filters( 'um_query_args_filter', $query_args );
+
+ if ( count( $query_args['meta_query'] ) == 1 )
+ unset( $query_args['meta_query'] );
+
+ return $query_args;
+
+}
+add_filter( 'um_prepare_user_query_args', 'um_add_search_to_query', 50, 2 );
+
+
+/**
+ * Adds main parameters
+ *
+ * @param $query_args
+ * @param $args
+ *
+ * @return mixed
+ */
+function um_prepare_user_query_args( $query_args, $args ) {
+ extract( $args );
+
+ $query_args['fields'] = 'ID';
+
+ $query_args['number'] = 0;
+
+ $query_args['meta_query']['relation'] = 'AND';
+
+ // must have a profile photo
+ if ( $has_profile_photo == 1 ) {
+ if ( UM()->options()->get( 'use_gravatars' ) ) {
+ $query_args['meta_query'][] = array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'synced_profile_photo', // addons
+ 'value' => '',
+ 'compare' => '!='
+ ),
+ array(
+ 'key' => 'profile_photo', // from upload form
+ 'value' => '',
+ 'compare' => '!='
+ ),
+ array(
+ 'key' => 'synced_gravatar_hashed_id', // gravatar
+ 'value' => '',
+ 'compare' => '!='
+ )
+
+ );
+ } else {
+ $query_args['meta_query'][] = array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'synced_profile_photo', // addons
+ 'value' => '',
+ 'compare' => '!='
+ ),
+ array(
+ 'key' => 'profile_photo', // from upload form
+ 'value' => '',
+ 'compare' => '!='
+ )
+ );
+ }
+ }
+
+ // must have a cover photo
+ if ( $has_cover_photo == 1 ) {
+ $query_args['meta_query'][] = array(
+ 'key' => 'cover_photo',
+ 'value' => '',
+ 'compare' => '!='
+ );
+ }
+
+
+ // show specific usernames
+ if ( isset( $show_these_users ) && $show_these_users && is_array( $show_these_users ) ) {
+ foreach ( $show_these_users as $username ) {
+ $users_array[] = username_exists( $username );
+ }
+ $query_args['include'] = $users_array;
+ }
+
+ // add roles to appear in directory
+ if ( ! empty( $roles ) ) {
+
+ //since WP4.4 use 'role__in' argument
+ $query_args['role__in'] = $roles;
+
+ /*$query_args['meta_query'][] = array(
+ 'key' => 'role',
+ 'value' => $roles,
+ 'compare' => 'IN'
+ );*/
+
+ }
+
+ // sort members by
+ $query_args['order'] = 'ASC';
+
+ if ( isset( $sortby ) ) {
+
+
+ if ( $sortby == 'other' && $sortby_custom ) {
+
+ $query_args['meta_key'] = $sortby_custom;
+ $query_args['orderby'] = 'meta_value, display_name';
+
+ } else if ( in_array( $sortby, array( 'last_name', 'first_name' ) ) ) {
+
+ $query_args['meta_key'] = $sortby;
+ $query_args['orderby'] = 'meta_value';
+
+ } else {
+
+ if ( strstr( $sortby, '_desc' ) ) {
+ $sortby = str_replace('_desc','',$sortby);
+ $order = 'DESC';
}
+ if ( strstr( $sortby, '_asc' ) ) {
+ $sortby = str_replace('_asc','',$sortby);
+ $order = 'ASC';
+ }
+
+ $query_args['orderby'] = $sortby;
+
+ }
+
+ if ( isset( $order ) ) {
+ $query_args['order'] = $order;
}
/**
* UM hook
*
* @type filter
- * @title um_query_args_filter
- * @description Change query for search at Members Directory
+ * @title um_modify_sortby_parameter
+ * @description Change query sort by attributes for search at Members Directory
* @input_vars
- * [{"var":"$query_args","type":"array","desc":"Query Arguments"}]
+ * [{"var":"$query_args","type":"array","desc":"Query Arguments"},
+ * {"var":"$sortby","type":"string","desc":"Sort by"}]
* @change_log
* ["Since: 2.0"]
* @usage
- *
+ *
* @example
*
*/
- $query_args = apply_filters( 'um_query_args_filter', $query_args );
-
- if ( count( $query_args['meta_query'] ) == 1 )
- unset( $query_args['meta_query'] );
-
- return $query_args;
+ $query_args = apply_filters('um_modify_sortby_parameter', $query_args, $sortby);
}
- /***
- *** @adds main parameters
- ***/
- function um_prepare_user_query_args( $query_args, $args ) {
- extract( $args );
-
- $query_args['fields'] = 'ID';
-
- $query_args['number'] = 0;
-
- $query_args['meta_query']['relation'] = 'AND';
-
- // must have a profile photo
- if ( $has_profile_photo == 1 ) {
- if ( UM()->options()->get( 'use_gravatars' ) ) {
- $query_args['meta_query'][] = array(
- 'relation' => 'OR',
- array(
- 'key' => 'synced_profile_photo', // addons
- 'value' => '',
- 'compare' => '!='
- ),
- array(
- 'key' => 'profile_photo', // from upload form
- 'value' => '',
- 'compare' => '!='
- ),
- array(
- 'key' => 'synced_gravatar_hashed_id', // gravatar
- 'value' => '',
- 'compare' => '!='
- )
-
- );
- } else {
- $query_args['meta_query'][] = array(
- 'relation' => 'OR',
- array(
- 'key' => 'synced_profile_photo', // addons
- 'value' => '',
- 'compare' => '!='
- ),
- array(
- 'key' => 'profile_photo', // from upload form
- 'value' => '',
- 'compare' => '!='
- )
- );
- }
- }
-
- // must have a cover photo
- if ( $has_cover_photo == 1 ) {
- $query_args['meta_query'][] = array(
- 'key' => 'cover_photo',
- 'value' => '',
- 'compare' => '!='
- );
- }
+ return $query_args;
+}
+add_filter( 'um_prepare_user_query_args', 'um_prepare_user_query_args', 10, 2 );
- // show specific usernames
- if ( isset( $show_these_users ) && $show_these_users && is_array( $show_these_users ) ) {
- foreach ( $show_these_users as $username ) {
- $users_array[] = username_exists( $username );
- }
- $query_args['include'] = $users_array;
- }
-
- // add roles to appear in directory
- if ( ! empty( $roles ) ) {
-
- //since WP4.4 use 'role__in' argument
- $query_args['role__in'] = $roles;
-
- /*$query_args['meta_query'][] = array(
- 'key' => 'role',
- 'value' => $roles,
- 'compare' => 'IN'
- );*/
-
- }
-
- // sort members by
- $query_args['order'] = 'ASC';
-
- if ( isset( $sortby ) ) {
+/**
+ * Sorting by last login date
+ *
+ * @param $query_args
+ * @param $sortby
+ *
+ * @return mixed
+ */
+function um_sortby_last_login( $query_args, $sortby ) {
+ if ( $sortby == 'last_login' ) {
+ $query_args['orderby'] = 'meta_value_num';
+ $query_args['order'] = 'desc';
+ $query_args['meta_key'] = '_um_last_login';
+ }
+ return $query_args;
+}
+add_filter( 'um_modify_sortby_parameter', 'um_sortby_last_login', 100, 2 );
- if ( $sortby == 'other' && $sortby_custom ) {
-
- $query_args['meta_key'] = $sortby_custom;
- $query_args['orderby'] = 'meta_value, display_name';
-
- } else if ( in_array( $sortby, array( 'last_name', 'first_name' ) ) ) {
-
- $query_args['meta_key'] = $sortby;
- $query_args['orderby'] = 'meta_value';
-
- } else {
-
- if ( strstr( $sortby, '_desc' ) ) {
- $sortby = str_replace('_desc','',$sortby);
- $order = 'DESC';
- }
-
- if ( strstr( $sortby, '_asc' ) ) {
- $sortby = str_replace('_asc','',$sortby);
- $order = 'ASC';
- }
-
- $query_args['orderby'] = $sortby;
-
- }
-
- if ( isset( $order ) ) {
- $query_args['order'] = $order;
- }
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_modify_sortby_parameter
- * @description Change query sort by attributes for search at Members Directory
- * @input_vars
- * [{"var":"$query_args","type":"array","desc":"Query Arguments"},
- * {"var":"$sortby","type":"string","desc":"Sort by"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $query_args = apply_filters('um_modify_sortby_parameter', $query_args, $sortby);
-
- }
-
- return $query_args;
+/**
+ * Sorting random
+ *
+ * @param $query
+ *
+ * @return mixed
+ */
+function um_modify_sortby_randomly( $query ) {
+ if( um_is_session_started() === false ){
+ @session_start();
}
- /***
- *** @sorting by last login date
- ***/
- add_filter('um_modify_sortby_parameter', 'um_sortby_last_login', 100, 2 );
- function um_sortby_last_login( $query_args, $sortby ) {
- if ( $sortby == 'last_login' ) {
- $query_args['orderby'] = 'meta_value_num';
- $query_args['order'] = 'desc';
- $query_args['meta_key'] = '_um_last_login';
+ // Reset seed on load of initial
+ if( ! isset( $_REQUEST['members_page'] ) || $_REQUEST['members_page'] == 0 || $_REQUEST['members_page'] == 1 ) {
+ if( isset( $_SESSION['seed'] ) ) {
+ unset( $_SESSION['seed'] );
}
- return $query_args;
}
- /***
- *** @sorting random
- ***/
- add_filter('pre_user_query','um_modify_sortby_randomly');
- function um_modify_sortby_randomly( $query ){
-
- if( um_is_session_started() === false ){
- @session_start();
- }
-
- // Reset seed on load of initial
- if( ! isset( $_REQUEST['members_page'] ) || $_REQUEST['members_page'] == 0 || $_REQUEST['members_page'] == 1 ) {
- if( isset( $_SESSION['seed'] ) ) {
- unset( $_SESSION['seed'] );
- }
- }
+ // Get seed from session variable if it exists
+ $seed = false;
+ if( isset( $_SESSION['seed'] ) ) {
+ $seed = $_SESSION['seed'];
+ }
- // Get seed from session variable if it exists
- $seed = false;
- if( isset( $_SESSION['seed'] ) ) {
- $seed = $_SESSION['seed'];
- }
-
- // Set new seed if none exists
- if ( ! $seed ) {
- $seed = rand();
- $_SESSION['seed'] = $seed;
- }
-
- if($query->query_vars["orderby"] == 'random') {
- $query->query_orderby = 'ORDER by RAND('. $seed.')';
- }
-
- return $query;
+ // Set new seed if none exists
+ if ( ! $seed ) {
+ $seed = rand();
+ $_SESSION['seed'] = $seed;
}
- /***
- *** @hook in the member results array
- ***/
- add_filter('um_prepare_user_results_array', 'um_prepare_user_results_array', 50, 2);
- function um_prepare_user_results_array($result){
+ if($query->query_vars["orderby"] == 'random') {
+ $query->query_orderby = 'ORDER by RAND('. $seed.')';
+ }
- if ( empty( $result['users_per_page'] ) ) {
- $result['no_users'] = 1;
- } else {
- $result['no_users'] = 0;
- }
+ return $query;
+}
+add_filter( 'pre_user_query','um_modify_sortby_randomly' );
+
+
+/**
+ * Hook in the member results array
+ *
+ * @param $result
+ *
+ * @return mixed
+ */
+function um_prepare_user_results_array( $result ) {
+ if ( empty( $result['users_per_page'] ) ) {
+ $result['no_users'] = 1;
+ } else {
+ $result['no_users'] = 0;
+ }
- return $result;
+ return $result;
+}
+add_filter( 'um_prepare_user_results_array', 'um_prepare_user_results_array', 50, 2 );
+
+
+/**
+ * Retrieves search filter options from a callback
+ *
+ * @param $atts array
+ * @return array
+ */
+function um_search_select_fields( $atts ) {
+
+ if( isset( $atts['custom_dropdown_options_source'] ) && ! empty( $atts['custom_dropdown_options_source'] ) ){
+ $atts['custom'] = true;
+ $atts['options'] = UM()->fields()->get_options_from_callback( $atts, $atts['type'] );
}
- /**
- * Retrieves search filter options from a callback
- * @param $atts array
- * @return $atts array
- */
- add_filter('um_search_select_fields','um_search_select_fields');
- function um_search_select_fields( $atts ){
-
- if( isset( $atts['custom_dropdown_options_source'] ) && ! empty( $atts['custom_dropdown_options_source'] ) ){
- $atts['custom'] = true;
- $atts['options'] = UM()->fields()->get_options_from_callback( $atts, $atts['type'] );
- }
-
- if( isset( $atts['label'] ) ){
- $atts['label'] = strip_tags( $atts['label'] );
- }
-
-
- return $atts;
+ if( isset( $atts['label'] ) ){
+ $atts['label'] = strip_tags( $atts['label'] );
}
- /**
- * Filter gender query argument
- * @param array $field_query
- * @return array
- */
- add_filter('um_query_args_gender__filter','um_query_args_gender__filter');
- function um_query_args_gender__filter( $field_query ){
+ return $atts;
+}
+add_filter( 'um_search_select_fields', 'um_search_select_fields' );
- unset( $field_query[1] );
-
- return $field_query;
- }
+/**
+ * Filter gender query argument
+ *
+ * @param array $field_query
+ * @return array
+ */
+function um_query_args_gender__filter( $field_query ) {
+ unset( $field_query[1] );
+ return $field_query;
+}
+add_filter( 'um_query_args_gender__filter', 'um_query_args_gender__filter' );
\ No newline at end of file
diff --git a/includes/core/um-filters-misc.php b/includes/core/um-filters-misc.php
index bb9a8041..5154a89f 100644
--- a/includes/core/um-filters-misc.php
+++ b/includes/core/um-filters-misc.php
@@ -1,13 +1,15 @@
- 0 ) ? true : false;
+ $visible = ( count( array_intersect( $current_user_roles, (array)$roles ) ) > 0 ) ? true : false;
} else {
$visible = is_user_logged_in() ? true : false;
}
@@ -111,5 +113,5 @@ if ( ! is_admin() ) {
return $items;
}
-
+ add_filter( 'wp_get_nav_menu_items', 'um_conditional_nav_menu', 9999, 3 );
}
\ No newline at end of file
diff --git a/includes/core/um-filters-profile.php b/includes/core/um-filters-profile.php
index 11686697..6a94e1c9 100644
--- a/includes/core/um-filters-profile.php
+++ b/includes/core/um-filters-profile.php
@@ -1,94 +1,105 @@
-options()->get( 'profile_title' );
+ $profile_title = UM()->options()->get( 'profile_title' );
- if ( um_is_core_page('user') && um_get_requested_user() ) {
+ if ( um_is_core_page('user') && um_get_requested_user() ) {
- um_fetch_user( um_get_requested_user() );
+ um_fetch_user( um_get_requested_user() );
- $profile_title = um_convert_tags( $profile_title );
+ $profile_title = um_convert_tags( $profile_title );
- $title = $profile_title;
+ $title = $profile_title;
- um_reset_user();
+ um_reset_user();
- }
+ }
+ return $title;
+}
+add_filter('the_seo_framework_pro_add_title', 'um_dynamic_user_profile_pagetitle', 100000, 2 );
+add_filter('wp_title', 'um_dynamic_user_profile_pagetitle', 100000, 2 );
+add_filter('pre_get_document_title', 'um_dynamic_user_profile_pagetitle', 100000, 2 );
+
+
+/**
+ * Try and modify the page title in page
+ *
+ * @param $title
+ * @param string $id
+ *
+ * @return string
+ */
+function um_dynamic_user_profile_title( $title, $id = '' ) {
+
+ if( is_admin() ){
return $title;
}
- /***
- *** @try and modify the page title in page
- ***/
- add_filter('the_title', 'um_dynamic_user_profile_title', 100000, 2 );
- function um_dynamic_user_profile_title( $title, $id = '' ) {
-
- if( is_admin() ){
- return $title;
+ if ( $id == UM()->config()->permalinks['user'] && in_the_loop() ) {
+ if ( um_is_core_page('user') && um_get_requested_user() ) {
+ $title = um_get_display_name( um_get_requested_user() );
+ } else if ( um_is_core_page('user') && is_user_logged_in() ) {
+ $title = um_get_display_name( get_current_user_id() );
}
-
- if ( $id == UM()->config()->permalinks['user'] && in_the_loop() ) {
- if ( um_is_core_page('user') && um_get_requested_user() ) {
- $title = um_get_display_name( um_get_requested_user() );
- } else if ( um_is_core_page('user') && is_user_logged_in() ) {
- $title = um_get_display_name( get_current_user_id() );
- }
- }
-
-
- if( ! function_exists('utf8_decode') ){
- return $title;
- }
-
- return (strlen($title)!==strlen(utf8_decode($title))) ? $title : utf8_encode($title);
}
+ if( ! function_exists('utf8_decode') ){
+ return $title;
+ }
- /***
- *** @Add cover photo label of file size limit
- ***/
- add_filter('um_predefined_fields_hook','um_change_profile_cover_photo_label',10,1);
- function um_change_profile_cover_photo_label( $args ){
- $max_size = UM()->files()->format_bytes( $args['cover_photo']['max_size'] );
- list( $file_size, $unit ) = explode(' ', $max_size );
+ return (strlen($title)!==strlen(utf8_decode($title))) ? $title : utf8_encode($title);
+}
+add_filter( 'the_title', 'um_dynamic_user_profile_title', 100000, 2 );
- if( $file_size >= 999999999 ){
+
+/**
+ * Add cover photo label of file size limit
+ *
+ * @param $args
+ *
+ * @return mixed
+ */
+function um_change_profile_cover_photo_label( $args ){
+ $max_size = UM()->files()->format_bytes( $args['cover_photo']['max_size'] );
+ list( $file_size, $unit ) = explode(' ', $max_size );
+
+ if( $file_size >= 999999999 ){
}else{
$args['cover_photo']['upload_text'] .= '( '.__('max','ultimate-member').': '.$file_size.$unit.' )';
}
return $args;
}
+add_filter( 'um_predefined_fields_hook', 'um_change_profile_cover_photo_label', 10, 1 );
- /***
- *** @Add profile photo label of file size limit
- ***/
- add_filter('um_predefined_fields_hook','um_change_profile_photo_label',10,1);
- function um_change_profile_photo_label( $args ){
- $max_size = UM()->files()->format_bytes( $args['profile_photo']['max_size'] );
- list( $file_size, $unit ) = explode(' ', $max_size );
+/**
+ * Add profile photo label of file size limit
+ *
+ * @param $args
+ *
+ * @return mixed
+ */
+function um_change_profile_photo_label( $args ) {
+ $max_size = UM()->files()->format_bytes( $args['profile_photo']['max_size'] );
+ list( $file_size, $unit ) = explode(' ', $max_size );
- if( $file_size >= 999999999 ){
-
- }else{
- $args['profile_photo']['upload_text'] .= '( '.__('max','ultimate-member').': '.$file_size.$unit.' )';
- }
- return $args;
+ if ( $file_size < 999999999 ) {
+ $args['profile_photo']['upload_text'] .= '( '.__('max','ultimate-member').': '.$file_size.$unit.' )';
}
+ return $args;
+}
+add_filter( 'um_predefined_fields_hook', 'um_change_profile_photo_label', 10, 1 );
\ No newline at end of file
diff --git a/includes/core/um-filters-user.php b/includes/core/um-filters-user.php
index 6c038a0d..6fef1987 100644
--- a/includes/core/um-filters-user.php
+++ b/includes/core/um-filters-user.php
@@ -1,12 +1,13 @@
-options()->get( 'permalink_base' );
$user_query = new WP_User_Query(
- array(
- 'meta_query' => array(
- 'relation' => 'AND',
- array(
- 'key' => 'um_user_profile_url_slug_'.$permalink_base,
- 'value' => $raw,
- 'compare' => '='
- )
- ),
- 'fields' => array('ID')
- )
+ array(
+ 'meta_query' => array(
+ 'relation' => 'AND',
+ array(
+ 'key' => 'um_user_profile_url_slug_'.$permalink_base,
+ 'value' => $raw,
+ 'compare' => '='
+ )
+ ),
+ 'fields' => array('ID')
+ )
);
if( $user_query->total_users > 0 ){
- $result = current( $user_query->get_results() );
- $slugname = '';
+ $result = current( $user_query->get_results() );
+ $slugname = '';
if( isset( $result->ID ) ){
- $slugname = get_user_meta( $result->ID, 'um_user_profile_url_slug_'.$permalink_base, true );
- $value = $slugname;
+ $slugname = get_user_meta( $result->ID, 'um_user_profile_url_slug_'.$permalink_base, true );
+ $value = $slugname;
}
}
@@ -117,155 +118,155 @@ function um_clean_user_basename_filter( $value, $raw ){
$raw_value = $value;
switch( $permalink_base ) {
- case 'name':
+ case 'name':
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
- $value = str_replace( '_', '. ', $value );
- }
+ if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ $value = str_replace( '_', '. ', $value );
+ }
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
- $value = str_replace( '_', '-', $value );
- }
+ if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ $value = str_replace( '_', '-', $value );
+ }
- if( ! empty( $value ) && strrpos( $value ,".") > -1 && strrpos( $raw_value ,"_" ) <= -1 ){
- $value = str_replace( '.', ' ', $value );
- }
+ if( ! empty( $value ) && strrpos( $value ,".") > -1 && strrpos( $raw_value ,"_" ) <= -1 ){
+ $value = str_replace( '.', ' ', $value );
+ }
- /**
- * UM hook
- *
- * @type filter
- * @title um_permalink_base_after_filter_name
- * @description Base permalink after if permalink is username
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"},
- * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $value = apply_filters("um_permalink_base_after_filter_name", $value, $raw_value );
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_permalink_base_after_filter_name
+ * @description Base permalink after if permalink is username
+ * @input_vars
+ * [{"var":"$permalink","type":"string","desc":"User Permalink"},
+ * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $value = apply_filters("um_permalink_base_after_filter_name", $value, $raw_value );
break;
- case 'name_dash':
+ case 'name_dash':
- if( ! empty( $value ) && strrpos( $value ,"-") > -1 ){
- $value = str_replace( '-', ' ', $value );
- }
+ if( ! empty( $value ) && strrpos( $value ,"-") > -1 ){
+ $value = str_replace( '-', ' ', $value );
+ }
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
- $value = str_replace( '_', '-', $value );
- }
+ if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ $value = str_replace( '_', '-', $value );
+ }
- // Checks if last name has a dash
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
- $value = str_replace( '_', '-', $value );
- }
+ // Checks if last name has a dash
+ if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ $value = str_replace( '_', '-', $value );
+ }
- /**
- * UM hook
- *
- * @type filter
- * @title um_permalink_base_after_filter_name_dash
- * @description Base permalink after if permalink is first name - last name
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"},
- * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $value = apply_filters("um_permalink_base_after_filter_name_dash", $value, $raw_value );
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_permalink_base_after_filter_name_dash
+ * @description Base permalink after if permalink is first name - last name
+ * @input_vars
+ * [{"var":"$permalink","type":"string","desc":"User Permalink"},
+ * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $value = apply_filters("um_permalink_base_after_filter_name_dash", $value, $raw_value );
break;
- case 'name_plus':
+ case 'name_plus':
- if( ! empty( $value ) && strrpos( $value ,"+") > -1 ){
- $value = str_replace( '+', ' ', $value );
- }
+ if( ! empty( $value ) && strrpos( $value ,"+") > -1 ){
+ $value = str_replace( '+', ' ', $value );
+ }
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
- $value = str_replace( '_', '+', $value );
- }
+ if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ $value = str_replace( '_', '+', $value );
+ }
- /**
- * UM hook
- *
- * @type filter
- * @title um_permalink_base_after_filter_name_plus
- * @description Base permalink after if permalink is first name + last name
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"},
- * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $value = apply_filters("um_permalink_base_after_filter_name_plus", $value, $raw_value );
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_permalink_base_after_filter_name_plus
+ * @description Base permalink after if permalink is first name + last name
+ * @input_vars
+ * [{"var":"$permalink","type":"string","desc":"User Permalink"},
+ * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $value = apply_filters("um_permalink_base_after_filter_name_plus", $value, $raw_value );
break;
- default:
+ default:
- // Checks if last name has a dash
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 && substr( $value , "_") == 1 ){
- $value = str_replace( '_', '-', $value );
- }
+ // Checks if last name has a dash
+ if( ! empty( $value ) && strrpos( $value ,"_") > -1 && substr( $value , "_") == 1 ){
+ $value = str_replace( '_', '-', $value );
+ }
- /**
- * UM hook
- *
- * @type filter
- * @title um_permalink_base_after_filter
- * @description Base permalink after for default permalink
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"},
- * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $value = apply_filters("um_permalink_base_after_filter", $value, $raw_value );
+ /**
+ * UM hook
+ *
+ * @type filter
+ * @title um_permalink_base_after_filter
+ * @description Base permalink after for default permalink
+ * @input_vars
+ * [{"var":"$permalink","type":"string","desc":"User Permalink"},
+ * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage
+ *
+ * @example
+ *
+ */
+ $value = apply_filters("um_permalink_base_after_filter", $value, $raw_value );
break;
}
@@ -273,6 +274,7 @@ function um_clean_user_basename_filter( $value, $raw ){
return $value;
}
+add_filter( 'um_clean_user_basename_filter', 'um_clean_user_basename_filter', 2, 10 );
/**
diff --git a/includes/core/um-navmenu.php b/includes/core/um-navmenu.php
index c23861c4..0840406e 100644
--- a/includes/core/um-navmenu.php
+++ b/includes/core/um-navmenu.php
@@ -3,8 +3,13 @@ if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'UM_Menu_Item_Custom_Fields_Editor' ) ) {
+
+ /**
+ * Class UM_Menu_Item_Custom_Fields_Editor
+ */
class UM_Menu_Item_Custom_Fields_Editor {
+
/**
* @var array
*/
diff --git a/includes/widgets/class-um-search-widget.php b/includes/widgets/class-um-search-widget.php
index 7e0cb26a..bae8cbce 100644
--- a/includes/widgets/class-um-search-widget.php
+++ b/includes/widgets/class-um-search-widget.php
@@ -4,8 +4,17 @@ namespace um\widgets;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Class UM_Search_Widget
+ * @package um\widgets
+ */
class UM_Search_Widget extends \WP_Widget {
+
+ /**
+ * UM_Search_Widget constructor.
+ */
function __construct() {
parent::__construct(
@@ -22,7 +31,13 @@ class UM_Search_Widget extends \WP_Widget {
}
- // Creating widget front-end
+
+ /**
+ * Creating widget front-end
+ *
+ * @param array $args
+ * @param array $instance
+ */
public function widget( $args, $instance ) {
$title = apply_filters( 'widget_title', $instance['title'] );
@@ -39,7 +54,12 @@ class UM_Search_Widget extends \WP_Widget {
echo $args['after_widget'];
}
- // Widget Backend
+
+ /**
+ * Widget Backend
+ *
+ * @param array $instance
+ */
public function form( $instance ) {
if ( isset( $instance[ 'title' ] ) ) {
$title = $instance[ 'title' ];
@@ -64,11 +84,19 @@ class UM_Search_Widget extends \WP_Widget {