Passed
Push — master ( 9a6d60...09efdf )
by Morris
12:40 queued 01:53
created
apps/files_sharing/lib/Migration/OwncloudGuestShareType.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 
69 69
 		$query = $this->connection->getQueryBuilder();
70 70
 		$query->update('share')
71
-			->set('share_type',  $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
71
+			->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
72 72
 			->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
73 73
 		$query->execute();
74 74
 	}
Please login to merge, or discard this patch.
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -36,47 +36,47 @@
 block discarded – undo
36 36
  */
37 37
 class OwncloudGuestShareType implements IRepairStep {
38 38
 
39
-	/** @var IDBConnection */
40
-	private $connection;
39
+    /** @var IDBConnection */
40
+    private $connection;
41 41
 
42
-	/** @var  IConfig */
43
-	private $config;
42
+    /** @var  IConfig */
43
+    private $config;
44 44
 
45 45
 
46
-	public function __construct(IDBConnection $connection, IConfig $config) {
47
-		$this->connection = $connection;
48
-		$this->config = $config;
49
-	}
46
+    public function __construct(IDBConnection $connection, IConfig $config) {
47
+        $this->connection = $connection;
48
+        $this->config = $config;
49
+    }
50 50
 
51
-	/**
52
-	 * Returns the step's name
53
-	 *
54
-	 * @return string
55
-	 * @since 9.1.0
56
-	 */
57
-	public function getName() {
58
-		return 'Fix the share type of guest shares when migrating from ownCloud';
59
-	}
51
+    /**
52
+     * Returns the step's name
53
+     *
54
+     * @return string
55
+     * @since 9.1.0
56
+     */
57
+    public function getName() {
58
+        return 'Fix the share type of guest shares when migrating from ownCloud';
59
+    }
60 60
 
61
-	/**
62
-	 * @param IOutput $output
63
-	 */
64
-	public function run(IOutput $output) {
65
-		if (!$this->shouldRun()) {
66
-			return;
67
-		}
61
+    /**
62
+     * @param IOutput $output
63
+     */
64
+    public function run(IOutput $output) {
65
+        if (!$this->shouldRun()) {
66
+            return;
67
+        }
68 68
 
69
-		$query = $this->connection->getQueryBuilder();
70
-		$query->update('share')
71
-			->set('share_type',  $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
72
-			->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
73
-		$query->execute();
74
-	}
69
+        $query = $this->connection->getQueryBuilder();
70
+        $query->update('share')
71
+            ->set('share_type',  $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
72
+            ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
73
+        $query->execute();
74
+    }
75 75
 
76
-	protected function shouldRun() {
77
-		$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
78
-		return $appVersion === '0.10.0' ||
79
-			$this->config->getAppValue('core', 'vendor', '') === 'owncloud';
80
-	}
76
+    protected function shouldRun() {
77
+        $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
78
+        return $appVersion === '0.10.0' ||
79
+            $this->config->getAppValue('core', 'vendor', '') === 'owncloud';
80
+    }
81 81
 
82 82
 }
Please login to merge, or discard this patch.
apps/files_sharing/lib/Migration/SetPasswordColumn.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -36,62 +36,62 @@
 block discarded – undo
36 36
  */
37 37
 class SetPasswordColumn implements IRepairStep {
38 38
 
39
-	/** @var IDBConnection */
40
-	private $connection;
41
-
42
-	/** @var  IConfig */
43
-	private $config;
44
-
45
-
46
-	public function __construct(IDBConnection $connection, IConfig $config) {
47
-		$this->connection = $connection;
48
-		$this->config = $config;
49
-	}
50
-
51
-	/**
52
-	 * Returns the step's name
53
-	 *
54
-	 * @return string
55
-	 * @since 9.1.0
56
-	 */
57
-	public function getName() {
58
-		return 'Copy the share password into the dedicated column';
59
-	}
60
-
61
-	/**
62
-	 * @param IOutput $output
63
-	 */
64
-	public function run(IOutput $output) {
65
-		if (!$this->shouldRun()) {
66
-			return;
67
-		}
68
-
69
-		$query = $this->connection->getQueryBuilder();
70
-		$query
71
-			->update('share')
72
-			->set('password', 'share_with')
73
-			->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_LINK)))
74
-			->andWhere($query->expr()->isNotNull('share_with'));
75
-		$result = $query->execute();
76
-
77
-		if ($result === 0) {
78
-			// No link updated, no need to run the second query
79
-			return;
80
-		}
81
-
82
-		$clearQuery = $this->connection->getQueryBuilder();
83
-		$clearQuery
84
-			->update('share')
85
-			->set('share_with', $clearQuery->createNamedParameter(null))
86
-			->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(Share::SHARE_TYPE_LINK)));
87
-
88
-		$clearQuery->execute();
89
-
90
-	}
91
-
92
-	protected function shouldRun() {
93
-		$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
94
-		return version_compare($appVersion, '1.4.0', '<');
95
-	}
39
+    /** @var IDBConnection */
40
+    private $connection;
41
+
42
+    /** @var  IConfig */
43
+    private $config;
44
+
45
+
46
+    public function __construct(IDBConnection $connection, IConfig $config) {
47
+        $this->connection = $connection;
48
+        $this->config = $config;
49
+    }
50
+
51
+    /**
52
+     * Returns the step's name
53
+     *
54
+     * @return string
55
+     * @since 9.1.0
56
+     */
57
+    public function getName() {
58
+        return 'Copy the share password into the dedicated column';
59
+    }
60
+
61
+    /**
62
+     * @param IOutput $output
63
+     */
64
+    public function run(IOutput $output) {
65
+        if (!$this->shouldRun()) {
66
+            return;
67
+        }
68
+
69
+        $query = $this->connection->getQueryBuilder();
70
+        $query
71
+            ->update('share')
72
+            ->set('password', 'share_with')
73
+            ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_LINK)))
74
+            ->andWhere($query->expr()->isNotNull('share_with'));
75
+        $result = $query->execute();
76
+
77
+        if ($result === 0) {
78
+            // No link updated, no need to run the second query
79
+            return;
80
+        }
81
+
82
+        $clearQuery = $this->connection->getQueryBuilder();
83
+        $clearQuery
84
+            ->update('share')
85
+            ->set('share_with', $clearQuery->createNamedParameter(null))
86
+            ->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(Share::SHARE_TYPE_LINK)));
87
+
88
+        $clearQuery->execute();
89
+
90
+    }
91
+
92
+    protected function shouldRun() {
93
+        $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
94
+        return version_compare($appVersion, '1.4.0', '<');
95
+    }
96 96
 
