Merge branch 'master' of https://github.com/friendica/red

3 files changed, 21 insertions, 10 deletions

diff --git a/boot.php b/boot.php
index 9048223bf..8460d76c6 100755
--- a/boot.php
+++ b/boot.php
@@ -1571,13 +1571,17 @@ function proc_run($cmd){
 		$args[$x] = escapeshellarg($args[$x]);
 
 	$cmdline = implode($args," ");
-	if(get_config('system','proc_windows'))
+	if(is_windows())
 		proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
 	else
 		proc_close(proc_open($cmdline." &",array(),$foo));
 }
 
 
+function is_windows() {
+	return ((strtoupper(substr(PHP_OS,0,3)) === 'WIN') ? true : false);
+}
+
 
 function current_theme(){
 	$app_base_themes = array('redbasic');
diff --git a/index.php b/index.php
index c2421bc0e..0012798a6 100755
--- a/index.php
+++ b/index.php
@@ -242,18 +242,22 @@ if (file_exists($theme_info_file)){
 if(! x($a->page,'content'))
 	$a->page['content'] = '';
 
-/* set JS cookie */
-if($_COOKIE['jsAvailable'] != 1) {
-	$a->page['content'] .= '<script>document.cookie="jsAvailable=1; path=/"; var jsMatch = /\&JS=1/; if (!jsMatch.exec(location.href)) { location.href = location.href + "&JS=1"; }</script>';
-	/* emulate JS cookie if cookies are not accepted */
-	if ($_GET['JS'] == 1) {
-		$_COOKIE['jsAvailable'] = 1;
+
+
+if(! ($a->module === 'setup')) {
+	/* set JS cookie */
+	if($_COOKIE['jsAvailable'] != 1) {
+		$a->page['content'] .= '<script>document.cookie="jsAvailable=1; path=/"; var jsMatch = /\&JS=1/; if (!jsMatch.exec(location.href)) { location.href = location.href + "&JS=1"; }</script>';
+		/* emulate JS cookie if cookies are not accepted */
+		if ($_GET['JS'] == 1) {
+			$_COOKIE['jsAvailable'] = 1;
+		}
 	}
+	call_hooks('page_content_top',$a->page['content']);
 }
 
 
-if(! $install)
-	call_hooks('page_content_top',$a->page['content']);
+
 
 /**
  * Call module functions
diff --git a/mod/setup.php b/mod/setup.php
index ca5566578..14572699e 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -373,7 +373,10 @@ function check_php(&$phpath, &$checks) {
 	if (strlen($phpath)){
 		$passed = file_exists($phpath);
 	} else {
-		$phpath = trim(shell_exec('which php'));
+		if(is_windows())
+			$phpath = trim(shell_exec('where php'));
+		else
+			$phpath = trim(shell_exec('which php'));
 		$passed = strlen($phpath);
 	}
 	$help = "";