mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-01 11:50:28 +02:00
Code Issues Releases Wiki Activity

V2.2.2 Finish license update

Browse Source
This commit is contained in:
trendschau
2024-03-04 19:30:18 +01:00
parent eb9efcb6bb
commit c0f7c4581c
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/typemill/Controllers/ControllerWebSystem.php
View File

@@ -198,7 +198,7 @@ class ControllerWebSystem extends Controller
}
# check license data
$licensecheck = $license->checkLicense($licensedata, $this->c->get('urlinfo'));
$licensecheck = $license->checkLicense($licensedata, $this->c->get('urlinfo'), $forceUpdateCheck = true);
if(!$licensecheck)
{
$message = $license->getMessage();

15
system/typemill/Models/License.php
View File

@@ -69,7 +69,7 @@ class License
}
# check the local licence file (like pem or pub)
public function checkLicense($licensedata, array $urlinfo)
public function checkLicense($licensedata, array $urlinfo, $forceUpdateCheck = NULL)
{
if(!isset(
$licensedata['license'],
@@ -111,7 +111,7 @@ class License
if(!$subscriptionPaid)
{
$storage = new StorageWrapper('\Typemill\Models\Storage');
if(!$storage->timeoutIsOver('licenseupdate', 3600))
if(!$forceUpdateCheck && !$storage->timeoutIsOver('licenseupdate', 3600))
{
$this->message = Translations::translate('The subscription period has not been paid yet. We will check it every 60 minutes.') . $this->message;
@@ -121,7 +121,7 @@ class License
$update = $this->updateLicense($licensedata);
if(!$update)
{
$this->message = Translations::translate('We tried to check your subscription payment but it failed. Answer from server: ') . $this->message;
$this->message = Translations::translate('The subscription period has not been paid yet and we got an error. ') . $this->message;
return false;
}
@@ -256,7 +256,7 @@ class License
{
$message = $signedLicense['code'];
}
$this->message = Translations::translate('the license server responded with: ') . $message;
$this->message = Translations::translate('Answer from license server: ') . $message;
return false;
}
@@ -290,7 +290,9 @@ class License
'license' => $data['license'],
'email' => $this->hashMail($readableMail),
'domain' => $data['domain'],
'signature' => $data['signature']
'signature' => $data['signature'],
'plan' => $data['plan'],
'payed_until' => $data['payed_until']
];
$postdata = http_build_query($licensedata);
@@ -325,7 +327,8 @@ class License
$message = $signedLicense['code'];
}
$this->message = Translations::translate('the license server responded with: ') . $message;
# problem: if admin is on license website, then the first check has already been done on start in system and it has set timer, so the admin will never see this message from server.
$this->message = Translations::translate('Answer from license server: ') . $message;
return false;
}