[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.uimain...

[Dave Hall]

CVSROOT:        /sources/phpgroupware
Module name:    admin
Changes by:     Dave Hall <skwashd>     06/08/11 07:09:27

Modified files:
        inc            : class.boaccounts.inc.php 
                         class.uimainscreen.inc.php 

Log message:
        fix redirects

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.boaccounts.inc.php?cvsroot=phpgroupware&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uimainscreen.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18

Patches:
Index: class.boaccounts.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- class.boaccounts.inc.php    6 Aug 2006 10:03:24 -0000       1.49
+++ class.boaccounts.inc.php    11 Aug 2006 07:09:27 -0000      1.50
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: class.boaccounts.inc.php,v 1.49 2006/08/06 10:03:24 skwashd Exp 
$ */
+       /* $Id: class.boaccounts.inc.php,v 1.50 2006/08/11 07:09:27 skwashd Exp 
$ */
 
        //FIXME define constants for rights so we can fuck all these magic 
numbers
        
@@ -312,7 +312,7 @@
                {
                        
if($GLOBALS['phpgw']->acl->check('group_access',16,'admin') || $_POST['cancel'])
                        {
-                               
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'admin.uiaccounts.list_groups'));
                                $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
                                exit;
                        }
@@ -333,7 +333,7 @@
                                        
$acl->add_repository('phpgw_group',intval($_POST['account_id']),$manager,(1 + 
PHPGW_ACL_GROUP_MANAGERS));
                                }
                        }
-                       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'admin.uiaccounts.list_groups'));
                        $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
                        exit;
                }

Index: class.uimainscreen.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.uimainscreen.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uimainscreen.inc.php  12 Mar 2006 11:19:48 -0000      1.17
+++ class.uimainscreen.inc.php  11 Aug 2006 07:09:27 -0000      1.18
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: class.uimainscreen.inc.php,v 1.17 2006/03/12 11:19:48 skwashd 
Exp $ */
+       /* $Id: class.uimainscreen.inc.php,v 1.18 2006/08/11 07:09:27 skwashd 
Exp $ */
 
        class uimainscreen
        {
@@ -40,7 +40,7 @@
                {
                        if ( isset($_POST['cancel']) && $_POST['cancel'] )
                        {
-                               header('Location: ' . 
$GLOBALS['phpgw']->link('/admin/index.php'));
+                               
$GLOBALS['phpgw']->redirect_link('/admin/index.php');
                        }
 
                        $GLOBALS['phpgw']->template->set_file(array('message' 
=> 'mainscreen_message.tpl'));