Merge branch 'rhymix:master' into develop

modules/board/board.view.php

@@ -289,9 +289,6 @@ class BoardView extends Board
 					}
 				}
 
-				// check the manage grant
-				if($this->grant->manager) $oDocument->setGrant();
-
 				// if the consultation function is enabled, and the document is not a notice
 				if($this->consultation && !$oDocument->isNotice())
 				{
@@ -904,7 +901,7 @@ class BoardView extends Board
 				}
 			}
 
-			if ($this->module_info->protect_admin_content_update !== 'N')
+			if (($this->module_info->protect_admin_content_update ?? 'N') !== 'N')
 			{
 				$member_info = MemberModel::getMemberInfo($oDocument->get('member_srl'));
 				if(isset($member_info->is_admin) && $member_info->is_admin == 'Y' && $this->user->is_admin != 'Y')

modules/board/conf/module.xml

@@ -116,21 +116,21 @@
 		<action name="dispBoardAdminContent" type="view" admin_index="true" menu_name="board" menu_index="true" />
 		<action name="dispBoardAdminInsertBoard" type="view" setup_index="true" menu_name="board" />
 		<action name="dispBoardAdminDeleteBoard" type="view" menu_name="board" />
-		<action name="dispBoardAdminBoardInfo" type="view" permission="manager" menu_name="board" />
-		<action name="dispBoardAdminCategoryInfo" type="view" permission="manager" menu_name="board" />
-		<action name="dispBoardAdminExtraVars" type="view" permission="manager" menu_name="board" />
-		<action name="dispBoardAdminGrantInfo" type="view" permission="manager" menu_name="board" />
-		<action name="dispBoardAdminBoardAdditionSetup" type="view" permission="manager" menu_name="board" />
-		<action name="dispBoardAdminSkinInfo" type="view" permission="manager" menu_name="board" />
-		<action name="dispBoardAdminMobileSkinInfo" type="view" permission="manager" menu_name="board" />
+		<action name="dispBoardAdminBoardInfo" type="view" permission="manager:config:*" menu_name="board" />
+		<action name="dispBoardAdminCategoryInfo" type="view" permission="manager:config:*" menu_name="board" />
+		<action name="dispBoardAdminExtraVars" type="view" permission="manager:config:*" menu_name="board" />
+		<action name="dispBoardAdminGrantInfo" type="view" permission="manager:config:*" menu_name="board" />
+		<action name="dispBoardAdminBoardAdditionSetup" type="view" permission="manager:config:*" menu_name="board" />
+		<action name="dispBoardAdminSkinInfo" type="view" permission="manager:config:*" menu_name="board" />
+		<action name="dispBoardAdminMobileSkinInfo" type="view" permission="manager:config:*" menu_name="board" />
 
 		<action name="getBoardAdminSimpleSetup" type="model" simple_setup_index="true" />
 
-		<action name="procBoardAdminInsertBoard" type="controller" permission="manager" check_var="module_srl" ruleset="insertBoard" />
-		<action name="procBoardAdminDeleteBoard" type="controller" permission="manager" check_var="module_srl" />
+		<action name="procBoardAdminInsertBoard" type="controller" permission="manager:config:*" check_var="module_srl" ruleset="insertBoard" />
+		<action name="procBoardAdminDeleteBoard" type="controller" permission="manager:config:*" check_var="module_srl" />
 		<action name="procBoardAdminUpdateBoard" type="controller" ruleset="insertBoardForBasic" />
 		<action name="procBoardAdminInsertCombinedConfig" type="controller" />
-		<action name="procBoardAdminSaveCategorySettings" type="controller" permission="manager" check_var="module_srl" ruleset="saveCategorySettings" />
+		<action name="procBoardAdminSaveCategorySettings" type="controller" permission="manager:config:*" check_var="module_srl" ruleset="saveCategorySettings" />
 	</actions>
 	<eventHandlers>
 		<eventHandler after="member.getMemberMenu" class="controller" method="triggerMemberMenu" />

modules/board/lang/en.php

@@ -97,7 +97,7 @@ $lang->cmd_do_not_message = 'Never';
 $lang->delete_placeholder = 'Delete Placeholder';
 $lang->msg_document_notify_mail = '[%s] The new post : %s';
 $lang->cmd_board_combined_board = 'Combined Board';
-$lang->about_board_combined_board = 'You can use this board to view documents from other boards. Press the Ctrl key and click to select multiple boards.<br />Caution: view permissions for the current board will apply to all affected documents.';
+$lang->about_board_combined_board = 'You can use this board to view documents from other boards. Press the Ctrl key and click to select multiple boards.<br /><span style="color:red">Warning: permissions for the current board will apply to all affected documents and comments.</span>';
 $lang->cmd_board_include_modules = 'Include Boards';
 $lang->cmd_board_include_modules_none = '(None)';
 $lang->cmd_board_include_days = 'Include Duration';

modules/board/lang/ko.php

@@ -109,7 +109,7 @@ $lang->cmd_document_vote_user = '이 글의 추천인 목록';
 $lang->cmd_comment_vote_user = '이 댓글의 추천인 목록';
 $lang->msg_not_target = '문서 또는 댓글의 추천인목록만 조회가능합니다.';
 $lang->cmd_board_combined_board = '통합 게시판';
-$lang->about_board_combined_board = '다른 게시판의 글을 모아서 볼 수 있습니다. 여러 게시판을 선택하려면 Ctrl 키를 누르고 클릭하세요.<br />주의: 현재 게시판의 읽기 권한 설정이 모든 글에 적용됩니다.';
+$lang->about_board_combined_board = '다른 게시판의 글을 모아서 볼 수 있습니다. 여러 게시판을 선택하려면 Ctrl 키를 누르고 클릭하세요.<br /><span style="color:red">주의: 현재 게시판의 권한 설정이 모든 글에 적용됩니다.</span>';
 $lang->cmd_board_include_modules = '포함할 게시판 선택';
 $lang->cmd_board_include_modules_none = '(포함하지 않음)';
 $lang->cmd_board_include_days = '포함할 기간';

modules/board/skins/xedition/_comment.html

@@ -91,8 +91,10 @@
 			</span>
 			<input cond="$is_logged" type="checkbox" name="notify_message" value="Y" id="notify_message" class="iCheck" />
 			<label cond="$is_logged" for="notify_message">{$lang->notify}</label>
-			<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" class="iCheck" />
-			<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
+			<!--@if(isset($module_info->secret) && $module_info->secret === 'Y')-->
+				<input type="checkbox" name="is_secret" value="Y" id="is_secret" class="iCheck" />
+				<label for="is_secret">{$lang->secret}</label>
+			<!--@endif-->
 		</div>
 		<div class="write_captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('comment')">
 			{$captcha}

modules/board/skins/xedition/comment_form.html

@@ -29,8 +29,10 @@
 			</span>
 			<input cond="$is_logged" type="checkbox" name="notify_message" value="Y" checked="checked"|cond="$oComment->get('notify_message')=='Y'" id="notify_message" class="iCheck" />
 			<label cond="$is_logged" for="notify_message">{$lang->notify}</label>
-			<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" checked="checked"|cond="$oComment->get('is_secret')=='Y'" class="iCheck" />
-			<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
+			<!--@if(isset($module_info->secret) && $module_info->secret === 'Y')-->
+				<input type="checkbox" name="is_secret" value="Y" id="is_secret" checked="checked"|cond="$oComment->get('is_secret')=='Y'" class="iCheck" />
+				<label for="is_secret">{$lang->secret}</label>
+			<!--@endif-->
 		</div>
 		<div class="write_captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('comment')">
 			{$captcha}

modules/board/tpl/index.html

@@ -22,7 +22,7 @@
 	</thead>
 	<tbody>
 		<tr loop="$board_list => $no,$val">
-			<td>{$no}</td>
+			<td>{$val->module_srl}</td>
 			<td>
 				<block cond="!$val->module_category_srl">
 					<block cond="$val->site_srl">{$lang->virtual_site}</block>
@@ -32,7 +32,7 @@
 			</td>
 			<td class="domain_prefix"><span class="domain">{$val->domain ?? ''}</span>{\RX_BASEURL}</td>
 			<td>{$val->mid}</td>
-			<td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}">{$val->browser_title}</a></td>
+			<td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}" target="_blank">{$val->browser_title}</a></td>
 			<td>{zdate($val->regdate,"Y-m-d")}</td>
 			<td>
 				<a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}"><i class="x_icon-cog"></i> {$lang->cmd_setup}</a> &nbsp;