nextcloud / server

apps/user_ldap/lib/ILDAPGroupPlugin.php

Indentation +50 added lines, -50 removed lines

@@ -26,61 +26,61 @@
 
 interface ILDAPGroupPlugin {
 
-	/**
-	 * Check if plugin implements actions
-	 * @return int
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
-	 */
-	public function respondToActions();
+    /**
+     * Check if plugin implements actions
+     * @return int
+     *
+     * Returns the supported actions as int to be
+     * compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
+     */
+    public function respondToActions();
 
-	/**
-	 * @param string $gid
-	 * @return string|null The group DN if group creation was successful.
-	 */
-	public function createGroup($gid);
+    /**
+     * @param string $gid
+     * @return string|null The group DN if group creation was successful.
+     */
+    public function createGroup($gid);
 
-	/**
-	 * delete a group
-	 * @param string $gid gid of the group to delete
-	 * @return bool
-	 */
-	public function deleteGroup($gid);
+    /**
+     * delete a group
+     * @param string $gid gid of the group to delete
+     * @return bool
+     */
+    public function deleteGroup($gid);
 
-	/**
-	 * Add a user to a group
-	 * @param string $uid Name of the user to add to group
-	 * @param string $gid Name of the group in which add the user
-	 * @return bool
-	 *
-	 * Adds a user to a group.
-	 */
-	public function addToGroup($uid, $gid);
+    /**
+     * Add a user to a group
+     * @param string $uid Name of the user to add to group
+     * @param string $gid Name of the group in which add the user
+     * @return bool
+     *
+     * Adds a user to a group.
+     */
+    public function addToGroup($uid, $gid);
 
-	/**
-	 * Removes a user from a group
-	 * @param string $uid Name of the user to remove from group
-	 * @param string $gid Name of the group from which remove the user
-	 * @return bool
-	 *
-	 * removes the user from a group.
-	 */
-	public function removeFromGroup($uid, $gid);
+    /**
+     * Removes a user from a group
+     * @param string $uid Name of the user to remove from group
+     * @param string $gid Name of the group from which remove the user
+     * @return bool
+     *
+     * removes the user from a group.
+     */
+    public function removeFromGroup($uid, $gid);
 
-	/**
-	 * get the number of all users matching the search string in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @return int|false
-	 */
-	public function countUsersInGroup($gid, $search = '');
+    /**
+     * get the number of all users matching the search string in a group
+     * @param string $gid
+     * @param string $search
+     * @return int|false
+     */
+    public function countUsersInGroup($gid, $search = '');
 
-	/**
-	 * get an array with group details
-	 * @param string $gid
-	 * @return array|false
-	 */
-	public function getGroupDetails($gid);
+    /**
+     * get an array with group details
+     * @param string $gid
+     * @return array|false
+     */
+    public function getGroupDetails($gid);
 
 }

apps/user_ldap/templates/part.wizardcontrols.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <div class="ldapWizardControls">
-	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
+	<span class="ldap_saving hidden"><?php p($l->t('Saving')); ?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
 	<span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span>
 	<button class="ldap_action_back invisible" name="ldap_action_back"
 			type="button">
-		<?php p($l->t('Back'));?>
+		<?php p($l->t('Back')); ?>
 	</button>
 	<button class="ldap_action_continue primary" name="ldap_action_continue" type="button">
