[Phpgroupware-cvs] phpgwapi/inc class.setup_detection.inc.php clas...

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/03/22 09:48:45

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

Log message:
        Only install core tables and the admin and preferences applications as 
stated

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.setup_detection.inc.php.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.setup_process.inc.php.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: phpgwapi/inc/class.setup_detection.inc.php
diff -u phpgwapi/inc/class.setup_detection.inc.php:1.10 
phpgwapi/inc/class.setup_detection.inc.php:1.11
--- phpgwapi/inc/class.setup_detection.inc.php:1.10     Sun May 15 11:58:17 2005
+++ phpgwapi/inc/class.setup_detection.inc.php  Wed Mar 22 09:48:44 2006
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.setup_detection.inc.php,v 1.10 2005/05/15 
11:58:17 skwashd Exp $
+       * @version $Id: class.setup_detection.inc.php,v 1.11 2006/03/22 
09:48:44 sigurdne Exp $
        */
 
        /**
@@ -222,6 +222,30 @@
                        return $setup_info;
                }
 
+               /*
+                Called during the first install.
+                only install core tables and the admin and preferences 
applications
+               */
+               function base_install($setup_info)
+               {
+                       $core_elements = array(
+                               'phpgwapi' => true,
+                               'admin' => true,
+                               'preferences' => true
+                               );
+                       
+                       
+                       foreach($setup_info as $key => $value)
+                       {
+                               if(!$core_elements[$key])
+                               {
+                                       unset($setup_info[$key]);
+                               }
+                       }
+                       return $setup_info;
+               }
+
+
                function check_header()
                {
                        if(!file_exists('../header.inc.php'))
Index: phpgwapi/inc/class.setup_process.inc.php
diff -u phpgwapi/inc/class.setup_process.inc.php:1.12 
phpgwapi/inc/class.setup_process.inc.php:1.13
--- phpgwapi/inc/class.setup_process.inc.php:1.12       Sun May 15 14:28:09 2005
+++ phpgwapi/inc/class.setup_process.inc.php    Wed Mar 22 09:48:44 2006
@@ -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.12 2005/05/15 14:28:09 
skwashd Exp $
+       * @version $Id: class.setup_process.inc.php,v 1.13 2006/03/22 09:48:44 
sigurdne Exp $
        */
 
        /**
@@ -74,8 +74,8 @@
                        $pass['admin']                  = $setup_info['admin'];
                        $pass['preferences']    = $setup_info['preferences'];
                        @reset($setup_info);
-                       $setup_info = 
$GLOBALS['phpgw_setup']->detection->get_versions($setup_info);
-                       @reset($setup_info);
+       //              $setup_info = 
$GLOBALS['phpgw_setup']->detection->get_versions($setup_info);
+       //              @reset($setup_info);
 
                        $i = 1;
                        $passed = array();