Merge remote-tracking branch 'upstream/master'

modules/board/board.admin.view.php

@@ -89,6 +89,7 @@ class BoardAdminView extends Board {
 
 		$output = executeQueryArray('board.getBoardList', $args);
 		ModuleModel::syncModuleToSite($output->data);
+		ModuleModel::addModuleExtraVars($output->data);
 
 		// get the skins path
 		$oModuleModel = getModel('module');

modules/board/board.controller.php

@@ -842,6 +842,23 @@ class BoardController extends Board
 		$oMemberController->addMemberPopupMenu($url, 'cmd_view_own_document', '', 'self', 'board_own_document');
 	}
 
+	/**
+	 * Trigger called at module copy
+	 */
+	public function triggerCopyModule(&$obj)
+	{
+		$board_config = ModuleModel::getModulePartConfig('board', $obj->originModuleSrl);
+
+		$oModuleController = ModuleController::getInstance();
+		if (is_array($obj->moduleSrlList))
+		{
+			foreach ($obj->moduleSrlList as $module_srl)
+			{
+				$oModuleController->insertModulePartConfig('board', $module_srl, $board_config);
+			}
+		}
+	}
+
 	/**
 	 * Create an anonymous nickname.
 	 *

modules/board/conf/module.xml

@@ -130,6 +130,7 @@
 	<eventHandlers>
 		<eventHandler after="member.getMemberMenu" class="controller" method="triggerMemberMenu" />
 		<eventHandler after="menu.getModuleListInSitemap" class="model" method="triggerModuleListInSitemap" />
+		<eventHandler after="module.procModuleAdminCopyModule" class="controller" method="triggerCopyModule" />
 	</eventHandlers>
 	<menus>
 		<menu name="board" type="all">

modules/board/lang/en.php

@@ -1,5 +1,6 @@
 <?php
 $lang->board = 'Board';
+$lang->board_special_features = 'Features';
 $lang->except_notice = 'Exclude Notices';
 $lang->use_bottom_list = 'Display Bottom List';
 $lang->customize_bottom_list = 'Customize Bottom List';

modules/board/lang/ko.php

@@ -1,5 +1,6 @@
 <?php
 $lang->board = '게시판';
+$lang->board_special_features = '특이사항';
 $lang->except_notice = '공지사항 제외';
 $lang->use_bottom_list = '하단목록 표시';
 $lang->customize_bottom_list = '하단목록 설정';

modules/board/tpl/index.html

@@ -15,6 +15,7 @@
 			<th scope="col" class="domain_prefix">{$lang->domain}&thinsp;/</th>
 			<th scope="col">{$lang->url}</th>
 			<th scope="col">{$lang->browser_title}</th>
+			<th scope="col">{$lang->board_special_features}</th>
 			<th scope="col">{$lang->regdate}</th>
 			<th scope="col">{$lang->cmd_edit}</th>
 			<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
@@ -40,6 +41,17 @@
 			</td>
 			<td>{$val->mid}</td>
 			<td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}" target="_blank">{$val->browser_title}</a></td>
+			<td>
+				<!--@if($val->consultation === 'Y')-->
+					<span title="{$lang->consultation}"><i class="xi-headset"></i></span>
+				<!--@end-->
+				<!--@if($val->use_anonymous === 'Y')-->
+					<span title="{$lang->use_anonymous}"><i class="xi-user-lock"></i></span>
+				<!--@end-->
+				<!--@if(!empty($val->include_modules))-->
+					<span title="{$lang->cmd_board_combined_board}"><i class="xi-file-add"></i></span>
+				<!--@end-->
+			</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;