[Gforge-commits] gforge/common/include Group.class,1.42,1.43

[root]

Update of /cvsroot/gforge/gforge/common/include
In directory db.perdue.net:/home/tperdue/share/dev.gforge.org/common/include

Modified Files:
        Group.class 
Log Message:
renaming groups.type to groups.type_id for database portability and clarity

Index: Group.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/include/Group.class,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Group.class 15 Mar 2004 23:24:40 -0000      1.42
+++ Group.class 15 Mar 2004 23:48:42 -0000      1.43
@@ -78,7 +78,7 @@
                        /*
                                check group type and set up object
                        */
-                       if (db_result($res,0,'type')==1) {
+                       if (db_result($res,0,'type_id')==1) {
                                //project
                                $GROUP_OBJ["_".$group_id."_"]= new 
Group($group_id,$res);
                        } else {
@@ -339,7 +339,7 @@
         *      @return status.
         *      @access public.
         */
-       function updateAdmin(&$user, $is_public, $license, $type, $unix_box, 
$http_domain) {
+       function updateAdmin(&$user, $is_public, $license, $type_id, $unix_box, 
$http_domain) {
                global $Language;
 
                $perm =& $this->getPermission($user);
@@ -359,7 +359,7 @@
                $res = db_query("
                        UPDATE groups
                        SET is_public='$is_public',
-                               license='$license',type='$type',
+                               license='$license',type_id='$type_id',
                                unix_box='$unix_box',http_domain='$http_domain'
                        WHERE group_id='".$this->getID()."'
                ");
@@ -377,8 +377,8 @@
                if ($license != $this->data_array['license']) {
                        $this->addHistory('license', 
$this->data_array['license']);
                }
-               if ($type != $this->data_array['type']) {
-                       $this->addHistory('type', $this->data_array['type']);
+               if ($type_id != $this->data_array['type_id']) {
+                       $this->addHistory('type_id', 
$this->data_array['type_id']);
                }
                if ($unix_box != $this->data_array['unix_box']) {
                        $this->addHistory('unix_box', 
$this->data_array['unix_box']);
@@ -560,7 +560,7 @@
         *      @return int     The type flag from the database.
         */
        function getType() {
-               return $this->data_array['type'];
+               return $this->data_array['type_id'];
        }