lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: style sweep

Browse Source
This commit is contained in:
Franco Fichtner 2020-05-15 08:30:04 +02:00
parent ef1bd41789
commit dd9be2e497
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/opnsense/mvc/app/library/OPNsense/Backup/Nextcloud.php
View File

@ -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);
}

2
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php
View File

@ -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();