Feature #272 - Installation scripts: Testing new installation procedure, minor corrections.

main/inc/lib/internationalization.lib.php

@@ -776,7 +776,7 @@ function api_htmlentities($string, $quote_style = ENT_COMPAT, $encoding = null)
 		$encoding = _api_mb_internal_encoding();
 	}
 	if (!api_is_utf8($encoding) && _api_html_entity_supports($encoding)) {
-		return htmlentities($string, $quote_style, $encoding);
+		return htmlentities((string)$string, $quote_style, $encoding);
 	}
 	if (_api_mb_supports($encoding)) {
 		if (!api_is_utf8($encoding)) {

main/install/index.php

@@ -155,7 +155,7 @@ if ($_POST['step2_install'] || $_POST['step2_update_8'] || $_POST['step2_update_
 		$installType = 'update';
 		if ($_POST['step2_update_8']) {
 			$emptyUpdatePath = false;
-			if(empty($_POST['updatePath'])) {
+			if (empty($_POST['updatePath'])) {
 				$proposedUpdatePath = $_SERVER['DOCUMENT_ROOT'];
 			} else {
 				$proposedUpdatePath = $_POST['updatePath'];
@@ -164,7 +164,7 @@ if ($_POST['step2_install'] || $_POST['step2_update_8'] || $_POST['step2_update_
 				$proposedUpdatePath .= '/';
 			}
 			if (file_exists($proposedUpdatePath)) {
-				if (in_array($my_old_version,$update_from_version_8)) {
+				if (in_array($my_old_version, $update_from_version_8)) {
 					$_POST['step2'] = 1;
 				} else {
 					$badUpdatePath = true;
@@ -177,7 +177,7 @@ if ($_POST['step2_install'] || $_POST['step2_update_8'] || $_POST['step2_update_
 				$_POST['step1'] = 1;
 			} else {
 				$emptyUpdatePath = false;
-				if(substr($_POST['updatePath'], -1) != '/') {
+				if (substr($_POST['updatePath'], -1) != '/') {
 					$_POST['updatePath'] .= '/';
 				}
 
@@ -256,7 +256,7 @@ if (!isset($_GET['running'])) {
 
 } else {
 
-	foreach($_POST as $key => $val) {
+	foreach ($_POST as $key => $val) {
 		$magic_quotes_gpc = ini_get('magic_quotes_gpc') ? true : false;
 		if (is_string($val)) {
 			if ($magic_quotes_gpc) {

main/install/install_functions.inc.php

@@ -632,7 +632,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
 		//and now display the choice buttons (go back or install)
 		?>
 		<p align="center">
-		<button type="submit" name="step1" class="back" onclick="window.location='index.php';return false;" value="&lt; <?php echo get_lang('Previous'); ?>" ><?php echo get_lang('Previous'); ?></button>
+		<button type="submit" name="step1" class="back" onclick="javascript: window.location='index.php'; return false;" value="&lt; <?php echo get_lang('Previous'); ?>" ><?php echo get_lang('Previous'); ?></button>
 		<button type="submit" name="step2_install" class="add" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) echo 'disabled="disabled"'; ?> ><?php echo get_lang('NewInstallation'); ?></button>
 		<input type="hidden" name="is_executable" id="is_executable" value="-" />
 		<?php