deprecate root bit_setup_inc use kernel/setup_inc.php

16 files changed, 34 insertions, 30 deletions

diff --git a/admin/admin_notifications.php b/admin/admin_notifications.php
index b04475f..fcd8238 100644
--- a/admin/admin_notifications.php
+++ b/admin/admin_notifications.php
@@ -1,13 +1,13 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_notifications.php,v 1.7 2009/10/01 14:17:01 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_notifications.php,v 1.8 2010/02/08 21:27:23 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
 
 // Initialization
-require_once( '../../bit_setup_inc.php' );
+require_once( '../../kernel/setup_inc.php' );
 
 include_once( KERNEL_PKG_PATH.'notification_lib.php' );
 
diff --git a/admin/admin_system.php b/admin/admin_system.php
index 82db100..0e65e3b 100644
--- a/admin/admin_system.php
+++ b/admin/admin_system.php
@@ -1,11 +1,11 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_system.php,v 1.22 2009/10/01 14:17:01 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_system.php,v 1.23 2010/02/08 21:27:23 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
 
-require_once( '../../bit_setup_inc.php' );
+require_once( '../../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPermission( 'p_admin' );
 $feedback = array();
diff --git a/admin/backup.php b/admin/backup.php
index 65e6fe4..84cb9e9 100644
--- a/admin/backup.php
+++ b/admin/backup.php
@@ -1,13 +1,13 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/backup.php,v 1.7 2009/10/01 14:17:01 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/backup.php,v 1.8 2010/02/08 21:27:23 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
 
 // Initialization
-require_once( '../../bit_setup_inc.php' );
+require_once( '../../kernel/setup_inc.php' );
 require_once ( KERNEL_PKG_PATH.'backups_lib.php' );
 
 // Check for admin permission
diff --git a/admin/db_performance.php b/admin/db_performance.php
index c450b50..122a43b 100644
--- a/admin/db_performance.php
+++ b/admin/db_performance.php
@@ -1,6 +1,6 @@
 <?php
 
-	require_once( '../../bit_setup_inc.php' );
+	require_once( '../../kernel/setup_inc.php' );
 
 	if (!$gBitUser->isAdmin()) {
 		$gBitSmarty->assign('msg', tra("You dont have permission to use this feature"));
diff --git a/admin/index.php b/admin/index.php
index cb58482..2051cbe 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/index.php,v 1.26 2009/10/01 14:17:01 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/index.php,v 1.27 2010/02/08 21:27:23 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
@@ -9,7 +9,7 @@
 // Initialization
 global $gForceAdodb;
 $gForceAdodb = TRUE;
-require_once( '../../bit_setup_inc.php' );
+require_once( '../../kernel/setup_inc.php' );
 require_once( KERNEL_PKG_PATH.'simple_form_functions_lib.php' );
 
 //make an alias in case anyone decides to verifyInstalledPackages
diff --git a/admin/list_cache.php b/admin/list_cache.php
index 025041a..78e95a9 100644
--- a/admin/list_cache.php
+++ b/admin/list_cache.php
@@ -1,13 +1,13 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/list_cache.php,v 1.8 2009/10/01 14:17:01 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/list_cache.php,v 1.9 2010/02/08 21:27:23 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
 
 // Initialization
-require_once( '../../bit_setup_inc.php' );
+require_once( '../../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPermission( 'p_admin' );
 
diff --git a/admin/phpinfo.php b/admin/phpinfo.php
index a68ea53..eb1ae7c 100644
--- a/admin/phpinfo.php
+++ b/admin/phpinfo.php
@@ -1,13 +1,13 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/phpinfo.php,v 1.4 2009/10/01 14:17:01 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/phpinfo.php,v 1.5 2010/02/08 21:27:23 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
 
 // Initialization
-require_once( '../../bit_setup_inc.php' );
+require_once( '../../kernel/setup_inc.php' );
 $gBitSystem->verifyPermission( 'p_admin' );
 phpinfo();
 ?>
diff --git a/admin/remote_backup.php b/admin/remote_backup.php
index 2a24bff..fcbd495 100644
--- a/admin/remote_backup.php
+++ b/admin/remote_backup.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/remote_backup.php,v 1.3 2009/10/01 14:17:01 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/remote_backup.php,v 1.4 2010/02/08 21:27:23 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
@@ -12,7 +12,7 @@
 // PLEASE UNCOMMENT THIS LINE TO ACTIVATE REMOTE BACKUPS (DISABLED IN THE DISTRIBUTION)
 die;
 
-require_once( '../../bit_setup_inc.php' );
+require_once( '../../kernel/setup_inc.php' );
 include_once('lib/backups/backupslib.php');
 if(isset($_REQUEST["generate"])) {
     if(isset($_REQUEST["my_word"]) &&
diff --git a/ajax_file_browser_inc.php b/ajax_file_browser_inc.php
index e25d78f..a59f25a 100644
--- a/ajax_file_browser_inc.php
+++ b/ajax_file_browser_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/ajax_file_browser_inc.php,v 1.6 2009/10/01 14:17:01 wjames5 Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/ajax_file_browser_inc.php,v 1.7 2010/02/08 21:27:23 wjames5 Exp $
  *
  * Copyright (c) 2008 bitweaver.org
  * All Rights Reserved. See below for details and a complete list of authors.
@@ -35,7 +35,7 @@
  *
  * NOTE: when you process the imported files, make sure you use realpath() to check of files are really in your 'jail'.
  */
-require_once( '../bit_setup_inc.php' );
+require_once( '../kernel/setup_inc.php' );
 // we need to set these global that we can include this file from functions
 global $gBitThemes, $gBitSystem, $gBitSmarty;
 
diff --git a/error.php b/error.php
index 9896deb..92cdc8f 100644
--- a/error.php
+++ b/error.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/error.php,v 1.5 2008/10/17 13:33:57 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/error.php,v 1.6 2010/02/08 21:27:23 wjames5 Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-require_once( '../bit_setup_inc.php' );
+require_once( '../kernel/setup_inc.php' );
 
 // Display the template
 $gBitSmarty->assign( 'msg', strip_tags( $_REQUEST["error"] ));
diff --git a/module_controls_inc.php b/module_controls_inc.php
index 1f23565..83f5753 100644
--- a/module_controls_inc.php
+++ b/module_controls_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/module_controls_inc.php,v 1.11 2009/10/01 14:17:01 wjames5 Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/module_controls_inc.php,v 1.12 2010/02/08 21:27:23 wjames5 Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See below for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details
  *
- * $Id: module_controls_inc.php,v 1.11 2009/10/01 14:17:01 wjames5 Exp $
+ * $Id: module_controls_inc.php,v 1.12 2010/02/08 21:27:23 wjames5 Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -16,7 +16,7 @@
 /**
  * Initialization
  */
-include_once( '../bit_setup_inc.php' );
+include_once( '../kernel/setup_inc.php' );
 
 if (!$gBitUser->hasPermission( 'p_tidbits_configure_modules' )) {
 	$gBitSmarty->assign('msg', tra("You dont have permission to use this feature"));
diff --git a/requirements_graph.php b/requirements_graph.php
index ebba7ba..f546a3e 100644
--- a/requirements_graph.php
+++ b/requirements_graph.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/requirements_graph.php,v 1.2 2009/03/31 06:30:03 lsces Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/requirements_graph.php,v 1.3 2010/02/08 21:27:23 wjames5 Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -8,7 +8,7 @@
 /**
  * Setup
  */
-require_once( '../bit_setup_inc.php' );
+require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPermission( 'p_admin' );
 global $gBitInstaller;
 $gBitInstaller = &$gBitSystem;
diff --git a/setup_inc.php b/setup_inc.php
index 7eefa1e..9bf9b28 100644
--- a/setup_inc.php
+++ b/setup_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/setup_inc.php,v 1.127 2009/10/01 14:17:01 wjames5 Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/setup_inc.php,v 1.128 2010/02/08 21:27:23 wjames5 Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -12,6 +12,10 @@
  * required setup
  */
 
+//ini_set( 'session.save_path', 'C:\somewhere\I\can\write' );
+$rootDir = dirname( dirname( __FILE__ ) );
+define( 'BIT_ROOT_PATH', empty( $_SERVER['VHOST_DIR'] ) ? $rootDir.'/' : $_SERVER['VHOST_DIR'].'/' );
+
 // immediately die on request to hack our database
 if(( !empty( $_REQUEST['sort_mode'] ) && !is_array( $_REQUEST['sort_mode'] ) && strpos( $_REQUEST['sort_mode'], 'http' ) !== FALSE ) || ( !empty( $_REQUEST['PGV_BASE_DIRECTORY'] ) && strpos( $_REQUEST['PGV_BASE_DIRECTORY'], 'http' ) !== FALSE )) {
 	die;
diff --git a/test/bit_setup_inc.php b/test/bit_setup_inc.php
index dc4d619..40b79de 100644
--- a/test/bit_setup_inc.php
+++ b/test/bit_setup_inc.php
@@ -1,3 +1,3 @@
 <?php
-require_once('../../bit_setup_inc.php');
+require_once('../../kernel/setup_inc.php');
 ?>
diff --git a/upload_slot_inc.php b/upload_slot_inc.php
index 1df25f1..99fba6f 100644
--- a/upload_slot_inc.php
+++ b/upload_slot_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/upload_slot_inc.php,v 1.2 2007/11/18 12:00:19 lsces Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/upload_slot_inc.php,v 1.3 2010/02/08 21:27:23 wjames5 Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-require_once( '../bit_setup_inc.php' );
+require_once( '../kernel/setup_inc.php' );
 
 if( isset( $_REQUEST['upload_id'] ) && $gBitThemes->isAjaxRequest() ) {
 	echo $gBitSmarty->fetch( 'bitpackage:kernel/upload_slot_inc.tpl' );
diff --git a/view_cache.php b/view_cache.php
index f7519a5..836ab19 100644
--- a/view_cache.php
+++ b/view_cache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/view_cache.php,v 1.12 2009/10/01 14:17:01 wjames5 Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/view_cache.php,v 1.13 2010/02/08 21:27:23 wjames5 Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -12,7 +12,7 @@
 /**
  * required setup
  */
-require_once( '../bit_setup_inc.php' );
+require_once( '../kernel/setup_inc.php' );
 require_once( WIKI_PKG_PATH.'BitPage.php' );
 
 /*