clean up install for new includes/classes directory pathing

13 files changed, 16 insertions, 52 deletions

diff --git a/BitInstaller.php b/includes/classes/BitInstaller.php
index bd636f9..7795403 100644
--- a/BitInstaller.php
+++ b/includes/classes/BitInstaller.php
@@ -29,7 +29,7 @@ class BitInstaller extends BitSystem {
 	 * Initiolize BitInstaller
 	 * @access public
 	 */
-	function BitInstaller() {
+	function __construct() {
 		parent::__construct();
 		$this->getWebServerUid();
 	}
@@ -641,7 +641,7 @@ function check_session_save_path() {
 		}
 
 		if( $errors ) {
-			$save_path = static::tempdir();
+			$save_path = tempdir();
 
 			if (is_dir($save_path) && bw_is_writeable($save_path)) {
 				ini_set('session.save_path', $save_path);
diff --git a/create_config_inc.php b/includes/create_config_inc.php
index 9ae113c..9ae113c 100644
--- a/create_config_inc.php
+++ b/includes/create_config_inc.php
diff --git a/get_databases_inc.php b/includes/get_databases_inc.php
index 22f6310..22f6310 100644
--- a/get_databases_inc.php
+++ b/includes/get_databases_inc.php
diff --git a/install_admin_inc.php b/includes/install_admin_inc.php
index 392fe76..392fe76 100644
--- a/install_admin_inc.php
+++ b/includes/install_admin_inc.php
diff --git a/install_inc.php b/includes/install_inc.php
index 14c8b19..12706c3 100644
--- a/install_inc.php
+++ b/includes/install_inc.php
@@ -81,9 +81,6 @@ if( isset( $_REQUEST['submit_db_info'] ) ) {
 	}
 	if ( empty( $gBitDbType ) ) {
 		$tmpHost = $_REQUEST['host'];
-		if ($_REQUEST['db'] == 'mssql' && get_magic_quotes_gpc() == 1) { // pull doubled up slashes from config
-			$tmpHost = stripslashes($tmpHost);
-		}
 		require_once( 'create_config_inc.php' );
 		$createHash = array(
 			"gBitDbType"            => $_REQUEST['db'],
@@ -101,12 +98,13 @@ if( isset( $_REQUEST['submit_db_info'] ) ) {
 		include( $config_file );
 	}
 }
-require_once("../kernel/setup_inc.php");
-require_once( 'BitInstaller.php' );
+require_once( '../kernel/includes/setup_inc.php' );
+require_once( INSTALL_PKG_CLASS_PATH.'BitInstaller.php' );
+
 if ( defined( 'ROLE_MODEL' ) ) {
-	require_once( USERS_PKG_PATH.'includes/RoleUser.php' );
+	require_once( USERS_PKG_CLASS_PATH.'RoleUser.php' );
 } else {
-	require_once( USERS_PKG_PATH.'includes/BitUser.php' );
+	require_once( USERS_PKG_CLASS_PATH.'BitUser.php' );
 }
 
 // set some preferences during installation
diff --git a/install.php b/install.php
index 5997355..7377095 100644
--- a/install.php
+++ b/install.php
@@ -60,7 +60,7 @@ die;
 /**
  * required setup
  */
-require_once( 'install_inc.php' );
+require_once( 'includes/install_inc.php' );
 
 // this variable will be appended to the template file called - useful for displaying messages after data input
 $app = '';
diff --git a/install_database.php b/install_database.php
index fb71fdb..31a94b9 100644
--- a/install_database.php
+++ b/install_database.php
@@ -10,7 +10,7 @@
  */
 $gBitSmarty->assign( 'next_step',$step );
 
-require_once( "get_databases_inc.php" );
+require_once( "includes/get_databases_inc.php" );
 
 // next block checks if there is a config/kernel/config_inc.php and if we can connect through this.
 if( isset( $_REQUEST['submit_db_info'] )) {
diff --git a/install_packages.php b/install_packages.php
index a26cc61..807cae3 100644
--- a/install_packages.php
+++ b/install_packages.php
@@ -118,7 +118,7 @@ if( !empty( $_REQUEST['cancel'] ) ) {
 		sort( $_REQUEST['packages'] );
 
 		// Need to unquote constraints. but this need replacing with a datadict function
-		require_once('../kernel/BitDbBase.php');
+		require_once( KERNEL_PKG_CLASS_PATH.'BitDbBase.php');
 		$gBitKernelDb = new BitDb();
 		$gBitKernelDb->mType = $gBitDbType;
 
diff --git a/migrate.php b/migrate.php
index 0af2e90..38371e9 100644
--- a/migrate.php
+++ b/migrate.php
@@ -12,7 +12,7 @@
 /**
  * required setup
  */
-require_once( 'install_inc.php' );
+require_once( 'includes/install_inc.php' );
 
 // this variable will be appended to the template file called - useful for displaying messages after data input
 $app = '';
diff --git a/migrate_database.php b/migrate_database.php
index df5767f..e2348aa 100644
--- a/migrate_database.php
+++ b/migrate_database.php
@@ -12,8 +12,8 @@
  * Initialization
  */
 $gBitSmarty->assign( 'next_step', $step );
-require_once( 'install_inc.php' );
-require_once( "get_databases_inc.php" );
+require_once( 'includes/install_inc.php' );
+require_once( 'includes/get_databases_inc.php' );
 
 // set the maximum execution time to very high
 ini_set( "max_execution_time", "86400" );
diff --git a/process_sql.php b/process_sql.php
deleted file mode 100644
index 23fbbdd..0000000
--- a/process_sql.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * @version $Header$
- * @package install
- * @subpackage functions
- */
-
-/**
- * Global flag to indicate we are installing
- * @ignore 
- */
-define( 'BIT_INSTALL', 'TRUE' );
-	global $failedcommands;
-// keep some crappy notices from spewing
-$_SERVER['HTTP_HOST'] = 'shell';
-$_SERVER['SERVER_SOFTWARE'] = 'command_line';
-
-/**
- * required setup
- */
-require_once( 'install_lib.php' );
-include("../kernel/setup_inc.php");
-
-if( count( $argv ) < 2) {
-	print "Please enter name of SQL file in db/ directory to process\n";
-} else {
-	// avoid errors in ADONewConnection() (wrong darabase driver etc...)
-	$gBitDb = &ADONewConnection($gBitDbType);
-	if( $gBitDb->Connect($gBitDbHost, $gBitDbUser, $gBitDbPassword, $gBitDbName) ) {
-		process_sql_file( $argv[1], $gBitDbType, BIT_DB_PREFIX );
-	}
-}
-
-?>
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index 71905fe..ebf76b7 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -54,7 +54,7 @@
 						{if !$item.installed and !$item.required}
 							<div class="bit-column-cell">
 							<div class="well">
-								<label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
+								<label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package class="img-responsive"}</label>
 								{forminput label="checkbox"}
 									<input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> <strong>{$package|capitalize}</strong></label>
 									{formhelp note=$item.info is_installer=1}
diff --git a/upgrade.php b/upgrade.php
index 5b3ff18..8c42fb6 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -15,7 +15,7 @@
 /**
  * required setup
  */
-require_once( 'install_inc.php' );
+require_once( 'includes/install_inc.php' );
 
 // this variable will be appended to the template file called - useful for displaying messages after data input
 $app = '';
@@ -72,4 +72,4 @@ $gBitSmarty->assign( 'section', 'Upgrade' );
 $gBitSmarty->assign( 'install_file', INSTALL_PKG_PATH."templates/upgrade_".$install_file[$step]['file'].$app.".tpl" );
 $gBitInstaller->in_display( $install_file[$step]['name'], INSTALL_PKG_PATH.'templates/install.tpl' );
 
-?>
\ No newline at end of file
+?>