phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] setup applications.php


From: Dave Hall
Subject: [Phpgroupware-cvs] setup applications.php
Date: Mon, 02 Oct 2006 09:59:28 +0000

CVSROOT:        /cvsroot/phpgroupware
Module name:    setup
Changes by:     Dave Hall <skwashd>     06/10/02 09:59:28

Modified files:
        .              : applications.php 

Log message:
        fix all apps being disabled and row_[on|off]

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/applications.php?cvsroot=phpgroupware&r1=1.30&r2=1.31

Patches:
Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- applications.php    1 Oct 2006 13:45:34 -0000       1.30
+++ applications.php    2 Oct 2006 09:59:28 -0000       1.31
@@ -5,10 +5,10 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package setup
-       * @version $Id: applications.php,v 1.30 2006/10/01 13:45:34 skwashd Exp 
$
+       * @version $Id: applications.php,v 1.31 2006/10/02 09:59:28 skwashd Exp 
$
        */
 
-       $DEBUG = $_POST['debug'] || $_GET['debug'];
+       $DEBUG = (isset($_POST['debug']) && $_POST['debug']) || 
(isset($_GET['debug']) && $_GET['debug']);
        /*
         TODO: We allow a user to hose their setup here, need to make use
         of dependencies so they are warned that they are pulling the rug
@@ -16,11 +16,12 @@
         this will happen without further warning.
        */
 
-       $GLOBALS['phpgw_info']['flags'] = array(
-               'noheader' => True,
-               'nonavbar' => True,
+       $GLOBALS['phpgw_info']['flags'] = array
+       (
+               'noheader'              => true,
+               'nonavbar'              => true,
                'currentapp' => 'home',
-               'noapi' => True
+               'noapi'                 => true
        );
        
        /**
@@ -28,7 +29,7 @@
         */
        include ('./inc/functions.inc.php');
 
-       if(@get_var('cancel',Array('POST')))
+       if ( isset($_POST['cancel']) && $_POST['cancel'] )
        {
                Header("Location: index.php");
                exit;
@@ -276,11 +277,12 @@
                                if ($key == 'depends') { $val = parsedep($val); 
}
                                if (is_array($val))    { $val = 
implode(',',$val); }
 
-                               $setup_tpl->set_var('bg_color',$bgcolor[$i]);
+                               $setup_tpl->set_var('bg_color', $bgcolor[$i]);
                                $setup_tpl->set_var('name',$key);
                                $setup_tpl->set_var('details',$val);
                                $setup_tpl->pparse('out','detail');
                        }
+                       ++$i;
                }
                $setup_tpl->pparse('out','footer');
                exit;
@@ -426,7 +428,7 @@
                {
                        if( isset($value['name']) && $value['name'] != 
'phpgwapi' && $value['name'] != 'notifywindow')
                        {
-                               $i = $i % 2;
+                               $i = ++$i % 2;
                                $value['title'] = !isset($value['title']) || 
!strlen($value['title']) ? str_replace('*', '', lang($value['name'])) : 
$value['title'];
                                $setup_tpl->set_var('apptitle',$value['title']);
                                
$setup_tpl->set_var('currentver',@$value['currentver']);
@@ -452,7 +454,7 @@
                                                        
$setup_tpl->set_var('instimg','completed.png');
                                                        
$setup_tpl->set_var('instalt', lang('%1 status - %2', $value['title'], 
lang('Completed')));
                                                        
$setup_tpl->set_var('install','&nbsp;');
-                                                       if($value['enabled'])
+                                                       if($value['enable'])
                                                        {
                                                                
$setup_tpl->set_var('resolution','');
                                                                $status = 
lang('OK') . ' - ' . $value['status'];




reply via email to

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