Add custom 404 handler

edg2s · web-flow · commit 1f6724676476 · 2020-09-08T23:34:05.000+02:00
Fixes #106
diff --git a/.htaccess b/.htaccess
@@ -0,0 +1,5 @@
+RewriteEngine on
+# Equivalent to ErrorDocument, but uses a relative path
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule .* 404.php [L]
diff --git a/404.php b/404.php
@@ -0,0 +1,10 @@
+<?php
+header( 'HTTP/1.0 404 Not Found' );
+require_once "includes.php";
+
+echo new \OOUI\MessageWidget( [
+	'type' => 'error',
+	'label' => 'Page not found. The wiki you are looking for may have been deleted.'
+] );
+
+include "footer.html";
diff --git a/includes.php b/includes.php
@@ -16,22 +16,28 @@
 
 OOUI\Theme::setSingleton( new OOUI\WikimediaUITheme() );
 
+$basePath = dirname( $_SERVER['SCRIPT_NAME'] );
+if ( $basePath === '/' ) {
+	$basePath = '';
+}
+$is404 = basename( $_SERVER['SCRIPT_NAME'] ) === '404.php';
+
 echo '<!DOCTYPE html>
 <html>
 	<head>
 		<meta charset="utf-8">
 		<title>Patch demo</title>
-		<link rel="stylesheet" href="index.css">
-		<link rel="stylesheet" href="node_modules/oojs-ui/dist/oojs-ui-wikimediaui.min.css">
-		<link rel="icon" type="image/png" sizes="32x32" href="images/favicon-32x32.png">
-		<link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png">
-		<link rel="mask-icon" href="images/safari-pinned-tab.svg" color="#006699">
-		<link rel="shortcut icon" href="images/favicon.ico">
+		<link rel="stylesheet" href="' . $basePath . '/index.css">
+		<link rel="stylesheet" href="' . $basePath . '/node_modules/oojs-ui/dist/oojs-ui-wikimediaui.min.css">
+		<link rel="icon" type="image/png" sizes="32x32" href="' . $basePath . '/images/favicon-32x32.png">
+		<link rel="icon" type="image/png" sizes="16x16" href="' . $basePath . '/images/favicon-16x16.png">
+		<link rel="mask-icon" href="' . $basePath . '/images/safari-pinned-tab.svg" color="#006699">
+		<link rel="shortcut icon" href="' . $basePath . '/images/favicon.ico">
 	</head>
 	<body>
 		<header>
 			<div class="headerInner">
-				<h1><a class="logo" href=".">Patch demo</a></h1>';
+				<h1><a class="logo" href="' . $basePath . '/.">Patch demo</a></h1>';
 
 include_once 'oauth.php';
 
diff --git a/oauth.php b/oauth.php
@@ -9,7 +9,7 @@
 
 $useOAuth = !empty( $config[ 'oauth' ][ 'url' ] );
 
-if ( $useOAuth ) {
+if ( $useOAuth && !$is404 ) {
 	$conf = new ClientConfig( $config[ 'oauth' ][ 'url' ] );
 	$conf->setConsumer( new Consumer(
 		$config[ 'oauth' ][ 'key' ],
@@ -48,5 +48,4 @@
 		include 'footer.html';
 		die();
 	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`$useOAuth = !empty( $config[ 'oauth' ][ 'url' ] );`
`11`	`11`
`12`		`-if ( $useOAuth ) {`
	`12`	`+if ( $useOAuth && !$is404 ) {`
`13`	`13`	`$conf = new ClientConfig( $config[ 'oauth' ][ 'url' ] );`
`14`	`14`	`$conf->setConsumer( new Consumer(`
`15`	`15`	`$config[ 'oauth' ][ 'key' ],`
`@@ -48,5 +48,4 @@`
`48`	`48`	`include 'footer.html';`
`49`	`49`	`die();`
`50`	`50`	`}`
`51`		`-`
`52`	`51`	`}`