@@ -126,7 +136,7 @@ HTML;
$perPage = 10;
$total = get_row_count('torrents_custom_fields');
list($paginationTop, $paginationBottom, $limit) = pager($perPage, $total, "?");
- $sql = "select * from torrents_custom_fields order by id asc $limit";
+ $sql = "select * from torrents_custom_fields order by priority desc $limit";
$res = sql_query($sql);
$header = [
'id' => $lang_fields['col_id'],
@@ -135,6 +145,7 @@ HTML;
'type_text' => $lang_fields['col_type'],
'required_text' => $lang_fields['col_required'],
'is_single_row_text' => $lang_fields['col_is_single_row'],
+ 'priority' => nexus_trans('label.priority'),
'action' => $lang_fields['col_action'],
];
$rows = [];
@@ -203,6 +214,8 @@ HEAD;
$attributes['help'] = $data['help'] ?? '';
$attributes['options'] = trim($data['options'] ?? '');
+ $attributes['display'] = trim($data['display'] ?? '');
+ $attributes['priority'] = trim($data['priority'] ?? '0');
$now = date('Y-m-d H:i:s');
$attributes['updated_at'] = $now;
$table = 'torrents_custom_fields';
@@ -252,24 +265,29 @@ HEAD;
}
- public function renderOnUploadPage($torrentId = 0)
+ public function renderOnUploadPage($torrentId = 0, $searchBoxId)
{
- global $browsecatmode;
- $searchBox = NexusDB::getOne('searchbox', "id = $browsecatmode");
+ $searchBox = NexusDB::getOne('searchbox', "id = $searchBoxId");
if (empty($searchBox)) {
- throw new \RuntimeException("Invalid search box: $browsecatmode");
+ throw new \RuntimeException("Invalid search box: $searchBoxId");
}
- $customValues = $this->listTorrentCustomField($torrentId);
- $sql = sprintf('select * from torrents_custom_fields where id in (%s)', $searchBox['custom_fields'] ?: 0);
+ $customValues = $this->listTorrentCustomField($torrentId, $searchBoxId);
+ $sql = sprintf('select * from torrents_custom_fields where id in (%s) order by priority desc', $searchBox['custom_fields'] ?: 0);
$res = sql_query($sql);
$html = '';
while ($row = mysql_fetch_assoc($res)) {
- $name = "custom_fields[{$row['id']}]";
+ $name = "custom_fields[$searchBoxId][{$row['id']}]";
$currentValue = $customValues[$row['id']]['custom_field_value'] ?? '';
+ $requireText = '';
+ if ($row['required']) {
+ $requireText = "
* ";
+ }
+ $trLabel = $row['label'] . $requireText;
+ $trRelation = "mode_$searchBoxId";
if ($row['type'] == self::TYPE_TEXT) {
- $html .= tr($row['label'], sprintf('
', $name, $currentValue, '99%'), 1);
+ $html .= tr($trLabel, sprintf('
', $name, $currentValue, '99%'), 1, $trRelation);
} elseif ($row['type'] == self::TYPE_TEXTAREA) {
- $html .= tr($row['label'], sprintf('
', $name, '99%', $currentValue), 1);
+ $html .= tr($trLabel, sprintf('
', $name, '99%', $currentValue), 1, $trRelation);
} elseif ($row['type'] == self::TYPE_RADIO || $row['type'] == self::TYPE_CHECKBOX) {
if ($row['type'] == self::TYPE_CHECKBOX) {
$name .= '[]';
@@ -293,7 +311,7 @@ HEAD;
$row['type'], $name, $value, $checked, $label
);
}
- $html .= tr($row['label'], $part, 1);
+ $html .= tr($trLabel, $part, 1, $trRelation);
} elseif ($row['type'] == self::TYPE_SELECT) {
$part = '
';
foreach (preg_split('/[\r\n]+/', trim($row['options'])) as $option) {
@@ -312,7 +330,7 @@ HEAD;
);
}
$part .= ' ';
- $html .= tr($row['label'], $part, 1);
+ $html .= tr($trLabel, $part, 1, $trRelation);
} elseif ($row['type'] == self::TYPE_IMAGE) {
$callbackFunc = "preview_custom_field_image_" . $row['id'];
$iframeId = "iframe_$callbackFunc";
@@ -351,18 +369,14 @@ HEAD;
}
JS;
- $html .= tr($row['label'], $y, 1);
+ $html .= tr($trLabel, $y, 1, $trRelation, true);
}
}
return $html;
}
- public function listTorrentCustomField($torrentId, $searchBoxId = 0)
+ public function listTorrentCustomField($torrentId, $searchBoxId)
{
- global $browsecatmode;
- if ($searchBoxId <= 0) {
- $searchBoxId = $browsecatmode;
- }
//suppose torrentId is array
$isArray = true;
$torrentIdArr = $torrentId;
@@ -371,7 +385,7 @@ JS;
$torrentIdArr = [$torrentId];
}
$torrentIdStr = implode(',', $torrentIdArr);
- $res = sql_query("select f.*, v.custom_field_value, v.torrent_id from torrents_custom_field_values v inner join torrents_custom_fields f on v.custom_field_id = f.id inner join searchbox box on box.id = $searchBoxId and find_in_set(f.id, box.custom_fields) where torrent_id in ($torrentIdStr)");
+ $res = sql_query("select f.*, v.custom_field_value, v.torrent_id from torrents_custom_field_values v inner join torrents_custom_fields f on v.custom_field_id = f.id inner join searchbox box on box.id = $searchBoxId and find_in_set(f.id, box.custom_fields) where torrent_id in ($torrentIdStr) order by f.priority desc");
$values = [];
$result = [];
while ($row = mysql_fetch_assoc($res)) {
@@ -402,12 +416,11 @@ JS;
return $isArray ? $result : ($result[$torrentId] ?? []);
}
- public function renderOnTorrentDetailsPage($torrentId)
+ public function renderOnTorrentDetailsPage($torrentId, $searchBoxId)
{
- global $browsecatmode;
- $displayName = get_searchbox_value($browsecatmode, 'custom_fields_display_name');
- $customFields = $this->listTorrentCustomField($torrentId);
- $mixedRowContent = get_searchbox_value($browsecatmode, 'custom_fields_display');
+ $displayName = get_searchbox_value($searchBoxId, 'custom_fields_display_name');
+ $customFields = $this->listTorrentCustomField($torrentId, $searchBoxId);
+ $mixedRowContent = get_searchbox_value($searchBoxId, 'custom_fields_display');
$rowByRowHtml = '';
$shouldRenderMixRow = false;
foreach ($customFields as $field) {
@@ -422,12 +435,20 @@ JS;
$mixedRowContent = str_replace("<%{$field['name']}.label%>", $field['label'], $mixedRowContent);
$mixedRowContent = str_replace("<%{$field['name']}.value%>", $contentNotFormatted, $mixedRowContent);
if ($field['is_single_row']) {
- $contentFormatted = $this->formatCustomFieldValue($field, true);
- $rowByRowHtml .= tr($field['label'], $contentFormatted, 1);
+ if (!empty($field['display'])) {
+ $customFieldDisplay = $field['display'];
+ $customFieldDisplay = str_replace("<%{$field['name']}.label%>", $field['label'], $customFieldDisplay);
+ $customFieldDisplay = str_replace("<%{$field['name']}.value%>", $contentNotFormatted, $customFieldDisplay);
+ $rowByRowHtml .= tr($field['label'], format_comment($customFieldDisplay, false), 1);
+ } else {
+ $contentFormatted = $this->formatCustomFieldValue($field, true);
+ $rowByRowHtml .= tr($field['label'], $contentFormatted, 1);
+ }
}
}
+
$result = $rowByRowHtml;
- if ($shouldRenderMixRow) {
+ if ($shouldRenderMixRow && $mixedRowContent) {
$result .= tr($displayName, format_comment($mixedRowContent), 1);
}
return $result;
@@ -442,13 +463,13 @@ JS;
switch ($customFieldWithValue['type']) {
case self::TYPE_TEXT:
case self::TYPE_TEXTAREA:
- $result .= $doFormatComment ? format_comment($fieldValue) : $fieldValue;
+ $result .= $doFormatComment ? format_comment($fieldValue, false) : $fieldValue;
break;
case self::TYPE_IMAGE:
if (substr($fieldValue, 0, 4) == 'http') {
$result .= $doFormatComment ? formatImg($fieldValue, true, 700, 0, "attach{$customFieldWithValue['id']}") : $fieldValue;
} else {
- $result .= $doFormatComment ? format_comment($fieldValue) : $fieldValue;
+ $result .= $doFormatComment ? format_comment($fieldValue, false) : $fieldValue;
}
break;
case self::TYPE_RADIO:
@@ -491,6 +512,32 @@ JS;
}
+ public function saveFieldValues($searchBoxId, $torrentId, array $data)
+ {
+ $searchBox = SearchBox::query()->findOrFail($searchBoxId);
+ $enabledFields = TorrentCustomField::query()->find($searchBox->custom_fields);
+ $insert = [];
+ $now = now();
+ foreach ($enabledFields as $field) {
+ if (empty($data[$field->id])) {
+ if ($field->required) {
+// throw new \InvalidArgumentException(nexus_trans("nexus.require_argument", ['argument' => $field->label]));
+ do_log("Field: {$field->label} required, but empty");
+ }
+ continue;
+ }
+ $insert[] = [
+ 'torrent_id' => $torrentId,
+ 'custom_field_id' => $field->id,
+ 'custom_field_value' => $data[$field->id],
+ 'created_at' => $now,
+ 'updated_at' => $now,
+ ];
+ }
+ TorrentCustomFieldValue::query()->where('torrent_id', $torrentId)->delete();
+ TorrentCustomFieldValue::query()->insert($insert);
+ }
+
}
diff --git a/nexus/Imdb/Imdb.php b/nexus/Imdb/Imdb.php
index baad02f9..78fe2bd5 100644
--- a/nexus/Imdb/Imdb.php
+++ b/nexus/Imdb/Imdb.php
@@ -34,7 +34,8 @@ class Imdb
public static function listSupportLanguages(): array
{
- $data = require_once sprintf('%s/resources/lang/%s/imdb.php', ROOT_PATH, get_langfolder_cookie(true));
+ $file = sprintf('%s/resources/lang/%s/imdb.php', ROOT_PATH, get_langfolder_cookie(true));
+ $data = include $file;
return $data['languages'];
}
diff --git a/nexus/Install/Update.php b/nexus/Install/Update.php
index 54ff934a..f9d4d312 100644
--- a/nexus/Install/Update.php
+++ b/nexus/Install/Update.php
@@ -15,6 +15,7 @@ use App\Models\Tag;
use App\Models\Torrent;
use App\Models\TorrentTag;
use App\Models\User;
+use App\Models\UserBanLog;
use App\Repositories\AttendanceRepository;
use App\Repositories\BonusRepository;
use App\Repositories\ExamRepository;
@@ -391,6 +392,8 @@ class Update extends Install
$command .= " --exclude=$exclude";
}
$this->executeCommand($command);
+ //remove original file
+ unlink($filename);
break;
}
}
@@ -444,5 +447,4 @@ class Update extends Install
}
-
}
diff --git a/nexus/Install/settings.default.php b/nexus/Install/settings.default.php
index eeb0c938..1f8398ea 100644
--- a/nexus/Install/settings.default.php
+++ b/nexus/Install/settings.default.php
@@ -92,6 +92,7 @@ return array (
'show_top_uploader' => 'no',
'imdb_language' => 'en-US',
'offer_skip_approved_count' => 5,
+ 'upload_deny_approval_deny_count' => 2,
),
'smtp' =>
array (
@@ -179,6 +180,8 @@ return array (
'torrent-delete' => User::CLASS_ADMINISTRATOR,
'user-delete' => User::CLASS_ADMINISTRATOR,
'user-change-class' => User::CLASS_ADMINISTRATOR,
+ 'torrent-set-special-tag' => User::CLASS_ADMINISTRATOR,
+ 'torrent-approval-allow-automatic' => User::CLASS_UPLOADER,
),
'tweak' =>
array (
@@ -233,6 +236,11 @@ return array (
'cancel_hr' => BonusLogs::DEFAULT_BONUS_CANCEL_ONE_HIT_AND_RUN,
'attendance_card' => BonusLogs::DEFAULT_BONUS_BUY_ATTENDANCE_CARD,
'harem_addition' => 0,
+ 'hundredgbupload' => 10000,
+ 'tengbdownload' => 1000,
+ 'hundredgbdownload' => 8000,
+ 'official_addition' => '0.5',
+ 'zero_bonus_factor' => '0.2',
),
'account' =>
array (
@@ -296,6 +304,7 @@ return array (
8 => '5',
9 => '10',
),
+ 'destroy_disabled' => 0,
),
'torrent' =>
array (
@@ -341,6 +350,7 @@ return array (
'claim_reach_standard_uploaded' => \App\Models\Claim::STANDARD_UPLOADED_TIMES,
'approval_status_icon_enabled' => 'no',
'approval_status_none_visible' => 'yes',
+ 'nfo_view_style_default' => \App\Models\Torrent::NFO_VIEW_STYLE_DOS,
),
'attachment' =>
array (
@@ -418,6 +428,7 @@ return array (
'no_promotion' => 'yes',
'max_uploaded' => 3,
'not_seed_box_max_speed' => 10240,
+ 'max_uploaded_duration' => 0,
],
'system' => [
'change_username_min_interval_in_days' => '365',
diff --git a/nexus/Torrent/TechnicalInformation.php b/nexus/Torrent/TechnicalInformation.php
index b7080573..048f4d8f 100644
--- a/nexus/Torrent/TechnicalInformation.php
+++ b/nexus/Torrent/TechnicalInformation.php
@@ -163,21 +163,27 @@ class TechnicalInformation
$subtitles = $this->getSubtitles();
// dd($videos, $audios, $subtitles);
if (empty($videos) && empty($audios) && empty($subtitles)) {
-// return '';
- return sprintf('
', $this->mediaInfo);
+ return sprintf('
', $this->mediaInfo);
}
$result = '
';
+ $cols = 0;
if (!empty($videos)) {
+ $cols++;
$result .= $this->buildTdTable($videos);
}
if (!empty($audios)) {
+ $cols++;
$result .= $this->buildTdTable($audios);
}
if (!empty($subtitles)) {
+ $cols++;
$result .= $this->buildTdTable($subtitles);
}
- $result .= '
';
+ $result .= '';
+ $rawMediaInfo = sprintf('[spoiler=%s][raw]
%s [/raw][/spoiler]', nexus_trans('torrent.show_hide_media_info'), $this->mediaInfo);
+ $result .= sprintf('
%s ', $cols, format_comment($rawMediaInfo, false));
+ $result .= '';
return $result;
}
@@ -189,7 +195,8 @@ class TechnicalInformation
$table .= sprintf('
%s: %s', $key, $value);
$table .= '';
}
- $table .= '';
+ $table .= '';
+ $table .= '';
return sprintf('
%s ', $table);
}
diff --git a/public/ajax.php b/public/ajax.php
index 97115177..8fe245a5 100644
--- a/public/ajax.php
+++ b/public/ajax.php
@@ -123,3 +123,11 @@ function consumeBenefit($params)
$rep = new \App\Repositories\UserRepository();
return $rep->consumeBenefit($CURUSER['id'], $params);
}
+
+function clearShoutBox($params)
+{
+ global $CURUSER;
+ user_can('sbmanage', true);
+ \Nexus\Database\NexusDB::table('shoutbox')->delete();
+ return true;
+}
diff --git a/public/announce.php b/public/announce.php
index 02737e76..19cee081 100644
--- a/public/announce.php
+++ b/public/announce.php
@@ -121,7 +121,7 @@ if (!$az) err("Invalid passkey! Re-download the .torrent from $BASEURL");
$userid = intval($az['id'] ?? 0);
unset($GLOBALS['CURUSER']);
$CURUSER = $GLOBALS["CURUSER"] = $az;
-$isDonor = $az['donor'] == 'yes' && ($az['donoruntil'] === null || $az['donoruntil'] == '0000-00-00 00:00:00' || $az['donoruntil'] > date('Y-m-d H:i:s'));
+$isDonor = is_donor($az);
$az['__is_donor'] = $isDonor;
$log = "user: $userid, isDonor: $isDonor, seeder: $seeder, ip: $ip, ipv4: $ipv4, ipv6: $ipv6";
@@ -156,7 +156,7 @@ elseif ($az['showclienterror'] == 'yes'){
}
// check torrent based on info_hash
-$checkTorrentSql = "SELECT id, size, owner, sp_state, seeders, leechers, UNIX_TIMESTAMP(added) AS ts, banned, hr, approval_status FROM torrents WHERE " . hash_where("info_hash", $info_hash);
+$checkTorrentSql = "SELECT torrents.id, size, owner, sp_state, seeders, leechers, UNIX_TIMESTAMP(added) AS ts, added, banned, hr, approval_status, categories.mode FROM torrents left join categories on torrents.category = categories.id WHERE " . hash_where("info_hash", $info_hash);
if (!$torrent = $Cache->get_value('torrent_hash_'.$info_hash.'_content')){
$res = sql_query($checkTorrentSql);
$torrent = mysql_fetch_array($res);
@@ -405,7 +405,7 @@ else // continue an existing session
$upSpeedMbps = number_format(($trueupthis / $self['announcetime'] / 1024 / 1024) * 8);
do_log("notSeedBoxMaxSpeedMbps: $notSeedBoxMaxSpeedMbps, upSpeedMbps: $upSpeedMbps");
if ($upSpeedMbps > $notSeedBoxMaxSpeedMbps) {
- (new \App\Repositories\UserRepository())->updateDownloadPrivileges(null, $userid, 'no');
+ (new \App\Repositories\UserRepository())->updateDownloadPrivileges(null, $userid, 'no', 'upload_over_speed');
do_log("user: $userid downloading privileges have been disabled! (over speed), notSeedBoxMaxSpeedMbps: $notSeedBoxMaxSpeedMbps > upSpeedMbps: $upSpeedMbps", 'error');
err("Your downloading privileges have been disabled! (over speed)");
}
@@ -553,9 +553,10 @@ elseif(isset($self))
if (!empty($snatchInfo)) {
sql_query("UPDATE snatched SET uploaded = uploaded + $trueupthis, downloaded = downloaded + $truedownthis, to_go = $left, $announcetime, last_action = ".$dt." $finished_snatched WHERE torrentid = $torrentid AND userid = $userid") or err("SL Err 2");
do_action('snatched_saved', $torrent, $snatchInfo);
- if ($event == 'completed' && $az['class'] < \App\Models\HitAndRun::MINIMUM_IGNORE_USER_CLASS && !$isDonor) {
+ if ($event == 'completed' && $az['class'] < \App\Models\HitAndRun::MINIMUM_IGNORE_USER_CLASS && !$isDonor && isset($torrent['mode'])) {
//think about H&R
- $hrMode = get_setting('hr.mode');
+// $hrMode = get_setting('hr.mode');
+ $hrMode = \App\Models\HitAndRun::getConfig('mode', $torrent['mode']);
if ($hrMode == \App\Models\HitAndRun::MODE_GLOBAL || ($hrMode == \App\Models\HitAndRun::MODE_MANUAL && $torrent['hr'] == \App\Models\Torrent::HR_YES)) {
$sql = "insert into hit_and_runs (uid, torrent_id, snatched_id) values ($userid, $torrentid, {$snatchInfo['id']}) on duplicate key update updated_at = " . sqlesc(date('Y-m-d H:i:s'));
$affectedRows = sql_query($sql);
diff --git a/public/catmanage.php b/public/catmanage.php
index d0db9a55..9593e9cc 100644
--- a/public/catmanage.php
+++ b/public/catmanage.php
@@ -784,6 +784,7 @@ elseif($action == 'submit')
$updateset[] = "name=".sqlesc($name);
$updateset[] = "image=".sqlesc($image);
$updateset[] = "class_name=".sqlesc($class_name);
+ $updateset[] = "source=".sqlesc($source);
$updateset[] = "medium=".sqlesc($medium);
$updateset[] = "codec=".sqlesc($codec);
$updateset[] = "standard=".sqlesc($standard);
diff --git a/public/complains.php b/public/complains.php
index 20827801..9c994922 100644
--- a/public/complains.php
+++ b/public/complains.php
@@ -18,7 +18,11 @@ if($_SERVER['REQUEST_METHOD'] === 'POST'){
$email = filter_input(INPUT_POST, 'email', FILTER_VALIDATE_EMAIL);
$body = filter_input(INPUT_POST, 'body', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
if(empty($email) || empty($body)) stderr($lang_functions['std_error'], $lang_complains['text_new_failure']);
- sql_query(sprintf('INSERT INTO complains (uuid, email, body, added) VALUES (UUID(), %s, %s, NOW())', sqlesc($email), sqlesc($body))) or sqlerr(__FILE__, __LINE__);
+ $user = \App\Models\User::query()->where('email', $email)->first();
+ if (!$user) {
+ stderr($lang_functions['std_error'], $lang_complains['text_new_failure']);
+ }
+ sql_query(sprintf('INSERT INTO complains (uuid, email, body, added, ip) VALUES (UUID(), %s, %s, NOW(), %s)', sqlesc($email), sqlesc($body), sqlesc(getip()))) or sqlerr(__FILE__, __LINE__);
$Cache->delete_value('COMPLAINTS_COUNT_CACHE');
nexus_redirect(sprintf('complains.php?action=view&id=%s', get_single_value('complains', 'uuid', 'WHERE id = ' . mysql_insert_id())));
break;
@@ -27,7 +31,7 @@ if($_SERVER['REQUEST_METHOD'] === 'POST'){
$body = filter_input(INPUT_POST, 'body', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
$complain = \App\Models\Complain::query()->findOrFail($id);
if(empty($id) || empty($body)) stderr($lang_functions['std_error'], $lang_complains['text_new_failure']);
- sql_query(sprintf('INSERT INTO complain_replies (complain, userid, added, body) VALUES (%u, %u, NOW(), %s)', $id, $uid, sqlesc($body))) or sqlerr(__FILE__, __LINE__);
+ sql_query(sprintf('INSERT INTO complain_replies (complain, userid, added, body, ip) VALUES (%u, %u, NOW(), %s, %s)', $id, $uid, sqlesc($body), sqlesc(getip()))) or sqlerr(__FILE__, __LINE__);
if ($uid > 0) {
try {
$toolRep = new \App\Repositories\ToolRepository();
@@ -110,6 +114,7 @@ if($_SERVER['REQUEST_METHOD'] === 'POST'){
if ($user) {
printf(' [
%s ]', urlencode($user->username), $lang_complains['text_view_band_log']);
}
+ printf('
IP: ' . htmlspecialchars($complain['ip']));
}
echo '
', format_comment($complain['body']);
end_frame();
@@ -118,7 +123,11 @@ if($_SERVER['REQUEST_METHOD'] === 'POST'){
$res = sql_query(sprintf('SELECT * FROM `complain_replies` WHERE complain = %u ORDER BY id DESC', $complain['id'])) or sqlerr(__FILE__, __LINE__);
if(mysql_num_rows($res)){
while($row = mysql_fetch_assoc($res)){
- printf('
%s @ %s : ', $row['userid'] ? get_plain_username($row['userid']) : $lang_complains['text_complainer'], gettime($row['added']));
+ printf('
%s @ %s', $row['userid'] ? get_plain_username($row['userid']) : $lang_complains['text_complainer'], gettime($row['added']));
+ if ($isAdmin) {
+ printf(' (%s)', htmlspecialchars($row['ip']));
+ }
+ echo ': ';
echo format_comment($row['body']) . '
';
}
}else{
diff --git a/public/details.php b/public/details.php
index 74831a1d..b6a440bd 100644
--- a/public/details.php
+++ b/public/details.php
@@ -70,7 +70,7 @@ if (!$row) {
$banned_torrent = ($row["banned"] == 'yes' ? "
(".$lang_functions['text_banned']." ) " : "");
$sp_torrent = get_torrent_promotion_append($row['sp_state'],'word', false, '', 0, '', $row['__ignore_global_sp_state'] ?? false);
$sp_torrent_sub = get_torrent_promotion_append_sub($row['sp_state'],"",true,$row['added'], $row['promotion_time_type'], $row['promotion_until'], $row['__ignore_global_sp_state'] ?? false);
- $hrImg = get_hr_img($row);
+ $hrImg = get_hr_img($row, $row['search_box_id']);
$approvalStatusIcon = $torrentRep->renderApprovalStatus($row["approval_status"]);
$s=htmlspecialchars($row["name"]).$banned_torrent.($sp_torrent ? " ".$sp_torrent : "").($sp_torrent_sub) . $hrImg . $approvalStatusIcon;
print("
".$s." \n");
@@ -101,7 +101,7 @@ if (!$row) {
// ------------- start upped by block ------------------//
if($row['anonymous'] == 'yes') {
- if (!user_can('viewanonymous'))
+ if (!user_can('viewanonymous') && $row['owner'] != $CURUSER['id'])
$uprow = "
".$lang_details['text_anonymous']." ";
else
$uprow = "
".$lang_details['text_anonymous']." (" . get_username($row['owner'], false, true, true, false, false, true) . ")";
@@ -126,6 +126,13 @@ if (!$row) {
if ($smalldescription_main == 'yes')
tr($lang_details['row_small_description'],htmlspecialchars(trim($row["small_descr"])),true);
+ //tag
+ $torrentTags = \App\Models\TorrentTag::query()->where('torrent_id', $row['id'])->get();
+ if ($torrentTags->isNotEmpty()) {
+ $tagRep = new \App\Repositories\TagRepository();
+ tr($lang_details['row_tags'], $tagRep->renderSpan($torrentTags->pluck('tag_id')->toArray()),true);
+ }
+
$size_info = "
".$lang_details['text_size']." " . mksize($row["size"]);
$type_info = "
".$lang_details['row_type'].": ".$row["cat_name"];
$source_info = $medium_info = $codec_info = $audiocodec_info = $standard_info = $processing_info = $team_info = '';
@@ -267,8 +274,11 @@ JS;
print("\n");
// ---------------- end subtitle block -------------------//
+ //hook before desc
+ do_action('torrent_detail_before_desc', $row['id'], $CURUSER['id']);
+
/**************start custom fields****************/
- echo $customField->renderOnTorrentDetailsPage($id);
+ echo $customField->renderOnTorrentDetailsPage($id, $row['search_box_id']);
/**************end custom fields****************/
@@ -290,10 +300,10 @@ JS;
if (user_can('viewnfo') && $CURUSER['shownfo'] != 'no' && $row["nfosz"] > 0){
if (!$nfo = $Cache->get_value('nfo_block_torrent_id_'.$id)){
- $nfo = code($row["nfo"], $view == "magic");
+ $nfo = code_new($row["nfo"], get_setting('torrent.nfo_view_style_default'));
$Cache->cache_value('nfo_block_torrent_id_'.$id, $nfo, 604800);
}
- tr("
". $lang_details['text_view_nfo']. " ", "
\n", 1);
+ tr("
". $lang_details['text_view_nfo']. " ", "
\n", 1);
}
if ($imdb_id && $showextinfo['imdb'] == 'yes' && $CURUSER['showimdb'] != 'no')
@@ -376,7 +386,7 @@ JS;
{
// $where_area = " url = " . sqlesc((int)$imdb_id) ." AND torrents.id != ".sqlesc($id);
$where_area = sprintf('torrents.id in (%s)', implode(',', $otherCopiesIdArr));
- $copies_res = sql_query("SELECT torrents.id, torrents.name, torrents.sp_state, torrents.size, torrents.added, torrents.seeders, torrents.leechers, torrents.hr,categories.id AS catid, categories.name AS catname, categories.image AS catimage, sources.name AS source_name, media.name AS medium_name, codecs.name AS codec_name, standards.name AS standard_name, processings.name AS processing_name FROM torrents LEFT JOIN categories ON torrents.category=categories.id LEFT JOIN sources ON torrents.source = sources.id LEFT JOIN media ON torrents.medium = media.id LEFT JOIN codecs ON torrents.codec = codecs.id LEFT JOIN standards ON torrents.standard = standards.id LEFT JOIN processings ON torrents.processing = processings.id WHERE " . $where_area . " ORDER BY torrents.id DESC") or sqlerr(__FILE__, __LINE__);
+ $copies_res = sql_query("SELECT torrents.id, torrents.name, torrents.sp_state, torrents.size, torrents.added, torrents.seeders, torrents.leechers, torrents.hr,categories.id AS catid, categories.name AS catname, categories.image AS catimage, sources.name AS source_name, media.name AS medium_name, codecs.name AS codec_name, standards.name AS standard_name, processings.name AS processing_name, categories.mode as search_box_id FROM torrents LEFT JOIN categories ON torrents.category=categories.id LEFT JOIN sources ON torrents.source = sources.id LEFT JOIN media ON torrents.medium = media.id LEFT JOIN codecs ON torrents.codec = codecs.id LEFT JOIN standards ON torrents.standard = standards.id LEFT JOIN processings ON torrents.processing = processings.id WHERE " . $where_area . " ORDER BY torrents.id DESC") or sqlerr(__FILE__, __LINE__);
$copies_count = mysql_num_rows($copies_res);
if($copies_count > 0)
@@ -406,7 +416,7 @@ JS;
$sphighlight = get_torrent_bg_color($copy_row['sp_state']);
$sp_info = get_torrent_promotion_append($copy_row['sp_state'], '', false, '', 0, '', $copy_row['__ignore_global_sp_state'] ?? false);
- $hrImg = get_hr_img($copy_row);
+ $hrImg = get_hr_img($copy_row, $copy_row['search_box_id']);
$s .= "
".return_category_image($copy_row["catid"], "torrents.php?allsec=1&")." " . $dispname ." ". $sp_info. $hrImg ."" . rtrim(trim($other_source_info . $other_medium_info . $other_codec_info . $other_standard_info . $other_processing_info), ","). " " .
diff --git a/public/edit.php b/public/edit.php
index adf57b6b..672982fb 100644
--- a/public/edit.php
+++ b/public/edit.php
@@ -17,6 +17,7 @@ if (!$row) die();
* @since v1.6
*/
$customField = new \Nexus\Field\Field();
+$hitAndRunRep = new \App\Repositories\HitAndRunRepository();
$tagIdArr = \App\Models\TorrentTag::query()->where('torrent_id', $id)->get()->pluck('tag_id')->toArray();
$searchBoxRep = new \App\Repositories\SearchBoxRepository();
@@ -68,8 +69,6 @@ else {
echo $ptGen->renderUploadPageFormInput($row['pt_gen']);
}
- $customField->renderOnUploadPage($id);
-
if ($enablenfo_main=='yes')
tr($lang_edit['row_nfo_file'], "";
+ $s = "";
$cats = genrelist($sectionmode);
foreach ($cats as $subrow) {
@@ -94,7 +93,7 @@ else {
$s .= " \n";
if ($allowmove){
- $s2 = "\n";
+ $s2 = "\n";
$cats2 = genrelist($othermode);
foreach ($cats2 as $subrow) {
$s2 .= "renderQualitySelect($sectionmode);
tr($lang_edit['row_quality'], $sectionCurrent, 1, "hide mode mode_$sectionmode");
+ echo $customField->renderOnUploadPage($id, $sectionmode);
+ echo $hitAndRunRep->renderOnUploadPage($row['hr'], $sectionmode);
if ($allowmove && $othermode) {
$selectOther = $searchBoxRep->renderQualitySelect($othermode);
tr($lang_edit['row_quality'], $selectOther, 1, "hide mode mode_$othermode");
+ echo $customField->renderOnUploadPage($id, $othermode);
+ echo $hitAndRunRep->renderOnUploadPage($row['hr'], $othermode);
}
tr($lang_functions['text_tags'], (new \App\Repositories\TagRepository())->renderCheckbox($tagIdArr), 1);
@@ -194,7 +197,8 @@ else {
foreach (\App\Models\Torrent::listPosStates() as $key => $value) {
$options[] = "".$value['text']." ";
}
- $pickcontent .= "".$lang_edit['row_torrent_position'].": "."" . implode('', $options) . " ";
+ $pickcontent .= "".$lang_edit['row_torrent_position'].": "."" . implode('', $options) . " ";
+ $pickcontent .= datetimepicker_input('pos_state_until', $row['pos_state_until'], nexus_trans('label.deadline') . ": ");
}
if(user_can('torrentmanage') && ($CURUSER["picker"] == 'yes' || get_user_class() >= \App\Models\User::CLASS_SYSOP))
{
@@ -208,11 +212,6 @@ else {
}
tr($lang_edit['row_pick'], $pickcontent, 1);
}
- if (get_setting('hr.mode') == \App\Models\HitAndRun::MODE_MANUAL && user_can('torrent_hr')) {
- $hrRadio = sprintf('".$lang_getusertorrentlistajax['col_type']." ".$lang_getusertorrentlistajax['col_name']." ".$lang_getusertorrentlistajax['col_added']." ".
($showsize ? "".$lang_getusertorrentlistajax['col_uploaded']." " : "") . ($showdownloaded ? "".$lang_getusertorrentlistajax['col_downloaded']." " : "").($showratio ? "".$lang_getusertorrentlistajax['col_ratio']." " : "").($showsetime ? "".$lang_getusertorrentlistajax['col_se_time']." " : "").($showletime ? "".$lang_getusertorrentlistajax['col_le_time']." " : "").($showcotime ? "".$lang_getusertorrentlistajax['col_time_completed']." " : "").($showanonymous ? "".$lang_getusertorrentlistajax['col_anonymous']." " : "");
+ if ($shouldShowClient) {
+ $ret .= sprintf('%s IP ', $lang_getusertorrentlistajax['col_client']);
+ }
$ret .= sprintf('%s ', $lang_functions['std_action']);
$ret .= ""."". str_replace(" ", " ";
if ($showanonymous)
$ret .= "".$arr['anonymous']." ";
+ if ($shouldShowClient) {
+ $ipArr = array_filter([$arr['ipv4'], $arr['ipv6']]);
+ foreach ($ipArr as &$_ip) {
+ $_ip = sprintf('%s ', $_ip . $seedBoxRep->renderIcon($_ip, $arr['userid']));
+ }
+ $ret .= sprintf(
+ '%s %s ',
+ get_agent($arr['peer_id'], $arr['agent']), $arr['port'],
+ implode('Subject Reason
diff --git a/public/index.php b/public/index.php
index 46130b2f..5f1626d6 100644
--- a/public/index.php
+++ b/public/index.php
@@ -137,10 +137,33 @@ if ($showfunbox_main == "yes" && (!isset($CURUSER) || $CURUSER['showfb'] == "yes
// ------------- start: shoutbox ------------------//
if ($showshoutbox_main == "yes") {
?>
- -
+
\n");
- print(" ';
print("
" . $row->id . "
" . optional($row->torrent)->name . " " . mksize($row->snatch->uploaded) . "
" . mksize($row->snatch->downloaded) . "
" . get_hr_ratio($row->snatch->uploaded, $row->snatch->downloaded) . "
- " . ($row->status == \App\Models\HitAndRun::STATUS_INSPECTING ? mkprettytime(3600 * get_setting('hr.seed_time_minimum') - $row->snatch->seedtime) : '---') . "
+ " . $row->seedTimeRequired . "
" . format_datetime($row->snatch->completedat) . "
- " . ($row->status == \App\Models\HitAndRun::STATUS_INSPECTING ? mkprettytime(\Carbon\Carbon::now()->diffInSeconds($row->snatch->completedat->addHours(get_setting('hr.inspect_time')))) : '---') . "
+ " . $row->inspectTimeLeft . "
" . nl2br(trim($row->comment)) . "
{$columnAction}
");
diff --git a/public/pic/bonusformulaa.svg b/public/pic/bonusformulaa.svg
new file mode 100644
index 00000000..6b95be41
--- /dev/null
+++ b/public/pic/bonusformulaa.svg
@@ -0,0 +1,2 @@
+
+");
+if ($search && $count > 0) {
+ $fieldsStr = implode(', ', \App\Models\Torrent::getFieldsForList(true));
+ $rows = $torrentQuery->selectRaw("$fieldsStr, categories.mode as search_box_id")
+ ->forPage($page + 1, $torrentsperpage)
+ ->orderBy("$tableTorrent.$column", $ascdesc)
+ ->get()
+ ->toArray();
+ print($pagertop);
+ torrenttable(json_decode(json_encode($rows), true));
+ print($pagerbottom);
+} else {
+ stdmsg($lang_torrents['std_search_results_for'] . $search . "\"",$lang_torrents['std_try_again']);
+}
+print("
");
+stdfoot();
+
+
+
diff --git a/public/settings.php b/public/settings.php
index d97ba88f..7cfdfaed 100644
--- a/public/settings.php
+++ b/public/settings.php
@@ -41,7 +41,8 @@ if ($action == 'savesettings_main') // save main
'showpolls','showstats','showlastxtorrents', 'showtrackerload','showshoutbox','showfunbox','showoffer','sptime','showhelpbox','enablebitbucket',
'smalldescription','altname','extforum','extforumurl','defaultlang','defstylesheet', 'donation','spsct','browsecat','specialcat','waitsystem',
'maxdlsystem','bitbucket','torrentnameprefix', 'showforumstats','verification','invite_count','invite_timeout', 'seeding_leeching_time_calc_start',
- 'startsubid', 'logo', 'showlastxforumposts', 'enable_technical_info', 'site_language_enabled', 'show_top_uploader', 'imdb_language', 'offer_skip_approved_count'
+ 'startsubid', 'logo', 'showlastxforumposts', 'enable_technical_info', 'site_language_enabled', 'show_top_uploader', 'imdb_language', 'offer_skip_approved_count',
+ 'upload_deny_approval_deny_count'
);
GetVar($validConfig);
$MAIN = [];
@@ -97,7 +98,7 @@ elseif ($action == 'savesettings_bonus') // save bonus
'addcomment','pollvote','offervote', 'funboxvote','saythanks','receivethanks','funboxreward','onegbupload','fivegbupload',
'tengbupload', 'ratiolimit','dlamountlimit','oneinvite','customtitle','vipstatus','bonusgift', 'basictax', 'taxpercentage',
'prolinkpoint', 'prolinktime', 'attendance_initial', 'attendance_step', 'attendance_max', 'cancel_hr', 'attendance_card',
- 'harem_addition'
+ 'harem_addition', 'hundredgbupload', 'tengbdownload', 'hundredgbdownload', 'official_addition', 'official_tag', 'zero_bonus_tag', 'zero_bonus_factor',
);
GetVar($validConfig);
$BONUS = [];
@@ -133,7 +134,7 @@ elseif ($action == 'savesettings_account') // save account
'exutime', 'exudl', \App\Models\User::CLASS_EXTREME_USER . '_min_seed_points', 'exuprratio', 'exuderatio', \App\Models\User::CLASS_EXTREME_USER . '_alias',
'uutime', 'uudl', \App\Models\User::CLASS_ULTIMATE_USER . '_min_seed_points', 'uuprratio', 'uuderatio', \App\Models\User::CLASS_ULTIMATE_USER . '_alias',
'nmtime', 'nmdl', \App\Models\User::CLASS_NEXUS_MASTER . '_min_seed_points', 'nmprratio', 'nmderatio', \App\Models\User::CLASS_NEXUS_MASTER . '_alias',
- 'getInvitesByPromotion'
+ 'getInvitesByPromotion', 'destroy_disabled'
);
GetVar($validConfig);
$ACCOUNT = [];
@@ -155,7 +156,8 @@ elseif($action == 'savesettings_torrent') // save account
'twoupbecome','twoupfreebecome', 'twouphalfleechbecome','normalbecome','uploaderdouble','deldeadtorrent', 'randomthirtypercentdown',
'thirtypercentleechbecome', 'expirethirtypercentleech', 'sticky_first_level_background_color', 'sticky_second_level_background_color',
'download_support_passkey', 'claim_enabled', 'claim_torrent_ttl', 'claim_torrent_user_counts_up_limit', 'claim_user_torrent_counts_up_limit', 'claim_remove_deduct_user_bonus',
- 'claim_give_up_deduct_user_bonus', 'claim_bonus_multiplier', 'claim_reach_standard_seed_time', 'claim_reach_standard_uploaded', 'approval_status_icon_enabled', 'approval_status_none_visible'
+ 'claim_give_up_deduct_user_bonus', 'claim_bonus_multiplier', 'claim_reach_standard_seed_time', 'claim_reach_standard_uploaded', 'approval_status_icon_enabled', 'approval_status_none_visible',
+ 'nfo_view_style_default',
);
$validConfig = apply_filter('setting_valid_config', $validConfig);
GetVar($validConfig);
@@ -222,7 +224,7 @@ elseif ($action == 'savesettings_authority') // save user authority
'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',
- 'torrent-delete', 'user-delete', 'user-change-class',
+ 'torrent-delete', 'user-delete', 'user-change-class', 'torrent-set-special-tag', 'torrent-approval-allow-automatic'
);
GetVar($validConfig);
$AUTHORITY = [];
@@ -450,7 +452,10 @@ elseif ($action == 'authoritysettings') //Authority settings
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);
+ tr(nexus_trans('permission.torrent-set-special-tag.text'), $lang_settings['text_minimum_class'].classlist('torrent-set-special-tag',$maxclass,$AUTHORITY['torrent-set-special-tag'] ?? '',0,true).$lang_settings['text_default'].get_user_class_name(UC_ADMINISTRATOR,false,true,true).nexus_trans('permission.torrent-set-special-tag.desc'),1);
tr(nexus_trans('permission.torrent-approval.text'), $lang_settings['text_minimum_class'].classlist('torrent-approval',$maxclass,$AUTHORITY['torrent-approval'] ?? '',0,true).$lang_settings['text_default'].get_user_class_name(UC_ADMINISTRATOR,false,true,true).nexus_trans('permission.torrent-approval.desc'),1);
+ tr(nexus_trans('permission.torrent-approval-allow-automatic.text'), $lang_settings['text_minimum_class'].classlist('torrent-approval-allow-automatic',$maxclass,$AUTHORITY['torrent-approval-allow-automatic'] ?? '',0,true).$lang_settings['text_default'].get_user_class_name(UC_UPLOADER,false,true,true).nexus_trans('permission.torrent-approval-allow-automatic.desc'),1);
+
tr($lang_settings['row_ask_for_reseed'], $lang_settings['text_minimum_class'].classlist('askreseed',$maxclass,$AUTHORITY['askreseed'],0,true).$lang_settings['text_default'].get_user_class_name(UC_POWER_USER,false,true,true).$lang_settings['text_ask_for_reseed_note'],1);
tr($lang_settings['row_view_nfo'], $lang_settings['text_minimum_class'].classlist('viewnfo',$maxclass,$AUTHORITY['viewnfo'],0,true).$lang_settings['text_default'].get_user_class_name(UC_POWER_USER,false,true,true).$lang_settings['text_view_nfo_note'],1);
tr($lang_settings['row_view_torrent_structure'], $lang_settings['text_minimum_class'].classlist('torrentstructure',$maxclass,$AUTHORITY['torrentstructure'],0,true).$lang_settings['text_default'].get_user_class_name(UC_ULTIMATE_USER,false,true,true).$lang_settings['text_view_torrent_structure_note'],1);
@@ -481,8 +486,12 @@ elseif ($action == 'authoritysettings') //Authority settings
tr($lang_settings['row_see_banned_torrents'], $lang_settings['text_minimum_class'].classlist('seebanned',$maxclass,$AUTHORITY['seebanned'],0,true).$lang_settings['text_default'].get_user_class_name(UC_UPLOADER,false,true,true).$lang_settings['text_see_banned_torrents_note'],1);
tr($lang_settings['row_vote_against_offers'], $lang_settings['text_minimum_class'].classlist('againstoffer',$maxclass,$AUTHORITY['againstoffer'],0,true).$lang_settings['text_default'].get_user_class_name(UC_USER,false,true,true).$lang_settings['text_vote_against_offers_note'],1);
tr($lang_settings['row_allow_userbar'], $lang_settings['text_minimum_class'].classlist('userbar',$maxclass,$AUTHORITY['userbar'],0,true).$lang_settings['text_default'].get_user_class_name(UC_POWER_USER,false,true,true).$lang_settings['text_allow_userbar_note'],1);
- tr($lang_settings['row_save_settings'],"".$lang_settings['text_bonus_by_seeding']." ".$lang_settings['text_bonus_formula_two']." ";
+ $formulaLiArr[] = "".$lang_settings['text_bonus_formula_three']." ";
+ $formulaLiArr[] = "".$lang_settings['text_bonus_formula_five']." ";
+ $formulaLiArr[] = "".$lang_settings['text_bonus_formula_six']." ";
+ $formulaLiArr[] = "".$lang_settings['text_bonus_formula_zero_bonus_factor']." ";
+ $formulaLiArr[] = "".$lang_settings['text_bonus_formula_eight']." ";
+ $formulaLiArr[] = "".$lang_settings['text_bonus_formula_nine']." ";
+ $formulaLiArr[] = "".$lang_settings['text_bonus_formula_eleven']." ";
+ tr($lang_settings['row_seeding_formula'], $lang_settings['text_bonus_formula_one']."".implode("", $formulaLiArr)." ", 1);
+
print("".$lang_settings['text_misc_ways_get_bonus']." ".$lang_settings['text_things_cost_bonus']." ".$lang_settings['text_user_promotion_demotion']." ".promotion_selection((isset($TORRENT['largepro']) ? $TORRENT['largepro'] : 2), 1)." ".$lang_settings['text_by_system_upon_uploading']."The message has ben sent. The message has ben sent.
-Send to: Send to class:
+
+
-Subject
-Sender:
+
Subject
+
+
+
+ Message
+
+
+Sender:
-$first $last $comment The IP address ". htmlspecialchars($ip) ." is banned:
". htmlspecialchars($banstable) ."
");
+ stderr("Result", "The IP address ". $ip ." is banned:
". $banstable ."
", false);
}
}
stdhead();
diff --git a/public/torrents.php b/public/torrents.php
index 32377e3d..4d4acebc 100644
--- a/public/torrents.php
+++ b/public/torrents.php
@@ -10,8 +10,7 @@ parked();
* tags
*/
$tagRep = new \App\Repositories\TagRepository();
-$tagKeyById = $tagRep->createBasicQuery()->get()->keyBy('id');
-$renderKeyArr = $tagKeyById->keys()->toArray();
+$allTags = $tagRep->listAll();
$elasticsearchEnabled = nexus_env('ELASTICSEARCH_ENABLED');
//check searchbox
@@ -914,11 +913,11 @@ if ($count)
list($pagertop, $pagerbottom, $limit, $offset, $size, $page) = pager($torrentsperpage, $count, "?" . $addparam);
$fieldsStr = implode(', ', \App\Models\Torrent::getFieldsForList(true));
- if ($allsec == 1 || $enablespecial != 'yes') {
- $query = "SELECT $fieldsStr FROM torrents ".($search_area == 3 || $column == "owner" ? "LEFT JOIN users ON torrents.owner = users.id " : "")." $tagFilter $where $orderby $limit";
- } else {
- $query = "SELECT $fieldsStr FROM torrents ".($search_area == 3 || $column == "owner" ? "LEFT JOIN users ON torrents.owner = users.id " : "")." LEFT JOIN categories ON torrents.category=categories.id $tagFilter $where $orderby $limit";
- }
+// if ($allsec == 1 || $enablespecial != 'yes') {
+// $query = "SELECT $fieldsStr FROM torrents ".($search_area == 3 || $column == "owner" ? "LEFT JOIN users ON torrents.owner = users.id " : "")." $tagFilter $where $orderby $limit";
+// } else {
+ $query = "SELECT $fieldsStr, categories.mode as search_box_id FROM torrents ".($search_area == 3 || $column == "owner" ? "LEFT JOIN users ON torrents.owner = users.id " : "")." LEFT JOIN categories ON torrents.category=categories.id $tagFilter $where $orderby $limit";
+// }
do_log("[TORRENT_LIST_SQL] $query", 'debug');
if (!$elasticsearchEnabled) {
$res = sql_query($query);
@@ -1130,7 +1129,7 @@ if (!$Cache->get_page()){
$hotsearch = "";
while ($searchrow = mysql_fetch_assoc($searchres))
{
- $hotsearch .= "" . $searchrow["keywords"] . " " . htmlspecialchars($searchrow["keywords"]) . " ' . $tagRep->renderSpan($tagKeyById, $renderKeyArr, true) . ' ' . $tagRep->renderSpan(['*'], true) . ' ".$lang_upload['text_only_viewed_by'].get_user_class_name($viewnfo_class,false,true,true).$lang_upload['text_or_above']." ", 1);
}
@@ -86,7 +90,7 @@ stdhead($lang_upload['head_upload']);
if ($allowtorrents){
$disablespecial = " onchange=\"disableother('browsecat','specialcat')\"";
- $s = "\n".$lang_upload['select_choose_one']." \n";
+ $s = "\n".$lang_upload['select_choose_one']." \n";
$cats = genrelist($browsecatmode);
foreach ($cats as $row)
$s .= "" . htmlspecialchars($row["name"]) . " \n";
@@ -95,7 +99,7 @@ stdhead($lang_upload['head_upload']);
else $s = "";
if ($allowspecial){
$disablebrowse = " onchange=\"disableother('specialcat','browsecat')\"";
- $s2 = "\n".$lang_upload['select_choose_one']." \n";
+ $s2 = "\n".$lang_upload['select_choose_one']." \n";
$cats2 = genrelist($specialcatmode);
foreach ($cats2 as $row)
$s2 .= "" . htmlspecialchars($row["name"]) . " \n";
@@ -147,13 +151,19 @@ stdhead($lang_upload['head_upload']);
tr($lang_upload['row_content'],$team_select,1);
}
*/
+ $customField = new \Nexus\Field\Field();
+ $hitAndRunRep = new \App\Repositories\HitAndRunRepository();
if ($allowtorrents) {
$selectNormal = $searchBoxRep->renderQualitySelect($browsecatmode);
tr($lang_upload['row_quality'], $selectNormal, 1, "hide mode mode_$browsecatmode");
+ echo $customField->renderOnUploadPage(0, $browsecatmode);
+ echo $hitAndRunRep->renderOnUploadPage('', $browsecatmode);
}
if ($allowspecial) {
$selectNormal = $searchBoxRep->renderQualitySelect($specialcatmode);
tr($lang_upload['row_quality'], $selectNormal, 1, "hide mode mode_$specialcatmode");
+ echo $customField->renderOnUploadPage(0, $specialcatmode);
+ echo $hitAndRunRep->renderOnUploadPage('', $specialcatmode);
}
//==== offer dropdown for offer mod from code by S4NE
@@ -191,16 +201,35 @@ JS;
}
//===end
+ //pick
+ $pickcontent = '';
+ if(user_can('torrentsticky'))
+ {
+ $options = [];
+ foreach (\App\Models\Torrent::listPosStates() as $key => $value) {
+ $options[] = "".$value['text']."";
+ }
+ $pickcontent .= "".$lang_edit['row_torrent_position'].": "."" . implode('', $options) . " ";
+ $pickcontent .= datetimepicker_input('pos_state_until', '', nexus_trans('label.deadline') . ": ");
+ }
+ if(user_can('torrentmanage') && ($CURUSER["picker"] == 'yes' || get_user_class() >= \App\Models\User::CLASS_SYSOP))
+ {
+ if ($pickcontent) $pickcontent .= '".$lang_edit['row_recommended_movie'].": "."";
+ foreach (\App\Models\Torrent::listPickInfo(true) as $_pick_type => $_pick_type_text) {
+ $pickcontent .= sprintf('%s ', $_pick_type, $_pick_type_text);
+ }
+ $pickcontent .= ' ';
+ }
+ if ($pickcontent) {
+ tr($lang_edit['row_pick'], $pickcontent, 1);
+ }
+
if(user_can('beanonymous'))
{
tr($lang_upload['row_show_uploader'], "";
$clientselect .= sprintf('%s ', get_agent($arr['peer_id'], $arr['agent']));
if (user_can('userprofile') || $user["id"] == $CURUSER["id"]) {
- $clientselect .= sprintf('%s %s %s ', $arr['ipv4'].$seedBoxRep->renderIcon($arr['ipv4'], $CURUSER['id']), $arr['ipv6'].$seedBoxRep->renderIcon($arr['ipv6'], $CURUSER['id']), $arr['port']);
+ $clientselect .= sprintf('%s %s %s ', $arr['ipv4'].$seedBoxRep->renderIcon($arr['ipv4'], $user['id']), $arr['ipv6'].$seedBoxRep->renderIcon($arr['ipv6'], $user['id']), $arr['port']);
} else {
$clientselect .= sprintf('%s %s %s ', '---', '---', '---');
}
@@ -394,6 +394,10 @@ if ($user["id"] == $CURUSER["id"] || user_can('viewhistory')) {
tr_small($lang_functions['text_seed_points'], number_format($user['seed_points'], 1), 1);
}
+if (user_can('prfmanage') && $user["class"] < get_user_class()) {
+ $bonusTable = build_bonus_table($user);
+ tr_small($lang_userdetails['text_bonus_table'], $bonusTable['table'], 1);
+}
if ($user["ip"] && (user_can('torrenthistory') || $user["id"] == $CURUSER["id"])){
diff --git a/public/vendor/jquery-datetimepicker/jquery.datetimepicker.full.min.js b/public/vendor/jquery-datetimepicker/jquery.datetimepicker.full.min.js
new file mode 100644
index 00000000..7947c33a
--- /dev/null
+++ b/public/vendor/jquery-datetimepicker/jquery.datetimepicker.full.min.js
@@ -0,0 +1 @@
+var DateFormatter;!function(){"use strict";var D,s,r,a,n;D=function(e,t){return"string"==typeof e&&"string"==typeof t&&e.toLowerCase()===t.toLowerCase()},s=function(e,t,a){var n=a||"0",r=e.toString();return r.length'),u=L('
'),d.append(u),l.addClass("xdsoft_scroller_box").append(d),p=function(e){var t=a(e).y-r+g;t<0&&(t=0),t+u[0].offsetHeight>h&&(t=h-u[0].offsetHeight),l.trigger("scroll_element.xdsoft_scroller",[c?t/c:0])},u.on("touchstart.xdsoft_scroller mousedown.xdsoft_scroller",function(e){i||l.trigger("resize_scroll.xdsoft_scroller",[y]),r=a(e).y,g=parseInt(u.css("marginTop"),10),h=d[0].offsetHeight,"mousedown"===e.type||"touchstart"===e.type?(D.ownerDocument&&L(D.ownerDocument.body).addClass("xdsoft_noselect"),L([D.ownerDocument.body,D.contentWindow]).on("touchend mouseup.xdsoft_scroller",function e(){L([D.ownerDocument.body,D.contentWindow]).off("touchend mouseup.xdsoft_scroller",e).off("mousemove.xdsoft_scroller",p).removeClass("xdsoft_noselect")}),L(D.ownerDocument.body).on("mousemove.xdsoft_scroller",p)):(t=!0,e.stopPropagation(),e.preventDefault())}).on("touchmove",function(e){t&&(e.preventDefault(),p(e))}).on("touchend touchcancel",function(){t=!1,g=0}),l.on("scroll_element.xdsoft_scroller",function(e,t){i||l.trigger("resize_scroll.xdsoft_scroller",[t,!0]),t=1'),e=L(''),g=L('
'),F=L(''),C=L('
'),o=L(''),u=o.find(".xdsoft_time_box").eq(0),P=L('
'),i=L('Save Selected '),Y=L(''),A=L(''),s=!1,d=0;I.id&&_.attr("id",I.id),I.style&&_.attr("style",I.style),I.weeks&&_.addClass("xdsoft_showweeks"),I.rtl&&_.addClass("xdsoft_rtl"),_.addClass("xdsoft_"+I.theme),_.addClass(I.className),F.find(".xdsoft_month span").after(Y),F.find(".xdsoft_year span").after(A),F.find(".xdsoft_month,.xdsoft_year").on("touchstart mousedown.xdsoft",function(e){var t,a,n=L(this).find(".xdsoft_select").eq(0),r=0,o=0,i=n.is(":visible");for(F.find(".xdsoft_select").hide(),W.currentTime&&(r=W.currentTime[L(this).hasClass("xdsoft_month")?"getMonth":"getFullYear"]()),n[i?"hide":"show"](),t=n.find("div.xdsoft_option"),a=0;aI.touchMovedThreshold&&(this.touchMoved=!0)};function f(){var e,t=!1;return I.startDate?t=W.strToDate(I.startDate):(t=I.value||(O&&O.val&&O.val()?O.val():""))?(t=W.strToDateTime(t),I.yearOffset&&(t=new Date(t.getFullYear()-I.yearOffset,t.getMonth(),t.getDate(),t.getHours(),t.getMinutes(),t.getSeconds(),t.getMilliseconds()))):I.defaultDate&&(t=W.strToDateTime(I.defaultDate),I.defaultTime&&(e=W.strtotime(I.defaultTime),t.setHours(e.getHours()),t.setMinutes(e.getMinutes()))),t&&W.isValidDate(t)?_.data("changed",!0):t="",t||0}function c(m){var h=function(e,t){var a=e.replace(/([\[\]\/\{\}\(\)\-\.\+]{1})/g,"\\$1").replace(/_/g,"{digit+}").replace(/([0-9]{1})/g,"{digit$1}").replace(/\{digit([0-9]{1})\}/g,"[0-$1_]{1}").replace(/\{digit[\+]\}/g,"[0-9_]{1}");return new RegExp(a).test(t)},g=function(e,t){if(!(e="string"==typeof e||e instanceof String?m.ownerDocument.getElementById(e):e))return!1;if(e.createTextRange){var a=e.createTextRange();return a.collapse(!0),a.moveEnd("character",t),a.moveStart("character",t),a.select(),!0}return!!e.setSelectionRange&&(e.setSelectionRange(t,t),!0)};m.mask&&O.off("keydown.xdsoft"),!0===m.mask&&(E.formatMask?m.mask=E.formatMask(m.format):m.mask=m.format.replace(/Y/g,"9999").replace(/F/g,"9999").replace(/m/g,"19").replace(/d/g,"39").replace(/H/g,"29").replace(/i/g,"59").replace(/s/g,"59")),"string"===L.type(m.mask)&&(h(m.mask,O.val())||(O.val(m.mask.replace(/[0-9]/g,"_")),g(O[0],0)),O.on("paste.xdsoft",function(e){var t=(e.clipboardData||e.originalEvent.clipboardData||window.clipboardData).getData("text"),a=this.value,n=this.selectionStart;return a=a.substr(0,n)+t+a.substr(n+t.length),n+=t.length,h(m.mask,a)?(this.value=a,g(this,n)):""===L.trim(a)?this.value=m.mask.replace(/[0-9]/g,"_"):O.trigger("error_input.xdsoft"),e.preventDefault(),!1}),O.on("keydown.xdsoft",function(e){var t,a=this.value,n=e.which,r=this.selectionStart,o=this.selectionEnd,i=r!==o;if(48<=n&&n<=57||96<=n&&n<=105||8===n||46===n){for(t=8===n||46===n?"_":String.fromCharCode(96<=n&&n<=105?n-48:n),8===n&&r&&!i&&(r-=1);;){var s=m.mask.substr(r,1),d=r",I.weeks&&(l+=""+I.i18n[R].dayOfWeekShort[(e+I.dayOfWeekStart)%7]+" ";for(l+=" ",!1!==I.maxDate&&(h=W.strToDate(I.maxDate),h=new Date(h.getFullYear(),h.getMonth(),h.getDate(),23,59,59,999)),!1!==I.minDate&&(g=W.strToDate(I.minDate),g=new Date(g.getFullYear(),g.getMonth(),g.getDate())),!1!==I.minDateTime&&(p=W.strToDate(I.minDateTime),p=new Date(p.getFullYear(),p.getMonth(),p.getDate(),p.getHours(),p.getMinutes(),p.getSeconds())),!1!==I.maxDateTime&&(D=W.strToDate(I.maxDateTime),D=new Date(D.getFullYear(),D.getMonth(),D.getDate(),D.getHours(),D.getMinutes(),D.getSeconds())),!1!==D&&(u=31*(12*D.getFullYear()+D.getMonth())+D.getDate());c",v=!1,I.weeks&&(l+=""+o+" ")),l+=''+n+"
",C.html(l),F.find(".xdsoft_label span").eq(0).text(I.i18n[R].months[W.currentTime.getMonth()]),F.find(".xdsoft_label span").eq(1).text(W.currentTime.getFullYear()+I.yearOffset),M=k="";var x=0;if(!1!==I.minTime){var T=W.strtotime(I.minTime);x=60*T.getHours()+T.getMinutes()}var S=1440;if(!1!==I.maxTime){T=W.strtotime(I.maxTime);S=60*T.getHours()+T.getMinutes()}if(!1!==I.minDateTime){T=W.strToDateTime(I.minDateTime);if(E.formatDate(W.currentTime,I.formatDate)===E.formatDate(T,I.formatDate)){var M=60*T.getHours()+T.getMinutes();x'+E.formatDate(n,I.formatTime)+""},I.allowTimes&&L.isArray(I.allowTimes)&&I.allowTimes.length)for(c=0;c'+(c+I.yearOffset)+"";for(A.children().eq(0).html(H),c=parseInt(I.monthStart,10),H="";c<=parseInt(I.monthEnd,10);c+=1)H+=''+I.i18n[R].months[c]+"
";Y.children().eq(0).html(H),L(_).trigger("generate.xdsoft")},10),e.stopPropagation()}).on("afterOpen.xdsoft",function(){var e,t,a,n;I.timepicker&&(P.find(".xdsoft_current").length?e=".xdsoft_current":P.find(".xdsoft_init_time").length&&(e=".xdsoft_init_time"),e?(t=u[0].clientHeight,(a=P[0].offsetHeight)-t<(n=P.find(e).index()*I.timeHeightInTimePicker+1)&&(n=a-t),u.trigger("scroll_element.xdsoft_scroller",[parseInt(n,10)/(a-t)])):u.trigger("scroll_element.xdsoft_scroller",[0]))}),n=0,C.on("touchend click.xdsoft","td",function(e){e.stopPropagation(),n+=1;var t=L(this),a=W.currentTime;if(null==a&&(W.currentTime=W.now(),a=W.currentTime),t.hasClass("xdsoft_disabled"))return!1;a.setDate(1),a.setFullYear(t.data("year")),a.setMonth(t.data("month")),a.setDate(t.data("date")),_.trigger("select.xdsoft",[a]),O.val(W.str()),I.onSelectDate&&L.isFunction(I.onSelectDate)&&I.onSelectDate.call(_,W.currentTime,_.data("input"),e),_.data("changed",!0),_.trigger("xchange.xdsoft"),_.trigger("changedatetime.xdsoft"),(1f+c?(u="bottom",a=f+c-e.top):a-=c):a+_[0].offsetHeight>f+c&&(a=e.top-_[0].offsetHeight+1),a<0&&(a=0),n+t.offsetWidth>d&&(n=d-t.offsetWidth)),o=_[0],h(o,function(e){if("relative"===I.contentWindow.getComputedStyle(e).getPropertyValue("position")&&d>=e.offsetWidth)return n-=(d-e.offsetWidth)/2,!1}),l={position:r,left:I.insideParent?t.offsetLeft:n,top:"",bottom:""},I.insideParent?l[u]=t.offsetTop+t.offsetHeight:l[u]=a,_.css(l)},_.on("open.xdsoft",function(e){var t=!0;I.onShow&&L.isFunction(I.onShow)&&(t=I.onShow.call(_,W.currentTime,_.data("input"),e)),!1!==t&&(_.show(),r(),L(I.contentWindow).off("resize.xdsoft",r).on("resize.xdsoft",r),I.closeOnWithoutClick&&L([I.ownerDocument.body,I.contentWindow]).on("touchstart mousedown.xdsoft",function e(){_.trigger("close.xdsoft"),L([I.ownerDocument.body,I.contentWindow]).off("touchstart mousedown.xdsoft",e)}))}).on("close.xdsoft",function(e){var t=!0;F.find(".xdsoft_month,.xdsoft_year").find(".xdsoft_select").hide(),I.onClose&&L.isFunction(I.onClose)&&(t=I.onClose.call(_,W.currentTime,_.data("input"),e)),!1===t||I.opened||I.inline||_.hide(),e.stopPropagation()}).on("toggle.xdsoft",function(){_.is(":visible")?_.trigger("close.xdsoft"):_.trigger("open.xdsoft")}).data("input",O),d=0,_.data("xdsoft_datetime",W),_.setOptions(I),W.setCurrentTime(f()),O.data("xdsoft_datetimepicker",_).on("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",function(){O.is(":disabled")||O.data("xdsoft_datetimepicker").is(":visible")&&I.closeOnInputClick||I.openOnFocus&&(clearTimeout(d),d=setTimeout(function(){O.is(":disabled")||(s=!0,W.setCurrentTime(f(),!0),I.mask&&c(I),_.trigger("open.xdsoft"))},100))}).on("keydown.xdsoft",function(e){var t,a=e.which;return-1!==[D].indexOf(a)&&I.enterLikeTab?(t=L("input:visible,textarea:visible,button:visible,a:visible"),_.trigger("close.xdsoft"),t.eq(t.index(this)+1).focus(),!1):-1!==[T].indexOf(a)?(_.trigger("close.xdsoft"),!0):void 0}).on("blur.xdsoft",function(){_.trigger("close.xdsoft")})},r=function(e){var t=e.data("xdsoft_datetimepicker");t&&(t.data("xdsoft_datetime",null),t.remove(),e.data("xdsoft_datetimepicker",null).off(".xdsoft"),L(I.contentWindow).off("resize.xdsoft"),L([I.contentWindow,I.ownerDocument.body]).off("mousedown.xdsoft touchstart"),e.unmousewheel&&e.unmousewheel())},L(I.ownerDocument).off("keydown.xdsoftctrl keyup.xdsoftctrl").off("keydown.xdsoftcmd keyup.xdsoftcmd").on("keydown.xdsoftctrl",function(e){e.keyCode===p&&(N=!0)}).on("keyup.xdsoftctrl",function(e){e.keyCode===p&&(N=!1)}).on("keydown.xdsoftcmd",function(e){91===e.keyCode&&!0}).on("keyup.xdsoftcmd",function(e){91===e.keyCode&&!1}),this.each(function(){var t,e=L(this).data("xdsoft_datetimepicker");if(e){if("string"===L.type(H))switch(H){case"show":L(this).select().focus(),e.trigger("open.xdsoft");break;case"hide":e.trigger("close.xdsoft");break;case"toggle":e.trigger("toggle.xdsoft");break;case"destroy":r(L(this));break;case"reset":this.value=this.defaultValue,this.value&&e.data("xdsoft_datetime").isValidDate(E.parseDate(this.value,I.format))||e.data("changed",!1),e.data("xdsoft_datetime").setCurrentTime(this.value);break;case"validate":e.data("input").trigger("blur.xdsoft");break;default:e[H]&&L.isFunction(e[H])&&(o=e[H](a))}else e.setOptions(H);return 0}"string"!==L.type(H)&&(!I.lazyInit||I.open||I.inline?n(L(this)):(t=L(this)).on("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",function e(){t.is(":disabled")||t.data("xdsoft_datetimepicker")||(clearTimeout(i),i=setTimeout(function(){t.data("xdsoft_datetimepicker")||n(t),t.off("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",e).trigger("open.xdsoft")},100))}))}),o},L.fn.datetimepicker.defaults=s};!function(e){"function"==typeof define&&define.amd?define(["jquery","jquery-mousewheel"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(datetimepickerFactory),function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e:e(jQuery)}(function(c){var m,h,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in document||9<=document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],g=Array.prototype.slice;if(c.event.fixHooks)for(var a=e.length;a;)c.event.fixHooks[e[--a]]=c.event.mouseHooks;var p=c.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],n,!1);else this.onmousewheel=n;c.data(this,"mousewheel-line-height",p.getLineHeight(this)),c.data(this,"mousewheel-page-height",p.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],n,!1);else this.onmousewheel=null;c.removeData(this,"mousewheel-line-height"),c.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=c(e),a=t["offsetParent"in c.fn?"offsetParent":"parent"]();return a.length||(a=c("body")),parseInt(a.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return c(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function n(e){var t,a=e||window.event,n=g.call(arguments,1),r=0,o=0,i=0,s=0,d=0;if((e=c.event.fix(a)).type="mousewheel","detail"in a&&(i=-1*a.detail),"wheelDelta"in a&&(i=a.wheelDelta),"wheelDeltaY"in a&&(i=a.wheelDeltaY),"wheelDeltaX"in a&&(o=-1*a.wheelDeltaX),"axis"in a&&a.axis===a.HORIZONTAL_AXIS&&(o=-1*i,i=0),r=0===i?o:i,"deltaY"in a&&(r=i=-1*a.deltaY),"deltaX"in a&&(o=a.deltaX,0===i&&(r=-1*o)),0!==i||0!==o){if(1===a.deltaMode){var u=c.data(this,"mousewheel-line-height");r*=u,i*=u,o*=u}else if(2===a.deltaMode){var l=c.data(this,"mousewheel-page-height");r*=l,i*=l,o*=l}if(t=Math.max(Math.abs(i),Math.abs(o)),(!h||tdiv>div{background:#f5f5f5;border-top:1px solid #ddd;color:#666;font-size:12px;text-align:center;border-collapse:collapse;cursor:pointer;border-bottom-width:0;height:25px;line-height:25px}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div:first-child{border-top-width:0}.xdsoft_datetimepicker .xdsoft_today_button:hover,.xdsoft_datetimepicker .xdsoft_next:hover,.xdsoft_datetimepicker .xdsoft_prev:hover{opacity:1;-ms-filter:"alpha(opacity=100)"}.xdsoft_datetimepicker .xdsoft_label{display:inline;position:relative;z-index:9999;margin:0;padding:5px 3px;font-size:14px;line-height:20px;font-weight:bold;background-color:#fff;float:left;width:182px;text-align:center;cursor:pointer}.xdsoft_datetimepicker .xdsoft_label:hover>span{text-decoration:underline}.xdsoft_datetimepicker .xdsoft_label:hover i{opacity:1.0}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select{border:1px solid #ccc;position:absolute;right:0;top:30px;z-index:101;display:none;background:#fff;max-height:160px;overflow-y:hidden}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select.xdsoft_monthselect{right:-7px}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select.xdsoft_yearselect{right:2px}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option:hover{color:#fff;background:#ff8000}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option{padding:2px 10px 2px 5px;text-decoration:none !important}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option.xdsoft_current{background:#3af;box-shadow:#178fe5 0 1px 3px 0 inset;color:#fff;font-weight:700}.xdsoft_datetimepicker .xdsoft_month{width:100px;text-align:right}.xdsoft_datetimepicker .xdsoft_calendar{clear:both}.xdsoft_datetimepicker .xdsoft_year{width:48px;margin-left:5px}.xdsoft_datetimepicker .xdsoft_calendar table{border-collapse:collapse;width:100%}.xdsoft_datetimepicker .xdsoft_calendar td>div{padding-right:5px}.xdsoft_datetimepicker .xdsoft_calendar th{height:25px}.xdsoft_datetimepicker .xdsoft_calendar td,.xdsoft_datetimepicker .xdsoft_calendar th{width:14.2857142%;background:#f5f5f5;border:1px solid #ddd;color:#666;font-size:12px;text-align:right;vertical-align:middle;padding:0;border-collapse:collapse;cursor:pointer;height:25px}.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_calendar th{width:12.5%}.xdsoft_datetimepicker .xdsoft_calendar th{background:#f1f1f1}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_today{color:#3af}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_highlighted_default{background:#ffe9d2;box-shadow:#ffb871 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_highlighted_mint{background:#c1ffc9;box-shadow:#00dd1c 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_default,.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current{background:#3af;box-shadow:#178fe5 0 1px 3px 0 inset;color:#fff;font-weight:700}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month,.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled,.xdsoft_datetimepicker .xdsoft_time_box>div>div.xdsoft_disabled{opacity:.5;-ms-filter:"alpha(opacity=50)";cursor:default}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{opacity:.2;-ms-filter:"alpha(opacity=20)"}.xdsoft_datetimepicker .xdsoft_calendar td:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div:hover{color:#fff !important;background:#ff8000 !important;box-shadow:none !important}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current.xdsoft_disabled:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current.xdsoft_disabled:hover{background:#3af !important;box-shadow:#178fe5 0 1px 3px 0 inset !important;color:#fff !important}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_disabled:hover{color:inherit !important;background:inherit !important;box-shadow:inherit !important}.xdsoft_datetimepicker .xdsoft_calendar th{font-weight:700;text-align:center;color:#999;cursor:default}.xdsoft_datetimepicker .xdsoft_copyright{color:#ccc !important;font-size:10px;clear:both;float:none;margin-left:8px}.xdsoft_datetimepicker .xdsoft_copyright a{color:#eee !important}.xdsoft_datetimepicker .xdsoft_copyright a:hover{color:#aaa !important}.xdsoft_time_box{position:relative;border:1px solid #ccc}.xdsoft_scrollbar>.xdsoft_scroller{background:#ccc !important;height:20px;border-radius:3px}.xdsoft_scrollbar{position:absolute;width:7px;right:0;top:0;bottom:0;cursor:pointer}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_scrollbar{left:0;right:auto}.xdsoft_scroller_box{position:relative}.xdsoft_datetimepicker.xdsoft_dark{box-shadow:0 5px 15px -5px rgba(255,255,255,0.506);background:#000;border-bottom:1px solid #444;border-left:1px solid #333;border-right:1px solid #333;border-top:1px solid #333;color:#ccc}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box{border-bottom:1px solid #222}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div{background:#0a0a0a;border-top:1px solid #222;color:#999}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label{background-color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select{border:1px solid #333;background:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select>div>.xdsoft_option:hover{color:#000;background:#007fff}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select>div>.xdsoft_option.xdsoft_current{background:#c50;box-shadow:#b03e00 0 1px 3px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label i,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_prev,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_next,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_today_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUExQUUzOTA0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QUExQUUzOTE0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBQTFBRTM4RTQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQTFBRTM4RjQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pp0VxGEAAAIASURBVHja7JrNSgMxEMebtgh+3MSLr1T1Xn2CHoSKB08+QmR8Bx9A8e7RixdB9CKCoNdexIugxFlJa7rNZneTbLIpM/CnNLsdMvNjM8l0mRCiQ9Ye61IKCAgZAUnH+mU3MMZaHYChBnJUDzWOFZdVfc5+ZFLbrWDeXPwbxIqrLLfaeS0hEBVGIRQCEiZoHQwtlGSByCCdYBl8g8egTTAWoKQMRBRBcZxYlhzhKegqMOageErsCHVkk3hXIFooDgHB1KkHIHVgzKB4ADJQ/A1jAFmAYhkQqA5TOBtocrKrgXwQA8gcFIuAIO8sQSA7hidvPwaQGZSaAYHOUWJABhWWw2EMIH9QagQERU4SArJXo0ZZL18uvaxejXt/Em8xjVBXmvFr1KVm/AJ10tRe2XnraNqaJvKE3KHuUbfK1E+VHB0q40/y3sdQSxY4FHWeKJCunP8UyDdqJZenT3ntVV5jIYCAh20vT7ioP8tpf6E2lfEMwERe+whV1MHjwZB7PBiCxcGQWwKZKD62lfGNnP/1poFAA60T7rF1UgcKd2id3KDeUS+oLWV8DfWAepOfq00CgQabi9zjcgJVYVD7PVzQUAUGAQkbNJTBICDhgwYTjDYD6XeW08ZKh+A4pYkzenOxXUbvZcWz7E8ykRMnIHGX1XPl+1m2vPYpL+2qdb8CDAARlKFEz/ZVkAAAAABJRU5ErkJggg==)}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{background:#0a0a0a;border:1px solid #222;color:#999}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{background:#0e0e0e}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_today{color:#c50}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_highlighted_default{background:#ffe9d2;box-shadow:#ffb871 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_highlighted_mint{background:#c1ffc9;box-shadow:#00dd1c 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_default,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_current,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current{background:#c50;box-shadow:#b03e00 0 1px 3px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td:hover,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div:hover{color:#000 !important;background:#007fff !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{color:#666}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright{color:#333 !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a{color:#111 !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a:hover{color:#555 !important}.xdsoft_dark .xdsoft_time_box{border:1px solid #333}.xdsoft_dark .xdsoft_scrollbar>.xdsoft_scroller{background:#333 !important}.xdsoft_datetimepicker .xdsoft_save_selected{display:block;border:1px solid #ddd !important;margin-top:5px;width:100%;color:#454551;font-size:13px}.xdsoft_datetimepicker .blue-gradient-button{font-family:"museo-sans","Book Antiqua",sans-serif;font-size:12px;font-weight:300;color:#82878c;height:28px;position:relative;padding:4px 17px 4px 33px;border:1px solid #d7d8da;background:-moz-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(73%,#f4f8fa));background:-webkit-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-o-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-ms-linear-gradient(top,#fff 0,#f4f8fa 73%);background:linear-gradient(to bottom,#fff 0,#f4f8fa 73%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff',endColorstr='#f4f8fa',GradientType=0)}.xdsoft_datetimepicker .blue-gradient-button:hover,.xdsoft_datetimepicker .blue-gradient-button:focus,.xdsoft_datetimepicker .blue-gradient-button:hover span,.xdsoft_datetimepicker .blue-gradient-button:focus span{color:#454551;background:-moz-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f4f8fa),color-stop(73%,#FFF));background:-webkit-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-o-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-ms-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:linear-gradient(to bottom,#f4f8fa 0,#FFF 73%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f8fa',endColorstr='#FFF',GradientType=0)}
diff --git a/public/viewnfo.php b/public/viewnfo.php
index c63fcd91..6d5b7ed6 100644
--- a/public/viewnfo.php
+++ b/public/viewnfo.php
@@ -27,12 +27,14 @@ if ($view == "latin-1" || $view == "fonthack") {
// Do not convert from ibm-437, read bytes as is.
// NOTICE: TBSource specifies Latin-1 encoding in include/bittorrent.php:
// stdhead()
-$nfo = htmlspecialchars(($a["nfo"]));
+//$nfo = htmlspecialchars(($a["nfo"]));
+$nfo = code_new($a["nfo"], $view);
}
else {
// Convert from ibm-437 to html unicode entities.
// take special care of Swedish letters if in magic view.
-$nfo = code($a["nfo"], $view == "magic");
+//$nfo = code($a["nfo"], $view == "magic");
+$nfo = code_new($a["nfo"], $view);
}
stdhead($lang_viewnfo['head_view_nfo']);
@@ -65,14 +67,14 @@ if ($view == "fonthack") {
// Please notice: MS LineDraw's glyphs are included in the Courier New font
// as of Courier New version 2.0, but uses the correct mappings instead.
// http://support.microsoft.com/kb/q179422/
-print("");
+print("");
}
else {
// IE6.0 need to know which font to use, Mozilla can figure it out in its own
// (windows firefox at least)
// Anything else than 'Courier New' looks pretty broken.
// 'Lucida Console', 'FixedSys'
-print("");
+print("");
}
// Writes the (eventually modified) nfo data to output, first formating urls.
print(format_urls($nfo));
diff --git a/public/viewsnatches.php b/public/viewsnatches.php
index 0d7c062d..1dd22577 100644
--- a/public/viewsnatches.php
+++ b/public/viewsnatches.php
@@ -13,7 +13,7 @@ begin_main_frame();
$torrent_name = get_single_value("torrents", "name", "WHERE id = ".sqlesc($id));
print("");
$count = get_row_count("snatched", "WHERE finished = 'yes' AND torrentid = ".sqlesc($id));
-
+$seedBoxRep = new \App\Repositories\SeedBoxRepository();
if ($count){
$perpage = 25;
list($pagertop, $pagerbottom, $limit) = pager($perpage, $count, $_SERVER["SCRIPT_NAME"] . "?id=" . htmlspecialchars($id) . "&" );
@@ -53,7 +53,7 @@ if ($count){
}
else $username = get_username($arr['userid']);
$reportImage = "" . $username ." ".(user_can('userprofile') ? "".$arr['ip']." " : "")."".$uploaded."@".$uprate.$lang_viewsnatches['text_per_second']." $ratio $seedtime $leechtime ".gettime($arr['completedat'],true,false)." ".gettime($arr['last_action'],true,false)." ".($userrow['privacy'] != 'strong' || user_can('viewanonymous') ? "$reportImage " : $reportImage)." \n");
+ print("" . $username ." ".(user_can('userprofile') || $arr['userid'] == $CURUSER['id'] ? "".$arr['ip'].$seedBoxRep->renderIcon($arr['ip'], $arr['userid'])." ".$uploaded."@".$uprate.$lang_viewsnatches['text_per_second']." $ratio $seedtime $leechtime ".gettime($arr['completedat'],true,false)." ".gettime($arr['last_action'],true,false)." ".($userrow['privacy'] != 'strong' || user_can('viewanonymous') ? "$reportImage " : $reportImage)." \n");
}
print("\n");
print($pagerbottom);
diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php
index 82480c32..ce81cbeb 100644
--- a/resources/lang/en/admin.php
+++ b/resources/lang/en/admin.php
@@ -89,6 +89,9 @@ return [
'bulk_action_attach_tag' => 'Attach tag',
'action_approval' => 'Approval',
'bulk_action_attach_tag_remove_old' => 'Also delete old tags',
+ 'bulk_action_recommend' => 'Recommend',
+ 'bulk_action_sp_state' => 'Promotion',
+ 'bulk_action_hr' => 'H&R',
],
'seed_box_record' => [
'toggle_status' => 'Change status',
diff --git a/resources/lang/en/bonus.php b/resources/lang/en/bonus.php
index 323dbe07..3b772e0d 100644
--- a/resources/lang/en/bonus.php
+++ b/resources/lang/en/bonus.php
@@ -3,4 +3,19 @@
return [
'comment_buy_medal' => 'Spend :bonus bonus buy :medal_name',
'comment_buy_attendance_card' => 'Spend :bonus bonus buy one attend card',
+ 'table_thead' => [
+ 'reward_type' => 'Reward type',
+ 'count' => 'Count',
+ 'size' => 'Size',
+ 'a_value' => 'A Value',
+ 'bonus_base' => 'Basic bonus',
+ 'factor' => 'Factor',
+ 'got_bonus' => 'Got bonus',
+ 'total' => 'Total',
+ ],
+ 'reward_types' => [
+ 'basic' => 'Basic reward',
+ 'harem_addition' => 'Harem addition',
+ 'official_addition' => 'Official addition',
+ ],
];
diff --git a/resources/lang/en/claim.php b/resources/lang/en/claim.php
index a0f3d0e9..b2caf10b 100644
--- a/resources/lang/en/claim.php
+++ b/resources/lang/en/claim.php
@@ -31,4 +31,7 @@ return [
'remove_claim_confirm' => 'Confirm to give up the claim?',
'already_claimed' => 'Claimed',
'not_claim_yet' => 'Unclaimed',
+ 'fields' => [
+ 'torrent_id' => 'Torrent ID',
+ ],
];
diff --git a/resources/lang/en/cleanup.php b/resources/lang/en/cleanup.php
index cefcc9fb..f747be84 100644
--- a/resources/lang/en/cleanup.php
+++ b/resources/lang/en/cleanup.php
@@ -2,9 +2,10 @@
return [
'ban_user_with_leech_warning_expired' => 'Banned by system because of leech warning expired.',
- 'delete_user_unconfirmed' => 'Disable by system because of unconfirmed excess deadline.',
- 'delete_user_no_transfer_alt_last_access_time' => 'Disable inactive user accounts, no transfer. Alt: last access time.',
- 'delete_user_no_transfer_alt_register_time' => 'Disable inactive user accounts, no transfer. Alt: register time.',
- 'delete_user_not_parked' => 'Disable inactive user accounts, not parked.',
- 'delete_user_parked' => 'Disable inactive user accounts, parked.',
+ 'disable_user_unconfirmed' => 'Disable by system because of unconfirmed excess deadline.',
+ 'disable_user_no_transfer_alt_last_access_time' => 'Disable inactive user accounts, no transfer. Alt: last access time.',
+ 'disable_user_no_transfer_alt_register_time' => 'Disable inactive user accounts, no transfer. Alt: register time.',
+ 'disable_user_not_parked' => 'Disable inactive user accounts, not parked.',
+ 'disable_user_parked' => 'Disable inactive user accounts, parked.',
+ 'destroy_disabled_account' => 'Timed physical deletion of disabled accounts',
];
diff --git a/resources/lang/en/exam.php b/resources/lang/en/exam.php
index c6c48728..b5163037 100644
--- a/resources/lang/en/exam.php
+++ b/resources/lang/en/exam.php
@@ -1,6 +1,7 @@
'Exam',
'name' => 'Exam name',
'index' => 'Exam index',
'time_range' => 'Exam time',
diff --git a/resources/lang/en/label.php b/resources/lang/en/label.php
index 9b43e750..3273d595 100644
--- a/resources/lang/en/label.php
+++ b/resources/lang/en/label.php
@@ -33,6 +33,7 @@ return [
'submit' => 'Submit',
'cancel' => 'Cancel',
'reset' => 'Reset',
+ 'anonymous' => 'Anonymous',
'setting' => [
'nav_text' => 'Setting',
'backup' => [
@@ -72,9 +73,11 @@ return [
'no_promotion' => 'No promotion',
'no_promotion_help' => 'No Promotion, uploaded/downloaded are calculated according to the actual value',
'max_uploaded' => 'Maximum upload volume multiplier',
- 'max_uploaded_help' => 'The total upload volume is at most a multiple of its volume',
+ 'max_uploaded_help' => 'The total upload volume is at most a multiple of its volume. Set to 0 No limitation',
'not_seed_box_max_speed' => 'Not SeedBox max upload speed',
'not_seed_box_max_speed_help' => 'Unit: Mbps, if this value is exceeded and the SeedBox record cannot be matched, download permission is disabled',
+ 'max_uploaded_duration' => 'Maximum upload volume multiplier effective time range',
+ 'max_uploaded_duration_help' => 'Unit: hours. The maximum upload volume multiplier takes effect within this time range after the torrent is published, and does not take effect beyond this range. A setting of 0 is always in effect',
],
'system' => [
'tab_header' => 'System',
@@ -148,6 +151,9 @@ return [
'pos_state' => 'Pos state',
'sp_state' => 'Promotion',
'visible' => 'Visible',
+ 'picktype' => 'Recommend',
+ 'promotion_time_type' => 'Promotion type time',
+ 'hr' => 'H&R',
],
'hit_and_run' => [
'label' => 'User H&R',
diff --git a/resources/lang/en/medal.php b/resources/lang/en/medal.php
index 9c953e4d..1800bd16 100644
--- a/resources/lang/en/medal.php
+++ b/resources/lang/en/medal.php
@@ -1,6 +1,7 @@
'Medal',
'action_wearing' => 'Wear',
'admin' => [
'list' => [
diff --git a/resources/lang/en/message.php b/resources/lang/en/message.php
index c9fb81d4..3d27859b 100644
--- a/resources/lang/en/message.php
+++ b/resources/lang/en/message.php
@@ -12,9 +12,13 @@ return [
'field_value_change_message_subject' => ':field changed',
'download_disable' => [
- 'subject' => 'Download permission cancellation',
+ 'subject' => 'Download permission canceled',
'body' => 'Your download privileges has revoked, possibly due to low sharing rates or misbehavior. By: :operator',
],
+ 'download_disable_upload_over_speed' => [
+ 'subject' => 'Download permission canceled',
+ 'body' => 'Your download permission has been cancelled due to excessive upload speed, please file if you are a seed box user.' ,
+ ],
'download_enable' => [
'subject' => 'Download permission restored',
'body' => 'Your download privileges restored, you can now download torrents. By: :operator',
diff --git a/resources/lang/en/nexus.php b/resources/lang/en/nexus.php
index d924ff86..bd9196f0 100644
--- a/resources/lang/en/nexus.php
+++ b/resources/lang/en/nexus.php
@@ -2,4 +2,7 @@
return [
'invalid_argument' => 'Invalid argument',
+ 'require_argument' => ':argument cannot be empty',
+ 'select_one_please' => 'Please select one',
+ 'user_not_exists' => '(orphaned)',
];
diff --git a/resources/lang/en/permission.php b/resources/lang/en/permission.php
index 47ae27aa..fa0c5a1c 100644
--- a/resources/lang/en/permission.php
+++ b/resources/lang/en/permission.php
@@ -5,6 +5,14 @@ return [
'text' => 'Approval Torrent',
'desc' => 'Allow, Deny, or mark as unreviewed',
],
+ 'torrent-set-special-tag' => [
+ 'text' => 'Set torrent special tags',
+ 'desc' => 'Set the Official/Zero bonus tag to torrents',
+ ],
+ 'torrent-approval-allow-automatic' => [
+ 'text' => 'Torrent approval allow automatically',
+ 'desc' => 'Torrent is the approval allow status after upload automatically',
+ ],
'defaultclass' => [
'text' => 'Default Class',
'desc' => ' Class upon registration',
diff --git a/resources/lang/en/search.php b/resources/lang/en/search.php
new file mode 100644
index 00000000..7eb78151
--- /dev/null
+++ b/resources/lang/en/search.php
@@ -0,0 +1,13 @@
+ 'Global Search',
+ 'search_keyword' => 'Keyword',
+ 'search_area' => 'Range',
+ 'search_area_options' => [
+ '0' => 'Title',
+ '1' => 'Description',
+ '3' => 'Uploader',
+ '4' => 'IMDB URL'
+ ],
+];
diff --git a/resources/lang/en/searchbox.php b/resources/lang/en/searchbox.php
index ceb08948..c4396836 100644
--- a/resources/lang/en/searchbox.php
+++ b/resources/lang/en/searchbox.php
@@ -13,4 +13,8 @@ return [
\App\Models\SearchBox::EXTRA_DISPLAY_COVER_ON_TORRENT_LIST => 'Display cover on torrent list',
\App\Models\SearchBox::EXTRA_DISPLAY_SEED_BOX_ICON_ON_TORRENT_LIST => 'Display seed box icon on torrent list',
],
+ 'sections' => [
+ 'browse' => 'Torrents',
+ 'special' => 'Special',
+ ],
];
diff --git a/resources/lang/en/torrent.php b/resources/lang/en/torrent.php
index 3c52d255..f30409bd 100644
--- a/resources/lang/en/torrent.php
+++ b/resources/lang/en/torrent.php
@@ -75,4 +75,10 @@ return [
'deny_comment_show' => 'Denied, reason: :reason',
'logs_label' => 'Approval logs'
],
+ 'show_hide_media_info' => 'Show/Hide raw MediaInfo',
+ 'promotion_time_types' => [
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_GLOBAL => 'Global',
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_PERMANENT => 'Permanent',
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_DEADLINE => 'Until',
+ ],
];
diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php
index 33e2e17d..8524f42e 100644
--- a/resources/lang/en/user.php
+++ b/resources/lang/en/user.php
@@ -27,4 +27,6 @@ return [
\App\Models\User::CLASS_STAFF_LEADER => 'Staff Leader',
],
'change_username_lte_min_interval' => 'Last change time: :last_change_time, unmet minimum interval: :interval days',
+ 'destroy_by_admin' => 'Physical delete by administrator',
+ 'disable_by_admin' => 'Disable by administrator',
];
diff --git a/resources/lang/zh_CN/admin.php b/resources/lang/zh_CN/admin.php
index e9d6a068..2e7c28d7 100644
--- a/resources/lang/zh_CN/admin.php
+++ b/resources/lang/zh_CN/admin.php
@@ -26,6 +26,7 @@ return [
'permissions' => '权限',
'section' => '分区',
'icon' => '分类图标',
+ 'plugin' => '插件',
],
'resources' => [
'agent_allow' => [
@@ -91,6 +92,9 @@ return [
'bulk_action_attach_tag' => '设置标签',
'action_approval' => '审核',
'bulk_action_attach_tag_remove_old' => '同时删除旧标签',
+ 'bulk_action_recommend' => '推荐',
+ 'bulk_action_sp_state' => '优惠',
+ 'bulk_action_hr' => 'H&R',
],
'seed_box_record' => [
'toggle_status' => '更改状态',
diff --git a/resources/lang/zh_CN/bonus.php b/resources/lang/zh_CN/bonus.php
index 26000772..aa7ead52 100644
--- a/resources/lang/zh_CN/bonus.php
+++ b/resources/lang/zh_CN/bonus.php
@@ -3,4 +3,19 @@
return [
'comment_buy_medal' => '花费 :bonus 魔力购买了 :medal_name',
'comment_buy_attendance_card' => '花费 :bonus 魔力购买了 1 张补签卡',
+ 'table_thead' => [
+ 'reward_type' => '奖励类型',
+ 'count' => '数量',
+ 'size' => '体积',
+ 'a_value' => 'A 值',
+ 'bonus_base' => '基础魔力',
+ 'factor' => '系数',
+ 'got_bonus' => '获得魔力',
+ 'total' => '合计',
+ ],
+ 'reward_types' => [
+ 'basic' => '基本奖励',
+ 'harem_addition' => '后宫加成',
+ 'official_addition' => '官种加成',
+ ],
];
diff --git a/resources/lang/zh_CN/claim.php b/resources/lang/zh_CN/claim.php
index 1f510b5a..075539a7 100644
--- a/resources/lang/zh_CN/claim.php
+++ b/resources/lang/zh_CN/claim.php
@@ -31,4 +31,8 @@ return [
'remove_claim_confirm' => '确认要放弃认领？',
'already_claimed' => '已认领',
'not_claim_yet' => '未认领',
+
+ 'fields' => [
+ 'torrent_id' => '种子 ID',
+ ],
];
diff --git a/resources/lang/zh_CN/cleanup.php b/resources/lang/zh_CN/cleanup.php
index 9528b3b8..e74ced00 100644
--- a/resources/lang/zh_CN/cleanup.php
+++ b/resources/lang/zh_CN/cleanup.php
@@ -2,9 +2,10 @@
return [
'ban_user_with_leech_warning_expired' => '上传警告到期，被系统禁用.',
- 'delete_user_unconfirmed' => '超时未确认，被系统封禁.',
- 'delete_user_no_transfer_alt_last_access_time' => '封禁非活跃的无流量账号，由最近访问时间断定.',
- 'delete_user_no_transfer_alt_register_time' => '封禁非活跃的无流量账号，由注册时间时间断定.',
- 'delete_user_not_parked' => '定时封禁未挂起的非活跃账号.',
- 'delete_user_parked' => '定时封禁已挂起的非活跃账号.',
+ 'disable_user_unconfirmed' => '超时未确认，被系统封禁.',
+ 'disable_user_no_transfer_alt_last_access_time' => '封禁非活跃的无流量账号，由最近访问时间断定.',
+ 'disable_user_no_transfer_alt_register_time' => '封禁非活跃的无流量账号，由注册时间时间断定.',
+ 'disable_user_not_parked' => '定时封禁未挂起的非活跃账号.',
+ 'disable_user_parked' => '定时封禁已挂起的非活跃账号.',
+ 'destroy_disabled_account' => '定时物理删除已封禁账号',
];
diff --git a/resources/lang/zh_CN/exam.php b/resources/lang/zh_CN/exam.php
index bff1252e..fd488e0d 100644
--- a/resources/lang/zh_CN/exam.php
+++ b/resources/lang/zh_CN/exam.php
@@ -1,6 +1,7 @@
'考核',
'name' => '考核名称',
'index' => '考核指标',
'time_range' => '考核时间',
diff --git a/resources/lang/zh_CN/label.php b/resources/lang/zh_CN/label.php
index 6d9b96f6..2f59a2b8 100644
--- a/resources/lang/zh_CN/label.php
+++ b/resources/lang/zh_CN/label.php
@@ -33,6 +33,7 @@ return [
'submit' => '提交',
'cancel' => '取消',
'reset' => '重置',
+ 'anonymous' => '匿名',
'setting' => [
'nav_text' => '设置',
'backup' => [
@@ -72,9 +73,11 @@ return [
'no_promotion' => '无优惠',
'no_promotion_help' => '不享受任何优惠，上传量/下载量按实际值计算',
'max_uploaded' => '最大上传量倍数',
- 'max_uploaded_help' => '总上传量最多为其体积的多少倍',
+ 'max_uploaded_help' => '总上传量最多为其体积的多少倍。设置为 0 无此限制',
'not_seed_box_max_speed' => '非 SeedBox 最高限速',
'not_seed_box_max_speed_help' => '单位：Mbps。若超过此值又不能匹配 SeedBox 记录，禁用下载权限',
+ 'max_uploaded_duration' => '最大上传量倍数有效时间范围',
+ 'max_uploaded_duration_help' => '单位：小时。种子发布后的这个时间范围内，最大上传量倍数生效，超过此范围不生效。设置为 0 一直生效',
],
'system' => [
'tab_header' => '系统',
@@ -154,6 +157,9 @@ return [
'team' => '制作组',
'processing' => '处理',
'standard' => '分辨率',
+ 'picktype' => '推荐',
+ 'promotion_time_type' => '优惠时间类型',
+ 'hr' => 'H&R',
],
'hit_and_run' => [
'label' => '用户 H&R',
diff --git a/resources/lang/zh_CN/medal.php b/resources/lang/zh_CN/medal.php
index 7993d4e5..b3099d15 100644
--- a/resources/lang/zh_CN/medal.php
+++ b/resources/lang/zh_CN/medal.php
@@ -1,6 +1,7 @@
'勋章',
'action_wearing' => '佩戴',
'admin' => [
'list' => [
diff --git a/resources/lang/zh_CN/message.php b/resources/lang/zh_CN/message.php
index 30ff49e6..f030b00e 100644
--- a/resources/lang/zh_CN/message.php
+++ b/resources/lang/zh_CN/message.php
@@ -15,6 +15,10 @@ return [
'subject' => '下载权限取消',
'body' => '你的下载权限被取消，可能的原因是过低的分享率或行为不当。By: :operator',
],
+ 'download_disable_upload_over_speed' => [
+ 'subject' => '下载权限取消',
+ 'body' => '你因上传速度过快下载权限被取消，若是盒子用户请备案。',
+ ],
'download_enable' => [
'subject' => '下载权限恢复',
'body' => '你的下载权限恢复，你现在可以下载种子。By: :operator',
diff --git a/resources/lang/zh_CN/nexus.php b/resources/lang/zh_CN/nexus.php
index e142c245..9d206b96 100644
--- a/resources/lang/zh_CN/nexus.php
+++ b/resources/lang/zh_CN/nexus.php
@@ -2,5 +2,7 @@
return [
'invalid_argument' => '参数错误',
- 'select_one_please' => '请选择',
+ 'require_argument' => ':argument 不能为空',
+ 'select_one_please' => '请选择一项',
+ 'user_not_exists' => '(无此帐户)',
];
diff --git a/resources/lang/zh_CN/permission.php b/resources/lang/zh_CN/permission.php
index 1e50fba3..ba4a205c 100644
--- a/resources/lang/zh_CN/permission.php
+++ b/resources/lang/zh_CN/permission.php
@@ -5,6 +5,14 @@ return [
'text' => '审核种子',
'desc' => '通过种子、拒绝种子、或将种子标记为未审',
],
+ 'torrent-set-special-tag' => [
+ 'text' => '设定种子特殊标签',
+ 'desc' => '设定种子的官方、零魔标签',
+ ],
+ 'torrent-approval-allow-automatic' => [
+ 'text' => '种子自动通过审核',
+ 'desc' => '种子发布即为审核通过状态',
+ ],
'defaultclass' => [
'text' => '默认等级',
'desc' => '注册时获得的等级',
@@ -205,4 +213,12 @@ return [
'text' => '允许个性条',
'desc' => '允许用户使用个性条',
],
+// 'not-counting-downloaded' => [
+// 'text' => '不计下载量',
+// 'desc' => '用户下载量不增加',
+// ],
+// 'not-counting-hit-and-run' => [
+// 'text' => '不计 H&R',
+// 'desc' => '下载带 H&R 标记的种子不记 H&R。注意：等级为 VIP 是固定不计的',
+// ],
];
diff --git a/resources/lang/zh_CN/plugin.php b/resources/lang/zh_CN/plugin.php
new file mode 100644
index 00000000..23da8598
--- /dev/null
+++ b/resources/lang/zh_CN/plugin.php
@@ -0,0 +1,32 @@
+ [
+ 'install' => '安装',
+ 'delete' => '删除',
+ 'update' => '升级',
+ ],
+ 'labels' => [
+ 'display_name' => '名称',
+ 'package_name' => '包名',
+ 'remote_url' => '仓库地址',
+ 'installed_version' => '已安装版本',
+ 'status' => '状态',
+ ],
+ 'status' => [
+ \App\Models\Plugin::STATUS_NORMAL => '正常',
+ \App\Models\Plugin::STATUS_NOT_INSTALLED => '未安装',
+
+ \App\Models\Plugin::STATUS_PRE_INSTALL => '准备安装',
+ \App\Models\Plugin::STATUS_INSTALLING => '安装中',
+ \App\Models\Plugin::STATUS_INSTALL_FAILED => '安装失败',
+
+ \App\Models\Plugin::STATUS_PRE_UPDATE => '准备升级',
+ \App\Models\Plugin::STATUS_UPDATING => '升级中',
+ \App\Models\Plugin::STATUS_UPDATE_FAILED => '升级失败',
+
+ \App\Models\Plugin::STATUS_PRE_DELETE => '准备删除',
+ \App\Models\Plugin::STATUS_DELETING => '删除中',
+ \App\Models\Plugin::STATUS_DELETE_FAILED => '删除失败',
+ ],
+];
diff --git a/resources/lang/zh_CN/search.php b/resources/lang/zh_CN/search.php
new file mode 100644
index 00000000..edac195d
--- /dev/null
+++ b/resources/lang/zh_CN/search.php
@@ -0,0 +1,13 @@
+ '全站搜索',
+ 'search_keyword' => '关键字',
+ 'search_area' => '范围',
+ 'search_area_options' => [
+ '0' => '标题',
+ '1' => '简介',
+ '3' => '发布者',
+ '4' => 'IMDB链接'
+ ],
+];
diff --git a/resources/lang/zh_CN/searchbox.php b/resources/lang/zh_CN/searchbox.php
index 69344bbe..501d36ca 100644
--- a/resources/lang/zh_CN/searchbox.php
+++ b/resources/lang/zh_CN/searchbox.php
@@ -13,4 +13,8 @@ return [
\App\Models\SearchBox::EXTRA_DISPLAY_COVER_ON_TORRENT_LIST => '种子列表页展示封面',
\App\Models\SearchBox::EXTRA_DISPLAY_SEED_BOX_ICON_ON_TORRENT_LIST => '种子列表页展示 SeedBox 图标',
],
+ 'sections' => [
+ 'browse' => '种子区',
+ 'special' => '特别区',
+ ],
];
diff --git a/resources/lang/zh_CN/torrent.php b/resources/lang/zh_CN/torrent.php
index 96ff4895..7740eb33 100644
--- a/resources/lang/zh_CN/torrent.php
+++ b/resources/lang/zh_CN/torrent.php
@@ -75,4 +75,10 @@ return [
'deny_comment_show' => '审核不通过，原因：:reason',
'logs_label' => '审核记录',
],
+ 'show_hide_media_info' => '显示/隐藏原始 MediaInfo',
+ 'promotion_time_types' => [
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_GLOBAL => '全局',
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_PERMANENT => '永久',
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_DEADLINE => '直到',
+ ],
];
diff --git a/resources/lang/zh_CN/user.php b/resources/lang/zh_CN/user.php
index 68c51678..ad427709 100644
--- a/resources/lang/zh_CN/user.php
+++ b/resources/lang/zh_CN/user.php
@@ -27,4 +27,6 @@ return [
\App\Models\User::CLASS_STAFF_LEADER => '主管',
],
'change_username_lte_min_interval' => '上次修改时间：:last_change_time，未满足最小间隔：:interval 天',
+ 'destroy_by_admin' => '被管理员物理删除',
+ 'disable_by_admin' => '被管理員封禁',
];
diff --git a/resources/lang/zh_TW/admin.php b/resources/lang/zh_TW/admin.php
index c46b91fd..07664aed 100644
--- a/resources/lang/zh_TW/admin.php
+++ b/resources/lang/zh_TW/admin.php
@@ -89,6 +89,9 @@ return [
'bulk_action_attach_tag' => '設置標簽',
'action_approval' => '審核',
'bulk_action_attach_tag_remove_old' => '同時刪除舊標簽',
+ 'bulk_action_recommend' => '推薦',
+ 'bulk_action_sp_state' => '優惠',
+ 'bulk_action_hr' => 'H&R',
],
'seed_box_record' => [
'toggle_status' => '更改狀態',
diff --git a/resources/lang/zh_TW/bonus.php b/resources/lang/zh_TW/bonus.php
index 0e57807c..a5cae0da 100644
--- a/resources/lang/zh_TW/bonus.php
+++ b/resources/lang/zh_TW/bonus.php
@@ -3,4 +3,19 @@
return [
'comment_buy_medal' => '花費 :bonus 魔力購買了 :medal_name',
'comment_buy_attendance_card' => '花費 :bonus 魔力購買了 1 張補簽卡',
+ 'table_thead' => [
+ 'reward_type' => '獎勵類型',
+ 'count' => '數量',
+ 'size' => '體積',
+ 'a_value' => 'A 值',
+ 'bonus_base' => '基礎魔力',
+ 'factor' => '系數',
+ 'got_bonus' => '獲得魔力',
+ 'total' => '合計',
+ ],
+ 'reward_types' => [
+ 'basic' => '基本獎勵',
+ 'harem_addition' => '後宮加成',
+ 'official_addition' => '官種加成',
+ ],
];
diff --git a/resources/lang/zh_TW/claim.php b/resources/lang/zh_TW/claim.php
index 473e4650..9fe68ede 100644
--- a/resources/lang/zh_TW/claim.php
+++ b/resources/lang/zh_TW/claim.php
@@ -30,4 +30,7 @@ return [
'remove_claim_confirm' => '確認要放棄認領？',
'already_claimed' => '已認領',
'not_claim_yet' => '未認領',
+ 'fields' => [
+ 'torrent_id' => '種子 ID',
+ ],
];
diff --git a/resources/lang/zh_TW/cleanup.php b/resources/lang/zh_TW/cleanup.php
index f996b106..86de0547 100644
--- a/resources/lang/zh_TW/cleanup.php
+++ b/resources/lang/zh_TW/cleanup.php
@@ -2,9 +2,10 @@
return [
'ban_user_with_leech_warning_expired' => '上傳警告到期，被系統禁用.',
- 'delete_user_unconfirmed' => '超時未確認，被系統封禁.',
- 'delete_user_no_transfer_alt_last_access_time' => '封禁非活躍的無流量賬號，由最近訪問時間斷定.',
- 'delete_user_no_transfer_alt_register_time' => '封禁非活躍的無流量賬號，由註冊時間時間斷定.',
- 'delete_user_not_parked' => '定時封禁未掛起的非活躍賬號.',
- 'delete_user_parked' => '定時封禁已掛起的非活躍賬號.',
+ 'disable_user_unconfirmed' => '超時未確認，被系統封禁.',
+ 'disable_user_no_transfer_alt_last_access_time' => '封禁非活躍的無流量賬號，由最近訪問時間斷定.',
+ 'disable_user_no_transfer_alt_register_time' => '封禁非活躍的無流量賬號，由註冊時間時間斷定.',
+ 'disable_user_not_parked' => '定時封禁未掛起的非活躍賬號.',
+ 'disable_user_parked' => '定時封禁已掛起的非活躍賬號.',
+ 'destroy_disabled_account' => '定時物理刪除已封禁賬號',
];
diff --git a/resources/lang/zh_TW/exam.php b/resources/lang/zh_TW/exam.php
index e6e5a1b7..21490e57 100644
--- a/resources/lang/zh_TW/exam.php
+++ b/resources/lang/zh_TW/exam.php
@@ -1,6 +1,7 @@
'考核',
'name' => '考核名稱',
'index' => '考核指標',
'time_range' => '考核時間',
diff --git a/resources/lang/zh_TW/label.php b/resources/lang/zh_TW/label.php
index 2cbe7e00..d1ac1dca 100644
--- a/resources/lang/zh_TW/label.php
+++ b/resources/lang/zh_TW/label.php
@@ -33,6 +33,7 @@ return [
'submit' => '提交',
'cancel' => '取消',
'reset' => '重置',
+ 'anonymous' => '匿名',
'setting' => [
'nav_text' => '設置',
'backup' => [
@@ -72,9 +73,11 @@ return [
'no_promotion' => '無優惠',
'no_promotion_help' => '不享受任何優惠，上傳量/下載量按實際值計算',
'max_uploaded' => '最大上傳量倍數',
- 'max_uploaded_help' => '總上傳量最多為其體積的多少倍',
+ 'max_uploaded_help' => '總上傳量最多為其體積的多少倍。設置為 0 無此限製',
'not_seed_box_max_speed' => '非 SeedBox 最高限速',
'not_seed_box_max_speed_help' => '單位：Mbps。若超過此值又不能匹配 SeedBox 記錄，禁用下載權限',
+ 'max_uploaded_duration' => '最大上傳量倍數有效時間範圍',
+ 'max_uploaded_duration_help' => '單位：小時。種子發布後的這個時間範圍內，最大上傳量倍數生效，超過此範圍不生效。設置為 0 一直生效',
],
'system' => [
'tab_header' => '系統',
@@ -148,6 +151,9 @@ return [
'pos_state' => '置頂',
'sp_state' => '優惠',
'visible' => '活種',
+ 'picktype' => '推薦',
+ 'promotion_time_type' => '優惠時間類型',
+ 'hr' => 'H&R',
],
'hit_and_run' => [
'label' => '用戶 H&R',
diff --git a/resources/lang/zh_TW/medal.php b/resources/lang/zh_TW/medal.php
index 3f6af04a..3ec07fd5 100644
--- a/resources/lang/zh_TW/medal.php
+++ b/resources/lang/zh_TW/medal.php
@@ -1,6 +1,7 @@
'勛章',
'action_wearing' => '佩戴',
'admin' => [
'list' => [
diff --git a/resources/lang/zh_TW/message.php b/resources/lang/zh_TW/message.php
index b2978f75..99aaceb2 100644
--- a/resources/lang/zh_TW/message.php
+++ b/resources/lang/zh_TW/message.php
@@ -14,6 +14,10 @@ return [
'subject' => '下載權限取消',
'body' => '你的下載權限被取消，可能的原因是過低的分享率或行為不當。By: :operator',
],
+ 'download_disable_upload_over_speed' => [
+ 'subject' => '下載權限取消',
+ 'body' => '你因上傳速度過快下載權限被取消，若是盒子用戶請備案。',
+ ],
'download_enable' => [
'subject' => '下載權限恢復',
'body' => '你的下載權限恢復，你現在可以下載種子。By: :operator',
diff --git a/resources/lang/zh_TW/nexus.php b/resources/lang/zh_TW/nexus.php
index 69a3f32b..2fd6b606 100644
--- a/resources/lang/zh_TW/nexus.php
+++ b/resources/lang/zh_TW/nexus.php
@@ -2,4 +2,7 @@
return [
'invalid_argument' => '參數錯誤',
+ 'require_argument' => ':argument 不能為空',
+ 'select_one_please' => '請選擇一項',
+ 'user_not_exists' => '(無此帳戶)',
];
diff --git a/resources/lang/zh_TW/permission.php b/resources/lang/zh_TW/permission.php
index da0889d6..95cb74ca 100644
--- a/resources/lang/zh_TW/permission.php
+++ b/resources/lang/zh_TW/permission.php
@@ -5,6 +5,14 @@ return [
'text' => '審核種子',
'desc' => '通過種子、拒絕種子、或將種子標記為未審',
],
+ 'torrent-set-special-tag' => [
+ 'text' => '設定種子特殊標簽',
+ 'desc' => '設定種子的官方、零魔標簽',
+ ],
+ 'torrent-approval-allow-automatic' => [
+ 'text' => '種子自動通過審核',
+ 'desc' => '種子發布即為審核通過狀態',
+ ],
'defaultclass' => [
'text' => '預設等級',
'desc' => '註冊時獲得的等級',
diff --git a/resources/lang/zh_TW/search.php b/resources/lang/zh_TW/search.php
new file mode 100644
index 00000000..0862f011
--- /dev/null
+++ b/resources/lang/zh_TW/search.php
@@ -0,0 +1,13 @@
+ '全站搜索',
+ 'search_keyword' => '關鍵字',
+ 'search_area' => '範圍',
+ 'search_area_options' => [
+ '0' => '標題',
+ '1' => '簡介',
+ '3' => '發布者',
+ '4' => 'IMDB鏈接'
+ ],
+];
diff --git a/resources/lang/zh_TW/searchbox.php b/resources/lang/zh_TW/searchbox.php
index e053f2b7..73558bae 100644
--- a/resources/lang/zh_TW/searchbox.php
+++ b/resources/lang/zh_TW/searchbox.php
@@ -13,4 +13,8 @@ return [
\App\Models\SearchBox::EXTRA_DISPLAY_COVER_ON_TORRENT_LIST => '種子列表頁展示封面',
\App\Models\SearchBox::EXTRA_DISPLAY_SEED_BOX_ICON_ON_TORRENT_LIST => '種子列表頁展示 SeedBox 圖標',
],
+ 'sections' => [
+ 'browse' => '種子區',
+ 'special' => '特別區',
+ ],
];
diff --git a/resources/lang/zh_TW/torrent.php b/resources/lang/zh_TW/torrent.php
index 23246c22..790c82e0 100644
--- a/resources/lang/zh_TW/torrent.php
+++ b/resources/lang/zh_TW/torrent.php
@@ -75,4 +75,10 @@ return [
'deny_comment_show' => '審核不通過，原因：:reason',
'logs_label' => '審核記錄'
],
+ 'show_hide_media_info' => '顯示/隱藏原始 MediaInfo',
+ 'promotion_time_types' => [
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_GLOBAL => '全局',
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_PERMANENT => '永久',
+ \App\Models\Torrent::PROMOTION_TIME_TYPE_DEADLINE => '直到',
+ ],
];
diff --git a/resources/lang/zh_TW/user.php b/resources/lang/zh_TW/user.php
index 9fa65910..9f5c1a80 100644
--- a/resources/lang/zh_TW/user.php
+++ b/resources/lang/zh_TW/user.php
@@ -27,4 +27,6 @@ return [
\App\Models\User::CLASS_STAFF_LEADER => '主管',
],
'change_username_lte_min_interval' => '上次修改時間：:last_change_time，未滿足最小間隔：:interval 天',
+ 'destroy_by_admin' => '被管理員物理刪除',
+ 'disable_by_admin' => '被管理员封禁',
];
diff --git a/resources/views/filament/resources/system/plugin-resource/pages/plugins.blade.php b/resources/views/filament/resources/system/plugin-resource/pages/plugins.blade.php
new file mode 100644
index 00000000..cd00dafb
--- /dev/null
+++ b/resources/views/filament/resources/system/plugin-resource/pages/plugins.blade.php
@@ -0,0 +1,3 @@
+
+
+
', '', '', '', '', '', '', '![\"cheaterbox\"](\"pic/trans.gif\" "\\"\".$lang_functions['title_cheaterbox'].\"\\"")
".$totalcheaters
- ." ![\"A](pic/bonusformulaa.png "\\"A")
![\"B](pic/bonusformulab.png "\\"B")
![](pic/bonusformulaa.svg "\\"A")
![\"A](\"pic/bonusformulaa.png\" "\\"A")
![\"B](\"pic/bonusformulab.png\" "\\"B")
![](\"pic/bonusformulaa.svg\" "\\"A")