[Phpgroupware-cvs] news_admin/inc class.uiacl.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    news_admin
Changes by:     Dave Hall <skwashd>     06/08/15 03:04:56

Modified files:
        inc            : class.uiacl.inc.php 

Log message:
        stop double output

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/news_admin/inc/class.uiacl.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4

Patches:
Index: class.uiacl.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/class.uiacl.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.uiacl.inc.php 4 Aug 2005 03:54:31 -0000       1.3
+++ class.uiacl.inc.php 15 Aug 2006 03:04:56 -0000      1.4
@@ -10,7 +10,7 @@
        * --------------------------------------------                          
   *
        
\**************************************************************************/
 
-       /* $Id: class.uiacl.inc.php,v 1.3 2005/08/04 03:54:31 skwashd Exp $ */
+       /* $Id: class.uiacl.inc.php,v 1.4 2006/08/15 03:04:56 skwashd Exp $ */
 
        class uiacl
        {
@@ -50,9 +50,6 @@
                                
$GLOBALS['phpgw']->redirect_link('/admin/index.php');
                        }
 
-                       $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
-
                        if ($_POST['btnSave'])
                        {
                                foreach($_POST['catids'] as $cat_id)
@@ -87,8 +84,9 @@
                                'query' => $this->query,
                        ));
 
-                       @reset($this->bo->cats);
-                       while (list(,$cat) = @each($this->bo->cats))
+                       if ( is_array($this->bo->cats) )
+                       {
+                               foreach ( $this->bo->cats as $cat )
                        {
                                $this->rights = 
$this->bo->get_rights($cat['id']);
 
@@ -102,7 +100,11 @@
                                ));
                                
$GLOBALS['phpgw']->template->parse('Cblock','cat_list',True);
                        }
-                       $GLOBALS['phpgw']->template->pfp('out','acl',True);
+                       }
+                       
+                       $GLOBALS['phpgw']->common->phpgw_header();
+                       echo parse_navbar();
+                       $GLOBALS['phpgw']->template->pfp('out','acl');
                }
 
                function selectlist($right)