From 996ee8feaf103f65a4923e0eea4567e67c1e6882 Mon Sep 17 00:00:00 2001
From: qw5414 <sosifam@070805.co.kr>
Date: Thu, 18 Feb 2016 10:33:27 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=A0=88?=
 =?UTF-8?q?=EB=B2=A8=20=EC=95=84=EC=9D=B4=EC=BD=98=EC=97=90=20=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=A4=91=EB=B3=B5=20=EB=B0=A9=EC=A7=80=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/point_level_icon/conf/info.xml         | 25 +++++++++++++++++++
 .../point_level_icon.addon.php                |  4 ++-
 .../point_level_icon/point_level_icon.lib.php | 14 ++++++-----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/addons/point_level_icon/conf/info.xml b/addons/point_level_icon/conf/info.xml
index 174175fca..0ca3b2f22 100644
--- a/addons/point_level_icon/conf/info.xml
+++ b/addons/point_level_icon/conf/info.xml
@@ -59,4 +59,29 @@
         <name xml:lang="ru">NAVER</name>
         <name xml:lang="zh-TW">NAVER</name>
     </author>
+
+	<extra_vars>
+		<var name="icon_duplication" type="select">
+			<title xml:lang="ko">아이콘 중복 방지 설정</title>
+			<description xml:lang="ko">아이콘 중복 방지 설정을 적용할 경우 그룹아이콘이 있을때 포인트 레벨 아이콘은 띄우지 않도록 합니다.</description>
+			<options value="">
+				<title xml:lang="ko">적용하지 않음</title>
+				<title xml:lang="zh-CN">不启用</title>
+				<title xml:lang="jp">적용하지 않음</title>
+				<title xml:lang="zh-TW">關閉</title>
+				<title xml:lang="en">Not apply</title>
+				<title xml:lang="ru">Not apply</title>
+				<title xml:lang="vi">Không áp dụng</title>
+			</options>
+			<options value="Y">
+				<title xml:lang="ko">적용</title>
+				<title xml:lang="zh-CN">启用</title>
+				<title xml:lang="jp">적용</title>
+				<title xml:lang="zh-TW">開啟</title>
+				<title xml:lang="en">Apply</title>
+				<title xml:lang="ru">Apply</title>
+				<title xml:lang="vi">Áp dụng</title>
+			</options>
+		</var>
+	</extra_vars>
 </addon>
diff --git a/addons/point_level_icon/point_level_icon.addon.php b/addons/point_level_icon/point_level_icon.addon.php
index 69f7eb8d9..fd3b2919e 100644
--- a/addons/point_level_icon/point_level_icon.addon.php
+++ b/addons/point_level_icon/point_level_icon.addon.php
@@ -19,7 +19,9 @@ if($called_position != "before_display_content" || Context::get('act') == 'dispP
 
 require_once(_XE_PATH_ . 'addons/point_level_icon/point_level_icon.lib.php');
 
-$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
+$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', function($matches) use($addon_info) {
+	return pointLevelIconTrans($matches, $addon_info);
+}, $output);
 if($temp_output)
 {
 	$output = $temp_output;
diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php
index 9dd9e3054..982259d21 100644
--- a/addons/point_level_icon/point_level_icon.lib.php
+++ b/addons/point_level_icon/point_level_icon.lib.php
@@ -4,7 +4,7 @@
 /**
  * @brief Function to change point icon.
  */
-function pointLevelIconTrans($matches)
+function pointLevelIconTrans($matches, $addon_info)
 {
 	$member_srl = $matches[3];
 	// If anonymous or not member_srl go to Hide Point Icon
@@ -15,12 +15,14 @@ function pointLevelIconTrans($matches)
 
 	$orig_text = preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]);
 
-	$oMemberModel = getModel('member');
-	
-	// Check Group Image Mark
-	if($oMemberModel->getGroupImageMark($member_srl))
+	if($addon_info->icon_duplication == 'Y')
 	{
-		return $orig_text . $matches[5] . '</' . $matches[6] . '>';
+		// Check Group Image Mark
+		$oMemberModel = getModel('member');
+		if($oMemberModel->getGroupImageMark($member_srl))
+		{
+			return $orig_text . $matches[5] . '</' . $matches[6] . '>';
+		}
 	}
 
 	if(!isset($GLOBALS['_pointLevelIcon'][$member_srl]))