[Phpgroupware-cvs] CVS: forum/inc class.soforum.inc.php,1.5,1.6

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/forum/inc
In directory subversions:/tmp/cvs-serv13217/forum/inc

Modified Files:
        class.soforum.inc.php 
Log Message:
Fix for GNU Bug #100584 - Error adding forum to category.

Index: class.soforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.soforum.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.soforum.inc.php       15 Feb 2002 03:58:44 -0000      1.5
--- class.soforum.inc.php       15 Mar 2002 03:52:34 -0000      1.6
***************
*** 74,89 ****
                                else
                                {
!                                       $new_forum_id = 
$this->get_max_forum_id($forum['cat_id']) + 1;
!                                       $query = 'UPDATE phpgw_forum_forums SET 
cat_id='.$forum['cat_id'].', id='.$new_forum_id.", name='".$forum['name']."', 
descr='".$forum['descr']."' WHERE cat_id=".$forum['orig_cat_id'].' and 
id='.$forum['id'];
                                        
$this->db->query($query,__LINE__,__FILE__);
!                                       $query = 'UPDATE phpgw_forum_threads 
SET cat_id='.$forum['cat_id'].', for_id='.$new_forum_id." WHERE 
cat_id=".$forum['orig_cat_id'].' and for_id='.$forum['id'];
                                        
$this->db->query($query,__LINE__,__FILE__);
!                                       $query = 'UPDATE phpgw_forum_body SET 
cat_id='.$forum['cat_id'].', for_id='.$new_forum_id." WHERE 
cat_id=".$forum['orig_cat_id'].' and for_id='.$forum['id'];
                                }
                        }
                        else
                        {
!                               $new_forum_id = 
$this->get_max_forum_id($forum['cat_id']) + 1;
!                               $query = 'INSERT INTO 
phpgw_forum_forums(cat_id,id,name,descr) 
VALUES('.$forum['cat_id'].','.$new_forum_id.",'".$forum['name']."','".$forum['descr']."')";
                        }
                        $this->db->query($query,__LINE__,__FILE__);
--- 74,91 ----
                                else
                                {
!                                       $query = 'UPDATE phpgw_forum_forums SET 
cat_id='.$forum['cat_id'].", name='".$forum['name']."', 
descr='".$forum['descr']."' WHERE cat_id=".$forum['orig_cat_id'].' and 
id='.$forum['id'];
                                        
$this->db->query($query,__LINE__,__FILE__);
!                                       $query = 'UPDATE phpgw_forum_threads 
SET cat_id='.$forum['cat_id'].' WHERE cat_id='.$forum['orig_cat_id'].' and 
for_id='.$forum['id'];
                                        
$this->db->query($query,__LINE__,__FILE__);
!                                       $query = 'UPDATE phpgw_forum_body SET 
cat_id='.$forum['cat_id'].' WHERE cat_id='.$forum['orig_cat_id'].' and 
for_id='.$forum['id'];
                                }
                        }
                        else
                        {
!                               if($this->debug)
!                               {
!                                       echo '<-- Cat ID: '.$forum['cat_id'].' 
-->'."\n";
!                               }
!                               $query = 'INSERT INTO phpgw_forum_forums 
(cat_id,name,descr,perm,groups) VALUES 
('.$forum['cat_id'].",'".$forum['name']."','".$forum['descr']."',0,'0')";
                        }
                        $this->db->query($query,__LINE__,__FILE__);
***************
*** 111,117 ****
                }
  
!               function get_max_forum_id($cat_id)
                {
!                       $this->db->query('select max(id) from 
phpgw_forum_forums where cat_id='.$cat_id,__LINE__,__FILE__);
                        $this->db->next_record();
                        return $this->db->f(0);
--- 113,119 ----
                }
  
!               function get_max_forum_id()
                {
!                       $this->db->query('select max(id) from 
phpgw_forum_forums',__LINE__,__FILE__);
                        $this->db->next_record();
                        return $this->db->f(0);