Passed
Push — master ( 35ccf0...c9949d )
by Roeland
11:29 queued 11s
created
config/config.sample.php 2 patches
Indentation   +135 added lines, -135 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
 /**
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
  *   Using TLS certificates where commonName=<IP address> is deprecated
70 70
  */
71 71
 'trusted_domains' =>
72
-  array (
72
+    array (
73 73
     'demo.example.org',
74 74
     'otherdomain.example.org',
75 75
     '10.111.112.113',
76 76
     '[2001:db8::1]'
77
-  ),
77
+    ),
78 78
 
79 79
 
80 80
 /**
@@ -681,10 +681,10 @@  discard block
 block discarded – undo
681 681
  *  - www.edri.org
682 682
  */
683 683
 'connectivity_check_domains' => array(
684
-	'www.nextcloud.com',
685
-	'www.startpage.com',
686
-	'www.eff.org',
687
-	'www.edri.org'
684
+    'www.nextcloud.com',
685
+    'www.startpage.com',
686
+    'www.eff.org',
687
+    'www.edri.org'
688 688
 ),
689 689
 
690 690
 /**
@@ -800,9 +800,9 @@  discard block
 block discarded – undo
800 800
  * Defaults to an empty array.
801 801
  */
802 802
 'log.condition' => [
803
-	'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
804
-	'users' => ['sample-user'],
805
-	'apps' => ['files'],
803
+    'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
804
+    'users' => ['sample-user'],
805
+    'apps' => ['files'],
806 806
 ],
807 807
 
808 808
 /**
@@ -856,18 +856,18 @@  discard block
 block discarded – undo
856 856
  *  - iOS client app id: ``1125420102``
857 857
  */
858 858
 'customclient_desktop' =>
859
-	'https://nextcloud.com/install/#install-clients',
859
+    'https://nextcloud.com/install/#install-clients',
860 860
 'customclient_android' =>
861
-	'https://play.google.com/store/apps/details?id=com.nextcloud.client',
861
+    'https://play.google.com/store/apps/details?id=com.nextcloud.client',
862 862
 'customclient_ios' =>
863
-	'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
863
+    'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
864 864
 'customclient_ios_appid' =>
865
-		'1125420102',
865
+        '1125420102',
866 866
 /**
867
- * Apps
868
- *
869
- * Options for the Apps folder, Apps store, and App code checker.
870
- */
867
+         * Apps
868
+         *
869
+         * Options for the Apps folder, Apps store, and App code checker.
870
+         */
871 871
 
872 872
 /**
873 873
  * When enabled, admins may install apps from the Nextcloud app store.
@@ -885,11 +885,11 @@  discard block
 block discarded – undo
885 885
  * indicates if a Web server can write files to that folder.
886 886
  */
887 887
 'apps_paths' => array(
888
-	array(
889
-		'path'=> '/var/www/nextcloud/apps',
890
-		'url' => '/apps',
891
-		'writable' => true,
892
-	),
888
+    array(
889
+        'path'=> '/var/www/nextcloud/apps',
890
+        'url' => '/apps',
891
+        'writable' => true,
892
+    ),
893 893
 ),
894 894
 
895 895
 /**
@@ -954,8 +954,8 @@  discard block
 block discarded – undo
954 954
  * Defaults to ``''`` (empty string)
955 955
  */
956 956
 'preview_office_cl_parameters' =>
957
-	' --headless --nologo --nofirststartwizard --invisible --norestore '.
958
-	'--convert-to png --outdir ',
957
+    ' --headless --nologo --nofirststartwizard --invisible --norestore '.
958
+    '--convert-to png --outdir ',
959 959
 
960 960
 /**
961 961
  * Only register providers that have been explicitly enabled
@@ -999,15 +999,15 @@  discard block
 block discarded – undo
999 999
  *  - OC\Preview\XBitmap
1000 1000
  */
1001 1001
 'enabledPreviewProviders' => array(
1002
-	'OC\Preview\PNG',
1003
-	'OC\Preview\JPEG',
1004
-	'OC\Preview\GIF',
1005
-	'OC\Preview\HEIC',
1006
-	'OC\Preview\BMP',
1007
-	'OC\Preview\XBitmap',
1008
-	'OC\Preview\MP3',
1009
-	'OC\Preview\TXT',
1010
-	'OC\Preview\MarkDown'
1002
+    'OC\Preview\PNG',
1003
+    'OC\Preview\JPEG',
1004
+    'OC\Preview\GIF',
1005
+    'OC\Preview\HEIC',
1006
+    'OC\Preview\BMP',
1007
+    'OC\Preview\XBitmap',
1008
+    'OC\Preview\MP3',
1009
+    'OC\Preview\TXT',
1010
+    'OC\Preview\MarkDown'
1011 1011
 ),