97 97
 }
Please login to merge, or discard this patch.
config/config.sample.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
  *   ubos-raspberry-pi.local and ubos-raspberry-pi-2.local
68 68
  */
69 69
 'trusted_domains' =>
70
-  array (
70
+  array(
71 71
     'demo.example.org',
72 72
     'otherdomain.example.org',
73 73
   ),
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
  *
193 193
  * Defaults to ``60*60*24*15`` seconds (15 days)
194 194
  */
195
-'remember_login_cookie_lifetime' => 60*60*24*15,
195
+'remember_login_cookie_lifetime' => 60 * 60 * 24 * 15,
196 196
 
197 197
 /**
198 198
  * The lifetime of a session after inactivity.
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
  * See https://redis.io/topics/cluster-spec for details about the Redis cluster
1075 1075
  */
1076 1076
 'redis.cluster' => [
1077
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1077
+	'seeds' => [// provide some/all of the cluster servers to bootstrap discovery, port required
1078 1078
 		'localhost:7000',
1079 1079
 		'localhost:7001'
1080 1080
 	],
@@ -1138,7 +1138,7 @@  discard block
 block discarded – undo
1138 1138
  *
1139 1139
  * Defaults to ``60*60*24`` (1 day)
1140 1140
  */
1141
-'cache_chunk_gc_ttl' => 60*60*24,
1141
+'cache_chunk_gc_ttl' => 60 * 60 * 24,
1142 1142
 
1143 1143
 /**
1144 1144
  * Using Object Store with Nextcloud
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
  * Defaults to ``60*60`` seconds (1 hour) or the php
1463 1463
  *             max_execution_time, whichever is higher.
1464 1464
  */
1465
-'filelocking.ttl' => 60*60,
1465
+'filelocking.ttl' => 60 * 60,
1466 1466
 
1467 1467
 /**
1468 1468
  * Memory caching backend for file locking
Please login to merge, or discard this patch.
Indentation   +134 added lines, -134 removed lines patch added patch discarded remove patch
@@ -41,17 +41,17 @@  discard block
 block discarded – undo
41 41
  */
42 42
 'instanceid' => '',
43 43
 
44
- /**
45
-  * The salt used to hash all passwords, auto-generated by the Nextcloud
46
-  * installer. (There are also per-user salts.) If you lose this salt you lose
47
-  * all your passwords. This example is for documentation only, and you should
48
-  * never use it.
49
-  *
50
-  * @deprecated This salt is deprecated and only used for legacy-compatibility,
51
-  * developers should *NOT* use this value for anything nowadays.
52
-  *
53
-  * 'passwordsalt' => 'd3c944a9af095aa08f',
54
- */
44
+    /**
45
+     * The salt used to hash all passwords, auto-generated by the Nextcloud
46
+     * installer. (There are also per-user salts.) If you lose this salt you lose
47
+     * all your passwords. This example is for documentation only, and you should
48
+     * never use it.
49
+     *
50
+     * @deprecated This salt is deprecated and only used for legacy-compatibility,
51
+     * developers should *NOT* use this value for anything nowadays.
52
+     *
53
+     * 'passwordsalt' => 'd3c944a9af095aa08f',
54
+     */
55 55
 'passwordsalt' => '',
56 56
 
57 57
 /**
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
  *   ubos-raspberry-pi.local and ubos-raspberry-pi-2.local
68 68
  */
69 69
 'trusted_domains' =>
70
-  array (
70
+    array (
71 71
     'demo.example.org',
72 72
     'otherdomain.example.org',
73
-  ),
73
+    ),
74 74
 
75 75
 
76 76
 /**
@@ -283,10 +283,10 @@  discard block
 block discarded – undo
283 283
  * IMAP (OC_User_IMAP), SMB (OC_User_SMB), and FTP (OC_User_FTP).
284 284
  */
285 285
 'user_backends' => array(
286
-	array(
287
-		'class' => 'OC_User_IMAP',
288
-		'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX')
289
-	)
286
+    array(
287
+        'class' => 'OC_User_IMAP',
288
+        'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX')
289
+    )
290 290
 ),
