[Phpgroupware-cvs] setup applications.php lang.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    setup
Changes by:     Dave Hall <skwashd>     07/02/10 09:20:24

Modified files:
        .              : applications.php lang.php 

Log message:
        notices and formatting

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/applications.php?cvsroot=phpgroupware&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/setup/lang.php?cvsroot=phpgroupware&r1=1.56&r2=1.57

Patches:
Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- applications.php    7 Jan 2007 01:55:57 -0000       1.35
+++ applications.php    10 Feb 2007 09:20:24 -0000      1.36
@@ -5,7 +5,7 @@
        * @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.35 2007/01/07 01:55:57 skwashd Exp 
$
+       * @version $Id: applications.php,v 1.36 2007/02/10 09:20:24 skwashd Exp 
$
        */
 
        $DEBUG = (isset($_POST['debug']) && $_POST['debug']) || 
(isset($_GET['debug']) && $_GET['debug']);
@@ -130,10 +130,10 @@
                $setup_tpl->set_var('description',lang('App 
install/remove/upgrade') . ':');
                $setup_tpl->pparse('out','header');
 
-               $appname = get_var('appname',Array('POST'));
-               $remove  = get_var('remove',Array('POST'));
-               $install = get_var('install',Array('POST'));
-               $upgrade = get_var('upgrade',Array('POST'));
+               $appname = get_var('appname', array('POST'));
+               $remove  = get_var('remove', array('POST'));
+               $install = get_var('install', array('POST'));
+               $upgrade = get_var('upgrade', array('POST'));
 
                if(!empty($remove) && is_array($remove))
                {
@@ -143,7 +143,8 @@
                                $terror = array();
                                $terror[] = $setup_info[$appname];
 
-                               if ($setup_info[$appname]['tables'])
+                               if ( isset($setup_info[$appname]['tables'])
+                                       && $setup_info[$appname]['tables'] )
                                {
                                        
$GLOBALS['phpgw_setup']->process->droptables($terror,$DEBUG);
                                        echo 
"<li>{$setup_info[$appname]['title']} " . lang('tables dropped') . ".</li>\n";
@@ -152,7 +153,8 @@
                                
$GLOBALS['phpgw_setup']->deregister_app($setup_info[$appname]['name']);
                                echo "<li>{$setup_info[$appname]['title']} " . 
lang('deregistered') . ".</li>\n";
 
-                               if ($setup_info[$appname]['hooks'])
+                               if (isset($setup_info[$appname]['hooks'])
+                                       && $setup_info[$appname]['hooks'] )
                                {
                                        
$GLOBALS['phpgw_setup']->deregister_hooks($setup_info[$appname]['name']);
                                        echo 
"<li>{$setup_info[$appname]['title']} " . lang('hooks deregistered') . 
".</li>\n";

Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- lang.php    2 Nov 2006 09:56:58 -0000       1.56
+++ lang.php    10 Feb 2007 09:20:24 -0000      1.57
@@ -5,7 +5,7 @@
        * @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: lang.php,v 1.56 2006/11/02 09:56:58 sigurdne Exp $
+       * @version $Id: lang.php,v 1.57 2007/02/10 09:20:24 skwashd Exp $
        */
 
        $phpgw_info = array();
@@ -123,7 +123,7 @@
                                                        $lines = file($appfile);
                                                        foreach($lines as $line)
                                                        {
-                                                               
list($message_id,$app_name,,$content) = explode("\t",$line);
+                                                               
list($message_id,$app_name,$ignore,$content) = explode("\t",$line);
                                                                /* XXX Caeies 
Get invalid lang files ... 
                                                                
if(empty($content))
                                                                {