Changeset 1977

Timestamp:

09/28/2009 07:42:55 PM (17 years ago)

Author:

apeatling

Message:

Xprofile fixes - default option radio button on field creation. Disabling register page for logged in site admins as it causes problems. Datebox tweaks.

Location:

trunk

Files:

• bp-core/bp-core-signup.php (modified) (2 diffs)
• bp-xprofile.php (modified) (2 diffs)
• bp-xprofile/admin/js/admin.js (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (2 diffs)

trunk/bp-core/bp-core-signup.php

@@ -7 +7 @@
                 return false;
                 
-        /* If the user is logged in, and is not a site admin, redirect away from here */
-        if ( is_user_logged_in() && !is_site_admin() )
+        /* If the user is logged in, redirect away from here */
+        if ( is_user_logged_in() )
                 bp_core_redirect( $bp->root_domain );
         
@@ -210 +210 @@
         if ( false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php') )
                 return false;
-                
+
         if ( '' != locate_template( array( 'registration/register.php' ), false ) || '' != locate_template( array( 'register.php' ), false ) )
                 die;

trunk/bp-xprofile.php

@@ -883 +883 @@
         if ( !$user_id )
                 $user_id = $bp->displayed_user->id;
+        
+        if ( !$user_id )
+                return false;
 
         if ( is_numeric( $field ) )
@@ -891 +894 @@
         if ( !$field_id )
                 return false;
-                
+
         return apply_filters( 'xprofile_get_field_data', BP_XProfile_ProfileData::get_value_byid( $field_id, $user_id ) );
 }

trunk/bp-xprofile/admin/js/admin.js

@@ -28 +28 @@
         
         isDefault.setAttribute('value', theId);
-
+        
         var label1 = document.createElement('label');
         var txt1 = document.createTextNode(" Default Value ");

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -503 +503 @@
                                         
                                         <p><?php _e('Option', 'buddypress') ?> 1: <input type="text" name="<?php echo $type ?>_option[1]" id="<?php echo $type ?>_option1" />
-                                        <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name; ?>" id="isDefault_<?php echo $type ?>_option" <?php if ( $default_input == 'radio' ) {?> checked="checked"<?php } ?>" value="1" /> <?php _e( 'Default Value', 'buddypress' ) ?>
+                                        <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name; ?>" id="isDefault_<?php echo $type ?>_option" value="1" /> <?php _e( 'Default Value', 'buddypress' ) ?>
                                         <input type="hidden" name="<?php echo $type ?>_option_number" id="<?php echo $type ?>_option_number" value="2" />
                                 

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -471 +471 @@
                         
                         case 'datebox':
-                                
+                        
                                 if ( $field->data->value != '' ) {
                                         $day = date("j", $field->data->value);
@@ -477 +477 @@
                                         $year = date("Y", $field->data->value);
                                         $default_select = ' selected="selected"';
-                                        
-                                        /* Check for updated posted values, but errors preventing them from being saved first time */
-                                        if ( isset( $_POST['field_' . $field->id . '_day'] ) && $day != $_POST['field_' . $field->id . '_day'] ) {
-                                                if ( !empty( $_POST['field_' . $field->id . '_day'] ) )
-                                                        $day = $_POST['field_' . $field->id . '_day'];
-                                        }
-                                        
-                                        if ( isset( $_POST['field_' . $field->id . '_month'] ) && $month != $_POST['field_' . $field->id . '_month'] ) {
-                                                if ( !empty( $_POST['field_' . $field->id . '_month'] ) )
-                                                        $month = $_POST['field_' . $field->id . '_month'];
-                                        }
-                                        
-                                        if ( isset( $_POST['field_' . $field->id . '_year'] ) && $year != date("j", $_POST['field_' . $field->id . '_year'] ) ) {
-                                                if ( !empty( $_POST['field_' . $field->id . '_year'] ) )
-                                                        $year = $_POST['field_' . $field->id . '_year'];
-                                        }
+                                }
+                                
+                                /* Check for updated posted values, but errors preventing them from being saved first time */
+                                if ( isset( $_POST['field_' . $field->id . '_day'] ) && $day != $_POST['field_' . $field->id . '_day'] ) {
+                                        if ( !empty( $_POST['field_' . $field->id . '_day'] ) )
+                                                $day = $_POST['field_' . $field->id . '_day'];
+                                }
+                                
+                                if ( isset( $_POST['field_' . $field->id . '_month'] ) && $month != $_POST['field_' . $field->id . '_month'] ) {
+                                        if ( !empty( $_POST['field_' . $field->id . '_month'] ) )
+                                                $month = $_POST['field_' . $field->id . '_month'];
+                                }
+                                
+                                if ( isset( $_POST['field_' . $field->id . '_year'] ) && $year != date("j", $_POST['field_' . $field->id . '_year'] ) ) {
+                                        if ( !empty( $_POST['field_' . $field->id . '_year'] ) )
+                                                $year = $_POST['field_' . $field->id . '_year'];
                                 }