phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] forum/inc class.boforum.inc.php, 1.1.2.7.2.3 class.ui


From: skwashd
Subject: [Phpgroupware-cvs] forum/inc class.boforum.inc.php, 1.1.2.7.2.3 class.uiadmin.inc.php, 1.1.2.4.2.2 class.uiforum.inc.php, 1.1.2.7.2.2
Date: Thu, 2 Jun 2005 14:51:00 +0200

Update of forum/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.boforum.inc.php lines: +36 -27
            class.uiadmin.inc.php lines: +10 -10
            class.uiforum.inc.php lines: +68 -58

Log Message:
major clean up and buf fixing

====================================================
Index: forum/inc/class.boforum.inc.php
diff -u forum/inc/class.boforum.inc.php:1.1.2.7.2.2 
forum/inc/class.boforum.inc.php:1.1.2.7.2.3
--- forum/inc/class.boforum.inc.php:1.1.2.7.2.2 Wed Oct 20 15:34:39 2004
+++ forum/inc/class.boforum.inc.php     Thu Jun  2 12:51:27 2005
@@ -35,7 +35,7 @@
                var $cat_id;
                var $forum_id;

-               function boforum($session=0)
+               function boforum( $session = 0 )
                {
                        $this->so = CreateObject('forum.soforum');

@@ -52,31 +52,40 @@
                                'forum_id'      => 'int'
                        );

-                       foreach($input_vars as $vname => $vtype)
+                       foreach ( $input_vars as $vname => $vtype )
                        {
-                               if($vtype == 'string')
+                               if ( $vtype == 'string' )
                                {
-                                       $this->$vname = 
addslashes(@isset($_GET[$vname]) ? $_GET[$vname] : '');
-                                       $this->$vname = 
addslashes(@isset($_POST[$vname]) ? $_POST[$vname] : $this->$vname);
+                                       $this->$vname = 
isset($_REQUEST[$vname]) ? addslashes($_REQUEST[$vname]) : '';
                                }
-                               elseif($vtype == 'int')
+                               elseif ( $vtype == 'int' )
                                {
-                                       $this->$vname = 
intval(@isset($_GET[$vname]) ? $_GET[$vname] : '');
-                                       $this->$vname = 
intval(@isset($_POST[$vname]) ? $_POST[$vname] : $this->$vname);
+                                       $this->$vname = 
isset($_REQUEST[$vname]) ? intval($_REQUEST[$vname]) : 0;
+                               }
+                               else
+                               {
+                                       $this->$vname = NULL;//make it empty if 
invalid
                                }
                        }
-                       if(address@hidden($this->view))
+
+                       if ( !isset($this->view) || $this->view == '' )
                        {
-                               $this->view = 
$GLOBALS['phpgw_info']['user']['preferences']['forum']['default_view'];
+                               $this->view = 
$GLOBALS['phpgw_info']['user']['preferences']['forum']['default_view']
+                                               ? 
$GLOBALS['phpgw_info']['user']['preferences']['forum']['default_view']
+                                               : 'collapsed';
                        }
                }

                function save_sessiondata($data)
                {
-                       if ($this->use_session)
+                       if ( $this->use_session )
                        {
-                               if($this->debug) { echo '<br>Save:'; 
_debug_array($data); }
-                               
$GLOBALS['phpgw']->session->appsession('session_data','forum',$data);
+                               if( $this->debug )
+                               {
+                                       echo '<br>Save:'; _debug_array($data);
+                               }
+
+                               
$GLOBALS['phpgw']->session->appsession('session_data', 'forum', $data);
                        }
                }

@@ -96,8 +105,8 @@
                        if ($_POST['action'] == 'post')
                        {
                                $data = Array(
-                                       'cat_id'        => $_POST['cat_id'],
-                                       'forum_id'      => $_POST['forum_id'],
+                                       'cat_id'        => 
intval($_POST['cat_id']),
+                                       'forum_id'      => 
intval($_POST['forum_id']),
                                        'postdate'      => time() - ((60 * 60) 
* intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'])),
                                        'subject'       => $_POST['subject'],
                                        'message'       => $_POST['message']
@@ -105,7 +114,7 @@

                                $this->so->add_post($data);
                        }
-                       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.threads'));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiforum.threads', 'forum_id' => $data['forum_id'] 
) );
                        $GLOBALS['phpgw']->common->phpgw_exit();
                }