291 291
 
292 292
 /**
@@ -762,9 +762,9 @@  discard block
 block discarded – undo
762 762
  * Defaults to an empty array.
763 763
  */
764 764
 'log.condition' => [
765
-	'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
766
-	'users' => ['sample-user'],
767
-	'apps' => ['files'],
765
+    'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
766
+    'users' => ['sample-user'],
767
+    'apps' => ['files'],
768 768
 ],
769 769
 
770 770
 /**
@@ -818,18 +818,18 @@  discard block
 block discarded – undo
818 818
  *  - iOS client app id: ``1125420102``
819 819
  */
820 820
 'customclient_desktop' =>
821
-	'https://nextcloud.com/install/#install-clients',
821
+    'https://nextcloud.com/install/#install-clients',
822 822
 'customclient_android' =>
823
-	'https://play.google.com/store/apps/details?id=com.nextcloud.client',
823
+    'https://play.google.com/store/apps/details?id=com.nextcloud.client',
824 824
 'customclient_ios' =>
825
-	'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
825
+    'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
826 826
 'customclient_ios_appid' =>
827
-		'1125420102',
827
+        '1125420102',
828 828
 /**
829
- * Apps
830
- *
831
- * Options for the Apps folder, Apps store, and App code checker.
832
- */
829
+         * Apps
830
+         *
831
+         * Options for the Apps folder, Apps store, and App code checker.
832
+         */
833 833
 
834 834
 /**
835 835
  * When enabled, admins may install apps from the Nextcloud app store.
@@ -847,11 +847,11 @@  discard block
 block discarded – undo
847 847
  * indicates if a Web server can write files to that folder.
848 848
  */
849 849
 'apps_paths' => array(
850
-	array(
851
-		'path'=> '/var/www/nextcloud/apps',
852
-		'url' => '/apps',
853
-		'writable' => true,
854
-	),
850
+    array(
851
+        'path'=> '/var/www/nextcloud/apps',
852
+        'url' => '/apps',
853
+        'writable' => true,
854
+    ),
855 855
 ),
