Merge branch 'ent-7861-fallo-umc-cuando-hay-db-historico' into 'develop'

Fix searchpath for MR while updating

See merge request artica/pandorafms!4334

pandora_console/godmode/um_client/index.php

@@ -381,6 +381,20 @@ if (is_array($config) === true) {
     }
 }
 
+$proxy = null;
+if (empty($config['update_manager_proxy_server']) === false
+    || empty($config['update_manager_proxy_port']) === false
+    || empty($config['update_manager_proxy_user']) === false
+    || empty($config['update_manager_proxy_password']) === false
+) {
+    $proxy = [
+        'host'     => $config['update_manager_proxy_server'],
+        'port'     => $config['update_manager_proxy_port'],
+        'user'     => $config['update_manager_proxy_user'],
+        'password' => $config['update_manager_proxy_password'],
+    ];
+}
+
 $ui = new Manager(
     ((is_array($config) === true) ? $pandora_url : 'http://'.$_SERVER['SERVER_ADDR'].'/'),
     ((is_array($config) === true) ? ui_get_full_url('ajax.php') : ''),
@@ -400,6 +414,7 @@ $ui = new Manager(
         'registration_code'      => $puid,
         'remote_config'          => $remote_config,
         'propagate_updates'      => $is_metaconsole,
+        'proxy'                  => $proxy,
         'set_maintenance_mode'   => function () {
             if (function_exists('config_update_value') === true) {
                 config_update_value('maintenance_mode', 1);

pandora_console/godmode/um_client/lib/UpdateManager/Client.php

@@ -1673,7 +1673,7 @@ class Client
                         );
 
                         $this->updateMR(
-                            $this->productPath.'/extras/mr/'.$mr,
+                            $this->extract_to.'/extras/mr/'.$mr,
                             $this->dbhHistory,
                             $historical_MR
                         );

pandora_console/include/lib/Core/DBMaintainer.php

@@ -721,6 +721,7 @@ final class DBMaintainer
                         $umc->updateMR($path);
                     } catch (\Exception $e) {
                         // TODO: Send an event to notify errors.
+                        $this->lastError = $e->getMessage();
                         $return = false;
                     }
                 } else {