Merge from 1.5.2.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10519 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/admin/tpl/css/admin.css

@@ -541,7 +541,7 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
 .x #skin .showAll.hideAll{background-position:right 0}
 /* Favorite On | Off */
 .x .fvOff,
-.x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:url(../img/iconFavorite.gif) no-repeat}
+.x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:transparent url(../img/iconFavorite.gif) no-repeat;border:0}
 .x .fvOn{background-position:0 -16px}
 /* Up-Down Dragable */
 .x .uDrag .wrap{position:relative;padding-left:20px}

modules/autoinstall/lang/lang.xml

@@ -282,7 +282,8 @@
 		<value xml:lang="jp"><![CDATA[このFTP情報ではログインできません。FTP情報を確認してください。]]></value>
 		<value xml:lang="zh-CN"><![CDATA[FTP登录失败。请确认输入的FTP信息。]]></value>
 		<value xml:lang="zh-TW"><![CDATA[FTP登入失敗。請確認輸入的 FTP 資訊。]]></value>
-		<value xml:lang="fr"><![CDATA[입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요]]></valuevalue xml:lang="de"><![CDATA[Anmeldungsfehler mit der Angabe des FTPs Bitte die Angabe des FTPs festlegen.]]></value>
+		<value xml:lang="fr"><![CDATA[입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요]]></value>
+		<value xml:lang="de"><![CDATA[Anmeldungsfehler mit der Angabe des FTPs Bitte die Angabe des FTPs festlegen.]]></value>
 		<value xml:lang="es"><![CDATA[Los datos de login para el FTP no son correctos. Veriféquelos.]]></value>
 		<value xml:lang="tr"><![CDATA[Kimlik doğrulama başarısız oldu. Lütfen kullanıcı adını ve şifreyi kontrol ediniz.]]></value>
 		<value xml:lang="vi"><![CDATA[Xác nhận thất bại. Xin vui lòng kiểm tra lại tên sử dụng và mật khẩu.]]></value>

modules/document/document.controller.php

@@ -170,7 +170,7 @@ class documentController extends document {
 			{
 				return new Object(-1, 'msg_not_permitted');
 			}
-			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
 		// Set the read counts and update order.
 		if(!$obj->readed_count) $obj->readed_count = 0;
@@ -722,11 +722,14 @@ class documentController extends document {
 			return $output;
 		}
 
-		$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
-		if(!$output->toBool())
+		if($var_idx != NULL)
 		{
-			$oDB->rollback();
-			return $output;
+			$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
+			if(!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 		}
 
 		$output =  executeQuery('document.deleteDocumentExtraVars', $obj);
@@ -736,11 +739,14 @@ class documentController extends document {
 			return $output;
 		}
 
-		$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
-		if(!$output->toBool())
+		if($var_idx != NULL)
 		{
-			$oDB->rollback();
-			return $output;
+			$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
+			if(!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 		}
 
 		$oDB->commit();

modules/install/install.view.php

@@ -34,7 +34,11 @@
 			if(file_exists($install_config_file)){
 				include $install_config_file;
 				if(is_array($install_config)){
-					foreach($install_config as $k => $v) Context::set($k,$v,true);
+					foreach($install_config as $k => $v) 
+					{
+						$v = ($k == 'db_table_prefix') ? $v.'_' : $v;
+						Context::set($k,$v,true);
+					}
 					unset($GLOBALS['__DB__']);
 					Context::set('install_config', true, true);
 					$oInstallController = &getController('install');

modules/member/member.admin.model.php

@@ -91,12 +91,12 @@
             }
 
 			if(!$sort_order) {
-				$sort_order = 'desc';
+				$sort_order = 'asc';
 			}
 
-            if($sort_order != 'desc')
+            if($sort_order != 'asc')
 			{
-				$sort_order = 'asc';
+				$sort_order = 'desc';
 			}
 
             if($args->selected_group_srl) {

modules/member/tpl/member_list.html

@@ -171,6 +171,12 @@
 	</form>
 	<form action="" method="post">
 		<input type="hidden" name="module" value="{$module}" />
+        <select name="selected_group_srl">
+            <option value="0">그룹 전체</option>
+            <!--@foreach($group_list as $key => $val)-->
+            <option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
+            <!--@end-->
+        </select>
 		<select name="search_target">
 			<option value="">{$lang->search_target}</option>
 			{@$lang->search_target_list = array_merge($lang->search_target_list, $usedIdentifiers)}

modules/module/module.controller.php

@@ -173,6 +173,14 @@
             if(!$output->toBool()) return $output;
 
             $output = executeQuery('module.insertModuleConfig', $args);
+			
+			//remove from cache
+			$oCacheHandler = &CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport())
+			{
+				$cache_key = 'object:module_config:module_'.$module.'_site_srl_'.$site_srl;
+				$oCacheHandler->delete($cache_key);
+			}			
             return $output;
         }
 

modules/module/tpl/module_list.html

@@ -21,9 +21,9 @@
 			<tr>
 				<td class="nowr">
 					<!--@if(in_array($val->module,$favoriteModuleList))-->
-					<a href="#" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->on})</a>
+					<button type="button" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->on})</button>
 					<!--@else-->
-					<a href="#" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->off})</a>
+					<button type="button" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->off})</button>
 					<!--@end-->
 				</td>
 				<td class="title">