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

Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug

This commit is contained in:
Luis Calvo 2019-05-08 12:37:10 +02:00
parent 954aac3aeb a9bf83cc5b
commit 5b75b671aa
38 changed files with 475 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/docker/build_and_push.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
docker build --rm=true --build-arg BRANCH="develop" --build-arg DB_PASS="pandora" -t pandorafms/pandorafms:7 . && \ docker build --rm=true --pull --no-cache --build-arg BRANCH="develop" --build-arg DB_PASS="pandora" -t pandorafms/pandorafms:7 . && \
docker push pandorafms/pandorafms:7 docker push pandorafms/pandorafms:7

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.734-190507 Version: 7.0NG.734-190508
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.734-190507" pandora_version="7.0NG.734-190508"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -42,7 +42,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.734'; use constant AGENT_VERSION => '7.0NG.734';
use constant AGENT_BUILD => '190507'; use constant AGENT_BUILD => '190508';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.734 %define version 7.0NG.734
%define release 190507 %define release 190508
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.734 %define version 7.0NG.734
%define release 190507 %define release 190508
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.734" PI_VERSION="7.0NG.734"
PI_BUILD="190507" PI_BUILD="190508"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{190507} {190508}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.734(Build 190507)") #define PANDORA_VERSION ("7.0NG.734(Build 190508)")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.734(Build 190507))" VALUE "ProductVersion", "(7.0NG.734(Build 190508))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.734-190507 Version: 7.0NG.734-190508
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.734-190507" pandora_version="7.0NG.734-190508"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

160
pandora_console/godmode/update_manager/update_manager.css
View File

@ -140,6 +140,162 @@
} }
#box_online { #box_online {
background-color: #e6e6e6; background-image: url("../../images/update_manager_background.jpg");
padding: 10px; background-size: cover;
background-position: center center;
background-repeat: no-repeat;
background-color: #fff;
padding: 40px 50px;
border: 1px solid #f3f3f3;
border-radius: 5px;
min-height: 600px;
}
div#box_online * {
font-size: 16pt;
font-family: "Open Sans", sans-serif;
}
#box_online .content {
max-width: 60%;
}
.update_popup {
display: flex;
justify-content: space-between;
align-items: center;
padding-left: 10px;
padding-right: 10px;
}
.update_icon {
padding-left: 20px;
}
.update_text h3 {
font-weight: bold;
font-size: 12pt;
}
.update_text p {
font-size: 11pt;
}
.update_text a {
font-size: 11pt;
color: #82b92e !important;
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: left !important;
padding-left: 19px;
padding-bottom: 5px;
}
.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget {
background-color: #cecece !important;
border: none !important;
border-radius: 2px !important;
text-transform: uppercase !important;
font-weight: bold !important;
}
.ui-dialog-buttonset > button.success_button.ui-button.ui-corner-all.ui-widget,
.update_manager_button {
background-color: #82b92e !important;
color: #fff !important;
border-radius: 2px !important;
text-transform: uppercase !important;
font-weight: bold !important;
}
a.update_manager_button {
padding: 10px 12px;
margin-top: 10px;
display: inline-flex;
align-items: center;
font-size: 16px !important;
border-radius: 4px !important;
text-decoration: none;
font-family: "Open Sans", sans-serif;
}
a.update_manager_button:after {
content: url(../../images/update_manager_button.png);
padding-left: 10px;
}
.progressbar {
margin-top: 15px;
}
.ui-draggable,
.ui-draggable .ui-dialog-titlebar {
cursor: default !important;
}
#box_online #pkg_version {
color: #82b92e;
font-size: 75pt;
font-weight: bold;
}
/* METACONSOLE */
.box_online_meta {
background: none !important;
min-height: 400px !important;
text-align: center;
border: none !important;
}
div#box_online.box_online_meta * {
font-size: 14pt;
}
#box_online.box_online_meta .content {
max-width: 100%;
}
#box_online.box_online_meta #pkg_version {
font-size: 60pt;
}
/* COMMUNITY */
.update_manager_open {
max-width: 50%;
font-size: 10pt;
margin-top: 40px;
padding: 20px;
border: 1px solid #eaeaea;
border-radius: 5px;
}
.update_manager_warning {
display: flex;
align-items: center;
margin-bottom: 10px;
}
.update_manager_warning p {
font-size: 10pt !important;
}
.update_manager_warning img {
padding-right: 20px;
width: 90px;
}
a.update_manager_button_open {
padding: 5px 10px;
font-size: 16px !important;
border-radius: 4px !important;
text-decoration: none;
border: 1px solid #82b92e;
color: #82b92e;
border-radius: 2px;
}
a.update_manager_button_open:hover {
color: #fff;
background-color: #82b92e;
} }

