From 460d12ab7bb93daa6b03300fefdfccefb6d32d01 Mon Sep 17 00:00:00 2001 From: ilotterytea Date: Tue, 22 Apr 2025 13:15:31 +0500 Subject: upd: combined single_page and multiple_page into one + updated emote url --- public/emotes/index.php | 209 ++++++++++++++++++++++++++++++++++++++++--- public/emotes/setmanip.php | 14 +-- public/emotes/upload.php | 2 +- public/users.php | 2 +- src/alert.php | 2 +- src/emotes/multiple_page.php | 48 ---------- src/emotes/single_page.php | 169 ---------------------------------- 7 files changed, 206 insertions(+), 240 deletions(-) delete mode 100644 src/emotes/multiple_page.php delete mode 100644 src/emotes/single_page.php diff --git a/public/emotes/index.php b/public/emotes/index.php index b377430..5224433 100644 --- a/public/emotes/index.php +++ b/public/emotes/index.php @@ -2,6 +2,9 @@ include "../../src/emote.php"; include "../../src/accounts.php"; include_once "../../src/config.php"; +include "../../src/partials.php"; +include "../../src/utils.php"; +include "../../src/alert.php"; authorize_user(); @@ -85,27 +88,207 @@ function display_emote(int $id) return $emote; } -$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || - $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://"; -$current_url = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; - -$id = parse_url($current_url, PHP_URL_PATH); -$id = substr($id, 8); -$id = str_replace("/", "", $id); - $emotes = null; $emote = null; -include "../../src/partials.php"; -include "../../src/utils.php"; -include "../../src/alert.php"; +$id = $_GET["id"] ?? ""; if ($id == "" || !is_numeric($id)) { $page = intval($_GET["p"] ?? "0"); $limit = 50; $emotes = display_list_emotes($page, $limit); - include "../../src/emotes/multiple_page.php"; } else { $emote = display_emote(intval($id)); - include "../../src/emotes/single_page.php"; } +?> + + + + + <?php + echo empty($emotes) ? "Emote " . $emote->get_code() : "Emotes" + ?> - alright.party + + + + +
+
+ + +
+
+ +
+
+ +
+
+ get_code() : "Emotes" ?> +
+ +
+
+ <?php echo $emote->get_code() ?> + <?php echo $emote->get_code() ?> + <?php echo $emote->get_code() ?> +
+
+
+
+ +
+ prepare("SELECT id FROM emote_set_contents WHERE emote_set_id = ? AND emote_id = ?"); + $stmt->execute([$_SESSION["user_emote_set_id"], $emote->get_id()]); + $added = $stmt->rowCount() > 0; + } + + $db = null; + ?> +
+ + + + + + + + +
+
+
+
+ + + +
+
+ + + +
+ Report + emote +
+ +

Log in to get additional features...

+ +
+ +
+ + + + + + + + + +
Uploaderget_uploaded_by()) { + $db = new PDO(DB_URL, DB_USER, DB_PASS); + $stmt = $db->prepare("SELECT username FROM users WHERE id = ?"); + $stmt->execute([$emote->get_uploaded_by()]); + + if ($row = $stmt->fetch()) { + $username = $row["username"]; + $link = "/users.php?id=" . $emote->get_uploaded_by(); + } + + $db = null; + } + + echo ""; + echo $username; + echo ""; + + echo ', get_created_at()); + echo ' UTC">about ' . format_timestamp(time() - $emote->get_created_at()) . " ago"; + ?>
RatingNot rated
+
+ +
+
+ prepare("SELECT users.id, users.username + FROM users + INNER JOIN emote_sets AS es ON es.owner_id = users.id + INNER JOIN emote_set_contents AS ec ON ec.emote_set_id = es.id + WHERE ec.emote_id = ?"); + + $stmt->execute([$emote->get_id()]); + $count = $stmt->rowCount(); + + $db = null; + + if ($count > 0) { + echo "

Added in $count channels

"; + } else { + echo "No one has added this emote yet... :'("; + } + ?> +
+ fetch()) { + echo '' . $row["username"] . ''; + } + ?> +
+
+ +
+ get_id() . '">'; + + if ($e->is_added_by_user()) { + echo ''; + } + + echo '' . $e->get_code() . ''; + echo '

' . $e->get_code() . '

