Merge branch 'release/1.8.14'

classes/security/Purifier.class.php

@@ -93,11 +93,17 @@ class Purifier
 				{
 					foreach($m2[1] as $value2)
 					{
+						//SECISSUE check style attr
+						if($value2 == 'style')
+						{
+							continue;
+						}
 						$attributeList[] = $value2;
 					}
 				}
 			}
 		}
+
 		return array_unique($attributeList);
 	}
 
@@ -121,6 +127,11 @@ class Purifier
 				{
 					foreach($m2[1] as $value2)
 					{
+						//SECISSUE check style attr
+						if($value2 == 'style')
+						{
+							continue;
+						}
 						$attributeList[] = $value2;
 					}
 				}

config/config.inc.php

@@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.8.13');
+define('__XE_VERSION__', '1.8.14');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

config/func.inc.php

@@ -471,6 +471,18 @@ function getFullSiteUrl()
 	return $url;
 }
 
+/**
+ * Return the exact url of the current page
+ *
+ * @return string
+ */
+function getCurrentPageUrl()
+{
+	$protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
+	$url = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+	return htmlspecialchars($url, ENT_COMPAT, 'UTF-8', FALSE);
+}
+
 /**
  * Return if domain of the virtual site is url type or id type
  *

layouts/xedition/layout.html

@@ -448,9 +448,9 @@
 			<h1>LOGIN</h1>
 		</div>
 		<div class="login-body">
-			<form action="{getUrl()}" method="post" autocomplete="off">
+			<form action="{getUrl('', 'act', 'procMemberLogin')}" method="post" autocomplete="off">
 				<input type="hidden" name="act" value="procMemberLogin" />
-				<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE)}" />
+				<input type="hidden" name="success_return_url" value="{getCurrentPageUrl()}" />
 				<input type="hidden" name="xe_validator_id" value="layouts/xedition/layout/1" />
 				<fieldset>
 					<legend class="blind">{$lang->cmd_login}</legend>

modules/addon/tpl/addon_list.html

@@ -61,3 +61,5 @@
 		</div>
 	</div>
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:애드온"></div>

modules/addon/tpl/setup_addon.html

@@ -120,3 +120,5 @@
 		});
 })(jQuery);
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:애드온"></div>

modules/admin/tpl/_dashboard_default.html

@@ -63,4 +63,3 @@
 		<p class="more"><a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList')}"><i>&rsaquo;</i> {$lang->more}</a></p>
 	</section>
 </div>
-

modules/admin/tpl/_header.html

@@ -1,5 +1,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2, user-scalable=yes" />
+<load target="../../../common/xeicon/xeicon.min.css" />
+
 <div class="x">
 <p class="skipNav"><a href="#content">{$lang->skip_to_content}</a></p>
 	<header class="header">

modules/admin/tpl/admin_setup.html

@@ -114,3 +114,5 @@
 .adminMap .parent>.side{right:30px}
 .adminMap .placeholder{background:#000;border-radius:5px}
 </style>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:관리자 설정"></div>

modules/admin/tpl/config_ftp.html

@@ -124,3 +124,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:FTP 설정"></div>

modules/admin/tpl/config_general.html

@@ -314,3 +314,4 @@ function doSubmitConfig()
 
 </script>
 
+<div class="admin-forum-container" data-chak-categories="XE설정:XE 일반 설정"></div>

modules/admin/tpl/css/admin.css

@@ -908,6 +908,9 @@ margin-bottom: 10px;
 	text-decoration: none;
 	color: #666;
 }
+.x>.header>.account>ul>li.forum-chak>a {
+	color: #FFF;
+}
 .x>.header>.account>ul>li>a:hover,
 .x>.header>.account>ul>li>a:focus {
 	text-decoration: underline;
@@ -2387,3 +2390,33 @@ html[lang="mn"] .x .g11n.active>[disabled],
 	height: 1px;
 	overflow: hidden;
 }
+
+
+.admin-forum-container {
+	clear: both;
+	margin: 10px 5px;
+	border: 0 solid #ddd;
+}
+.admin-forum-container.activated-forum {
+	margin-top: 30px;
+	padding: 15px;
+	background-color: #fbfbfb;
+	border-width: 3px 0;
+}
+.admin-forum-container .open-forum {
+	display: inline-block;
+	padding: 15px;
+	padding-left: 60px;
+	color: #0088cc;
+	font-size: 14px;
+	height: 20px;
+	line-height: 20px;
+	text-decoration: none;
+	background-image: url('../img/chak_c.png');
+	background-repeat: no-repeat;
+	background-position: center left;
+}
+.admin-forum-container .open-forum:hover,
+.admin-forum-container .open-forum:active {
+	text-decoration: underline;
+}

modules/admin/tpl/js/admin.js

@@ -2471,3 +2471,67 @@ jQuery(function($){
 		}
 	});
 });
+
+
+
+// Forum Chak
+(function($){
+	var chak = {
+		elClass: 'chak-comment',
+		group_id: 'xe1_official',
+		apikey: 'xe17935b49af5435d37f1cde130363db-forum'
+	};
+
+	$(function(){
+		var $chakContainer = $('.admin-forum-container');
+
+		if($chakContainer.length) {
+			var $forumOpen = $('<a href="#' + chak.elClass + '" class="open-forum">이 페이지에 대한 포럼 보기</a>');
+			var $headerButton = $('<li class="forum-chak"><a href="#" class="x_btn x_btn-primary">Forum</a></li>');
+			var $headerMenu = $('header.header .account ul');
+
+			(function(){var s=document.createElement('script');s.type='text/javascript';s.src='//chak.it/static/service.js';s.async=true;(document.getElementsByTagName('head')[0]||document.getElementsByTagName('body')[0]).appendChild(s);})();
+
+			$chakContainer.each(function(idx){
+				var $el = $(this);
+				var elData = $el.data();
+				elData.count = 0;
+				var $opener = $forumOpen.clone();
+				var $button = $headerButton.clone();
+				var forumId = 'inline-forum-' + idx;
+
+				$el.append($opener);
+
+				$button.find('a')
+					.attr('href', '#' + forumId)
+					.on('click', function(){
+						var $target = $($.attr(this, 'href'));
+						$('html, body').animate({
+							scrollTop: $target.offset().top - 20
+						}, 500);
+						return false;
+					})
+					.one('click', function() {
+						var $target = $($.attr(this, 'href'));
+						$target.find('a').click();
+					});
+
+				$headerMenu.append($button);
+				$el.attr('id', forumId);
+
+				$el.find('a').on('click', function(){
+					var div = document.createElement("div");
+					div.setAttribute("data-chak-apikey", chak.apikey);
+					div.setAttribute("data-chak-categories", elData.chakCategories);
+
+					$opener.after(div);
+					$chakContainer.addClass('activated-forum');
+
+					manuallySetChakService(div);
+
+					$opener.remove();
+				});
+			});
+		}
+	});
+})(jQuery);

modules/autoinstall/tpl/index.html

@@ -25,3 +25,5 @@
 </form>
 -->
 <include target="list.html" />
+
+<div class="admin-forum-container" data-chak-categories="XE설정:쉬운 설치"></div>

modules/autoinstall/tpl/list.html

@@ -45,16 +45,6 @@
 				</div>
 				<div class="text">
 					<h3><span class="x_label x_label-info">{$item->category}</span> <a href="{$target_url}" title="{$item->title}" target="_blank">{$item->title}</a></h3>
-					<p>
-						<block cond="(int)$item->package_voter > 0">
-							<span class="starRating"><span style="width:{sprintf("%d",$item->package_voted/$item->package_voter*20)}%">{sprintf("%0.1f",$item->package_voted/$item->package_voter*2)}{sprintf($lang->rate, $item->package_start)}</span></span>
-							<span class="x_badge">{sprintf("%0.1f",$item->package_voted/$item->package_voter*2)}/{number_format($item->package_voter)}</span>
-						</block>
-						<block cond="(int)$item->package_voter <= 0">
-							<span class="starRating"><span style="width:0%">0</span></span>
-							<span class="x_badge">0/0</span>
-						</block>
-					</p>
 					<p class="x_btn-group" style="text-align:right">
 						<a cond="$item->current_version && $item->need_update != 'Y'" class="x_btn x_disabled" href="#">{$lang->installed}</a>
 						<a cond="!$item->current_version" class="x_btn" href="{getUrl('act','dispAutoinstallAdminInstall','package_srl',$item->package_srl)}"><i class="x_icon-download-alt"></i> {$lang->install}</a>
@@ -100,14 +90,6 @@
 				<p><span class="x_label x_label-info">{$item->category}</span> <a href="{$target_url}" target="_blank">{$item->title}</a></p>
 				<p style="margin:5px 0">{cut_str($item->package_description,200)}</p>
 				<p style="margin:5px 0">
-					<block cond="(int)$item->package_voter > 0">
-						<span class="starRating"><span style="width:{sprintf("%d",$item->package_voted/$item->package_voter*20)}%">{sprintf("%0.1f",$item->package_voted/$item->package_voter*2)}{sprintf($lang->rate, $item->package_start)}</span></span>
-						<span class="x_badge">{sprintf("%0.1f",$item->package_voted/$item->package_voter*2)}/{number_format($item->package_voter)}</span>
-					</block>
-					<block cond="(int)$item->package_voter <= 0">
-						<span class="starRating"><span style="width:0%">0</span></span>
-						<span class="x_badge">0/0</span>
-					</block>
 					{$lang->package_update}: <time title="{zdate($item->item_regdate, "Y-m-d H:i")}">{zdate($item->item_regdate, "Y-m-d")}</time> 
 					<i>|</i>
 					{$lang->package_downloaded_count}: {number_format($item->package_downloaded)}

modules/board/board.class.php

@@ -29,7 +29,7 @@ class board extends ModuleObject
 
 		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
-			$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
+			$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDelete', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
 			Context::addSSLActions($ssl_actions);
 		}
 	}

modules/board/board.controller.php

@@ -202,8 +202,9 @@ class boardController extends board
 		}
 
 		// alert an message
+		$this->setRedirectUrl(getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '', 'page', Context::get('page'), 'document_srl', ''));
 		$this->add('mid', Context::get('mid'));
-		$this->add('page', $output->get('page'));
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_deleted');
 	}
 

modules/comment/tpl/comment_list.html

@@ -199,3 +199,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:댓글"></div>

modules/comment/tpl/declared_list.html

@@ -115,4 +115,6 @@ jQuery(function($){
 		}
 	}).change();
 });
-</script>
+</script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:댓글"></div>

modules/communication/conf/module.xml

@@ -16,7 +16,7 @@
 		<action name="procCommunicationSendMessage" type="controller" ruleset="sendMessage" standalone="true" />
 		<action name="procCommunicationStoreMessage" type="controller" standalone="true" />
 		<action name="procCommunicationDeleteMessage" type="controller" standalone="true" />
-		<action name="procCommunicationDeleteMessages" type="controller" standalone="true" />
+		<action name="procCommunicationDeleteMessages" type="controller" method="GET|POST" standalone="true" />
 
 		<action name="procCommunicationAddFriend" type="controller" ruleset="addFriend" standalone="true" />
 		<action name="procCommunicationMoveFriend" type="controller" ruleset="deleteCheckedFriend" standalone="true" />

modules/document/tpl/declared_list.html

@@ -200,4 +200,6 @@ jQuery(function($){
 		}
 	});
 });
-</script>
+</script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:문서"></div>

modules/document/tpl/document_list.html

@@ -216,3 +216,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:문서"></div>

modules/editor/tpl/admin_index.html

@@ -213,3 +213,4 @@ jQuery(function($){
 });
 </script>
 
+<div class="admin-forum-container" data-chak-categories="XE설정:에디터"></div>

modules/file/tpl/adminConfig.html

@@ -56,3 +56,5 @@
 		</div>
 	</div>
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:파일 업로드"></div>

modules/file/tpl/file_list.html

@@ -207,3 +207,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:파일첨부"></div>

modules/importer/tpl/index.html

@@ -105,3 +105,5 @@ jQuery('a.modalAnchor')
 	return false;
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:데이터 들여오기"></div>

modules/layout/tpl/installed_layout_list.html

@@ -52,3 +52,5 @@
 		</tr>
 	</tbody>
 </table>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:레이아웃"></div>

modules/layout/tpl/layout_all_instance_list.html

@@ -43,3 +43,5 @@
 		<!--@end-->
 	</tbody>
 </table>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:레이아웃 관리"></div>

modules/layout/tpl/layout_edit.html

@@ -94,3 +94,5 @@
 	</div>
 
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:레이아웃 관리"></div>

modules/layout/tpl/layout_instance_list.html

@@ -105,3 +105,5 @@ xe.lang.confirm_delete = '{$lang->confirm_delete}';
 		</div>
 	</form>
 </section>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:레이아웃"></div>

modules/layout/tpl/layout_modify.html

@@ -1,3 +1,5 @@
 <include target="header.html" />
 <load target="js/layout_modify.js" />
 {$content}
+
+ <div class="admin-forum-container" data-chak-categories="XE설정:레이아웃 관리"></div>

modules/member/tpl/default_config.html

@@ -80,3 +80,5 @@
 		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:회원 설정"></div>

modules/member/tpl/design_config.html

@@ -50,3 +50,5 @@
 <script>
     jQuery(function() { doGetSkinColorset("{$config->skin}"); });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:회원 설정"></div>

modules/member/tpl/group_list.html

@@ -103,3 +103,5 @@
 		<p class="x_pull-right">{$lang->add_group_image_mark}: <a href="{getUrl('', 'module','admin', 'act', 'dispModuleAdminFileBox')}" target="_blank">{$lang->link_file_box}</a></p>
 	</div>
 </section>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:회원 그룹"></div>

modules/member/tpl/insert_member.html

@@ -129,3 +129,5 @@
     });
 })(jQuery);
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:회원 정보"></div>

modules/member/tpl/login_config.html

@@ -62,3 +62,5 @@ jQuery(function($){
 	}).change();
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:회원 설정"></div>

modules/member/tpl/member_list.html

@@ -202,3 +202,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:회원 목록"></div>

modules/member/tpl/signup_config.html

@@ -198,3 +198,5 @@
 #userDefine{max-width:60%;margin-left:-30%}
 }
 </style>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:회원 설정"></div>

modules/menu/tpl/sitemap.html

@@ -352,6 +352,8 @@
 		</fieldset>
 		<button type="button" class="x_close" data-admin-hide="#imgbtn">&times;</button>
 	</div>
+
+	
 	<!--@end-->
 
 	<!--@if($act == 'dispMenuAdminSiteMap')-->
@@ -4120,3 +4122,6 @@ jQuery.extend({
 });
 //]]>
 </script>
+
+<div cond="$act === 'dispMenuAdminSiteMap'" class="admin-forum-container" data-chak-categories="XE설정:사이트 메뉴 편집"></div>
+<div cond="$act === 'dispMenuAdminSiteDesign'" class="admin-forum-container" data-chak-categories="XE설정:사이트 디자인 설정"></div>

modules/module/tpl/adminFileBox.html

@@ -116,3 +116,5 @@
 		</ul>
 	</form>
 </section>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:파일 박스"></div>

modules/module/tpl/category_list.html

@@ -58,3 +58,5 @@
 		<input type="submit" class="x_btn x_btn-primary" value="{$lang->cmd_registration}">
 	</div>
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:모듈"></div>

modules/module/tpl/category_update_form.html

@@ -20,3 +20,4 @@
 </section>
 <!--@end-->
 
+<div class="admin-forum-container" data-chak-categories="XE설정:모듈"></div>

modules/module/tpl/module_list.html

@@ -59,4 +59,6 @@ jQuery(function($){
 	$('.dsTg>tbody>tr[data-type1]').prependTo('tbody');
 	$('.dsTg>tbody>tr[data-type2]').prependTo('tbody');
 });
-</script>
+</script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:모듈"></div>

modules/point/tpl/config.html

@@ -190,4 +190,6 @@ jQuery(function($){
 		}
 	});
 });
-</script>
+</script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:포인트"></div>

modules/point/tpl/member_list.html

@@ -145,3 +145,5 @@
 	<input type="hidden" name="success_return_url" value="{Context::getRequestUrl()}" />
 	<input type="hidden" name="xe_validator_id" value="modules/point/tpl/member_list/1" />
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:포인트"></div>

modules/point/tpl/module_config.html

@@ -37,3 +37,5 @@
 		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_registration}" /></span>
 	</div>
 </form>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:포인트"></div>

modules/poll/tpl/poll_list.html

@@ -124,3 +124,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:설문"></div>

modules/rss/tpl/rss_admin_index.html

@@ -122,3 +122,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:RSS"></div>

modules/spamfilter/tpl/footer.html

@@ -0,0 +1 @@
+<div class="admin-forum-container" data-chak-categories="XE설정:스팸필터"></div>

modules/trash/tpl/trash_list.html

@@ -165,3 +165,5 @@ jQuery(function($){
 	});
 });
 </script>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:휴지통"></div>

modules/trash/tpl/trash_view.html

@@ -75,3 +75,4 @@
 	</div>
 </form>
 
+<div class="admin-forum-container" data-chak-categories="XE설정:휴지통"></div>

modules/widget/tpl/downloaded_widget_list.html

@@ -39,3 +39,5 @@
 		</tr>
 	</tbody>
 </table>
+
+<div class="admin-forum-container" data-chak-categories="XE설정:위젯"></div>

modules/widget/tpl/widget_generate_code.html

@@ -17,3 +17,5 @@
 	<p style="margin-right:14px"><textarea id="widget_code" rows="4" cols="42" style="width:100%;cursor:text;font-family:'Courier New', Courier, monospace" readonly="readonly"></textarea>
 </div>
 <include target="../../module/tpl/include.filebox.html" />
+
+<div class="admin-forum-container" data-chak-categories="XE설정:위젯"></div>