[Phpgroupware-cvs] phpgwapi/inc class.setup.inc.php class.setup_pr...

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/08/15 13:57:01

Modified files:
        inc            : class.setup.inc.php class.setup_process.inc.php 

Log message:
        more E_NOTICES and a kill debug output

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup.inc.php?cvsroot=phpgwapi&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup_process.inc.php?cvsroot=phpgwapi&r1=1.15&r2=1.16

Patches:
Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.setup.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.setup.inc.php 15 Aug 2006 13:50:11 -0000      1.25
+++ class.setup.inc.php 15 Aug 2006 13:57:01 -0000      1.26
@@ -9,7 +9,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.setup.inc.php,v 1.25 2006/08/15 13:50:11 skwashd 
Exp $
+       * @version $Id: class.setup.inc.php,v 1.26 2006/08/15 13:57:01 skwashd 
Exp $
        */
 
        /**
@@ -545,7 +545,7 @@
                                return False;
                        }
 
-                       if (!is_object($this->hooks))
+                       if ( !isset($this->hooks) || !is_object($this->hooks))
                        {
                                $this->hooks = 
CreateObject('phpgwapi.hooks',$this->db);
                        }

Index: class.setup_process.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.setup_process.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.setup_process.inc.php 19 Jul 2006 04:17:51 -0000      1.15
+++ class.setup_process.inc.php 15 Aug 2006 13:57:01 -0000      1.16
@@ -6,7 +6,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.setup_process.inc.php,v 1.15 2006/07/19 04:17:51 
skwashd Exp $
+       * @version $Id: class.setup_process.inc.php,v 1.16 2006/08/15 13:57:01 
skwashd Exp $
        */
 
        /**
@@ -553,7 +553,7 @@
                                        $setup_info[$key]['status'] == '') // 
TODO this is not getting set for api upgrade, sometimes ???
                                {
                                        $appname    = $setup_info[$key]['name'];
-                                       $apptitle   = 
$setup_info[$key]['title'];
+                                       $apptitle   = 
isset($setup_info[$key]['title']) ? $setup_info[$key]['title'] : '';
                                        $currentver = 
$setup_info[$key]['currentver'];
                                        $targetver  = 
$setup_info[$key]['version'];     // The version we need to match when done
                                        $appdir     = PHPGW_SERVER_ROOT . SEP . 
$appname . SEP . 'setup' . SEP;
@@ -601,7 +601,7 @@
                                                        /* $test array comes 
from update file.  It is a list of available upgrade functions */
                                                        foreach ( $test as $x 
=> $value )
                                                        {
-                                                               $currentver = 
$setup_info[$appname]['currentver'];
+                                                               $currentver = 
isset($setup_info[$appname]['currentver']) ? 
$setup_info[$appname]['currentver'] : '';
 
                                                                /* build 
upgrade function name */
                                                                $function = 
$appname . '_upgrade' . ereg_replace("\.", '_', $value);
@@ -641,7 +641,6 @@
                                                                }
                                                                elseif ( 
($value == $currentver) || !$currentver)
                                                                {
-                                                                       echo 
"$app, val: $value cur: $currentver <br />";
                                                                        /* 
start upgrading db in addition to bas eline */
                                                                        
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
                                                                        
if($DEBUG) { echo '<br>process->upgrade(): running ' . $function; }