From 75ea89e2037bda36f55427c2252fb8a74c02515c Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Tue, 28 Nov 2017 17:48:38 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=84=9C=20=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EC=9D=98=20=EC=95=84=EC=9D=B4=EC=BD=98=EC=9D=84=20=EC=8A=A4?=
 =?UTF-8?q?=ED=82=A8=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95=ED=95=A0=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/xpressengine/xe-core/pull/2172
---
 .../document/document.admin.controller.php    |   8 +++++
 modules/document/document.admin.view.php      |   7 +++++
 modules/document/document.item.php            |  20 ++++++++++--
 modules/document/document.model.php           |  29 +++++++++++++++---
 modules/document/lang/en.php                  |   2 ++
 modules/document/lang/ko.php                  |   4 +++
 modules/document/tpl/document_config.html     |  22 +++++++++++++
 modules/document/tpl/icons/default/file.gif   | Bin 0 -> 183 bytes
 modules/document/tpl/icons/default/image.gif  | Bin 0 -> 127 bytes
 modules/document/tpl/icons/default/movie.gif  | Bin 0 -> 134 bytes
 modules/document/tpl/icons/default/new.gif    | Bin 0 -> 126 bytes
 modules/document/tpl/icons/default/secret.gif | Bin 0 -> 120 bytes
 modules/document/tpl/icons/default/update.gif | Bin 0 -> 128 bytes
 13 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 modules/document/tpl/icons/default/file.gif
 create mode 100644 modules/document/tpl/icons/default/image.gif
 create mode 100644 modules/document/tpl/icons/default/movie.gif
 create mode 100644 modules/document/tpl/icons/default/new.gif
 create mode 100644 modules/document/tpl/icons/default/secret.gif
 create mode 100644 modules/document/tpl/icons/default/update.gif

diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index ab7944110..0d9da1833 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -471,10 +471,18 @@ class documentAdminController extends document
 		$oDocumentModel = getModel('document');
 		$config = $oDocumentModel->getDocumentConfig();
 		$config->view_count_option = Context::get('view_count_option');
+		$config->icons = Context::get('icons');
+		$config->micons = Context::get('micons');
 
 		// Insert by creating the module Controller object
 		$oModuleController = getController('module');
 		$output = $oModuleController->insertModuleConfig('document',$config);
+		if(!$output->toBool())
+		{
+			return $output;
+		}
+
+		$this->setMessage('success_updated');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminConfig');
 		return $this->setRedirectUrl($returnUrl, $output);
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 76a827b7d..36bac493d 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -148,6 +148,13 @@ class documentAdminView extends document
 		$config = $oDocumentModel->getDocumentConfig();
 		Context::set('config',$config);
 