1012 1012
 
1013 1013
 /**
@@ -1083,11 +1083,11 @@  discard block
 block discarded – undo
1083 1083
 
1084 1084
 /**
1085 1085
  * Extra SSL options to be used for configuration.
1086
-  *
1086
+ *
1087 1087
  * Defaults to an empty array.
1088 1088
  */
1089 1089
 'openssl' => array(
1090
-	'config' => '/absolute/location/of/openssl.cnf',
1090
+    'config' => '/absolute/location/of/openssl.cnf',
1091 1091
 ),
1092 1092
 
1093 1093
 /**
@@ -1135,11 +1135,11 @@  discard block
 block discarded – undo
1135 1135
  * for more information.
1136 1136
  */
1137 1137
 'redis' => [
1138
-	'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1139
-	'port' => 6379,
1140
-	'timeout' => 0.0,
1141
-	'password' => '', // Optional, if not defined no password will be used.
1142
-	'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
1138
+    'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1139
+    'port' => 6379,
1140
+    'timeout' => 0.0,
1141
+    'password' => '', // Optional, if not defined no password will be used.
1142
+    'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
1143 1143
 ],
1144 1144
 
1145 1145
 /**
@@ -1168,14 +1168,14 @@  discard block
 block discarded – undo
1168 1168
  * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
1169 1169
  */
1170 1170
 'redis.cluster' => [
1171
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1172
-		'localhost:7000',
1173
-		'localhost:7001',
1174
-	],
1175
-	'timeout' => 0.0,
1176
-	'read_timeout' => 0.0,
1177
-	'failover_mode' => \RedisCluster::FAILOVER_ERROR,
1178
-	'password' => '', // Optional, if not defined no password will be used.
1171
+    'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1172
+        'localhost:7000',
1173
+        'localhost:7001',
1174
+    ],
1175
+    'timeout' => 0.0,
1176
+    'read_timeout' => 0.0,
1177
+    'failover_mode' => \RedisCluster::FAILOVER_ERROR,
1178
+    'password' => '', // Optional, if not defined no password will be used.
1179 1179
 ],
1180 1180
 
1181 1181
 
@@ -1183,35 +1183,35 @@  discard block
 block discarded – undo
1183 1183
  * Server details for one or more memcached servers to use for memory caching.
1184 1184
  */
1185 1185
 'memcached_servers' => array(
1186
-	// hostname, port and optional weight. Also see:
1187
-	// http://www.php.net/manual/en/memcached.addservers.php
1188
-	// http://www.php.net/manual/en/memcached.addserver.php
1189
-	array('localhost', 11211),
1190
-	//array('other.host.local', 11211),
1186
+    // hostname, port and optional weight. Also see:
1187
+    // http://www.php.net/manual/en/memcached.addservers.php
1188
+    // http://www.php.net/manual/en/memcached.addserver.php
1189
+    array('localhost', 11211),
1190
+    //array('other.host.local', 11211),
1191 1191
 ),
1192 1192
 
1193 1193
 /**
1194 1194
  * Connection options for memcached
1195 1195
  */