856 856
 
857 857
 /**
@@ -916,8 +916,8 @@  discard block
 block discarded – undo
916 916
  * Defaults to ``''`` (empty string)
917 917
  */
918 918
 'preview_office_cl_parameters' =>
919
-	' --headless --nologo --nofirststartwizard --invisible --norestore '.
920
-	'--convert-to png --outdir ',
919
+    ' --headless --nologo --nofirststartwizard --invisible --norestore '.
920
+    '--convert-to png --outdir ',
921 921
 
922 922
 /**
923 923
  * Only register providers that have been explicitly enabled
@@ -961,15 +961,15 @@  discard block
 block discarded – undo
961 961
  *  - OC\Preview\XBitmap
962 962
  */
963 963
 'enabledPreviewProviders' => array(
964
-	'OC\Preview\PNG',
965
-	'OC\Preview\JPEG',
966
-	'OC\Preview\GIF',
967
-	'OC\Preview\HEIC',
968
-	'OC\Preview\BMP',
969
-	'OC\Preview\XBitmap',
970
-	'OC\Preview\MP3',
971
-	'OC\Preview\TXT',
972
-	'OC\Preview\MarkDown'
964
+    'OC\Preview\PNG',
965
+    'OC\Preview\JPEG',
966
+    'OC\Preview\GIF',
967
+    'OC\Preview\HEIC',
968
+    'OC\Preview\BMP',
969
+    'OC\Preview\XBitmap',
970
+    'OC\Preview\MP3',
971
+    'OC\Preview\TXT',
972
+    'OC\Preview\MarkDown'
973 973
 ),
974 974
 
975 975
 /**
@@ -1045,11 +1045,11 @@  discard block
 block discarded – undo
1045 1045
 
1046 1046
 /**
1047 1047
  * Extra SSL options to be used for configuration.
1048
-  *
1048
+ *
1049 1049
  * Defaults to an empty array.
1050 1050
  */
1051 1051
 'openssl' => array(
1052
-	'config' => '/absolute/location/of/openssl.cnf',
1052
+    'config' => '/absolute/location/of/openssl.cnf',
1053 1053
 ),
1054 1054
 
1055 1055
 /**
@@ -1097,11 +1097,11 @@  discard block
 block discarded – undo
1097 1097
  * for more information.
1098 1098
  */
1099 1099
 'redis' => [
1100
-	'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1101
-	'port' => 6379,
1102
-	'timeout' => 0.0,
1103
-	'password' => '', // Optional, if not defined no password will be used.
1104
-	'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
1100
+    'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1101
+    'port' => 6379,
1102
+    'timeout' => 0.0,
1103
+    'password' => '', // Optional, if not defined no password will be used.
1104
+    'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
1105 1105
 ],
1106 1106
 
1107 1107
 /**
@@ -1127,13 +1127,13 @@  discard block
 block discarded – undo
1127 1127
  * See https://redis.io/topics/cluster-spec for details about the Redis cluster
1128 1128
  */
1129 1129
 'redis.cluster' => [
1130
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1131
-		'localhost:7000',
1132
-		'localhost:7001'
1133
-	],
1134
-	'timeout' => 0.0,
1135
-	'read_timeout' => 0.0,
1136
-	'failover_mode' => \RedisCluster::FAILOVER_ERROR
1130
+    'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1131
+        'localhost:7000',
1132
+        'localhost:7001'
1133
+    ],
1134
+    'timeout' => 0.0,
1135
+    'read_timeout' => 0.0,
1136
+    'failover_mode' => \RedisCluster::FAILOVER_ERROR
1137 1137
 ],
1138 1138
 
1139 1139
 
@@ -1141,35 +1141,35 @@  discard block
 block discarded – undo
1141 1141
  * Server details for one or more memcached servers to use for memory caching.
1142 1142
  */
1143 1143
 'memcached_servers' => array(
1144
-	// hostname, port and optional weight. Also see:
1145
-	// http://www.php.net/manual/en/memcached.addservers.php
1146
-	// http://www.php.net/manual/en/memcached.addserver.php
1147
-	array('localhost', 11211),
1148
-	//array('other.host.local', 11211),
1144
+    // hostname, port and optional weight. Also see:
1145
+    // http://www.php.net/manual/en/memcached.addservers.php
1146
+    // http://www.php.net/manual/en/memcached.addserver.php
1147
+    array('localhost', 11211),
1148
+    //array('other.host.local', 11211),
1149 1149
 ),
