From 51130a02a6cf05e4dafadb48f425c20b91d1f8b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Granado?= <adrgranado@gmail.com>
Date: Thu, 22 Oct 2015 11:14:11 +0200
Subject: [PATCH] Coherence in recommended settings
---
layouts/vlayout/modules/Install/Step3.tpl | 23 +++++++++++++++++++++--
modules/Install/models/Utils.php | 2 +-
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/layouts/vlayout/modules/Install/Step3.tpl b/layouts/vlayout/modules/Install/Step3.tpl
index 34dec0622..2092522c5 100644
--- a/layouts/vlayout/modules/Install/Step3.tpl
+++ b/layouts/vlayout/modules/Install/Step3.tpl
@@ -42,8 +42,27 @@
<table class="config-table">
<tr><th>{vtranslate('LBL_PHP_CONFIGURATION', 'Install')}</th><th>{vtranslate('LBL_REQUIRED_VALUE', 'Install')}</th><th>{vtranslate('LBL_PRESENT_VALUE', 'Install')}</th></tr>
{foreach key=CONFIG_NAME item=INFO from=$SYSTEM_PREINSTALL_PARAMS}
- <tr><td>{vtranslate($CONFIG_NAME, 'Install')}</td><td>{if $INFO.1 eq 1} {vtranslate('LBL_TRUE', 'Install')} {else} {$INFO.1} {/if}</td>
- <td {if $INFO.2 eq false} class="no" > {vtranslate('LBL_NO', 'Install')} {else if ($INFO.2 eq true and $INFO.1 === true)} > {vtranslate('LBL_YES', 'Install')} {else} > {$INFO.0} {/if}</td></tr>
+ <tr><td>{vtranslate($CONFIG_NAME, 'Install')}</td>
+ <td>
+ {if $INFO.1 eq 1}
+ {vtranslate('LBL_YES', 'Install')}
+ {else}
+ {$INFO.1}
+ {/if}
+ </td>
+ <td
+ {if $INFO.2 eq false} class="no" >
+ {if $CONFIG_NAME = 'LBL_PHP_VERSION'}
+ {$INFO.0}
+ {else}
+ {vtranslate('LBL_NO', 'Install')}
+ {/if}
+ {else if ($INFO.2 eq true and $INFO.1 === true)} >
+ {vtranslate('LBL_YES', 'Install')}
+ {else} >
+ {$INFO.0}
+ {/if}
+ </td></tr>
{/foreach}
</table>
<br>
diff --git a/modules/Install/models/Utils.php b/modules/Install/models/Utils.php
index 37ba8a4ff..87a7d28c3 100644
--- a/modules/Install/models/Utils.php
+++ b/modules/Install/models/Utils.php
@@ -126,7 +126,7 @@ class Install_Utils_Model {
function getSystemPreInstallParameters() {
$preInstallConfig = array();
// Name => array( System Value, Recommended value, supported or not(true/false) );
- $preInstallConfig['LBL_PHP_VERSION'] = array(phpversion(), '5.5.0', (version_compare(phpversion(), '5.5.0', '<=')));
+ $preInstallConfig['LBL_PHP_VERSION'] = array(phpversion(), '5.4.0', (version_compare(phpversion(), '5.4.0', '>=')));
$preInstallConfig['LBL_IMAP_SUPPORT'] = array(function_exists('imap_open'), true, (function_exists('imap_open') == true));
$preInstallConfig['LBL_ZLIB_SUPPORT'] = array(function_exists('gzinflate'), true, (function_exists('gzinflate') == true));
if ($preInstallConfig['LBL_PHP_VERSION'] >= '5.5.0') {
--
GitLab