Allow site config to be overridden by JSON

Fixes #19

Author: edg2s

LocalSettings.txt

@@ -46,3 +46,15 @@ $wgLogos = [
 	]
 ];
 $wgFavicon = "$wgResourceBasePath/favicon.ico";
+
+// Apply config.json
+$config = json_decode(
+	file_get_contents( 'config.json' ),
+	true
+);
+if ( $config ) {
+	foreach ( $config as $key => $value ) {
+		$name = "wg$key";
+		$$name = $value;
+	}
+}

createwiki.sh

@@ -45,6 +45,9 @@ date +%s > $PATCHDEMO/wikis/$NAME/created.txt
 # apply our default settings
 cat $PATCHDEMO/LocalSettings.txt >> $PATCHDEMO/wikis/$NAME/w/LocalSettings.php
 
+# add site config
+echo "$SITECONFIG" >> $PATCHDEMO/wikis/$NAME/w/config.json
+
 # update Main_Page
 sleep 1 # Ensure edit appears after creation in history
 echo "$MAINPAGE" | php $PATCHDEMO/wikis/$NAME/w/maintenance/edit.php "Main_Page"

index.js

@@ -1,8 +1,18 @@
 ( function () {
 	var myWikis, wikisTable,
-		form = document.getElementById( 'new-form' );
+		form = document.getElementById( 'new-form' ),
+		siteConfig = form.querySelector( '[name=siteConfig]' );
 
-	form.addEventListener( 'submit', function () {
+	form.addEventListener( 'submit', function ( e ) {
+		if ( siteConfig.value.trim() ) {
+			try {
+				JSON.parse( siteConfig.value );
+			} catch ( err ) {
+				e.preventDefault();
+				alert( 'Invalid JSON: ' + err.message )
+				return;
+			}
+		}
 		form.querySelector( 'button[type=submit]' ).disabled = true;
 	} );
 

index.php

@@ -27,6 +27,12 @@
 		<div>Then, apply patches:</div>
 		<textarea name="patches" placeholder="Gerrit changeset number or Change-Id, one per line" rows="4" cols="50"></textarea>
 	</label>
+	<label>
+		<div>Site config:<br/>All keys will be given a <code>$wg</code> prefix.<br/>This file will be <strong>public</strong>.</div>
+		<textarea name="siteConfig" placeholder="{
+  &quot;Sitename&quot;: &quot;Test wiki&quot;
+}" rows="4" cols="50"></textarea>
+	</label>
 	<button type="submit">Create demo</button>
 </form>
 <br/>
@@ -82,6 +88,8 @@
 				}
 				$creator = get_creator( $dir );
 				$created = get_created( $dir );
+				$siteConfig = get_if_file_exists( 'wikis/' . $dir . '/w/config.json' );
+				$hasConfig = $siteConfig && strlen( trim( $siteConfig ) );
 
 				if ( !$created ) {
 					// Add created.txt to old wikis
@@ -94,7 +102,8 @@
 				$wikis[ $dir ] = [
 					'mtime' => $created,
 					'title' => $title,
-					'creator' => $creator
+					'creator' => $creator,
+					'hasConfig' => $hasConfig,
 				];
 			}
 		}
@@ -115,6 +124,12 @@
 		$anyCanDelete = $anyCanDelete || $canDelete;
 		$rows .= '<tr' . ( $creator !== $username ? ' class="other"' : '' ) . '>' .
 			'<td class="title">' . $title . '</td>' .
+			'<td>' .
+				( $data[ 'hasConfig' ] ?
+					'<a href="wikis/' . $wiki . '/w/config.json">JSON</a>' :
+					''
+				) .
+			'</td>' .
 			'<td><a href="wikis/' . $wiki . '/w">' . $wiki . '</a></td>' .
 			'<td>' . date( 'c', $data[ 'mtime' ] ) . '</td>' .
 			( $useOAuth ? '<td>' . ( $creator ? user_link( $creator ) : '?' ) . '</td>' : '' ) .
@@ -127,6 +142,7 @@
 
 	echo '<tr>' .
 			'<th>Patches</th>' .
+			'<th>Config</th>' .
 			'<th>Link</th>' .
 			'<th>Time</th>' .
 			( $useOAuth ? '<th>Creator</th>' : '' ) .

new.php

@@ -6,6 +6,7 @@
 
 $branch = trim( $_POST['branch'] );
 $patches = $_POST['patches'];
+$siteConfig = $_POST['siteConfig'];
 
 $namePath = md5( $branch . $patches . time() );
 $server = ( isset( $_SERVER['HTTPS'] ) ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
@@ -147,6 +148,7 @@
 	'WIKINAME' => $wikiName,
 	'CREATOR' => $user ? $user->username : '',
 	'MAINPAGE' => $mainPage,
+	'SITECONFIG' => $siteConfig,
 	'SERVER' => $server,
 	'SERVERPATH' => $serverPath,
 	'COMPOSER_HOME' => __DIR__ . '/composer',