Fixed object initialisation warnings, db*.php (Bug MDL-7380 "groups".)

diff --git a/group/db/dbbasicgrouplib.php b/group/db/dbbasicgrouplib.php
index b9b67cbbf719f3604f40e24c563e087c4f8a6981..2d9be3eebff2279ceebc3f8e45bed989caf7a3ff 100644 (file)
--- a/group/db/dbbasicgrouplib.php
+++ b/group/db/dbbasicgrouplib.php
@@ -1,10 +1,14 @@
 <?php 
-/*******************************************************************************
+/**
  * Functions to make changes to groups in the database i.e. functions that 
- * access the groups_courses_groups, 
- * groups_groups and groups_groups_users.
- ******************************************************************************/
-
+ * access tables:
+ *     groups_courses_groups, groups_groups and groups_groups_users.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author J.White AT open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package groups
+ */
 require_once($CFG->libdir.'/datalib.php');
 require_once($CFG->dirroot.'/group/lib/lib.php');
 
@@ -23,7 +27,6 @@ require_once($CFG->dirroot.'/group/lib/lib.php');
 function groups_db_get_user($userid) {
        $query = get_record('user', 'id', $userid);
        return $query;
-       
 }
 
 
@@ -55,7 +58,7 @@ function groups_db_get_user($userid) {
                }
         }
     }
-    
+
     return $groupids;
 }
 
@@ -142,7 +145,7 @@ function groups_db_get_group_settings($groupid) {
                 WHERE id = $groupid";
         $groupsettings = get_record_sql($sql);
     }
-  
+
     return $groupsettings;     
 
 }
@@ -160,11 +163,11 @@ function groups_db_users_in_common_group($userid1, $userid2) {
                        "INNER JOIN {$tableprefix}groups_members AS gm2 " .
                        "ON gm1.groupid =gm2.groupid" .
                        "WHERE gm1.userid = $userid1 AND gm2.userid = $userid2";
-    $commonggroups = get_record_sql($sql);
+    $commongroups = get_record_sql($sql);
     if ($commongroups) {
        $havecommongroup = true;
     }
-    
+
     return $havecommongroup;           
 }
 
@@ -187,7 +190,7 @@ function groups_db_group_exists($groupid) {
     } else {
         $exists = record_exists($table = 'groups_groups', 'id', $groupid);
     }
-    
+
     return $exists;
 }
 
@@ -224,7 +227,7 @@ function groups_db_group_belongs_to_course($groupid, $courseid) {
                                   'groupid', $groupid, 
                                   'courseid', $courseid);
     }
-    
+
     return $ismember;
 }
 
@@ -249,11 +252,11 @@ function groups_db_create_group($courseid, $groupsettings = false) {
        $record = $groupsettings;
         $record->timecreated = time();
         $record->timemodified = time();
-        print_r($record);
+        //print_r($record);
         $groupid = insert_record('groups_groups', $record);
 
-        
         if ($groupid != false) {
+            $record2 = new Object();
                $record2->courseid = $courseid;
                $record2->groupid = $groupid;
                $record2->timeadded = time();
@@ -282,12 +285,13 @@ function groups_db_add_member($userid, $groupid) {
                $useradded = true;
        } else {
         // Add the user to the group
+        $record = new Object();
                $record->groupid = $groupid;
                $record->userid = $userid;
                $record->timeadded = time();
                $useradded = insert_record($table = 'groups_groups_users', $record);
        }
-       
+
        return $useradded;
 }
 
@@ -312,7 +316,7 @@ function groups_db_set_group_settings($groupid, $groupsettings) {
             $success = false;
         }
     }
-     
+
     return $success;
        
 }
@@ -342,7 +346,7 @@ function groups_db_remove_member($userid, $groupid) {
             $success = true;
         }
     }
-    
+
     return $success;
 }
 
@@ -369,24 +373,24 @@ function groups_db_delete_group($groupid) {
                    }
                }
         }
-       
-       // Remove any groupings that the group belongs to     
-          $groupingids = groups_get_groupings_for_group($groupid); 
-          if ($groupingids != false) {
-                  foreach($groupingids as $groupingid) {
-                      $groupremoved = groups_remove_group_from_grouping($groupid, 
-                                                                        $groupingid);
-                      if(!$groupremoved) {
+
+        // Remove any groupings that the group belongs to     
+           $groupingids = groups_get_groupings_for_group($groupid); 
+           if ($groupingids != false) {
+                   foreach($groupingids as $groupingid) {
+                       $groupremoved = groups_remove_group_from_grouping($groupid, 
+                                                                         $groupingid);
+                       if(!$groupremoved) {
                                $success = false; 
-                      }
-                  }
-          }
-               
+                       }
+                   }
+           }
+
                $results = delete_records('groups_courses_groups', 'groupid', $groupid);
                if ($results == false) {
                        $success = false;
                }
-               
+
         // Delete the group itself
         $results = delete_records($table = 'groups_groups', $field1 = 'id', 
                                   $value1 = $groupid);
@@ -396,7 +400,8 @@ function groups_db_delete_group($groupid) {
             $success = false;
         }
     }
-    
+
     return $success;
 }
+
 ?>
\ No newline at end of file

diff --git a/group/db/dbgroupinglib.php b/group/db/dbgroupinglib.php
index 52f8755ce38763a2366d8404e1b19e16152e06a3..409fe194b0a0f28727bf0e6d26eed0165f7e874e 100644 (file)
--- a/group/db/dbgroupinglib.php
+++ b/group/db/dbgroupinglib.php
@@ -1,11 +1,15 @@
 <?php