70
pandora_console/godmode/update_manager/update_manager.online.php
View File

@ -1,16 +1,22 @@
<?php <?php
// Pandora FMS - http://pandorafms.com /**
// ================================================== Pandora FMS - http://pandorafms.com
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas * ==================================================
// Please see http://pandorafms.org for full contribution list * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
// This program is free software; you can redistribute it and/or * Please see http://pandorafms.org for full contribution list
// modify it under the terms of the GNU General Public License * This program is free software; you can redistribute it and/or
// as published by the Free Software Foundation; version 2 * modify it under the terms of the GNU General Public License
// This program is distributed in the hope that it will be useful, * as published by the Free Software Foundation; version 2
// but WITHOUT ANY WARRANTY; without even the implied warranty of * This program is distributed in the hope that it will be useful,
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * but WITHOUT ANY WARRANTY; without even the implied warranty of
// GNU General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* @package category
* @subpackage category
*/
global $config; global $config;
check_login(); check_login();
@ -61,7 +67,7 @@ if ($memory_limit < 100) {
); );
} }
// Translators: Do not translade Update Manager, it's the name of the program // Translators: Do not translade Update Manager, it's the name of the program.
if (is_metaconsole()) { if (is_metaconsole()) {
echo "<style type='text/css' media='screen'> echo "<style type='text/css' media='screen'>
@import 'styles/meta_pandora.css'; @import 'styles/meta_pandora.css';
@ -69,23 +75,29 @@ if (is_metaconsole()) {
} }
if (is_metaconsole()) { if (is_metaconsole()) {
echo "<div id='box_online' style='float:right;padding-right:400px;padding-top:40px;padding-bottom:40px;' class='cargatextodialogo'>"; $baseurl = ui_get_full_url(false, false, false, false);
echo ' <link rel="stylesheet" type="text/css" href="'.$baseurl.'/godmode/update_manager/update_manager.css">';
echo "<div id='box_online' class='box_online_meta'>";
} else { } else {
echo "<div id='box_online' style='padding-top:40px;padding-bottom:40px;' class='cargatextodialogo'>"; echo "<div id='box_online'>";
} }
echo "<span class='loading' style='font-size:18pt;'>"; echo "<span class='loading' style='font-size:18pt;'>";
echo "<img src='images/wait.gif' />"; echo "<img src='images/wait.gif' />";
echo '</span><br><br>'; echo '</span>';
echo '<div><b>'.__('The latest version of package installed is:').'</b></div><br>'; echo '<p style="font-weight: 600;">'.__('The latest version of package installed is:').'</p>';
echo "<div id='pkg_version' style='color:#82b92e;font-size:40pt;font-weight:bold;'>".$current_package.'</div>'; if ($open) {
echo '<div id="pkg_version" style="font-size:40pt;">'.$build_version.'</div>';
} else {
echo '<div id="pkg_version">'.$current_package.'</div>';
}
echo "<div class='checking_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>"; echo "<div class='checking_package' style='font-size:18pt;width:100%; display: none;'>";
echo __('Checking for the newest package.'); echo __('Checking for the newest package.');
echo '</div>'; echo '</div>';
echo "<div class='downloading_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>"; echo "<div class='downloading_package' style='font-size:18pt;width:100%; display: none;'>";
echo __('Downloading for the newest package.'); echo __('Downloading for the newest package.');
echo '</div>'; echo '</div>';
@ -119,22 +131,26 @@ echo "<div id='pkg_version' style='color:#82b92e;font-size:40pt;font-weight:bold
let you know this does not reflect any change in our opensource mentality of let you know this does not reflect any change in our opensource mentality of
does the last 14 years. does the last 14 years.
------------------------------------------------------------------------- */ -------------------------------------------------------------------------
*/
if ($open) { if ($open) {
echo " echo "<div class='update_manager_open'>
<br><br> <div class='update_manager_warning'>
<div id='updatemodal' class='publienterprisehide' title='Community version' style=''> <div><img src='images/icono_info.png'></div>
<img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/icono_exclamacion_2.png'> <div><p>".__('WARNING: You are just one click away from an automated update. This may result in a damaged system, including loss of data and operativity. Check you have a recent backup. OpenSource updates are automatically created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version.')."</p></div>
</div> </div>
<br>"; <div style='text-align:center; margin-top:10px;'>
<a class='update_manager_button_open' href='https://pandorafms.com/pandora-fms-enterprise/' target='_blank'>About Enterprise</a>
</div>
</div>";
} }
$enterprise = enterprise_hook('update_manager_enterprise_main'); $enterprise = enterprise_hook('update_manager_enterprise_main');
if ($enterprise == ENTERPRISE_NOT_HOOK) { if ($enterprise == ENTERPRISE_NOT_HOOK) {
// Open view // Open view.
update_manager_main(); update_manager_main();
} }
?> ?>

BIN
pandora_console/images/icon_error_db.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
pandora_console/images/icon_error_mr.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
pandora_console/images/icon_info_mr.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
pandora_console/images/icon_success_db.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
pandora_console/images/icon_success_mr.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
pandora_console/images/icon_warning_db.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
pandora_console/images/update_manager_background.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 KiB

BIN
pandora_console/images/update_manager_button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC190507'; $build_version = 'PC190508';
$pandora_version = 'v7.0NG.734'; $pandora_version = 'v7.0NG.734';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

2
pandora_console/include/functions_update_manager.php
View File

@ -397,7 +397,7 @@ function update_manager_check_online_free_packages($is_ajax=true)
<?php <?php
$baseurl = ui_get_full_url(false, false, false, false); $baseurl = ui_get_full_url(false, false, false, false);
echo '<p><b>There is a new version:</b> '.$result[0]['version'].'</p>'; echo '<p><b>There is a new version:</b> '.$result[0]['version'].'</p>';
echo "<a href='javascript: update_last_package(\"".base64_encode($result[0]['file_name']).'", "'.$result[0]['version'].'", "'.$baseurl."\");'>".__('Update to the last version').'</a>'; echo "<a class='update_manager_button' href='javascript: update_last_package(\"".base64_encode($result[0]['file_name']).'", "'.$result[0]['version'].'", "'.$baseurl."\");'>".__('Update').'</a>';
} else { } else {
echo __('There is no update available.'); echo __('There is no update available.');
} }