+		$oModuleModel = getModel('module');
+		$pcIconSkinList = $oModuleModel->getSkins($this->module_path . 'tpl', 'icons');
+		$mobileIconSkinList = $oModuleModel->getSkins($this->module_path . 'tpl', 'micons');
+
+		Context::set('pcIconSkinList', $pcIconSkinList);
+		Context::set('mobileIconSkinList', $mobileIconSkinList);
+
 		// Set the template file
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('document_config');
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index a0803496a..276643a5e 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -1188,9 +1188,23 @@ class documentItem extends Object
 	 */
 	function printExtraImages($time_check = 43200)
 	{
-		if(!$this->document_srl) return;
-		// Get the icon directory
-		$path = sprintf('%s%s',getUrl(), 'modules/document/tpl/icons/');
+		if (!$this->document_srl)
+		{
+			return;
+		}
+
+		$oDocumentModel = getModel('document');
+		$documentConfig = $oDocumentModel->getDocumentConfig();
+
+		if(Mobile::isFromMobilePhone())
+		{
+			$iconSkin = $documentConfig->micons;
+		}
+		else
+		{
+			$iconSkin = $documentConfig->icons;
+		}
+		$path = sprintf('%s%s',getUrl(), "modules/document/tpl/icons/$iconSkin/");
 
 		$buffs = $this->getExtraImages($time_check);
 		if(!count($buffs)) return;
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 194e2bdb0..cb6c2a3d3 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -10,6 +10,8 @@
  */
 class documentModel extends document
 {
+	private $documentConfig = NULL;
+
 	/**
 	 * Initialization
 	 * @return void
@@ -935,15 +937,18 @@ class documentModel extends document
 	 */
 	function getDocumentConfig()
 	{
-		if(!$GLOBALS['__document_config__'])
+		if ($this->documentConfig === NULL)
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('document');
 
-			if(!$config) $config = new stdClass();
-			$GLOBALS['__document_config__'] = $config;
+			if (!$config)
+			{
+				$config = new stdClass();
+			}
+			$this->documentConfig = $config;
 		}
-		return $GLOBALS['__document_config__'];
+		return $this->documentConfig;
 	}
 
 	/**
@@ -1610,6 +1615,22 @@ class documentModel extends document
 
 		return false;
 	}
+
+	function getDocumentExtraImagePath()
+	{
+		$documentConfig = getModel('document')->getDocumentConfig();
+		if(Mobile::isFromMobilePhone())
+		{
+			$iconSkin = $documentConfig->micons;
+		}
+		else
+		{
+			$iconSkin = $documentConfig->icons;
+		}
+		$path = sprintf('%s%s',getUrl(), "modules/document/tpl/icons/$iconSkin/");
+
+		return $path;
+	}
 }
 /* End of file document.model.php */
 /* Location: ./modules/document/document.model.php */
diff --git a/modules/document/lang/en.php b/modules/document/lang/en.php
index b9f9787f1..6b1058408 100644
--- a/modules/document/lang/en.php
+++ b/modules/document/lang/en.php
@@ -10,6 +10,8 @@ $lang->category_color = 'Category Font Color';
 $lang->expand = 'Expand';
 $lang->category_group_srls = 'Accessable Group';
 $lang->cmd_make_child = 'Add Child Category';
+$lang->cmd_pc_icon_setting = 'PC icon setting';
+$lang->cmd_mobile_icon_setting = 'Mobile icon setting';
 $lang->cmd_enable_move_category = 'Change category position (Select a category and drag it to the position you want.)';
 $lang->about_category_title = 'Please enter a category name.';
 $lang->about_expand = 'Select this option, and they will stay expanded.';
diff --git a/modules/document/lang/ko.php b/modules/document/lang/ko.php
index f1f9b5f49..95085bf40 100644
--- a/modules/document/lang/ko.php
+++ b/modules/document/lang/ko.php
@@ -6,6 +6,8 @@ $lang->view_count_option_some = '일부 계산';
 $lang->view_count_option_once = '중복 금지';
 $lang->view_count_option_none = '계산 안함';
 $lang->cmd_delete_all_thumbnail = '섬네일 모두 삭제';
+$lang->cmd_pc_icon_setting = 'PC아이콘 설정';
+$lang->cmd_mobile_icon_setting = '모바일 아이콘 설정';
 $lang->title_bold = '제목 굵게';
 $lang->title_color = '제목 색깔';
 $lang->new_document_count = '새 글';
@@ -21,6 +23,8 @@ $lang->about_view_count_option = '조회수설정에 따라 중복 조회수 카
 $lang->about_expand = '선택하면 늘 펼쳐진 상태로 있게 합니다.';
 $lang->about_category_group_srls = '선택한 그룹만 현재 카테고리를 지정할 수 있도록 합니다.';
 $lang->about_category_color = '분류 폰트색깔을 지정합니다. 예) red 또는 #ff0000';
+$lang->about_cmd_pc_icon_setting = '게시판 새로운 글 혹은 수정되었을 때 출력하는 아이콘입니다. 기본값은 default 입니다.';
+$lang->about_cmd_mobile_icon_setting = '게시판 새로운 글 혹은 수정되었을 때 출력하는 아이콘입니다. 기본값은 default 입니다.';
 $lang->cmd_search_next = '계속 검색';
 $lang->cmd_temp_save = '임시 저장';
 $lang->cmd_toggle_checked_document = '선택항목 반전';
diff --git a/modules/document/tpl/document_config.html b/modules/document/tpl/document_config.html
index 06c545e6d..0f0781b40 100644
--- a/modules/document/tpl/document_config.html
+++ b/modules/document/tpl/document_config.html
@@ -19,6 +19,28 @@
 			</div>
 		</div>
 	</div>
+	<div class="x_control-group">
+		<label class="x_control-label" for="icons">{$lang->cmd_pc_icon_setting}</label>
+		<div class="x_controls">
+			<select name="icons" id="icons">
+				<option value="">{$lang->notuse}</option>
+				<option loop="$pcIconSkinList => $key, $val" value="{$val->title}" selected="selected"|cond="$config->icons == $val->title">{$val->title}</option>
+			</select>
+			<a href="#icons_help" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
+			<p id="icons_help" class="x_help-block" hidden>{$lang->about_cmd_pc_icon_setting}</p>
+		</div>
+	</div>
+	<div class="x_control-group">
+		<label class="x_control-label" for="micons">{$lang->cmd_mobile_icon_setting}</label>
+		<div class="x_controls">
+			<select name="micons" id="micons">
+				<option value="">{$lang->notuse}</option>
+				<option loop="$pcIconSkinList => $key, $val" value="{$val->title}" selected="selected"|cond="$config->micons == $val->title">{$val->title}</option>
+			</select>
+			<a href="#micons_help" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
+			<p id="micons_help" class="x_help-block" hidden>{$lang->about_cmd_mobile_icon_setting}</p>
+		</div>
+	</div>
 
 	<div class="btnArea x_clearfix">
 		<span class="x_pull-right" style="margin-left:10px;"><input class="btn" type="button" value="{$lang->cmd_delete_all_thumbnail}" onclick="doDeleteAllThumbnail()"/></span>
diff --git a/modules/document/tpl/icons/default/file.gif b/modules/document/tpl/icons/default/file.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7d07680100b10b586b84a2890600b75f6334f54c
GIT binary patch
literal 183
zcmZ?wbhEHb<YwSz_#(*QlhhcN)16Q@#W|{S%JPE~m+b49x9j(xe^(!Vc>m?+grx@`
zz4}_#y&}7De#6vF|NsA=zVaXgDM0Zj3o8SIAcGD_6Ua^mRucu4zGRV!UaRIEdn{GJ
uV_6d0?X&K6#pC~W6CXI}$gv!1DVoXA!O*>;gt0<tUBnTFqpd9r4AubG);$*h

