From dd9be2e49763f271c88d6a2997eae5a3562c0f83 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 15 May 2020 08:30:04 +0200 Subject: [PATCH] src: style sweep --- .../app/library/OPNsense/Backup/Nextcloud.php | 22 +++++++++++++------ .../Base/FieldTypes/InterfaceField.php | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php b/src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php index d197342a2..4da2b34a9 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php +++ b/src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php @@ -256,7 +256,8 @@ class Nextcloud extends Base implements IBackupProvider ); } - public function getInternalUsername($url, $username, $password) : string { + public function getInternalUsername($url, $username, $password): string + { $xml_response = $this->ocs_request( "$url/ocs/v1.php/cloud/user", $username, @@ -291,9 +292,15 @@ class Nextcloud extends Base implements IBackupProvider * @return array response status * @throws \Exception when request fails */ - public function curl_request($url, $username, $password, $method, $error_message, $postdata = null, - $headers = array("User-Agent: OPNsense Firewall")) - { + public function curl_request( + $url, + $username, + $password, + $method, + $error_message, + $postdata = null, + $headers = array("User-Agent: OPNsense Firewall") + ) { $curl = curl_init(); curl_setopt_array($curl, array( CURLOPT_URL => $url, @@ -331,14 +338,15 @@ class Nextcloud extends Base implements IBackupProvider * @return array|\SimpleXMLElement|null * @throws \Exception */ - public function ocs_request($url, $username, $password, $method, $error_message, $postdata = null) { + public function ocs_request($url, $username, $password, $method, $error_message, $postdata = null) + { $headers = $headers = array("User-Agent: OPNsense Firewall", "OCS-APIRequest: true"); $result = $this->curl_request($url, $username, $password, $method, $error_message, $postdata, $headers); if (array_key_exists('content_type', $result['info'])) { - if (stripos($result['info']['content_type'], 'xml') !== FALSE) { + if (stripos($result['info']['content_type'], 'xml') !== false) { return new \SimpleXMLElement($result['response']); } - if (stripos($result['info']['content_type'], 'json') !== FALSE) { + if (stripos($result['info']['content_type'], 'json') !== false) { return json_decode($result['response'], true); } diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php index 79fc2f6ff..6012951e3 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php @@ -230,7 +230,7 @@ class InterfaceField extends BaseListField $this->internalAllowDynamic = 1; } elseif (trim(strtoupper($value)) == "S") { $this->internalAllowDynamic = 2; - }else { + } else { $this->internalAllowDynamic = 0; } $this->updateInternalCacheKey();