';
- $output .= '
';
/* modal hidden */
$output .= '
+ if ( $this->field_value( $key, $default, $data ) ) {
-
+ $output .= ''. __('Change photo') . '';
- '. $button_text . '
+ } else {
+
+ $output .= ''. $button_text . '';
-
';
+ }
+
+ $output .= '';
@@ -1060,21 +1077,38 @@ class UM_Fields {
case 'file':
$output .= '
';
+ $output .= '';
+
if ( isset( $data['label'] ) ) {
$output .= $this->field_label($label, $key, $data);
}
$modal_label = ( isset( $data['label'] ) ) ? $data['label'] : __('Upload Photo','ultimatemember');
- $output .= '
+ $output .= '
';
/* modal hidden */
$output .= '';
-
';
+ $output .= '
+ if ( $this->field_value( $key, $default, $data ) ) {
+
+ $extension = pathinfo( $this->field_value( $key, $default, $data ), PATHINFO_EXTENSION);
+
+ $output .= ''. __('Change file') . '';
+
+ } else {
+
+ $output .= '
-
- '. $button_text . '
-
-
+
'. $button_text . '';
+
+ }
- ';
@@ -1094,7 +1128,7 @@ class UM_Fields {
$output .= '
';
+ }
+
+ return $value;
+ }
+
/***
*** @some required changes before value is shown
***/
@@ -9,7 +53,6 @@
if ( isset( $data['validate'] ) && $data['validate'] != '' && strstr( $data['validate'], 'url' ) ) {
$alt = ( isset( $data['url_text'] ) ) ? $data['url_text'] : $value;
$url_rel = ( isset( $data['url_rel'] ) ) ? 'rel="nofollow"' : '';
-
if( !strstr( $value, 'http' )
&& !strstr( $value, '://' )
&& !strstr( $value, 'www.' )
@@ -17,32 +60,24 @@
&& !strstr( $value, '.net' )
&& !strstr( $value, '.org' )
) {
-
if ( $data['validate'] == 'facebook_url' ) $value = 'http://facebook.com/' . $value;
if ( $data['validate'] == 'twitter_url' ) $value = 'http://twitter.com/' . $value;
if ( $data['validate'] == 'linkedin_url' ) $value = 'http://linkedin.com/' . $value;
if ( $data['validate'] == 'skype' ) $value = 'http://skype.com/' . $value;
if ( $data['validate'] == 'googleplus_url' ) $value = 'http://plus.google.com/' . $value;
- if ( $data['validate'] == 'instagram_url' ) $value = 'http://instagram.com/' . $value;
-
+ if ( $data['validate'] == 'instagram_url' ) $value = 'http://instagram.com/' . $value;
}
-
if ( strpos($value, 'http://') !== 0 ) {
$value = 'http://' . $value;
}
-
$value = ''.$alt.'';
}
if ( !is_array( $value ) ) {
-
if ( is_email( $value ) )
$value = ''.$value.'';
-
} else {
-
$value = implode(', ', $value);
-
}
return $value;
diff --git a/core/um-form.php b/core/um-form.php
index a27013e0..36fd4efc 100644
--- a/core/um-form.php
+++ b/core/um-form.php
@@ -12,7 +12,7 @@ class UM_Form {
$this->errors = null;
- add_action('init', array(&$this, 'form_init'), 1);
+ add_action('init', array(&$this, 'form_init'), 2);
add_action('init', array(&$this, 'field_declare'), 10);
@@ -88,6 +88,7 @@ class UM_Form {
do_action("um_submit_form_errors_hook", $this->post_form );
+
do_action("um_submit_form_{$this->post_form['mode']}", $this->post_form );
}
diff --git a/core/um-short-functions.php b/core/um-short-functions.php
index e5680e8a..2aa682cb 100644
--- a/core/um-short-functions.php
+++ b/core/um-short-functions.php
@@ -13,6 +13,21 @@
return 0;
}
+
+ /***
+ *** @Check that temp upload is valid
+ ***/
+ function um_is_temp_upload( $url ) {
+ global $ultimatemember;
+ $url = explode('/ultimatemember/temp/', $url);
+ if ( isset( $url[1] ) ) {
+ $src = $ultimatemember->files->upload_temp . $url[1];
+ if ( !file_exists( $src ) )
+ return false;
+ return $src;
+ }
+ return false;
+ }
/***
*** @Check that temp image is valid
@@ -21,16 +36,12 @@
global $ultimatemember;
$url = explode('/ultimatemember/temp/', $url);
if ( isset( $url[1] ) ) {
-
$src = $ultimatemember->files->upload_temp . $url[1];
-
if ( !file_exists( $src ) )
return false;
-
list($width, $height, $type, $attr) = @getimagesize($src);
if ( isset( $width ) && isset( $height ) )
return $src;
-
}
return false;
}
@@ -440,6 +451,18 @@
return $uri;
}
+ /***
+ *** @user uploads directory
+ ***/
+ function um_user_uploads_dir() {
+ global $ultimatemember;
+ $uri = $ultimatemember->files->upload_basedir . um_user('ID') . '/';
+ return $uri;
+ }
+
+ /***
+ *** @find closest number in an array
+ ***/
function um_closest_num($array, $number) {
sort($array);
foreach ($array as $a) {
diff --git a/core/um-user.php b/core/um-user.php
index caaaa6bb..7e6c39d1 100644
--- a/core/um-user.php
+++ b/core/um-user.php
@@ -21,7 +21,7 @@ class UM_User {
$this->preview = false;
- // needs to be updated by wp_update_user()
+ // a list of keys that should be done on wp_update_user
$this->update_user_keys = array(
'user_email',
'user_pass',
@@ -406,6 +406,20 @@ class UM_User {
return false;
}
+ /***
+ *** @update files
+ ***/
+ function update_files( $array ) {
+
+ global $ultimatemember;
+
+ foreach( $array as $key => $uri ) {
+ $src = um_is_temp_upload( $uri );
+ $ultimatemember->files->new_user_upload( $this->id, $src, $key );
+ }
+
+ }
+
/***
*** @update profile
***/
-
+
diff --git a/core/um-files.php b/core/um-files.php
index f4b631d4..39f2ec56 100644
--- a/core/um-files.php
+++ b/core/um-files.php
@@ -411,8 +411,8 @@ class UM_Files {
$ext = '.' . pathinfo($source_name, PATHINFO_EXTENSION);
$name = str_replace( $ext, '', $source_name );
$filename = $name . $ext;
-
- // copy image
+
+ // copy file
copy( $source, $this->upload_basedir . $user_id . '/' . $filename );
// thumbs
@@ -466,15 +466,15 @@ class UM_Files {
}
}
-
+
// clean up temp
$dir = dirname( $source );
unlink( $source );
rmdir( $dir );
-
+
// update user's meta
update_user_meta( $user_id, $key, $filename );
-
+
// the url of upload
return $this->upload_baseurl . $user_id . '/' . $filename;
diff --git a/core/um-filters-fields.php b/core/um-filters-fields.php
index 64f54181..268c8990 100644
--- a/core/um-filters-fields.php
+++ b/core/um-filters-fields.php
@@ -1,5 +1,49 @@
+
+
';
+ }
+
+ return $value;
+ }
+
+ /***
+ *** @Files
+ ***/
+ 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');
+
+ if ( !file_exists( um_user_uploads_dir() . $value ) ) {
+ $value = __('Image has been removed.');
+ } else {
+ $value = '