nextcloud / server

apps/files_external/lib/Lib/Api.php

Indentation +50 added lines, -50 removed lines

@@ -28,61 +28,61 @@
 
 class Api {
 
-	/**
-	 * Formats the given mount config to a mount entry.
-	 *
-	 * @param string $mountPoint mount point name, relative to the data dir
-	 * @param array $mountConfig mount config to format
-	 *
-	 * @return array entry
-	 */
-	private static function formatMount($mountPoint, $mountConfig) {
-		// strip "/$user/files" from mount point
-		$mountPoint = explode('/', trim($mountPoint, '/'), 3);
-		$mountPoint = $mountPoint[2];
+    /**
+     * Formats the given mount config to a mount entry.
+     *
+     * @param string $mountPoint mount point name, relative to the data dir
+     * @param array $mountConfig mount config to format
+     *
+     * @return array entry
+     */
+    private static function formatMount($mountPoint, $mountConfig) {
+        // strip "/$user/files" from mount point
+        $mountPoint = explode('/', trim($mountPoint, '/'), 3);
+        $mountPoint = $mountPoint[2];
 
-		// split path from mount point
-		$path = dirname($mountPoint);
-		if ($path === '.') {
-			$path = '';
-		}
+        // split path from mount point
+        $path = dirname($mountPoint);
+        if ($path === '.') {
+            $path = '';
+        }
 
-		$isSystemMount = !$mountConfig['personal'];
+        $isSystemMount = !$mountConfig['personal'];
 
-		$permissions = \OCP\Constants::PERMISSION_READ;
-		// personal mounts can be deleted
-		if (!$isSystemMount) {
-			$permissions |= \OCP\Constants::PERMISSION_DELETE;
-		}
+        $permissions = \OCP\Constants::PERMISSION_READ;
+        // personal mounts can be deleted
+        if (!$isSystemMount) {
+            $permissions |= \OCP\Constants::PERMISSION_DELETE;
+        }
 
-		$entry = array(
-			'name' => basename($mountPoint),
-			'path' => $path,
-			'type' => 'dir',
-			'backend' => $mountConfig['backend'],
-			'scope' => ( $isSystemMount ? 'system' : 'personal' ),
-			'permissions' => $permissions,
-			'id' => $mountConfig['id'],
-			'class' => $mountConfig['class']
-		);
-		return $entry;
-	}
+        $entry = array(
+            'name' => basename($mountPoint),
+            'path' => $path,
+            'type' => 'dir',
+            'backend' => $mountConfig['backend'],
+            'scope' => ( $isSystemMount ? 'system' : 'personal' ),
+            'permissions' => $permissions,
+            'id' => $mountConfig['id'],
+            'class' => $mountConfig['class']
+        );
+        return $entry;
+    }
 
-	/**
-	 * Returns the mount points visible for this user.
-	 *
-	 * @param array $params
-	 * @return \OC_OCS_Result share information
-	 */
-	public static function getUserMounts($params) {
-		$entries = array();
-		$user = \OC::$server->getUserSession()->getUser()->getUID();
+    /**
+     * Returns the mount points visible for this user.
+     *
+     * @param array $params
+     * @return \OC_OCS_Result share information
+     */
+    public static function getUserMounts($params) {
+        $entries = array();
+        $user = \OC::$server->getUserSession()->getUser()->getUID();
 
-		$mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
-		foreach($mounts as $mountPoint => $mount) {
-			$entries[] = self::formatMount($mountPoint, $mount);
-		}
+        $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
+        foreach($mounts as $mountPoint => $mount) {
+            $entries[] = self::formatMount($mountPoint, $mount);
+        }
 
-		return new \OC_OCS_Result($entries);
-	}
+        return new \OC_OCS_Result($entries);
+    }
 }

apps/files_external/lib/Lib/IdentifierTrait.php

Indentation +62 added lines, -62 removed lines

