mantisbt core.php,1.39,1.40 config_defaults_inc.php,1.258,1.259

Update of /cvsroot/mantisbt/mantisbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21684

Modified Files:
        core.php config_defaults_inc.php 
Log Message:
Initial commit of installer code
  - linking code in core.php is commented out
  - admin/schema.php needs to be updated
part of  0005289: Use ADODB DataDict for DB Creation / Upgrade


Index: core.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- core.php    31 Mar 2005 01:08:36 -0000      1.39
+++ core.php    26 Apr 2005 17:35:08 -0000      1.40
@@ -41,7 +41,27 @@
                require_once( dirname( __FILE__ 
).DIRECTORY_SEPARATOR.'custom_constant_inc.php' );
        }
        require_once( dirname( __FILE__ 
).DIRECTORY_SEPARATOR.'config_defaults_inc.php' );
-       require_once( dirname( __FILE__ ).DIRECTORY_SEPARATOR.'config_inc.php' 
);
+       # config_inc may not be present if this is a new install
+       if ( file_exists( dirname( __FILE__ 
).DIRECTORY_SEPARATOR.'config_inc.php' ) ) {
+               require_once( dirname( __FILE__ 
).DIRECTORY_SEPARATOR.'config_inc.php' );
+       } else {
+               # if not found, redirect to the admin page to install the system
+/* @@@ commented out for now until installer works
+               if ( ! stristr ( $_SERVER['PHP_SELF'], 'admin' ) ) {
+                       if ( OFF == $g_use_iis ) {
+                               header( 'Status: 302' );
+                       }
+                       header( 'Content-Type: text/html' );
+
+                       if ( ON == $g_use_iis ) {
+                               header( "Refresh: 0;url=admin/" );
+                       } else {
+                               header( "Location: admin/" );
+                       }
+               exit; # additional output can cause problems so let's just stop 
output here
+               }
+*/
+       }
 
        # Allow an environment variable (defined in an Apache vhost for example)
        #  to specify a config file to load to override other local settings

Index: config_defaults_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/config_defaults_inc.php,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- config_defaults_inc.php     26 Apr 2005 01:49:02 -0000      1.258
+++ config_defaults_inc.php     26 Apr 2005 17:35:08 -0000      1.259
@@ -1196,6 +1196,7 @@
        $g_mantis_tokens_table                                  = 
'%db_table_prefix%_tokens%db_table_suffix%';
        $g_mantis_project_hierarchy_table               = 
'%db_table_prefix%_project_hierarchy%db_table_suffix%';
        $g_mantis_config_table                                  = 
'%db_table_prefix%_config%db_table_suffix%';
+       $g_mantis_database_table                                        = 
'%db_table_prefix%_database%db_table_suffix%';
 
        ###########################
        # Mantis Enum Strings



-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start!  http://www.idcswdc.com/cgi-bin/survey?id=105hix