'; + echo ''; + } + ?> +
+ +
+
+
+
+
+ + + \ No newline at end of file diff --git a/public/emotes/setmanip.php b/public/emotes/setmanip.php index 2c5d577..b5796c7 100644 --- a/public/emotes/setmanip.php +++ b/public/emotes/setmanip.php @@ -8,7 +8,7 @@ if (!authorize_user(true)) { } if (!isset($_POST["id"], $_POST["action"])) { - generate_alert("/emotes/$emote_id", "Not enough POST fields"); + generate_alert("/emotes", "Not enough POST fields"); exit; } @@ -19,7 +19,7 @@ $emote_id = $_POST["id"]; $stmt = $db->prepare("SELECT id FROM emotes WHERE id = ?"); $stmt->execute([$emote_id]); if ($stmt->rowCount() == 0) { - generate_alert("/emotes/$emote_id", "Emote not found", 404); + generate_alert("/emotes", "Emote not found", 404); exit; } @@ -39,7 +39,7 @@ if ($row = $stmt->fetch()) { if ($stmt->rowCount() == 0) { $_SESSION["user_emote_set_id"] = ""; - generate_alert("/emotes/$emote_id", "Bad ownership permissions on active emoteset", 403); + generate_alert("/emotes?id=$emote_id", "Bad ownership permissions on active emoteset", 403); exit; } } @@ -63,7 +63,7 @@ $action = $_POST["action"]; if ($action == "add") { if ($stmt->rowCount() != 0) { - generate_alert("/emotes/$emote_id", "This emote has been already added!"); + generate_alert("/emotes?id=$emote_id", "This emote has been already added!"); exit; } @@ -72,18 +72,18 @@ if ($action == "add") { $db = null; - generate_alert("/emotes/$emote_id", "This emote has been added to your set. Enjoy!", 200); + generate_alert("/emotes?id=$emote_id", "This emote has been added to your set. Enjoy!", 200); } else { if ($row = $stmt->fetch()) { $stmt = $db->prepare("DELETE FROM emote_set_contents WHERE id = ?"); $stmt->execute([$row["id"]]); } else { - generate_alert("/emotes/$emote_id", "This emote wasn't added!"); + generate_alert("/emotes?id=$emote_id", "This emote wasn't added!"); $db = null; exit; } $db = null; - generate_alert("/emotes/$emote_id", "This emote has been removed from your set.", 200); + generate_alert("/emotes?id=$emote_id", "This emote has been removed from your set.", 200); } \ No newline at end of file diff --git a/public/emotes/upload.php b/public/emotes/upload.php index ad581ca..44d9161 100644 --- a/public/emotes/upload.php +++ b/public/emotes/upload.php @@ -127,7 +127,7 @@ if (isset($_SERVER["HTTP_ACCEPT"]) && $_SERVER["HTTP_ACCEPT"] == "application/js exit; } -header("Location: /emotes/$id", true, 307); +header("Location: /emotes?id=$id", true, 307); function echo_upload_page() { diff --git a/public/users.php b/public/users.php index fae1e70..fdcbacf 100644 --- a/public/users.php +++ b/public/users.php @@ -308,7 +308,7 @@ if ($is_json) { echo ''; echo ' Favorite emote'; echo ''; - echo ""; + echo ""; echo $row["code"] . ' '; echo ''; } diff --git a/src/alert.php b/src/alert.php index 62f1887..62045d5 100644 --- a/src/alert.php +++ b/src/alert.php @@ -10,7 +10,7 @@ function generate_alert(string $path, string $error, int $status = 400) "data" => null ]); } else { - header("Location: $path?error_status=$status&error_reason=$error"); + header("Location: $path" . (str_contains($path, "?") ? "&" : "?") . "error_status=$status&error_reason=$error"); } } diff --git a/src/emotes/multiple_page.php b/src/emotes/multiple_page.php deleted file mode 100644 index 25c4c9c..0000000 --- a/src/emotes/multiple_page.php +++ /dev/null @@ -1,48 +0,0 @@ - - - - AlrightTV - - - - -
-
- -
-
- -
-
-
-
- -
-
- get_id() . "\">"; - - if ($e->is_added_by_user()) { - echo ''; - } - - echo "get_id() . "/2x." . $e->get_ext() . "\" alt=\"" . $e->get_code() . "\"/>"; - echo "

" . $e->get_code() . "

"; - echo ""; - } - } else { - // info - echo ""; - } - ?> -
-
-
-
-
-
- - - \ No newline at end of file diff --git a/src/emotes/single_page.php b/src/emotes/single_page.php deleted file mode 100644 index d1fc4e8..0000000 --- a/src/emotes/single_page.php +++ /dev/null @@ -1,169 +0,0 @@ - - - - - AlrightTV - - - - -
-
- -
-
- -
-
- -
-
- Emote - get_code() ?> -
-
-
- <?php echo $emote->get_code() ?> - <?php echo $emote->get_code() ?> - <?php echo $emote->get_code() ?> -
-
-
- -
- -
- prepare("SELECT id FROM emote_set_contents WHERE emote_set_id = ? AND emote_id = ?"); - $stmt->execute([$_SESSION["user_emote_set_id"], $emote->get_id()]); - $added = $stmt->rowCount() > 0; - } - - $db = null; - ?> -
- - - - - - - - -
-
-
-
- - - -
-
- - - -
- Report - emote -
- -

Log in to get additional features...

- -
- -
- - - - - - - - - -
Uploaderget_uploaded_by()) { - $db = new PDO(DB_URL, DB_USER, DB_PASS); - $stmt = $db->prepare("SELECT username FROM users WHERE id = ?"); - $stmt->execute([$emote->get_uploaded_by()]); - - if ($row = $stmt->fetch()) { - $username = $row["username"]; - $link = "/users.php?id=" . $emote->get_uploaded_by(); - } - - $db = null; - } - - echo ""; - echo $username; - echo ""; - - echo ', get_created_at()); - echo ' UTC">about ' . format_timestamp(time() - $emote->get_created_at()) . " ago"; - ?>
RatingNot rated
-
- -
-
- prepare("SELECT users.id, users.username - FROM users - INNER JOIN emote_sets AS es ON es.owner_id = users.id - INNER JOIN emote_set_contents AS ec ON ec.emote_set_id = es.id - WHERE ec.emote_id = ?"); - - $stmt->execute([$emote->get_id()]); - $count = $stmt->rowCount(); - - $db = null; - - if ($count > 0) { - echo "

Added in $count channels

"; - } else { - echo "No one has added this emote yet... :'("; - } - ?> -
- fetch()) { - echo '' . $row["username"] . ''; - } - ?> -
-
-
-
-
-
-
- - - \ No newline at end of file -- cgit v1.2.3