summaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib
diff options
context:
space:
mode:
authorJuan Pablo Villafáñez <jvillafanez@solidgear.es>2016-06-07 18:25:17 +0200
committerJuan Pablo Villafáñez <jvillafanez@solidgear.es>2016-06-07 18:25:17 +0200
commit110edd3d3ca37d496b54c651ab049cbaab503423 (patch)
tree5a7e2c14d10cec974487c86e748902cdf82032a2 /apps/files_external/lib
parent8526bbb347a7b1ea18b225b4dda40029534636db (diff)
downloadnextcloud-server-110edd3d3ca37d496b54c651ab049cbaab503423.tar.gz
nextcloud-server-110edd3d3ca37d496b54c651ab049cbaab503423.zip
Rename variable
Diffstat (limited to 'apps/files_external/lib')
-rw-r--r--apps/files_external/lib/Controller/GlobalStoragesController.php4
-rw-r--r--apps/files_external/lib/Controller/StoragesController.php8
-rw-r--r--apps/files_external/lib/Controller/UserGlobalStoragesController.php8
-rw-r--r--apps/files_external/lib/Controller/UserStoragesController.php8
-rw-r--r--apps/files_external/lib/config.php4
5 files changed, 16 insertions, 16 deletions
diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php
index af71a4831cd..e606bacd8c2 100644
--- a/apps/files_external/lib/Controller/GlobalStoragesController.php
+++ b/apps/files_external/lib/Controller/GlobalStoragesController.php
@@ -140,7 +140,7 @@ class GlobalStoragesController extends StoragesController {
$applicableUsers,
$applicableGroups,
$priority,
- $origin = null
+ $testOnly = null
) {
$storage = $this->createStorage(
$mountPoint,
@@ -173,7 +173,7 @@ class GlobalStoragesController extends StoragesController {
);
}
- $this->updateStorageStatus($storage, $origin);
+ $this->updateStorageStatus($storage, $testOnly);
return new DataResponse(
$storage,
diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php
index 213518ff4a0..8eb5506d534 100644
--- a/apps/files_external/lib/Controller/StoragesController.php
+++ b/apps/files_external/lib/Controller/StoragesController.php
@@ -238,7 +238,7 @@ abstract class StoragesController extends Controller {
*
* @param StorageConfig $storage storage configuration
*/
- protected function updateStorageStatus(StorageConfig &$storage, $origin = null) {
+ protected function updateStorageStatus(StorageConfig &$storage, $testOnly = null) {
try {
$this->manipulateStorageConfig($storage);
@@ -250,7 +250,7 @@ abstract class StoragesController extends Controller {
$backend->getStorageClass(),
$storage->getBackendOptions(),
false,
- $origin
+ $testOnly
)
);
} catch (InsufficientDataForMeaningfulAnswerException $e) {
@@ -294,11 +294,11 @@ abstract class StoragesController extends Controller {
*
* @return DataResponse
*/
- public function show($id, $origin = null) {
+ public function show($id, $testOnly = null) {
try {
$storage = $this->service->getStorage($id);
- $this->updateStorageStatus($storage, $origin);
+ $this->updateStorageStatus($storage, $testOnly);
} catch (NotFoundException $e) {
return new DataResponse(
[
diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
index 5050962a52e..8376a00559d 100644
--- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php
+++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
@@ -111,11 +111,11 @@ class UserGlobalStoragesController extends StoragesController {
*
* @NoAdminRequired
*/
- public function show($id, $origin = null) {
+ public function show($id, $testOnly = null) {
try {
$storage = $this->service->getStorage($id);
- $this->updateStorageStatus($storage, $origin);
+ $this->updateStorageStatus($storage, $testOnly);
} catch (NotFoundException $e) {
return new DataResponse(
[
@@ -147,7 +147,7 @@ class UserGlobalStoragesController extends StoragesController {
public function update(
$id,
$backendOptions,
- $origin = null
+ $testOnly = null
) {
try {
$storage = $this->service->getStorage($id);
@@ -172,7 +172,7 @@ class UserGlobalStoragesController extends StoragesController {
);
}
- $this->updateStorageStatus($storage);
+ $this->updateStorageStatus($storage, $testOnly);
$this->sanitizeStorage($storage);
return new DataResponse(
diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php
index 73f7178b142..ca949df8a05 100644
--- a/apps/files_external/lib/Controller/UserStoragesController.php
+++ b/apps/files_external/lib/Controller/UserStoragesController.php
@@ -101,8 +101,8 @@ class UserStoragesController extends StoragesController {
*
* {@inheritdoc}
*/
- public function show($id, $origin = null) {
- return parent::show($id, $origin);
+ public function show($id, $testOnly = null) {
+ return parent::show($id, $testOnly);
}
/**
@@ -171,7 +171,7 @@ class UserStoragesController extends StoragesController {
$authMechanism,
$backendOptions,
$mountOptions,
- $origin = null
+ $testOnly = null
) {
$storage = $this->createStorage(
$mountPoint,
@@ -201,7 +201,7 @@ class UserStoragesController extends StoragesController {
);
}
- $this->updateStorageStatus($storage, $origin);
+ $this->updateStorageStatus($storage, $testOnly);
return new DataResponse(
$storage,
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 51d62449782..95220f86cf7 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -215,7 +215,7 @@ class OC_Mount_Config {
* @return int see self::STATUS_*
* @throws Exception
*/
- public static function getBackendStatus($class, $options, $isPersonal, $origin = null) {
+ public static function getBackendStatus($class, $options, $isPersonal, $testOnly = null) {
if (self::$skipTest) {
return StorageNotAvailableException::STATUS_SUCCESS;
}
@@ -228,7 +228,7 @@ class OC_Mount_Config {
$storage = new $class($options);
try {
- $result = $storage->test($isPersonal, $origin);
+ $result = $storage->test($isPersonal, $testOnly);
$storage->setAvailability($result);
if ($result) {
return StorageNotAvailableException::STATUS_SUCCESS;