Merge branch 'rhymix:master' into develop

common/constants.php

@@ -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);
 }

modules/board/board.view.php

@@ -916,9 +916,16 @@ class BoardView extends Board
 
 		// if the document is not granted, then back to the password input form
 		if($oDocument->isExists() && !$oDocument->isGranted())
+		{
+			if ($oDocument->getMemberSrl())
+			{
+				return $this->dispBoardMessage('msg_not_permitted');
+			}
+			else
 			{
 				return $this->setTemplateFile('input_password_form');
 			}
+		}
 
 		if(!$oDocument->isExists())
 		{
@@ -1032,9 +1039,16 @@ class BoardView extends Board
 
 		// if the document is not granted, then back to the password input form
 		if(!$oDocument->isGranted())
+		{
+			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,8 +1234,15 @@ class BoardView extends Board
 		if(!$oComment->isGranted())
 		{
 			Context::set('document_srl', $oComment->get('document_srl'));
+			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,8 +1318,15 @@ class BoardView extends Board
 		if(!$oComment->isGranted())
 		{
 			Context::set('document_srl', $oComment->get('document_srl'));
+			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)
 		{

modules/document/document.class.php

@@ -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');
 		}
 	}
 

modules/member/member.class.php

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

modules/page/m.skins/default/skin.xml

@@ -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>

modules/page/skins/default/content.html

@@ -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}

modules/page/skins/default/skin.xml

@@ -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>