Changeset 11784

Timestamp:

08/06/2009 09:59:52 PM (16 years ago)

Author:

westi

Message:

Make it much easier to filter contact methods from user profiles adding and removing at will. Fixes #10240 props joostdevalk.

Location:

trunk

Files:

• wp-admin/includes/user.php (modified) (3 diffs)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/registration.php (modified) (2 diffs)

trunk/wp-admin/includes/user.php

@@ -106 +106 @@
     if ( isset( $_POST['description'] ))
         $user->description = trim( $_POST['description'] );
-    if ( isset( $_POST['jabber'] ))
-        $user->jabber = esc_html( trim( $_POST['jabber'] ));
-    if ( isset( $_POST['aim'] ))
-        $user->aim = esc_html( trim( $_POST['aim'] ));
-    if ( isset( $_POST['yim'] ))
-        $user->yim = esc_html( trim( $_POST['yim'] ));
+    $user_contactmethods = _wp_get_user_contactmethods();
+    foreach ($user_contactmethods as $method => $name) {
+        if ( isset( $_POST[$method] ))
+            $user->$method = esc_html( trim( $_POST[$method] ) );
+    }
     if ( !$update )
         $user->rich_editing = 'true';  // Default to true for new users.
@@ -379 +378 @@
     $user->display_name = esc_attr($user->display_name);
     $user->nickname     = esc_attr($user->nickname);
-    $user->aim          = isset( $user->aim ) && !empty( $user->aim ) ? esc_attr($user->aim) : '';
-    $user->yim          = isset( $user->yim ) && !empty( $user->yim ) ? esc_attr($user->yim) : '';
-    $user->jabber       = isset( $user->jabber ) && !empty( $user->jabber ) ? esc_attr($user->jabber) : '';
+
+    $user_contactmethods = _wp_get_user_contactmethods();
+    foreach ($user_contactmethods as $method => $name) {
+        $user->{$method} = isset( $user->{$method} ) && !empty( $user->{$method} ) ? esc_attr($user->{$method}) : '';
+    }
+    
     $user->description  = isset( $user->description ) && !empty( $user->description ) ? esc_html($user->description) : '';
 
@@ -836 +838 @@
 }
 
+/**
+ * Setup the default contact methods
+ *
+ * @access private
+ * @since 
+ *
+ * @return array $user_contactmethods Array of contact methods and their labels.
+ */
+function _wp_get_user_contactmethods() {
+    $user_contactmethods = array(
+        'aim' => __('AIM'),
+        'yim' => __('Yahoo IM'),
+        'jabber' => __('Jabber / Google Talk')
+    );
+    return apply_filters('user_contactmethods',$user_contactmethods);
+}
+
 ?>

trunk/wp-admin/user-edit.php

@@ -268 +268 @@
 </tr>
 
-<tr>
-    <th><label for="aim"><?php echo apply_filters('user_aim_label', __('AIM')); ?></label></th>
-    <td><input type="text" name="aim" id="aim" value="<?php echo esc_attr($profileuser->aim) ?>" class="regular-text" /></td>
-</tr>
-
-<tr>
-    <th><label for="yim"><?php echo apply_filters('user_yim_label', __('Yahoo IM')); ?></label></th>
-    <td><input type="text" name="yim" id="yim" value="<?php echo esc_attr($profileuser->yim) ?>" class="regular-text" /></td>
-</tr>
-
-<tr>
-    <th><label for="jabber"><?php echo apply_filters('user_jabber_label', __('Jabber / Google Talk')); ?></label></th>
-    <td><input type="text" name="jabber" id="jabber" value="<?php echo esc_attr($profileuser->jabber) ?>" class="regular-text" /></td>
-</tr>
+<?php
+    foreach (_wp_get_user_contactmethods() as $name => $desc) {
+?>
+<tr>
+    <th><label for="<?php echo $name; ?>"><?php echo apply_filters('user_'.$name.'_label', $desc); ?></label></th>
+    <td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
+</tr>   
+<?php
+    }
+?>
 </table>
 

trunk/wp-includes/registration.php

@@ -165 +165 @@
         $use_ssl = 0;
 
-    if ( empty($jabber) )
-        $jabber = '';
-
-    if ( empty($aim) )
-        $aim = '';
-
-    if ( empty($yim) )
-        $yim = '';
-
     if ( empty($user_registered) )
         $user_registered = gmdate('Y-m-d H:i:s');
@@ -204 +195 @@
     update_usermeta( $user_id, 'nickname', $nickname );
     update_usermeta( $user_id, 'description', $description );
-    update_usermeta( $user_id, 'jabber', $jabber );
-    update_usermeta( $user_id, 'aim', $aim );
-    update_usermeta( $user_id, 'yim', $yim );
     update_usermeta( $user_id, 'rich_editing', $rich_editing);
     update_usermeta( $user_id, 'comment_shortcuts', $comment_shortcuts);
     update_usermeta( $user_id, 'admin_color', $admin_color);
     update_usermeta( $user_id, 'use_ssl', $use_ssl);
+    foreach (_wp_get_user_contactmethods() as $method => $name) {
+        if ( empty($$method) )
+            $$method = '';
+        
+        update_usermeta( $user_id, $method, $$method );
+    }
 
     if ( isset($role) ) {