From 584ef2f40ab820403c7ea504fd3ed7e29ed37ad6 Mon Sep 17 00:00:00 2001 From: Floorb <132411956+Neetpone@users.noreply.github.com> Date: Thu, 26 Aug 2021 05:58:37 -0400 Subject: [PATCH] Make markup more valid --- includes/common.php | 10 +++ theme/bulma/archive.php | 5 +- theme/bulma/common.php | 167 ++++++++++++++--------------------- theme/bulma/discover.php | 1 + theme/bulma/event.php | 2 +- theme/bulma/login.php | 2 +- theme/bulma/main.php | 11 +-- theme/bulma/user_profile.php | 29 +++--- theme/bulma/view.php | 2 +- user.php | 6 +- 10 files changed, 106 insertions(+), 129 deletions(-) diff --git a/includes/common.php b/includes/common.php index e910908..0908990 100644 --- a/includes/common.php +++ b/includes/common.php @@ -10,6 +10,16 @@ require_once(__DIR__ . '/User.class.php'); require_once(__DIR__ . '/ViewBag.class.php'); /* View functions */ +function urlForPage($page = '') : string { + if (!PP_MOD_REWRITE) { + $page .= '.php'; + } + + return (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . '/' . $page; +} + + + function urlForPaste($paste_id) : string { if (PP_MOD_REWRITE) { return "/${paste_id}"; diff --git a/theme/bulma/archive.php b/theme/bulma/archive.php index 1a15f18..398287a 100644 --- a/theme/bulma/archive.php +++ b/theme/bulma/archive.php @@ -44,6 +44,9 @@ Tags + + + Title @@ -51,8 +54,6 @@ Tags - - - @@ -61,107 +60,71 @@ $start = microtime(true); + diff --git a/theme/bulma/event.php b/theme/bulma/event.php index 7a968ef..347d4ff 100644 --- a/theme/bulma/event.php +++ b/theme/bulma/event.php @@ -83,7 +83,7 @@ What do I win?

>A fucking badge, plus the best pony game the host can find.

- + Prize

Note: This is a steam game, winner will be sent a cdkey


What do I have to do? diff --git a/theme/bulma/login.php b/theme/bulma/login.php index f05e5eb..2aeea3e 100644 --- a/theme/bulma/login.php +++ b/theme/bulma/login.php @@ -106,7 +106,7 @@
- '; ?> + CAPTCHA

and diff --git a/theme/bulma/main.php b/theme/bulma/main.php index 3445034..27a285e 100644 --- a/theme/bulma/main.php +++ b/theme/bulma/main.php @@ -164,7 +164,7 @@

 Highlight + class="fas fa-indent"> Highlight
@@ -183,10 +183,10 @@
- +
- "> +
@@ -315,7 +315,7 @@
- '; ?> + CAPTCHA

and press @@ -325,6 +325,7 @@

+
diff --git a/theme/bulma/user_profile.php b/theme/bulma/user_profile.php index 52975d2..4d84f93 100644 --- a/theme/bulma/user_profile.php +++ b/theme/bulma/user_profile.php @@ -147,20 +147,7 @@ } ?> - - - Title - Paste Time - Visibility"; - } ?> - Views - Tags - Delete"; - } ?> - - + + + + Title + Paste Time + Visibility"; + } ?> + Views + Tags + Delete"; + } ?> + + diff --git a/theme/bulma/view.php b/theme/bulma/view.php index 6edff4d..c493df1 100644 --- a/theme/bulma/view.php +++ b/theme/bulma/view.php @@ -323,7 +323,7 @@ $selectedloader = "$bg[$i]"; // set variable equal to which random filename was
 Highlight + class="fa fa-indent"> Highlight
diff --git a/user.php b/user.php index bcc285a..f7f543e 100644 --- a/user.php +++ b/user.php @@ -40,9 +40,9 @@ $total_yfav = intval($query->fetch(PDO::FETCH_NUM)[0]); // Badges $profile_badge = match ($profile_info['badge']) { - 1 => '', - 2 => '', - 3 => '', + 1 => 'Donated to PonePaste', + 2 => 'You had one job', + 3 => 'Won a PasteJam competition', default => '', };