Changeset 15

Timestamp:

04/07/2008 09:35:36 PM (18 years ago)

Author:

apeatling

Message:

Fixed DB errors on field adding, saving and deleting (all caused by fields with no children). Made sure that field children are deleted in the DB when their parent is deleted.

Location:

trunk

Files:

• bp_friends.php (modified) (1 diff)
• bp_messages.php (modified) (2 diffs)
• bp_xprofile.php (modified) (1 diff)
• bp_xprofile/bp_xprofile.classes.php (modified) (11 diffs)
• bp_xprofile/bp_xprofile.cssjs.php (modified) (1 diff)

trunk/bp_friends.php

@@ -63 +63 @@
 
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-    if($wpdb->get_var("show tables like '$table_name'") != $table_name) friends_install();
+    if($wpdb->get_var("show tables like '%" . $table_name . "%'") == false) friends_install();
 }
 add_action('admin_menu','friends_add_menu');

trunk/bp_messages.php

@@ -26 +26 @@
 
     $sql = "CREATE TABLE ". $table_name ." (
-          id mediumint(9) NOT NULL AUTO_INCREMENT,
-          sender_id mediumint(9) NOT NULL,
-          recipient_id mediumint(9) NOT NULL,
+          id int(11) NOT NULL AUTO_INCREMENT,
+          sender_id int(11) NOT NULL,
+          recipient_id int(11) NOT NULL,
+          folder_id tinyint(1) NOT NULL DEFAULT 1,
           subject varchar(200) NOT NULL,
           message longtext NOT NULL,
@@ -70 +71 @@
 
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-    if($wpdb->get_var("show tables like '$table_name'") != $table_name) messages_install();
+    if($wpdb->get_var("show tables like '%" . $table_name . "%'") == false) messages_install();
 }
 add_action('admin_menu','messages_add_menu');

trunk/bp_xprofile.php

@@ -102 +102 @@
 
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-    if($wpdb->get_var("show tables like '$bp_xprofile_table_name'") != $bp_xprofile_table_name) xprofile_install();
+    if($wpdb->get_var("show tables like '%" . $bp_xprofile_table_name . "%'") == false) xprofile_install();
 }
 add_action('admin_menu','xprofile_add_menu');

trunk/bp_xprofile/bp_xprofile.classes.php

@@ -57 +57 @@
 
     }
