From 5acf54d93abbd2b34b4cba31ed65a5ddc1f40171 Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Wed, 3 Oct 2018 18:53:16 +0200 Subject: [PATCH] Added check for minimal PHP version when syncing with Github --- e107_admin/db.php | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/e107_admin/db.php b/e107_admin/db.php index 497cca808..9fc135da2 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -321,40 +321,43 @@ class system_tools } - - - - // Developer Mode ONly.. No LANS. + // Developer Mode ONly.. No LANS required. private function githubSync() { $frm = e107::getForm(); $mes = e107::getMessage(); - // $message = DBLAN_70; - // $message .= "
".LAN_CREATE.""; - - $message = $frm->open('githubSync'); - $message .= "

".DBLAN_116." ".e_SYSTEM."temp ".DBLAN_117."

"; - $message .= $frm->button('githubSyncProcess',1,'delete', DBLAN_113); - $message .= $frm->close(); + // $message = DBLAN_70; + // $message .= "
".LAN_CREATE.""; - $mes->addInfo($message); - - // $text = "
"; + // Check for minimum required PHP version, and display warning instead of sync button to avoid broken functionality after syncing + // MIN_PHP_VERSION constant only defined in install.php, thus hardcoded here + $php_version = phpversion(); + $min_php_version = '5.6'; + if(version_compare($php_version, $min_php_version, "<")) + { + $mes->addWarning("The minimum required PHP version is ".$min_php_version.". You are using PHP version ".$php_version.".
Syncing with Github has been disabled to avoid broken fuctionality."); // No nee to translate, developer mode only + } + else + { + $message = $frm->open('githubSync'); + $message .= "

".DBLAN_116." ".e_SYSTEM."temp ".DBLAN_117."

"; + $message .= $frm->button('githubSyncProcess',1,'delete', DBLAN_113); + $message .= $frm->close(); + + $mes->addInfo($message); + } + + // $text = "
"; e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_112, $mes->render()); - - - } - - // Developer Mode ONly.. No LANS. private function githubSyncProcess() {