update truck and tag 1.4.2.3

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

addons/blogapi/conf/info.xml

@@ -58,10 +58,10 @@
         тег RSD и api работают только при включенном аддоне.
     </description>
     <description xml:lang="zh-TW">
-        支援MetaWeblog的部落格API附加元件。
+        支援 MetaWeblog 的部落格 API 附加元件。
-        設置成"啟用"時，會使每個模組都顯示RSD圖示。
+        設置成"啟用"時，會使每個模組都顯示 RSD 圖示。
         API網址是 http://安裝位置/模組名稱/api。
-        將狀態設置成"啟用"時，才可使用RSD和API
+        將狀態設置成"啟用"時，才可使用 RSD 和 API
     </description>
     <version>0.1</version>
     <date>2007-02-28</date>

classes/db/DB.class.php

@@ -47,8 +47,8 @@
 
         /**
          * @brief returns instance of certain db type
-		 * @param[in] $db_type type of db
+         * @param[in] $db_type type of db
-		 * @return instance
+         * @return instance
          **/
         function &getInstance($db_type = NULL) {
             if(!$db_type) $db_type = Context::getDBType();
@@ -69,7 +69,7 @@
 
         /**
          * @brief constructor
-		 * @return none
+         * @return none
          **/
         function DB() {
             $this->count_cache_path = _XE_PATH_.$this->count_cache_path;
@@ -78,7 +78,7 @@
 
         /**
          * @brief returns list of supported db
-		 * @return list of supported db
+         * @return list of supported db
          **/
         function getSupportedList() {
             $oDB = new DB();
@@ -87,7 +87,7 @@
 
         /**
          * @brief returns list of supported db
-		 * @return list of supported db
+         * @return list of supported db
          **/
         function _getSupportedList() {
             $db_classes_path = _XE_PATH_."classes/db/";
@@ -124,8 +124,8 @@
 
         /**
          * @brief check if the db_type is supported
-		 * @param[in] $db_type type of db to check
+         * @param[in] $db_type type of db to check
-		 * @return true: is supported, false: is not supported
+         * @return true: is supported, false: is not supported
          **/
         function isSupported($db_type) {
             $supported_list = DB::getSupportedList();
@@ -134,7 +134,7 @@
 
         /**
          * @brief check if is connected
-		 * @return true: connected, false: not connected
+         * @return true: connected, false: not connected
          **/
         function isConnected() {
             return $this->is_connected ? true : false;
@@ -142,7 +142,7 @@
 
         /**
          * @brief start recording log
-		 * @return none
+         * @return none
          **/
         function actStart($query) {
             $this->setError(0, 'success');
@@ -151,9 +151,9 @@
             $this->elapsed_time = 0;
         }
 
-		/**
+        /**
          * @brief finish recording log
-		 * @return none
+         * @return none
          **/
         function actFinish() {
             if(!$this->query) return;
@@ -192,26 +192,27 @@
             $GLOBALS['__db_queries__'][] = $log;
 
             // if __LOG_SLOW_QUERY__ if defined, check elapsed time and leave query log
-            if(__LOG_SLOW_QUERY__>0 && $elapsed_time > __LOG_SLOW_QUERY__) {
+            if(__LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__) {
                 $buff = '';
                 $log_file = _XE_PATH_.'files/_db_slow_query.php';
                 if(!file_exists($log_file)) {
                     $buff = '<?php exit();?>'."\n";
                 }
-                $buff .= sprintf("%s\t%s\n\t%0.6f sec\n\n", date("Y-m-h H:i"), $this->query, $elapsed_time);
+
+                $buff .= sprintf("%s\t%s\n\t%0.6f sec\tquery_id:%s\n\n", date("Y-m-d H:i"), $this->query, $elapsed_time, $this->query_id);
+
                 if($fp = fopen($log_file, 'a')) {
                     fwrite($fp, $buff);
                     fclose($fp);
                 }
-
             }
         }
 
         /**
          * @brief set error
-		 * @param[in] $errno error code
+         * @param[in] $errno error code
-		 * @param[in] $errstr error message
+         * @param[in] $errstr error message
-		 * @return none
+         * @return none
          **/
         function setError($errno = 0, $errstr = 'success') {
             $this->errno = $errno;
@@ -220,7 +221,7 @@
 
         /**
          * @brief check if an error occured
-		 * @return true: error, false: no error
+         * @return true: error, false: no error
          **/
         function isError() {
             return $this->errno === 0 ? false : true;
@@ -228,7 +229,7 @@
 
         /**
          * @brief returns object of error info
-		 * @return object of error
+         * @return object of error
          **/
         function getError() {
             $this->errstr = Context::convertEncodingStr($this->errstr);
@@ -238,8 +239,8 @@
         /**
          * @brief query xml 파일을 실행하여 결과를 return
          * @param[in] $query_id query id (module.queryname
-		 * @param[in] $args arguments for query
+         * @param[in] $args arguments for query
-		 * @return result of query
+         * @return result of query
          * @remarks this function finds xml file or cache file of $query_id, compiles it and then execute it
          **/
         function executeQuery($query_id, $args = NULL) {
@@ -273,8 +274,8 @@
         /**
          * @brief look for cache file
          * @param[in] $query_id query id for finding
-		 * @param[in] $xml_file original xml query file
+         * @param[in] $xml_file original xml query file
-		 * @return cache file
+         * @return cache file
          **/
         function checkQueryCacheFile($query_id,$xml_file){
 
@@ -297,10 +298,10 @@
 
         /**
          * @brief execute query and return the result
-		 * @param[in] $cache_file cache file of query
+         * @param[in] $cache_file cache file of query
-		 * @param[in] $source_args arguments for query
+         * @param[in] $source_args arguments for query
-		 * @param[in] $query_id query id
+         * @param[in] $query_id query id
-		 * @return result of query
+         * @return result of query
          **/
         function _executeQuery($cache_file, $source_args, $query_id) {
             global $lang;
@@ -342,10 +343,10 @@
 
         /**
          * @brief check $val with $filter_type
-		 * @param[in] $key key value
+         * @param[in] $key key value
-		 * @param[in] $val value of $key
+         * @param[in] $val value of $key
-		 * @param[in] $filter_type type of filter to check $val
+         * @param[in] $filter_type type of filter to check $val
-		 * @return object
+         * @return object
          * @remarks this function is to be used from XmlQueryParser
          **/
         function checkFilter($key, $val, $filter_type) {
@@ -380,9 +381,9 @@
 
         /**
          * @brief returns type of column
-		 * @param[in] $column_type_list list of column type
+         * @param[in] $column_type_list list of column type
-		 * @param[in] $name name of column type
+         * @param[in] $name name of column type
-		 * @return column type of $name
+         * @return column type of $name
          * @remarks columns are usually like a.b, so it needs another function
          **/
         function getColumnType($column_type_list, $name) {
@@ -393,12 +394,12 @@
 
         /**
          * @brief returns the value of condition
-		 * @param[in] $name name of condition
+         * @param[in] $name name of condition
-		 * @param[in] $value value of condition
+         * @param[in] $value value of condition
-		 * @param[in] $operation operation this is used in condition
+         * @param[in] $operation operation this is used in condition
-		 * @param[in] $type type of condition
+         * @param[in] $type type of condition
-		 * @param[in] $column_type type of column
+         * @param[in] $column_type type of column
-		 * @return well modified $value
+         * @return well modified $value
          * @remarks if $operation is like or like_prefix, $value itself will be modified
          * @remarks if $type is not 'number', call addQuotes() and wrap with ' '
          **/
@@ -438,10 +439,10 @@
 
         /**
          * @brief returns part of condition
-		 * @param[in] $name name of condition
+         * @param[in] $name name of condition
-		 * @param[in] $value value of condition
+         * @param[in] $value value of condition
-		 * @param[in] $operation operation that is used in condition
+         * @param[in] $operation operation that is used in condition
-		 * @return detail condition
+         * @return detail condition
          **/
         function getConditionPart($name, $value, $operation) {
             switch($operation) {
@@ -503,8 +504,8 @@
 
         /**
          * @brief returns condition key
-		 * @param[in] $output result of query
+         * @param[in] $output result of query
-		 * @return array of conditions of $output
+         * @return array of conditions of $output
          **/
         function getConditionList($output) {
             $conditions = array();
@@ -523,9 +524,9 @@
 
         /**
          * @brief returns counter cache data
-		 * @param[in] $tables tables to get data
+         * @param[in] $tables tables to get data
-		 * @param[in] $condition condition to get data
+         * @param[in] $condition condition to get data
-		 * @return count of cache data
+         * @return count of cache data
          **/
         function getCountCache($tables, $condition) {
             return false;
@@ -557,10 +558,10 @@
 
         /**
          * @brief save counter cache data
-		 * @param[in] $tables tables to save data
+         * @param[in] $tables tables to save data
-		 * @param[in] $condition condition to save data
+         * @param[in] $condition condition to save data
-		 * @param[in] $count count of cache data to save
+         * @param[in] $count count of cache data to save
-		 * @return none
+         * @return none
          **/
         function putCountCache($tables, $condition, $count = 0) {
             return false;
@@ -582,8 +583,8 @@
 
         /**
          * @brief reset counter cache data
-		 * @param[in] $tables tables to reset cache data
+         * @param[in] $tables tables to reset cache data
-		 * @return true: success, false: failed
+         * @return true: success, false: failed
          **/
         function resetCountCache($tables) {
             return false;
@@ -600,10 +601,10 @@
             return true;
         }
 
-		/**
+        /**
-		 * @brief returns supported database list
+         * @brief returns supported database list
-		 * @return list of supported database
+         * @return list of supported database
-		 **/
+         **/
         function getSupportedDatabase(){
             $result = array();
 

classes/db/DBCubrid.class.php

@@ -215,9 +215,9 @@
          **/
         function isTableExists($target_name) {
             if($target_name == 'sequence')
-              $query = sprintf("select * from db_serial where name = '%s%s'", $this->prefix, $target_name);
+              $query = sprintf("select * from \"db_serial\" where \"name\" = '%s%s'", $this->prefix, $target_name);
             else
-              $query = sprintf("select * from db_class where class_name = '%s%s'", $this->prefix, $target_name);
+              $query = sprintf("select * from \"db_class\" where \"class_name\" = '%s%s'", $this->prefix, $target_name);
             $result = $this->_query($query);
 
             if(cubrid_num_rows($result)>0) $output = true;
@@ -234,10 +234,13 @@
             $type = $this->column_type[$type];
             if(strtoupper($type)=='INTEGER') $size = '';
 
-            $query = sprintf("alter class %s%s add %s ", $this->prefix, $table_name, $column_name);
+            $query = sprintf("alter class \"%s%s\" add \"%s\" ", $this->prefix, $table_name, $column_name);
             if($size) $query .= sprintf(" %s(%s) ", $type, $size);
             else $query .= sprintf(" %s ", $type);
-            if($default) $query .= sprintf(" default '%s' ", $default);
+            if($default) {
+                if ($type == 'number' || $type == 'bignumber') $query .= sprintf (" default %d ", $default);
+                else $query .= sprintf(" default '%s' ", $default);
+            }
             if($notnull) $query .= " not null ";
 
             $this->_query($query);
@@ -247,7 +250,7 @@
          * @brief 특정 테이블에 특정 column 제거
          **/
         function dropColumn($table_name, $column_name) {
-            $query = sprintf("alter class %s%s drop %s ", $this->prefix, $table_name, $column_name);
+            $query = sprintf("alter class \"%s%s\" drop \"%s\" ", $this->prefix, $table_name, $column_name);
             $this->_query($query);
         }
 
@@ -255,8 +258,8 @@
          * @brief 특정 테이블의 column의 정보를 return
          **/
         function isColumnExists($table_name, $column_name) {
-            $query = sprintf("select * from db_attribute where attr_name ='%s' and class_name = '%s%s'",
+            $query = sprintf("select * from \"db_attribute\" where \"attr_name\" ='%s' and \"class_name\" = '%s%s'",
-                                $column_name, $this->prefix, $table_name);
+            $column_name, $this->prefix, $table_name);
             $result = $this->_query($query);
             if(cubrid_num_rows($result)>0) $output = true;
             else $output = false;
@@ -273,7 +276,7 @@
         function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
             if(!is_array($target_columns)) $target_columns = array($target_columns);
 
-            $query = sprintf("create %s index %s on %s%s (%s);", $is_unique?'unique':'', $index_name, $this->prefix, $table_name, '"'.implode('","',$target_columns).'"');
+            $query = sprintf("create %s index \"%s\" on \"%s%s\" (%s);", $is_unique?'unique':'', $index_name, $this->prefix, $table_name, '"'.implode('","',$target_columns).'"');
             $this->_query($query);
         }
 
@@ -281,7 +284,7 @@
          * @brief 특정 테이블의 특정 인덱스 삭제
          **/
         function dropIndex($table_name, $index_name, $is_unique = false) {
-            $query = sprintf("drop %s index %s on %s%s", $is_unique?'unique':'', $index_name, $this->prefix, $table_name);
+            $query = sprintf("drop %s index \"%s\" on \"%s%s\"", $is_unique?'unique':'', $index_name, $this->prefix, $table_name);
             $this->_query($query);
         }
 
@@ -290,7 +293,7 @@
          * @brief 특정 테이블의 index 정보를 return
          **/
         function isIndexExists($table_name, $index_name) {
-            $query = sprintf("select * from db_index where class_name='%s%s' and index_name = '%s' ", $this->prefix, $table_name, $index_name);
+            $query = sprintf("select * from \"db_index\" where \"class_name\" = '%s%s' and \"index_name\" = '%s' ", $this->prefix, $table_name, $index_name);
             $result = $this->_query($query);
             if($this->isError()) return false;
             $output = $this->_fetch($result);
@@ -333,7 +336,7 @@
             // 만약 테이블 이름이 sequence라면 serial 생성
             if($table_name == 'sequence') {
 
-                $query = sprintf('create serial %s start with 1 increment by 1 minvalue 1 maxvalue 10000000000000000000000000000000000000 nocycle;', $this->prefix.$table_name);
+                $query = sprintf('create serial "%s" start with 1 increment by 1 minvalue 1 maxvalue 10000000000000000000000000000000000000 nocycle;', $this->prefix.$table_name);
                 return $this->_query($query);
             }
 

common/script.php

@@ -128,7 +128,7 @@ function printFileList($list){
 	$size = strlen($output);
 
 	if($size > 0){
-		header("Cache-Control: private, max-age=2592000"); 
+		header("Cache-Control: private"); 
 		header("Pragma: cache"); 
 		header("Connection: close"); 
 		header("Last-Modified: " . substr(gmdate('r', $mtime), 0, -5). "GMT");

config/config.inc.php

@@ -13,7 +13,7 @@
      * @brief XE의 전체 버전 표기
      * 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
      **/
-    define('__ZBXE_VERSION__', '1.4.2.2');
+    define('__ZBXE_VERSION__', '1.4.2.3');
 
     /**
      * @brief zbXE가 설치된 장소의 base path를 구함

modules/addon/schemas/addons.xml

@@ -1,6 +1,6 @@
 <table name="addons">
     <column name="addon" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
     <column name="is_used" type="char" size="1" default="Y" notnull="notnull" />
-    <column name="extra_vars" type="text"/>
+    <column name="extra_vars" type="text" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>

modules/addon/schemas/addons_site.xml

@@ -1,7 +1,7 @@
 <table name="addons_site">
-    <column name="site_srl" type="number" size="11" notnull="notnull" default="0" unique="unique_addon_site"/>
+    <column name="site_srl" type="number" size="11" notnull="notnull" default="0" unique="unique_addon_site" />
     <column name="addon" type="varchar" size="250" notnull="notnull" unique="unique_addon_site" />
     <column name="is_used" type="char" size="1" default="Y" notnull="notnull" />
-    <column name="extra_vars" type="text"/>
+    <column name="extra_vars" type="text" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>

modules/admin/conf/module.xml

@@ -3,7 +3,7 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispAdminIndex" type="view" standalone="true" index="true"/>
+        <action name="dispAdminIndex" type="view" standalone="true" index="true" />
         <action name="dispAdminConfig" type="view" standalone="true" />
 
         <action name="procAdminRecompileCacheFile" type="controller" standalone="true" />

modules/admin/lang/zh-TW.lang.php

@@ -69,11 +69,11 @@
     $lang->about_recompile_cache = "可有效的整理錯誤的暫存檔";
     $lang->use_ssl = "SSL功能";
     $lang->ssl_options = array(
-        'none' => "禁止使用",
+        'none' => "關閉",
-        'optional' => "選擇使用",
+        'optional' => "手動",
-        'always' => "總是使用"
+        'always' => "開啟"
     );
-    $lang->about_use_ssl = "當會員登入或修改資料等動作時，可選擇是否使用 SSL 功能。";
+    $lang->about_use_ssl = "選擇手動時，在會員註冊或修改資料等動作時才會使用 SSL 功能。<br/>選擇開啟時，所有的服務都會使用 SSL 功能。";
     $lang->server_ports = "主機埠口";
     $lang->about_server_ports = "HTTP預設埠口是『80』、HTTPS是『443』，如果想使用其他的埠口的話，請自行設定。";
     $lang->use_db_session = 'DB session認證';
@@ -81,6 +81,6 @@
     $lang->sftp = "使用 SFTP";
     $lang->ftp_get_list = "取得列表";
     $lang->ftp_remove_info = '移除 FTP 資料';
-	$lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.';
+	$lang->msg_ftp_invalid_path = '指定的 FTP 路徑讀取失敗。';
-	$lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.';
+	$lang->msg_self_restart_cache_engine = '請重新啟動 Memcached 快取程式。';
 ?>

modules/admin/queries/getCommentDeclaredStatus.xml

@@ -7,7 +7,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="more" column="regdate" var="date" notnull="notnull"/>
+        <condition operation="more" column="regdate" var="date" notnull="notnull" />
     </conditions>
     <navigation>
         <index var="sort_index" default="substr(regdate,1,8)" order="asc" />

modules/admin/queries/getCommentStatus.xml

@@ -7,7 +7,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="more" column="regdate" var="date" notnull="notnull"/>
+        <condition operation="more" column="regdate" var="date" notnull="notnull" />
     </conditions>
     <navigation>
         <index var="sort_index" default="substr(regdate,1,8)" order="asc" />

modules/admin/queries/getDocumentDeclaredStatus.xml

@@ -7,7 +7,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="more" column="regdate" var="date" notnull="notnull"/>
+        <condition operation="more" column="regdate" var="date" notnull="notnull" />
     </conditions>
     <navigation>
         <index var="sort_index" default="substr(regdate,1,8)" order="asc" />

modules/admin/queries/getDocumentStatus.xml

@@ -7,7 +7,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="more" column="regdate" var="date" notnull="notnull"/>
+        <condition operation="more" column="regdate" var="date" notnull="notnull" />
     </conditions>
     <navigation>
         <index var="sort_index" default="substr(regdate,1,8)" order="asc" />

modules/admin/queries/getMemberStatus.xml

@@ -7,7 +7,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="more" column="regdate" var="date" notnull="notnull"/>
+        <condition operation="more" column="regdate" var="date" notnull="notnull" />
     </conditions>
     <navigation>
         <index var="sort_index" default="substr(regdate,1,8)" order="asc" />

modules/admin/queries/getTrackbackStatus.xml

@@ -7,7 +7,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="more" column="regdate" var="date" notnull="notnull"/>
+        <condition operation="more" column="regdate" var="date" notnull="notnull" />
     </conditions>
     <navigation>
         <index var="sort_index" default="substr(regdate,1,8)" order="asc" />

modules/autoinstall/autoinstall.lib.php

@@ -54,7 +54,7 @@
             $postdata["path"] = $this->package->path;
             $postdata["module"] = "resourceapi";
             $postdata["act"] = "procResourceapiDownload";
-            $buff = FileHandler::getRemoteResource($this->base_url, null, 3, "POST", "application/x-www-form-urlencoded; charset=utf-8", array(), array(), $postdata);
+            $buff = FileHandler::getRemoteResource($this->base_url, null, 3, "POST", "application/x-www-form-urlencoded", array(), array(), $postdata);
             FileHandler::writeFile($this->download_file, $buff);
         }
 

modules/comment/conf/module.xml

@@ -3,7 +3,7 @@
     <grants />
     <permissions />
     <actions>
-        <action name="getCommentMenu" type="model" standalone="true"/>
+        <action name="getCommentMenu" type="model" standalone="true" />
         <action name="dispCommentAdminList" type="view" admin_index="true" standalone="true" />
         <action name="dispCommentAdminDeclared" type="view" standalone="true" />
         <action name="procCommentVoteUp" type="controller" standalone="true" />

modules/comment/queries/getDeclaredList.xml

@@ -1,7 +1,7 @@
 <query id="getDeclaredList" action="select">
     <tables>
-        <table name="comments" alias="comments"/>
+        <table name="comments" alias="comments" />
-        <table name="comment_declared" alias="comment_declared"/>
+        <table name="comment_declared" alias="comment_declared" />
     </tables>
     <columns>
         <column name="*" />

modules/comment/queries/insertCommentVotedLog.xml

@@ -7,6 +7,6 @@
         <column name="member_srl" var="member_srl" filter="number" default="0" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="regdate" var="regdate" default="curdate()" />
-	    <column name="point" var="point" filter="number" default="0"/>
+	    <column name="point" var="point" filter="number" default="0" />
     </columns>
 </query>

modules/comment/schemas/comment_declared_log.xml

@@ -1,6 +1,6 @@
 <table name="comment_declared_log">
     <column name="comment_srl" type="number" size="11" notnull="notnull" index="idx_comment_srl" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
-    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>

modules/comment/schemas/comment_voted_log.xml

@@ -1,7 +1,7 @@
 <table name="comment_voted_log">
     <column name="comment_srl" type="number" size="11" notnull="notnull" index="idx_comment_srl" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
-    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="regdate" type="date" index="idx_regdate" />
     <column name="point" type="number" size="11" notnull="notnull" />
 </table>

modules/comment/schemas/comments.xml

@@ -18,6 +18,6 @@
     <column name="uploaded_count" type="number" size="11" default="0" notnull="notnull" index="idx_uploaded_count" />
     <column name="regdate" type="date" index="idx_regdate" />
     <column name="last_update" type="date" index="idx_last_update" />
-    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
 </table>

modules/communication/queries/getNewMessage.xml

@@ -1,7 +1,7 @@
 <query id="getNewMessage" action="select">
     <tables>
         <table name="member_message" alias="member_message" />
-        <table name="member" alias="member"/>
+        <table name="member" alias="member" />
     </tables>
     <columns>
         <column name="*" />

modules/communication/queries/getReceivedMessages.xml

@@ -1,6 +1,6 @@
 <query id="getReceivedMessages" action="select">
     <tables>
-        <table name="member_message" alias="message"/>
+        <table name="member_message" alias="message" />
         <table name="member" alias="member" />
     </tables>
     <columns>
@@ -13,7 +13,7 @@
     <conditions>
         <condition operation="equal" column="message.receiver_srl" var="member_srl" notnull="notnull" />
         <condition operation="equal" column="message.message_type" var="message_type" default="R" pipe="and" />
-        <condition operation="equal" column="message.sender_srl" var="member.member_srl" pipe="and"/>
+        <condition operation="equal" column="message.sender_srl" var="member.member_srl" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="message.list_order" order="asc" />

modules/communication/queries/getSendedMessages.xml

@@ -1,6 +1,6 @@
 <query id="getSendedMessages" action="select">
     <tables>
-        <table name="member_message" alias="message"/>
+        <table name="member_message" alias="message" />
         <table name="member" alias="member" />
     </tables>
     <columns>
@@ -13,7 +13,7 @@
     <conditions>
         <condition operation="equal" column="message.sender_srl" var="member_srl" notnull="notnull" />
         <condition operation="equal" column="message.message_type" var="message_type" default="S" pipe="and" />
-        <condition operation="equal" column="message.receiver_srl" var="member.member_srl" pipe="and"/>
+        <condition operation="equal" column="message.receiver_srl" var="member.member_srl" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="message.list_order" order="asc" />

modules/communication/queries/getStoredMessages.xml

@@ -1,6 +1,6 @@
 <query id="getStoredMessages" action="select">
     <tables>
-        <table name="member_message" alias="message"/>
+        <table name="member_message" alias="message" />
         <table name="member" alias="member" />
     </tables>
     <columns>
@@ -13,7 +13,7 @@
     <conditions>
         <condition operation="equal" column="message.receiver_srl" var="member_srl" notnull="notnull" />
         <condition operation="equal" column="message.message_type" var="message_type" default="T" pipe="and" />
-        <condition operation="equal" column="message.sender_srl" var="member.member_srl" pipe="and"/>
+        <condition operation="equal" column="message.sender_srl" var="member.member_srl" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="message.list_order" order="asc" />

modules/communication/queries/moveFriend.xml

@@ -6,7 +6,7 @@
         <column name="friend_group_srl" var="friend_group_srl" default="0" notnull="notnull" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
         <condition operation="in" column="friend_srl" var="friend_srls" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/communication/queries/setMessageReaded.xml

@@ -7,7 +7,7 @@
         <column name="readed_date" default="curdate()" />
     </columns>
     <conditions>
-        <condition operation="equal" column="message_srl" var="message_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="message_srl" var="message_srl" notnull="notnull" filter="number" />
         <condition operation="equal" column="related_srl" var="related_srl" notnull="notnull" filter="number" pipe="or" />
     </conditions>
 </query>

modules/communication/queries/setMessageStored.xml

@@ -6,7 +6,7 @@
         <column name="message_type" default="T" />
     </columns>
     <conditions>
-        <condition operation="equal" column="message_srl" var="message_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="message_srl" var="message_srl" notnull="notnull" filter="number" />
         <condition operation="equal" column="receiver_srl" var="receiver_srl" notnull="notnull" filter="number" pipe="and" />
     </conditions>
 </query>

modules/communication/queries/updateAllowMessage.xml

@@ -6,6 +6,6 @@
         <column name="allow_message" var="allow_message" default="Y" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
     </conditions>
 </query>

modules/counter/queries/getCounterLog.xml

@@ -3,7 +3,7 @@
         <table name="counter_log" />
     </tables>
     <columns>
-        <column name="count(*)" alias="count"/>
+        <column name="count(*)" alias="count" />
     </columns>
     <conditions>
         <condition operation="equal" column="site_srl" var="site_srl" default="0" pipe="and" />

modules/counter/queries/getSiteTodayStatus.xml

@@ -3,7 +3,7 @@
         <table name="counter_site_status" />
     </tables>
     <columns>
-        <column name="count(*)" alias="count"/>
+        <column name="count(*)" alias="count" />
     </columns>
     <conditions>
         <condition operation="equal" column="site_srl" var="site_srl" default="0" />

modules/counter/queries/getTodayStatus.xml

@@ -3,7 +3,7 @@
         <table name="counter_status" />
     </tables>
     <columns>
-        <column name="count(*)" alias="count"/>
+        <column name="count(*)" alias="count" />
     </columns>
     <conditions>
         <condition operation="equal" column="regdate" var="regdate" notnull="notnull" />

modules/counter/queries/insertCounterLog.xml

@@ -4,7 +4,7 @@
     </tables>
     <columns>
         <column name="site_srl" var="site_srl" notnull="notnull" default="0" />
-        <column name="regdate" var="regdate" default="curdate()" notnull="notnull"/>
+        <column name="regdate" var="regdate" default="curdate()" notnull="notnull" />
         <column name="ipaddress" var="ipaddress" notnull="notnull" default="ipaddress()" />
         <column name="user_agent" var="user_agent" />
     </columns>

modules/document/conf/module.xml

@@ -16,10 +16,10 @@
     <actions>
         <action name="dispDocumentPrint" type="view" standalone="true" />
         <action name="dispDocumentPreview" type="view" standalone="true" />
-        <action name="dispDocumentManageDocument" type="view" standalone="true"/>
+        <action name="dispDocumentManageDocument" type="view" standalone="true" />
 
-        <action name="getDocumentCategories" type="model" standalone="true"/>
+        <action name="getDocumentCategories" type="model" standalone="true" />
-        <action name="getDocumentMenu" type="model" standalone="true"/>
+        <action name="getDocumentMenu" type="model" standalone="true" />
 
         <action name="procDocumentVoteUp" type="controller" standalone="true" />
         <action name="procDocumentVoteDown" type="controller" standalone="true" />
@@ -34,17 +34,17 @@
         <action name="dispDocumentAdminDeclared" type="view" standalone="true" />
         <action name="dispDocumentAdminTrashList" type="view" standalone="true" />
 
-        <action name="getDocumentCategoryTplInfo" type="model" standalone="true"/>
+        <action name="getDocumentCategoryTplInfo" type="model" standalone="true" />
 
-        <action name="procDocumentInsertCategory" type="controller" standalone="true"/>
+        <action name="procDocumentInsertCategory" type="controller" standalone="true" />
-        <action name="procDocumentDeleteCategory" type="controller" standalone="true"/>
+        <action name="procDocumentDeleteCategory" type="controller" standalone="true" />
-        <action name="procDocumentMoveCategory" type="controller" standalone="true"/>
+        <action name="procDocumentMoveCategory" type="controller" standalone="true" />
-        <action name="procDocumentMakeXmlFile" type="controller" standalone="true"/>
+        <action name="procDocumentMakeXmlFile" type="controller" standalone="true" />
 
-        <action name="procDocumentAdminInsertAlias" type="controller" standalone="true"/>
+        <action name="procDocumentAdminInsertAlias" type="controller" standalone="true" />
-        <action name="procDocumentAdminDeleteAlias" type="controller" standalone="true"/>
+        <action name="procDocumentAdminDeleteAlias" type="controller" standalone="true" />
-        <action name="procDocumentAdminRestoreTrash" type="controller" standalone="true"/>
+        <action name="procDocumentAdminRestoreTrash" type="controller" standalone="true" />
-        <action name="procDocumentAdminMoveExtraVar" type="controller" standalone="true"/>
+        <action name="procDocumentAdminMoveExtraVar" type="controller" standalone="true" />
 
         <action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" />
         <action name="procDocumentAdminDeleteExtraVar" type="controller" standalone="true" />

modules/document/queries/getDailyArchivedList.xml

@@ -3,7 +3,7 @@
         <table name="documents" />
     </tables>
     <columns>
-        <column name="substr(regdate,1,8)" alias="month"/>
+        <column name="substr(regdate,1,8)" alias="month" />
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>

modules/document/queries/getDeclaredList.xml

@@ -1,7 +1,7 @@
 <query id="getDeclaredList" action="select">
     <tables>
-        <table name="documents" alias="documents"/>
+        <table name="documents" alias="documents" />
-        <table name="document_declared" alias="document_declared"/>
+        <table name="document_declared" alias="document_declared" />
     </tables>
     <columns>
         <column name="*" />

modules/document/queries/getDocumentDivisionCount.xml

@@ -3,7 +3,7 @@
         <table name="documents" />
     </tables>
     <columns>
-        <column name="count(*)" alias="count"/>
+        <column name="count(*)" alias="count" />
     </columns>
     <conditions>
         <condition operation="in" column="module_srl" var="module_srl" filter="number" />

modules/document/queries/getDocumentListWithinComment.xml

@@ -1,7 +1,7 @@
 <query id="getDocumentListWithinComment" action="select">
     <tables>
         <table name="documents" alias="documents" />
-        <table name="comments" alias="comments"/>
+        <table name="comments" alias="comments" />
     </tables>
     <columns>
         <column name="documents.document_srl" />

modules/document/queries/getDocumentListWithinMember.xml

@@ -1,7 +1,7 @@
 <query id="getDocumentListWithinMember" action="select">
     <tables>
         <table name="documents" alias="documents" />
-        <table name="member" alias="member"/>
+        <table name="member" alias="member" />
     </tables>
     <columns />
     <conditions>

modules/document/queries/getDocumentListWithinTag.xml

@@ -1,7 +1,7 @@
 <query id="getDocumentListWithinTag" action="select">
     <tables>
         <table name="documents" alias="documents" />
-        <table name="tags" alias="tags"/>
+        <table name="tags" alias="tags" />
     </tables>
     <columns>
         <column name="documents.document_srl" />

modules/document/queries/getMonthlyArchivedList.xml

@@ -3,7 +3,7 @@
         <table name="documents" />
     </tables>
     <columns>
-        <column name="substr(regdate,1,6)" alias="month"/>
+        <column name="substr(regdate,1,6)" alias="month" />
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>

modules/document/queries/insertDocumentVotedLog.xml

@@ -7,6 +7,6 @@
         <column name="member_srl" var="member_srl" filter="number" default="0" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="regdate" var="regdate" default="curdate()" />
-	    <column name="point" var="point" filter="number" default="0"/>
+	    <column name="point" var="point" filter="number" default="0" />
     </columns>
 </query>

modules/document/schemas/document_declared_log.xml

@@ -1,6 +1,6 @@
 <table name="document_declared_log">
     <column name="document_srl" type="number" size="11" notnull="notnull" index="idx_document_srl" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
-    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>

modules/document/schemas/document_histories.xml

@@ -6,5 +6,5 @@
     <column name="nick_name" type="varchar" size="80" notnull="notnull" />
     <column name="member_srl" type="number" size="11" />
     <column name="regdate" type="date" index="idx_regdate" />
-    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
 </table>

modules/document/schemas/document_readed_log.xml

@@ -1,6 +1,6 @@
 <table name="document_readed_log">
     <column name="document_srl" type="number" size="11" notnull="notnull" index="idx_document_srl" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
-    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>

modules/document/schemas/document_voted_log.xml

@@ -1,7 +1,7 @@
 <table name="document_voted_log">
     <column name="document_srl" type="number" size="11" notnull="notnull" index="idx_document_srl" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
-    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="regdate" type="date" index="idx_regdate" />
     <column name="point" type="number" size="11" notnull="notnull" />
 </table>

modules/document/schemas/documents.xml

@@ -27,7 +27,7 @@
     <column name="regdate" type="date" index="idx_regdate " />
     <column name="last_update" type="date" index="idx_last_update" />
     <column name="last_updater" type="varchar" size="80" />
-    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
     <column name="update_order" type="number" size="11" notnull="notnull" index="idx_update_order" />
     <column name="allow_comment" type="char" size="1" default="Y" notnull="notnull" />

modules/editor/queries/getComponent.xml

@@ -6,6 +6,6 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="component_name" var="component_name" notnull="notnull"/>
+        <condition operation="equal" column="component_name" var="component_name" notnull="notnull" />
     </conditions>
 </query>

modules/editor/queries/getSiteComponent.xml

@@ -6,7 +6,7 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
-        <condition operation="equal" column="component_name" var="component_name" notnull="notnull" pipe="and"/>
+        <condition operation="equal" column="component_name" var="component_name" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/editor/queries/getSiteComponentList.xml

@@ -6,7 +6,7 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
         <condition operation="equal" column="enabled" var="enabled" pipe="and" />
     </conditions>
     <navigation>

modules/editor/queries/isSiteComponentInserted.xml

@@ -6,7 +6,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
         <condition operation="equal" column="component_name" var="component_name" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/editor/queries/updateSiteComponent.xml

@@ -8,7 +8,7 @@
         <column name="list_order" var="list_order" />
     </columns>
     <conditions>
-        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
         <condition operation="equal" column="component_name" var="component_name" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/editor/schemas/editor_components.xml

@@ -1,6 +1,6 @@
 <table name="editor_components">
     <column name="component_name" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
     <column name="enabled" type="char" size="1" default="N" notnull="notnull" />
-    <column name="extra_vars" type="text"/>
+    <column name="extra_vars" type="text" />
     <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
 </table>

modules/editor/schemas/editor_components_site.xml

@@ -2,6 +2,6 @@
     <column name="site_srl" type="number" size="11" notnull="notnull" default="0" unique="unique_component_site" />
     <column name="component_name" type="varchar" size="250" notnull="notnull" unique="unique_component_site" />
     <column name="enabled" type="char" size="1" default="N" notnull="notnull" />
-    <column name="extra_vars" type="text"/>
+    <column name="extra_vars" type="text" />
     <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
 </table>

modules/file/queries/getOneFileInDocument.xml

@@ -1,11 +1,11 @@
 <query id="getOneFileInDocument" action="select">
     <tables>
-        <table name="files" alias="files"/>
+        <table name="files" alias="files" />
-        <table name="modules" alias="modules"/>
+        <table name="modules" alias="modules" />
-        <table name="documents" alias="documents"/>
+        <table name="documents" alias="documents" />
     </tables>
     <columns>
-        <column name="files.upload_target_srl" alias="document_srl"/>
+        <column name="files.upload_target_srl" alias="document_srl" />
     </columns>
     <conditions>
         <condition operation="equal" column="modules.site_srl" var="site_srl" />

modules/install/install.model.php

@@ -40,7 +40,6 @@ class installModel extends install {
 
 	function getInstallFTPList()
 	{
-		require_once(_XE_PATH_.'libs/ftp.class.php');
 		$ftp_info =  Context::getRequestVars();
 		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) 
 		{
@@ -57,16 +56,40 @@ class installModel extends install {
 			return $this->getSFTPList();
 		}
 
-		$oFtp = new ftp();
+		if(function_exists(ftp_connect))
-		if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)){
+		{
-			if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
+			$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-				$_list = $oFtp->ftp_rawlist($this->pwd);
+			if(!$connection) return new Object(-1, 'msg_ftp_not_connected');
-				$oFtp->ftp_quit();
+			$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password); 
-			}
+			if(!$login_result)
-			else
 			{
+				ftp_close($connection);	
 				return new Object(-1,'msg_ftp_invalid_auth_info');
 			}
+
+			if($ftp_info->ftp_pasv != "N") 
+			{
+				ftp_pasv($connection, true);
+			}
+
+			$_list = ftp_rawlist($connection, $this->pwd);
+			ftp_close($connection);	
+		}
+		else
+		{
+			require_once(_XE_PATH_.'libs/ftp.class.php');
+			$oFtp = new ftp();
+			if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)){
+				if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
+					$_list = $oFtp->ftp_rawlist($this->pwd);
+					$oFtp->ftp_quit();
+				}
+				else
+				{
+					$oFtp->ftp_quit();
+					return new Object(-1,'msg_ftp_invalid_auth_info');
+				}
+			}
 		}
 		$list = array();
 

modules/install/tpl/filter/cubrid.xml

@@ -3,16 +3,16 @@
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
         <node target="db_port" minlength="1" maxlength="250" />
-        <node target="db_userid" required="true" minlength="1" maxlength="250"/>
+        <node target="db_userid" required="true" minlength="1" maxlength="250" />
         <node target="db_password" required="true" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
-        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha"/>
+        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
         <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
         <node target="password1" required="true" minlength="1" maxlength="20" />
         <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
         <node target="user_name" required="true" minlength="2" maxlength="20" />
         <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />

modules/install/tpl/filter/firebird.xml

@@ -3,16 +3,16 @@
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
         <node target="db_port" minlength="1" maxlength="250" />
-        <node target="db_userid" required="true" minlength="1" maxlength="250"/>
+        <node target="db_userid" required="true" minlength="1" maxlength="250" />
         <node target="db_password" required="true" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
-        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha"/>
+        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
         <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
         <node target="password1" required="true" minlength="1" maxlength="20" />
         <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
         <node target="user_name" required="true" minlength="2" maxlength="20" />
         <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />

modules/install/tpl/filter/mssql.xml

@@ -4,13 +4,13 @@
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
         <node target="db_port" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
-        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha"/>
+        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
         <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
         <node target="password1" required="true" minlength="1" maxlength="20" />
         <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
         <node target="user_name" required="true" minlength="2" maxlength="20" />
         <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />

modules/install/tpl/filter/mysql.xml

@@ -3,16 +3,16 @@
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
         <node target="db_port" minlength="1" maxlength="250" />
-        <node target="db_userid" required="true" minlength="1" maxlength="250"/>
+        <node target="db_userid" required="true" minlength="1" maxlength="250" />
         <node target="db_password" required="true" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
-        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha"/>
+        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
         <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
         <node target="password1" required="true" minlength="1" maxlength="20" />
         <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
         <node target="user_name" required="true" minlength="2" maxlength="20" />
         <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />

modules/install/tpl/filter/postgresql.xml

@@ -3,15 +3,15 @@
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
         <node target="db_port" minlength="1" maxlength="250" />
-        <node target="db_userid" required="true" minlength="1" maxlength="250"/>
+        <node target="db_userid" required="true" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
-        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha"/>
+        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
         <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
         <node target="password1" required="true" minlength="1" maxlength="20" />
         <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
         <node target="user_name" required="true" minlength="2" maxlength="20" />
         <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />

modules/install/tpl/filter/sqlite2.xml

@@ -2,13 +2,13 @@
     <form>
         <node target="db_type" required="true" />
         <node target="db_database_file" required="true" minlength="1" maxlength="250" />
-        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha"/>
+        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
         <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
         <node target="password1" required="true" minlength="1" maxlength="20" />
         <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
         <node target="user_name" required="true" minlength="2" maxlength="20" />
         <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />

modules/layout/queries/updateModuleLayout.xml

@@ -6,6 +6,6 @@
         <column name="layout_srl" var="layout_srl" />
     </columns>
     <conditions>
-        <condition operation="in" column="module_srl" var="module_srls" notnull="notnull"/>
+        <condition operation="in" column="module_srl" var="module_srls" notnull="notnull" />
     </conditions>
 </query>

modules/member/member.model.php

@@ -83,7 +83,7 @@
 
                 // 메일 보내기
                 if($member_info->email_address) {
-                    $url = 'mailto:'.$member_info->email_address;
+                    $url = 'mailto:'.htmlspecialchars($member_info->email_address);
                     $icon_path = './modules/member/tpl/images/icon_sendmail.gif';
                     $oMemberController->addMemberPopupMenu($url,'cmd_send_email',$icon_path);
                 }
@@ -91,11 +91,11 @@
 
             // 홈페이지 보기
             if($member_info->homepage)
-                $oMemberController->addMemberPopupMenu($member_info->homepage, 'homepage', './modules/member/tpl/images/icon_homepage.gif','blank');
+                $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage), 'homepage', './modules/member/tpl/images/icon_homepage.gif','blank');
 
             // 블로그 보기
             if($member_info->blog)
-                $oMemberController->addMemberPopupMenu($member_info->blog, 'blog', './modules/member/tpl/images/icon_blog.gif','blank');
+                $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog), 'blog', './modules/member/tpl/images/icon_blog.gif','blank');
 
             // trigger 호출 (after)
             ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);

modules/member/queries/changeGroup.xml

@@ -6,6 +6,6 @@
         <column name="group_srl" var="target_group_srl" filter="number" notnull="notnull" />
     </columns>
     <conditions>
-        <condition operation="equal" column="group_srl" var="source_group_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="group_srl" var="source_group_srl" notnull="notnull" filter="number" />
     </conditions>
 </query>

modules/member/queries/getAutologin.xml

@@ -1,6 +1,6 @@
 <query id="getAutologin" action="select">
     <tables>
-        <table name="member" alias="member"/>
+        <table name="member" alias="member" />
         <table name="member_autologin" alias="member_autologin" />
     </tables>
     <columns>

modules/member/queries/getMemberGroups.xml

@@ -1,7 +1,7 @@
 <query id="getMemberGroups" action="select">
     <tables>
-        <table name="member_group" alias="a"/>
+        <table name="member_group" alias="a" />
-        <table name="member_group_member" alias="b"/>
+        <table name="member_group_member" alias="b" />
     </tables>
     <columns>
         <column name="a.title" alias="title" />

modules/member/queries/getMemberListWithinGroup.xml

@@ -1,7 +1,7 @@
 <query id="getMemberListWithinGroup" action="select">
     <tables>
-        <table name="member" alias="member"/>
+        <table name="member" alias="member" />
-        <table name="member_group_member" alias="member_group"/>
+        <table name="member_group_member" alias="member_group" />
     </tables>
     <columns />
     <conditions>

modules/member/queries/getMembersGroup.xml

@@ -1,7 +1,7 @@
 <query id="getMembersGroup" action="select">
     <tables>
-        <table name="member_group" alias="a"/>
+        <table name="member_group" alias="a" />
-        <table name="member_group_member" alias="b"/>
+        <table name="member_group_member" alias="b" />
     </tables>
     <columns>
         <column name="a.group_srl" alias="group_srl" />

modules/member/queries/getMembersGroups.xml

@@ -1,7 +1,7 @@
 <query id="getMembersGroups" action="select">
     <tables>
-        <table name="member_group" alias="a"/>
+        <table name="member_group" alias="a" />
-        <table name="member_group_member" alias="b"/>
+        <table name="member_group_member" alias="b" />
     </tables>
     <columns>
         <column name="a.title" alias="title" />

modules/member/queries/getSiteMemberList.xml

@@ -9,8 +9,8 @@
         <column name="member_group_member.regdate" alias="regdate" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_group.site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="member_group.site_srl" var="site_srl" notnull="notnull" />
-        <condition operation="equal" column="member_group_member.group_srl" default="member_group.group_srl" notnull="notnull" pipe="and"/>
+        <condition operation="equal" column="member_group_member.group_srl" default="member_group.group_srl" notnull="notnull" pipe="and" />
         <condition operation="equal" column="member.member_srl" var="member_group_member.member_srl" pipe="and" />
     </conditions>
     <navigation>

modules/member/queries/updateAuthMail.xml

@@ -8,6 +8,6 @@
         <column name="regdate" default="curdate()" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
     </conditions>
 </query>

modules/member/queries/updateJoinForm.xml

@@ -12,6 +12,6 @@
         <column name="description" var="description" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_join_form_srl" var="member_join_form_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="member_join_form_srl" var="member_join_form_srl" notnull="notnull" filter="number" />
     </conditions>
 </query>

modules/member/queries/updateLastLogin.xml

@@ -7,6 +7,6 @@
         <column name="last_login" var="last_login" notnull="notnull" default="curdate()" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
     </conditions>
 </query>

modules/member/queries/updateMember.xml

@@ -21,6 +21,6 @@
         <column name="extra_vars" var="extra_vars" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
     </conditions>
 </query>

modules/member/queries/updateMemberPassword.xml

@@ -7,6 +7,6 @@
         <column name="denied" var="denied" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
     </conditions>
 </query>

modules/member/schemas/member.xml

@@ -5,8 +5,8 @@
     <column name="password" type="varchar" size="60" notnull="notnull" />
     <column name="email_id" type="varchar" size="80" notnull="notnull" />
     <column name="email_host" type="varchar" size="160" index="idx_email_host" />
-    <column name="user_name" type="varchar" size="40" notnull="notnull"/>
+    <column name="user_name" type="varchar" size="40" notnull="notnull" />
-    <column name="nick_name" type="varchar" size="40" notnull="notnull" unique="unique_nick_name"/>
+    <column name="nick_name" type="varchar" size="40" notnull="notnull" unique="unique_nick_name" />
     <column name="homepage" type="varchar" size="250" />
     <column name="blog" type="varchar" size="250" />
     <column name="birthday" type="char" size="8" />

modules/member/schemas/member_auth_mail.xml

@@ -1,5 +1,5 @@
 <table name="member_auth_mail">
-    <column name="auth_key" type="varchar" size="60" notnull="notnull" unique="unique_key"/>
+    <column name="auth_key" type="varchar" size="60" notnull="notnull" unique="unique_key" />
     <column name="member_srl" type="number" size="11" notnull="notnull" unique="unique_key" />
     <column name="user_id" type="varchar" size="80" notnull="notnull" />
     <column name="new_password" type="varchar" size="80" notnull="notnull" />

modules/member/schemas/member_openid_nonce.xml

@@ -1,4 +1,4 @@
 <table name="member_openid_nonce">
-    <column name="nonce" type="char" size="8" notnull="notnull" primary_key="primary_key"/>
+    <column name="nonce" type="char" size="8" notnull="notnull" primary_key="primary_key" />
     <column name="expires" type="number" size="11" />
 </table>

modules/member/skins/default/filter/add_openid_to_member.xml

@@ -1,6 +1,6 @@
 <filter name="add_openid_to_member" module="member" act="procMemberAddOpenIDToMember">
     <form>
-        <node target="openid" required="true" minlength="2" maxlength="80"/>
+        <node target="openid" required="true" minlength="2" maxlength="80" />
     </form>
     <parameter>
         <param name="openid" target="openid" />

modules/member/skins/default/filter/delete_openid_from_member.xml

@@ -1,6 +1,6 @@
 <filter name="delete_openid_from_member" module="member" act="procMemberDeleteOpenIDFromMember">
     <form>
-        <node target="openid_to_delete" required="true" minlength="2" maxlength="80"/>
+        <node target="openid_to_delete" required="true" minlength="2" maxlength="80" />
     </form>
     <parameter>
         <param name="openid_to_delete" target="openid_to_delete" />

modules/member/skins/default/filter/login.xml

@@ -1,6 +1,6 @@
 <filter name="login" module="member" act="procMemberLogin">
     <form>
-        <node target="user_id" required="true" filter="user_id"/>
+        <node target="user_id" required="true" filter="user_id" />
         <node target="password" required="true" />
     </form>
     <parameter />

modules/member/skins/default/filter/modify_info.xml

@@ -1,8 +1,8 @@
 <filter name="modify_info" module="member" act="procMemberModifyInfo" extend_filter="member.getJoinFormList" confirm_msg_code="confirm_submit">
     <form>
-        <node target="user_name" required="true" minlength="2" maxlength="40"/>
+        <node target="user_name" required="true" minlength="2" maxlength="40" />
-        <node target="nick_name" required="true" minlength="2" maxlength="40"/>
+        <node target="nick_name" required="true" minlength="2" maxlength="40" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="accept_agreement" target="accept_agreement" />

modules/member/skins/default/filter/signup.xml

@@ -5,7 +5,7 @@
         <node target="password2" required="true" minlength="6" maxlength="20" equalto="password1" />
         <node target="user_name" required="true" minlength="2" maxlength="40" />
         <node target="nick_name" required="true" minlength="2" maxlength="40" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="accept_agreement" target="accept_agreement" />

modules/member/tpl/filter/insert.xml

@@ -3,7 +3,7 @@
         <node target="user_id" required="true" minlength="3" maxlength="20" />
         <node target="user_name" required="true" minlength="2" maxlength="40" />
         <node target="nick_name" required="true" minlength="2" maxlength="40" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="page" target="page" />

modules/member/tpl/filter/insert_join_form.xml

@@ -1,7 +1,7 @@
 <filter name="insert_join_form" module="member" act="procMemberAdminInsertJoinForm" confirm_msg_code="confirm_submit">
     <form>
         <node target="column_type" required="true" />
-        <node target="column_name" required="true" filter="alpha"/>
+        <node target="column_name" required="true" filter="alpha" />
         <node target="column_title" required="true" />
     </form>
     <response callback_func="completeInsertJoinForm">

modules/member/tpl/filter/update_member.xml

@@ -2,7 +2,7 @@
     <form>
         <node target="user_name" required="true" minlength="2" maxlength="40" />
         <node target="nick_name" required="true" minlength="2" maxlength="40" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="page" target="page" />

modules/menu/queries/getMaxListorder.xml

@@ -7,7 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
-        <condition operation="equal" column="parent_srl" var="parent_srl" filter="number" notnull="notnull" pipe="and"/>
+        <condition operation="equal" column="parent_srl" var="parent_srl" filter="number" notnull="notnull" pipe="and" />
-        <condition operation="more" column="menu_item_srl" var="menu_item_srl" filter="number" pipe="and"/>
+        <condition operation="more" column="menu_item_srl" var="menu_item_srl" filter="number" pipe="and" />
     </conditions>
 </query>

modules/menu/queries/getMinListorder.xml

@@ -8,6 +8,6 @@
     <conditions>
         <condition operation="equal" column="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
         <condition operation="equal" column="parent_srl" var="parent_srl" filter="number" notnull="notnull" pipe="and" />
-        <condition operation="more" column="menu_item_srl" var="menu_item_srl" filter="number" pipe="and"/>
+        <condition operation="more" column="menu_item_srl" var="menu_item_srl" filter="number" pipe="and" />
     </conditions>
 </query>

modules/message/conf/module.xml

@@ -3,8 +3,8 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispMessage" type="view" standalone="true" index="true"/>
+        <action name="dispMessage" type="view" standalone="true" index="true" />
-        <action name="dispMessageAdminConfig" type="view" standalone="true" admin_index="true"/>
+        <action name="dispMessageAdminConfig" type="view" standalone="true" admin_index="true" />
         <action name="procMessageAdminInsertConfig" type="controller" standalone="true" />
     </actions>
 </module>

modules/message/skins/default/filter/login.xml

@@ -1,6 +1,6 @@
 <filter name="message_login" module="member" act="procMemberLogin">
   <form>
-    <node target="user_id" required="true" filter="user_id"/>
+    <node target="user_id" required="true" filter="user_id" />
     <node target="password" required="true" />
   </form>
   <parameter />

modules/module/queries/deleteAdminId.xml

@@ -4,6 +4,6 @@
     </tables>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and"/>
+        <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
     </conditions>
 </query>

modules/module/queries/deleteModule.xml

@@ -3,6 +3,6 @@
         <table name="modules" />
     </tables>
     <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" pipe="and"/>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/module/queries/deleteModuleCategory.xml

@@ -3,6 +3,6 @@
         <table name="module_categories" />
     </tables>
     <conditions>
-        <condition operation="equal" column="module_category_srl" var="module_category_srl" filter="number" notnull="notnull"/>
+        <condition operation="equal" column="module_category_srl" var="module_category_srl" filter="number" notnull="notnull" />
     </conditions>
 </query>

modules/module/queries/deleteModulePartConfig.xml

@@ -4,6 +4,6 @@
     </tables>
     <conditions>
         <condition operation="equal" column="module" var="module" notnull="notnull" />
-        <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" pipe="and"/>
+        <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/module/queries/getAdminID.xml

@@ -8,6 +8,6 @@
     </columns>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" />
-        <condition operation="equal" column="member.member_srl" default="module_admins.member_srl" notnull="notnull" pipe="and"/>
+        <condition operation="equal" column="member.member_srl" default="module_admins.member_srl" notnull="notnull" pipe="and" />
     </conditions>
 </query>

modules/module/queries/getMidInfo.xml

@@ -8,6 +8,6 @@
     <conditions>
         <condition operation="equal" column="mid" var="mid" />
         <condition operation="equal" column="module_srl" var="module_srl" pipe="and" />
-        <condition operation="equal" column="site_srl" var="site_srl" pipe="and"/>
+        <condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
     </conditions>
 </query>

modules/module/queries/getModuleCategory.xml

@@ -4,6 +4,6 @@
     </tables>
     <columns />
     <conditions>
-        <condition operation="equal" column="module_category_srl" var="module_category_srl" filter="number" notnull="notnull"/>
+        <condition operation="equal" column="module_category_srl" var="module_category_srl" filter="number" notnull="notnull" />
     </conditions>
 </query>

modules/module/queries/getModuleCount.xml

@@ -6,7 +6,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
         <condition operation="equal" column="module" var="module" pipe="and" />
     </conditions>
 </query>