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 develop

Browse source
This commit is contained in:
Lastorder 2024-10-19 10:03:03 +09:00 • committed by GitHub
commit af21a9fb8a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 36 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/constants.php
View file

@ -3,7 +3,7 @@
/**
* RX_VERSION is the version number of the Rhymix CMS.
*/
define('RX_VERSION', '2.1.17');
define('RX_VERSION', '2.1.18');
/**
* RX_MICROTIME is the startup time of the current script, in microseconds since the Unix epoch.
@ -85,7 +85,7 @@ else
/*
* RX_SSL is true if the current request uses SSL/TLS.
*/
if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
{
define('RX_SSL', true);
}

36
modules/board/board.view.php
View file

@ -917,7 +917,14 @@ class BoardView extends Board
// if the document is not granted, then back to the password input form
if($oDocument->isExists() && !$oDocument->isGranted())
{
return $this->setTemplateFile('input_password_form');
if ($oDocument->getMemberSrl())
{
return $this->dispBoardMessage('msg_not_permitted');
}
else
{
return $this->setTemplateFile('input_password_form');
}
}
if(!$oDocument->isExists())
@ -1033,7 +1040,14 @@ class BoardView extends Board
// if the document is not granted, then back to the password input form
if(!$oDocument->isGranted())
{
return $this->setTemplateFile('input_password_form');
if ($oDocument->getMemberSrl())
{
return $this->dispBoardMessage('msg_not_permitted');
}
else
{
return $this->setTemplateFile('input_password_form');
}
}
if($this->module_info->protect_document_regdate > 0 && $this->grant->manager == false)
@ -1220,7 +1234,14 @@ class BoardView extends Board
if(!$oComment->isGranted())
{
Context::set('document_srl', $oComment->get('document_srl'));
return $this->setTemplateFile('input_password_form');
if ($oComment->getMemberSrl())
{
return $this->dispBoardMessage('msg_not_permitted');
}
else
{
return $this->setTemplateFile('input_password_form');
}
}
if($this->module_info->protect_comment_regdate > 0 && $this->grant->manager == false)
@ -1297,7 +1318,14 @@ class BoardView extends Board
if(!$oComment->isGranted())
{
Context::set('document_srl', $oComment->get('document_srl'));
return $this->setTemplateFile('input_password_form');
if ($oComment->getMemberSrl())
{
return $this->dispBoardMessage('msg_not_permitted');
}
else
{
return $this->setTemplateFile('input_password_form');
}
}
if($this->module_info->protect_comment_regdate > 0 && $this->grant->manager == false)

2
modules/document/document.class.php
View file

@ -231,7 +231,7 @@ class Document extends ModuleObject
}
if(!$oDB->isColumnExists('document_extra_keys', 'var_options'))
{
$oDB->addColumn('document_extra_keys', 'var_options', 'text', '', '', false, 'var_default');
$oDB->addColumn('document_extra_keys', 'var_options', 'text', null, null, false, 'var_default');
}
}

3
modules/member/member.class.php
View file

@ -427,10 +427,7 @@ class Member extends ModuleObject
}
else
{
var_dump($result);
var_dump(Rhymix\Framework\Debug::getErrors());
$oDB->rollback();
exit;
}
}
else

21
modules/page/m.skins/default/skin.xml
View file

@ -44,26 +44,5 @@
<title xml:lang="jp">非表示</title>
</options>
</var>
<var name="display_popupmenu" type="radio" default="show">
<title xml:lang="ko">팝업메뉴 표시</title>
<title xml:lang="en">Display popup menu</title>
<title xml:lang="jp">ポップアップメニュー表示</title>
<description xml:lang="ko">
문서 하단의 팝업 메뉴를 표시 할지 선택합니다.
</description>
<description xml:lang="jp">
ドキュメント下段のポップアップメニューの表示可否を選択します。
</description>
<options value="show">
<title xml:lang="ko">출력</title>
<title xml:lang="en">Show</title>
<title xml:lang="jp">表示</title>
</options>
<options value="hide">
<title xml:lang="ko">출력하지 않음</title>
<title xml:lang="en">Hide</title>
<title xml:lang="jp">非表示</title>
</options>
</var>
</extra_vars>
</skin>

2
modules/page/skins/default/content.html
View file

@ -1,6 +1,6 @@
<block cond="$oDocument">
<h1 cond="($module_info->display_title ?? '') !== 'hide'">{$oDocument->getTitle()}</h1>
{$oDocument->getContent(($module_info->display_popupmenu ?? '') !== 'hide')}
{$oDocument->getContent(false)}
</block>
<block cond="!$oDocument">
{$lang->none_content}

21
modules/page/skins/default/skin.xml
View file

@ -44,26 +44,5 @@
<title xml:lang="jp">非表示</title>
</options>
</var>
<var name="display_popupmenu" type="radio" default="show">
<title xml:lang="ko">팝업메뉴 표시</title>
<title xml:lang="en">Display popup menu</title>
<title xml:lang="jp">ポップアップメニュー表示</title>
<description xml:lang="ko">
문서 하단의 팝업 메뉴를 표시 할지 선택합니다.
</description>
<description xml:lang="jp">
ドキュメント下段のポップアップメニューの表示可否を選択します。
</description>
<options value="show">
<title xml:lang="ko">출력</title>
<title xml:lang="en">Show</title>
<title xml:lang="jp">表示</title>
</options>
<options value="hide">
<title xml:lang="ko">출력하지 않음</title>
<title xml:lang="en">Hide</title>
<title xml:lang="jp">非表示</title>
</options>
</var>
</extra_vars>
</skin>