Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop'

multiple fixes

See merge request artica/pandorafms!3812

pandora_console/godmode/tag/tag.php

@@ -66,6 +66,7 @@ if (is_ajax()) {
                 function ($counter, $server) use ($id_tag) {
                     if (metaconsole_connect($server) === NOERR) {
                         $counter += tags_get_local_modules_count($id_tag);
+                        metaconsole_restore_db();
                     }
 
                     return $counter;
@@ -83,6 +84,7 @@ if (is_ajax()) {
                 function ($counter, $server) use ($id_tag) {
                     if (metaconsole_connect($server) === NOERR) {
                         $counter += tags_get_policy_modules_count($id_tag);
+                        metaconsole_restore_db();
                     }
 
                     return $counter;
@@ -272,6 +274,7 @@ if (!empty($result)) {
                 function ($counter, $server) use ($tag_id) {
                     if (metaconsole_connect($server) === NOERR) {
                         $counter += tags_get_modules_count($tag_id);
+                        metaconsole_restore_db();
                     }
 
                     return $counter;

pandora_console/godmode/users/user_list.php

@@ -260,21 +260,21 @@ if (isset($_GET['user_del'])) {
         if (defined('METACONSOLE') && isset($_GET['delete_all'])) {
             $servers = metaconsole_get_servers();
             foreach ($servers as $server) {
-                // Connect to the remote console
+                // Connect to the remote console.
-                metaconsole_connect($server);
+                if (metaconsole_connect($server) === NOERR) {
+                    // Delete the user
+                    $result = delete_user($id_user);
+                    if ($result) {
+                        db_pandora_audit(
+                            'User management',
+                            __('Deleted user %s from metaconsole', io_safe_input($id_user))
+                        );
+                    }
 
-                // Delete the user
+                    // Restore the db connection.
-                $result = delete_user($id_user);
+                    metaconsole_restore_db();
-                if ($result) {
-                    db_pandora_audit(
-                        'User management',
-                        __('Deleted user %s from metaconsole', io_safe_input($id_user))
-                    );
                 }
 
-                // Restore the db connection
-                metaconsole_restore_db();
-
                 // Log to the metaconsole too
                 if ($result) {
                     db_pandora_audit(

pandora_console/include/ajax/events.php

@@ -1477,15 +1477,21 @@ if ($get_extended_event) {
         $related = events_page_related($event, $server);
     }
 
+    $connected = true;
     if ($meta) {
-        metaconsole_connect($server);
+        if (metaconsole_connect($server) === NOERR) {
+            $connected = true;
+        } else {
+            $connected = false;
+        }
     }
 
-    $custom_fields = events_page_custom_fields($event);
+    if ($connected === true) {
+        $custom_fields = events_page_custom_fields($event);
+        $custom_data = events_page_custom_data($event);
+    }
 
-    $custom_data = events_page_custom_data($event);
+    if ($meta && $connected === true) {
-
-    if ($meta) {
         metaconsole_restore_db();
     }
 

pandora_console/include/functions.php

@@ -2853,7 +2853,11 @@ function can_user_access_node()
 {
     global $config;
 
-    $userinfo = get_user_info($config['id_user']);
+    static $userinfo;
+
+    if ($userinfo === null) {
+        $userinfo = get_user_info($config['id_user']);
+    }
 
     if (is_metaconsole()) {
         return $userinfo['is_admin'] == 1 ? 1 : $userinfo['metaconsole_access_node'];