[Phpgroupware-cvs] forum/inc class.boforum.inc.php class.uiforum.i... [Version-0_9_16-branch]

[Dave Hall]

CVSROOT:        /sources/phpgroupware
Module name:    forum
Branch:         Version-0_9_16-branch
Changes by:     Dave Hall <skwashd>     07/09/27 11:41:49

Modified files:
        inc            : class.boforum.inc.php class.uiforum.inc.php 

Log message:
        fix cat id so thread posts actually show up

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/forum/inc/class.boforum.inc.php?cvsroot=phpgroupware&only_with_tag=Version-0_9_16-branch&r1=1.1.2.7.2.3&r2=1.1.2.7.2.4
http://cvs.savannah.gnu.org/viewcvs/forum/inc/class.uiforum.inc.php?cvsroot=phpgroupware&only_with_tag=Version-0_9_16-branch&r1=1.1.2.7.2.2&r2=1.1.2.7.2.3

Patches:
Index: class.boforum.inc.php
===================================================================
RCS file: /sources/phpgroupware/forum/inc/class.boforum.inc.php,v
retrieving revision 1.1.2.7.2.3
retrieving revision 1.1.2.7.2.4
diff -u -b -r1.1.2.7.2.3 -r1.1.2.7.2.4
--- class.boforum.inc.php       2 Jun 2005 12:51:27 -0000       1.1.2.7.2.3
+++ class.boforum.inc.php       27 Sep 2007 11:41:48 -0000      1.1.2.7.2.4
@@ -11,7 +11,7 @@
        *  option) any later version.                                           
      *
        
\*****************************************************************************/
 
-       /* $Id: class.boforum.inc.php,v 1.1.2.7.2.3 2005/06/02 12:51:27 skwashd 
Exp $ */
+       /* $Id: class.boforum.inc.php,v 1.1.2.7.2.4 2007/09/27 11:41:48 skwashd 
Exp $ */
 
        class boforum
        {
@@ -45,7 +45,8 @@
                                $this->use_session = True;
                        }
 
-                       $input_vars = Array(
+                       $input_vars = Array
+                       (
                                'view'          => 'string',
                                'location'      => 'string',
                                'cat_id'        => 'int',
@@ -60,7 +61,7 @@
                                }
                                elseif ( $vtype == 'int' )
                                {
-                                       $this->$vname = 
isset($_REQUEST[$vname]) ? intval($_REQUEST[$vname]) : 0;
+                                       $this->$vname = 
isset($_REQUEST[$vname]) ? (int) $_REQUEST[$vname] : 0;
                                }
                                else
                                {

Index: class.uiforum.inc.php
===================================================================
RCS file: /sources/phpgroupware/forum/inc/class.uiforum.inc.php,v
retrieving revision 1.1.2.7.2.2
retrieving revision 1.1.2.7.2.3
diff -u -b -r1.1.2.7.2.2 -r1.1.2.7.2.3
--- class.uiforum.inc.php       2 Jun 2005 12:51:27 -0000       1.1.2.7.2.2
+++ class.uiforum.inc.php       27 Sep 2007 11:41:48 -0000      1.1.2.7.2.3
@@ -11,7 +11,7 @@
        *  option) any later version.                                           
      *
        
\*****************************************************************************/
 
-       /* $Id: class.uiforum.inc.php,v 1.1.2.7.2.2 2005/06/02 12:51:27 skwashd 
Exp $ */
+       /* $Id: class.uiforum.inc.php,v 1.1.2.7.2.3 2007/09/27 11:41:48 skwashd 
Exp $ */
 
        class uiforum
        {
@@ -174,6 +174,7 @@
                                                        'THREADS_LINK'      => 
$GLOBALS['phpgw']->link('/index.php',
                                                                        Array(
                                                                                
'menuaction'    => 'forum.uiforum.threads',
+                                                                               
'cat_id'        => (int) $this->bo->cat_id,
                                                                                
'forum_id'      => $forum['id']
                                                                        )
                                                         ),
@@ -219,6 +220,7 @@
                                                        Array(
                                                                'menuaction'    
=> 'forum.uiforum.post',
                                                                'type'          
=> 'new',
+                                                               'cat_id'        
=> $this->bo->cat_id,
                                                                'forum_id'      
=> $this->bo->forum_id
                                                        )
                                        )
@@ -251,6 +253,7 @@
                                                                        Array(
                                                                                
'menuaction'    => 'forum.uiforum.read',
                                                                                
'msg'           => $thread['id'],
+                                                                               
'cat_id'        => $this->bo->cat_id,
                                                                                
'forum_id'      => $this->bo->forum_id
                                                                        )
                                                                ),
@@ -264,6 +267,7 @@
                                                        Array(
                                                                'menuaction'    
=> 'forum.uiforum.threads',
                                                                'view'          
=> 'threads',
+                                                               'cat_id'        
=> $this->bo->cat_id,
                                                                'forum_id'      
=> $this->bo->forum_id
                                                        )
                                                ),
@@ -494,7 +498,7 @@
                                'FORUM_LINK'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.forum') ),
                                'MAIN_LINK'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.index') ),
                                'POST_LINK'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.post') ),
-                               'THREADS_LINK'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.threads') ),
+                               'THREADS_LINK'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.threads', 'cat_id' => $this->bo->cat_id, 'forum_id' => 
$this->bo->forum_id) ),
                                'SEARCH_LINK'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.search') ),
                                'POST_ACTION'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.boforum.post') ),
                                'CAT_ID'        => $this->bo->cat_id,