[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] forum index.php inc/class.boforum.inc.php inc/c...
|
From: |
Caeies |
|
Subject: |
[Phpgroupware-cvs] forum index.php inc/class.boforum.inc.php inc/c... |
|
Date: |
Wed, 24 Jan 2007 17:11:14 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: forum
Changes by: Caeies <Caeies> 07/01/24 17:11:14
Modified files:
. : index.php
inc : class.boforum.inc.php class.uiadmin.inc.php
class.uiforum.inc.php hook_preferences.inc.php
Log message:
some call to link() fixed
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/forum/index.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/forum/inc/class.boforum.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/forum/inc/class.uiadmin.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/forum/inc/class.uiforum.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/forum/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/index.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- index.php 20 Jan 2002 03:37:07 -0000 1.26
+++ index.php 24 Jan 2007 17:11:13 -0000 1.27
@@ -10,7 +10,7 @@
* option) any later version.
*
\*****************************************************************************/
- /* $Id: index.php,v 1.26 2002/01/20 03:37:07 skeeter Exp $ */
+ /* $Id: index.php,v 1.27 2007/01/24 17:11:13 Caeies Exp $ */
$phpgw_flags = Array(
'currentapp' => 'forum',
@@ -25,6 +25,6 @@
include('../header.inc.php');
- Header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+ Header('Location: '.$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'forum.uiforum.index')));
$GLOBALS['phpgw']->common->phpgw_exit();
?>
Index: inc/class.boforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.boforum.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- inc/class.boforum.inc.php 28 Dec 2006 04:56:10 -0000 1.11
+++ inc/class.boforum.inc.php 24 Jan 2007 17:11:13 -0000 1.12
@@ -11,7 +11,7 @@
* option) any later version.
*
\*****************************************************************************/
- /* $Id: class.boforum.inc.php,v 1.11 2006/12/28 04:56:10 skwashd Exp $
*/
+ /* $Id: class.boforum.inc.php,v 1.12 2007/01/24 17:11:13 Caeies Exp $ */
class boforum
{
@@ -98,7 +98,7 @@
$this->so->add_post($data);
}
-
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.threads'));
+
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'forum.uiforum.threads')));
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -137,7 +137,7 @@
$this->so->add_reply($data);
}
- Header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.threads'));
+ Header('Location:
'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiforum.threads')));
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -145,11 +145,11 @@
{
if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
{
- Header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+ Header('Location:
'.$GLOBALS['phpgw']->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'));
+ Header('Location:
'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiadmin.index')));
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -157,11 +157,11 @@
{
if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
{
- Header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+ Header('Location:
'.$GLOBALS['phpgw']->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'));
+ Header('Location:
'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiadmin.index')));
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -169,11 +169,11 @@
{
if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
{
- Header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+ Header('Location:
'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiforum.index')));
$GLOBALS['phpgw']->common->phpgw_exit();
}
$this->so->save_category(get_var('cat',Array('POST')));
- Header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
+ Header('Location:
'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiadmin.index')));
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -181,11 +181,11 @@
{
if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
{
- Header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'));
+ Header('Location:
'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiforum.index')));
$GLOBALS['phpgw']->common->phpgw_exit();
}
$this->so->save_forum(get_var('forum',Array('POST')));
- Header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
+ Header('Location:
'.$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiadmin.index')));
$GLOBALS['phpgw']->common->phpgw_exit();
}
Index: inc/class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.uiadmin.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.uiadmin.inc.php 28 Dec 2006 11:43:05 -0000 1.5
+++ inc/class.uiadmin.inc.php 24 Jan 2007 17:11:13 -0000 1.6
@@ -11,7 +11,7 @@
* option) any later version.
*
\*****************************************************************************/
- /* $Id: class.uiadmin.inc.php,v 1.5 2006/12/28 11:43:05 Caeies Exp $ */
+ /* $Id: class.uiadmin.inc.php,v 1.6 2007/01/24 17:11:13 Caeies Exp $ */
class uiadmin
{
@@ -390,10 +390,10 @@
'THBG' =>
$GLOBALS['phpgw_info']['theme']['bg09'],
//'TRBG' =>
$GLOBALS['phpgw_info']['theme']['row_off'],
- 'CAT_LINK' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.category'),
- 'FOR_LINK' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.forum'),
- 'MAIN_LINK' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'),
- 'ADM_LINK' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'),
+ 'CAT_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiadmin.category')),
+ 'FOR_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiadmin.forum')),
+ 'MAIN_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiforum.index')),
+ 'ADM_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiadmin.index')),
'LANG_ADM_MAIN' => lang('Return to Admin'),
'LANG_CAT' => lang('New Category'),
'LANG_FOR' => lang('New Forum'),
@@ -404,7 +404,7 @@
'LANG_CAT_DESC' => lang('Category Description'),
'BELONG_TO' => lang('Belongs to Category'),
'ACTION' => 'addforum',
- 'ACTION_LINK' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.boforum.forum'),
+ 'ACTION_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.boforum.forum')),
'FORID' => $forum_id,
'CATID' => $this->bo->cat_id
);
Index: inc/class.uiforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.uiforum.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- inc/class.uiforum.inc.php 4 May 2005 13:46:33 -0000 1.11
+++ inc/class.uiforum.inc.php 24 Jan 2007 17:11:13 -0000 1.12
@@ -11,7 +11,7 @@
* option) any later version.
*
\*****************************************************************************/
- /* $Id: class.uiforum.inc.php,v 1.11 2005/05/04 13:46:33 powerstat Exp
$ */
+ /* $Id: class.uiforum.inc.php,v 1.12 2007/01/24 17:11:13 Caeies Exp $ */
class uiforum
{
@@ -142,7 +142,7 @@
'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')
+ 'MAIN_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiforum.index'))
);
$this->template->set_var($var);
@@ -206,7 +206,7 @@
'cat_id' =>
$this->bo->cat_id
)
),
- 'MAIN_LINK' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.index'),
+ 'MAIN_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiforum.index')),
'POST_LINK' =>
$GLOBALS['phpgw']->link('/index.php',
Array(
'menuaction' =>
'forum.uiforum.post',
@@ -357,17 +357,17 @@
'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')),
+ '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'
)
),
- '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')),
+ '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,
@@ -381,7 +381,7 @@
'LANG_MESSAGE' => lang('Message'),
'LANG_THREADS' => lang('Return to forums')
/*
- 'THREADS_LINK' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.threads'),
+ 'THREADS_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiforum.threads')),
*/
);
@@ -475,12 +475,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' => get_var('type',Array('GET')),
@@ -492,7 +492,7 @@
'LANG_MESSAGE' => lang('Message'),
'LANG_THREADS' => lang('Return to forums')
/*
- 'THREADS_LINK' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiforum.threads'),
+ 'THREADS_LINK' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'forum.uiforum.threads')),
*/
);
Index: inc/hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/hook_preferences.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/hook_preferences.inc.php 23 Nov 2001 20:04:22 -0000 1.3
+++ inc/hook_preferences.inc.php 24 Jan 2007 17:11:13 -0000 1.4
@@ -9,10 +9,10 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: hook_preferences.inc.php,v 1.3 2001/11/23 20:04:22 milosch Exp
$ */
+ /* $Id: hook_preferences.inc.php,v 1.4 2007/01/24 17:11:13 Caeies Exp $
*/
{
display_section('forum','Forum',array(
- 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=forum')
+ 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php', array('appname' =>
'forum'))
));
}
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] forum index.php inc/class.boforum.inc.php inc/c...,
Caeies <=