tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#13312 new free/trial license 6

This commit is contained in:
Daniel Maya 2024-05-14 10:33:13 +02:00
parent c633ca28b4
commit e696567ada
4 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/um_client/index.php
View File

@ -91,7 +91,7 @@ if ($license_data !== ENTERPRISE_NOT_HOOK && $license !== 'PANDORA-ENTERPRISE-FR
$limit = db_get_value('count(*)', 'tagente_modulo', 'disabled', 0);
}
if ($limit > $license_data['limit']) {
if (($limit * 1.1) > $license_data['limit']) {
ui_print_warning_message(
__(
'You cannot use update manager %s. You are exceding monitoring limits by %s elements. Please update your license or disable enterprise section by moving enterprise directory to another location and try again.',

11
pandora_console/update_manager_client/lib/UpdateManager/Client.php
View File

@ -654,6 +654,17 @@ class Client
}
/**
* Return license.
*
* @return string|null
*/
public function getLicense()
{
return $this->license;
}
/**
* Executes a curl request.
*

32
pandora_console/update_manager_client/lib/UpdateManager/UI/Manager.php
View File

@ -292,21 +292,23 @@ class Manager
*/
public function register()
{
View::render(
'register',
[
'version' => $this->umc->getVersion(),
'mr' => $this->umc->getMR(),
'error' => $this->umc->getLastError(),
'asset' => function ($rp) {
echo $this->getUrl($rp);
},
'authCode' => $this->authCode,
'ajax' => $this->ajaxUrl,
'ajaxPage' => $this->ajaxPage,
'mode' => self::MODE_REGISTER,
]
);
if ($this->umc->getLicense() !== 'PANDORA-ENTERPRISE-FREE') {
View::render(
'register',
[
'version' => $this->umc->getVersion(),
'mr' => $this->umc->getMR(),
'error' => $this->umc->getLastError(),
'asset' => function ($rp) {
echo $this->getUrl($rp);
},
'authCode' => $this->authCode,
'ajax' => $this->ajaxUrl,
'ajaxPage' => $this->ajaxPage,
'mode' => self::MODE_REGISTER,
]
);
}
}

4
pandora_console/update_manager_client/resources/styles/um.css
View File

@ -451,6 +451,10 @@ span.warning {
align-items: center;
justify-content: space-between;
}
.ui-dialog-content.ui-widget-content#register_dialog_message {
display: inherit;
}
/*.ui-dialog-content.ui-widget-content p {
font-size: 10pt;
word-break: keep-all;