v 0.16.3

- the avatar field is now usable outside of the main metas form.
WordPressUtilities · Oct 4, 2024 · adcde0e · adcde0e
1 parent b6b8757
commit adcde0e
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 39 deletions.
diff --git a/inc/modules/edit-metas.php b/inc/modules/edit-metas.php
@@ -95,7 +95,45 @@ function wpu_extranet_update_metas__form($args = array()) {
 
     $user = wp_get_current_user();
 
-    /* Avatar */
+    $fields = array();
+    $fields['wpuextranet_avatar'] = wpu_extranet_get_avatar_field();
+
+    /* Default fields */
+    $fields['username'] = array(
+        'label' => __('Username', 'wpu_extranet'),
+        'attributes' => 'readonly',
+        'value' => $user->display_name
+    );
+
+    $fields['email'] = array(
+        'label' => __('Email', 'wpu_extranet'),
+        'attributes' => 'readonly',
+        'value' => $user->user_email
+    );
+
+    /* Custom fields */
+    foreach ($extra_fields as $field_id => $field):
+        if (!$field['in_editmetas_form']) {
+            continue;
+        }
+        $field['value'] = get_user_meta(get_current_user_id(), $field_id, 1);
+        $fields[$field_id] = $field;
+    endforeach;
+
+    $fields = apply_filters('wpu_extranet_update_metas__form_fields', $fields);
+
+    return wpu_extranet_get_form_html('editmetas', $fields, array(
+        'before_fields' => $args['before_fields'],
+        'after_fields' => '',
+        'form_action' => get_permalink(),
+        'form_submit' => __('Edit my infos', 'wpu_extranet'),
+        'form_title' => __('Infos', 'wpu_extranet')
+    ));
+}
+
+function wpu_extranet_get_avatar_field() {
+
+/* Avatar */
     $avatar_script = <<<EOT
 <script>
 document.addEventListener("DOMContentLoaded", function() {
@@ -129,48 +167,14 @@ function wpu_extranet_update_metas__form($args = array()) {
     if ($avatar_id) {
         $avatar_message = '<input type="checkbox" id="wpuextranet_delete_avatar" name="delete_avatar" value="1" /><label for="wpuextranet_delete_avatar">' . __('Delete this avatar', 'wpu_extranet') . '</label>';
     }
-
-    $fields = array();
-    $fields['wpuextranet_avatar'] = array(
+    return array(
         'label' => __('Avatar', 'wpu_extranet'),
         'before_content' => $avatar_script . '<div class="avatar-grid"><div>' . $avatar_img . '</div><div>',
         'after_content' => '<small id="wpu-extranet-avatar-message">' . $avatar_message . '</small></div></div>',
         'attributes' => 'accept="image/png, image/jpg, image/jpeg"',
         'type' => 'file',
-        'value' => $user->user_email
-    );
-
-    /* Default fields */
-    $fields['username'] = array(
-        'label' => __('Username', 'wpu_extranet'),
-        'attributes' => 'readonly',
-        'value' => $user->display_name
+        'value' => 0
     );
-
-    $fields['email'] = array(
-        'label' => __('Email', 'wpu_extranet'),
-        'attributes' => 'readonly',
-        'value' => $user->user_email
-    );
-
-    /* Custom fields */
-    foreach ($extra_fields as $field_id => $field):
-        if (!$field['in_editmetas_form']) {
-            continue;
-        }
-        $field['value'] = get_user_meta(get_current_user_id(), $field_id, 1);
-        $fields[$field_id] = $field;
-    endforeach;
-
-    $fields = apply_filters('wpu_extranet_update_metas__form_fields', $fields);
-
-    return wpu_extranet_get_form_html('editmetas', $fields, array(
-        'before_fields' => $args['before_fields'],
-        'after_fields' => '',
-        'form_action' => get_permalink(),
-        'form_submit' => __('Edit my infos', 'wpu_extranet'),
-        'form_title' => __('Infos', 'wpu_extranet')
-    ));
 }
 
 /* ----------------------------------------------------------

diff --git a/wpu_extranet.php b/wpu_extranet.php
@@ -4,7 +4,7 @@
 /*
 Plugin Name: WPU Extranet
 Description: Simple toolbox to create an extranet or a customer account
-Version: 0.16.2
+Version: 0.16.3
 Author: Darklg
 Author URI: https://darklg.me/
 Text Domain: wpu_extranet
@@ -18,7 +18,7 @@
 Update URI: https://github.com/WordPressUtilities/wpu_extranet
 */
 
-define('WPU_EXTRANET_VERSION', '0.16.2');
+define('WPU_EXTRANET_VERSION', '0.16.3');
 
 /* ----------------------------------------------------------
   Settings