diff --git a/composer.lock b/composer.lock index b2c806794..7e787fe4e 100644 --- a/composer.lock +++ b/composer.lock @@ -2620,22 +2620,22 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.3", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "67c26b443f348a51926030c83481b85718457d3d" + "reference": "b635f279edd83fc275f822a1188157ffea568ff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", - "reference": "67c26b443f348a51926030c83481b85718457d3d", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", + "reference": "b635f279edd83fc275f822a1188157ffea568ff6", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -2655,9 +2655,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -2719,7 +2716,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.3" + "source": "https://github.com/guzzle/psr7/tree/2.5.0" }, "funding": [ { @@ -2735,7 +2732,7 @@ "type": "tidelift" } ], - "time": "2022-10-26T14:07:24+00:00" + "time": "2023-04-17T16:11:26+00:00" }, { "name": "guzzlehttp/uri-template", @@ -5937,21 +5934,21 @@ }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -5971,7 +5968,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -5986,31 +5983,31 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -6039,9 +6036,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", diff --git a/include/functions.php b/include/functions.php index b48eff8ad..17019f27e 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2668,7 +2668,7 @@ function stdhead($title = "", $msgalert = true, $script = "", $place = "") '.$lang_functions['text_attended'].'', $attendance->points, $CURUSER['attendance_card']); }else{ printf(' %s', $lang_functions['text_attendance']);}?> [] []: where('inviter', $CURUSER['id'])->where('invitee', '')->where('expired_at', '>', now())->count())?> - = \App\Models\User::CLASS_ADMINISTRATOR) printf('[%s]', nexus_env('FILAMENT_PATH', 'nexusphp'), $lang_functions['text_management_system'])?> + = \App\Models\User::CLASS_ADMINISTRATOR) printf('[%s]', nexus_env('FILAMENT_PATH', 'nexusphp'), $lang_functions['text_management_system'])?>
@@ -6410,7 +6410,7 @@ function torrent_name_for_admin(\App\Models\Torrent|null $torrent, $withTags = f return ''; } $name = sprintf( - '
%s
', + '
%s
', $torrent->id, $torrent->name, Str::limit($torrent->name, $length) ); $tags = ''; diff --git a/lang/chs/lang_complains.php b/lang/chs/lang_complains.php index 8df7f2389..64c5e42dc 100644 --- a/lang/chs/lang_complains.php +++ b/lang/chs/lang_complains.php @@ -28,5 +28,5 @@ 'no_complaints_have_been_processed' => '暂无已处理的申诉', 'text_view_band_log' => '查看封禁记录', 'reply_notify_subject' => '申诉回复', - 'reply_notify_body' => '你在网站 %s 的申诉有了回复,点此 查看。', + 'reply_notify_body' => '你在网站 %s 的申诉有了回复,点此 查看。', ]; diff --git a/lang/chs/lang_mybonus.php b/lang/chs/lang_mybonus.php index 21bc88aae..823b81e48 100644 --- a/lang/chs/lang_mybonus.php +++ b/lang/chs/lang_mybonus.php @@ -150,7 +150,7 @@ 'official_tag_bonus_additional_factor' => '最终奖励为计算所得官种奖励乘以官种系数,当前官种系数为: ', 'reward_type_official_addition' => '官种加成', 'text_get_by_harem' => '后宫加成每小时将额外得到如下的魔力值', - 'harem_additional_desc' => '后宫只考虑直属后宫。每个后宫加成值可在此查看', + 'harem_additional_desc' => '后宫只考虑直属后宫。每个后宫加成值可在此查看', 'harem_additional_note' => '注意:如果自己不做种,此加成值不会增加到用户账号上', 'harem_additional_factor' => '所得奖励为全部后宫的时魔(不考虑加成)之和,乘以后宫加成系数,当前值为:', 'text_bonus_summary' => '每小时获得的合计魔力值', diff --git a/lang/chs/lang_settings.php b/lang/chs/lang_settings.php index cc7d6ae4e..66301a639 100644 --- a/lang/chs/lang_settings.php +++ b/lang/chs/lang_settings.php @@ -759,7 +759,7 @@ 'submit_misc_settings' => '其他设定', 'text_misc_settings_note' => '配置其他杂项。', 'row_misc_donation_custom' => '捐赠自定义内容', - 'text_donation_custom_note' => '捐赠页自定义的内容,展示于支付宝、PayPal上面。支持 bbcode 标签', + 'text_donation_custom_note' => '捐赠页自定义的内容,展示于支付宝、PayPal上面。支持 bbcode 标签', 'row_approval_status_icon_enabled' => '显示审核状态图标', 'text_approval_status_icon_enabled_note' => "是否在种子列表展示审核状态图标,默认: '否'。", 'row_approval_status_none_visible' => '未审核种子是否可见', diff --git a/lang/cht/lang_complains.php b/lang/cht/lang_complains.php index bccbc8fea..509d36997 100644 --- a/lang/cht/lang_complains.php +++ b/lang/cht/lang_complains.php @@ -28,5 +28,5 @@ 'no_complaints_have_been_processed' => '暫無已處理的申訴', 'text_view_band_log' => '查看封禁記錄', 'reply_notify_subject' => '申訴回復', - 'reply_notify_body' => '你在網站 %s 的申訴有了回復,點此 查看。', + 'reply_notify_body' => '你在網站 %s 的申訴有了回復,點此 查看。', ]; diff --git a/lang/cht/lang_mybonus.php b/lang/cht/lang_mybonus.php index 9232a3b94..ed202b9ec 100644 --- a/lang/cht/lang_mybonus.php +++ b/lang/cht/lang_mybonus.php @@ -150,7 +150,7 @@ 'official_tag_bonus_additional_factor' => '最終獎勵為計算所得官種獎勵乘以官種系數,當前官種系數為: ', 'reward_type_official_addition' => '官種加成', 'text_get_by_harem' => '後宮加成每小時將額外得到如下的魔力值', - 'harem_additional_desc' => '後宮只考慮直屬後宮。每個後宮加成值可在此查看', + 'harem_additional_desc' => '後宮只考慮直屬後宮。每個後宮加成值可在此查看', 'harem_additional_note' => '註意:如果自己不做種,此加成值不會增加到用戶賬號上', 'harem_additional_factor' => '所得獎勵為全部後宮的時魔(不考慮加成)之和,乘以後宮加成系數,當前值為:', 'text_bonus_summary' => '每小時獲得的合計魔力值', diff --git a/lang/cht/lang_settings.php b/lang/cht/lang_settings.php index 773a221c3..19ff39f85 100644 --- a/lang/cht/lang_settings.php +++ b/lang/cht/lang_settings.php @@ -759,7 +759,7 @@ 'submit_misc_settings' => '其他設定', 'text_misc_settings_note' => '配置其他雜項。', 'row_misc_donation_custom' => '捐贈自定義內容', - 'text_donation_custom_note' => '捐贈頁自定義的內容,展示於支付寶、PayPal上面。支持 bbcode 標簽', + 'text_donation_custom_note' => '捐贈頁自定義的內容,展示於支付寶、PayPal上面。支持 bbcode 標簽', 'row_approval_status_icon_enabled' => '顯示審核狀態圖標', 'text_approval_status_icon_enabled_note' => "是否在種子列表展示審核狀態圖標,默認: '否'。", 'row_approval_status_none_visible' => '未審核種子是否可見', diff --git a/lang/en/lang_complains.php b/lang/en/lang_complains.php index 2dfd42544..42a971fbf 100644 --- a/lang/en/lang_complains.php +++ b/lang/en/lang_complains.php @@ -28,5 +28,5 @@ 'no_complaints_have_been_processed' => 'No complaints have been processed', 'text_view_band_log' => 'View ban log', 'reply_notify_subject' => 'Complaint replied', - 'reply_notify_body' => 'You have a reply to your complaint on the site %s, click here to see it.', + 'reply_notify_body' => 'You have a reply to your complaint on the site %s, click here to see it.', ]; diff --git a/lang/en/lang_settings.php b/lang/en/lang_settings.php index 8013f389c..8062a8cfd 100644 --- a/lang/en/lang_settings.php +++ b/lang/en/lang_settings.php @@ -759,7 +759,7 @@ 'submit_misc_settings' => 'Misc settings', 'text_misc_settings_note' => 'Misc settings', 'row_misc_donation_custom' => 'Donation custom', - 'text_donation_custom_note' => 'Donation page custom content, displayed above Alipay, PayPal. Support bbcode tag', + 'text_donation_custom_note' => 'Donation page custom content, displayed above Alipay, PayPal. Support bbcode tag', 'row_approval_status_icon_enabled' => 'Show approval status icon', 'text_approval_status_icon_enabled_note' => "Whether to show the approval status icon in the torrent list, default: 'No'.", 'row_approval_status_none_visible' => 'Visibility of not reviewed torrents', diff --git a/nexus/Install/install/install.php b/nexus/Install/install/install.php index cfbd053dd..08af5202e 100644 --- a/nexus/Install/install/install.php +++ b/nexus/Install/install/install.php @@ -225,7 +225,7 @@
- Welcome to the NexusPHP installer, if you have any questions, clickherefor help. + Welcome to the NexusPHP installer, if you have any questions, clickherefor help.