-		<?php p($l->t('Continue'));?>
+		<?php p($l->t('Continue')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer noopener">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<span class="ldap_grey"><?php p($l->t('Help'));?></span>
+		<span class="ldap_grey"><?php p($l->t('Help')); ?></span>
 	</a>
 </div>

lib/public/Support/CrashReport/IReporter.php

Indentation +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@
  */
 interface IReporter {
 
-	/**
-	 * Report an (unhandled) exception
-	 *
-	 * @since 13.0.0
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 */
-	public function report($exception, array $context = []);
+    /**
+     * Report an (unhandled) exception
+     *
+     * @since 13.0.0
+     * @param Exception|Throwable $exception
+     * @param array $context
+     */
+    public function report($exception, array $context = []);
 }

apps/files_sharing/lib/Capabilities.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 			$res['group'] = [];
 			$res['group']['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
 			$res['group']['expire_date']['enabled'] = true;
-			$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
+			$res['default_permissions'] = (int) $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
 		}
 
 		//Federated sharing

Indentation +87 added lines, -87 removed lines

@@ -35,91 +35,91 @@
  */
 class Capabilities implements ICapability {
 
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		$res = [];
-
-		if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
-			$res['api_enabled'] = false;
-			$res['public'] = ['enabled' => false];
-			$res['user'] = ['send_mail' => false];
-			$res['resharing'] = false;
-		} else {
-			$res['api_enabled'] = true;
-
-			$public = [];
-			$public['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
-			if ($public['enabled']) {
-				$public['password'] = [];
-				$public['password']['enforced'] = ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes');
-
-				if ($public['password']['enforced']) {
-					$public['password']['askForOptionalPassword'] = false;
-				} else {
-					$public['password']['askForOptionalPassword'] = ($this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no') === 'yes');
-				}
-
-				$public['expire_date'] = [];
-				$public['multiple_links'] = true;
-				$public['expire_date']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
-				if ($public['expire_date']['enabled']) {
-					$public['expire_date']['days'] = $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-					$public['expire_date']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
-				}
-
-				$public['expire_date_internal'] = [];
-				$public['expire_date_internal']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
-				if ($public['expire_date_internal']['enabled']) {
-					$public['expire_date_internal']['days'] = $this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
-					$public['expire_date_internal']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
-				}
-
-				$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
-				$public['upload'] = $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
-				$public['upload_files_drop'] = $public['upload'];
-			}
-			$res['public'] = $public;
-
-			$res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
-
-			$res['user']['send_mail'] = false;
-			$res['user']['expire_date']['enabled'] = true;
-
-			// deprecated in favour of 'group', but we need to keep it for now
-			// in order to stay compatible with older clients
-			$res['group_sharing'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
-
-			$res['group'] = [];
-			$res['group']['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
-			$res['group']['expire_date']['enabled'] = true;
-			$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
-		}
-
-		//Federated sharing
-		$res['federation'] = [
-			'outgoing' => $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes',
-			'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
-			'expire_date' => ['enabled' => true]
-		];
-
-		// Sharee searches
-		$res['sharee'] = [
-			'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false)
-		];
-
-		return [
-			'files_sharing' => $res,
-		];
-	}
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        $res = [];
+
+        if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+            $res['api_enabled'] = false;
+            $res['public'] = ['enabled' => false];
+            $res['user'] = ['send_mail' => false];
+            $res['resharing'] = false;
+        } else {
+            $res['api_enabled'] = true;
+
+            $public = [];
+            $public['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
+            if ($public['enabled']) {
+                $public['password'] = [];
+                $public['password']['enforced'] = ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes');
+
+                if ($public['password']['enforced']) {
+                    $public['password']['askForOptionalPassword'] = false;
+                } else {
+                    $public['password']['askForOptionalPassword'] = ($this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no') === 'yes');
+                }
+
+                $public['expire_date'] = [];
+                $public['multiple_links'] = true;
+                $public['expire_date']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+                if ($public['expire_date']['enabled']) {
+                    $public['expire_date']['days'] = $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+                    $public['expire_date']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+                }
+
+                $public['expire_date_internal'] = [];
+                $public['expire_date_internal']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
+                if ($public['expire_date_internal']['enabled']) {
+                    $public['expire_date_internal']['days'] = $this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
+                    $public['expire_date_internal']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
+                }
+
+                $public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
+                $public['upload'] = $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
+                $public['upload_files_drop'] = $public['upload'];
+            }
+            $res['public'] = $public;
+
+            $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
+
+            $res['user']['send_mail'] = false;
+            $res['user']['expire_date']['enabled'] = true;
+
+            // deprecated in favour of 'group', but we need to keep it for now
+            // in order to stay compatible with older clients
+            $res['group_sharing'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
+
+            $res['group'] = [];
+            $res['group']['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
+            $res['group']['expire_date']['enabled'] = true;
+            $res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
+        }
+
+        //Federated sharing
+        $res['federation'] = [
+            'outgoing' => $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes',
+            'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
+            'expire_date' => ['enabled' => true]
+        ];
+
+        // Sharee searches
+        $res['sharee'] = [
+            'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false)
+        ];
+
+        return [
+            'files_sharing' => $res,
+        ];
+    }
 }

ocs/providers.php

Spacing +4 added lines, -4 removed lines

@@ -23,18 +23,18 @@
  *
  */
 
-require_once __DIR__ . '/../lib/versioncheck.php';
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/versioncheck.php';
+require_once __DIR__.'/../lib/base.php';
 
 header('Content-type: application/xml');
 
 $request = \OC::$server->getRequest();
 
-$url = $request->getServerProtocol() . '://' . substr($request->getServerHost() . $request->getRequestUri(), 0, -17).'ocs/v1.php/';
+$url = $request->getServerProtocol().'://'.substr($request->getServerHost().$request->getRequestUri(), 0, -17).'ocs/v1.php/';
 
 $writer = new XMLWriter();
 $writer->openURI('php://output');
-$writer->startDocument('1.0','UTF-8');
+$writer->startDocument('1.0', 'UTF-8');
 $writer->setIndent(true);
 $writer->startElement('providers');
 $writer->startElement('provider');

lib/public/Files/Config/ICachedMountFileInfo.php

Indentation +12 added lines, -12 removed lines

@@ -27,17 +27,17 @@
  * @since 13.0.0
  */
 interface ICachedMountFileInfo extends ICachedMountInfo {
-	/**
-	 * Return the path for the file within the cached mount
-	 *
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getInternalPath();
+    /**
+     * Return the path for the file within the cached mount
+     *
+     * @return string
+     * @since 13.0.0
+     */
+    public function getInternalPath();
 
-	/**
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getPath();
+    /**
+     * @return string
+     * @since 13.0.0
+     */
+    public function getPath();
 }

lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * @inheritdoc
 	 */
 	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
 	}
 
 	public function iLike($x, $y, $type = null) {

Indentation +9 added lines, -9 removed lines

@@ -24,14 +24,14 @@
 namespace OC\DB\QueryBuilder\ExpressionBuilder;
 
 class SqliteExpressionBuilder extends ExpressionBuilder {
-	/**
-	 * @inheritdoc
-	 */
-	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
-	}
+    /**
+     * @inheritdoc
+     */
+    public function like($x, $y, $type = null) {
+        return parent::like($x, $y, $type) . " ESCAPE '\\'";
+    }
 
-	public function iLike($x, $y, $type = null) {
-		return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y), $type);
-	}
+    public function iLike($x, $y, $type = null) {
+        return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y), $type);
+    }
 }

