From d4109f82792922445a20ba3e9068e2f0f287f919 Mon Sep 17 00:00:00 2001 From: xiaomlove Date: Mon, 26 May 2025 15:10:31 +0700 Subject: [PATCH] fix delete torrent message + Chevereto compatible with V3 --- include/constants.php | 4 ++-- nexus/Attachment/Drivers/Chevereto.php | 6 +++++- public/delete.php | 14 ++++++++++---- public/fastdelete.php | 10 +++++++--- resources/lang/cs/torrent.php | 3 ++- resources/lang/da/torrent.php | 3 ++- resources/lang/de/torrent.php | 3 ++- resources/lang/el/torrent.php | 3 ++- resources/lang/en/torrent.php | 3 ++- resources/lang/es/torrent.php | 3 ++- resources/lang/fi/torrent.php | 3 ++- resources/lang/fr/torrent.php | 3 ++- resources/lang/it/torrent.php | 3 ++- resources/lang/ja/torrent.php | 3 ++- resources/lang/nb/torrent.php | 3 ++- resources/lang/nl/torrent.php | 3 ++- resources/lang/pl/torrent.php | 3 ++- resources/lang/pt/torrent.php | 3 ++- resources/lang/ro/torrent.php | 3 ++- resources/lang/ru/torrent.php | 3 ++- resources/lang/sv/torrent.php | 3 ++- resources/lang/zh_CN/torrent.php | 3 ++- resources/lang/zh_TW/torrent.php | 2 +- 23 files changed, 61 insertions(+), 29 deletions(-) diff --git a/include/constants.php b/include/constants.php index a118958e..9ddefc8d 100644 --- a/include/constants.php +++ b/include/constants.php @@ -1,6 +1,6 @@ request('POST', $api, [ @@ -40,7 +42,9 @@ class Chevereto extends Storage { do_log("$logPrefix, no image url", "error"); throw new \Exception("upload fail: " . ($result["error"]["message"] ?? "")); } - return $result["image"]["url"]; + $url = $result["image"]["url"]; + do_log("$logPrefix, upload success, url: $url"); + return $url; } function getBaseUrl(): string diff --git a/public/delete.php b/public/delete.php index bfd3cc53..ed9c03fb 100644 --- a/public/delete.php +++ b/public/delete.php @@ -71,11 +71,17 @@ KPS("-",$uploadtorrent_bonus,$row["owner"]); //Send pm to torrent uploader if ($CURUSER["id"] != $row["owner"] && \App\Models\User::exists($row["owner"])){ - $dt = sqlesc(date("Y-m-d H:i:s")); + $dt = date("Y-m-d H:i:s"); $locale = get_user_locale($row["owner"]); - $subject = sqlesc(nexus_trans("torrent.msg_torrent_deleted", [], $locale)); - $msg = sqlesc(nexus_trans("torrent.msg_the_torrent_you_uploaded", [], $locale).$row['name'].nexus_trans("torrent.msg_was_deleted_by", [], $locale)."[url=userdetails.php?id=".$CURUSER['id']."]".$CURUSER['username']."[/url]".nexus_trans("torrent.msg_reason_is", [], $locale).$reasonstr); - sql_query("INSERT INTO messages (sender, receiver, subject, added, msg) VALUES(0, {$row['owner']}, $subject, $dt, $msg)") or sqlerr(__FILE__, __LINE__); + $subject = nexus_trans("torrent.msg_torrent_deleted", [], $locale); + $msg = nexus_trans("torrent.msg_the_torrent_you_uploaded", [], $locale).$row['name'].nexus_trans("torrent.msg_was_deleted_by", [], $locale)."[url=userdetails.php?id=".$CURUSER['id']."]".$CURUSER['username']."[/url]".nexus_trans("torrent.msg_reason_is", [], $locale).$reasonstr; + \App\Models\Message::add([ + 'sender' => 0, + 'receiver' => $row['owner'], + 'subject' => $subject, + 'msg' => $msg, + 'added' => $dt, + ]); } stdhead($lang_delete['head_torrent_deleted']); diff --git a/public/fastdelete.php b/public/fastdelete.php index 21fc3a95..a0871977 100644 --- a/public/fastdelete.php +++ b/public/fastdelete.php @@ -47,9 +47,13 @@ if ($row['anonymous'] == 'yes' && $CURUSER["id"] == $row["owner"]) { //Send pm to torrent uploader if (\App\Models\User::query()->where("id", $row['owner'])->exists()) { if ($CURUSER["id"] != $row["owner"]){ - $dt = sqlesc(date("Y-m-d H:i:s")); - $subject = nexus_trans("torrent.msg_torrent_deleted", [], get_user_locale($row['owner'])); - $msg = nexus_trans("torrent.msg_the_torrent_you_uploaded", [], get_user_locale($row['owner'])); + $locale = get_user_locale($row["owner"]); + $dt = date("Y-m-d H:i:s"); + $subject = nexus_trans("torrent.msg_torrent_deleted", [], $locale); + $msg = nexus_trans("torrent.msg_the_torrent_you_uploaded", [], $locale) + .$row['name'] + .nexus_trans("torrent.msg_was_deleted_by", ['admin' => $CURUSER['username']], $locale) + ; \App\Models\Message::add([ 'sender' => 0, 'receiver' => $row['owner'], diff --git a/resources/lang/cs/torrent.php b/resources/lang/cs/torrent.php index 4b6d661e..34c4eddf 100644 --- a/resources/lang/cs/torrent.php +++ b/resources/lang/cs/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Placený torrent', 'msg_torrent_deleted' => "Váš torrent byl smazán", 'msg_the_torrent_you_uploaded' => "torrent, který jste nahráli '", - 'msg_was_deleted_by' => "' byl smazán ", + 'msg_was_deleted_by' => "'byl smazán :admin", 'msg_reason_is' => ", důvod: ", 'msg_reseed_request' => "Znovu zaslat žádost", 'msg_reseed_user' => "Uživatel ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nMůžete stáhnout Torrent", 'msg_here' => " [b]zde[/b]", 'msg_offer' => "Nabídka ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/da/torrent.php b/resources/lang/da/torrent.php index 21df3f8c..7982a5e2 100644 --- a/resources/lang/da/torrent.php +++ b/resources/lang/da/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Betalt torrent', 'msg_torrent_deleted' => "Din torrent blev slettet", 'msg_the_torrent_you_uploaded' => "Torrent du uploadede '", - 'msg_was_deleted_by' => "' blev slettet af ", + 'msg_was_deleted_by' => "'blev slettet af :admin", 'msg_reason_is' => "Årsagen: ", 'msg_reseed_request' => "Reseed Anmodning", 'msg_reseed_user' => "Bruger ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nDu kan downloade Torrent", 'msg_here' => " [b]her[/b]", 'msg_offer' => "Tilbud ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/de/torrent.php b/resources/lang/de/torrent.php index 24592aa6..596f5281 100644 --- a/resources/lang/de/torrent.php +++ b/resources/lang/de/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Bezahlter Torrent', 'msg_torrent_deleted' => "Ihr Torrent wurde gelöscht", 'msg_the_torrent_you_uploaded' => "Der Torrent den Sie hochgeladen haben '", - 'msg_was_deleted_by' => "' wurde gelöscht von ", + 'msg_was_deleted_by' => "'wurde von :admin gelöscht", 'msg_reason_is' => ". Der Grund: ", 'msg_reseed_request' => "Reseed Anfrage", 'msg_reseed_user' => "Benutzer ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nDu kannst den Torrent herunterladen", 'msg_here' => " [b]hier[/b]", 'msg_offer' => "Angebot ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/el/torrent.php b/resources/lang/el/torrent.php index a7b353d6..8da05f54 100644 --- a/resources/lang/el/torrent.php +++ b/resources/lang/el/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Καταβεβλημένο torrent', 'msg_torrent_deleted' => "Το torrent σας διαγράφηκε", 'msg_the_torrent_you_uploaded' => "Το torrent που ανεβάσατε '", - 'msg_was_deleted_by' => "' διαγράφηκε από ", + 'msg_was_deleted_by' => "'διαγράφηκε από τον :admin", 'msg_reason_is' => ". Ο λόγος: ", 'msg_reseed_request' => "Αίτημα Ανησυχίας", 'msg_reseed_user' => "Χρήστης ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nYou can Download the Torrent", 'msg_here' => " [b]here[/b]", 'msg_offer' => "Προσφορά ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/en/torrent.php b/resources/lang/en/torrent.php index 60bd2e7c..21aa5d28 100644 --- a/resources/lang/en/torrent.php +++ b/resources/lang/en/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Paid torrent', 'msg_torrent_deleted' => "Your torrent was deleted", 'msg_the_torrent_you_uploaded' => "The torrent you uploaded '", - 'msg_was_deleted_by' => "' was delete by ", + 'msg_was_deleted_by' => "'was deleted by :admin", 'msg_reason_is' => ". The reason: ", 'msg_reseed_request' => "Reseed Request", 'msg_reseed_user' => "User ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nYou can Download the Torrent", 'msg_here' => " [b]here[/b]", 'msg_offer' => "Offer ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/es/torrent.php b/resources/lang/es/torrent.php index f2145df1..c0786876 100644 --- a/resources/lang/es/torrent.php +++ b/resources/lang/es/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Torrent pagado', 'msg_torrent_deleted' => "Tu torrent ha sido eliminado", 'msg_the_torrent_you_uploaded' => "El torrent que has subido '", - 'msg_was_deleted_by' => "' fue eliminado por ", + 'msg_was_deleted_by' => "'fue eliminado por :admin", 'msg_reason_is' => ". La razón: ", 'msg_reseed_request' => "Solicitud de resembrado", 'msg_reseed_user' => "Usuario ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nYou can Download the Torrent", 'msg_here' => " [b]aquí[/b]", 'msg_offer' => "Oferta ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/fi/torrent.php b/resources/lang/fi/torrent.php index 464147ef..806fc313 100644 --- a/resources/lang/fi/torrent.php +++ b/resources/lang/fi/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Maksettu torrentti', 'msg_torrent_deleted' => "Sinun torrentti poistettiin", 'msg_the_torrent_you_uploaded' => "The torrent you uploaded '", - 'msg_was_deleted_by' => "' poistettiin ", + 'msg_was_deleted_by' => "'oli poistanut :admin", 'msg_reason_is' => ". Syy: ", 'msg_reseed_request' => "Palautettu Pyyntö", 'msg_reseed_user' => "Käyttäjä ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nVoit ladata Torrentin", 'msg_here' => " [b]tässä[/b]", 'msg_offer' => "Tarjous ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/fr/torrent.php b/resources/lang/fr/torrent.php index b8ed9d31..754a72a9 100644 --- a/resources/lang/fr/torrent.php +++ b/resources/lang/fr/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Torrent payé', 'msg_torrent_deleted' => "Votre torrent a été supprimé", 'msg_the_torrent_you_uploaded' => "Le torrent que vous avez téléchargé '", - 'msg_was_deleted_by' => "' a été supprimé par ", + 'msg_was_deleted_by' => "'a été supprimé par :admin", 'msg_reason_is' => ". - La raison: ", 'msg_reseed_request' => "Remise en page de la requête", 'msg_reseed_user' => "Utilisateur ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nVous pouvez télécharger le Torrent", 'msg_here' => " [b]ici[/b]", 'msg_offer' => "Offre ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/it/torrent.php b/resources/lang/it/torrent.php index b42feadd..8e1b4e2d 100644 --- a/resources/lang/it/torrent.php +++ b/resources/lang/it/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Torrent pagato', 'msg_torrent_deleted' => "Il tuo torrent è stato eliminato", 'msg_the_torrent_you_uploaded' => "Il torrent che hai caricato '", - 'msg_was_deleted_by' => "' è stato eliminato da ", + 'msg_was_deleted_by' => "'è stato eliminato da :admin", 'msg_reason_is' => ". Il motivo: ", 'msg_reseed_request' => "Riseed Request", 'msg_reseed_user' => "Utente ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => "\nÈ possibile scaricare il Torrent", 'msg_here' => " [b]qui[/b]", 'msg_offer' => "Offerta ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/ja/torrent.php b/resources/lang/ja/torrent.php index 429a7c25..30597dce 100644 --- a/resources/lang/ja/torrent.php +++ b/resources/lang/ja/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => '有料Torrent', 'msg_torrent_deleted' => "トレントが削除されました", 'msg_the_torrent_you_uploaded' => "アップロードされた Torrent '", - 'msg_was_deleted_by' => "によって削除された ", + 'msg_was_deleted_by' => "was deleted by :admin", 'msg_reason_is' => "理由: ", 'msg_reseed_request' => "リクエストを再送する", 'msg_reseed_user' => "ユーザー ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => "\nTorrent をダウンロードできます", 'msg_here' => " ここ [b][/b]", 'msg_offer' => "オファー ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/nb/torrent.php b/resources/lang/nb/torrent.php index 385b4e65..382c4eb1 100644 --- a/resources/lang/nb/torrent.php +++ b/resources/lang/nb/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Betalt torrent', 'msg_torrent_deleted' => "Din torrent er slettet", 'msg_the_torrent_you_uploaded' => "Torrenten du lastet opp '", - 'msg_was_deleted_by' => "' ble slettet av ", + 'msg_was_deleted_by' => "'ble slettet av :admin", 'msg_reason_is' => ". Begrunnelsen. ", 'msg_reseed_request' => "Reseed forespørsel", 'msg_reseed_user' => "Bruker ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nDu kan laste ned Torrent", 'msg_here' => " [b]her[/b]", 'msg_offer' => "Tilbud ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/nl/torrent.php b/resources/lang/nl/torrent.php index 9cc0f39c..3f6eeea9 100644 --- a/resources/lang/nl/torrent.php +++ b/resources/lang/nl/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Betaalde torrent', 'msg_torrent_deleted' => "Je torrent is verwijderd", 'msg_the_torrent_you_uploaded' => "De torrent die je hebt geüpload \"", - 'msg_was_deleted_by' => "' is verwijderd door ", + 'msg_was_deleted_by' => "'is verwijderd door :admin", 'msg_reason_is' => ". De reden: ", 'msg_reseed_request' => "Opnieuw doorgaan verzoek", 'msg_reseed_user' => "Gebruiker ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nJe kunt de Torrent downloaden", 'msg_here' => " [b]hier[/b]", 'msg_offer' => "Aanbieding ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/pl/torrent.php b/resources/lang/pl/torrent.php index f17bd6ad..031a6a63 100644 --- a/resources/lang/pl/torrent.php +++ b/resources/lang/pl/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Płatny torrent', 'msg_torrent_deleted' => "Twój torrent został usunięty", 'msg_the_torrent_you_uploaded' => "Przesłany torrent '", - 'msg_was_deleted_by' => "' został usunięty przez ", + 'msg_was_deleted_by' => "'został usunięty przez :admin", 'msg_reason_is' => ". Powód: ", 'msg_reseed_request' => "Żądanie reseedowania", 'msg_reseed_user' => "Użytkownik ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nMożesz pobrać torrent", 'msg_here' => " [b]tutaj[/b]", 'msg_offer' => "Oferta ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/pt/torrent.php b/resources/lang/pt/torrent.php index 1f77df7d..4c783e96 100644 --- a/resources/lang/pt/torrent.php +++ b/resources/lang/pt/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Torrent pago', 'msg_torrent_deleted' => "Seu torrent foi excluído", 'msg_the_torrent_you_uploaded' => "O torrent que você enviou '", - 'msg_was_deleted_by' => "' foi apagado por ", + 'msg_was_deleted_by' => "'foi excluído por :admin", 'msg_reason_is' => ". O motivo: ", 'msg_reseed_request' => "Solicitação de Reenvio", 'msg_reseed_user' => "Usuário ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nVocê pode baixar o Torrent", 'msg_here' => " [b]aqui[/b]", 'msg_offer' => "Oferta ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/ro/torrent.php b/resources/lang/ro/torrent.php index ab1876ba..0ca80c1d 100644 --- a/resources/lang/ro/torrent.php +++ b/resources/lang/ro/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Torent plătit', 'msg_torrent_deleted' => "Torentul tău a fost șters", 'msg_the_torrent_you_uploaded' => "Torentul pe care l-ai încărcat '", - 'msg_was_deleted_by' => "' a fost șters de ", + 'msg_was_deleted_by' => "'a fost șters de :admin", 'msg_reason_is' => ". Motivul: ", 'msg_reseed_request' => "Cerere retrimisă", 'msg_reseed_user' => "Utilizator ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nPoți descărca Torentul", 'msg_here' => " [b]aici[/b]", 'msg_offer' => "Ofertă ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/ru/torrent.php b/resources/lang/ru/torrent.php index a7a2bcd1..5035437c 100644 --- a/resources/lang/ru/torrent.php +++ b/resources/lang/ru/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Платный торрент', 'msg_torrent_deleted' => "Ваш торрент был удален", 'msg_the_torrent_you_uploaded' => "Торрент, который вы загрузили '", - 'msg_was_deleted_by' => "' был удалён ", + 'msg_was_deleted_by' => "'был удален :admin", 'msg_reason_is' => ". Причина: ", 'msg_reseed_request' => "Запрос отправлен", 'msg_reseed_user' => "Пользователь ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nYou can Download the Torrent", 'msg_here' => " [b]here[/b]", 'msg_offer' => "Предложение ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/sv/torrent.php b/resources/lang/sv/torrent.php index b9d938c3..c552f54a 100644 --- a/resources/lang/sv/torrent.php +++ b/resources/lang/sv/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => 'Betald torrent', 'msg_torrent_deleted' => "Din torrent har tagits bort", 'msg_the_torrent_you_uploaded' => "Den torrent du laddat upp '", - 'msg_was_deleted_by' => "' togs bort av ", + 'msg_was_deleted_by' => "'togs bort av :admin", 'msg_reason_is' => ". Anledningen till detta: ", 'msg_reseed_request' => "Återupphäv begäran", 'msg_reseed_user' => "Användare ", @@ -106,4 +106,5 @@ return [ 'msg_you_can_download' => ".\nDu kan ladda ner Torrent", 'msg_here' => " [b]här[/b]", 'msg_offer' => "Erbjudande ", + 'msg_blank' => ".", ]; diff --git a/resources/lang/zh_CN/torrent.php b/resources/lang/zh_CN/torrent.php index f165f99d..db58b5c5 100644 --- a/resources/lang/zh_CN/torrent.php +++ b/resources/lang/zh_CN/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => '收费种子', 'msg_torrent_deleted' => "种子被删除", 'msg_the_torrent_you_uploaded' => "你上传的种子'", - 'msg_was_deleted_by' => "'被管理员", + 'msg_was_deleted_by' => "'被管理员: :admin 删除", 'msg_reason_is' => "删除。原因：", 'msg_reseed_request' => "续种请求", 'msg_reseed_user' => "用户", @@ -105,4 +105,5 @@ return [ 'msg_you_can_download' => "上传。\n下载请到", 'msg_here' => "[b]这里[/b]", 'msg_offer' => "候选 ", + 'msg_blank' => "刪除。", ]; diff --git a/resources/lang/zh_TW/torrent.php b/resources/lang/zh_TW/torrent.php index b71ef0e6..568b1b80 100644 --- a/resources/lang/zh_TW/torrent.php +++ b/resources/lang/zh_TW/torrent.php @@ -94,7 +94,7 @@ return [ 'paid_torrent' => '收費種子', 'msg_torrent_deleted' => "種子被刪除", 'msg_the_torrent_you_uploaded' => "你上傳的種子'", - 'msg_was_deleted_by' => "'被管理員", + 'msg_was_deleted_by' => "'被管理員: :admin 刪除", 'msg_reason_is' => "刪除。原因：", 'msg_reseed_request' => "續種請求", 'msg_reseed_user' => "用戶",