From 574373fe1f56edec7c73cf903196339abd364afd Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Tue, 29 Mar 2016 13:02:56 +0200
Subject: [PATCH] Revert "Only conecction timeout in login. Tiquet: #3485"
This reverts commit b923519c75b09a5018afa48f077e2395bc86d1b6.
---
pandora_console/include/functions_update_manager.php | 2 ++
pandora_console/include/functions_visual_map_editor.php | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 7064ef1fe7..c1b98f5feb 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -298,6 +298,8 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
curl_setopt($curlObj, CURLOPT_POST, true);
curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params);
curl_setopt($curlObj, CURLOPT_SSL_VERIFYPEER, false);
+ curl_setopt($curlObj, CURLOPT_CONNECTTIMEOUT, 4);
+
if (isset($config['update_manager_proxy_server'])) {
curl_setopt($curlObj, CURLOPT_PROXY, $config['update_manager_proxy_server']);
}
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 20b6751cfd..b6feb53612 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -637,4 +637,4 @@ function visual_map_editor_print_hack_translate_strings() {
echo '<span style="display: none" id="hack_translation_incorrect_save">' .
__('Could not be save') .'</span>';
}
-?>
+?>
\ No newline at end of file