apps/files_external/lib/Command/Verify.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 
@@ -105,7 +105,7 @@ 
 
 			foreach ($configInput as $configOption) {
 				if (!strpos($configOption, '=')) {
-					$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+					$output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>');
 					return;
 				}
 				list($key, $value) = explode('=', $configOption, 2);
@@ -137,7 +137,7 @@ 
 			// FIXME: convert storage exceptions to StorageNotAvailableException
 			$storage->setStatus(
 				StorageNotAvailableException::STATUS_ERROR,
-				get_class($e) . ': ' . $e->getMessage()
+				get_class($e).': '.$e->getMessage()
 			);
 		}
 	}

Indentation +95 added lines, -95 removed lines

@@ -38,109 +38,109 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Verify extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	public function __construct(GlobalStoragesService $globalService) {
-		parent::__construct();
-		$this->globalService = $globalService;
-	}
+    public function __construct(GlobalStoragesService $globalService) {
+        parent::__construct();
+        $this->globalService = $globalService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:verify')
-			->setDescription('Verify mount configuration')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to check'
-			)->addOption(
-				'config',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'Additional config option to set before checking in key=value pairs, required for certain auth backends such as login credentails'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:verify')
+            ->setDescription('Verify mount configuration')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to check'
+            )->addOption(
+                'config',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'Additional config option to set before checking in key=value pairs, required for certain auth backends such as login credentails'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		$configInput = $input->getOption('config');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        $configInput = $input->getOption('config');
 
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$this->updateStorageStatus($mount, $configInput, $output);
+        $this->updateStorageStatus($mount, $configInput, $output);
 
-		$this->writeArrayInOutputFormat($input, $output, [
-			'status' => StorageNotAvailableException::getStateCodeName($mount->getStatus()),
-			'code' => $mount->getStatus(),
-			'message' => $mount->getStatusMessage()
-		]);
-		return 0;
-	}
+        $this->writeArrayInOutputFormat($input, $output, [
+            'status' => StorageNotAvailableException::getStateCodeName($mount->getStatus()),
+            'code' => $mount->getStatus(),
+            'message' => $mount->getStatusMessage()
+        ]);
+        return 0;
+    }
 
-	private function manipulateStorageConfig(StorageConfig $storage) {
-		/** @var AuthMechanism */
-		$authMechanism = $storage->getAuthMechanism();
-		$authMechanism->manipulateStorageConfig($storage);
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		$backend->manipulateStorageConfig($storage);
-	}
+    private function manipulateStorageConfig(StorageConfig $storage) {
+        /** @var AuthMechanism */
+        $authMechanism = $storage->getAuthMechanism();
+        $authMechanism->manipulateStorageConfig($storage);
+        /** @var Backend */
+        $backend = $storage->getBackend();
+        $backend->manipulateStorageConfig($storage);
+    }
 