1196 1196
 'memcached_options' => array(
1197
-	// Set timeouts to 50ms
1198
-	\Memcached::OPT_CONNECT_TIMEOUT => 50,
1199
-	\Memcached::OPT_RETRY_TIMEOUT =>   50,
1200
-	\Memcached::OPT_SEND_TIMEOUT =>    50,
1201
-	\Memcached::OPT_RECV_TIMEOUT =>    50,
1202
-	\Memcached::OPT_POLL_TIMEOUT =>    50,
1197
+    // Set timeouts to 50ms
1198
+    \Memcached::OPT_CONNECT_TIMEOUT => 50,
1199
+    \Memcached::OPT_RETRY_TIMEOUT =>   50,
1200
+    \Memcached::OPT_SEND_TIMEOUT =>    50,
1201
+    \Memcached::OPT_RECV_TIMEOUT =>    50,
1202
+    \Memcached::OPT_POLL_TIMEOUT =>    50,
1203 1203
 
1204
-	// Enable compression
1205
-	\Memcached::OPT_COMPRESSION =>          true,
1204
+    // Enable compression
1205
+    \Memcached::OPT_COMPRESSION =>          true,
1206 1206
 
1207
-	// Turn on consistent hashing
1208
-	\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1207
+    // Turn on consistent hashing
1208
+    \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1209 1209
 
1210
-	// Enable Binary Protocol
1211
-	\Memcached::OPT_BINARY_PROTOCOL =>      true,
1210
+    // Enable Binary Protocol
1211
+    \Memcached::OPT_BINARY_PROTOCOL =>      true,
1212 1212
 
1213
-	// Binary serializer vill be enabled if the igbinary PECL module is available
1214
-	//\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1213
+    // Binary serializer vill be enabled if the igbinary PECL module is available
1214
+    //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1215 1215
 ),
1216 1216
 
1217 1217
 
@@ -1257,61 +1257,61 @@  discard block
 block discarded – undo
1257 1257
  * One way to test is applying for a trystack account at http://trystack.org/
1258 1258
  */
1259 1259
 'objectstore' => [
1260
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
1261
-	'arguments' => [
1262
-		// trystack will use your facebook id as the user name
1263
-		'username' => 'facebook100000123456789',
1264
-		// in the trystack dashboard go to user -> settings -> API Password to
1265
-		// generate a password
1266
-		'password' => 'Secr3tPaSSWoRdt7',
1267
-		// must already exist in the objectstore, name can be different
1268
-		'container' => 'nextcloud',
1269
-		// prefix to prepend to the fileid, default is 'oid:urn:'
1270
-		'objectPrefix' => 'oid:urn:',
1271
-		// create the container if it does not exist. default is false
1272
-		'autocreate' => true,
1273
-		// required, dev-/trystack defaults to 'RegionOne'
1274
-		'region' => 'RegionOne',
1275
-		// The Identity / Keystone endpoint
1276
-		'url' => 'http://8.21.28.222:5000/v2.0',
1277
-		// required on dev-/trystack
1278
-		'tenantName' => 'facebook100000123456789',
1279
-		// dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1280
-		// if omitted
1281
-		'serviceName' => 'swift',
1282
-		// The Interface / url Type, optional
1283
-		'urlType' => 'internal'
1284
-	],
1260
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
1261
+    'arguments' => [
1262
+        // trystack will use your facebook id as the user name
1263
+        'username' => 'facebook100000123456789',
1264
+        // in the trystack dashboard go to user -> settings -> API Password to
1265
+        // generate a password
1266
+        'password' => 'Secr3tPaSSWoRdt7',
1267
+        // must already exist in the objectstore, name can be different
1268
+        'container' => 'nextcloud',
1269
+        // prefix to prepend to the fileid, default is 'oid:urn:'
1270
+        'objectPrefix' => 'oid:urn:',
1271
+        // create the container if it does not exist. default is false
1272
+        'autocreate' => true,
1273
+        // required, dev-/trystack defaults to 'RegionOne'
1274
+        'region' => 'RegionOne',
1275
+        // The Identity / Keystone endpoint
1276
+        'url' => 'http://8.21.28.222:5000/v2.0',
1277
+        // required on dev-/trystack
1278
+        'tenantName' => 'facebook100000123456789',
1279
+        // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1280
+        // if omitted
1281
+        'serviceName' => 'swift',
1282
+        // The Interface / url Type, optional
1283
+        'urlType' => 'internal'
1284
+    ],
1285 1285
 ],
1286 1286
 
1287 1287
 /**
1288 1288
  * To use swift V3
1289 1289
  */
