From 52af627f2b18e1b1116d88d08af96c8285569642 Mon Sep 17 00:00:00 2001 From: Neozlag <50456371+Neozlag@users.noreply.github.com> Date: Tue, 25 Jan 2022 10:15:08 +0100 Subject: [PATCH] Update Nextcloud.php (#2662) It seems the try in the getInternalUsername function was not placed very well, so the throw exception in the ocs_request function didn't work. --- .../mvc/app/library/OPNsense/Backup/Nextcloud.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sysutils/nextcloud-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php b/sysutils/nextcloud-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php index cca836516..71185b110 100644 --- a/sysutils/nextcloud-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php +++ b/sysutils/nextcloud-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php @@ -280,15 +280,14 @@ class Nextcloud extends Base implements IBackupProvider public function getInternalUsername($url, $username, $password): string { - $xml_response = $this->ocs_request( - "$url/ocs/v1.php/cloud/user", - $username, - $password, - "GET", - "Cannot get real username" - ); - try { + $xml_response = $this->ocs_request( + "$url/ocs/v1.php/cloud/user", + $username, + $password, + "GET", + "Cannot get real username" + ); $data = $xml_response->data; if ($data == null) { return $username; // no data found, return the old username