Improve error page, make it so blank usernames are not valid, make it so you can log in.

includes/common.php

@@ -117,6 +117,27 @@ function getFlashes() {
     return $flashes;
 }
 
+function outputFlashes($flashes) {
+    function __outputFlash($level, $flash) {
+        echo '<div class="notification is-' . $level . ' flash">
+                <i class="fa fa-exclamation-circle" aria-hidden="true"></i>'
+            . pp_html_escape($flash) .
+            '</div>';
+    }
+
+    foreach ($flashes['success'] as $flash) {
+        __outputFlash('info', $flash);
+    }
+
+    foreach ($flashes['warning'] as $flash) {
+        __outputFlash('warning', $flash);
+    }
+
+    foreach ($flashes['error'] as $flash) {
+        __outputFlash('danger', $flash);
+    }
+}
+
 /* Database functions */
 function getSiteInfo() : array {
     return require(__DIR__ . '/../config/site.php');

login.php

@@ -105,7 +105,7 @@ if (isset($_POST['forgot'])) {
         $error = 'All fields must be filled out.';
     } elseif (strlen($username) > 25) {
         $error = 'Username too long.'; // "Username already taken.";
-    } elseif (preg_match('/[^A-Za-z0-9._\\-$]/', $username)) {
+    } elseif (!preg_match('/^[A-Za-z0-9._\\-]+$/', $username)) {
         $error = 'Username is invalid - please use A-Za-z0-9, periods, hyphens, and underscores only.';
     } else {
         if (User::where('username', $username)->first()) {

theme/bulma/css/paste.css

@@ -229,3 +229,8 @@ button.button--no-style {
     margin-bottom: 1rem;
     color: black;
 }
+
+.flash i {
+    margin-right: 0.5rem;
+    font-size: 1.25rem;
+}

theme/bulma/errors.php

@@ -20,7 +20,10 @@
                         </form>
                     <?php endif; ?>
                     <a href="/" class="btn btn-default">New Paste</a>
+                <?php elseif (isset($flashes)): ?>
+                    <?php outputFlashes($flashes) ?>
                 <?php endif; ?>
+                <a href="/" class="button">Go Home</a>
             </div>
         </div>
     </div>

theme/bulma/user_profile.php

@@ -71,15 +71,7 @@
                     ?>
                 </div>
 
-                <?php
+                <?php outputFlashes($flashes) ?>
-                foreach ($flashes['success'] as $success) {
-                    echo '<div class="notification is-info"><i class="fa fa-exclamation-circle" aria-hidden="true"></i>' . pp_html_escape($success) . '</div>';
-                }
-
-                foreach ($flashes['error'] as $error) {
-                    echo '<div class="notification is-danger"><i class="fa fa-exclamation-circle" aria-hidden="true"></i>' . pp_html_escape($error) . '</div>';
-                }
-                ?>
 
                 <?php if ($is_current_user): ?>
                     Some of your statistics:

user.php

@@ -8,8 +8,8 @@ use PonePaste\Models\Paste;
 
 if (empty($_GET['user'])) {
     // No username provided
-    header("Location: ../error.php");
+    flashError('User not found.');
-    die();
+    goto Render;
 }
 
 $profile_username = trim($_GET['user']);
@@ -21,8 +21,8 @@ $profile_info = User::with('favourites')
 
 if (!$profile_info) {
     // Invalid username
-    header("Location: ../error.php");
+    flashError('User not found.');
-    die();
+    goto Render;
 }
 
 $p_title = $profile_username . "'s Public Pastes";
@@ -66,7 +66,16 @@ $is_current_user = ($current_user !== null) && ($profile_info->id == $current_us
 updatePageViews();
 
 $csrf_token = setupCsrfToken();
-$page_title = 'Profile of ' . $profile_username;
+
-$page_template = 'user_profile';
+Render:
-$script_bundles[] = 'user_profile';
+
+if (isset($profile_info)) {
+    $page_title = 'Profile of ' . $profile_username;
+    $page_template = 'user_profile';
+    $script_bundles[] = 'user_profile';
+} else {
+    $page_title = 'User not found';
+    $page_template = 'errors';
+}
+
 require_once('theme/' . $default_theme . '/common.php');