@@ -121,7 +130,7 @@

                                if ($_POST['pos'] != 0)
                                {
-                                       
$this->so->fix_pos($_POST['thread'],$_POST['pos']);
+                                       $this->so->fix_pos($_POST['thread'], 
$_POST['pos']);
                                }
                                else
                                {
@@ -142,7 +151,7 @@

                                $this->so->add_reply($data);
                        }
-                       Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.threads'));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiforum.threads', 'forum_id' => $this->forum_id) );
                        $GLOBALS['phpgw']->common->phpgw_exit();
                }

@@ -150,11 +159,11 @@
                {
                        if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
                        {
-                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiforum.index') );
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        $this->so->delete_category($this->cat_id);
-                       Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiadmin.index') );
                        $GLOBALS['phpgw']->common->phpgw_exit();
                }

@@ -162,11 +171,11 @@
                {
                        if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
                        {
-                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiforum.index') );
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        $this->so->delete_forum($this->cat_id,$this->forum_id);
-                       Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiadmin.index') );
                        $GLOBALS['phpgw']->common->phpgw_exit();
                }

@@ -174,11 +183,11 @@
                {
                        if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
                        {
-                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiforum.index') );
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        $this->so->save_category($_POST['cat']);
-                       Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiadmin.index') );
                        $GLOBALS['phpgw']->common->phpgw_exit();
                }

@@ -186,11 +195,11 @@
                {
                        if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
                        {
-                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiforum.index') );
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        $this->so->save_forum($_POST['forum']);
-                       Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiadmin.index') );
                        $GLOBALS['phpgw']->common->phpgw_exit();
                }


====================================================
Index: forum/inc/class.uiadmin.inc.php
diff -u forum/inc/class.uiadmin.inc.php:1.1.2.4.2.1 
forum/inc/class.uiadmin.inc.php:1.1.2.4.2.2
--- forum/inc/class.uiadmin.inc.php:1.1.2.4.2.1 Fri Oct 10 00:22:37 2003
+++ forum/inc/class.uiadmin.inc.php     Thu Jun  2 12:51:27 2005
@@ -36,7 +36,7 @@
                {
                        if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
                        {
-                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'forum.uiforum.index') );
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }

@@ -60,10 +60,10 @@
                                . ' <tr>'."\n"
                                . '  <td 
bgcolor="'.$GLOBALS['phpgw_info']['theme']['row_off'].'" align="left">'
                                . '[<font size="-1">'."\n"
-                               . '<a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.add_category').'">'.lang('New
 Category').'</a> '."\n"
-                               . '| <a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.add_forum').'">'.lang('New
 Forum').'</a> '."\n"
-                               . ($this->current_page!='index'?'| <a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index').'">'.lang('Return
 to Admin').'</a> ':' ')."\n"
-                               . '| <a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index').'">'.lang('Return
 to Forums').'</a>'."\n"
+                               . '<a href="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiadmin.add_category') ).'">'.lang('New Category').'</a> '."\n"
+                               . '| <a 
href="'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiadmin.add_forum') ).'">'.lang('New Forum').'</a> '."\n"
+                               . ($this->current_page!='index'?'| <a 
href="'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiadmin.index') ) .'">'.lang('Return to Admin').'</a> ':' ')."\n"
+                               . '| <a 
href="'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.index') ).'">'.lang('Return to Forums').'</a>'."\n"
                                . '</font>]'
                                . '  </td>'."\n".' </tr>'."\n".'</table>'."\n";
                }
@@ -94,9 +94,9 @@
                                'TR_BG'         => 
$GLOBALS['phpgw_info']['theme']['bg_color'],
                                'CAT_IMG'       => 
$GLOBALS['phpgw']->common->image('forum','category'),
                                'FORUM_IMG'     => 
$GLOBALS['phpgw']->common->image('forum','forum'),
-                               'CAT_LINK'      => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.add_category'),
-                               'FOR_LINK'      => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.add_forum'),
-                               'MAIN_LINK'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'),
+                               'CAT_LINK'      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiadmin.add_category') ),
+                               'FOR_LINK'      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiadmin.add_forum') ),
+                               'MAIN_LINK'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.index') ),
                                'LANG_CAT'      => lang('New Category'),
                                'LANG_FOR'      => lang('New Forum'),
                                'LANG_MAIN'     => lang('Return to Forums'),
@@ -120,7 +120,7 @@

                        if (is_array($cats))
                        {
-                               while(list($key,$cat) = each($cats))
+                               foreach($cats as $key => $cat)
                                {
                                        $var = Array(
                                                'CAT_NAME'  => $cat['name'],

====================================================
Index: forum/inc/class.uiforum.inc.php
diff -u forum/inc/class.uiforum.inc.php:1.1.2.7.2.1 
forum/inc/class.uiforum.inc.php:1.1.2.7.2.2
--- forum/inc/class.uiforum.inc.php:1.1.2.7.2.1 Wed Oct 20 15:34:39 2004
+++ forum/inc/class.uiforum.inc.php     Thu Jun  2 12:51:27 2005
@@ -29,7 +29,7 @@
                var $template_dir;
                var $template;

-               function uiforum($session=0)
+               function uiforum( $session = 0 )
                {
                        $GLOBALS['phpgw']->nextmatchs = 
CreateObject('phpgwapi.nextmatchs');
                        $this->bo = CreateObject('forum.boforum',1);
@@ -98,7 +98,7 @@

                        if (is_array($cats))
                        {
-                               while(list($key,$cat) = each($cats))
+                               foreach ( $cats as $key => $cat)
                                {
                                        $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
                                        $var = Array(
@@ -143,10 +143,10 @@

                        $var = Array(
                                'BGROUND'       => 
$GLOBALS['phpgw_info']['theme']['th_bg'],
-                               'FORUM_IMG' => 
$GLOBALS['phpgw']->common->image('forum','forum'),
-                               'CATEGORY'       => $cat['name'],
-                               'LANG_MAIN'      => lang('Forum'),
-                               'MAIN_LINK'      => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index')
+                               'FORUM_IMG'     => 
$GLOBALS['phpgw']->common->image('forum','forum'),
+                               'CATEGORY'      => $cat['name'],
+                               'LANG_MAIN'     => lang('Forum'),
+                               'MAIN_LINK'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index')
                        );
                        $this->template->set_var($var);

@@ -160,7 +160,11 @@
                        }
                        else
                        {
-                               while (list($key,$forum) = each($forum_info))
+                               if ( !is_array($forum_info) )
+                               {
+                                       $forum_info = array();
+                               }
+                               foreach ( $forum_info as $key => $forum )
                                {
                                        
$GLOBALS['phpgw']->nextmatchs->template_alternate_row_color(&$this->template);
                                        $this->template->set_var(
@@ -194,34 +198,35 @@
                        $category = $this->bo->get_cat_info($this->bo->cat_id);
                        $forum = 
$this->bo->get_forum_info($this->bo->cat_id,$this->bo->forum_id);

-                       $pre_var        = array(
-                               'BGROUND'        => 
$GLOBALS['phpgw_info']['theme']['th_bg'],
-                               'LANG_TOPIC'     => lang('Topic'),
-                               'LANG_AUTHOR'    => lang('Author'),
-                               'LANG_REPLIES'   => lang('Replies'),
-                               'LANG_LATREP'    => lang('Latest Reply'),
-                               'LANG_MAIN'      => lang('Forums'),
-                               'LANG_NEWTOPIC'  => lang('New Topic'),
-                               'LANG_CATEGORY'  => $category['name'],
-                               'LANG_FORUM'     => $forum['name'],
-                               'FORUM_LINK'     => 
$GLOBALS['phpgw']->link('/index.php',
-                                               Array(
-                                                       'menuaction'    => 
'forum.uiforum.forum',
-                                                       'cat_id'        =>      
$this->bo->cat_id
-                                               )
-                                       ),
-                               'MAIN_LINK'      => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'),
-                               'POST_LINK'      => 
$GLOBALS['phpgw']->link('/index.php',
-                                               Array(
-                                                       'menuaction' => 
'forum.uiforum.post',
-                                                       'type'  => 'new'
-                                               )
+                       $pre_var = array(
+                                       'BGROUND'        => 
$GLOBALS['phpgw_info']['theme']['th_bg'],
+                                       'LANG_TOPIC'     => lang('Topic'),
+                                       'LANG_AUTHOR'    => lang('Author'),
+                                       'LANG_REPLIES'   => lang('Replies'),
+                                       'LANG_LATREP'    => lang('Latest 
Reply'),
+                                       'LANG_MAIN'      => lang('Forums'),
+                                       'LANG_NEWTOPIC'  => lang('New Topic'),
+                                       'LANG_CATEGORY'  => $category['name'],
+                                       'LANG_FORUM'     => $forum['name'],
+                                       'FORUM_LINK'     => 
$GLOBALS['phpgw']->link('/index.php',
+                                                       Array(
+                                                               'menuaction'    
=> 'forum.uiforum.forum',
+                                                               'cat_id'        
=>      $this->bo->cat_id
+                                                       )
+                                               ),
+                                       'MAIN_LINK'      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.index') ),
+                                       'POST_LINK'      => 
$GLOBALS['phpgw']->link('/index.php',
+                                                       Array(
+                                                               'menuaction'    
=> 'forum.uiforum.post',
+                                                               'type'          
=> 'new',
+                                                               'forum_id'      
=> $this->bo->forum_id
+                                                       )
                                        )
                        );

-                       $is_collapsed = (strcmp($this->bo->view,'collapsed') == 
0);
-                       $thread_listing = 
$this->bo->get_thread($this->bo->cat_id,$this->bo->forum_id,$is_collapsed);
-                       if($is_collapsed)
+                       $is_collapsed = ($this->bo->view == 'collapsed');
+                       $thread_listing = 
$this->bo->get_thread($this->bo->cat_id, $this->bo->forum_id, $is_collapsed);
+                       if ( $is_collapsed )
                        {
                                $this->template->set_file(
                                        Array(
@@ -231,23 +236,24 @@
                                
$this->template->set_block('COLLAPSE','CollapseThreads','CollapseT');

                                $this->template->set_var($pre_var);
-                               
$this->template->set_var('THREAD_IMG',$GLOBALS['phpgw']->common->image('forum','thread'));
+                               $this->template->set_var('THREAD_IMG', 
$GLOBALS['phpgw']->common->image('forum','thread'));

                                while($thread_listing && list($key,$thread) = 
each($thread_listing))
                                {
                                        $GLOBALS['tr_color'] = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);

                                        $var = Array(
-                                               'COLOR' => $GLOBALS['tr_color'],
-                                               'TOPIC' => 
($thread['subject']?$thread['subject']:'[No subject]'),
+                                               'COLOR'         => 
$GLOBALS['tr_color'],
+                                               'TOPIC'         => 
($thread['subject']?$thread['subject']:'[No subject]'),
                                                'AUTHOR'        => 
($thread['author']?$GLOBALS['phpgw']->common->grab_owner_name($thread['author']):lang('Unknown')),
                                                'REPLIES'       => 
$thread['replies'],
                                                'READ_LINK'     => 
$GLOBALS['phpgw']->link('/index.php',
-                                                               Array(
-                                                                       
'menuaction'    => 'forum.uiforum.read',
-                                                                       'msg'   
=> $thread['id']
-                                                               )
-                                                       ),
+                                                                       Array(
+                                                                               
'menuaction'    => 'forum.uiforum.read',
+                                                                               
'msg'           => $thread['id'],
+                                                                               
'forum_id'      => $this->bo->forum_id
+                                                                       )
+                                                               ),
                                                'LATESTREPLY'   => 
$thread['last_reply']
                                        );
                                        $this->template->set_var($var);
@@ -257,7 +263,8 @@
                                        'THREADS_LINK'  => 
$GLOBALS['phpgw']->link('/index.php',
                                                        Array(
                                                                'menuaction'    
=> 'forum.uiforum.threads',
-                                                               'view'  => 
'threads'
+                                                               'view'          
=> 'threads',
+                                                               'forum_id'      
=> $this->bo->forum_id
                                                        )
                                                ),
                                        'LANG_THREADS' => lang('View Threads')
@@ -296,8 +303,9 @@
                                                'READ_LINK'     => 
$GLOBALS['phpgw']->link('/index.php',
                                                                Array(
                                                                        
'menuaction'    => 'forum.uiforum.read',
-                                                                       'msg'   
=> $thread['id'],
-                                                                       'pos'   
=> $thread['pos']
+                                                                       'msg'   
        => $thread['id'],
+                                                                       'pos'   
        => $thread['pos'],
+                                                                       
'forum_id'      => $this->bo->forum_id
                                                                )
                                                        ),
                                                'LATESTREPLY'   => 
$thread['last_reply'],
@@ -311,7 +319,8 @@
                                        'THREADS_LINK'  => 
$GLOBALS['phpgw']->link('/index.php',
                                                        Array(
                                                                'menuaction'    
=> 'forum.uiforum.threads',
-                                                               'view'  => 
'collapsed'
+                                                               'view'          
=> 'collapsed',
+                                                               'forum_id'      
=> $this->bo->forum_id
                                                        )
                                                ),
                                        'LANG_THREADS' => lang('Collapse 
Threads')
@@ -361,17 +370,18 @@
                                'LANG_FORUM'    => $forum['name'],
                                'LANG_SEARCH'   => lang('Search'),
                                'LANG_POST'     => lang('Post'),
-                               'FORUM_LINK'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.forum'),
-                               'MAIN_LINK'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'),
+                               'FORUM_LINK'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.forum', 'forum_id' => $this->bo->forum_id)),
+                               'MAIN_LINK'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.index') ),
                                'POST_LINK'     => 
$GLOBALS['phpgw']->link('/index.php',
                                                Array(
-                                                       'menuaction' => 
'forum.uiforum.post',
-                                                       'type'  => 'new'
+                                                       'menuaction'    => 
'forum.uiforum.post',
+                                                       'type'          => 
'new',
+                                                       'forum_id'      => 
$this->bo->forum_id
                                                )
                                        ),
-                               'THREADS_LINK' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.threads'),
-                               'SEARCH_LINK'  => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.search'),
-                               'READ_ACTION'  => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.boforum.reply'),
+                               'THREADS_LINK' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.threads', 'forum_id' => $this->bo->forum_id) ),
+                               'SEARCH_LINK'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiforum.search') ),
+                               'READ_ACTION'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.boforum.reply') ),
                                'MSG'          => $msg,
                                'POST'         => $pos,
                                'CAT_ID'       => $this->bo->cat_id,
@@ -481,12 +491,12 @@
                                'LANG_FORUM'    => $forum['name'],
                                'LANG_SEARCH'   => lang('Search'),
                                'LANG_POST'     => lang('Post'),
-                               'FORUM_LINK'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.forum'),
-                               'MAIN_LINK'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'),
-                               'POST_LINK'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.post'),
-                               'THREADS_LINK'  => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.threads'),
-                               'SEARCH_LINK'   => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.search'),
-                               'POST_ACTION'   => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.boforum.post'),
+                               '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') ),
+                               '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,
                                'FORUM_ID'      => $this->bo->forum_id,
                                'TYPE'          => $posttype,






reply via email to

[Prev in Thread] Current Thread [Next in Thread]