Merge pull request #1621 from HalianElf/v2-develop

Bug fixes

api/classes/organizr.class.php

@@ -6051,7 +6051,7 @@ class Organizr
 		if (!$error) {
 			$pre = explode('/api/v2/socks/', $requestObject->getUri()->getPath());
 			$endpoint = explode('/', $pre[1]);
-			$new = str_ireplace($endpoint[0], '', $pre[1]);
+			$new = urldecode(preg_replace('/'.$endpoint[0].'/', '', $pre[1], 1));
 			$getParams = ($_GET) ? '?' . http_build_query($_GET) : '';
 			$url = $this->qualifyURL($this->config[$url]) . $new . $getParams;
 			$url = $this->cleanPath($url);

api/functions/sso-functions.php

@@ -47,7 +47,8 @@ trait SSOFunctions
 			}
 		}
 		if ($this->config['ssoPetio']) {
-			$petioToken = $this->getPetioToken($this->getSSOUserFor('petio', $userobj), $password, $token);
+			$fallback = ($this->config['petioFallbackUser'] !== '' && $this->config['petioFallbackPassword'] !== '');
+			$petioToken = $this->getPetioToken($this->getSSOUserFor('petio', $userobj), $password, $token, $fallback);
 			if ($petioToken) {
 				$this->coookie('set', 'petio_jwt', $petioToken, $this->config['rememberMeDays'], false);
 			}

api/v2/routes/socks.php

@@ -30,7 +30,7 @@ $app->any('/socks/{app}/{route:.*}', function ($request, $response, $args) {
 			$url = 'nzbgetURL';
 			$enabled = 'nzbgetSocksEnabled';
 			$auth = 'nzbgetSocksAuth';
-			$header = null;
+			$header = 'Authorization';
 			break;
 		default:
 			$Organizr->setAPIResponse('error', 'Application not supported for socks', 404);