Remove 404 handler code

Author: supertassu

data/templates/errors/403.html

@@ -6,15 +6,6 @@
 {% block content %}
 <h1>Forbidden</h1>
 <p>The URI you have requested, <a href="{{ uri }}"><code>{{ uri }}</code></a>, might exist but the server has been instructed not to let you reach it.</p>
-{% if tool %}
-<h2>If you have reached this page from somewhere else...</h2>
-<p>This URI is managed by the <a href="{{ urlFor('tool', {'name': tool}) }}"><code>{{ tool }}</code></a> tool, maintained by {{ utils.printMaintainers( maintainers ) }}.</p>
-<p>Perhaps this content can only be accessed from the secret underground lair of the maintainers, or the link you've followed doesn't actually lead somewhere useful?</p>
-<p>If you're pretty sure this shouldn't be an error, you may wish to notify the tool's maintainers (they are listed above) about the error and how you ended up here.</p>
-<h2>If you maintain this tool</h2>
-<p>The error might be caused by incorrect permissions, or by the absence of an index file (this webserver does not list directory contents by default).</p>
-{% else %}
 <p>Perhaps the webserver has temporarily become confused, or the link you've followed doesn't actually lead somewhere useful?</p>
 <p>If you're pretty sure this shouldn't be an error, you may wish to notify the <a href="{{ urlFor('tool', {'name': 'admin'}) }}">project administrators</a> about the error and how you ended up here.</p>
-{% endif %}
 {% endblock content %}

data/templates/errors/404.html

@@ -6,13 +6,6 @@
 {% block content %}
 <h1>Four hundred and four!</h1>
 <p>The URI you have requested, <code>{{ uri }}</code>, doesn't seem to actually exist.</p>
-{% if tool %}
-<h2>If you have reached this page from somewhere else...</h2>
-<p>This URI is managed by the <a href="{{ urlFor('tool', {'name': tool}) }}"><code>{{ tool }}</code></a> tool, maintained by {{ utils.printMaintainers( maintainers ) }}.</p>
-<p>Perhaps its files are on vacation, or the link you've followed doesn't actually lead somewhere useful?</p>
-<p>You might want to look at the <a href="{{ urlFor('tools') }}">list of tools</a> to find what you were looking for. If you're pretty sure this shouldn't be an error, you may wish to notify the tool's maintainers (they are listed above) about the error and how you ended up here.</p>
-{% else %}
 <p>Perhaps the webserver has temporarily become confused, or the link you've followed doesn't actually lead somewhere useful?</p>
 <p>You might want to look at the <a href="{{ urlFor('tools') }}">list of tools</a> to find what you were looking for. If you're pretty sure this shouldn't be an error, you may wish to notify the <a href="{{ urlFor('tool', {'name': 'admin'}) }}">project administrators</a> about the error and how you ended up here.</p>
-{% endif %}
 {% endblock content %}

data/templates/errors/500.html

@@ -6,15 +6,5 @@
 {% block content %}
 <h1>Internal error</h1>
 <p>The URI you have requested, <a href="{{ uri }}"><code>{{ uri }}</code></a>, appears to be non-functional at this time.</p>
-{% if tool %}
-<h2>If you have reached this page from somewhere else...</h2>
-<p>This URI is part of the <a href="{{ urlFor('tool', {'name': tool}) }}"><code>{{ tool }}</code></a> tool, maintained by {{ utils.printMaintainers( maintainers ) }}.</p>
-<p>Perhaps its magical script elves are temporarily ill, or the link you've followed doesn't actually lead somewhere useful?<p>
-<p>If you're pretty sure this shouldn't be an error, you may wish to notify the tool's maintainers (they are listed above) about the error and how you ended up here.</p>
-<h2>If you maintain this tool</h2>
-<p>The error might be caused by incorrect permission, or by an error in the script or CGI that was meant to execute here. Please check the error logs for your web service.</p>
-{% else %}
-<p>Perhaps the webserver has temporarily become confused, or the link you've followed doesn't actually lead somewhere useful?</p>
-<p>If you're pretty sure this shouldn't be an error, you may wish to notify the <a href="{{ urlFor('tool', {'name': 'admin'}) }}">project administrators</a> about the error and how you ended up here.</p>
-{% endif %}
+<p>You may wish to notify the <a href="{{ urlFor('tool', {'name': 'admin'}) }}">project administrators</a> about the error and how you ended up here.</p>
 {% endblock content %}

data/templates/errors/503.html

@@ -6,16 +6,6 @@
 {% block content %}
 <h1>No webservice</h1>
 <p>The URI you have requested, <a href="{{ uri }}"><code>{{ uri }}</code></a>, is not currently serviced.</p>
-{% if tool %}
 <h2>If you have reached this page from somewhere else...</h2>
-<p>This URI is part of the <a href="{{ urlFor('tool', {'name': tool}) }}"><code>{{ tool }}</code></a> tool, maintained by {{ utils.printMaintainers( maintainers ) }}.</p>
-<p>That tool might not have a web interface, or it may currently be disabled.</p>
-<p>If you're pretty sure this shouldn't be an error, you may wish to notify the tool's maintainers (above) about the error and how you ended up here.</p>
-<h2>If you maintain this tool</h2>
-<p>You have not enabled a web service for your tool, or it has stopped working because of a fatal error. Please check the error logs of your web service.</p>
-{% else %}
-<h2>If you have reached this page from somewhere else...</h2>
-<p>This URI is not currently part of any tool.</p>
 <p>If you're pretty sure this shouldn't be an error, you may wish to notify the <a href="{{ urlFor('tool', {'name': 'admin'}) }}">project administrators</a> about the error and how you ended up here.</p>
-{% endif %}
 {% endblock content %}

src/App.php

@@ -105,10 +105,6 @@ protected function configureIoc( \Slim\Helper\Set $container ) {
 			);
 		} );
 
-		$container->singleton( 'tools', function ( $c ) {
-			return new Tools( $c->cache, $c->log );
-		} );
-
 		$container->singleton( 'toolinfo', function ( $c ) {
 			return new Toolinfo(
 				$c->settings['toolinfo.uri'], $c->cache, $c->log );

src/Pages/Error.php

@@ -45,30 +45,9 @@ public function setTools( $tools ) {
 	protected function handleGet( $errorCode, $notFoundHandler = false ) {
 		$env = \Slim\Environment::getInstance();
 		$uri = $env['HTTP_X_ORIGINAL_URI'] ?: $env['PATH_INFO'];
-		if ( preg_match( '@^/([^/]+)/@', $uri, $match ) ) {
-			$info = $this->tools->getToolInfo( $match[1] );
-
-			if ( $notFoundHandler && $info['name'] !== false ) {
-				// Route was for a known tool
-				if ( $uri === "/{$info['name']}" ) {
-					// Redirect bare /<toolname> to /<toolname>
-					$this->redirect( "/{$info['name']}/", 301 );
-				} else {
-					// The tool's service must be down. Send a 503 response.
-					$errorCode = '503';
-				}
-			}
-		} else {
-			$info = [
-				'name' => false,
-				'maintainers' => []
-			];
-		}
 
 		$httpStatus = $notFoundHandler ? (int)$errorCode : 200;
 		$this->view->set( 'uri', $uri );
-		$this->view->set( 'tool', $info['name'] );
-		$this->view->set( 'maintainers', $info['maintainers'] );
 		$this->render( "errors/{$errorCode}.html", [], $httpStatus );
 	}
 }