[Phpgroupware-cvs] CVS: forum/inc class.boforum.inc.php,1.2,1.3 class.soforum.inc.php,1.2,1.3 class.uiforum.inc.php,1.4,1.5

[Mark A Peters <address@hidden>]

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

Modified Files:
        class.boforum.inc.php class.soforum.inc.php 
        class.uiforum.inc.php 
Log Message:
Should bring the 2 environments in parallel.

Index: class.boforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.boforum.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.boforum.inc.php       20 Jan 2002 03:37:07 -0000      1.2
--- class.boforum.inc.php       20 Jan 2002 12:17:59 -0000      1.3
***************
*** 52,59 ****
                        {
                                $var_str = $var[$i];
!                               if(@isset($GLOBALS['HTTP_GET_VARS'][$var_str]))
!                               {
!                                       $this->$var_str = 
$GLOBALS['HTTP_GET_VARS'][$var_str];
!                               }
                        }
                        if(address@hidden($this->view))
--- 52,57 ----
                        {
                                $var_str = $var[$i];
!                               $this->$var_str = 
(@isset($GLOBALS['HTTP_GET_VARS'][$var_str])?$GLOBALS['HTTP_GET_VARS'][$var_str]:$this->$var_str);
!                               $this->$var_str = 
(@isset($GLOBALS['HTTP_POST_VARS'][$var_str])?$GLOBALS['HTTP_POST_VARS'][$var_str]:$this->$var_str);
                        }
                        if(address@hidden($this->view))
***************
*** 68,72 ****
                        {
                                if($this->debug) { echo '<br>Save:'; 
_debug_array($data); }
!                               
$GLOBALS['phpgw']->session->appsession('session_data','calendar',$data);
                        }
                }
--- 66,70 ----
                        {
                                if($this->debug) { echo '<br>Save:'; 
_debug_array($data); }
!                               
$GLOBALS['phpgw']->session->appsession('session_data','forum',$data);
                        }
                }
***************
*** 79,84 ****
                        $this->view     = $data['view'];
                        $this->location = $data['location'];
!                       $this->cat_id   = intval($data['cat_id']);
!                       $this->forum_id = intval($data['forum_id']);
                }
                
--- 77,82 ----
                        $this->view     = $data['view'];
                        $this->location = $data['location'];
!                       $this->cat_id   = $data['cat_id'];
!                       $this->forum_id = $data['forum_id'];
                }
                

Index: class.soforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.soforum.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soforum.inc.php       20 Jan 2002 03:37:07 -0000      1.2
--- class.soforum.inc.php       20 Jan 2002 12:17:59 -0000      1.3
***************
*** 184,188 ****
                        $db2->query('select thread from phpgw_forum_threads 
where id='.$msg_id,__LINE__,__FILE__);
                        $db2->next_record();
!                       $this->db->query('select * from phpgw_forum_threads 
where id>='.$msg_id.' and cat_id='.$cat_id.' and for_id='.$forum_id.' and 
thread='.$db2->f('thread').' order by parent,id',__LINE__,__FILE__);
                        if(!$this->db->num_rows())
                        {
--- 184,188 ----
                        $db2->query('select thread from phpgw_forum_threads 
where id='.$msg_id,__LINE__,__FILE__);
                        $db2->next_record();
!                       $this->db->query('select * from phpgw_forum_threads 
where id >= '.$msg_id.' and cat_id='.$cat_id.' and for_id='.$forum_id.' and 
thread='.$db2->f('thread').' order by parent,id',__LINE__,__FILE__);
                        if(!$this->db->num_rows())
                        {

Index: class.uiforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.uiforum.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiforum.inc.php       20 Jan 2002 04:11:52 -0000      1.4
--- class.uiforum.inc.php       20 Jan 2002 12:17:59 -0000      1.5
***************
*** 391,395 ****
                        $pre_ul = '';
                        $messages = 
$this->bo->read_msg($this->bo->cat_id,$this->bo->forum_id,$msg);
!                       while(list($key,$message) = each($messages))
                        {
                                if($message['id'] == $msg)
--- 391,395 ----
                        $pre_ul = '';
                        $messages = 
$this->bo->read_msg($this->bo->cat_id,$this->bo->forum_id,$msg);
!                       while($messages && list($key,$message) = 
each($messages))
                        {
                                if($message['id'] == $msg)