-/*******************************************************************************
+/**
  * Functions to make changes to groupings in the database. In general these 
- * access the groups_groupings, groups_courses_groupings and 
- * groups_groupings_groups tables, although some all access the groups
- * tables that store information about groups.
- ******************************************************************************/
-
+ * access the tables:
+ *     groups_groupings, groups_courses_groupings and groups_groupings_groups
+ * although some access all the tables that store information about groups.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author J.White AT open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package groups
+ */
 require_once($CFG->libdir.'/datalib.php');
 
 /*******************************************************************************
@@ -271,6 +275,7 @@ function groups_db_create_grouping($courseid, $groupingsettings = false) {
 
         $groupingid = insert_record('groups_groupings', $record);
         if ($groupingid != false) {
+            $record2 = new Object();
                $record2->courseid = $courseid;
                $record2->groupingid = $groupingid;
                $record2->timeadded = time();
@@ -297,9 +302,11 @@ function groups_db_add_group_to_grouping($groupid, $groupingid) {
         $success = false;
     } else {
         $success = true;
+        $record = new Object();
         $record->groupingid = $groupingid;
         $record->groupid = $groupid;
         $record->timeadded = time();
+
         $results = insert_record('groups_groupings_groups', $record);
         if (!$results) {
             $success = false;
@@ -346,6 +353,7 @@ function groups_db_set_grouping_for_coursemodule($groupingid, $coursemoduleid) {
        if (!$groupingid or !$coursemoduleid) {
                $success = false;
        } else {
+        $record = new Object();
                $record->id = $coursemoduleid;
                $record->groupingid = $groupingid;
                $result = update_record('course_modules', $record);
@@ -411,12 +419,12 @@ function groups_db_delete_grouping($groupingid) {
             $success = false;
         } 
         
-       $results = delete_records('groups_groupings', 'id', $groupingid);
+        $results = delete_records('groups_groupings', 'id', $groupingid);
         if ($results == false) {
             $success = false;
         } 
     }
-    
+
     return $success;
     
 }

diff --git a/group/db/dbsetup.php b/group/db/dbsetup.php
index cbfa18babbe8d610c7234195869bc96f9de37bc6..bb82361f5a80543122fb724766edc4ccfe0fac32 100644 (file)
--- a/group/db/dbsetup.php
+++ b/group/db/dbsetup.php
@@ -4,7 +4,7 @@
  *
  * @copyright © 2006 The Open University
  * @author J.White AT open.ac.uk
- * @author N.D.Freear@open.ac.uk   
+ * @author N.D.Freear@open.ac.uk
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  * @package groups
  */
@@ -203,6 +203,7 @@ function groups_db_copy_moodle_group_to_imsgroup($groupid, $courseid) {
        
        // Only copy the group if the group exists. 
        if ($groupsettings != false) {
+        $record = new Object();
                $record->name = $groupsettings->name;
                $record->description = $groupsettings->description;
                $record->password = $groupsettings->password;
@@ -212,25 +213,28 @@ function groups_db_copy_moodle_group_to_imsgroup($groupid, $courseid) {
                $record->hidepicture = $groupsettings->hidepicture;
                $record->timecreated = $groupsettings->timecreated;
                $record->timemodified = $groupsettings->timemodified;
+
                $newgroupid = insert_record('groups_groups', $record);
            if (!$newgroupid) {
                $success = false;
            }
-               
+
+        $courserecord = new Object();
                $courserecord->courseid = $groupsettings->courseid;
                $courserecord->groupid = $newgroupid;
                
                $added = insert_record('groups_courses_groups', $courserecord);
-                                   
-            if (!$added) {
-               $success = false;
-            }  
-            
-            // Copy over the group members
+
+           if (!$added) {
+               $success = false;
+           }  
+
+           // Copy over the group members
                $groupmembers = get_records('groups_users', 'groupid', $groupid);
                if ($groupmembers != false) {
                        foreach($groupmembers as $member) {
-                               $record->groupid = $newgroupid;
+                $record = new Object();
+                $record->groupid = $newgroupid;
                                $record->userid = $member->userid;
                                $useradded = insert_record('groups_groups_users', $record);
                                if (!$useradded) {
@@ -238,13 +242,12 @@ function groups_db_copy_moodle_group_to_imsgroup($groupid, $courseid) {
                                }
                        }
                }
+       }
 
-       } 
-       
        if (!$success) {
                notify('Copy operations from Moodle groups to IMS Groups failed');
        }
-     
+
     return $success;
 }
 

diff --git a/group/install.php b/group/install.php
index 52fded7d07e689f0e935c580471aa9350eb1af7d..c578b5597ec83e9a932131ea250f2cbaa693f049 100644 (file)
--- a/group/install.php
+++ b/group/install.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Functions required for setting up the database to use the new groups.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author J.White AT open.ac.uk
+ * @author N.D.Freear@open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package groups
+ */
 require_once('../config.php');
 require_once($CFG->dirroot.'/group/db/dbsetup.php');
 require_once($CFG->dirroot.'/group/lib/utillib.php');
@@ -20,6 +28,7 @@ groups_create_database_tables();
  * @return int The id of the grouping to which the groups have been copied, or false if an error occurred. 
  */
 function groups_copy_moodle_groups_to_groups($courseid) {
+    $groupingsettings = new Object();
        $groupingsettings->name = 'Old moodle groups';
        $groupingid = groups_create_grouping($courseid, $groupingsettings);