diff options
| author | Simon <simon@kisikew.org> | 2012-05-24 16:30:22 -0700 |
|---|---|---|
| committer | Simon <simon@kisikew.org> | 2012-05-24 16:30:22 -0700 |
| commit | 5bc0cfa06724204f8de26508859b1b76636f77bd (patch) | |
| tree | ccc8ea49461ffdba3870857ea13925370cdbe320 | |
| parent | e54b649c987d156225cb90dd79025fc44c2a646f (diff) | |
| parent | 60df67b9e3717516191f39870a6e7b6db977fc06 (diff) | |
| download | volse-hubzilla-5bc0cfa06724204f8de26508859b1b76636f77bd.tar.gz volse-hubzilla-5bc0cfa06724204f8de26508859b1b76636f77bd.tar.bz2 volse-hubzilla-5bc0cfa06724204f8de26508859b1b76636f77bd.zip | |
Merge pull request #313 from fabrixxm/master
install wizard: fix php executable path
| -rw-r--r-- | mod/install.php | 6 | ||||
| -rw-r--r-- | view/head.tpl | 2 | ||||
| -rw-r--r-- | view/install_checks.tpl | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mod/install.php b/mod/install.php index 1bdb792a9..6d6232a95 100644 --- 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/head.tpl b/view/head.tpl index 0fffc1344..8a75a4b8e 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -29,7 +29,7 @@ <script> var updateInterval = $update_interval; - var localUser = $local_user; + var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }}; function confirmDelete() { return confirm("$delitem"); } function commentOpen(obj,id) { diff --git a/view/install_checks.tpl b/view/install_checks.tpl index 8a76c454c..176611d4b 100644 --- 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> |