fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2025-03-10 17:04:17 +09:00 • committed by GitHub
commit a40502885e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 259 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/framework/Mail.php
View file

@ -556,12 +556,13 @@ class Mail
/**
* Send the email.
*
* @param bool $sync
* @return bool
*/
public function send(): bool
public function send(bool $sync = false): bool
{
// If queue is enabled, send asynchronously.
if (config('queue.enabled') && !defined('RXQUEUE_CRON'))
if (!$sync && config('queue.enabled') && !defined('RXQUEUE_CRON'))
{
Queue::addTask(self::class . '::' . 'sendAsync', $this);
return true;

5
common/framework/Push.php
View file

@ -398,12 +398,13 @@ class Push
/**
* Send the message.
*
* @param bool $sync
* @return bool
*/
public function send(): bool
public function send(bool $sync = false): bool
{
// If queue is enabled, send asynchronously.
if (config('queue.enabled') && !defined('RXQUEUE_CRON'))
if (!$sync && config('queue.enabled') && !defined('RXQUEUE_CRON'))
{
Queue::addTask(self::class . '::' . 'sendAsync', $this);
return true;

2
common/framework/Router.php
View file

@ -626,7 +626,7 @@ class Router
$route = preg_replace_callback('#\\$([a-zA-Z0-9_]+)(:[a-z]+)?#i', function($match) use(&$vars) {
if (isset($vars[$match[1]]))
{
$replacement = urlencode($vars[$match[1]]);
$replacement = urlencode(strval($vars[$match[1]]));
unset($vars[$match[1]]);
return (isset($match[2]) && $match[2] === ':delete') ? '' : $replacement;
}

5
common/framework/SMS.php
View file

@ -507,12 +507,13 @@ class SMS
/**
* Send the message.
*
* @param bool $sync
* @return bool
*/
public function send(): bool
public function send(bool $sync = false): bool
{
// If queue is enabled, send asynchronously.
if (config('queue.enabled') && !defined('RXQUEUE_CRON'))
if (!$sync && config('queue.enabled') && !defined('RXQUEUE_CRON'))
{
Queue::addTask(self::class . '::' . 'sendAsync', $this);
return true;

4
common/framework/Security.php
View file

@ -317,11 +317,11 @@ class Security
$check_csrf_token = config('security.check_csrf_token') ? true : false;
if ($token = isset($_SERVER['HTTP_X_CSRF_TOKEN']) ? $_SERVER['HTTP_X_CSRF_TOKEN'] : null)
{
return Session::verifyToken($token, '', $check_csrf_token);
return Session::verifyToken((string)$token, '', $check_csrf_token);
}
elseif ($token = isset($_REQUEST['_rx_csrf_token']) ? $_REQUEST['_rx_csrf_token'] : null)
{
return Session::verifyToken($token, '', $check_csrf_token);
return Session::verifyToken((string)$token, '', $check_csrf_token);
}
elseif ($token = isset($_REQUEST['_fb_adsense_token']) ? $_REQUEST['_fb_adsense_token'] : null)
{

2
common/lang/en.php
View file

@ -373,7 +373,7 @@ $lang->use_and_display = 'Use and Display Vote List';
$lang->pc = 'PC';
$lang->mobile = 'Mobile';
$lang->mobile_view = 'Mobile View';
$lang->about_mobile_view = 'Mobile View will display the best layout when you access the website with your smart phone.';
$lang->about_mobile_view = 'Use different layouts and skins for PC and mobile.<br>Select &quot;No&quot; if you have installed an adaptive (responsive) theme that supports both PC and mobile.';
$lang->simple_view = 'Simple View';
$lang->detail_view = 'Detail View';
$lang->more = 'More';

2
common/lang/ja.php
View file

@ -311,7 +311,7 @@ $lang->play = 'プレイ';
$lang->use_and_display = '使用＋推奨履歴公開';
$lang->mobile = 'モバイル';
$lang->mobile_view = 'モバイルスキン使用';
$lang->about_mobile_view = 'スマートフォンなどを利用してサイトに接続した場合、モバイル画面に最適化されたレイアウトを使用するよう設定します。';
$lang->about_mobile_view = 'PCとモバイルにそれぞれ異なるレイアウトとスキンを使用します。<br>PCとモバイルの両方に対応する適応型(反応型)テーマを使用する場合は、"いいえ"を選択してください。';
$lang->simple_view = 'シンプルビュー';
$lang->detail_view = '詳細ビュー';
$lang->more = 'もっと見る';

2
common/lang/ko.php
View file

@ -374,7 +374,7 @@ $lang->use_and_display = '사용 + 추천내역 공개';
$lang->pc = 'PC';
$lang->mobile = '모바일';
$lang->mobile_view = '모바일 뷰 사용';
$lang->about_mobile_view = '스마트폰 등을 이용하여 접속할 때 모바일 화면에 최적화된 레이아웃을 이용하도록 합니다.';
$lang->about_mobile_view = 'PC와 모바일에 각각 다른 레이아웃과 스킨을 사용합니다.<br>PC와 모바일을 모두 지원하는 적응형(반응형) 테마를 사용하신다면 &quot;아니오&quot;를 선택하세요.';
$lang->simple_view = '간단보기';
$lang->detail_view = '상세보기';
$lang->more = '더보기';

2
common/lang/zh-CN.php
View file

@ -293,7 +293,7 @@ $lang->reload = '重新加载';
$lang->play = '播放';
$lang->use_and_display = '使用+专题刊物历史';
$lang->mobile_view = '开启移动版';
$lang->about_mobile_view = '为智能手机访问网站，提供最佳视觉效果。';
$lang->about_mobile_view = '在PC和手机上分别使用不同的布局和皮肤。<br>如果使用同时支持PC和手机的适应型（反应型）主题，请选择"不"。';
$lang->simple_view = '预览';
$lang->detail_view = '查看详情';
$lang->more = '更多';

2
common/lang/zh-TW.php
View file

@ -293,5 +293,5 @@ $lang->reload = '重新讀取';
$lang->play = '播放';
$lang->use_and_display = '使用+專題刊物歷史';
$lang->mobile_view = '手機瀏覽';
$lang->about_mobile_view = '使用手機瀏覽時將會顯示最適當的畫面。';
$lang->about_mobile_view = '在PC和手機上分別使用不同的佈局和皮膚。<br>如果使用同時支持PC和手機的適應型（反應型）主題，請選擇"不"。';
$lang->more = '更多';