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

Merge branch 'ent-1668-update-manager' into 'develop' 

fixed: um url relative

See merge request artica/pandorafms!2444
This commit is contained in:
fbsanchez 2019-05-23 11:33:46 +02:00
parent dd8af874fa 0ee42fbafe
commit 1529a04507
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/update_manager/update_manager.setup.php
View File

@ -28,7 +28,7 @@ $action_update_url_update_manager = (bool) get_parameter(
); );
if (!$action_update_url_update_manager) { if (!$action_update_url_update_manager) {
$url_update_manager = get_parameter('url_update_manager', get_um_url()); $url_update_manager = get_parameter('url_update_manager', $config['url_update_manager']);
$update_manager_proxy_server = get_parameter('update_manager_proxy_server', $config['update_manager_proxy_server']); $update_manager_proxy_server = get_parameter('update_manager_proxy_server', $config['update_manager_proxy_server']);
$update_manager_proxy_port = get_parameter('update_manager_proxy_port', $config['update_manager_proxy_port']); $update_manager_proxy_port = get_parameter('update_manager_proxy_port', $config['update_manager_proxy_port']);
$update_manager_proxy_user = get_parameter('update_manager_proxy_user', $config['update_manager_proxy_user']); $update_manager_proxy_user = get_parameter('update_manager_proxy_user', $config['update_manager_proxy_user']);

6
pandora_console/include/functions_update_manager.php
View File

@ -1211,7 +1211,7 @@ function update_manager_check_online_free_packages_available()
]; ];
$curlObj = curl_init(); $curlObj = curl_init();
curl_setopt($curlObj, CURLOPT_URL, get_um_url()); curl_setopt($curlObj, CURLOPT_URL, get_um_url().'server.php');
curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curlObj, CURLOPT_POST, true); curl_setopt($curlObj, CURLOPT_POST, true);
curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params); curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params);
@ -1285,7 +1285,7 @@ function update_manager_check_online_free_packages($is_ajax=true)
*/ */
$curlObj = curl_init(); $curlObj = curl_init();
curl_setopt($curlObj, CURLOPT_URL, get_um_url()); curl_setopt($curlObj, CURLOPT_URL, get_um_url().'server.php');
curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curlObj, CURLOPT_POST, true); curl_setopt($curlObj, CURLOPT_POST, true);
curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params); curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params);
@ -1436,7 +1436,7 @@ function update_manager_curl_request($action, $additional_params=false)
$params['action'] = $action; $params['action'] = $action;
$curlObj = curl_init(); $curlObj = curl_init();
curl_setopt($curlObj, CURLOPT_URL, get_um_url()); curl_setopt($curlObj, CURLOPT_URL, get_um_url().'server.php');
curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curlObj, CURLOPT_POST, true); curl_setopt($curlObj, CURLOPT_POST, true);
curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params); curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params);