merge recent changes into HEAD

6 files changed, 11 insertions, 10 deletions

diff --git a/install_checks.php b/install_checks.php
index 49f1aad..55413bf 100644
--- a/install_checks.php
+++ b/install_checks.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_install/install_checks.php,v 1.9 2005/12/26 12:24:22 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_install/install_checks.php,v 1.10 2006/01/14 19:54:34 squareing Exp $
  * @package install
  * @subpackage functions
  */
@@ -91,8 +91,8 @@ function check_settings() {
 				<dt>Windows</dt>
 				<dd>For information on how to install ImageMagick on Windows, please visit <a class="external" href="http://www.bitweaver.org/wiki/ImageMagick">Install ImageMagick</a>.</dd>
 			</dl>',
-		'magickwand' => 'MagickWand is an alternative php extension for ImageMagick. please see the ImageMagic documentation for installation.',
-		'eAccelerator' => '<a href="http://eaccelerator.net/HomeUk">eAccelerator</a> increases the efficiency of php by caching. Using this extension will greatly increase your servers performance and reduce the memory needed to run bitweaver.',
+		'magickwand' => 'MagickWand is an alternative php extension for ImageMagick. please see the ImageMagic documentation for installation instructions.',
+		'eAccelerator' => '<a href="http://eaccelerator.net/HomeUk">eAccelerator</a> increases the efficiency of php by caching and optimising queries. Using this extension will greatly increase your servers performance and reduce the memory needed to run bitweaver.',
 	);
 	foreach( $php_ext as $ext => $note ) {
 		$extensions[$i]['note'] = 'The extension <strong>'.$ext.'</strong> is ';
diff --git a/install_cleanup.php b/install_cleanup.php
index e2ed1d4..eb7923b 100644
--- a/install_cleanup.php
+++ b/install_cleanup.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_install/install_cleanup.php,v 1.2 2006/01/10 21:12:27 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_install/install_cleanup.php,v 1.3 2006/01/14 19:54:34 squareing Exp $
  * @package install
  * @subpackage functions
  */
@@ -27,7 +27,7 @@ while( !$result->EOF ) {
 $insPerms = $delPerms = array();
 foreach( array_keys( $gBitInstaller->mPermHash ) as $perm ) {
 	if( !in_array( $perm, array_keys( $bitPrefs ) ) ) {
-		if( $schema[$gBitInstaller->mPermHash[$perm][3]]['installed'] ) {
+		if( @$schema[$gBitInstaller->mPermHash[$perm][3]]['installed'] ) {
 			$insPerms[$perm] = $gBitInstaller->mPermHash[$perm];
 		}
 	}
@@ -58,6 +58,7 @@ if( !empty(  $_REQUEST['resolve_conflicts'] ) ) {
 		$gBitInstallDb->debug = 99;
 	}
 	$fix = array_merge( $delPerms, $insPerms );
+	$fixedPermissions = array();
 	if( !empty( $_REQUEST['perms'] ) ) {
 		foreach( $_REQUEST['perms'] as $perm ) {
 			$gBitInstaller->mDb->query( $fix[$perm]['sql'] );
diff --git a/templates/install.tpl b/templates/install.tpl
index aecfb61..0843c7a 100644
--- a/templates/install.tpl
+++ b/templates/install.tpl
@@ -76,7 +76,7 @@
 
 		<div class="body">
 			<div class="bittop">
-				<h1>bitweaver <strong>{$bitMajorVersion}.{$bitMinorVersion}.{$bitSubVersion} {$bitLevel}</strong></h1>
+				<h1>bitweaver <strong>{$smarty.const.BIT_MAJOR_VERSION}.{$smarty.const.BIT_MINOR_VERSION}.{$smarty.const.BIT_SUB_VERSION} {$smarty.const.BIT_LEVEL}</strong></h1>
 			</div>
 
 			{include file=$install_file}
diff --git a/templates/install_database_reset.tpl b/templates/install_database_reset.tpl
index 9067db6..9fdad48 100644
--- a/templates/install_database_reset.tpl
+++ b/templates/install_database_reset.tpl
@@ -12,13 +12,13 @@
 	</div>
 
 	<div class="row">
-		<p>Your database information is stored in the file '<strong>{$smarty.const.INSTALL_PKG_PATH}kernel/config_inc.php</strong>'. If you would like to reset these settings with new ones, you will first have to delete the settings stored therein before you can connect to a different database.</p>
+		<p>Your database information is stored in the file '<strong>{$smarty.const.BIT_ROOT_PATH}kernel/config_inc.php</strong>'. If you would like to reset these settings with new ones, you will first have to delete the settings stored therein before you can connect to a different database.</p>
 		<p class="warning">Before you hit the <strong>Reset config_inc.php file button</strong> please make sure you know what you are doing.</p>
 		<p>Hitting the <strong>Reset</strong> button will delete all contents in the config_inc.php file which will render your site useless until you've completed the installation process again. This is only really useful if your database access information has changed or if you plan to install bitweaver to a different database or use a different schema or prefix.</p>
 		<p>If you want to reinstall bitweaver into the same database as before, make sure you have deleted all bitweaver related tables before doing so. Reinstalling into an existing database might cause unwanted effects.</p>
 	</div>
 
 	<div class="row submit">
-		<input type="submit" name="reset_config_inc" value="Reset config_inc.php file" />
+		<input type="submit" name="reset_config_inc" value="Reset config_inc.php file" onclick="return confirm( 'Are you absolutely sure you want to reset your configuration file?' );" />
 	</div>
 {/form}
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 9013702..2b92ab3 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -1,4 +1,4 @@
-<h3>Upgrading {$upgradeFrom} to {$bitMajorVersion}{$bitMinorVersion} -{$bitBranch}-</h3>
+<h3>Upgrading {$upgradeFrom} to {$smarty.const.BIT_MAJOR_VERSION}.{$smarty.const.BIT_MINOR_VERSION}.{$smarty.const.BIT_SUB_VERSION} {$smarty.const.BIT_LEVEL}</h3>
 
 <p>The following packages will be updated</p>
 
diff --git a/templates/upgrade_ready.tpl b/templates/upgrade_ready.tpl
index 5ab1025..8d14def 100644
--- a/templates/upgrade_ready.tpl
+++ b/templates/upgrade_ready.tpl
@@ -1,5 +1,5 @@
 {form legend="Begin the upgrade process"}
-<h3>Upgrading {$upgradeFrom} to {$bitMajorVersion}{$bitMinorVersion} -{$bitBranch}-</h3>
+<h3>Upgrading {$upgradeFrom} to {$smarty.const.BIT_MAJOR_VERSION}.{$smarty.const.BIT_MINOR_VERSION}.{$smarty.const.BIT_SUB_VERSION} {$smarty.const.BIT_LEVEL}</h3>
 
 <p>The following packages will be updated: