From ebc03b6136e890ac5f6bbb335f872712f1b509d8 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 25 Jul 2023 17:43:05 +0200
Subject: [PATCH] added calls to empty when checking for ['OWNCLOUD_VERBOSE']
---
OwnCloudPlugin.class.php | 2 +-
classes/OAuth.class.php | 6 +++---
classes/OwncloudFile.php | 4 ++--
classes/OwncloudFolder.php | 14 +++++++-------
controllers/oauth.php | 2 +-
plugin.manifest | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/OwnCloudPlugin.class.php b/OwnCloudPlugin.class.php
index 663ac5f..6408617 100755
--- a/OwnCloudPlugin.class.php
+++ b/OwnCloudPlugin.class.php
@@ -62,7 +62,7 @@ class OwnCloudPlugin extends StudIPPlugin implements FilesystemPlugin {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
diff --git a/classes/OAuth.class.php b/classes/OAuth.class.php
index 4fa1902..a71768a 100755
--- a/classes/OAuth.class.php
+++ b/classes/OAuth.class.php
@@ -22,7 +22,7 @@ class OAuth {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) \Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) \Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
@@ -88,7 +88,7 @@ class OAuth {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) \Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) \Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
@@ -141,4 +141,4 @@ class OAuth {
\UserConfig::get($GLOBALS['user']->id)->delete("OWNCLOUD_ACCESS_TOKEN");
\UserConfig::get($GLOBALS['user']->id)->delete("OWNCLOUD_REFRESH_TOKEN");
}
-}
\ No newline at end of file
+}
diff --git a/classes/OwncloudFile.php b/classes/OwncloudFile.php
index e99a2bb..cc97982 100644
--- a/classes/OwncloudFile.php
+++ b/classes/OwncloudFile.php
@@ -333,7 +333,7 @@ class OwncloudFile implements FileType
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
@@ -434,7 +434,7 @@ class OwncloudFile implements FileType
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
curl_exec($r);
diff --git a/classes/OwncloudFolder.php b/classes/OwncloudFolder.php
index b5a34b8..ca0ecc5 100755
--- a/classes/OwncloudFolder.php
+++ b/classes/OwncloudFolder.php
@@ -58,7 +58,7 @@ class OwncloudFolder extends VirtualFolderType {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
curl_exec($r);
@@ -90,7 +90,7 @@ class OwncloudFolder extends VirtualFolderType {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
@@ -138,7 +138,7 @@ class OwncloudFolder extends VirtualFolderType {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
curl_exec($r);
@@ -185,7 +185,7 @@ class OwncloudFolder extends VirtualFolderType {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
@@ -231,7 +231,7 @@ class OwncloudFolder extends VirtualFolderType {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
@@ -277,7 +277,7 @@ class OwncloudFolder extends VirtualFolderType {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
@@ -321,7 +321,7 @@ class OwncloudFolder extends VirtualFolderType {
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
diff --git a/controllers/oauth.php b/controllers/oauth.php
index 4d7bb01..7d84f40 100755
--- a/controllers/oauth.php
+++ b/controllers/oauth.php
@@ -65,7 +65,7 @@ class OauthController extends PluginController
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_SSL_VERIFYPEER, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
curl_setopt($r, CURLOPT_SSL_VERIFYHOST, (bool) Config::get()->OWNCLOUD_SSL_VERIFYPEER);
- if ($GLOBALS['OWNCLOUD_VERBOSE']) {
+ if (!empty($GLOBALS['OWNCLOUD_VERBOSE'])) {
curl_setopt($r, CURLOPT_VERBOSE, true);
}
diff --git a/plugin.manifest b/plugin.manifest
index 528880d..ce5b509 100755
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,6 +1,6 @@
pluginname=OwnCloudPlugin
pluginclassname=OwnCloudPlugin
-version=2.1.0
+version=2.1.1
origin=data-quest
studipMinVersion=5.0
studipMaxVersion=5.3.99
--
GitLab