Merge branch 'rhymix:master' into master

modules/admin/admin.admin.model.php

@@ -56,11 +56,7 @@ class AdminAdminModel extends Admin
 	 */
 	public function getSiteAllList()
 	{
-		if(Context::get('domain'))
-		{
-			$domain = Context::get('domain');
-		}
-		$siteList = $this->getAllSitesThatHaveModules($domain);
+		$siteList = $this->getAllSitesThatHaveModules(Context::get('domain'));
 		$this->add('site_list', $siteList);
 	}
 

modules/comment/comment.item.php

@@ -466,10 +466,12 @@ class CommentItem extends BaseObject
 		$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
 		if($strlen)
 		{
-			$content = cut_str($content, $strlen, '...');
+			$content = escape(cut_str($content, $strlen, '...'), false);
+		}
+		else
+		{
+			$content = escape($content);
 		}
-
-		$content = escape($content);
 
 		if ($content === '')
 		{
@@ -511,9 +513,12 @@ class CommentItem extends BaseObject
 		$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
 		if($strlen)
 		{
-			$content = cut_str($content, $strlen, '...');
+			return escape(cut_str($content, $strlen, '...'), false);
+		}
+		else
+		{
+			return escape($content);
 		}
-		return escape($content);
 	}
 
 	/**

modules/document/document.item.php

@@ -634,10 +634,12 @@ class DocumentItem extends BaseObject
 		$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
 		if($strlen)
 		{
-			$content = cut_str($content, $strlen, '...');
+			return escape(cut_str($content, $strlen, '...'), false);
+		}
+		else
+		{
+			return escape($content);
 		}
-
-		return escape($content);
 	}
 
 	function getContentText($strlen = 0)
@@ -653,17 +655,22 @@ class DocumentItem extends BaseObject
 		}
 
 		$content = preg_replace('!(</p>|</div>|<br)!i', ' $1', $this->get('content'));
-		$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
-		$content = preg_replace_callback('/<object[^>]*>/is', array($this, '_addAllowScriptAccess'), $content);
+		//$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
+		//$content = preg_replace_callback('/<object[^>]*>/is', array($this, '_addAllowScriptAccess'), $content);
 		if($strlen)
 		{
 			$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
-			$content = cut_str($content, $strlen, '...');
+			return escape(cut_str($content, $strlen, '...'), false);
+		}
+		else
+		{
+			return escape($content);
 		}
-
-		return escape($content);
 	}
 
+	/**
+	 * @deprecated
+	 */
 	function _addAllowScriptAccess($m)
 	{
 		if($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
@@ -674,6 +681,9 @@ class DocumentItem extends BaseObject
 		return $m[0];
 	}
 
+	/**
+	 * @deprecated
+	 */
 	function _checkAllowScriptAccess($m)
 	{
 		if($m[1] == 'object')
@@ -806,8 +816,7 @@ class DocumentItem extends BaseObject
 
 		// Truncate string
 		$content = cut_str($content, $str_size, $tail);
-
-		return escape($content);
+		return escape($content, false);
 	}
 
 	function getRegdate($format = 'Y.m.d H:i:s', $conversion = true)

modules/member/tpl/js/signup_check.js

@@ -19,31 +19,32 @@ function memberSetEvent() {
 // 실제 서버에 특정 필드의 value check를 요청하고 이상이 있으면 메세지를 뿌려주는 함수
 function memberCheckValue(event) {
 	var field  = event.target;
-	var _name  = field.name;
-	var _value = field.value;
-	if(!_name || !_value) return;
+	if(!field.name || !field.value) {
+		return;
+	}
 
-	var params = {name:_name, value:_value};
-	var response_tags = ['error','message'];
-
-	exec_xml('member','procMemberCheckValue', params, completeMemberCheckValue, response_tags, field);
+	exec_json('member.procMemberCheckValue', {
+		name: field.name,
+		value: field.value
+	}, function(data) {
+		completeMemberCheckValue(data, null, field);
+	});
 }
 
 // 서버에서 응답이 올 경우 이상이 있으면 메세지를 출력
-function completeMemberCheckValue(ret_obj, response_tags, field) {
+function completeMemberCheckValue(data, unused, field) {
 	var _id   = 'dummy_check'+field.name;
 	var dummy = jQuery('#'+_id);
-   
-    if(ret_obj['message']=='success') {
-        dummy.html('').hide();
-        return;
-    }
-
 	if (!dummy.length) {
 		dummy = jQuery('<p class="checkValue help-inline" style="color:red" />').attr('id', _id).appendTo(field.parentNode);
 	}
 
-	dummy.html(ret_obj['message']).show();
+    if(data.message == 'success') {
+        dummy.html('').hide();
+        return;
+    } else {
+		dummy.html(data.message).show();
+	}
 }
 
 // 결과 메세지를 정리하는 함수

modules/module/module.controller.php

@@ -443,6 +443,10 @@ class ModuleController extends Module
 			{
 				$oMenuAdminController = getAdminController('menu');
 				$menuSrl = $oMenuAdminController->getUnlinkedMenu();
+				if ($menuSrl instanceof BaseObject && !$menuSrl->toBool())
+				{
+					return $menuSrl;
+				}
 
 				$menuArgs->menu_srl = $menuSrl;
 				$menuArgs->menu_item_srl = getNextSequence();

modules/module/queries/getDomainInfo.xml

@@ -1,7 +1,11 @@
 <query id="getDomainInfo" action="select">
 	<tables>
 		<table name="domains" />
-		<table name="modules" />
+		<table name="modules" type="left join">
+			<conditions>
+				<condition operation="equal" column="modules.module_srl" default="domains.index_module_srl" />
+			</conditions>
+		</table>
 	</tables>
 	<columns>
 		<column name="domains.*" />
@@ -9,7 +13,6 @@
 		<column name="domains.domain_srl" alias="domain_srl" />
 	</columns>
 	<conditions>
-		<condition operation="equal" column="modules.module_srl" default="domains.index_module_srl" notnull="notnull" />
 		<condition operation="equal" column="domains.domain_srl" var="domain_srl" pipe="and" />
 		<condition operation="equal" column="domains.domain" var="domain" pipe="and" />
 		<condition operation="equal" column="domains.is_default_domain" var="is_default_domain" pipe="and" />

modules/rss/tpl/format/rss10.html

@@ -28,7 +28,7 @@
 	<item loop="$document_list=>$oDocument" rdf:about="{$oDocument->getPermanentUrl()}">
 		<title>{$oDocument->getTitleText()}</title>
 		<link>{$oDocument->getPermanentUrl()}</link>
-		<description>{$oDocument->getSummary(400)|escape}</description>
+		<description>{$oDocument->getSummary(400)}</description>
 		<dc:creator>{$oDocument->getNickName()}</dc:creator>
 		<dc:date>{date('c', ztime($oDocument->get('regdate')))}</dc:date>
 	</item>

modules/rss/tpl/format/rss20.html

@@ -22,7 +22,7 @@
 			<!--@if($target_modules[$oDocument->get('module_srl')] == 'Y')-->
 			<description>{\Rhymix\Framework\Filters\HTMLFilter::fixRelativeUrls(utf8_trim(utf8_normalize_spaces($oDocument->get('content'))))|escape}</description>
 			<!--@else-->
-			<description>{$oDocument->getSummary(400)|escape}</description>
+			<description>{$oDocument->getSummary(400)}</description>
 			<!--@end-->
 			<category cond="$oDocument->getModuleName()">{Context::replaceUserLang($oDocument->getModuleName())}</category>
 			<category cond="$oDocument->get('category_srl') && $category_name = $category_list[$oDocument->get('module_srl')][$oDocument->get('category_srl')]->title">{Context::replaceUserLang($category_name)}</category>