1150 1150
 
1151 1151
 /**
1152 1152
  * Connection options for memcached, see http://apprize.info/php/scaling/15.html
1153 1153
  */
1154 1154
 'memcached_options' => array(
1155
-	// Set timeouts to 50ms
1156
-	\Memcached::OPT_CONNECT_TIMEOUT => 50,
1157
-	\Memcached::OPT_RETRY_TIMEOUT =>   50,
1158
-	\Memcached::OPT_SEND_TIMEOUT =>    50,
1159
-	\Memcached::OPT_RECV_TIMEOUT =>    50,
1160
-	\Memcached::OPT_POLL_TIMEOUT =>    50,
1155
+    // Set timeouts to 50ms
1156
+    \Memcached::OPT_CONNECT_TIMEOUT => 50,
1157
+    \Memcached::OPT_RETRY_TIMEOUT =>   50,
1158
+    \Memcached::OPT_SEND_TIMEOUT =>    50,
1159
+    \Memcached::OPT_RECV_TIMEOUT =>    50,
1160
+    \Memcached::OPT_POLL_TIMEOUT =>    50,
1161 1161
 
1162
-	// Enable compression
1163
-	\Memcached::OPT_COMPRESSION =>          true,
1162
+    // Enable compression
1163
+    \Memcached::OPT_COMPRESSION =>          true,
1164 1164
 
1165
-	// Turn on consistent hashing
1166
-	\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1165
+    // Turn on consistent hashing
1166
+    \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1167 1167
 
1168
-	// Enable Binary Protocol
1169
-	\Memcached::OPT_BINARY_PROTOCOL =>      true,
1168
+    // Enable Binary Protocol
1169
+    \Memcached::OPT_BINARY_PROTOCOL =>      true,
1170 1170
 
1171
-	// Binary serializer vill be enabled if the igbinary PECL module is available
1172
-	//\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1171
+    // Binary serializer vill be enabled if the igbinary PECL module is available
1172
+    //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1173 1173
 ),
1174 1174
 
1175 1175
 
@@ -1215,61 +1215,61 @@  discard block
 block discarded – undo
1215 1215
  * One way to test is applying for a trystack account at http://trystack.org/
1216 1216
  */
1217 1217
 'objectstore' => [
1218
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
1219
-	'arguments' => [
1220
-		// trystack will use your facebook id as the user name
1221
-		'username' => 'facebook100000123456789',
1222
-		// in the trystack dashboard go to user -> settings -> API Password to
1223
-		// generate a password
1224
-		'password' => 'Secr3tPaSSWoRdt7',
1225
-		// must already exist in the objectstore, name can be different
1226
-		'container' => 'nextcloud',
1227
-		// prefix to prepend to the fileid, default is 'oid:urn:'
1228
-		'objectPrefix' => 'oid:urn:',
1229
-		// create the container if it does not exist. default is false
1230
-		'autocreate' => true,
1231
-		// required, dev-/trystack defaults to 'RegionOne'
1232
-		'region' => 'RegionOne',
1233
-		// The Identity / Keystone endpoint
1234
-		'url' => 'http://8.21.28.222:5000/v2.0',
1235
-		// required on dev-/trystack
1236
-		'tenantName' => 'facebook100000123456789',
1237
-		// dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1238
-		// if omitted
1239
-		'serviceName' => 'swift',
1240
-		// The Interface / url Type, optional
1241
-		'urlType' => 'internal'
1242
-	],
1218
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
1219
+    'arguments' => [
1220
+        // trystack will use your facebook id as the user name
1221
+        'username' => 'facebook100000123456789',
1222
+        // in the trystack dashboard go to user -> settings -> API Password to
1223
+        // generate a password
1224
+        'password' => 'Secr3tPaSSWoRdt7',
1225
+        // must already exist in the objectstore, name can be different
1226
+        'container' => 'nextcloud',
1227
+        // prefix to prepend to the fileid, default is 'oid:urn:'
1228
+        'objectPrefix' => 'oid:urn:',
1229
+        // create the container if it does not exist. default is false
1230
+        'autocreate' => true,
1231
+        // required, dev-/trystack defaults to 'RegionOne'
1232
+        'region' => 'RegionOne',
1233
+        // The Identity / Keystone endpoint
1234
+        'url' => 'http://8.21.28.222:5000/v2.0',
1235
+        // required on dev-/trystack
1236
+        'tenantName' => 'facebook100000123456789',
1237
+        // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1238
+        // if omitted
1239
+        'serviceName' => 'swift',
1240
+        // The Interface / url Type, optional
1241
+        'urlType' => 'internal'
1242
+    ],
1243 1243
 ],