literal 0
HcmV?d00001

diff --git a/modules/document/tpl/icons/default/image.gif b/modules/document/tpl/icons/default/image.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9e16ba62045b9e7edbb31e21d81a40296b98f23b
GIT binary patch
literal 127
zcmZ?wbh9u|<YC}u_{_kt<MscJ;|y^N{$?!yfAFc%w3B~k+-F#R=D&Ua|Awvqfne3n
zvkXW;2gC;HWneKWIO(~3mxZ^ffR}rPMzldmf`?w0phP^=y0wl1g-+5nfp-{Yu`5mx
TZIYhZFk?~bys0Zxm>8@9<Hs*h

literal 0
HcmV?d00001

diff --git a/modules/document/tpl/icons/default/movie.gif b/modules/document/tpl/icons/default/movie.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4933e45af49117e26235f123c64087cae2745800
GIT binary patch
literal 134
zcmZ?wbhEHb<YC}u_{_^NW%<F9j>XxH^UJzdI7d}ZSb8v_Y)Zq_O<_6R9rJeiBsKp3
z|9|?*gA6dB_>+Z|fq|Dn2P6P8gMr0(!$!~5EUK?<C;wL{?m6z%cX<I{_s(Tbcl0(I
gNbb1!>{#!g?)e3aG^F}9n~GNQ80d+5voKf#0Dg)y2><{9

literal 0
HcmV?d00001

diff --git a/modules/document/tpl/icons/default/new.gif b/modules/document/tpl/icons/default/new.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0d2aad44a70d152e28bfe16c0c47db4e5812627c
GIT binary patch
literal 126
zcmZ?wbhEHb<YwSz_{_ubyNuyaGsEv%hX2zT{&q6_Dq#4Y!0;oL;s0cYpIHq5`WXKI
z|IdH~6o0a?GBEHk=zzpPW-zd5Pw4er>0*(6boX~|#kQmbJ(Wx@rx%+HCQNcjY~Q|C
Tz2?3Afdvy1HKclbI2fz}ivKEo

literal 0
HcmV?d00001

diff --git a/modules/document/tpl/icons/default/secret.gif b/modules/document/tpl/icons/default/secret.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4e752dee82f5d66a79e450a1fcbe404caf29f1c1
GIT binary patch
literal 120
zcmZ?wbhEHb<YeGx_{_slH)Uhn?Clel9!#yC*|TtOZ1Kd<?9Q^DmA)y>?s2twEerqu
z|IdH~6o0a?GBEHk=zzpPW-zd*PVjVWoul$xn(5gARoRqGt&CNC-qw3uV|0pgFSzx+
NshR)hKs*bBH2~O~DA)i1

literal 0
HcmV?d00001

diff --git a/modules/document/tpl/icons/default/update.gif b/modules/document/tpl/icons/default/update.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7a8d21f361d6928c57b4f6ae9013c61d43f8dc2d
GIT binary patch
literal 128
zcmZ?wbhEHb<YwSz_{_sl6nDL);CZs&sjjj&)0)56Wj(4$xswxdX>!At{_2nE!Ds*f
z|IdH~6o0a?GBEHk=zzpPW-zemPMGMq(#7KSk=@@<E3_pgOk#{$qquwDv7|Gfc<vln
W^!U%i{|>DM7AYKk9xBRA4AuahHZpGj

literal 0
HcmV?d00001