X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=65fa603ee10812b042bce81747c3cb0838359792;hb=32d4a359f1bc713b37f47d1d2a5e1f47d8ca6501;hp=1bdb792a9cbff406d05154ad44bc42e3d73ea699;hpb=8bc8be1f8741fde802643744748db69a5a52237c;p=friendica.git

diff --git a/mod/install.php b/mod/install.php
old mode 100644
new mode 100755
index 1bdb792a9c..65fa603ee1
--- a/mod/install.php
+++ b/mod/install.php
@@ -60,7 +60,7 @@ function install_post(&$a) {
 
 			return; 
 			break;
-		case 4;
+		case 4:
 			$urlpath = $a->get_path();
 			$dbhost = notags(trim($_POST['dbhost']));
 			$dbuser = notags(trim($_POST['dbuser']));
@@ -155,11 +155,11 @@ function install_content(&$a) {
 	}
 
 	if(x($a->data,'txt') && strlen($a->data['txt'])) {
-		$tpl = get_markup_template('install.tpl');
 		$db_return_text .= manual_config($a);
 	}
 	
 	if ($db_return_text!="") {
+		$tpl = get_markup_template('install.tpl');
 		return replace_macros($tpl, array(
 			'$title' => $install_title,
 			'$pass' => "",
@@ -184,15 +184,16 @@ function install_content(&$a) {
 
 			check_php($phpath, $checks);
 
-			check_htaccess($checks);
-			
+            check_htaccess($checks);
+            
 			function check_passed($v, $c){
 				if ($c['required'])
 					$v = $v && $c['status'];
 				return $v;
 			}
 			$checkspassed = array_reduce($checks, "check_passed", true);
-			
+	        
+
 
 			$tpl = get_markup_template('install_checks.tpl');
 			$o .= replace_macros($tpl, array(
@@ -315,14 +316,16 @@ function check_php(&$phpath, &$checks) {
 	$help = "";
 	if(!$passed) {
 		$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
+		$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>") . EOL ;
+		$help .= EOL . EOL ;
 		$tpl = get_markup_template('field_input.tpl');
 		$help .= replace_macros($tpl, array(
-			'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
+			'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')),
 		));
 		$phpath="";
 	}
 	
-	check_add($checks, t('Command line PHP'), $passed, true, $help);
+	check_add($checks, t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
 	
 	if($passed) {
 		$str = autoname(8);
@@ -379,6 +382,7 @@ function check_funcs(&$checks) {
 			check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
 		}
 	}
+
 	if(! function_exists('curl_init')){
 		$ck_funcs[0]['status']= false;
 		$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
@@ -419,21 +423,26 @@ function check_htconfig(&$checks) {
 		$help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL;
 		$help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; 
 	}
-
+    
 	check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
-	
+
 }
 
 function check_htaccess(&$checks) {
 	$a = get_app();
 	$status = true;
 	$help = "";
-	$test = fetch_url($a->get_baseurl()."/install/testrewrite");
-	if ($test!="ok") {
-		$status = false;
-		$help = t('Url rewrite in .htconfig is not working. Check your server configuration.');
-	}
-	check_add($checks, t('Url rewrite is working'), $status, true, $help);
+	if (function_exists('curl_init')){
+        $test = fetch_url($a->get_baseurl()."/install/testrewrite");
+        if ($test!="ok") {
+            $status = false;
+            $help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
+        }
+        check_add($checks, t('Url rewrite is working'), $status, true, $help); 
+    } else {
+        // cannot check modrewrite if libcurl is not installed
+    }
+	
 }
 
 	
@@ -457,7 +466,6 @@ function load_database_rem($v, $i){
 function load_database($db) {
 
 	$str = file_get_contents('database.sql');
-//	$str = array_reduce(explode("\n", $str),"load_database_rem","");
 	$arr = explode(';',$str);
 	$errors = false;
 	foreach($arr as $a) {
@@ -479,7 +487,7 @@ function what_next() {
 		."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
 		.t('Please see the file "INSTALL.txt".')			
 		."</p><p>"
-		.t("Go to your new Firendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
+		.t("Go to your new Friendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
 		."</p>";
 }