mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove odd code, align to master 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2019-10-11 15:54:21 +02:00
parent 3fc86e639e
commit 0f5cc5249c
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/Http/Client/Client.php
View File

@ -114,21 +114,18 @@ class Client implements IClient {
*/
private function getProxyUri(): ?string {
$proxyHost = $this->config->getSystemValue('proxy', '');
if ($proxyHost === '' || $proxyHost === null) {
return null;
}
$proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', '');
$proxyUri = '';
if ($proxyUserPwd === '' || $proxyUserPwd === null) {
$proxyUri .= $proxyUserPwd . '@';
}
if ($proxyHost !== null) {
$proxyUri .= $proxyHost;
return $proxyHost;
}
return $proxyUri;
return $proxyUserPwd . '@' . $proxyHost;
}
/**