Merge branch 'ent-12721-nuevo-modo-de-licencia-trial' into 'develop'

Ent 12721 nuevo modo de licencia trial

See merge request artica/pandorafms!6846
This commit is contained in:
Daniel Rodriguez 2024-04-08 08:12:41 +00:00
commit 9b4d33ce77
4 changed files with 112 additions and 1 deletions

View File

@ -68,7 +68,7 @@ if ($renew_license_result !== null) {
}
if ($update_settings) {
if (!is_metaconsole()) {
if (is_metaconsole() === false) {
// Node.
foreach ($_POST['keys'] as $key => $value) {
db_process_sql_update(

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -221,6 +221,31 @@ $(document).ready(function() {
}
}
if ($("#license_dialog_message").length) {
let height = 570;
$("#license_dialog_message").dialog({
dialogClass: "no-close",
closeOnEscape: false,
resizable: false,
draggable: true,
modal: true,
height: "auto",
width: 800,
overlay: {
opacity: 0.5,
background: "black"
},
open: function() {
$("#ok_buttom").show();
}
});
$("#ok_buttom").click(function() {
$("#license_dialog_message").dialog("close");
});
}
if ($("#msg_change_password").length) {
$("#msg_change_password").dialog({
resizable: false,

View File

@ -662,6 +662,7 @@ if (isset($config['id_user']) === false) {
db_logon($nick_in_db, $_SERVER['REMOTE_ADDR']);
$_SESSION['id_usuario'] = $nick_in_db;
$config['id_user'] = $nick_in_db;
$_SESSION['logged'] = true;
config_prepare_expire_time_session(true);
// Check if connection goes through F5 balancer. If it does, then