From d715012bc177e6254a472ccf008de3f96c17698c Mon Sep 17 00:00:00 2001 From: xiaomlove Date: Thu, 8 Sep 2022 21:48:15 +0800 Subject: [PATCH] torrent delete independent of torrent management --- lang/chs/lang_settings.php | 4 +++- lang/cht/lang_settings.php | 4 +++- lang/en/lang_settings.php | 4 +++- nexus/Install/settings.default.php | 1 + public/delete.php | 2 +- public/edit.php | 2 +- public/settings.php | 5 ++++- resources/lang/en/permission.php | 6 +++++- resources/lang/zh_CN/permission.php | 4 ++++ resources/lang/zh_TW/permission.php | 4 ++++ 10 files changed, 29 insertions(+), 7 deletions(-) diff --git a/lang/chs/lang_settings.php b/lang/chs/lang_settings.php index c3dcb295..9566cb22 100644 --- a/lang/chs/lang_settings.php +++ b/lang/chs/lang_settings.php @@ -91,7 +91,7 @@ $lang_settings = array 'row_view_userlist' => "查看用户列表", 'text_view_userlist_note' => "。查看、搜索用户列表。", 'row_torrent_management' => "管理种子", - 'text_torrent_management_note' => "。编辑、删除种子，但不能将种子设为置顶或促销。", + 'text_torrent_management_note' => "。编辑种子，但不能将种子设为置顶或促销或删除。", 'row_torrent_sticky' => "设定种子置顶", 'text_torrent_sticky_note' => "。将种子设为置顶", 'row_torrent_on_promotion' => "设定种子为促销", @@ -771,6 +771,8 @@ $lang_settings = array 'text_harem_addition_note' => '倍作为奖励（系数，如填入 0.01，后宫获得 100 魔力则奖励用户 100 * 0.01 = 1）', 'row_offer_skip_approved_count' => '直接发布候选通过数', 'text_offer_skip_approved_count_note' => '当通过的候选数大于等于此数值时，可直接发布不用提交候选。', + 'row_torrent_delete' => '删除种子', + 'text_torrent_delete_note' => '。删除种子', ); ?> diff --git a/lang/cht/lang_settings.php b/lang/cht/lang_settings.php index 9701895b..6ec1fc42 100644 --- a/lang/cht/lang_settings.php +++ b/lang/cht/lang_settings.php @@ -91,7 +91,7 @@ $lang_settings = array 'row_view_userlist' => "檢視用戶清單", 'text_view_userlist_note' => "。檢視、搜索用戶清單。", 'row_torrent_management' => "管理種子", - 'text_torrent_management_note' => "。編輯、移除種子，但無法將種子設為置頂或促銷。", + 'text_torrent_management_note' => "。編輯種子，但無法將種子設為置頂或促銷或移除。", 'row_torrent_sticky' => "設定種子置頂", 'text_torrent_sticky_note' => "。將種子設為置頂", 'row_torrent_on_promotion' => "設定種子為促銷", @@ -771,6 +771,8 @@ $lang_settings = array 'text_harem_addition_note' => '倍作為獎勵（系數，如填入 0.01，後宮獲得 100 魔力則獎勵用戶 100 * 0.01 = 1）', 'row_offer_skip_approved_count' => '直接發布候選通過數', 'text_offer_skip_approved_count_note' => '當通過的候選數大於等於此數值時，可直接發布不用提交候選。', + 'row_torrent_delete' => '移除種子', + 'text_torrent_delete_note' => '。移除種子', ); ?> diff --git a/lang/en/lang_settings.php b/lang/en/lang_settings.php index 9a049d52..9e0fc03b 100644 --- a/lang/en/lang_settings.php +++ b/lang/en/lang_settings.php @@ -91,7 +91,7 @@ $lang_settings = array 'row_view_userlist' => "View User List", 'text_view_userlist_note' => ". View, search user list", 'row_torrent_management' => "Torrent Management", - 'text_torrent_management_note' => ". Edit, delete torrents, excluding setting torrent sticky or on promotion", + 'text_torrent_management_note' => ". Edit torrents, excluding setting torrent sticky or on promotion or delete", 'row_torrent_sticky' => "Torrent Sticky", 'text_torrent_sticky_note' => ". Set torrents sticky", 'row_torrent_on_promotion' => "Torrent on Promotion", @@ -771,6 +771,8 @@ $lang_settings = array 'text_harem_addition_note' => 'times as reward (factor, e.g. fill in 0.01, if harem gets 100 bonus then reward user 100 * 0.01 = 1)', 'row_offer_skip_approved_count' => 'Direct upload offer allow count', 'text_offer_skip_approved_count_note' => 'When the number of approved offer is greater than or equal to this value, you can upload directly without submitting offers.', + 'row_torrent_delete' => 'Delete torrent', + 'text_torrent_delete_note' => '.Delete torrent', ); ?> diff --git a/nexus/Install/settings.default.php b/nexus/Install/settings.default.php index 10acad0f..66c584f3 100644 --- a/nexus/Install/settings.default.php +++ b/nexus/Install/settings.default.php @@ -176,6 +176,7 @@ return array ( 'view_special_torrent' => '4', 'torrent_hr' => User::CLASS_ADMINISTRATOR, 'torrent-approval' => User::CLASS_ADMINISTRATOR, + 'torrent-delete' => User::CLASS_ADMINISTRATOR, ), 'tweak' => array ( diff --git a/public/delete.php b/public/delete.php index 0db79d51..2c2cc32f 100644 --- a/public/delete.php +++ b/public/delete.php @@ -4,7 +4,7 @@ dbconn(); require_once(get_langfile_path()); require_once(get_langfile_path("",true)); loggedinorreturn(); -user_can('torrentmanage', true); +user_can('torrent-delete', true); function bark($msg) { global $lang_delete; stdhead(); diff --git a/public/edit.php b/public/edit.php index 2d99b928..ae6720c1 100644 --- a/public/edit.php +++ b/public/edit.php @@ -205,7 +205,7 @@ else { print(" \n"); print("\n"); print("\n"); - if (user_can('torrentmanage')) { + if (user_can('torrent-delete')) { print("

"); print("
\n"); print("\n"); diff --git a/public/settings.php b/public/settings.php index f212dd75..d186a52e 100644 --- a/public/settings.php +++ b/public/settings.php @@ -222,7 +222,7 @@ elseif ($action == 'savesettings_authority') // save user authority 'commanage','forummanage','viewuserlist','torrentmanage','torrentsticky', 'torrentonpromotion', 'torrent_hr', 'askreseed', 'viewnfo', 'torrentstructure','sendinvite','viewhistory','topten','log','confilog','userprofile', 'torrenthistory','prfmanage', 'cruprfmanage', 'uploadsub','delownsub','submanage','updateextinfo', 'viewanonymous','beanonymous','addoffer','offermanage', 'upload','uploadspecial', - 'view_special_torrent','movetorrent','chrmanage','viewinvite', 'buyinvite','seebanned','againstoffer','userbar', 'torrent-approval' + 'view_special_torrent','movetorrent','chrmanage','viewinvite', 'buyinvite','seebanned','againstoffer','userbar', 'torrent-approval', 'torrent-delete' ); GetVar($validConfig); $AUTHORITY = []; @@ -441,6 +441,9 @@ elseif ($action == 'authoritysettings') //Authority settings tr($lang_settings['row_forum_management'], $lang_settings['text_minimum_class'].classlist('forummanage',$maxclass,$AUTHORITY['forummanage'],0,true).$lang_settings['text_default'].get_user_class_name(UC_ADMINISTRATOR,false,true,true).$lang_settings['text_forum_management_note'],1); tr($lang_settings['row_view_userlist'], $lang_settings['text_minimum_class'].classlist('viewuserlist',$maxclass,$AUTHORITY['viewuserlist'],0,true).$lang_settings['text_default'].get_user_class_name(UC_POWER_USER,false,true,true).$lang_settings['text_view_userlist_note'],1); tr($lang_settings['row_torrent_management'], $lang_settings['text_minimum_class'].classlist('torrentmanage',$maxclass,$AUTHORITY['torrentmanage'],0,true).$lang_settings['text_default'].get_user_class_name(UC_MODERATOR,false,true,true).$lang_settings['text_torrent_management_note'], 1); + tr($lang_settings['row_torrent_delete'], $lang_settings['text_minimum_class'].classlist('torrent-delete',$maxclass,$AUTHORITY['torrent-delete'],0,true).$lang_settings['text_default'].get_user_class_name(UC_MODERATOR,false,true,true).$lang_settings['text_torrent_delete_note'], 1); + + tr($lang_settings['row_torrent_sticky'], $lang_settings['text_minimum_class'].classlist('torrentsticky',$maxclass,$AUTHORITY['torrentsticky'],0,true).$lang_settings['text_default'].get_user_class_name(UC_ADMINISTRATOR,false,true,true).$lang_settings['text_torrent_sticky_note'],1); tr($lang_settings['row_torrent_on_promotion'], $lang_settings['text_minimum_class'].classlist('torrentonpromotion',$maxclass,$AUTHORITY['torrentonpromotion'] ?? '',0,true).$lang_settings['text_default'].get_user_class_name(UC_ADMINISTRATOR,false,true,true).$lang_settings['text_torrent_promotion_note'],1); tr($lang_settings['row_torrent_hr'], $lang_settings['text_minimum_class'].classlist('torrent_hr',$maxclass,$AUTHORITY['torrent_hr'] ?? '',0,true).$lang_settings['text_default'].get_user_class_name(UC_ADMINISTRATOR,false,true,true).$lang_settings['text_torrent_hr_note'],1); diff --git a/resources/lang/en/permission.php b/resources/lang/en/permission.php index f345c7c8..45bed5b5 100644 --- a/resources/lang/en/permission.php +++ b/resources/lang/en/permission.php @@ -59,7 +59,11 @@ return [ ], 'torrentmanage' => [ 'text' => 'Torrent Management', - 'desc' => 'Edit, delete torrents, excluding setting torrent sticky or on promotion', + 'desc' => 'Edit torrents, excluding setting torrent sticky or on promotion or delete', + ], + 'torrent-delete' => [ + 'text' => 'Delete torrent', + 'desc' => 'Delete torrent', ], 'torrentsticky' => [ 'text' => 'Torrent Sticky', diff --git a/resources/lang/zh_CN/permission.php b/resources/lang/zh_CN/permission.php index c6e4645c..5987a378 100644 --- a/resources/lang/zh_CN/permission.php +++ b/resources/lang/zh_CN/permission.php @@ -61,6 +61,10 @@ return [ 'text' => '管理种子', 'desc' => '编辑、删除种子，但不能将种子设为置顶或促销', ], + 'torrent-delete' => [ + 'text' => '删除种子', + 'desc' => '删除种子', + ], 'torrentsticky' => [ 'text' => '设定种子置顶', 'desc' => '将种子设为置顶', diff --git a/resources/lang/zh_TW/permission.php b/resources/lang/zh_TW/permission.php index 7c7f5935..642c8097 100644 --- a/resources/lang/zh_TW/permission.php +++ b/resources/lang/zh_TW/permission.php @@ -61,6 +61,10 @@ return [ 'text' => '管理種子', 'desc' => '編輯、移除種子，但無法將種子設為置頂或促銷', ], + 'torrent-delete' => [ + 'text' => '移除种子', + 'desc' => '移除种子', + ], 'torrentsticky' => [ 'text' => '設定種子置頂', 'desc' => '將種子設為置頂',