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

Update 1.0.62

Browse Source
This commit is contained in:
ultimatemember
2015-02-21 01:39:02 +02:00
parent 11c684fdeb
commit 6bc9419c06
17 changed files with 181 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/um-fields.php
+49 -6
View File
@@ -772,7 +772,7 @@ class UM_Fields {
$array['allowed_types'] = implode(',',$array['allowed_types']);
}
if (!isset($array['upload_text'])) $array['upload_text'] = '';
if (!isset($array['button_text'])) $array['button_text'] = __('Upload');
if (!isset($array['button_text'])) $array['button_text'] = __('Upload','ultimatemember');
if (!isset($array['extension_error'])) $array['extension_error'] = "Sorry this is not a valid image.";
if (!isset($array['max_size_error'])) $array['max_size_error'] = "This image is too large!";
if (!isset($array['min_size_error'])) $array['min_size_error'] = "This image is too small!";
@@ -793,7 +793,7 @@ class UM_Fields {
$array['allowed_types'] = implode(',',$array['allowed_types']);
}
if (!isset($array['upload_text'])) $array['upload_text'] = '';
if (!isset($array['button_text'])) $array['button_text'] = __('Upload');
if (!isset($array['button_text'])) $array['button_text'] = __('Upload','ultimatemember');
if (!isset($array['extension_error'])) $array['extension_error'] = "Sorry this is not a valid file.";
if (!isset($array['max_size_error'])) $array['max_size_error'] = "This file is too large!";
if (!isset($array['min_size_error'])) $array['min_size_error'] = "This file is too small!";
@@ -1202,9 +1202,17 @@ class UM_Fields {
if ( $this->field_value( $key, $default, $data ) ) {
$uri = um_user_uploads_uri() . $this->field_value( $key, $default, $data );
if ( isset( $ultimatemember->form->errors ) && !empty( $ultimatemember->form->errors ) ) {
if ( isset( $this->set_mode ) && $this->set_mode == 'register' ) {
$uri = $this->field_value( $key, $default, $data );
}
}
$output .= '<div class="um-single-image-preview show '. $crop_class .'" data-crop="'.$crop_data.'" data-key="'.$key.'">
<a href="#" class="cancel"><i class="um-icon-close"></i></a>
<img src="' . um_user_uploads_uri() . $this->field_value( $key, $default, $data ) . '" alt="" />
<img src="' . $uri . '" alt="" />
</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 photo') . '</a>';
} else {
@@ -1372,6 +1380,22 @@ class UM_Fields {
$options = $ultimatemember->builtin->get ( 'countries' );
}
// role field
if ( $form_key == 'role' ) {
global $wpdb;
foreach($options as $key => $val ) {
$val = (string) $val;
$val = trim( $val );
$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'um_role' AND post_title = '$val'");
$_role = get_post($post_id);
$new_roles[$_role->post_name] = $_role->post_title;
wp_reset_postdata();
}
$options = $new_roles;
}
// add an empty option!
$output .= '<option value=""></option>';
@@ -1470,7 +1494,23 @@ class UM_Fields {
}
$output .= '<div class="um-field-area">';
// role field
if ( $form_key == 'role' ) {
global $wpdb;
foreach($options as $key => $val ) {
$val = (string) $val;
$val = trim( $val );
$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'um_role' AND post_title = '$val'");
$_role = get_post($post_id);
$new_roles[$_role->post_name] = $_role->post_title;
wp_reset_postdata();
}
$options = $new_roles;
}
// add options
$i = 0;
@@ -2137,7 +2177,10 @@ class UM_Fields {
// show the heading
if ( $heading ) {
$heading_background_color = (isset($heading_background_color))?$heading_background_color:'';
$heading_text_color = (isset($heading_text_color))?$heading_text_color:'';
if ( $heading_background_color ) {
$css_heading_background_color = 'background-color: ' . $heading_background_color .';';
$css_heading_padding = 'padding: 10px 15px;';
@@ -2147,7 +2190,7 @@ class UM_Fields {
if ( $borderradius ) $css_heading_borderradius = 'border-radius: ' . $borderradius . ' ' . $borderradius . ' 0px 0px;';
$output .= '<div class="um-row-heading" style="' . $css_heading_background_color . $css_heading_padding . $css_heading_text_color . $css_heading_borderradius . '">';
if ( $icon ) $output .= '<span class="um-row-heading-icon"><i class="' . $icon . '"></i></span>';
if ( isset($icon) ) $output .= '<span class="um-row-heading-icon"><i class="' . $icon . '"></i></span>';
$output .= $heading_text .'</div>';
} else {