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

- small fixes for file uploader;

Browse Source 
- added filter for include UM pages to conditional logic;
This commit is contained in:
nikitozzzzzzz
2018-08-07 12:38:19 +03:00
parent 06ca1cd775
commit 1a17095b24
8 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-functions.js
+6 -4
View File
@@ -241,12 +241,13 @@ function initImageUpload_UM( trigger ) {
}
trigger.uploadFile({
url: um_scripts.imageupload,
url: wp.ajax.settings.url,
method: "POST",
multiple: false,
formData: {
key: trigger.data('key'),
set_id: trigger.data('set_id'),
action: 'um_imageupload',
key: trigger.data('key'),
set_id: trigger.data('set_id'),
set_mode: trigger.data('set_mode'),
_wpnonce: trigger.data('nonce'),
timestamp: trigger.data('timestamp'),
@@ -339,10 +340,11 @@ function initFileUpload_UM( trigger ) {
}
trigger.uploadFile({
url: um_scripts.fileupload,
url: wp.ajax.settings.url,
method: "POST",
multiple: false,
formData: {
action: 'um_fileupload',
key: trigger.data('key'),
set_id: trigger.data('set_id'),
set_mode: trigger.data('set_mode'),
includes/class-init.php
+2 -2
View File
@@ -30,7 +30,7 @@ if ( ! class_exists( 'UM' ) ) {
* @method UM_Terms_Conditions_API Terms_Conditions_API()
* @method UM_Private_Content_API Private_Content_API()
* @method UM_User_Location_API User_Location_API()
* @method UM_GDPR_API GDPR_API()
* @method UM_Photos_API Photos_API()
*
*/
final class UM extends UM_Functions {
@@ -1158,7 +1158,7 @@ if ( ! class_exists( 'UM' ) ) {
/**
* @since 2.0.21
*
* @return um\core\Files
* @return um\core\Uploader
*/
function uploader() {
if ( empty( $this->classes['uploader'] ) ) {
includes/core/class-access.php
+7 -2
View File
@@ -533,12 +533,17 @@ if ( ! class_exists( 'um\core\Access' ) ) {
return false;
}
//exlude from privacy UM default pages (except Members list and User(Profile) page)
//exclude from privacy UM default pages (except Members list and User(Profile) page)
$exclude = false;
if ( ! empty( $post->post_type ) && $post->post_type == 'page' ) {
if ( um_is_core_post( $post, 'login' ) || um_is_core_post( $post, 'register' ) ||
um_is_core_post( $post, 'account' ) || um_is_core_post( $post, 'logout' ) ||
um_is_core_post( $post, 'password-reset' ) || ( is_user_logged_in() && um_is_core_post( $post, 'user' ) ) )
return false;
$exclude = true;
}
$exclude = apply_filters( 'um_exclude_posts_from_privacy', $exclude, $post );
if ( $exclude ) {
return false;
}
$restricted_posts = UM()->options()->get( 'restricted_access_post_metabox' );
includes/core/class-enqueue.php
+3 -3
View File
@@ -137,8 +137,8 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
*/
$localize_data = apply_filters( 'um_enqueue_localize_data', array(
'ajaxurl' => admin_url( 'admin-ajax.php' ),
'fileupload' => UM()->get_ajax_route( 'um\core\Files', 'ajax_file_upload' ),
'imageupload' => UM()->get_ajax_route( 'um\core\Files', 'ajax_image_upload' ),
//'fileupload' => UM()->get_ajax_route( 'um\core\Files', 'ajax_file_upload' ),
//'imageupload' => UM()->get_ajax_route( 'um\core\Files', 'ajax_image_upload' ),
'remove_file' => UM()->get_ajax_route( 'um\core\Files', 'ajax_remove_file' ),
'delete_profile_photo' => UM()->get_ajax_route( 'um\core\Profile', 'ajax_delete_profile_photo' ),
'delete_cover_photo' => UM()->get_ajax_route( 'um\core\Profile', 'ajax_delete_cover_photo' ),
@@ -318,7 +318,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
*/
function load_functions() {
wp_register_script('um_functions', um_url . 'assets/js/um-functions' . $this->suffix . '.js', array('jquery', 'jquery-masonry') );
wp_register_script('um_functions', um_url . 'assets/js/um-functions' . $this->suffix . '.js', array('jquery', 'jquery-masonry', 'wp-util') );
wp_enqueue_script('um_functions');
wp_enqueue_script( 'um-gdpr', um_url . 'assets/js/um-gdpr' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, false );
includes/core/class-fields.php
+12 -3
View File
@@ -2303,15 +2303,24 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}else{
$file_url = um_user_uploads_uri() . $this->field_value( $key, $default, $data );
}
$output .= "<div class=\"um-single-file-preview show\" data-key=\"{$key}\">
if ( file_exists( um_user_uploads_dir() . $file_field_value ) ) {
$output .= "<div class=\"um-single-file-preview show\" data-key=\"{$key}\">
<a href=\"#\" class=\"cancel\"><i class=\"um-icon-close\"></i></a>
<div class=\"um-single-fileinfo\">
<a href=\"{$file_url}\" target=\"_blank\">
<span class=\"icon\" style=\"background:" . UM()->files()->get_fonticon_bg_by_ext( $file_type['ext'] ) . "\"><i class=\"" . UM()->files()->get_fonticon_by_ext( $file_type['ext'] ) . "\"></i></span>
<span class=\"filename\">{$file_field_value}</span>
</a>
</div>
</div><a href=\"#\" data-modal=\"um_upload_single\" data-modal-size=\"{$modal_size}\" data-modal-copy=\"1\" class=\"um-button um-btn-auto-width\">" . __( 'Change file', 'ultimate-member' ) . "</a>";
</div></div>";
} else {
$output .= "<div class=\"um-single-file-preview show\" data-key=\"{$key}\">" . __('This file has been removed.','ultimate-member') . "</div>";
}
$output .= "<a href=\"#\" data-modal=\"um_upload_single\" data-modal-size=\"{$modal_size}\" data-modal-copy=\"1\" class=\"um-button um-btn-auto-width\">" . __( 'Change file', 'ultimate-member' ) . "</a>";
} else {
$output .= '<div class="um-single-file-preview" data-key="{$key}">
</div><a href="#" data-modal="um_upload_single" data-modal-size="{$modal_size}" data-modal-copy="1" class="um-button um-btn-auto-width">{$button_text}</a>';
includes/core/class-uploader.php
+25 -12
View File
@@ -232,7 +232,10 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
/**
* Set upload directory
*
* @param array $args
*
* @return array
*/
public function set_upload_directory( $args ){
@@ -252,17 +255,20 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
return $args;
}
/**
* Upload Image files
* @param string $uploadedfile
* @param integer $user_id
* @param string $field_key
* @param string $upload_type
*
* @since 2.0.22
* @param $uploadedfile
* @param int|null $user_id
* @param string $field_key
* @param string $upload_type
*
* @since 2.0.22
*
* @return array
*/
public function upload_image( $uploadedfile, $user_id = null, $field_key = '', $upload_type = 'stream_photo' ){
public function upload_image( $uploadedfile, $user_id = null, $field_key = '', $upload_type = 'stream_photo' ) {
$response = array();
@@ -324,6 +330,8 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
$response['error'] = $movefile['error'];
}else{
$movefile['url'] = set_url_scheme( $movefile['url'] );
$movefile['file_info']['basename'] = wp_basename( $movefile['file'] );
$file_type = wp_check_filetype( $movefile['file_info']['basename'] );
@@ -336,7 +344,7 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
$movefile['file_info']['size_format'] = size_format( $movefile['file_info']['size'] );
$movefile['file'] = $movefile['file_info']['basename'];
/**
* UM hook
*
@@ -438,11 +446,14 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
/**
* Upload Files
* @param string $uploadedfile
* @param integer $user_id
* @param string $field_key
*
* @since 2.0.22
* @param $uploadedfile
* @param int|null $user_id
* @param string $field_key
*
* @since 2.0.22
*
* @return array
*/
public function upload_file( $uploadedfile, $user_id = null, $field_key = '' ){
@@ -492,6 +503,8 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
$file_type = wp_check_filetype( $movefile['file'] );
$movefile['url'] = set_url_scheme( $movefile['url'] );
$movefile['file_info']['name'] = $movefile['url'];
$movefile['file_info']['original_name'] = $uploadedfile['name'];
$movefile['file_info']['basename'] = wp_basename( $movefile['file'] );
includes/core/um-filters-fields.php
+1 -1
View File
@@ -220,7 +220,7 @@ add_filter( 'um_profile_field_filter_hook__date', 'um_profile_field_filter_hook_
* @param $value
* @param $data
*
* @return string|void
* @return string
*/
function um_profile_field_filter_hook__file( $value, $data ) {
$uri = um_user_uploads_uri() . $value;
templates/members-grid.php
+2 -2
View File
@@ -100,7 +100,7 @@
continue;
?>
<div class="um-member-tagline um-member-tagline-<?php echo $key;?>"><?php _e( $value, 'ultimate-member'); ?></div>
<div class="um-member-tagline um-member-tagline-<?php echo esc_attr( $key );?>"><?php _e( $value, 'ultimate-member'); ?></div>
<?php
} // end if
@@ -124,7 +124,7 @@
if ( ! $value )
continue; ?>
<div class="um-member-metaline um-member-metaline-<?php echo $key; ?>"><span><strong><?php echo UM()->fields()->get_label( $key ); ?>:</strong> <?php _e( $value, 'ultimate-member'); ?></span></div>
<div class="um-member-metaline um-member-metaline-<?php echo esc_attr( $key ); ?>"><span><strong><?php echo UM()->fields()->get_label( $key ); ?>:</strong> <?php _e( $value, 'ultimate-member'); ?></span></div>
<?php }
}