1244 1244
 
1245 1245
 /**
1246 1246
  * To use swift V3
1247 1247
  */
1248 1248
 'objectstore' => [
1249
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
1250
-	'arguments' => [
1251
-		'autocreate' => true,
1252
-		'user' => [
1253
-			'name' => 'swift',
1254
-			'password' => 'swift',
1255
-			'domain' => [
1256
-				'name' => 'default',
1257
-			],
1258
-		],
1259
-		'scope' => [
1260
-			'project' => [
1261
-				'name' => 'service',
1262
-				'domain' => [
1263
-					'name' => 'default',
1264
-				],
1265
-			],
1266
-		],
1267
-		'tenantName' => 'service',
1268
-		'serviceName' => 'swift',
1269
-		'region' => 'regionOne',
1270
-		'url' => 'http://yourswifthost:5000/v3',
1271
-		'bucket' => 'nextcloud',
1272
-	],
1249
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
1250
+    'arguments' => [
1251
+        'autocreate' => true,
1252
+        'user' => [
1253
+            'name' => 'swift',
1254
+            'password' => 'swift',
1255
+            'domain' => [
1256
+                'name' => 'default',
1257
+            ],
1258
+        ],
1259
+        'scope' => [
1260
+            'project' => [
1261
+                'name' => 'service',
1262
+                'domain' => [
1263
+                    'name' => 'default',
1264
+                ],
1265
+            ],
1266
+        ],
1267
+        'tenantName' => 'service',
1268
+        'serviceName' => 'swift',
1269
+        'region' => 'regionOne',
1270
+        'url' => 'http://yourswifthost:5000/v3',
1271
+        'bucket' => 'nextcloud',
1272
+    ],
1273 1273
 ],
1274 1274
 
1275 1275
 
@@ -1309,8 +1309,8 @@  discard block
 block discarded – undo
1309 1309
  * encryption in MySQL or specify a custom wait timeout on a cheap hoster.
1310 1310
  */
1311 1311
 'dbdriveroptions' => array(
1312
-	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1313
-	PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1312
+    PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1313
+    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1314 1314
 ),
1315 1315
 
1316 1316
 /**
@@ -1367,10 +1367,10 @@  discard block
 block discarded – undo
1367 1367
  *  - pgsql (PostgreSQL)
1368 1368
  */
1369 1369
 'supportedDatabases' => array(
1370
-	'sqlite',
1371
-	'mysql',
1372
-	'pgsql',
1373
-	'oci',
1370
+    'sqlite',
1371
+    'mysql',
1372
+    'pgsql',
1373
+    'oci',
1374 1374
 ),
1375 1375
 
1376 1376
 /**
@@ -1630,8 +1630,8 @@  discard block
 block discarded – undo
1630 1630
  * WARNING: only use this if you know what you are doing
1631 1631
  */
1632 1632
 'csrf.optout' => array(
1633
-	'/^WebDAVFS/', // OS X Finder
1634
-	'/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
1633
+    '/^WebDAVFS/', // OS X Finder
1634
+    '/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
1635 1635
 ),
1636 1636
 
