[Phpgroupware-cvs] CVS: setup/inc class.setup_process.inc.php,1.8,1.9 class.setup_detection.inc.php,1.9,1.10

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/setup/inc
In directory subversions:/tmp/cvs-serv8083/inc

Modified Files:
        class.setup_process.inc.php class.setup_detection.inc.php 
Log Message:
Additional fix for non-installed apps during upgrades



Index: class.setup_process.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup_process.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.setup_process.inc.php 11 Jan 2002 03:40:59 -0000      1.8
--- class.setup_process.inc.php 15 Jan 2002 01:46:27 -0000      1.9
***************
*** 516,519 ****
--- 516,520 ----
                                                echo '<br>process_upgrade(): 
Application not installed: ' . $appname . "\n";
                                        }
+                                       @unset($setup_info[$key]);
                                        continue;
                                }

Index: class.setup_detection.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup_detection.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.setup_detection.inc.php       13 Jan 2002 21:12:35 -0000      1.9
--- class.setup_detection.inc.php       15 Jan 2002 01:46:27 -0000      1.10
***************
*** 173,186 ****
                                                        if 
($setup_info[$key]['status'] != 'F' )//&& $setup_info[$key]['status'] != 'C')
                                                        {
-                                                               /*
                                                                
if($setup_info[$key]['status'] == 'C')
                                                                {
!                                                                       
$setup_info[$key]['status'] = 'P';
                                                                }
                                                                else
                                                                {
!                                                               */
!                                                                       
$setup_info[$key]['status'] = 'D';
!                                                               //}
                                                        }
                                                }
--- 173,184 ----
                                                        if 
($setup_info[$key]['status'] != 'F' )//&& $setup_info[$key]['status'] != 'C')
                                                        {
                                                                
if($setup_info[$key]['status'] == 'C')
                                                                {
!                                                                       
$setup_info[$key]['status'] = 'D';
                                                                }
                                                                else
                                                                {
!                                                                       
$setup_info[$key]['status'] = 'P';
!                                                               }
                                                        }
                                                }