Make instantCommons a checkbox

Author: edg2s

LocalSettings-instantCommons.txt

@@ -0,0 +1,2 @@
+// InstantCommons
+$wgUseInstantCommons = true;

LocalSettings.txt

@@ -64,9 +64,6 @@ $wgEchoPerUserBlacklist = true;
 // GlobalWatchlist
 $wgGlobalWatchlistDevMode = true;
 
-// InstantCommons
-$wgUseInstantCommons = true;
-
 // UploadWizard, Special:Upload
 $wgEnableUploads = true;
 

index.php

@@ -151,6 +151,19 @@
 							'classes' => [ 'form-repos-field' ],
 						]
 					),
+					new OOUI\FieldLayout(
+						new OOUI\CheckboxInputWidget( [
+							'name' => 'instantCommons',
+							'value' => 1,
+							'selected' => true
+						] ),
+						[
+							'label' => 'Load images from Commons',
+							'help' => 'Any images not local to the wiki will be pulled from Wikimedia Commons.',
+							'helpInline' => true,
+							'align' => 'left',
+						]
+					),
 					new OOUI\FieldLayout(
 						new OOUI\CheckboxInputWidget( [
 							'name' => 'proxy',

new.php

@@ -276,6 +276,7 @@ function set_progress( float $pc, string $label ) {
 $repos = get_repo_data();
 
 $useProxy = !empty( $_POST['proxy'] );
+$useInstantCommons = !empty( $_POST['instantCommons' ] );
 
 if ( $_POST['preset'] === 'custom' ) {
 	$allowedRepos = $_POST['repos'];
@@ -374,6 +375,7 @@ function set_progress( float $pc, string $label ) {
 $cmd = make_shell_command( $baseEnv + [
 	'MAINPAGE' => $mainPage,
 	'USE_PROXY' => $useProxy,
+	'USE_INSTANT_COMMONS' => $useInstantCommons,
 ], __DIR__ . '/new/postinstall.sh' );
 
 $error = shell_echo( $cmd );

new/postinstall.sh

@@ -54,6 +54,11 @@ if [ "${USE_PROXY}" = "1" ]; then
 	done
 fi
 
+# Enable instantCommons if selected
+if [ "${USE_INSTANT_COMMONS}" = "1" ]; then
+	cat $PATCHDEMO/LocalSettings-instantCommons.txt >> $PATCHDEMO/wikis/$NAME/w/LocalSettings.php
+fi
+
 # populate interwiki table from en.wiki
 php $PATCHDEMO/wikis/$NAME/w/maintenance/populateInterwiki.php