strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #313 from fabrixxm/master

Browse source 
install wizard: fix php executable path
This commit is contained in:
Simon 2012-05-24 16:30:22 -07:00
commit 5bc0cfa067
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/install.php
View file

@ -315,14 +315,16 @@ function check_php(&$phpath, &$checks) {
$help = ""; $help = "";
if(!$passed) { if(!$passed) {
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL; $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'); $tpl = get_markup_template('field_input.tpl');
$help .= replace_macros($tpl, array( $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=""; $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) { if($passed) {
$str = autoname(8); $str = autoname(8);

2
view/head.tpl
View file

@ -29,7 +29,7 @@
<script> <script>
var updateInterval = $update_interval; var updateInterval = $update_interval;
var localUser = $local_user; var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
function confirmDelete() { return confirm("$delitem"); } function confirmDelete() { return confirm("$delitem"); }
function commentOpen(obj,id) { function commentOpen(obj,id) {

4
view/install_checks.tpl
View file

@ -1,6 +1,6 @@
<h1>$title</h1> <h1>$title</h1>
<h2>$pass</h2> <h2>$pass</h2>
<form action="$baseurl/install" method="post"> <form action="$baseurl/index.php?q=install" method="post">
<table> <table>
{{ for $checks as $check }} {{ 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> <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"> <input type="submit" value="$next">
{{ else }} {{ else }}
<input type="hidden" name="pass" value="1"> <input type="hidden" name="pass" value="1">
<input type="button" value="$reload" onclick="document.location.reload()"> <input type="submit" value="$reload">
{{ endif }} {{ endif }}
</form> </form>