From 70e3afc38e638ab57103aecd4a5d6cfacb7c4c6b Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Mon, 24 Oct 2016 20:26:39 +0200 Subject: [PATCH] license expiration --- lam/templates/config/mainlogin.php | 5 ++++- lam/templates/login.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index e7bbc50f..343bb1f4 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -131,9 +131,12 @@ echo $_SESSION['header']; if (!$cfgMain->isWritable()) { StatusMessage('WARN', 'The config file is not writable.', 'Your changes cannot be saved until you make the file writable for the webserver user.'); } - if (!empty($_GET['invalidLicense'])) { + if (!empty($_GET['invalidLicense']) && ($_GET['invalidLicense'] == '1')) { StatusMessage('WARN', _('Invalid licence'), _('Please setup your licence data.')); } + if (!empty($_GET['invalidLicense']) && ($_GET['invalidLicense'] == '2')) { + StatusMessage('WARN', _('Expired licence'), _('Please setup your licence data.')); + } ?>
diff --git a/lam/templates/login.php b/lam/templates/login.php index a77b718d..efd8d002 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -45,7 +45,7 @@ include_once("../lib/config.inc"); if (isLAMProVersion()) { include_once("../lib/env.inc"); $validator = new \LAM\ENV\LAMLicenseValidator(); - $validator->validateAndRedirect('config/mainlogin.php?invalidLicense=1'); + $validator->validateAndRedirect('config/mainlogin.php?invalidLicense=1', 'config/mainlogin.php?invalidLicense=2'); } /** Upgrade functions */