install wizard: fix php executable path

- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect

diff --git a/mod/install.php b/mod/install.php
index 1bdb792a9cbff406d05154ad44bc42e3d73ea699..6d6232a9569a50c3d1ea01f59cb7cde55822885c 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -315,14 +315,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);

diff --git a/view/install_checks.tpl b/view/install_checks.tpl
index 8a76c454c27b25c194f6107779866cb113245da3..176611d4bef27471ecb7de3d02ba23cf7c084cec 100644 (file)
--- a/view/install_checks.tpl
+++ b/view/install_checks.tpl
@@ -1,6 +1,6 @@
 <h1>$title</h1>
 <h2>$pass</h2>
-<form  action="$baseurl/install" method="post">
+<form  action="$baseurl/index.php?q=install" method="post">
 <table>
 {{ for $checks as $check }}
        <tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if$check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
@@ -19,6 +19,6 @@
        <input type="submit" value="$next">
 {{ else }}
        <input type="hidden" name="pass" value="1">
-       <input type="button" value="$reload" onclick="document.location.reload()">
+       <input type="submit" value="$reload">
 {{ endif }}
 </form>