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 2026-01-30 14:57:37 +09:00 • committed by GitHub
commit ba8bbda74b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 66 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/UA.php
View file

@ -171,7 +171,7 @@ class UA
}
// Look for common search engine names and the 'bot' keyword.
if (preg_match('/bot|spider|crawler|archiver|wget|curl|php|slurp|wordpress|facebook|external(agent|fetcher)|teoma|yeti|daum|apachebench|googleother|mediapartners-google|[(<+]https?:|@/i', $ua))
if (preg_match('/bot|spider|crawler|archiver|wget|curl|php|slurp|wordpress|facebook|external(agent|fetcher)|teoma|yeti|daum\b|apachebench|googleother|mediapartners-google|[(<+]https?:|@/i', $ua))
{
return self::$_robot_cache[$ua] = true;
}

14
common/js/common.js
View file

@ -1580,9 +1580,10 @@ function doDocumentLoad(obj) {
*
* @param int document_srl
* @param string module
* @param string mid
* @return void
*/
function doDocumentSelect(document_srl, module) {
function doDocumentSelect(document_srl, module, mid) {
if (!opener) {
window.close();
return;
@ -1590,6 +1591,9 @@ function doDocumentSelect(document_srl, module) {
if (module === undefined) {
module = 'document';
}
if (mid === undefined) {
mid = current_mid;
}
// 게시글을 가져와서 등록하기
if (module === 'page') {
@ -1602,9 +1606,13 @@ function doDocumentSelect(document_srl, module) {
}
opener.location.href = url;
} else {
opener.location.href = opener.current_url.setQuery('act', 'dispBoardWrite').setQuery('document_srl', document_srl);
opener.location.href = opener.current_url.setQuery('mid', mid).setQuery('act', 'dispBoardWrite').setQuery('document_srl', document_srl);
}
window.close();
// 딜레이 후 창 닫기
setTimeout(function() {
window.close();
}, 100);
}
/**

1
common/lang/en.php
View file

@ -307,6 +307,7 @@ $lang->confirm_vote = 'Are you sure you want to upvote?';
$lang->confirm_delete = 'Are you sure you want to delete?';
$lang->confirm_restore = 'Are you sure you want to restore?';
$lang->confirm_move = 'Are you sure you want to move?';
$lang->confirm_trash = 'Are you sure you want to move to trash?';
$lang->confirm_reset = 'Are you sure you want to reset?';
$lang->confirm_leave = 'Are you sure you want to delete your account?';
$lang->confirm_update = 'Are you sure you want to update?';

1
common/lang/ko.php
View file

@ -307,6 +307,7 @@ $lang->confirm_vote = '추천하시겠습니까?';
$lang->confirm_delete = '삭제하시겠습니까?';
$lang->confirm_restore = '복원하시겠습니까?';
$lang->confirm_move = '이동하시겠습니까?';
$lang->confirm_trash = '휴지통으로 이동하시겠습니까?';
$lang->confirm_reset = '초기화하시겠습니까?';
$lang->confirm_leave = '탈퇴하시겠습니까?';
$lang->confirm_update = '수정하시겠습니까?';

1
common/legacy.php
View file

@ -875,6 +875,7 @@ function getDestroyXeVars($vars)
*/
function getNumberingPath($no, int $size = 3): string
{
$no = intval($no);
$mod = pow(10, $size);
$output = sprintf('%0' . $size . 'd/', intval($no % $mod));
if($no >= $mod)