Changeset 10

Timestamp:

04/05/2008 12:15:13 AM (18 years ago)

Author:

apeatling

Message:

Fixed the validation of dates on signup form, as well as callback of values. Dates entered on the signup form now save correctly and pass through to an activated account profile.

Location:

trunk

Files:

• bp_xprofile.php (modified) (1 diff)
• bp_xprofile/bp_xprofile.classes.php (modified) (2 diffs)
• bp_xprofile/bp_xprofile.signup.php (modified) (9 diffs)

trunk/bp_xprofile.php

@@ -311 +311 @@
                                 $list_html .= '<p>This group is currently empty. Please contact the site admin if this is incorrect.</p>';
                         }
-                        
+                
+                        echo BP_XProfile_Field::get_type(2);
                 ?>
 

trunk/bp_xprofile/bp_xprofile.classes.php

@@ -519 +519 @@
                                 }
                                 
-                                $html .= '<div id="field_' . $this->id . '"';
+                                $html .= '<div id="field_' . $this->id . '">';
                                 $html .= '<label for="field_' . $this->id . '_day">' . $asterisk . $this->name . ':</label>';
                                 
@@ -780 +780 @@
         }
         
+        function get_type($field_id)
+        {
+                global $wpdb, $bp_xprofile_table_name;
+
+                if(bp_core_validate($field_id))
+                {
+                        $sql = "SELECT type
+                                        FROM " . $bp_xprofile_table_name . "_fields
+                                        WHERE id = " . $field_id;
+
+                        if(!$field_type = $wpdb->get_var($sql))
+                        {
+                                return false;
+                        }
+                
+                        return $field_type;
+                }
+                
+                return false;
+        }
 }
 

trunk/bp_xprofile/bp_xprofile.signup.php

@@ -90 +90 @@
                         {
                                 $_POST['blog_id'] = $_POST['user_name'];
-                                $_POST['blog_title'] = $_POST['field_1']; // The core 'Full Name' field.
+                                $_POST['blog_title'] = $_POST['field_1']; // The core name fields.
 
                                 $counter = 0;
                                 $hasErrors = false;
+                                $prev_field_id = 0;
                                 foreach($_POST as $key => $value)
                                 {
@@ -100 +101 @@
                                                 $field_id = explode("_", $key);
                                                 $field_id = $field_id[1];
+                                                $field_type = BP_XProfile_Field::get_type($field_id);
                                                 
-                                                $field = new BP_XProfile_Field($field_id);
-                                                
-                                                $bp_xprofile_callback[$counter] = array(
-                                                        "field_id" => $field_id,
-                                                        "value" => $value
-                                                );
-                                                
-                                                if($field->is_required && $_POST[$key] == '')
-                                                {
-                                                        $bp_xprofile_callback[$counter]["error_msg"] = $field->name . ' cannot be left blank.';
-                                                        $hasErrors = true;
+                                                // Need to check if the previous field had
+                                                // the same ID, as to not validate individual
+                                                // day/month/year dropdowns individually.
+                                                if($prev_field_id != $field_id) {
+                                                        $field = new BP_XProfile_Field($field_id);
+                                                        
+                                                        if($field_type == "datebox") {
+                                                                $value = strtotime($_POST['field_' . $field_id . '_day'] . " " . 
+                                                                             $_POST['field_' . $field_id . '_month'] . " " .
+                                                                             $_POST['field_' . $field_id . '_year']);
+                                                        }
+                                                        
+                                                        $bp_xprofile_callback[$counter] = array(
+                                                                "field_id" => $field->id,
+                                                                "type" => $field->type,
+                                                                "value" => $value
+                                                        );
+                                                        
+                                                        if($field->is_required && $_POST[$key] == '')
+                                                        {
+                                                                $bp_xprofile_callback[$counter]["error_msg"] = $field->name . ' cannot be left blank.';
+                                                                $hasErrors = true;
+                                                        }       
+                                                        
+                                                        $counter++;
                                                 }
                                                 
-                                                $counter++;
+                                                $prev_field_id = $field_id;
                                         }
                                 }
@@ -122 +138 @@
                                 
                                 if ( $errors->get_error_code() || $hasErrors ) {
+
                                         signup_user($user_name, $user_email, $errors);
                                         
@@ -145 +162 @@
                                         for($i=0; $i<count($bp_xprofile_callback); $i++)
                                         {
-                                                $meta['field_' . $bp_xprofile_callback[$i]['field_id']] = $bp_xprofile_callback[$i]['value'];
+                                                $meta['field_' . $bp_xprofile_callback[$i]['field_id']] .= $bp_xprofile_callback[$i]['value'];
                                         }
                                         
                                         $meta['xprofile_field_ids'] = $_POST['xprofile_ids'];
                                         $meta = apply_filters( "add_signup_meta", $meta );
-                                        
+
                                         wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta);
                                         confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta);
@@ -210 +227 @@
         global $wpdb, $wpmuBaseTablePrefix, $profile_picture_path;
         
+        // Extract signup meta fields to fill out profile
         $field_ids = get_blog_option($blog_id, 'xprofile_field_ids');
         $field_ids = explode(",", $field_ids);
-        
+                
+        // Get the new user ID.
         $sql = "SELECT u.ID from " . $wpmuBaseTablePrefix . "users u, 
                         " . $wpmuBaseTablePrefix . "usermeta um
@@ -218 +237 @@
                         AND um.meta_key = 'primary_blog'
                         AND um.meta_value = " . $blog_id;
-
+                        
         $user_id = $wpdb->get_var($sql); 
-        
+
+        // Loop through each bit of profile data and save it to profile.
         for($i=0; $i<count($field_ids); $i++)
         {
@@ -228 +248 @@
                         
                         $field = new BP_XProfile_ProfileData();
-                        
                         $field->user_id = $user_id;
                         $field->value = $field_value;
                         $field->field_id = $field_ids[$i];
-                        $field->last_updated = time();                  
-
+                        $field->last_updated = time();  
+        
                         $field->save();
                         delete_blog_option($blog_id, 'field_' . $field_ids[$i]);
@@ -240 +259 @@
         delete_blog_option($blog_id, 'xprofile_field_ids');     
         
+        // Set up profile pictures and create a directory to store them for the user.
         $profile_picture_path = trim(get_blog_option($blog_id, 'upload_path')) . '/profilepics';
 
@@ -260 +280 @@
                 
         }
+
 }