@@ -28,76 +28,76 @@
  */
 trait IdentifierTrait {
 
-	/** @var string */
-	protected $identifier;
+    /** @var string */
+    protected $identifier;
 
-	/** @var string[] */
-	protected $identifierAliases = [];
+    /** @var string[] */
+    protected $identifierAliases = [];
 
-	/** @var IdentifierTrait */
-	protected $deprecateTo = null;
+    /** @var IdentifierTrait */
+    protected $deprecateTo = null;
 
-	/**
-	 * @return string
-	 */
-	public function getIdentifier() {
-		return $this->identifier;
-	}
+    /**
+     * @return string
+     */
+    public function getIdentifier() {
+        return $this->identifier;
+    }
 
-	/**
-	 * @param string $identifier
-	 * @return self
-	 */
-	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
-		$this->identifierAliases[] = $identifier;
-		return $this;
-	}
+    /**
+     * @param string $identifier
+     * @return self
+     */
+    public function setIdentifier($identifier) {
+        $this->identifier = $identifier;
+        $this->identifierAliases[] = $identifier;
+        return $this;
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getIdentifierAliases() {
-		return $this->identifierAliases;
-	}
+    /**
+     * @return string[]
+     */
+    public function getIdentifierAliases() {
+        return $this->identifierAliases;
+    }
 
-	/**
-	 * @param string $alias
-	 * @return self
-	 */
-	public function addIdentifierAlias($alias) {
-		$this->identifierAliases[] = $alias;
-		return $this;
-	}
+    /**
+     * @param string $alias
+     * @return self
+     */
+    public function addIdentifierAlias($alias) {
+        $this->identifierAliases[] = $alias;
+        return $this;
+    }
 
-	/**
-	 * @return object|null
-	 */
-	public function getDeprecateTo() {
-		return $this->deprecateTo;
-	}
+    /**
+     * @return object|null
+     */
+    public function getDeprecateTo() {
+        return $this->deprecateTo;
+    }
 
-	/**
-	 * @param object $destinationObject
-	 * @return self
-	 */
-	public function deprecateTo($destinationObject) {
-		$this->deprecateTo = $destinationObject;
-		return $this;
-	}
+    /**
+     * @param object $destinationObject
+     * @return self
+     */
+    public function deprecateTo($destinationObject) {
+        $this->deprecateTo = $destinationObject;
+        return $this;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function jsonSerializeIdentifier() {
-		$data = [
-			'identifier' => $this->identifier,
-			'identifierAliases' => $this->identifierAliases,
-		];
-		if ($this->deprecateTo) {
-			$data['deprecateTo'] = $this->deprecateTo->getIdentifier();
-		}
-		return $data;
-	}
+    /**
+     * @return array
+     */
+    public function jsonSerializeIdentifier() {
+        $data = [
+            'identifier' => $this->identifier,
+            'identifierAliases' => $this->identifierAliases,
+        ];
+        if ($this->deprecateTo) {
+            $data['deprecateTo'] = $this->deprecateTo->getIdentifier();
+        }
+        return $data;
+    }
 
 }

apps/files_external/appinfo/update.php

Indentation +2 added lines, -2 removed lines

@@ -27,6 +27,6 @@
 
 // Migration to db config
 if (version_compare($installedVersion, '0.5.0', '<')) {
-	$migrator = $app->getContainer()->query('OCA\Files_External\Migration\StorageMigrator');
-	$migrator->migrateGlobal();
+    $migrator = $app->getContainer()->query('OCA\Files_External\Migration\StorageMigrator');
+    $migrator->migrateGlobal();
 }

apps/files_external/appinfo/routes.php

Indentation +27 added lines, -27 removed lines

@@ -30,40 +30,40 @@
  * @var $this \OCP\Route\IRouter
  **/
 \OC_Mount_Config::$app->registerRoutes(
-	$this,
-	array(
-		'resources' => array(
-			'global_storages' => array('url' => '/globalstorages'),
-			'user_storages' => array('url' => '/userstorages'),
-			'user_global_storages' => array('url' => '/userglobalstorages'),
-		),
-		'routes' => array(
-			array(
-				'name' => 'Ajax#getSshKeys',
-				'url' => '/ajax/public_key.php',
-				'verb' => 'POST',
-				'requirements' => array()
-			),
-			[
-				'name' => 'Ajax#saveGlobalCredentials',
-				'url' => '/globalcredentials',
-				'verb' => 'POST',
-			],
-		)
-	)
+    $this,
+    array(
+        'resources' => array(
+            'global_storages' => array('url' => '/globalstorages'),
+            'user_storages' => array('url' => '/userstorages'),
+            'user_global_storages' => array('url' => '/userglobalstorages'),
+        ),
+        'routes' => array(
+            array(
+                'name' => 'Ajax#getSshKeys',
+                'url' => '/ajax/public_key.php',
+                'verb' => 'POST',
+                'requirements' => array()
+            ),
+            [
+                'name' => 'Ajax#saveGlobalCredentials',
+                'url' => '/globalcredentials',
+                'verb' => 'POST',
+            ],
+        )
+    )
 );
 
 $this->create('files_external_oauth1', 'ajax/oauth1.php')
-	->actionInclude('files_external/ajax/oauth1.php');
+    ->actionInclude('files_external/ajax/oauth1.php');
 $this->create('files_external_oauth2', 'ajax/oauth2.php')
-	->actionInclude('files_external/ajax/oauth2.php');
+    ->actionInclude('files_external/ajax/oauth2.php');
 
 
 $this->create('files_external_list_applicable', '/applicable')
-	->actionInclude('files_external/ajax/applicable.php');
+    ->actionInclude('files_external/ajax/applicable.php');
 
 \OCP\API::register('get',
-		'/apps/files_external/api/v1/mounts',
-		array('\OCA\Files_External\Lib\Api', 'getUserMounts'),
-		'files_external');
+        '/apps/files_external/api/v1/mounts',
+        array('\OCA\Files_External\Lib\Api', 'getUserMounts'),
+        'files_external');
 

apps/files_external/appinfo/app.php

Indentation +5 added lines, -5 removed lines

@@ -40,11 +40,11 @@
 $l = \OC::$server->getL10N('files_external');
 
 \OCA\Files\App::getNavigationManager()->add([
-	"id" => 'extstoragemounts',
-	"appname" => 'files_external',
-	"script" => 'list.php',
-	"order" => 30,
-	"name" => $l->t('External storage')
+    "id" => 'extstoragemounts',
+    "appname" => 'files_external',
+    "script" => 'list.php',
+    "order" => 30,
+    "name" => $l->t('External storage')
 ]);
 
 $mountProvider = $appContainer->query('OCA\Files_External\Config\ConfigAdapter');

apps/systemtags/lib/Settings/Admin.php

Indentation +22 added lines, -22 removed lines

@@ -28,29 +28,29 @@
 
 class Admin implements ISettings {
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		return new TemplateResponse('systemtags', 'admin', [], '');
-	}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        return new TemplateResponse('systemtags', 'admin', [], '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'workflow';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'workflow';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 70;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 70;
+    }
 
 }

apps/files_sharing/ajax/shareinfo.php

Indentation +27 added lines, -27 removed lines

@@ -30,28 +30,28 @@ 
 OCP\JSON::checkAppEnabled('files_sharing');
 
 if (!isset($_GET['t'])) {
-	\OC_Response::setStatus(400); //400 Bad Request
-	exit;
+    \OC_Response::setStatus(400); //400 Bad Request
+    exit;
 }
 
 $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
 $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
 
 if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false) {
-	\OC_Response::setStatus(404); // 404 not found
-	exit;
+    \OC_Response::setStatus(404); // 404 not found
+    exit;
 }
 
 $token = $_GET['t'];
 
 $password = null;
 if (isset($_POST['password'])) {
-	$password = $_POST['password'];
+    $password = $_POST['password'];
 }
 
 $relativePath = null;
 if (isset($_GET['dir'])) {
-	$relativePath = $_GET['dir'];
+    $relativePath = $_GET['dir'];
 }
 
 $data = \OCA\Files_Sharing\Helper::setupFromToken($token, $relativePath, $password);
@@ -63,20 +63,20 @@ 
 
 $isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 if (!$isWritable) {
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
-	});
-	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+    $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+    \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+        return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
+    });
+    \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 }
 
 $rootInfo = \OC\Files\Filesystem::getFileInfo($path);
 $rootView = new \OC\Files\View('');
 
 if($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
-	OCP\JSON::error(array('data' => 'Share is not readable.'));
-	exit();
+    OCP\JSON::error(array('data' => 'Share is not readable.'));
+    exit();
 }
 
 /**
@@ -85,18 +85,18 @@ 
  * @return array
  */
 function getChildInfo($dir, $view, $sharePermissions) {
-	$children = $view->getDirectoryContent($dir->getPath());
-	$result = array();
-	foreach ($children as $child) {
-		$formatted = \OCA\Files\Helper::formatFileInfo($child);
-		if ($child->getType() === 'dir') {
-			$formatted['children'] = getChildInfo($child, $view, $sharePermissions);
-		}
-		$formatted['mtime'] = $formatted['mtime'] / 1000;
-		$formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
-		$result[] = $formatted;
-	}
-	return $result;
+    $children = $view->getDirectoryContent($dir->getPath());
+    $result = array();
+    foreach ($children as $child) {
+        $formatted = \OCA\Files\Helper::formatFileInfo($child);
+        if ($child->getType() === 'dir') {
+            $formatted['children'] = getChildInfo($child, $view, $sharePermissions);
+        }
+        $formatted['mtime'] = $formatted['mtime'] / 1000;
+        $formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
+        $result[] = $formatted;
+    }
+    return $result;
 }
 
 $result = \OCA\Files\Helper::formatFileInfo($rootInfo);
@@ -105,7 +105,7 @@ 
 
 
 if ($rootInfo->getType() === 'dir') {
-	$result['children'] = getChildInfo($rootInfo, $rootView, $share->getPermissions());
+    $result['children'] = getChildInfo($rootInfo, $rootView, $share->getPermissions());
 }
 
 OCP\JSON::success(array('data' => $result));

apps/files_sharing/lib/ExpireSharesJob.php

Indentation +38 added lines, -38 removed lines

@@ -29,49 +29,49 @@
  */
 class ExpireSharesJob extends TimedJob {
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$logger = \OC::$server->getLogger();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
+        $logger = \OC::$server->getLogger();
 
-		//Current time
-		$now = new \DateTime();
-		$now = $now->format('Y-m-d H:i:s');
+        //Current time
+        $now = new \DateTime();
+        $now = $now->format('Y-m-d H:i:s');
 
-		/*
+        /*
 		 * Expire file link shares only (for now)
 		 */
-		$qb = $connection->getQueryBuilder();
-		$qb->select('id', 'file_source', 'uid_owner', 'item_type')
-			->from('share')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
-					$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
-					$qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->expr()->literal('file')),
-						$qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
-					)
-				)
-			);
+        $qb = $connection->getQueryBuilder();
+        $qb->select('id', 'file_source', 'uid_owner', 'item_type')
+            ->from('share')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
+                    $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
+                    )
+                )
+            );
 
-		$shares = $qb->execute();
-		while($share = $shares->fetch()) {
-			\OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
-		}
-		$shares->closeCursor();
-	}
+        $shares = $qb->execute();
+        while($share = $shares->fetch()) {
+            \OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
+        }
+        $shares->closeCursor();
+    }
 
 }

apps/files_sharing/lib/Exceptions/BrokenPath.php

Indentation -1 removed lines

@@ -27,7 +27,6 @@
  * Expected path with a different root
  * Possible Error Codes:
  * 10 - Path not relative to data/ and point to the users file directory
-
  */
 class BrokenPath extends \Exception {
 }