diff --git a/extras/docker/centos8/pandora-stack/sources/init_pandora.sh b/extras/docker/centos8/pandora-stack/sources/init_pandora.sh
index 56424e6cb9..7c000ebebd 100755
--- a/extras/docker/centos8/pandora-stack/sources/init_pandora.sh
+++ b/extras/docker/centos8/pandora-stack/sources/init_pandora.sh
@@ -148,7 +148,7 @@ EOF_INDEX
sed -i -e "s/^max_input_time.*/max_input_time = -1/g" /etc/php.ini
sed -i -e "s/^max_execution_time.*/max_execution_time = 0/g" /etc/php.ini
sed -i -e "s/^upload_max_filesize.*/upload_max_filesize = 800M/g" /etc/php.ini
- sed -i -e "s/^memory_limit.*/memory_limit = 500M/g" /etc/php.ini
+ sed -i -e "s/^memory_limit.*/memory_limit = 800M/g" /etc/php.ini
echo "- Setting Public URL: $PUBLICURL"
q=$(mysql -u$DBUSER -p$DBPASS $DBNAME -h$DBHOST -sNe "select token from tconfig;" | grep public_url)
diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt
index 1d8e1ec96e..9221d762aa 100644
--- a/pandora_console/extras/delete_files/delete_files.txt
+++ b/pandora_console/extras/delete_files/delete_files.txt
@@ -73,7 +73,7 @@ enterprise/extensions/ipam.php
enterprise/extensions/ipam
enterprise/extensions/disabled/visual_console_manager.php
enterprise/extensions/visual_console_manager.php
-pandora_console/extensions/net_tools.php
+extensions/net_tools.php
enterprise/godmode/agentes/module_manager_editor_web.php
enterprise/include/ajax/web_server_module_debug.php
enterprise/include/class/WebServerModuleDebug.class.php
@@ -82,4 +82,11 @@ include/lib/WSManager.php
include/lib/WebSocketServer.php
include/lib/WebSocketUser.php
operation/network/network_explorer.php
-operation/vsual_console/pure_ajax.php
+operation/visual_console/pure_ajax.php
+include/ajax/update_manager.ajax.php
+godmode/update_manager/update_manager.css
+godmode/update_manager/update_manager.offline.php
+godmode/update_manager/update_manager.online.php
+include/javascript/update_manager.js
+enterprise/include/functions_update_manager.php
+include/ajax/rolling_release.ajax.php
\ No newline at end of file
diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php
index 5c40d49d0c..888a71d5be 100644
--- a/pandora_console/general/footer.php
+++ b/pandora_console/general/footer.php
@@ -37,14 +37,14 @@ require_once $config['homedir'].'/include/functions_update_manager.php';
$current_package = update_manager_get_current_package();
-if ($current_package == 0) {
- $build_package_version = $build_version;
+if ($current_package === null) {
+ $build_package_version = 'Build '.$build_version;
} else {
- $build_package_version = $current_package;
+ $build_package_version = 'OUM '.$current_package;
}
echo __(
- '%s %s - Build %s - MR %s',
+ '%s %s - %s - MR %s',
get_product_name(),
$pandora_version,
$build_package_version,
diff --git a/pandora_console/general/maintenance.php b/pandora_console/general/maintenance.php
new file mode 100644
index 0000000000..bff7c2ef5e
--- /dev/null
+++ b/pandora_console/general/maintenance.php
@@ -0,0 +1,69 @@
+
+
+
+ Ups ...
+
+
+
+
+
+
+ 'responsive',
+ 'width' => 800,
+ ]
+ );
+ ?>
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index dcaa6e3e6f..215e9642ef 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -29,24 +29,16 @@
// Begin.
global $config;
-require_once $config['homedir'].'/include/functions_update_manager.php';
+require_once $config['homedir'].'/include/functions_register.php';
require_once $config['homedir'].'/include/class/WelcomeWindow.class.php';
-if (is_ajax()) {
+if ((bool) is_ajax() === true) {
// Parse responses, flow control.
$configuration_wizard = get_parameter('save_required_wizard', 0);
$change_language = get_parameter('change_language', 0);
$cancel_wizard = get_parameter('cancel_wizard', 0);
- // Console registration.
- $cancel_registration = get_parameter('cancel_registration', 0);
- $register_console = get_parameter('register_console', 0);
-
- // Newsletter.
- $cancel_newsletter = get_parameter('cancel_newsletter', 0);
- $register_newsletter = get_parameter('register_newsletter', 0);
-
// Load wizards.
$load_wizards = get_parameter('load_wizards', '');
@@ -58,16 +50,8 @@ if (is_ajax()) {
case 'initial':
return config_wiz_modal(false, false);
- case 'registration':
- return registration_wiz_modal(false, false);
-
- case 'newsletter':
- return newsletter_wiz_modal(false, false);
-
case 'all':
config_wiz_modal(false, false);
- registration_wiz_modal(false, false);
- newsletter_wiz_modal(false, false);
return;
default:
@@ -90,31 +74,7 @@ if (is_ajax()) {
config_update_value('initial_wizard', 1);
}
- // Update Manager registration.
- if ($cancel_registration) {
- config_update_value('pandora_uid', 'OFFLINE');
- }
-
- if ($register_console) {
- $feedback = registration_wiz_process();
- }
-
- // Newsletter.
- if ($cancel_newsletter) {
- db_process_sql_update(
- 'tusuario',
- ['middlename' => -1],
- ['id_user' => $config['id_user']]
- );
-
- // XXX: Also notify UpdateManager.
- }
-
- if ($register_newsletter) {
- $feedback = newsletter_wiz_process();
- }
-
- if (is_array($feedback)) {
+ if (is_array($feedback) === true) {
echo json_encode($feedback);
}
@@ -123,60 +83,23 @@ if (is_ajax()) {
exit();
}
-
-
ui_require_css_file('register');
$initial = isset($config['initial_wizard']) !== true
|| $config['initial_wizard'] != '1';
-$newsletter = db_get_value(
- 'middlename',
- 'tusuario',
- 'id_user',
- $config['id_user']
-);
-$show_newsletter = $newsletter == '0' || $newsletter == '';
-
-$registration = isset($config['pandora_uid']) !== true
- || $config['pandora_uid'] == '';
-
-
if ($initial && users_is_admin()) {
// Show all forms in order.
// 1- Ask for email, timezone, etc. Fullfill alerts and user mail.
config_wiz_modal(
false,
true,
- (($registration === true) ? 'show_registration_wizard()' : null),
+ null,
true
);
}
-if (!$config['disabled_newsletter']) {
- if ($registration && users_is_admin()) {
- // Prepare registration wizard, not launch. leave control to flow.
- registration_wiz_modal(
- false,
- // Launch only if not being launch from 'initial'.
- !$initial,
- (($show_newsletter === false) ? 'force_run_newsletter()' : null),
- true
- );
- } else {
- if ($show_newsletter) {
- // Show newsletter wizard for current user.
- newsletter_wiz_modal(
- false,
- // Launch only if not being call from 'registration'.
- !$registration && !$initial,
- true
- );
- }
- }
-}
-
-$welcome = !$registration && !$show_newsletter && !$initial;
+$welcome = !$initial;
try {
$welcome_window = new WelcomeWindow($welcome);
if ($welcome_window !== null) {
@@ -271,8 +194,6 @@ if (!$double_auth_enabled
echo '';
}
-$newsletter = null;
-
?>
';
-
-echo '