518
pandora_console/include/javascript/update_manager.js
View File

@ -326,20 +326,20 @@ function install_package(package, homeurl) {
}); });
var dialog_accept_package_mr_fail_text = var dialog_accept_package_mr_fail_text =
"<div>"; "<div class='update_popup'>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text + dialog_accept_package_mr_fail_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>INFO</h3>";
home_url +
"images/icono_info_mr.png'></div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text + dialog_accept_package_mr_fail_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>"; "<p>" +
dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
mr_not_accepted_code_yes + mr_not_accepted_code_yes +
"</p></div>"; "</p></div>";
dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_info_mr.png'></div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text + dialog_accept_package_mr_fail_text +
"</div>"; "</div>";
@ -397,20 +397,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_success_pkg_text = "<div>"; var dialog_success_pkg_text =
"<div class='update_popup'>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + dialog_success_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>SUCCESS</h3>";
home_url +
"images/icono_exito_mr.png'></div>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + dialog_success_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>"; "<p>" +
dialog_success_pkg_text =
dialog_success_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_success + package_success +
"</p></div>"; "</p></div>";
dialog_success_pkg_text =
dialog_success_pkg_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_success_mr.png'></div>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + "</div>"; dialog_success_pkg_text + "</div>";
@ -456,20 +457,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_error_pkg_text = "<div>"; var dialog_error_pkg_text =
"<div class='update_popup'>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>ERROR</h3>";
home_url +
"images/icono_error_mr.png'></div>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>"; "<p>" +
dialog_error_pkg_text =
dialog_error_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_error + package_error +
"</p></div>"; "</p></div>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_error_mr.png'></div>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + "</div>"; dialog_error_pkg_text + "</div>";
@ -533,20 +535,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_cancel_pkg_text = "<div>"; var dialog_cancel_pkg_text =
"<div class='update_popup'>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text =
dialog_cancel_pkg_text + dialog_cancel_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>INFO</h3>";
home_url +
"images/icono_info_mr.png'></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text =
dialog_cancel_pkg_text + dialog_cancel_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>"; "<p>" +
dialog_cancel_pkg_text =
dialog_cancel_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_cancel + package_cancel +
"</p></div>"; "</p></div>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_info_mr.png'></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text =
dialog_cancel_pkg_text + "</div>"; dialog_cancel_pkg_text + "</div>";
@ -571,20 +574,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_bad_message_text = "<div>"; var dialog_bad_message_text =
"<div class='update_popup'>";
dialog_bad_message_text = dialog_bad_message_text =
dialog_bad_message_text + dialog_bad_message_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>ERROR</h3>";
home_url +
"images/icono_error_mr.png'></div>";
dialog_bad_message_text = dialog_bad_message_text =
dialog_bad_message_text + dialog_bad_message_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>"; "<p>" +
dialog_bad_message_text =
dialog_bad_message_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
bad_mr_file + bad_mr_file +
"</p></div>"; "</p></div>";
dialog_bad_message_text =
dialog_bad_message_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_error_mr.png'></div>";
dialog_bad_message_text = dialog_bad_message_text =
dialog_bad_message_text + "</div>"; dialog_bad_message_text + "</div>";
@ -616,20 +620,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_success_mr_text = "<div>"; var dialog_success_mr_text =
"<div class='update_popup'>";
dialog_success_mr_text = dialog_success_mr_text =
dialog_success_mr_text + dialog_success_mr_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>SUCCESS</h3>";
home_url +
"images/icono_exito_mr.png'></div>";
dialog_success_mr_text = dialog_success_mr_text =
dialog_success_mr_text + dialog_success_mr_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>"; "<p>" +
dialog_success_mr_text =
dialog_success_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
mr_success + mr_success +
"</p></div>"; "</p></div>";
dialog_success_mr_text =
dialog_success_mr_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_success_mr.png'></div>";
dialog_success_mr_text = dialog_success_mr_text =
dialog_success_mr_text + "</div>"; dialog_success_mr_text + "</div>";
@ -684,20 +689,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_success_pkg_text = "<div>"; var dialog_success_pkg_text =
"<div class='update_popup'>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + dialog_success_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>SUCCESS</h3>";
home_url +
"images/icono_exito_mr.png'></div>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + dialog_success_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>"; "<p>" +
dialog_success_pkg_text =
dialog_success_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_success + package_success +
"</p></div>"; "</p></div>";
dialog_success_pkg_text =
dialog_success_pkg_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_success_mr.png'></div>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + "</div>"; dialog_success_pkg_text + "</div>";
@ -743,20 +749,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_error_pkg_text = "<div>"; var dialog_error_pkg_text =
"<div class='update_popup'>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>ERROR</h3>";
home_url +
"images/icono_error_mr.png'></div>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>"; "<p>" +
dialog_error_pkg_text =
dialog_error_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_error + package_error +
"</p></div>"; "</p></div>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_error_mr.png'></div>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + "</div>"; dialog_error_pkg_text + "</div>";
@ -814,20 +821,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_error_mr_text = "<div>"; var dialog_error_mr_text =
"<div class='update_popup'>";
dialog_error_mr_text = dialog_error_mr_text =
dialog_error_mr_text + dialog_error_mr_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>ERROR</h3>";
home_url +
"images/icono_error_mr.png'></div>";
dialog_error_mr_text = dialog_error_mr_text =
dialog_error_mr_text + dialog_error_mr_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>"; "<p>" +
dialog_error_mr_text =
dialog_error_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
mr_error + mr_error +
"</p></div>"; "</p></div>";
dialog_error_mr_text =
dialog_error_mr_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_error_mr.png'></div>";
dialog_error_mr_text = dialog_error_mr_text =
dialog_error_mr_text + "</div>"; dialog_error_mr_text + "</div>";
@ -874,20 +882,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_cancel_mr_text = "<div>"; var dialog_cancel_mr_text =
"<div class='update_popup'>";
dialog_cancel_mr_text = dialog_cancel_mr_text =
dialog_cancel_mr_text + dialog_cancel_mr_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>INFO</h3>";
home_url +
"images/icono_info_mr.png'></div>";
dialog_cancel_mr_text = dialog_cancel_mr_text =
dialog_cancel_mr_text + dialog_cancel_mr_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>"; "<p>" +
dialog_cancel_mr_text =
dialog_cancel_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
mr_cancel + mr_cancel +
"</p></div>"; "</p></div>";
dialog_cancel_mr_text =
dialog_cancel_mr_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_info_mr.png'></div>";
dialog_cancel_mr_text = dialog_cancel_mr_text =
dialog_cancel_mr_text + "</div>"; dialog_cancel_mr_text + "</div>";
@ -910,34 +919,33 @@ function install_package(package, homeurl) {
] ]
}); });
$("button:contains(Apply MR)").attr("id", "apply_rr_button"); $("button:contains(Apply MR)")
.attr("id", "apply_rr_button")
.addClass("success_button");
$("button:contains(Cancel)").attr("id", "cancel_rr_button"); $("button:contains(Cancel)").attr("id", "cancel_rr_button");
var dialog_have_mr_text = "<div>"; var dialog_have_mr_text = "<div class='update_popup'>";
dialog_have_mr_text = dialog_have_mr_text =
dialog_have_mr_text + dialog_have_mr_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>" +
home_url +
"images/icono_warning_mr.png'></div>";
dialog_have_mr_text =
dialog_have_mr_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" +
mr_available_header + mr_available_header +
"</strong></h3>"; "</h3>";
dialog_have_mr_text =
dialog_have_mr_text + "<p>" + text1_mr_file + "</p>";
dialog_have_mr_text = dialog_have_mr_text =
dialog_have_mr_text + dialog_have_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" + "<p>" +
text1_mr_file +
"</p>";
dialog_have_mr_text =
dialog_have_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
text2_mr_file + text2_mr_file +
"<a style='font-family:Verdana bold; font-size:12pt; color:#82B92E'href=\"index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">" + '<a href="index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list">' +
text3_mr_file + text3_mr_file +
"</a>" + "</a>" +
text4_mr_file + text4_mr_file +
"</p></div>"; "</p></div>";
dialog_have_mr_text =
dialog_have_mr_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_warning_db.png'></div>";
dialog_have_mr_text = dialog_have_mr_text + "</div>"; dialog_have_mr_text = dialog_have_mr_text + "</div>";
$("#mr_dialog2").html(dialog_have_mr_text); $("#mr_dialog2").html(dialog_have_mr_text);
@ -992,20 +1000,21 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_success_pkg_text = "<div>"; var dialog_success_pkg_text =
"<div class='update_popup'>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + dialog_success_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>SUCCESS</h3>";
home_url +
"images/icono_exito_mr.png'></div>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + dialog_success_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>"; "<p>" +
dialog_success_pkg_text =
dialog_success_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_success + package_success +
"</p></div>"; "</p></div>";
dialog_success_pkg_text =
dialog_success_pkg_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_success_mr.png'></div>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + "</div>"; dialog_success_pkg_text + "</div>";
@ -1047,20 +1056,20 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_error_pkg_text = "<div>"; var dialog_error_pkg_text = "<div class='update_popup'>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>ERROR</h3>";
home_url +
"images/icono_error_mr.png'></div>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>"; "<p>" +
dialog_error_pkg_text =
dialog_error_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_error + package_error +
"</p></div>"; "</p></div>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_error_mr.png'></div>";
dialog_error_pkg_text = dialog_error_pkg_text + "</div>"; dialog_error_pkg_text = dialog_error_pkg_text + "</div>";
$("#error_pkg").html(dialog_error_pkg_text); $("#error_pkg").html(dialog_error_pkg_text);
@ -1124,20 +1133,16 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_cancel_pkg_text = "<div>"; var dialog_cancel_pkg_text = "<div class='update_popup'>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text + "<div class='update_text'><h3>INFO</h3>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text + "<p>" + package_cancel + "</p></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text =
dialog_cancel_pkg_text + dialog_cancel_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_icon'><img src='" +
home_url + home_url +
"images/icono_info_mr.png'></div>"; "images/icon_info_mr.png'></div>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_cancel +
"</p></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>";
$("#cancel_pkg").html(dialog_cancel_pkg_text); $("#cancel_pkg").html(dialog_cancel_pkg_text);
@ -1214,22 +1219,18 @@ function install_package(package, homeurl) {
] ]
}); });
var dialog_text = "<div>"; var dialog_text = "<div class='update_popup'>";
dialog_text = dialog_text =
dialog_text + dialog_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>" +
home_url +
"images/icono_info_mr.png'></div>";
dialog_text =
dialog_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" +
text1_package_file + text1_package_file +
"</strong></h3>"; "</h3>";
dialog_text = dialog_text + "<p>" + text2_package_file + "</p></div>";
dialog_text = dialog_text =
dialog_text + dialog_text +
"<p style='font-family:Verdana; font-size:12pt;'>" + "<div class='update_icon'><img src='" +
text2_package_file + home_url +
"</p></div>"; "images/icon_info_mr.png'></div>";
dialog_text = dialog_text + "</div>"; dialog_text = dialog_text + "</div>";
$("#pkg_apply_dialog").html(dialog_text); $("#pkg_apply_dialog").html(dialog_text);
@ -1522,20 +1523,20 @@ function install_free_package_prev_step(package, version, homeurl) {
}); });
var dialog_accept_package_mr_fail_text = var dialog_accept_package_mr_fail_text =
"<div>"; "<div class='update_popup'>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text + dialog_accept_package_mr_fail_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>INFO</h3>";
home_url +
"images/icono_info_mr.png'></div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text + dialog_accept_package_mr_fail_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>"; "<p>" +
dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
mr_not_accepted_code_yes + mr_not_accepted_code_yes +
"</p></div>"; "</p></div>";
dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_info_mr.png'></div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text =
dialog_accept_package_mr_fail_text + dialog_accept_package_mr_fail_text +
"</div>"; "</div>";
@ -1616,20 +1617,21 @@ function install_free_package_prev_step(package, version, homeurl) {
] ]
}); });
var dialog_cancel_pkg_text = "<div>"; var dialog_cancel_pkg_text =
"<div class='update_popup'>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text =
dialog_cancel_pkg_text + dialog_cancel_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>INFO</h3>";
home_url +
"images/icono_info_mr.png'></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text =
dialog_cancel_pkg_text + dialog_cancel_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>"; "<p>" +
dialog_cancel_pkg_text =
dialog_cancel_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_cancel + package_cancel +
"</p></div>"; "</p></div>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_info_mr.png'></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text =
dialog_cancel_pkg_text + "</div>"; dialog_cancel_pkg_text + "</div>";
@ -1646,20 +1648,21 @@ function install_free_package_prev_step(package, version, homeurl) {
] ]
}); });
var dialog_bad_message_text = "<div>"; var dialog_bad_message_text =
"<div class='update_popup'>";
dialog_bad_message_text = dialog_bad_message_text =
dialog_bad_message_text + dialog_bad_message_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>ERROR</h3>";
home_url +
"images/icono_error_mr.png'></div>";
dialog_bad_message_text = dialog_bad_message_text =
dialog_bad_message_text + dialog_bad_message_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>"; "<p>" +
dialog_bad_message_text =
dialog_bad_message_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
bad_mr_file + bad_mr_file +
"</p></div>"; "</p></div>";
dialog_bad_message_text =
dialog_bad_message_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_error_mr.png'></div>";
dialog_bad_message_text = dialog_bad_message_text =
dialog_bad_message_text + "</div>"; dialog_bad_message_text + "</div>";
@ -1691,20 +1694,21 @@ function install_free_package_prev_step(package, version, homeurl) {
] ]
}); });
var dialog_success_mr_text = "<div>"; var dialog_success_mr_text =
"<div class='update_popup'>";
dialog_success_mr_text = dialog_success_mr_text =
dialog_success_mr_text + dialog_success_mr_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>SUCCESS</h3>";
home_url +
"images/icono_exito_mr.png'></div>";
dialog_success_mr_text = dialog_success_mr_text =
dialog_success_mr_text + dialog_success_mr_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>"; "<p>" +
dialog_success_mr_text =
dialog_success_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
mr_success + mr_success +
"</p></div>"; "</p></div>";
dialog_success_mr_text =
dialog_success_mr_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_success_mr.png'></div>";
dialog_success_mr_text = dialog_success_mr_text =
dialog_success_mr_text + "</div>"; dialog_success_mr_text + "</div>";
@ -1774,20 +1778,21 @@ function install_free_package_prev_step(package, version, homeurl) {
] ]
}); });
var dialog_error_mr_text = "<div>"; var dialog_error_mr_text =
"<div class='update_popup'>";
dialog_error_mr_text = dialog_error_mr_text =
dialog_error_mr_text + dialog_error_mr_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>ERROR</h3>";
home_url +
"images/icono_error_mr.png'></div>";
dialog_error_mr_text = dialog_error_mr_text =
dialog_error_mr_text + dialog_error_mr_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>"; "<p>" +
dialog_error_mr_text =
dialog_error_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
mr_error + mr_error +
"</p></div>"; "</p></div>";
dialog_error_mr_text =
dialog_error_mr_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_error_mr.png'></div>";
dialog_error_mr_text = dialog_error_mr_text =
dialog_error_mr_text + "</div>"; dialog_error_mr_text + "</div>";
@ -1827,20 +1832,21 @@ function install_free_package_prev_step(package, version, homeurl) {
] ]
}); });
var dialog_cancel_mr_text = "<div>"; var dialog_cancel_mr_text =
"<div class='update_popup'>";
dialog_cancel_mr_text = dialog_cancel_mr_text =
dialog_cancel_mr_text + dialog_cancel_mr_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>INFO</h3>";
home_url +
"images/icono_info_mr.png'></div>";
dialog_cancel_mr_text = dialog_cancel_mr_text =
dialog_cancel_mr_text + dialog_cancel_mr_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>"; "<p>" +
dialog_cancel_mr_text =
dialog_cancel_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
mr_cancel + mr_cancel +
"</p></div>"; "</p></div>";
dialog_cancel_mr_text =
dialog_cancel_mr_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_info_mr.png'></div>";
dialog_cancel_mr_text = dialog_cancel_mr_text =
dialog_cancel_mr_text + "</div>"; dialog_cancel_mr_text + "</div>";
@ -1855,34 +1861,33 @@ function install_free_package_prev_step(package, version, homeurl) {
] ]
}); });
$("button:contains(Apply MR)").attr("id", "apply_rr_button"); $("button:contains(Apply MR)")
.attr("id", "apply_rr_button")
.addClass("success_button");
$("button:contains(Cancel)").attr("id", "cancel_rr_button"); $("button:contains(Cancel)").attr("id", "cancel_rr_button");
var dialog_have_mr_text = "<div>"; var dialog_have_mr_text = "<div class='update_popup'>";
dialog_have_mr_text = dialog_have_mr_text =
dialog_have_mr_text + dialog_have_mr_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>" +
home_url +
"images/icono_warning_mr.png'></div>";
dialog_have_mr_text =
dialog_have_mr_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" +
mr_available_header + mr_available_header +
"</strong></h3>"; "</h3>";
dialog_have_mr_text =
dialog_have_mr_text + "<p>" + text1_mr_file + "</p>";
dialog_have_mr_text = dialog_have_mr_text =
dialog_have_mr_text + dialog_have_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" + "<p>" +
text1_mr_file +
"</p>";
dialog_have_mr_text =
dialog_have_mr_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
text2_mr_file + text2_mr_file +
"<a style='font-family:Verdana bold; font-size:12pt; color:#82B92E'href=\"index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">" + '<a href="index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list">' +
text3_mr_file + text3_mr_file +
"</a>" + "</a>" +
text4_mr_file + text4_mr_file +
"</p></div>"; "</p></div>";
dialog_have_mr_text =
dialog_have_mr_text +
"<div class='update_icon'><img src='" +
home_url +
"images/icon_warning_db.png'></div>";
dialog_have_mr_text = dialog_have_mr_text + "</div>"; dialog_have_mr_text = dialog_have_mr_text + "</div>";
$("#mr_dialog2").html(dialog_have_mr_text); $("#mr_dialog2").html(dialog_have_mr_text);
@ -1950,20 +1955,16 @@ function install_free_package_prev_step(package, version, homeurl) {
] ]
}); });
var dialog_cancel_pkg_text = "<div>"; var dialog_cancel_pkg_text = "<div class='update_popup'>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text + "<div class='update_text'><h3>INFO</h3>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text + "<p>" + package_cancel + "</p></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text =
dialog_cancel_pkg_text + dialog_cancel_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_icon'><img src='" +
home_url + home_url +
"images/icono_info_mr.png'></div>"; "images/icon_info_mr.png'></div>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
dialog_cancel_pkg_text =
dialog_cancel_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
package_cancel +
"</p></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>";
$("#cancel_pkg").html(dialog_cancel_pkg_text); $("#cancel_pkg").html(dialog_cancel_pkg_text);
@ -1977,22 +1978,18 @@ function install_free_package_prev_step(package, version, homeurl) {
] ]
}); });
var dialog_text = "<div>"; var dialog_text = "<div class='update_popup'>";
dialog_text = dialog_text =
dialog_text + dialog_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>" +
home_url +
"images/icono_info_mr.png'></div>";
dialog_text =
dialog_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" +
text1_package_file + text1_package_file +
"</strong></h3>"; "</h3>";
dialog_text = dialog_text + "<p>" + text2_package_file + "</p></div>";
dialog_text = dialog_text =
dialog_text + dialog_text +
"<p style='font-family:Verdana; font-size:12pt;'>" + "<div class='update_icon'><img src='" +
text2_package_file + home_url +
"</p></div>"; "images/icon_info_mr.png'></div>";
dialog_text = dialog_text + "</div>"; dialog_text = dialog_text + "</div>";
$("#pkg_apply_dialog").html(dialog_text); $("#pkg_apply_dialog").html(dialog_text);
@ -2039,20 +2036,16 @@ function install_free_package(package, version, homeurl) {
] ]
}); });
var dialog_error_pkg_text = "<div>"; var dialog_error_pkg_text = "<div class='update_popup'>";
dialog_error_pkg_text =
dialog_error_pkg_text + "<div class='update_text'><h3>ERROR</h3>";
dialog_error_pkg_text =
dialog_error_pkg_text + "<p>" + data["message"] + "</p></div>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_icon'><img src='" +
home_url + home_url +
"images/icono_error_mr.png'></div>"; "images/icon_error_mr.png'></div>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
data["message"] +
"</p></div>";
dialog_error_pkg_text = dialog_error_pkg_text + "</div>"; dialog_error_pkg_text = dialog_error_pkg_text + "</div>";
$("#error_pkg").html(dialog_error_pkg_text); $("#error_pkg").html(dialog_error_pkg_text);
@ -2092,20 +2085,17 @@ function install_free_package(package, version, homeurl) {
] ]
}); });
var dialog_success_pkg_text = "<div>"; var dialog_success_pkg_text = "<div class='update_popup'>";
dialog_success_pkg_text = dialog_success_pkg_text =
dialog_success_pkg_text + dialog_success_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_text'><h3>SUCCESS</h3>";
dialog_success_pkg_text =
dialog_success_pkg_text + "<p>" + data["message"] + "</p></div>";
dialog_success_pkg_text =
dialog_success_pkg_text +
"<div class='update_icon'><img src='" +
home_url + home_url +
"images/icono_exito_mr.png'></div>"; "images/icon_success_mr.png'></div>";
dialog_success_pkg_text =
dialog_success_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
dialog_success_pkg_text =
dialog_success_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
data["message"] +
"</p></div>";
dialog_success_pkg_text = dialog_success_pkg_text + "</div>"; dialog_success_pkg_text = dialog_success_pkg_text + "</div>";
$("#success_pkg").html(dialog_success_pkg_text); $("#success_pkg").html(dialog_success_pkg_text);
@ -2142,20 +2132,16 @@ function install_free_package(package, version, homeurl) {
] ]
}); });
var dialog_error_pkg_text = "<div>"; var dialog_error_pkg_text = "<div class='update_popup'>";
dialog_error_pkg_text =
dialog_error_pkg_text + "<div class='update_text'><h3>ERROR</h3>";
dialog_error_pkg_text =
dialog_error_pkg_text + "<p>" + data["message"] + "</p></div>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_icon'><img src='" +
home_url + home_url +
"images/icono_error_mr.png'></div>"; "images/icon_error_mr.png'></div>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
data["message"] +
"</p></div>";
dialog_error_pkg_text = dialog_error_pkg_text + "</div>"; dialog_error_pkg_text = dialog_error_pkg_text + "</div>";
$("#error_pkg").html(dialog_error_pkg_text); $("#error_pkg").html(dialog_error_pkg_text);
@ -2193,20 +2179,16 @@ function install_free_package(package, version, homeurl) {
] ]
}); });
var dialog_error_pkg_text = "<div>"; var dialog_error_pkg_text = "<div class='update_popup'>";
dialog_error_pkg_text =
dialog_error_pkg_text + "<div class='update_text'><h3>ERROR</h3>";
dialog_error_pkg_text =
dialog_error_pkg_text + "<p>" + data["message"] + "</p></div>";
dialog_error_pkg_text = dialog_error_pkg_text =
dialog_error_pkg_text + dialog_error_pkg_text +
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" + "<div class='update_icon'><img src='" +
home_url + home_url +
"images/icono_error_mr.png'></div>"; "images/icon_error_mr.png'></div>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
dialog_error_pkg_text =
dialog_error_pkg_text +
"<p style='font-family:Verdana; font-size:12pt;'>" +
data["message"] +
"</p></div>";
dialog_error_pkg_text = dialog_error_pkg_text + "</div>"; dialog_error_pkg_text = dialog_error_pkg_text + "</div>";
$("#error_pkg").html(dialog_error_pkg_text); $("#error_pkg").html(dialog_error_pkg_text);
@ -2246,13 +2228,7 @@ function apply_minor_release(n_mr, pkg, ent, off, homeurl) {
$("#mr_dialog2").html(data); $("#mr_dialog2").html(data);
error["error"] = true; error["error"] = true;
} else { } else {
$("#mr_dialog2").append( $("#mr_dialog2").append("<p>- " + applying_mr + " #" + mr + "</p>");
"<p style='font-family:Verdana; font-size:12pt;'>- " +
applying_mr +
" #" +
mr +
"</p>"
);
} }
} }
}); });

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '7.0NG.734'; $version = '7.0NG.734';
$build = '190507'; $build = '190508';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.734 %define version 7.0NG.734
%define release 190507 %define release 190508
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.734 %define version 7.0NG.734
%define release 190507 %define release 190508
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.734 %define version 7.0NG.734
%define release 190507 %define release 190508
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.734-190507 Version: 7.0NG.734-190508
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.734-190507" pandora_version="7.0NG.734-190508"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.734"; my $pandora_version = "7.0NG.734";
my $pandora_build = "190507"; my $pandora_build = "190508";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.734"; my $pandora_version = "7.0NG.734";
my $pandora_build = "190507"; my $pandora_build = "190508";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.734 %define version 7.0NG.734
%define release 190507 %define release 190508
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.734 %define version 7.0NG.734
%define release 190507 %define release 190508
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.734" PI_VERSION="7.0NG.734"
PI_BUILD="190507" PI_BUILD="190508"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.734 PS190507"; my $version = "7.0NG.734 PS190508";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.734 PS190507"; my $version = "7.0NG.734 PS190508";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);