delete.php: Use FormLayout

Author: edg2s

delete.php

@@ -11,57 +11,80 @@
 	die( '<p>You are not allowed to delete this wiki.</p>' );
 }
 
-if ( !isset( $_POST['confirm' ] ) ) {
-	$patches = format_patch_list( $wikiData['patchList'], $wikiData['branch'] );
-	$linkedTasks = format_linked_tasks( $wikiData['linkedTaskList'] );
-	$creator = $wikiData[ 'creator' ] ?? '';
+if ( !$wikiData['deleted'] ) {
+	if ( !isset( $_POST['confirm' ] ) ) {
+		$patches = format_patch_list( $wikiData['patchList'], $wikiData['branch'] );
+		$linkedTasks = format_linked_tasks( $wikiData['linkedTaskList'] );
+		$creator = $wikiData[ 'creator' ] ?? '';
 
-	echo '<table class="wikis">' .
-		'<tr>' .
-			'<th>Wiki</th>' .
-			'<th>Patches<br /><em>✓=Merged ✗=Abandoned</em></th>' .
-			'<th>Linked tasks<br /><em>✓=Resolved ✗=Declined/Invalid</em></th>' .
-			'<th>Time</th>' .
-			( $useOAuth ? '<th>Creator</th>' : '' ) .
-		'</tr>' .
-		'<tr>' .
-			'<td data-label="Wiki" class="wiki"><a href="wikis/' . $wiki . '/w" title="' . $wiki . '">' . substr( $wiki, 0, 10 ) . '</a></td>' .
-			'<td data-label="Patches" class="patches">' . $patches . '</td>' .
-			'<td data-label="Linked tasks" class="linkedTasks">' . $linkedTasks . '</td>' .
-			'<td data-label="Time" class="date">' . date( 'Y-m-d H:i:s', $wikiData[ 'created' ] ) . '</td>' .
-			( $useOAuth ? '<td data-label="Creator">' . ( $creator ? user_link( $creator ) : '?' ) . '</td>' : '' ) .
-		'</tr>' .
-	'</table>';
+		echo '<table class="wikis">' .
+			'<tr>' .
+				'<th>Wiki</th>' .
+				'<th>Patches<br /><em>✓=Merged ✗=Abandoned</em></th>' .
+				'<th>Linked tasks<br /><em>✓=Resolved ✗=Declined/Invalid</em></th>' .
+				'<th>Time</th>' .
+				( $useOAuth ? '<th>Creator</th>' : '' ) .
+			'</tr>' .
+			'<tr>' .
+				'<td data-label="Wiki" class="wiki"><a href="wikis/' . $wiki . '/w" title="' . $wiki . '">' . substr( $wiki, 0, 10 ) . '</a></td>' .
+				'<td data-label="Patches" class="patches">' . $patches . '</td>' .
+				'<td data-label="Linked tasks" class="linkedTasks">' . $linkedTasks . '</td>' .
+				'<td data-label="Time" class="date">' . date( 'Y-m-d H:i:s', $wikiData[ 'created' ] ) . '</td>' .
+				( $useOAuth ? '<td data-label="Creator">' . ( $creator ? user_link( $creator ) : '?' ) . '</td>' : '' ) .
+			'</tr>' .
+		'</table>';
 
-	echo '<form method="POST">' .
-		'<p>Are you sure you want to delete this wiki?</p>' .
-		'<p>This cannot be undone.</p>' .
-		new OOUI\ButtonInputWidget( [
-			'type' => 'submit',
-			'name' => 'confirm',
-			'label' => 'Delete',
-			'flags' => [ 'primary', 'destructive' ]
-		] ) .
-		new OOUI\HiddenInputWidget( [
-			'name' => 'csrf_token',
-			'value' => get_csrf_token(),
-		] ) .
-	'</form>';
-	die();
-}
+		echo new OOUI\FormLayout( [
+			'method' => 'POST',
+			'items' => [
+				new OOUI\FieldsetLayout( [
+					'label' => new OOUI\HtmlSnippet(
+						'<br>Are you sure you want to delete this wiki? This cannot be undone.'
+					),
+					'items' => array_filter( [
+						new OOUI\FieldLayout(
+							new OOUI\ButtonInputWidget( [
+								'type' => 'submit',
+								'name' => 'confirm',
+								'label' => 'Delete',
+								'flags' => [ 'primary', 'destructive' ]
+							] ),
+							[
+								'label' => ' ',
+								'align' => 'inline',
+							]
+						),
+						new OOUI\FieldLayout(
+							new OOUI\HiddenInputWidget( [
+								'name' => 'csrf_token',
+								'value' => get_csrf_token(),
+							] )
+						),
+					] )
+				] )
+			]
+		] );
 
-if ( !isset( $_POST['csrf_token'] ) || !check_csrf_token( $_POST['csrf_token'] ) ) {
-	die( "Invalid session." );
-}
+	} else {
+		if ( !isset( $_POST['csrf_token'] ) || !check_csrf_token( $_POST['csrf_token'] ) ) {
+			die( "Invalid session." );
+		}
+
+		ob_implicit_flush( true );
 
-ob_implicit_flush( true );
+		echo '<div class="consoleLog">';
+		$error = delete_wiki( $wiki );
+		echo '</div>';
 
-echo '<div class="consoleLog">';
-$error = delete_wiki( $wiki );
-echo '</div>';
+		if ( $error ) {
+			die( '<p>Error deleting wiki:<br>' . htmlentities( $error ) . '</p>' );
+		}
+
+		// Refresh wiki data
+		$wikiData = get_wiki_data( $wiki );
+	}
+}
 
-if ( $error ) {
-	die( '<p>Error deleting wiki:<br>' . htmlentities( $error ) . '</p>' );
-} else {
+if ( $wikiData['deleted'] ) {
 	echo '<p>Wiki deleted.</p>';
 }

includes.php

@@ -305,7 +305,7 @@ function shell( $cmd ) : ?string {
 	return $error ? null : $process->getOutput();
 }
 
-function delete_wiki( string $wiki ) : int {
+function delete_wiki( string $wiki ) : ?string {
 	global $mysqli;
 
 	$wikiData = get_wiki_data( $wiki );
@@ -318,7 +318,7 @@ function delete_wiki( string $wiki ) : int {
 		'PATCHDEMO' => __DIR__,
 		'WIKI' => $wiki
 	], __DIR__ . '/deletewiki.sh' );
-	$error = shell_echo( $cmd );
+	$errorCode = shell_echo( $cmd );
 
 	foreach ( $wikiData['announcedTasks'] as $task ) {
 		// TODO: Deduplicate server/serverPath with variables in new.php
@@ -343,7 +343,7 @@ function delete_wiki( string $wiki ) : int {
 	$stmt->execute();
 	$stmt->close();
 
-	return $error;
+	return $errorCode ? 'Delete script failed.' : null;
 }
 
 $requestCache = [];