1637 1637
 /**
Please login to merge, or discard this patch.
lib/private/App/AppStore/Fetcher/CategoryFetcher.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -28,26 +28,26 @@
 block discarded – undo
28 28
 use OCP\ILogger;
29 29
 
30 30
 class CategoryFetcher extends Fetcher {
31
-	/**
32
-	 * @param Factory $appDataFactory
33
-	 * @param IClientService $clientService
34
-	 * @param ITimeFactory $timeFactory
35
-	 * @param IConfig $config
36
-	 * @param ILogger $logger
37
-	 */
38
-	public function __construct(Factory $appDataFactory,
39
-								IClientService $clientService,
40
-								ITimeFactory $timeFactory,
41
-								IConfig $config,
42
-								ILogger $logger) {
43
-		parent::__construct(
44
-			$appDataFactory,
45
-			$clientService,
46
-			$timeFactory,
47
-			$config,
48
-			$logger
49
-		);
50
-		$this->fileName = 'categories.json';
51
-		$this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
52
-	}
31
+    /**
32
+     * @param Factory $appDataFactory
33
+     * @param IClientService $clientService
34
+     * @param ITimeFactory $timeFactory
35
+     * @param IConfig $config
36
+     * @param ILogger $logger
37
+     */
38
+    public function __construct(Factory $appDataFactory,
39
+                                IClientService $clientService,
40
+                                ITimeFactory $timeFactory,
41
+                                IConfig $config,
42
+                                ILogger $logger) {
43
+        parent::__construct(
44
+            $appDataFactory,
45
+            $clientService,
46
+            $timeFactory,
47
+            $config,
48
+            $logger
49
+        );
50
+        $this->fileName = 'categories.json';
51
+        $this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
52
+    }
53 53
 }
Please login to merge, or discard this patch.
apps/oauth2/lib/Db/Client.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -34,20 +34,20 @@
 block discarded – undo
34 34
  * @method void setName(string $name)
35 35
  */
36 36
 class Client extends Entity {
37
-	/** @var string */
38
-	protected $name;
39
-	/** @var string */
40
-	protected $redirectUri;
41
-	/** @var string */
42
-	protected $clientIdentifier;
43
-	/** @var string */
44
-	protected $secret;
37
+    /** @var string */
38
+    protected $name;
39
+    /** @var string */
40
+    protected $redirectUri;
41
+    /** @var string */
42
+    protected $clientIdentifier;
43
+    /** @var string */
44
+    protected $secret;
45 45
 
46
-	public function __construct() {
47
-		$this->addType('id', 'int');
48
-		$this->addType('name', 'string');
49
-		$this->addType('redirect_uri', 'string');
50
-		$this->addType('client_identifier', 'string');
51
-		$this->addType('secret', 'string');
52
-	}
46
+    public function __construct() {
47
+        $this->addType('id', 'int');
48
+        $this->addType('name', 'string');
49
+        $this->addType('redirect_uri', 'string');
50
+        $this->addType('client_identifier', 'string');
51
+        $this->addType('secret', 'string');
52
+    }
53 53
 }
Please login to merge, or discard this patch.
apps/oauth2/lib/Db/AccessToken.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -34,20 +34,20 @@
 block discarded – undo
34 34
  * @method void setHashedCode(string $token)
35 35
  */
36 36
 class AccessToken extends Entity {
37
-	/** @var int */
38
-	protected $tokenId;
39
-	/** @var int */
40
-	protected $clientId;
41
-	/** @var string */
42
-	protected $hashedCode;
43
-	/** @var string */
44
-	protected $encryptedToken;
37
+    /** @var int */
38
+    protected $tokenId;
39
+    /** @var int */
40
+    protected $clientId;
41
+    /** @var string */
42
+    protected $hashedCode;
43
+    /** @var string */
44
+    protected $encryptedToken;
45 45
 
46
-	public function __construct() {
47
-		$this->addType('id', 'int');
48
-		$this->addType('token_id', 'int');
49
-		$this->addType('client_id', 'int');
50
-		$this->addType('hashed_code', 'string');
51
-		$this->addType('encrypted_token', 'string');
52
-	}
46
+    public function __construct() {
47
+        $this->addType('id', 'int');
48
+        $this->addType('token_id', 'int');
49
+        $this->addType('client_id', 'int');
50
+        $this->addType('hashed_code', 'string');
51
+        $this->addType('encrypted_token', 'string');
52
+    }
53 53
 }
Please login to merge, or discard this patch.
lib/public/Authentication/LoginCredentials/ICredentials.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -31,31 +31,31 @@
 block discarded – undo
31 31
  */