1290 1290
 'objectstore' => [
1291
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
1292
-	'arguments' => [
1293
-		'autocreate' => true,
1294
-		'user' => [
1295
-			'name' => 'swift',
1296
-			'password' => 'swift',
1297
-			'domain' => [
1298
-				'name' => 'default',
1299
-			],
1300
-		],
1301
-		'scope' => [
1302
-			'project' => [
1303
-				'name' => 'service',
1304
-				'domain' => [
1305
-					'name' => 'default',
1306
-				],
1307
-			],
1308
-		],
1309
-		'tenantName' => 'service',
1310
-		'serviceName' => 'swift',
1311
-		'region' => 'regionOne',
1312
-		'url' => 'http://yourswifthost:5000/v3',
1313
-		'bucket' => 'nextcloud',
1314
-	],
1291
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
1292
+    'arguments' => [
1293
+        'autocreate' => true,
1294
+        'user' => [
1295
+            'name' => 'swift',
1296
+            'password' => 'swift',
1297
+            'domain' => [
1298
+                'name' => 'default',
1299
+            ],
1300
+        ],
1301
+        'scope' => [
1302
+            'project' => [
1303
+                'name' => 'service',
1304
+                'domain' => [
1305
+                    'name' => 'default',
1306
+                ],
1307
+            ],
1308
+        ],
1309
+        'tenantName' => 'service',
1310
+        'serviceName' => 'swift',
1311
+        'region' => 'regionOne',
1312
+        'url' => 'http://yourswifthost:5000/v3',
1313
+        'bucket' => 'nextcloud',
1314
+    ],
1315 1315
 ],
1316 1316
 
1317 1317
 
@@ -1363,8 +1363,8 @@  discard block
 block discarded – undo
1363 1363
  * encryption in MySQL or specify a custom wait timeout on a cheap hoster.
1364 1364
  */
1365 1365
 'dbdriveroptions' => array(
1366
-	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1367
-	PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1366
+    PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1367
+    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1368 1368
 ),
1369 1369
 
1370 1370
 /**
@@ -1421,10 +1421,10 @@  discard block
 block discarded – undo
1421 1421
  *  - pgsql (PostgreSQL)
1422 1422
  */
1423 1423
 'supportedDatabases' => array(
1424
-	'sqlite',
1425
-	'mysql',
1426
-	'pgsql',
1427
-	'oci',
1424
+    'sqlite',
1425
+    'mysql',
1426
+    'pgsql',
1427
+    'oci',
1428 1428
 ),
1429 1429
 
1430 1430
 /**
@@ -1752,8 +1752,8 @@  discard block
 block discarded – undo
1752 1752
  * WARNING: only use this if you know what you are doing
1753 1753
  */
1754 1754
 'csrf.optout' => array(
1755
-	'/^WebDAVFS/', // OS X Finder
1756
-	'/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
1755
+    '/^WebDAVFS/', // OS X Finder
1756
+    '/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
1757 1757
 ),
1758 1758
 
1759 1759
 /**
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
  *   Using TLS certificates where commonName=<IP address> is deprecated
70 70
  */
71 71
 'trusted_domains' =>
72
-  array (
72
+  array(
73 73
     'demo.example.org',
74 74
     'otherdomain.example.org',
75 75
     '10.111.112.113',
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
  *
235 235
  * Defaults to ``60*60*24*15`` seconds (15 days)
236 236
  */
237
-'remember_login_cookie_lifetime' => 60*60*24*15,
237
+'remember_login_cookie_lifetime' => 60 * 60 * 24 * 15,
238 238
 
239 239
 /**
240 240
  * The lifetime of a session after inactivity.
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
1168 1168
  * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
1169 1169
  */
1170 1170
 'redis.cluster' => [
1171
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1171
+	'seeds' => [// provide some/all of the cluster servers to bootstrap discovery, port required
1172 1172
 		'localhost:7000',
1173 1173
 		'localhost:7001',
1174 1174
 	],
@@ -1233,7 +1233,7 @@  discard block
 block discarded – undo
1233 1233
  *
1234 1234
  * Defaults to ``60*60*24`` (1 day)
1235 1235
  */
1236
-'cache_chunk_gc_ttl' => 60*60*24,
1236
+'cache_chunk_gc_ttl' => 60 * 60 * 24,
1237 1237
 
1238 1238
 /**
1239 1239
  * Using Object Store with Nextcloud
@@ -1666,7 +1666,7 @@  discard block
 block discarded – undo
1666 1666
  * Defaults to ``60*60`` seconds (1 hour) or the php
1667 1667
  *             max_execution_time, whichever is higher.
1668 1668
  */
1669
-'filelocking.ttl' => 60*60,
1669
+'filelocking.ttl' => 60 * 60,
1670 1670
 
1671 1671
 /**
1672 1672
  * Memory caching backend for file locking
Please login to merge, or discard this patch.