-    
-    function exists()
+
+    function save()
     {
         global $wpdb;
         
-        // check to see if the current object exists in the DB
-        
-        $sql = "SELECT id FROM " . $this->table_name . "_groups
-                WHERE group_id = " . $this->id;
-        
-        if(!$wpdb->get_row($sql))
-        {
-            return false;
-        }
-        
-        return true;                
-    }
-    
-    function save()
-    {
-        global $wpdb;
-        
-        if($this->exists())
+        if($this->id != null)
         {
             // Update a group.
@@ -306 +289 @@
     }
 
-    function exists()
+    function delete() 
     {
         global $wpdb;
         
-        // check to see if the current object exists in the DB
-        
-        $sql = "SELECT id FROM " . $this->table_name . "_fields
-                WHERE id = " . $this->id;
-        
-        if(!$wpdb->get_row($sql))
-        {
-            return false;
-        }
-        
-        return true;        
-    }
-
-    function delete() 
+        $sql = "DELETE FROM " . $this->table_name . "_fields
+                WHERE id = " . $this->id . "
+                OR parent_id = " . $this->id;
+
+        if($wpdb->query($sql) === false) {
+            return false;
+        }
+        
+        // delete the data in the DB for this field
+        BP_XProfile_ProfileData::delete_all($this->id);
+        
+        return true;
+        
+    }
+    
+    function save() 
     {
         global $wpdb;
-        
-        $sql = "DELETE FROM " . $this->table_name . "_fields
-                WHERE id = " . $this->id;
-
-        if($wpdb->query($sql) === false) {
-            return false;
-        }
-        
-        return true;
-        
-    }
-    
-    function save() 
-    {
-        global $wpdb;
-
-        if($this->exists())
+
+        if($this->id != null)
         {
             $sql = "UPDATE " . $this->table_name . "_fields 
@@ -364 +334 @@
         if($wpdb->query($sql) !== false) 
         {
-            // Remove any radio or dropdown options for this
-            // field. They will be re-added if needed.
-            // This stops orphan options if the user changes a
-            // field from a radio button field to a text box. 
-            
-            $this->delete_children();
+            // Only do this if we are editing an existing field
+            if($this->id != null) {
+                
+                // Remove any radio or dropdown options for this
+                // field. They will be re-added if needed.
+                // This stops orphan options if the user changes a
+                // field from a radio button field to a text box. 
+                $this->delete_children();
+            }
             
             // Check to see if this is a selectbox or radio button field.
             // We need to add the options to the db, if it is.
-
             if($this->type == "radio" || $this->type == "selectbox")
             {
@@ -404 +376 @@
                         {
                             return false;
-                            
+                        
                             // Need to go back and reverse what has been entered here.
                         }
@@ -626 +598 @@
     function render_admin_form($message = '')
     {
-        $options = $this->get_children();
-
+        if($this->id != null) {
+            $options = $this->get_children();
+        }
     ?>
     
@@ -642 +615 @@
         <form action="<?php echo $action ?>" method="post">
 
-            <fieldset id="titlediv">
-                <legend><?php _e("Field Title") ?></legend>
+                <label for="title">* <?php _e("Field Title") ?></label>
                 <div>
                     <input type="text" name="title" id="title" value="<?php echo $this->name ?>" style="width:50%" />
                 </div>
-            </fieldset>
-
-            <fieldset id="descriptiondiv">
-                <legend><?php _e("Field Description") ?></legend>
+                <p></p>
+                <label for="description"><?php _e("Field Description") ?></label>
                 <div>
                     <textarea name="description" id="description" rows="5" cols="60"><?php echo $this->desc ?></textarea>
                 </div>
-            </fieldset>
-            
-            <fieldset id="requireddiv">
-                <legend><?php _e("Is This Field Required?") ?></legend>
+                <p></p>
+                <label for="required">* <?php _e("Is This Field Required?") ?></label>
                 <div>
                     <select name="required" id="required">
@@ -664 +632 @@
                     </select>
                 </div>
-            </fieldset>
-
-            <fieldset id="typediv">
-                <legend><?php _e("Field Type") ?></legend>
+                <p></p>
+                <label for="fieldtype">* <?php _e("Field Type") ?></label>
                 <div>
                     <select name="fieldtype" id="fieldtype" onchange="show_options(this.value)">
@@ -677 +643 @@
                     </select>
                 </div>
-            </fieldset>
             
             <div id="radio" style="<?php if($this->type != 'radio') {?>display: none;<?php } ?> margin-left: 15px;">
@@ -762 +727 @@
         if($_POST['title'] == '' || $_POST['required'] == '' || $_POST['fieldtype'] == '')
         {
-            $message = __('Please make sure you fill out the form completely, every field is required.');
+            $message = __('Please make sure you fill out all required fields.');
             return false;
         }
@@ -952 +917 @@
     }
     
-    
-
     /** Static Functions **/
     
@@ -974 +937 @@
                 return false;
             }
+        }
+    }
+    
+    function delete_all($field_id)
+    {
+        global $wpdb, $userdata;
+        
+        if(bp_core_validate($field_id))
+        {
+            $sql = "DELETE FROM " . $this->table_name . "_data 
+                    WHERE field_id = " . $field_id;
+
+            if($wpdb->query($sql) === false) {
+                return false;
+            }
+            
+            return true;
         }
     }

trunk/bp_xprofile/bp_xprofile.cssjs.php

@@ -157 +157 @@
             color: #555;
         }
-        
+
         
     </style>