From c4b3a6795ea5c76ea3752dab5498edbbb4079ac7 Mon Sep 17 00:00:00 2001 From: gpw Date: Wed, 8 Jun 2022 11:46:36 +0000 Subject: [PATCH] sync: 2022-06-08 11:46:36 +0000 --- .prettierignore | 2 +- .vscode/settings.json | 2 +- classes/donationsview.class.php | 4 +- classes/format.class.php | 2 +- classes/torrent_form.class.php | 31 +- classes/torrents.class.php | 2 +- classes/torrenttable.class.php | 53 +- classes/users.class.php | 126 +--- design/privateheader.php | 37 +- i18n/chs.js | 1 + i18n/en.js | 1 + lang/chs/lang_forums.php | 2 +- lang/chs/lang_index.php | 2 +- lang/en/lang_index.php | 2 +- package.json | 1 + public/static/functions/browse.js | 4 +- public/static/functions/notifications.js | 5 +- public/static/functions/script_start.js | 14 - public/static/functions/sort.js | 2 +- public/static/functions/thumb.js | 16 +- public/static/functions/torrent.js | 73 +- sections/ajax/request.php | 2 +- sections/apply/admin.php | 7 +- sections/apply/apply.php | 4 +- sections/artist/browse.php | 10 +- sections/blog/browse.php | 8 +- sections/collages/torrent_collage.php | 5 +- sections/contest/intro.php | 2 +- sections/contest/leaderboard.php | 2 +- sections/donate/step2.php | 7 +- sections/forums/ajax_get_edit.php | 4 +- sections/forums/browse.php | 2 +- sections/forums/forum.php | 2 +- sections/forums/search.php | 9 +- sections/forums/thread.php | 73 +- sections/index/private.php | 37 +- sections/questions/ajax_get_answers.php | 10 +- sections/questions/answer_question.php | 2 +- sections/questions/popular_questions.php | 2 +- sections/questions/questions.php | 2 +- sections/questions/view_answers.php | 2 +- sections/reports/report.php | 14 +- sections/reports/reports.php | 12 +- sections/reportsv2/ajax_new_report.php | 8 +- sections/reportsv2/reports.php | 4 +- sections/reportsv2/static.php | 644 +++++++++--------- sections/requests/browse.php | 12 +- sections/requests/index.php | 2 +- sections/requests/new_edit.php | 36 +- sections/requests/request.php | 16 +- sections/staffblog/index.php | 7 +- sections/staffpm/common_responses.php | 2 +- sections/staffpm/viewconv.php | 4 +- sections/tools/browse.php | 2 +- sections/tools/development/render_base.html | 60 +- sections/tools/managers/award.php | 2 +- sections/tools/managers/news.php | 4 +- sections/top10/users.php | 31 +- sections/torrents/browse.php | 4 +- sections/torrents/details.php | 8 +- sections/torrents/missing.php | 2 +- sections/torrents/notify.php | 10 +- sections/upload/upload.php | 16 +- sections/upload/upload_handle.php | 4 +- sections/user/linkedfunctions.php | 4 +- sections/user/user.php | 63 +- sections/wiki/browse.php | 4 +- src/css/default/components/Button-Link.css | 7 +- .../default/components/Overlay/Snackbar.css | 8 +- src/css/default/components/Table/Table.css | 5 +- .../components/Table/TableMediaInfo.css | 2 +- .../default/components/Table/TableTorrent.css | 4 + src/css/default/components/TorrentDetail.css | 6 +- src/css/default/default/default-variables.css | 1 + src/css/default/pages/PageForum.css | 17 +- src/css/default/pages/PageHome.css | 28 + src/css/default/pages/index.css | 1 + src/icons/Admin/add.svg | 1 - src/icons/Admin/pass.svg | 1 - src/icons/Admin/pend.svg | 2 +- src/icons/Admin/reject.svg | 1 - src/icons/BBCodeToolbar/cloudUpload.svg | 2 +- src/icons/BBCodeToolbar/eye.svg | 2 +- src/icons/BBCodeToolbar/eyeSlash.svg | 2 +- src/icons/Common/like-solid.svg | 3 + src/icons/Common/like.svg | 1 - src/icons/Common/unlike.svg | 3 + src/icons/MovieInfo/birthday.svg | 2 +- src/icons/MovieInfo/place-of-birth.svg | 2 +- src/icons/Table/check-all.svg | 2 +- src/icons/Table/checked.svg | 2 +- src/icons/Table/clear.svg | 2 +- src/icons/Table/cn-quality.svg | 2 +- src/icons/Table/diy.svg | 2 +- src/icons/Table/en-quality.svg | 2 +- src/icons/Table/feature.svg | 2 +- src/icons/Table/quality.svg | 2 +- src/icons/Table/remux.svg | 2 +- src/icons/Table/request-numbers.svg | 2 +- src/icons/Table/retention.svg | 2 +- src/icons/Table/seed-status.svg | 2 +- src/icons/Table/unchecked.svg | 2 +- src/icons/Table/untouched.svg | 2 +- src/icons/User/disabled.svg | 2 +- src/icons/User/display-badge.svg | 2 +- src/icons/User/hnr.svg | 2 +- src/icons/User/warned.svg | 2 +- src/icons/User/wear-badge.svg | 2 +- src/icons/check.svg | 1 - src/icons/circle.svg | 2 +- src/icons/github.svg | 8 + src/icons/rss.svg | 6 + src/icons/telegram.svg | 6 + src/icons/times.svg | 2 +- .../PixelCompare/pixelCompare.js | 2 +- .../SolarCurve/solarCurve.js | 2 +- src/js/app/components/Snackbar/Snackbar.jsx | 14 +- src/js/app/components/Snackbar/index.jsx | 25 +- src/js/globalapp/Lightbox.js | 4 +- .../bbcode/BBCodeToolbar/commands.js | 2 +- src/js/globalapp/filterSlot.js | 2 +- src/js/globalapp/globalapp.js | 15 + src/js/globalapp/imageUpload.js | 17 +- src/js/globalapp/index.js | 39 +- .../js/globalapp}/requests.js | 57 +- src/js/globalapp/toggleAny.js | 59 +- src/js/globalapp/toggleEdition.js | 2 +- src/js/globalapp/toggleGroup.js | 2 +- .../globalapp/toggleSearchTorrentAdvanced.js | 5 +- src/js/globalapp/toggleTab.js | 2 +- src/js/globalapp/toggleTorrentDetail.js | 2 +- src/js/globalapp/tooltipster.js | 66 +- src/js/pages/upload/events.js | 2 +- src/js/pages/upload/movieAutofill.js | 10 +- src/js/pages/upload/origin.js | 289 +------- templates/admin/privilege-matrix.twig | 4 +- templates/request/edit-bounty.twig | 8 +- yarn.lock | 5 + 138 files changed, 1007 insertions(+), 1341 deletions(-) create mode 100644 src/css/default/pages/PageHome.css create mode 100644 src/icons/Common/like-solid.svg create mode 100644 src/icons/Common/unlike.svg create mode 100644 src/icons/github.svg create mode 100644 src/icons/rss.svg create mode 100644 src/icons/telegram.svg create mode 100644 src/js/globalapp/globalapp.js rename {public/static/functions => src/js/globalapp}/requests.js (85%) diff --git a/.prettierignore b/.prettierignore index 9b276d7..8dc93e0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,4 @@ -public +public/{app,js} vendor src/js/forked src/css/forked diff --git a/.vscode/settings.json b/.vscode/settings.json index c53408f..ae53927 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[xml]": { - "editor.defaultFormatter": "DotJoshJohnson.xml" + "editor.defaultFormatter": "redhat.vscode-xml" }, "[php]": { "editor.defaultFormatter": "bmewburn.vscode-intelephense-client" diff --git a/classes/donationsview.class.php b/classes/donationsview.class.php index b199142..78ef024 100644 --- a/classes/donationsview.class.php +++ b/classes/donationsview.class.php @@ -32,7 +32,7 @@ class DonationsView { - + @@ -107,7 +107,7 @@ class DonationsView {
- +
∞"; + return "∞"; } if ($Color) { $Ratio = sprintf( diff --git a/classes/torrent_form.class.php b/classes/torrent_form.class.php index bf3ed91..461f9ff 100644 --- a/classes/torrent_form.class.php +++ b/classes/torrent_form.class.php @@ -130,7 +130,7 @@ class TORRENT_FORM { @@ -479,7 +482,7 @@ class TORRENT_FORM { + WithNumber) { @@ -246,8 +246,8 @@ class TorrentTableView { } public function render_torrent_detail($Group, $Torrent) { $ReadOnly = $this->DetailOption->ReadOnly; - $ThumbCounts = $this->DetailOption->ThumbCounts; - $BonusSended = $this->DetailOption->BonusSended; + $ThumbCounts = $this->DetailOption->ThumbCounts[$Torrent['ID']]; + $BonusSended = $this->DetailOption->BonusSended[$Torrent['ID']]; $ShowReport = $this->DetailOption->WithReport; $GroupID = $Group['ID']; $GroupCategoryID = $Group['CategoryID']; @@ -405,12 +405,14 @@ class TorrentTableView { } ?> -
+
- 0 ? $BonusSended['Count'] : '0' ?> + + 0 ? $BonusSended['Count'] : '0' ?> +
'>'>
: :
- Disabled ?>> Categories) as $Index => $Cat) { if ($Cat == "Applications") { @@ -302,9 +302,12 @@ class TORRENT_FORM {
Disabled ?> value=> - +
- Disabled ? "disabled" : '' ?>> + Disabled ? "disabled" : '' ?>>
@@ -409,7 +412,7 @@ class TORRENT_FORM { if ($FirstArtist) { if (!$this->DisabledFlag) { ?> - + − + + − - + - − + + + −
- Disabled ?>> @@ -955,15 +958,15 @@ class TORRENT_FORM {
- /> + />
- /> + />
diff --git a/classes/torrents.class.php b/classes/torrents.class.php index f54cc8f..928842e 100644 --- a/classes/torrents.class.php +++ b/classes/torrents.class.php @@ -1814,7 +1814,7 @@ WHERE ud.TorrentID=? AND ui.NotifyOnDeleteDownloaded='1' AND ud.UserID NOT IN ({ if ($SubName) { $DisplayName .= " [$SubName] "; } - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear) { $DisplayName .= " ($GroupYear)"; } diff --git a/classes/torrenttable.class.php b/classes/torrenttable.class.php index 1eab947..11af5c7 100644 --- a/classes/torrenttable.class.php +++ b/classes/torrenttable.class.php @@ -84,7 +84,7 @@ class UngroupTorrentSimpleListView extends UngroupTorrentTableView { $ColCount -= 1; } ?> -
× "); } - echo Users::format_username($val['Sentuid'], false, false, false, false, false, $IsDonorForum); ?> - -
+ echo Users::format_username($val['Sentuid'], false, false, false, false, false, $IsDonorForum); + ?> +
- -
+
- - +
+ ... + + +