mirror of
https://github.com/friendica/friendica
synced 2024-12-23 09:20:17 +00:00
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
This commit is contained in:
parent
325343a492
commit
a5b8339a75
2 changed files with 6 additions and 4 deletions
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue