Completed
Pull Request — master (#7994)
by Robin
21:10
created
apps/files_external/lib/Lib/Backend/Swift.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -33,31 +33,31 @@
 block discarded – undo
33 33
 
34 34
 class Swift extends Backend {
35 35
 
36
-	use LegacyDependencyCheckPolyfill;
36
+    use LegacyDependencyCheckPolyfill;
37 37
 
38
-	public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
39
-		$this
40
-			->setIdentifier('swift')
41
-			->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
42
-			->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
43
-			->setText($l->t('OpenStack Object Storage'))
44
-			->addParameters([
45
-				(new DefinitionParameter('service_name', $l->t('Service name')))
46
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
47
-				(new DefinitionParameter('region', $l->t('Region')))
48
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
49
-				(new DefinitionParameter('bucket', $l->t('Bucket'))),
50
-				(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
51
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
52
-			])
53
-			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
54
-			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
55
-				if (isset($params['options']['key']) && $params['options']['key']) {
56
-					return $rackspaceAuth;
57
-				}
58
-				return $openstackAuth;
59
-			})
60
-		;
61
-	}
38
+    public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
39
+        $this
40
+            ->setIdentifier('swift')
41
+            ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
42
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
43
+            ->setText($l->t('OpenStack Object Storage'))
44
+            ->addParameters([
45
+                (new DefinitionParameter('service_name', $l->t('Service name')))
46
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
47
+                (new DefinitionParameter('region', $l->t('Region')))
48
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
49
+                (new DefinitionParameter('bucket', $l->t('Bucket'))),
50
+                (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
51
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
52
+            ])
53
+            ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
54
+            ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
55
+                if (isset($params['options']['key']) && $params['options']['key']) {
56
+                    return $rackspaceAuth;
57
+                }
58
+                return $openstackAuth;
59
+            })
60
+        ;
61
+    }
62 62
 
63 63
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Backend/OwnCloud.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -32,22 +32,22 @@
 block discarded – undo
32 32
 
33 33
 class OwnCloud extends Backend {
34 34
 
35
-	public function __construct(IL10N $l, Password $legacyAuth) {
36
-		$this
37
-			->setIdentifier('owncloud')
38
-			->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
39
-			->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
40
-			->setText($l->t('Nextcloud'))
41
-			->addParameters([
42
-				(new DefinitionParameter('host', $l->t('URL'))),
43
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
44
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
45
-				(new DefinitionParameter('secure', $l->t('Secure https://')))
46
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
47
-			])
48
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
49
-			->setLegacyAuthMechanism($legacyAuth)
50
-		;
51
-	}
35
+    public function __construct(IL10N $l, Password $legacyAuth) {
36
+        $this
37
+            ->setIdentifier('owncloud')
38
+            ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
39
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
40
+            ->setText($l->t('Nextcloud'))
41
+            ->addParameters([
42
+                (new DefinitionParameter('host', $l->t('URL'))),
43
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
44
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
45
+                (new DefinitionParameter('secure', $l->t('Secure https://')))
46
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
47
+            ])
48
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
49
+            ->setLegacyAuthMechanism($legacyAuth)
50
+        ;
51
+    }
52 52
 
53 53
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Backend/SFTP_Key.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -32,20 +32,20 @@
 block discarded – undo
32 32
 
33 33
 class SFTP_Key extends Backend {
34 34
 
35
-	public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
36
-		$this
37
-			->setIdentifier('\OC\Files\Storage\SFTP_Key')
38
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
39
-			->setText($l->t('SFTP with secret key login'))
40
-			->addParameters([
41
-				(new DefinitionParameter('host', $l->t('Host'))),
42
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
43
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
44
-			])
45
-			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
46
-			->setLegacyAuthMechanism($legacyAuth)
47
-			->deprecateTo($sftpBackend)
48
-		;
49
-	}
35
+    public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
36
+        $this
37
+            ->setIdentifier('\OC\Files\Storage\SFTP_Key')
38
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
39
+            ->setText($l->t('SFTP with secret key login'))
40
+            ->addParameters([
41
+                (new DefinitionParameter('host', $l->t('Host'))),
42
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
43
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
44
+            ])
45
+            ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
46
+            ->setLegacyAuthMechanism($legacyAuth)
47
+            ->deprecateTo($sftpBackend)
48
+        ;
49
+    }
50 50
 
51 51
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Backend/SMB.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -35,36 +35,36 @@
 block discarded – undo
35 35
 
36 36
 class SMB extends Backend {
37 37
 
38
-	use LegacyDependencyCheckPolyfill;
38
+    use LegacyDependencyCheckPolyfill;
39 39
 
40
-	public function __construct(IL10N $l, Password $legacyAuth) {
41
-		$this
42
-			->setIdentifier('smb')
43
-			->addIdentifierAlias('\OC\Files\Storage\SMB') // legacy compat
44
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
45
-			->setText($l->t('SMB / CIFS'))
46
-			->addParameters([
47
-				(new DefinitionParameter('host', $l->t('Host'))),
48
-				(new DefinitionParameter('share', $l->t('Share'))),
49
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
50
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
51
-				(new DefinitionParameter('domain', $l->t('Domain')))
52
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
53
-			])
54
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
55
-			->setLegacyAuthMechanism($legacyAuth)
56
-		;
57
-	}
40
+    public function __construct(IL10N $l, Password $legacyAuth) {
41
+        $this
42
+            ->setIdentifier('smb')
43
+            ->addIdentifierAlias('\OC\Files\Storage\SMB') // legacy compat
44
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
45
+            ->setText($l->t('SMB / CIFS'))
46
+            ->addParameters([
47
+                (new DefinitionParameter('host', $l->t('Host'))),
48
+                (new DefinitionParameter('share', $l->t('Share'))),
49
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
50
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
51
+                (new DefinitionParameter('domain', $l->t('Domain')))
52
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
53
+            ])
54
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
55
+            ->setLegacyAuthMechanism($legacyAuth)
56
+        ;
57
+    }
58 58
 
59
-	/**
60
-	 * @param StorageConfig $storage
61
-	 * @param IUser $user
62
-	 */
63
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
64
-		$user = $storage->getBackendOption('user');
65
-		if ($domain = $storage->getBackendOption('domain')) {
66
-			$storage->setBackendOption('user', $domain.'\\'.$user);
67
-		}
68
-	}
59
+    /**
60
+     * @param StorageConfig $storage
61
+     * @param IUser $user
62
+     */
63
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
64
+        $user = $storage->getBackendOption('user');
65
+        if ($domain = $storage->getBackendOption('domain')) {
66
+            $storage->setBackendOption('user', $domain.'\\'.$user);
67
+        }
68
+    }
69 69
 
70 70
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Backend/SMB_OC.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -38,36 +38,36 @@
 block discarded – undo
38 38
  */
39 39
 class SMB_OC extends Backend {
40 40
 
41
-	use LegacyDependencyCheckPolyfill;
41
+    use LegacyDependencyCheckPolyfill;
42 42
 
43
-	public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
44
-		$this
45
-			->setIdentifier('\OC\Files\Storage\SMB_OC')
46
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
47
-			->setText($l->t('SMB / CIFS using OC login'))
48
-			->addParameters([
49
-				(new DefinitionParameter('host', $l->t('Host'))),
50
-				(new DefinitionParameter('username_as_share', $l->t('Username as share')))
51
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
52
-				(new DefinitionParameter('share', $l->t('Share')))
53
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
54
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
55
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
56
-			])
57
-			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
58
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
59
-			->setLegacyAuthMechanism($legacyAuth)
60
-			->deprecateTo($smbBackend)
61
-		;
62
-	}
43
+    public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
44
+        $this
45
+            ->setIdentifier('\OC\Files\Storage\SMB_OC')
46
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
47
+            ->setText($l->t('SMB / CIFS using OC login'))
48
+            ->addParameters([
49
+                (new DefinitionParameter('host', $l->t('Host'))),
50
+                (new DefinitionParameter('username_as_share', $l->t('Username as share')))
51
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
52
+                (new DefinitionParameter('share', $l->t('Share')))
53
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
54
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
55
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
56
+            ])
57
+            ->setPriority(BackendService::PRIORITY_DEFAULT - 10)
58
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
59
+            ->setLegacyAuthMechanism($legacyAuth)
60
+            ->deprecateTo($smbBackend)
61
+        ;
62
+    }
63 63
 
64
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
65
-		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
64
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
65
+        $username_as_share = ($storage->getBackendOption('username_as_share') === true);
66 66
 
67
-		if ($username_as_share) {
68
-			$share = '/' . $storage->getBackendOption('user');
69
-			$storage->setBackendOption('share', $share);
70
-		}
71
-	}
67
+        if ($username_as_share) {
68
+            $share = '/' . $storage->getBackendOption('user');
69
+            $storage->setBackendOption('share', $share);
70
+        }
71
+    }
72 72
 
73 73
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
 		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
66 66
 
67 67
 		if ($username_as_share) {
68
-			$share = '/' . $storage->getBackendOption('user');
68
+			$share = '/'.$storage->getBackendOption('user');
69 69
 			$storage->setBackendOption('share', $share);
70 70
 		}
71 71
 	}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/MissingDependency.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -27,39 +27,39 @@
 block discarded – undo
27 27
  */
28 28
 class MissingDependency {
29 29
 
30
-	/** @var string */
31
-	private $dependency;
30
+    /** @var string */
31
+    private $dependency;
32 32
 
33
-	/** @var string|null Custom message */
34
-	private $message = null;
33
+    /** @var string|null Custom message */
34
+    private $message = null;
35 35
 
36
-	/**
37
-	 * @param string $dependency
38
-	 */
39
-	public function __construct($dependency) {
40
-		$this->dependency = $dependency;
41
-	}
36
+    /**
37
+     * @param string $dependency
38
+     */
39
+    public function __construct($dependency) {
40
+        $this->dependency = $dependency;
41
+    }
42 42
 
43
-	/**
44
-	 * @return string
45
-	 */
46
-	public function getDependency() {
47
-		return $this->dependency;
48
-	}
43
+    /**
44
+     * @return string
45
+     */
46
+    public function getDependency() {
47
+        return $this->dependency;
48
+    }
49 49
 
50
-	/**
51
-	 * @return string|null
52
-	 */
53
-	public function getMessage() {
54
-		return $this->message;
55
-	}
50
+    /**
51
+     * @return string|null
52
+     */
53
+    public function getMessage() {
54
+        return $this->message;
55
+    }
56 56
 
57
-	/**
58
-	 * @param string $message
59
-	 * @return self
60
-	 */
61
-	public function setMessage($message) {
62
-		$this->message = $message;
63
-		return $this;
64
-	}
57
+    /**
58
+     * @param string $message
59
+     * @return self
60
+     */
61
+    public function setMessage($message) {
62
+        $this->message = $message;
63
+        return $this;
64
+    }
65 65
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/DependencyTrait.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,14 +29,14 @@
 block discarded – undo
29 29
  */
30 30
 trait DependencyTrait {
31 31
 
32
-	/**
33
-	 * Check if object is valid for use
34
-	 *
35
-	 * @return MissingDependency[] Unsatisfied dependencies
36
-	 */
37
-	public function checkDependencies() {
38
-		return []; // no dependencies by default
39
-	}
32
+    /**
33
+     * Check if object is valid for use
34
+     *
35
+     * @return MissingDependency[] Unsatisfied dependencies
36
+     */
37
+    public function checkDependencies() {
38
+        return []; // no dependencies by default
39
+    }
40 40
 
41 41
 }
42 42
 
Please login to merge, or discard this patch.
apps/systemtags/templates/admin.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -20,10 +20,10 @@
 block discarded – undo
20 20
  */
21 21
 
22 22
 script('core', [
23
-	'oc-backbone-webdav',
24
-	'systemtags/systemtags',
25
-	'systemtags/systemtagmodel',
26
-	'systemtags/systemtagscollection',
23
+    'oc-backbone-webdav',
24
+    'systemtags/systemtags',
25
+    'systemtags/systemtagmodel',
26
+    'systemtags/systemtagscollection',
27 27
 ]);
28 28
 
29 29
 script('systemtags', 'admin');
Please login to merge, or discard this patch.
apps/systemtags/templates/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@
 block discarded – undo
18 18
 		<tr>
19 19
 			<th id='headerName' class="hidden column-name">
20 20
 				<div id="headerName-container">
21
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
21
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
22 22
 				</div>
23 23
 			</th>
24 24
 			<th id="headerSize" class="hidden column-size">
25 25
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
26 26
 			</th>
27 27
 			<th id="headerDate" class="hidden column-mtime">
28
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
28
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
29 29
 			</th>
30 30
 		</tr>
31 31
 	</thead>
Please login to merge, or discard this patch.