32 32
 interface ICredentials {
33 33
 
34
-	/**
35
-	 * Get the user UID
36
-	 *
37
-	 * @since 12
38
-	 *
39
-	 * @return string
40
-	 */
41
-	public function getUID();
34
+    /**
35
+     * Get the user UID
36
+     *
37
+     * @since 12
38
+     *
39
+     * @return string
40
+     */
41
+    public function getUID();
42 42
 
43
-	/**
44
-	 * Get the login name the users used to login
45
-	 *
46
-	 * @since 12
47
-	 *
48
-	 * @return string
49
-	 */
50
-	public function getLoginName();
43
+    /**
44
+     * Get the login name the users used to login
45
+     *
46
+     * @since 12
47
+     *
48
+     * @return string
49
+     */
50
+    public function getLoginName();
51 51
 
52
-	/**
53
-	 * Get the password
54
-	 *
55
-	 * @since 12
56
-	 *
57
-	 * @return string
58
-	 * @throws PasswordUnavailableException
59
-	 */
60
-	public function getPassword();
52
+    /**
53
+     * Get the password
54
+     *
55
+     * @since 12
56
+     *
57
+     * @return string
58
+     * @throws PasswordUnavailableException
59
+     */
60
+    public function getPassword();
61 61
 }
Please login to merge, or discard this patch.
core/templates/update.use-cli.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
 
15 15
 	<?php if ($_['tooBig']) { ?>
16 16
 		<div class="warning updateAnyways">
17
-			<?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.' )); ?>
18
-			<a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk' )); ?></a>
17
+			<?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.')); ?>
18
+			<a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk')); ?></a>
19 19
 		</div>
20 20
 	<?php } ?>
21 21
 
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,12 +3,12 @@
 block discarded – undo
3 3
 		<h2 class="title"><?php p($l->t('Update needed')) ?></h2>
4 4
 		<div class="infogroup">
5 5
 			<?php if ($_['tooBig']) {
6
-				p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
7
-			} else {
8
-				p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
9
-			} ?><br><br>
6
+                p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
7
+            } else {
8
+                p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
9
+            } ?><br><br>
10 10
 			<?php
11
-			print_unescaped($l->t('For help, see the  <a target="_blank" rel="noreferrer noopener" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
11
+            print_unescaped($l->t('For help, see the  <a target="_blank" rel="noreferrer noopener" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
12 12
 		</div>
13 13
 	</div>
14 14
 
Please login to merge, or discard this patch.
settings/Activity/SecurityFilter.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -28,39 +28,39 @@
 block discarded – undo
28 28
 
29 29
 class SecurityFilter implements IFilter {
30 30
 
31
-	/** @var IURLGenerator */
32
-	private $urlGenerator;
31
+    /** @var IURLGenerator */
32
+    private $urlGenerator;
33 33
 
34
-	/** @var IL10N */
35
-	private $l10n;
34
+    /** @var IL10N */
35
+    private $l10n;
36 36
 
37
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
38
-		$this->urlGenerator = $urlGenerator;
39
-		$this->l10n = $l10n;
40
-	}
37
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
38
+        $this->urlGenerator = $urlGenerator;
39
+        $this->l10n = $l10n;
40
+    }
41 41
 
42
-	public function allowedApps() {
43
-		return [];
44
-	}
42
+    public function allowedApps() {
43
+        return [];
44
+    }
45 45
 
46
-	public function filterTypes(array $types) {
47
-		return array_intersect(['security'], $types);
48
-	}
46
+    public function filterTypes(array $types) {
47
+        return array_intersect(['security'], $types);
48
+    }
49 49
 
50
-	public function getIcon() {
51
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
52
-	}
50
+    public function getIcon() {
51
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
52
+    }
53 53
 
54
-	public function getIdentifier() {
55
-		return 'security';
56
-	}
54
+    public function getIdentifier() {
55
+        return 'security';
56
+    }
57 57
 
58
-	public function getName() {
59
-		return $this->l10n->t('Security');
60
-	}
58
+    public function getName() {
59
+        return $this->l10n->t('Security');
60
+    }
61 61
 
62
-	public function getPriority() {
63
-		return 30;
64
-	}
62
+    public function getPriority() {
63
+        return 30;
64
+    }
65 65
 
66 66
 }
Please login to merge, or discard this patch.