phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] forum preference_deletecategory.php preference_...


From: Caeies
Subject: [Phpgroupware-cvs] forum preference_deletecategory.php preference_...
Date: Thu, 28 Dec 2006 11:43:05 +0000

CVSROOT:        /cvsroot/phpgroupware
Module name:    forum
Changes by:     Caeies <Caeies> 06/12/28 11:43:05

Modified files:
        .              : preference_deletecategory.php 
                         preference_deleteforum.php 
        inc            : class.uiadmin.inc.php 

Log message:
        link fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/forum/preference_deletecategory.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/forum/preference_deleteforum.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/forum/inc/class.uiadmin.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5

Patches:
Index: preference_deletecategory.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/preference_deletecategory.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- preference_deletecategory.php       14 Jul 2001 01:44:06 -0000      1.4
+++ preference_deletecategory.php       28 Dec 2006 11:43:05 -0000      1.5
@@ -10,7 +10,7 @@
        *  option) any later version.                                           
      *
        
\*****************************************************************************/
 
-       /* $Id: preference_deletecategory.php,v 1.4 2001/07/14 01:44:06 jengo 
Exp $ */
+       /* $Id: preference_deletecategory.php,v 1.5 2006/12/28 11:43:05 Caeies 
Exp $ */
 
   $phpgw_info["flags"] = array("currentapp" => "forum", 
"enable_nextmatchs_class" => True);
   if($confirm || ! $cat_id) {
@@ -38,7 +38,7 @@
            <a href="<?php echo $phpgw->link("/forum") . "\">" . lang("No"); 
?></a>
          </td>
          <td>
-           <a href="<?php echo 
$phpgw->link("/forum/preference_deletecategory.php","cat_id=$cat_id&confirm=true")
 . "\">" . lang("Yes"); ?></a>
+           <a href="<?php echo 
$phpgw->link('/forum/preference_deletecategory.php', array('cat_id' => $cat_id, 
'confirm' => 'true')) . "\">" . lang("Yes"); ?></a>
          </td>
        </tr>
       </table>

Index: preference_deleteforum.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/preference_deleteforum.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- preference_deleteforum.php  14 Jul 2001 01:44:06 -0000      1.4
+++ preference_deleteforum.php  28 Dec 2006 11:43:05 -0000      1.5
@@ -10,7 +10,7 @@
        *  option) any later version.                                           
      *
        
\*****************************************************************************/
 
-       /* $Id: preference_deleteforum.php,v 1.4 2001/07/14 01:44:06 jengo Exp 
$ */
+       /* $Id: preference_deleteforum.php,v 1.5 2006/12/28 11:43:05 Caeies Exp 
$ */
 
   $phpgw_info["flags"] = array("currentapp" => "forum", 
"enable_nextmatchs_class" => True);
   if($confirm || ! $for_id) {
@@ -38,7 +38,7 @@
            <a href="<?php echo $phpgw->link("/forum") . "\">" . lang("No"); 
?></a>
          </td>
          <td>
-           <a href="<?php echo 
$phpgw->link("/forum/preference_deleteforum.php","for_id=$for_id&confirm=true") 
. "\">" . lang("Yes"); ?></a>
+           <a href="<?php echo 
$phpgw->link('/forum/preference_deleteforum.php',array('for_id' => $for_id, 
'confirm' => 'true')) . "\">" . lang("Yes"); ?></a>
          </td>
        </tr>
       </table>

Index: inc/class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.uiadmin.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.uiadmin.inc.php   30 Apr 2002 18:04:59 -0000      1.4
+++ inc/class.uiadmin.inc.php   28 Dec 2006 11:43:05 -0000      1.5
@@ -11,7 +11,7 @@
        *  option) any later version.                                           
      *
        
\*****************************************************************************/
 
-       /* $Id: class.uiadmin.inc.php,v 1.4 2002/04/30 18:04:59 skeeter Exp $ */
+       /* $Id: class.uiadmin.inc.php,v 1.5 2006/12/28 11:43:05 Caeies Exp $ */
 
        class uiadmin
        {
@@ -36,7 +36,7 @@
                {
                        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();
                        }
 
@@ -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'),
@@ -242,7 +242,7 @@
                        $this->template->parse('YES','form_button');
 
                        $var = Array(
-                               'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'),
+                               'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiadmin.index')),
                                'action_text_button'    => lang('Cancel'),
                                'action_confirm_button' => '',
                                'action_extra_field'    => ''
@@ -294,7 +294,7 @@
                        $this->template->parse('YES','form_button');
 
                        $var = Array(
-                               'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'),
+                               'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction' => 
'forum.uiadmin.index')),
                                'action_text_button'    => lang('Cancel'),
                                'action_confirm_button' => '',
                                'action_extra_field'    => ''
@@ -325,10 +325,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'),
@@ -339,7 +339,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.category'),
+                               'ACTION_LINK'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.boforum.category')),
                                'LANG_ADD_CAT'  => lang('Edit Category'),
                                'CAT_ID'        => $cat_id
                        );




reply via email to

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