From a5b8339a75858d17d9b50f3694fe89daae1414fe Mon Sep 17 00:00:00 2001 From: root Date: Thu, 24 May 2012 04:21:33 -0400 Subject: [PATCH 1/2] 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 --- mod/install.php | 6 ++++-- view/install_checks.tpl | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mod/install.php b/mod/install.php index 1bdb792a9c..6d6232a956 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 'Activating scheduled tasks'") . 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?" ($phpath)":""), $passed, false, $help); if($passed) { $str = autoname(8); diff --git a/view/install_checks.tpl b/view/install_checks.tpl index 8a76c454c2..176611d4be 100644 --- a/view/install_checks.tpl +++ b/view/install_checks.tpl @@ -1,6 +1,6 @@

$title

$pass

-
+ {{ for $checks as $check }} @@ -19,6 +19,6 @@ {{ else }} - + {{ endif }} From 60df67b9e3717516191f39870a6e7b6db977fc06 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 24 May 2012 04:29:33 -0400 Subject: [PATCH 2/2] fix small js error when user not logged in --- view/head.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/head.tpl b/view/head.tpl index 0fffc13443..8a75a4b8e0 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -29,7 +29,7 @@
$check.title {{if $check.required}}(required){{endif}}