Preserve old input on error

BytewaveMLP · Jul 8, 2017 · b598c39 · b598c39
1 parent 641bfce
commit b598c39
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/bootstrap/middleware.php b/bootstrap/middleware.php
@@ -6,4 +6,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-$app->add(new SubCompare\Middleware\ActiveRouteMiddleware($container));
+$app->add(new \SubCompare\Middleware\ActiveRouteMiddleware($container));
+$app->add(new \SubCompare\Middleware\OldInputMiddleware($container));
diff --git a/resources/views/pages/home.twig b/resources/views/pages/home.twig
@@ -29,15 +29,15 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 					<form action="{{ path_for('compare') }}" method="get">
 						<div class="form-group">
 							<label for="user1">User 1</label>
-							<input type="text" class="form-control" id="user1" name="user1" placeholder="UCXXXXXXXXXXXXXXXXXXXXXX">
+							<input type="text" class="form-control" id="user1" name="user1" placeholder="UCXXXXXXXXXXXXXXXXXXXXXX" value="{{ old.user1 }}">
 							<p class="help-block">
 								This is the YouTube user's <b>channel ID</b>, which should start with <code>UC</code>. If you aren't sure how to get that, please <a href="https://imgur.com/a/P6Dcm" target="_blank">click here</a>.
 							</p>
 						</div>
 
 						<div class="form-group">
 							<label for="user2">User 2</label>
-							<input type="text" class="form-control" id="user2" name="user2" placeholder="UCXXXXXXXXXXXXXXXXXXXXXX">
+							<input type="text" class="form-control" id="user2" name="user2" placeholder="UCXXXXXXXXXXXXXXXXXXXXXX" value="{{ old.user2 }}">
 						</div>
 
 						<button type="submit" class="btn btn-default">Submit</button>

diff --git a/src/Middleware/OldInputMiddleware.php b/src/Middleware/OldInputMiddleware.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SubCompare\Middleware;
+
+/**
+ * Persists old input for forms that request it
+ */
+class OldInputMiddleware extends Middleware
+{
+	public function __invoke($request, $response, $next) {
+		$this->container->view->getEnvironment()->addGlobal('old', $_SESSION['old'] ?? null);
+		$_SESSION['old'] = $request->getParams();
+
+		$response = $next($request, $response);
+		return $response;
+	}
+}