-	private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) {
-		try {
-			try {
-				$this->manipulateStorageConfig($storage);
-			} catch (InsufficientDataForMeaningfulAnswerException $e) {
-				if (count($configInput) === 0) { // extra config options might solve the error
-					throw $e;
-				}
-			}
+    private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) {
+        try {
+            try {
+                $this->manipulateStorageConfig($storage);
+            } catch (InsufficientDataForMeaningfulAnswerException $e) {
+                if (count($configInput) === 0) { // extra config options might solve the error
+                    throw $e;
+                }
+            }
 
-			foreach ($configInput as $configOption) {
-				if (!strpos($configOption, '=')) {
-					$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
-					return;
-				}
-				list($key, $value) = explode('=', $configOption, 2);
-				$storage->setBackendOption($key, $value);
-			}
+            foreach ($configInput as $configOption) {
+                if (!strpos($configOption, '=')) {
+                    $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+                    return;
+                }
+                list($key, $value) = explode('=', $configOption, 2);
+                $storage->setBackendOption($key, $value);
+            }
 
-			/** @var Backend */
-			$backend = $storage->getBackend();
-			// update status (can be time-consuming)
-			$storage->setStatus(
-				\OCA\Files_External\MountConfig::getBackendStatus(
-					$backend->getStorageClass(),
-					$storage->getBackendOptions(),
-					false
-				)
-			);
-		} catch (InsufficientDataForMeaningfulAnswerException $e) {
-			$status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE;
-			$storage->setStatus(
-				$status,
-				$e->getMessage()
-			);
-		} catch (StorageNotAvailableException $e) {
-			$storage->setStatus(
-				$e->getCode(),
-				$e->getMessage()
-			);
-		} catch (\Exception $e) {
-			// FIXME: convert storage exceptions to StorageNotAvailableException
-			$storage->setStatus(
-				StorageNotAvailableException::STATUS_ERROR,
-				get_class($e) . ': ' . $e->getMessage()
-			);
-		}
-	}
+            /** @var Backend */
+            $backend = $storage->getBackend();
+            // update status (can be time-consuming)
+            $storage->setStatus(
+                \OCA\Files_External\MountConfig::getBackendStatus(
+                    $backend->getStorageClass(),
+                    $storage->getBackendOptions(),
+                    false
+                )
+            );
+        } catch (InsufficientDataForMeaningfulAnswerException $e) {
+            $status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE;
+            $storage->setStatus(
+                $status,
+                $e->getMessage()
+            );
+        } catch (StorageNotAvailableException $e) {
+            $storage->setStatus(
+                $e->getCode(),
+                $e->getMessage()
+            );
+        } catch (\Exception $e) {
+            // FIXME: convert storage exceptions to StorageNotAvailableException
+            $storage->setStatus(
+                StorageNotAvailableException::STATUS_ERROR,
+                get_class($e) . ': ' . $e->getMessage()
+            );
+        }
+    }
 }

apps/files_external/lib/Lib/Backend/InvalidBackend.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 		$this
 			->setIdentifier($invalidId)
 			->setStorageClass('\OC\Files\Storage\FailedStorage')
-			->setText('Unknown storage backend ' . $invalidId);
+			->setText('Unknown storage backend '.$invalidId);
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	}
 
 	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		$storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR));
+		$storage->setBackendOption('exception', new \Exception('Unknown storage backend "'.$this->invalidId.'"', StorageNotAvailableException::STATUS_ERROR));
 	}
 }
 

Indentation +26 added lines, -26 removed lines

@@ -34,33 +34,33 @@
  */
 class InvalidBackend extends Backend {
 
-	/** @var string Invalid backend id */
-	private $invalidId;
+    /** @var string Invalid backend id */
+    private $invalidId;
 
-	/**
-	 * Constructs a new InvalidBackend with the id of the invalid backend
-	 * for display purposes
-	 *
-	 * @param string $invalidId id of the backend that did not exist
-	 */
-	public function __construct($invalidId) {
-		$this->invalidId = $invalidId;
-		$this
-			->setIdentifier($invalidId)
-			->setStorageClass('\OC\Files\Storage\FailedStorage')
-			->setText('Unknown storage backend ' . $invalidId);
-	}
+    /**
+     * Constructs a new InvalidBackend with the id of the invalid backend
+     * for display purposes
+     *
+     * @param string $invalidId id of the backend that did not exist
+     */
+    public function __construct($invalidId) {
+        $this->invalidId = $invalidId;
+        $this
+            ->setIdentifier($invalidId)
+            ->setStorageClass('\OC\Files\Storage\FailedStorage')
+            ->setText('Unknown storage backend ' . $invalidId);
+    }
 
-	/**
-	 * Returns the invalid backend id
-	 *
-	 * @return string invalid backend id
-	 */
-	public function getInvalidId() {
-		return $this->invalidId;
-	}
+    /**
+     * Returns the invalid backend id
+     *
+     * @return string invalid backend id
+     */
+    public function getInvalidId() {
+        return $this->invalidId;
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		$storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR));
-	}
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        $storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR));
+    }
 }