From 762ebbf445555d8230ee22871278f4a5f9fa8124 Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 8 Jun 2010 08:29:56 +0000 Subject: [PATCH] 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 | 6 +- classes/db/DB.class.php | 119 +++++++++--------- classes/db/DBCubrid.class.php | 25 ++-- common/script.php | 2 +- config/config.inc.php | 2 +- modules/addon/schemas/addons.xml | 2 +- modules/addon/schemas/addons_site.xml | 4 +- modules/admin/conf/module.xml | 2 +- modules/admin/lang/zh-TW.lang.php | 12 +- .../queries/getCommentDeclaredStatus.xml | 2 +- modules/admin/queries/getCommentStatus.xml | 2 +- .../queries/getDocumentDeclaredStatus.xml | 2 +- modules/admin/queries/getDocumentStatus.xml | 2 +- modules/admin/queries/getMemberStatus.xml | 2 +- modules/admin/queries/getTrackbackStatus.xml | 2 +- modules/autoinstall/autoinstall.lib.php | 2 +- modules/comment/conf/module.xml | 2 +- modules/comment/queries/getDeclaredList.xml | 4 +- .../comment/queries/insertCommentVotedLog.xml | 2 +- .../comment/schemas/comment_declared_log.xml | 2 +- modules/comment/schemas/comment_voted_log.xml | 2 +- modules/comment/schemas/comments.xml | 2 +- .../communication/queries/getNewMessage.xml | 2 +- .../queries/getReceivedMessages.xml | 4 +- .../queries/getSendedMessages.xml | 4 +- .../queries/getStoredMessages.xml | 4 +- modules/communication/queries/moveFriend.xml | 2 +- .../queries/setMessageReaded.xml | 2 +- .../queries/setMessageStored.xml | 2 +- .../queries/updateAllowMessage.xml | 2 +- modules/counter/queries/getCounterLog.xml | 2 +- .../counter/queries/getSiteTodayStatus.xml | 2 +- modules/counter/queries/getTodayStatus.xml | 2 +- modules/counter/queries/insertCounterLog.xml | 2 +- modules/document/conf/module.xml | 24 ++-- .../document/queries/getDailyArchivedList.xml | 2 +- modules/document/queries/getDeclaredList.xml | 4 +- .../queries/getDocumentDivisionCount.xml | 2 +- .../queries/getDocumentListWithinComment.xml | 2 +- .../queries/getDocumentListWithinMember.xml | 2 +- .../queries/getDocumentListWithinTag.xml | 2 +- .../queries/getMonthlyArchivedList.xml | 2 +- .../queries/insertDocumentVotedLog.xml | 2 +- .../schemas/document_declared_log.xml | 2 +- .../document/schemas/document_histories.xml | 2 +- .../document/schemas/document_readed_log.xml | 2 +- .../document/schemas/document_voted_log.xml | 2 +- modules/document/schemas/documents.xml | 2 +- modules/editor/queries/getComponent.xml | 2 +- modules/editor/queries/getSiteComponent.xml | 4 +- .../editor/queries/getSiteComponentList.xml | 2 +- .../queries/isSiteComponentInserted.xml | 2 +- .../editor/queries/updateSiteComponent.xml | 2 +- modules/editor/schemas/editor_components.xml | 2 +- .../editor/schemas/editor_components_site.xml | 2 +- modules/file/queries/getOneFileInDocument.xml | 8 +- modules/install/install.model.php | 39 ++++-- modules/install/tpl/filter/cubrid.xml | 6 +- modules/install/tpl/filter/firebird.xml | 6 +- modules/install/tpl/filter/mssql.xml | 4 +- modules/install/tpl/filter/mysql.xml | 6 +- modules/install/tpl/filter/postgresql.xml | 6 +- modules/install/tpl/filter/sqlite2.xml | 4 +- modules/layout/queries/updateModuleLayout.xml | 2 +- modules/member/member.model.php | 6 +- modules/member/queries/changeGroup.xml | 2 +- modules/member/queries/getAutologin.xml | 2 +- modules/member/queries/getMemberGroups.xml | 4 +- .../queries/getMemberListWithinGroup.xml | 4 +- modules/member/queries/getMembersGroup.xml | 4 +- modules/member/queries/getMembersGroups.xml | 4 +- modules/member/queries/getSiteMemberList.xml | 4 +- modules/member/queries/updateAuthMail.xml | 2 +- modules/member/queries/updateJoinForm.xml | 2 +- modules/member/queries/updateLastLogin.xml | 2 +- modules/member/queries/updateMember.xml | 2 +- .../member/queries/updateMemberPassword.xml | 2 +- modules/member/schemas/member.xml | 4 +- modules/member/schemas/member_auth_mail.xml | 2 +- .../member/schemas/member_openid_nonce.xml | 2 +- .../default/filter/add_openid_to_member.xml | 2 +- .../filter/delete_openid_from_member.xml | 2 +- modules/member/skins/default/filter/login.xml | 2 +- .../skins/default/filter/modify_info.xml | 6 +- .../member/skins/default/filter/signup.xml | 2 +- modules/member/tpl/filter/insert.xml | 2 +- .../member/tpl/filter/insert_join_form.xml | 2 +- modules/member/tpl/filter/update_member.xml | 2 +- modules/menu/queries/getMaxListorder.xml | 4 +- modules/menu/queries/getMinListorder.xml | 2 +- modules/message/conf/module.xml | 4 +- .../message/skins/default/filter/login.xml | 2 +- modules/module/queries/deleteAdminId.xml | 2 +- modules/module/queries/deleteModule.xml | 2 +- .../module/queries/deleteModuleCategory.xml | 2 +- .../module/queries/deleteModulePartConfig.xml | 2 +- modules/module/queries/getAdminID.xml | 2 +- modules/module/queries/getMidInfo.xml | 2 +- modules/module/queries/getModuleCategory.xml | 2 +- modules/module/queries/getModuleCount.xml | 2 +- modules/module/queries/getModulesInfo.xml | 2 +- modules/module/queries/getSiteAdmin.xml | 2 +- modules/module/queries/getSiteCount.xml | 2 +- modules/module/queries/getSiteModules.xml | 2 +- modules/module/queries/insertModule.xml | 2 +- .../module/queries/insertModuleCategory.xml | 2 +- modules/module/queries/isSiteAdmin.xml | 2 +- modules/module/queries/updateModule.xml | 6 +- .../module/queries/updateModuleCategory.xml | 4 +- .../module/queries/updateModuleFileBox.xml | 28 ++--- modules/module/queries/updateModuleLayout.xml | 2 +- modules/module/queries/updateModuleMenu.xml | 2 +- modules/module/queries/updateModuleSite.xml | 2 +- .../module/queries/updateModuleSkinVars.xml | 2 +- modules/module/schemas/action_forward.xml | 2 +- modules/module/schemas/modules.xml | 6 +- modules/module/tpl/filter/insert_lang.xml | 2 +- modules/point/queries/getCommentPoint.xml | 2 +- modules/point/queries/getCommentUsers.xml | 2 +- modules/point/queries/getDocumentPoint.xml | 2 +- modules/point/queries/getFilePoint.xml | 2 +- modules/point/queries/getMemberList.xml | 4 +- .../queries/getMemberListWithinGroup.xml | 6 +- modules/poll/queries/getPollLog.xml | 2 +- modules/spamfilter/queries/insertLog.xml | 2 +- modules/widget/widget.controller.php | 15 +-- .../skins/xe_official/filter/login.xml | 2 +- 127 files changed, 303 insertions(+), 283 deletions(-) diff --git a/addons/blogapi/conf/info.xml b/addons/blogapi/conf/info.xml index f9ad5589b..4850ac4ee 100644 --- a/addons/blogapi/conf/info.xml +++ b/addons/blogapi/conf/info.xml @@ -58,10 +58,10 @@ тег RSD и api работают только при включенном аддоне. - 支援MetaWeblog的部落格API附加元件。 - 設置成"啟用"時，會使每個模組都顯示RSD圖示。 + 支援 MetaWeblog 的部落格 API 附加元件。 + 設置成"啟用"時，會使每個模組都顯示 RSD 圖示。 API網址是 http://安裝位置/模組名稱/api。 - 將狀態設置成"啟用"時，才可使用RSD和API + 將狀態設置成"啟用"時，才可使用 RSD 和 API 0.1 2007-02-28 diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index 4dcf5639a..29de6cf01 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -47,8 +47,8 @@ /** * @brief returns instance of certain db type - * @param[in] $db_type type of db - * @return instance + * @param[in] $db_type type of db + * @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 - * @return true: is supported, false: is not supported + * @param[in] $db_type type of db to check + * @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 = ''."\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] $errstr error message - * @return none + * @param[in] $errno error code + * @param[in] $errstr error message + * @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 - * @return result of query + * @param[in] $args arguments for 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 - * @return cache file + * @param[in] $xml_file original xml query 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] $source_args arguments for query - * @param[in] $query_id query id - * @return result of query + * @param[in] $cache_file cache file of query + * @param[in] $source_args arguments for query + * @param[in] $query_id query id + * @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] $val value of $key - * @param[in] $filter_type type of filter to check $val - * @return object + * @param[in] $key key value + * @param[in] $val value of $key + * @param[in] $filter_type type of filter to check $val + * @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] $name name of column type - * @return column type of $name + * @param[in] $column_type_list list of column type + * @param[in] $name name of column type + * @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] $value value of condition - * @param[in] $operation operation this is used in condition - * @param[in] $type type of condition - * @param[in] $column_type type of column - * @return well modified $value + * @param[in] $name name of condition + * @param[in] $value value of condition + * @param[in] $operation operation this is used in condition + * @param[in] $type type of condition + * @param[in] $column_type type of column + * @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] $value value of condition - * @param[in] $operation operation that is used in condition - * @return detail condition + * @param[in] $name name of condition + * @param[in] $value value of condition + * @param[in] $operation operation that is used in 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 - * @return array of conditions of $output + * @param[in] $output result of query + * @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] $condition condition to get data - * @return count of cache data + * @param[in] $tables tables to get data + * @param[in] $condition condition to get 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] $condition condition to save data - * @param[in] $count count of cache data to save - * @return none + * @param[in] $tables tables to save data + * @param[in] $condition condition to save data + * @param[in] $count count of cache data to save + * @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 - * @return true: success, false: failed + * @param[in] $tables tables to reset cache data + * @return true: success, false: failed **/ function resetCountCache($tables) { return false; @@ -600,10 +601,10 @@ return true; } - /** - * @brief returns supported database list - * @return list of supported database - **/ + /** + * @brief returns supported database list + * @return list of supported database + **/ function getSupportedDatabase(){ $result = array(); diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index 4165936e2..f0a3955b6 100644 --- a/classes/db/DBCubrid.class.php +++ b/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'", - $column_name, $this->prefix, $table_name); + $query = sprintf("select * from \"db_attribute\" where \"attr_name\" ='%s' and \"class_name\" = '%s%s'", + $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); } diff --git a/common/script.php b/common/script.php index 23aa51045..2d232dd3e 100644 --- a/common/script.php +++ b/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"); diff --git a/config/config.inc.php b/config/config.inc.php index 85dae4044..c43cba6b8 100644 --- a/config/config.inc.php +++ b/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를 구함 diff --git a/modules/addon/schemas/addons.xml b/modules/addon/schemas/addons.xml index e83c7d9b7..566bc989f 100644 --- a/modules/addon/schemas/addons.xml +++ b/modules/addon/schemas/addons.xml @@ -1,6 +1,6 @@ - +
diff --git a/modules/addon/schemas/addons_site.xml b/modules/addon/schemas/addons_site.xml index fc156ae09..550ef3bfa 100644 --- a/modules/addon/schemas/addons_site.xml +++ b/modules/addon/schemas/addons_site.xml @@ -1,7 +1,7 @@ - + - +
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml index c5a0470f4..853f8f60a 100644 --- a/modules/admin/conf/module.xml +++ b/modules/admin/conf/module.xml @@ -3,7 +3,7 @@ - + diff --git a/modules/admin/lang/zh-TW.lang.php b/modules/admin/lang/zh-TW.lang.php index 85205026a..6a5b2f3f0 100644 --- a/modules/admin/lang/zh-TW.lang.php +++ b/modules/admin/lang/zh-TW.lang.php @@ -69,11 +69,11 @@ $lang->about_recompile_cache = "可有效的整理錯誤的暫存檔"; $lang->use_ssl = "SSL功能"; $lang->ssl_options = array( - 'none' => "禁止使用", - 'optional' => "選擇使用", - 'always' => "總是使用" + 'none' => "關閉", + 'optional' => "手動", + 'always' => "開啟" ); - $lang->about_use_ssl = "當會員登入或修改資料等動作時，可選擇是否使用 SSL 功能。"; + $lang->about_use_ssl = "選擇手動時，在會員註冊或修改資料等動作時才會使用 SSL 功能。
選擇開啟時，所有的服務都會使用 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_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->msg_ftp_invalid_path = '指定的 FTP 路徑讀取失敗。'; + $lang->msg_self_restart_cache_engine = '請重新啟動 Memcached 快取程式。'; ?> diff --git a/modules/admin/queries/getCommentDeclaredStatus.xml b/modules/admin/queries/getCommentDeclaredStatus.xml index 9b7f0e21b..63f5ae3ef 100644 --- a/modules/admin/queries/getCommentDeclaredStatus.xml +++ b/modules/admin/queries/getCommentDeclaredStatus.xml @@ -7,7 +7,7 @@ - + diff --git a/modules/admin/queries/getCommentStatus.xml b/modules/admin/queries/getCommentStatus.xml index f50198b00..d5612e430 100644 --- a/modules/admin/queries/getCommentStatus.xml +++ b/modules/admin/queries/getCommentStatus.xml @@ -7,7 +7,7 @@ - + diff --git a/modules/admin/queries/getDocumentDeclaredStatus.xml b/modules/admin/queries/getDocumentDeclaredStatus.xml index 160dce597..d50927d38 100644 --- a/modules/admin/queries/getDocumentDeclaredStatus.xml +++ b/modules/admin/queries/getDocumentDeclaredStatus.xml @@ -7,7 +7,7 @@ - + diff --git a/modules/admin/queries/getDocumentStatus.xml b/modules/admin/queries/getDocumentStatus.xml index dab021a1e..4343f7caf 100644 --- a/modules/admin/queries/getDocumentStatus.xml +++ b/modules/admin/queries/getDocumentStatus.xml @@ -7,7 +7,7 @@ - + diff --git a/modules/admin/queries/getMemberStatus.xml b/modules/admin/queries/getMemberStatus.xml index 191a9e735..acbdd04c9 100644 --- a/modules/admin/queries/getMemberStatus.xml +++ b/modules/admin/queries/getMemberStatus.xml @@ -7,7 +7,7 @@ - + diff --git a/modules/admin/queries/getTrackbackStatus.xml b/modules/admin/queries/getTrackbackStatus.xml index b3d295e66..4abf18270 100644 --- a/modules/admin/queries/getTrackbackStatus.xml +++ b/modules/admin/queries/getTrackbackStatus.xml @@ -7,7 +7,7 @@ - + diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index abedcfc9a..28c905ffa 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/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); } diff --git a/modules/comment/conf/module.xml b/modules/comment/conf/module.xml index 9775f95cc..5cafa4989 100644 --- a/modules/comment/conf/module.xml +++ b/modules/comment/conf/module.xml @@ -3,7 +3,7 @@ - + diff --git a/modules/comment/queries/getDeclaredList.xml b/modules/comment/queries/getDeclaredList.xml index e479b41d3..aaff1d8e4 100644 --- a/modules/comment/queries/getDeclaredList.xml +++ b/modules/comment/queries/getDeclaredList.xml @@ -1,7 +1,7 @@ - -
+
+
diff --git a/modules/comment/queries/insertCommentVotedLog.xml b/modules/comment/queries/insertCommentVotedLog.xml index 6d9ab5020..d00e371ac 100644 --- a/modules/comment/queries/insertCommentVotedLog.xml +++ b/modules/comment/queries/insertCommentVotedLog.xml @@ -7,6 +7,6 @@ - + diff --git a/modules/comment/schemas/comment_declared_log.xml b/modules/comment/schemas/comment_declared_log.xml index d7a892d32..bf1f4a7d7 100644 --- a/modules/comment/schemas/comment_declared_log.xml +++ b/modules/comment/schemas/comment_declared_log.xml @@ -1,6 +1,6 @@
- +
diff --git a/modules/comment/schemas/comment_voted_log.xml b/modules/comment/schemas/comment_voted_log.xml index 095cca0f8..c583adc2d 100644 --- a/modules/comment/schemas/comment_voted_log.xml +++ b/modules/comment/schemas/comment_voted_log.xml @@ -1,7 +1,7 @@ - +
diff --git a/modules/comment/schemas/comments.xml b/modules/comment/schemas/comments.xml index c272c5d53..8b6898180 100644 --- a/modules/comment/schemas/comments.xml +++ b/modules/comment/schemas/comments.xml @@ -18,6 +18,6 @@ - + diff --git a/modules/communication/queries/getNewMessage.xml b/modules/communication/queries/getNewMessage.xml index 6aaf769e4..0e2549ab9 100644 --- a/modules/communication/queries/getNewMessage.xml +++ b/modules/communication/queries/getNewMessage.xml @@ -1,7 +1,7 @@ -
+
diff --git a/modules/communication/queries/getReceivedMessages.xml b/modules/communication/queries/getReceivedMessages.xml index 6711052dd..ba56c2fb0 100644 --- a/modules/communication/queries/getReceivedMessages.xml +++ b/modules/communication/queries/getReceivedMessages.xml @@ -1,6 +1,6 @@ -
+
@@ -13,7 +13,7 @@ - + diff --git a/modules/communication/queries/getSendedMessages.xml b/modules/communication/queries/getSendedMessages.xml index 443527694..9fc82db39 100644 --- a/modules/communication/queries/getSendedMessages.xml +++ b/modules/communication/queries/getSendedMessages.xml @@ -1,6 +1,6 @@ -
+
@@ -13,7 +13,7 @@ - + diff --git a/modules/communication/queries/getStoredMessages.xml b/modules/communication/queries/getStoredMessages.xml index 63bcad1db..0888b7611 100644 --- a/modules/communication/queries/getStoredMessages.xml +++ b/modules/communication/queries/getStoredMessages.xml @@ -1,6 +1,6 @@ -
+
@@ -13,7 +13,7 @@ - + diff --git a/modules/communication/queries/moveFriend.xml b/modules/communication/queries/moveFriend.xml index 730b1b1be..31af5740f 100644 --- a/modules/communication/queries/moveFriend.xml +++ b/modules/communication/queries/moveFriend.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/communication/queries/setMessageReaded.xml b/modules/communication/queries/setMessageReaded.xml index a55a91eba..76303d10c 100644 --- a/modules/communication/queries/setMessageReaded.xml +++ b/modules/communication/queries/setMessageReaded.xml @@ -7,7 +7,7 @@ - + diff --git a/modules/communication/queries/setMessageStored.xml b/modules/communication/queries/setMessageStored.xml index 6cba267b2..440ba29af 100644 --- a/modules/communication/queries/setMessageStored.xml +++ b/modules/communication/queries/setMessageStored.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/communication/queries/updateAllowMessage.xml b/modules/communication/queries/updateAllowMessage.xml index f435107da..02eb835af 100644 --- a/modules/communication/queries/updateAllowMessage.xml +++ b/modules/communication/queries/updateAllowMessage.xml @@ -6,6 +6,6 @@ - + diff --git a/modules/counter/queries/getCounterLog.xml b/modules/counter/queries/getCounterLog.xml index 9c8e1384c..361779848 100644 --- a/modules/counter/queries/getCounterLog.xml +++ b/modules/counter/queries/getCounterLog.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/counter/queries/getSiteTodayStatus.xml b/modules/counter/queries/getSiteTodayStatus.xml index 9ff01fcd1..b18107cca 100644 --- a/modules/counter/queries/getSiteTodayStatus.xml +++ b/modules/counter/queries/getSiteTodayStatus.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/counter/queries/getTodayStatus.xml b/modules/counter/queries/getTodayStatus.xml index dc1988c04..d5c0b716c 100644 --- a/modules/counter/queries/getTodayStatus.xml +++ b/modules/counter/queries/getTodayStatus.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/counter/queries/insertCounterLog.xml b/modules/counter/queries/insertCounterLog.xml index 5e1131b3e..8542276d1 100644 --- a/modules/counter/queries/insertCounterLog.xml +++ b/modules/counter/queries/insertCounterLog.xml @@ -4,7 +4,7 @@ - + diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml index 072a861aa..341d5475c 100644 --- a/modules/document/conf/module.xml +++ b/modules/document/conf/module.xml @@ -16,10 +16,10 @@ - + - - + + @@ -34,17 +34,17 @@ - + - - - - + + + + - - - - + + + + diff --git a/modules/document/queries/getDailyArchivedList.xml b/modules/document/queries/getDailyArchivedList.xml index 06718ffeb..fab40e0a6 100644 --- a/modules/document/queries/getDailyArchivedList.xml +++ b/modules/document/queries/getDailyArchivedList.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/document/queries/getDeclaredList.xml b/modules/document/queries/getDeclaredList.xml index ac8183019..7daf5457b 100644 --- a/modules/document/queries/getDeclaredList.xml +++ b/modules/document/queries/getDeclaredList.xml @@ -1,7 +1,7 @@ -
-
+
+
diff --git a/modules/document/queries/getDocumentDivisionCount.xml b/modules/document/queries/getDocumentDivisionCount.xml index c061f2a84..8c8a76cc7 100644 --- a/modules/document/queries/getDocumentDivisionCount.xml +++ b/modules/document/queries/getDocumentDivisionCount.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/document/queries/getDocumentListWithinComment.xml b/modules/document/queries/getDocumentListWithinComment.xml index f463669d5..c36592ebe 100644 --- a/modules/document/queries/getDocumentListWithinComment.xml +++ b/modules/document/queries/getDocumentListWithinComment.xml @@ -1,7 +1,7 @@
-
+
diff --git a/modules/document/queries/getDocumentListWithinMember.xml b/modules/document/queries/getDocumentListWithinMember.xml index 5b80862ed..1f5f93ea7 100644 --- a/modules/document/queries/getDocumentListWithinMember.xml +++ b/modules/document/queries/getDocumentListWithinMember.xml @@ -1,7 +1,7 @@
-
+
diff --git a/modules/document/queries/getDocumentListWithinTag.xml b/modules/document/queries/getDocumentListWithinTag.xml index 51b0d9f8e..7bbd930be 100644 --- a/modules/document/queries/getDocumentListWithinTag.xml +++ b/modules/document/queries/getDocumentListWithinTag.xml @@ -1,7 +1,7 @@
-
+
diff --git a/modules/document/queries/getMonthlyArchivedList.xml b/modules/document/queries/getMonthlyArchivedList.xml index 32e7f7b22..055d77517 100644 --- a/modules/document/queries/getMonthlyArchivedList.xml +++ b/modules/document/queries/getMonthlyArchivedList.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/document/queries/insertDocumentVotedLog.xml b/modules/document/queries/insertDocumentVotedLog.xml index d9cf6e471..a1233b5d3 100644 --- a/modules/document/queries/insertDocumentVotedLog.xml +++ b/modules/document/queries/insertDocumentVotedLog.xml @@ -7,6 +7,6 @@ - + diff --git a/modules/document/schemas/document_declared_log.xml b/modules/document/schemas/document_declared_log.xml index ed45a542b..046f6d3b3 100644 --- a/modules/document/schemas/document_declared_log.xml +++ b/modules/document/schemas/document_declared_log.xml @@ -1,6 +1,6 @@
- +
diff --git a/modules/document/schemas/document_histories.xml b/modules/document/schemas/document_histories.xml index 26661951a..68d95f731 100644 --- a/modules/document/schemas/document_histories.xml +++ b/modules/document/schemas/document_histories.xml @@ -6,5 +6,5 @@ - + diff --git a/modules/document/schemas/document_readed_log.xml b/modules/document/schemas/document_readed_log.xml index 849038898..3008e302e 100644 --- a/modules/document/schemas/document_readed_log.xml +++ b/modules/document/schemas/document_readed_log.xml @@ -1,6 +1,6 @@ - +
diff --git a/modules/document/schemas/document_voted_log.xml b/modules/document/schemas/document_voted_log.xml index 6bd23e7b9..10ff627cb 100644 --- a/modules/document/schemas/document_voted_log.xml +++ b/modules/document/schemas/document_voted_log.xml @@ -1,7 +1,7 @@ - +
diff --git a/modules/document/schemas/documents.xml b/modules/document/schemas/documents.xml index 6ea3fc6c2..f95f92c87 100644 --- a/modules/document/schemas/documents.xml +++ b/modules/document/schemas/documents.xml @@ -27,7 +27,7 @@ - + diff --git a/modules/editor/queries/getComponent.xml b/modules/editor/queries/getComponent.xml index 0f7f5be5e..e35506b45 100644 --- a/modules/editor/queries/getComponent.xml +++ b/modules/editor/queries/getComponent.xml @@ -6,6 +6,6 @@ - + diff --git a/modules/editor/queries/getSiteComponent.xml b/modules/editor/queries/getSiteComponent.xml index 9e0198805..fb9917402 100644 --- a/modules/editor/queries/getSiteComponent.xml +++ b/modules/editor/queries/getSiteComponent.xml @@ -6,7 +6,7 @@ - - + + diff --git a/modules/editor/queries/getSiteComponentList.xml b/modules/editor/queries/getSiteComponentList.xml index 718aa7906..6d960f8e5 100644 --- a/modules/editor/queries/getSiteComponentList.xml +++ b/modules/editor/queries/getSiteComponentList.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/editor/queries/isSiteComponentInserted.xml b/modules/editor/queries/isSiteComponentInserted.xml index b92d16dfb..14f8694e5 100644 --- a/modules/editor/queries/isSiteComponentInserted.xml +++ b/modules/editor/queries/isSiteComponentInserted.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/editor/queries/updateSiteComponent.xml b/modules/editor/queries/updateSiteComponent.xml index bf3a3b9d6..41e77f3d1 100644 --- a/modules/editor/queries/updateSiteComponent.xml +++ b/modules/editor/queries/updateSiteComponent.xml @@ -8,7 +8,7 @@ - + diff --git a/modules/editor/schemas/editor_components.xml b/modules/editor/schemas/editor_components.xml index f10c288ee..deb02ca3c 100644 --- a/modules/editor/schemas/editor_components.xml +++ b/modules/editor/schemas/editor_components.xml @@ -1,6 +1,6 @@ - +
diff --git a/modules/editor/schemas/editor_components_site.xml b/modules/editor/schemas/editor_components_site.xml index 0613eae46..c6efce17c 100644 --- a/modules/editor/schemas/editor_components_site.xml +++ b/modules/editor/schemas/editor_components_site.xml @@ -2,6 +2,6 @@ - + diff --git a/modules/file/queries/getOneFileInDocument.xml b/modules/file/queries/getOneFileInDocument.xml index e9eb3164a..7f14e400d 100644 --- a/modules/file/queries/getOneFileInDocument.xml +++ b/modules/file/queries/getOneFileInDocument.xml @@ -1,11 +1,11 @@ - -
-
+
+
+
- + diff --git a/modules/install/install.model.php b/modules/install/install.model.php index 05461425a..f03118dff 100644 --- a/modules/install/install.model.php +++ b/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($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 + if(function_exists(ftp_connect)) + { + $connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port); + if(!$connection) return new Object(-1, 'msg_ftp_not_connected'); + $login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password); + if(!$login_result) { + 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(); diff --git a/modules/install/tpl/filter/cubrid.xml b/modules/install/tpl/filter/cubrid.xml index 2ce3a6dab..60d044457 100644 --- a/modules/install/tpl/filter/cubrid.xml +++ b/modules/install/tpl/filter/cubrid.xml @@ -3,16 +3,16 @@ - + - + - + diff --git a/modules/install/tpl/filter/firebird.xml b/modules/install/tpl/filter/firebird.xml index 2ce3a6dab..60d044457 100644 --- a/modules/install/tpl/filter/firebird.xml +++ b/modules/install/tpl/filter/firebird.xml @@ -3,16 +3,16 @@ - + - + - + diff --git a/modules/install/tpl/filter/mssql.xml b/modules/install/tpl/filter/mssql.xml index ac0d37d83..b79b23c0b 100644 --- a/modules/install/tpl/filter/mssql.xml +++ b/modules/install/tpl/filter/mssql.xml @@ -4,13 +4,13 @@ - + - + diff --git a/modules/install/tpl/filter/mysql.xml b/modules/install/tpl/filter/mysql.xml index 2ce3a6dab..60d044457 100644 --- a/modules/install/tpl/filter/mysql.xml +++ b/modules/install/tpl/filter/mysql.xml @@ -3,16 +3,16 @@ - + - + - + diff --git a/modules/install/tpl/filter/postgresql.xml b/modules/install/tpl/filter/postgresql.xml index 5df9f3aca..402d8d30a 100644 --- a/modules/install/tpl/filter/postgresql.xml +++ b/modules/install/tpl/filter/postgresql.xml @@ -3,15 +3,15 @@ - + - + - + diff --git a/modules/install/tpl/filter/sqlite2.xml b/modules/install/tpl/filter/sqlite2.xml index df39ac33d..98ed92367 100644 --- a/modules/install/tpl/filter/sqlite2.xml +++ b/modules/install/tpl/filter/sqlite2.xml @@ -2,13 +2,13 @@
- + - + diff --git a/modules/layout/queries/updateModuleLayout.xml b/modules/layout/queries/updateModuleLayout.xml index ad1db62b8..7a8adbfe1 100644 --- a/modules/layout/queries/updateModuleLayout.xml +++ b/modules/layout/queries/updateModuleLayout.xml @@ -6,6 +6,6 @@ - + diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 997d65c36..5b27aedd2 100644 --- a/modules/member/member.model.php +++ b/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); diff --git a/modules/member/queries/changeGroup.xml b/modules/member/queries/changeGroup.xml index fd43cc6f0..b1b31f461 100644 --- a/modules/member/queries/changeGroup.xml +++ b/modules/member/queries/changeGroup.xml @@ -6,6 +6,6 @@ - + diff --git a/modules/member/queries/getAutologin.xml b/modules/member/queries/getAutologin.xml index 078182d48..eef12f490 100644 --- a/modules/member/queries/getAutologin.xml +++ b/modules/member/queries/getAutologin.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/member/queries/getMemberGroups.xml b/modules/member/queries/getMemberGroups.xml index 2f3d00a8a..08a37cb18 100644 --- a/modules/member/queries/getMemberGroups.xml +++ b/modules/member/queries/getMemberGroups.xml @@ -1,7 +1,7 @@ -
-
+
+
diff --git a/modules/member/queries/getMemberListWithinGroup.xml b/modules/member/queries/getMemberListWithinGroup.xml index 355865943..0f69d9b63 100644 --- a/modules/member/queries/getMemberListWithinGroup.xml +++ b/modules/member/queries/getMemberListWithinGroup.xml @@ -1,7 +1,7 @@ -
-
+
+
diff --git a/modules/member/queries/getMembersGroup.xml b/modules/member/queries/getMembersGroup.xml index 5e61c9c98..0c2732def 100644 --- a/modules/member/queries/getMembersGroup.xml +++ b/modules/member/queries/getMembersGroup.xml @@ -1,7 +1,7 @@ -
-
+
+
diff --git a/modules/member/queries/getMembersGroups.xml b/modules/member/queries/getMembersGroups.xml index 829dd78b3..b26191ff4 100644 --- a/modules/member/queries/getMembersGroups.xml +++ b/modules/member/queries/getMembersGroups.xml @@ -1,7 +1,7 @@ -
-
+
+
diff --git a/modules/member/queries/getSiteMemberList.xml b/modules/member/queries/getSiteMemberList.xml index 0972fe450..670fbaf83 100644 --- a/modules/member/queries/getSiteMemberList.xml +++ b/modules/member/queries/getSiteMemberList.xml @@ -9,8 +9,8 @@ - - + + diff --git a/modules/member/queries/updateAuthMail.xml b/modules/member/queries/updateAuthMail.xml index 0f39e103d..d749176ba 100644 --- a/modules/member/queries/updateAuthMail.xml +++ b/modules/member/queries/updateAuthMail.xml @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/modules/member/queries/updateJoinForm.xml b/modules/member/queries/updateJoinForm.xml index e4ae8ba1f..5b6082682 100644 --- a/modules/member/queries/updateJoinForm.xml +++ b/modules/member/queries/updateJoinForm.xml @@ -12,6 +12,6 @@ - + diff --git a/modules/member/queries/updateLastLogin.xml b/modules/member/queries/updateLastLogin.xml index d80744d44..7b1ac219c 100644 --- a/modules/member/queries/updateLastLogin.xml +++ b/modules/member/queries/updateLastLogin.xml @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/modules/member/queries/updateMember.xml b/modules/member/queries/updateMember.xml index 231d60a91..e584367e4 100644 --- a/modules/member/queries/updateMember.xml +++ b/modules/member/queries/updateMember.xml @@ -21,6 +21,6 @@ - + diff --git a/modules/member/queries/updateMemberPassword.xml b/modules/member/queries/updateMemberPassword.xml index ff3c64fd6..11d069cae 100644 --- a/modules/member/queries/updateMemberPassword.xml +++ b/modules/member/queries/updateMemberPassword.xml @@ -7,6 +7,6 @@ - + diff --git a/modules/member/schemas/member.xml b/modules/member/schemas/member.xml index 9d75750b3..9a908ec8c 100644 --- a/modules/member/schemas/member.xml +++ b/modules/member/schemas/member.xml @@ -5,8 +5,8 @@ - - + + diff --git a/modules/member/schemas/member_auth_mail.xml b/modules/member/schemas/member_auth_mail.xml index d89d5d34d..790d1b862 100644 --- a/modules/member/schemas/member_auth_mail.xml +++ b/modules/member/schemas/member_auth_mail.xml @@ -1,5 +1,5 @@
- + diff --git a/modules/member/schemas/member_openid_nonce.xml b/modules/member/schemas/member_openid_nonce.xml index 0831ea1b6..69fa39ccd 100644 --- a/modules/member/schemas/member_openid_nonce.xml +++ b/modules/member/schemas/member_openid_nonce.xml @@ -1,4 +1,4 @@
- +
diff --git a/modules/member/skins/default/filter/add_openid_to_member.xml b/modules/member/skins/default/filter/add_openid_to_member.xml index 3315012bd..a7670efa3 100644 --- a/modules/member/skins/default/filter/add_openid_to_member.xml +++ b/modules/member/skins/default/filter/add_openid_to_member.xml @@ -1,6 +1,6 @@
- + diff --git a/modules/member/skins/default/filter/delete_openid_from_member.xml b/modules/member/skins/default/filter/delete_openid_from_member.xml index 44338efc5..7505cb124 100644 --- a/modules/member/skins/default/filter/delete_openid_from_member.xml +++ b/modules/member/skins/default/filter/delete_openid_from_member.xml @@ -1,6 +1,6 @@
- + diff --git a/modules/member/skins/default/filter/login.xml b/modules/member/skins/default/filter/login.xml index 442dfd16e..13d3e2836 100644 --- a/modules/member/skins/default/filter/login.xml +++ b/modules/member/skins/default/filter/login.xml @@ -1,6 +1,6 @@
- + diff --git a/modules/member/skins/default/filter/modify_info.xml b/modules/member/skins/default/filter/modify_info.xml index 7cafb4872..c91364b63 100644 --- a/modules/member/skins/default/filter/modify_info.xml +++ b/modules/member/skins/default/filter/modify_info.xml @@ -1,8 +1,8 @@
- - - + + + diff --git a/modules/member/skins/default/filter/signup.xml b/modules/member/skins/default/filter/signup.xml index 402959783..ced939f46 100644 --- a/modules/member/skins/default/filter/signup.xml +++ b/modules/member/skins/default/filter/signup.xml @@ -5,7 +5,7 @@ - + diff --git a/modules/member/tpl/filter/insert.xml b/modules/member/tpl/filter/insert.xml index caab35f32..7ab738254 100644 --- a/modules/member/tpl/filter/insert.xml +++ b/modules/member/tpl/filter/insert.xml @@ -3,7 +3,7 @@ - + diff --git a/modules/member/tpl/filter/insert_join_form.xml b/modules/member/tpl/filter/insert_join_form.xml index 5d3cd97ee..19627befa 100644 --- a/modules/member/tpl/filter/insert_join_form.xml +++ b/modules/member/tpl/filter/insert_join_form.xml @@ -1,7 +1,7 @@
- + diff --git a/modules/member/tpl/filter/update_member.xml b/modules/member/tpl/filter/update_member.xml index 645feb8de..1fe46f61f 100644 --- a/modules/member/tpl/filter/update_member.xml +++ b/modules/member/tpl/filter/update_member.xml @@ -2,7 +2,7 @@
- + diff --git a/modules/menu/queries/getMaxListorder.xml b/modules/menu/queries/getMaxListorder.xml index 978cc81c6..d574ac6a5 100644 --- a/modules/menu/queries/getMaxListorder.xml +++ b/modules/menu/queries/getMaxListorder.xml @@ -7,7 +7,7 @@ - - + +
diff --git a/modules/menu/queries/getMinListorder.xml b/modules/menu/queries/getMinListorder.xml index cbc9e7efd..370055162 100644 --- a/modules/menu/queries/getMinListorder.xml +++ b/modules/menu/queries/getMinListorder.xml @@ -8,6 +8,6 @@ - + diff --git a/modules/message/conf/module.xml b/modules/message/conf/module.xml index 16565e264..a32d6a2fb 100644 --- a/modules/message/conf/module.xml +++ b/modules/message/conf/module.xml @@ -3,8 +3,8 @@ - - + + diff --git a/modules/message/skins/default/filter/login.xml b/modules/message/skins/default/filter/login.xml index 60e0379c4..c0c7e870c 100644 --- a/modules/message/skins/default/filter/login.xml +++ b/modules/message/skins/default/filter/login.xml @@ -1,6 +1,6 @@
- + diff --git a/modules/module/queries/deleteAdminId.xml b/modules/module/queries/deleteAdminId.xml index 5ea3d4699..e82c60c52 100644 --- a/modules/module/queries/deleteAdminId.xml +++ b/modules/module/queries/deleteAdminId.xml @@ -4,6 +4,6 @@ - + diff --git a/modules/module/queries/deleteModule.xml b/modules/module/queries/deleteModule.xml index cf711fe1d..cb4fc3882 100644 --- a/modules/module/queries/deleteModule.xml +++ b/modules/module/queries/deleteModule.xml @@ -3,6 +3,6 @@ - + diff --git a/modules/module/queries/deleteModuleCategory.xml b/modules/module/queries/deleteModuleCategory.xml index c732504fa..ee22ed0cd 100644 --- a/modules/module/queries/deleteModuleCategory.xml +++ b/modules/module/queries/deleteModuleCategory.xml @@ -3,6 +3,6 @@
- + diff --git a/modules/module/queries/deleteModulePartConfig.xml b/modules/module/queries/deleteModulePartConfig.xml index 9501e0b49..4b609f5c6 100644 --- a/modules/module/queries/deleteModulePartConfig.xml +++ b/modules/module/queries/deleteModulePartConfig.xml @@ -4,6 +4,6 @@ - + diff --git a/modules/module/queries/getAdminID.xml b/modules/module/queries/getAdminID.xml index c79fd39cd..2998962ba 100644 --- a/modules/module/queries/getAdminID.xml +++ b/modules/module/queries/getAdminID.xml @@ -8,6 +8,6 @@ - + diff --git a/modules/module/queries/getMidInfo.xml b/modules/module/queries/getMidInfo.xml index 6a13acf70..2bf8bf9bf 100644 --- a/modules/module/queries/getMidInfo.xml +++ b/modules/module/queries/getMidInfo.xml @@ -8,6 +8,6 @@ - + diff --git a/modules/module/queries/getModuleCategory.xml b/modules/module/queries/getModuleCategory.xml index 4f022acc7..62b355e9a 100644 --- a/modules/module/queries/getModuleCategory.xml +++ b/modules/module/queries/getModuleCategory.xml @@ -4,6 +4,6 @@ - + diff --git a/modules/module/queries/getModuleCount.xml b/modules/module/queries/getModuleCount.xml index fa2c142d1..8c800647f 100644 --- a/modules/module/queries/getModuleCount.xml +++ b/modules/module/queries/getModuleCount.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/module/queries/getModulesInfo.xml b/modules/module/queries/getModulesInfo.xml index 50fee6e2a..e1e54245f 100644 --- a/modules/module/queries/getModulesInfo.xml +++ b/modules/module/queries/getModulesInfo.xml @@ -6,6 +6,6 @@ - + diff --git a/modules/module/queries/getSiteAdmin.xml b/modules/module/queries/getSiteAdmin.xml index 26c2d0a74..cf137df21 100644 --- a/modules/module/queries/getSiteAdmin.xml +++ b/modules/module/queries/getSiteAdmin.xml @@ -9,6 +9,6 @@ - + diff --git a/modules/module/queries/getSiteCount.xml b/modules/module/queries/getSiteCount.xml index 3a4de8838..866ebaf81 100644 --- a/modules/module/queries/getSiteCount.xml +++ b/modules/module/queries/getSiteCount.xml @@ -3,6 +3,6 @@
- + diff --git a/modules/module/queries/getSiteModules.xml b/modules/module/queries/getSiteModules.xml index 9d34a6a12..2c80abe39 100644 --- a/modules/module/queries/getSiteModules.xml +++ b/modules/module/queries/getSiteModules.xml @@ -14,7 +14,7 @@ - + diff --git a/modules/module/queries/insertModule.xml b/modules/module/queries/insertModule.xml index 1c997d45d..0ef8d8df2 100644 --- a/modules/module/queries/insertModule.xml +++ b/modules/module/queries/insertModule.xml @@ -12,7 +12,7 @@ - + diff --git a/modules/module/queries/insertModuleCategory.xml b/modules/module/queries/insertModuleCategory.xml index a44282f72..9d49b1c94 100644 --- a/modules/module/queries/insertModuleCategory.xml +++ b/modules/module/queries/insertModuleCategory.xml @@ -4,7 +4,7 @@ - + diff --git a/modules/module/queries/isSiteAdmin.xml b/modules/module/queries/isSiteAdmin.xml index 453367e3f..d2daa42e6 100644 --- a/modules/module/queries/isSiteAdmin.xml +++ b/modules/module/queries/isSiteAdmin.xml @@ -7,6 +7,6 @@ - + diff --git a/modules/module/queries/updateModule.xml b/modules/module/queries/updateModule.xml index a61972501..57f52764c 100644 --- a/modules/module/queries/updateModule.xml +++ b/modules/module/queries/updateModule.xml @@ -3,12 +3,12 @@
- + - + @@ -19,6 +19,6 @@ - + diff --git a/modules/module/queries/updateModuleCategory.xml b/modules/module/queries/updateModuleCategory.xml index 39f19ad22..6ccc62bf1 100644 --- a/modules/module/queries/updateModuleCategory.xml +++ b/modules/module/queries/updateModuleCategory.xml @@ -3,9 +3,9 @@
- + - + diff --git a/modules/module/queries/updateModuleFileBox.xml b/modules/module/queries/updateModuleFileBox.xml index 63d003bf2..556f550b7 100644 --- a/modules/module/queries/updateModuleFileBox.xml +++ b/modules/module/queries/updateModuleFileBox.xml @@ -1,15 +1,15 @@ - - -
- - - - - - - - - - - + + +
+ + + + + + + + + + + \ No newline at end of file diff --git a/modules/module/queries/updateModuleLayout.xml b/modules/module/queries/updateModuleLayout.xml index 27fc67b54..f96880096 100644 --- a/modules/module/queries/updateModuleLayout.xml +++ b/modules/module/queries/updateModuleLayout.xml @@ -6,6 +6,6 @@ - + diff --git a/modules/module/queries/updateModuleMenu.xml b/modules/module/queries/updateModuleMenu.xml index f70f08496..fc75348b4 100644 --- a/modules/module/queries/updateModuleMenu.xml +++ b/modules/module/queries/updateModuleMenu.xml @@ -7,6 +7,6 @@ - + diff --git a/modules/module/queries/updateModuleSite.xml b/modules/module/queries/updateModuleSite.xml index 382ed0744..c26d7a2f1 100644 --- a/modules/module/queries/updateModuleSite.xml +++ b/modules/module/queries/updateModuleSite.xml @@ -7,6 +7,6 @@ - + diff --git a/modules/module/queries/updateModuleSkinVars.xml b/modules/module/queries/updateModuleSkinVars.xml index c2f9b8127..6037baa53 100644 --- a/modules/module/queries/updateModuleSkinVars.xml +++ b/modules/module/queries/updateModuleSkinVars.xml @@ -6,6 +6,6 @@ - + diff --git a/modules/module/schemas/action_forward.xml b/modules/module/schemas/action_forward.xml index a4625989c..608bae8c8 100644 --- a/modules/module/schemas/action_forward.xml +++ b/modules/module/schemas/action_forward.xml @@ -1,5 +1,5 @@
- +
diff --git a/modules/module/schemas/modules.xml b/modules/module/schemas/modules.xml index 74e823ec3..943841e42 100644 --- a/modules/module/schemas/modules.xml +++ b/modules/module/schemas/modules.xml @@ -3,14 +3,14 @@ - + - + - + diff --git a/modules/module/tpl/filter/insert_lang.xml b/modules/module/tpl/filter/insert_lang.xml index 203b68ece..99019d9d6 100644 --- a/modules/module/tpl/filter/insert_lang.xml +++ b/modules/module/tpl/filter/insert_lang.xml @@ -1,6 +1,6 @@
- + diff --git a/modules/point/queries/getCommentPoint.xml b/modules/point/queries/getCommentPoint.xml index a1ce7f7ab..2344aa1dc 100644 --- a/modules/point/queries/getCommentPoint.xml +++ b/modules/point/queries/getCommentPoint.xml @@ -5,7 +5,7 @@ - + diff --git a/modules/point/queries/getCommentUsers.xml b/modules/point/queries/getCommentUsers.xml index 5ff50aecc..dfc946562 100644 --- a/modules/point/queries/getCommentUsers.xml +++ b/modules/point/queries/getCommentUsers.xml @@ -4,7 +4,7 @@ - + diff --git a/modules/point/queries/getDocumentPoint.xml b/modules/point/queries/getDocumentPoint.xml index a7d23f147..e60b8b84e 100644 --- a/modules/point/queries/getDocumentPoint.xml +++ b/modules/point/queries/getDocumentPoint.xml @@ -5,7 +5,7 @@ - + diff --git a/modules/point/queries/getFilePoint.xml b/modules/point/queries/getFilePoint.xml index 05232eaff..3a7247233 100644 --- a/modules/point/queries/getFilePoint.xml +++ b/modules/point/queries/getFilePoint.xml @@ -5,7 +5,7 @@ - + diff --git a/modules/point/queries/getMemberList.xml b/modules/point/queries/getMemberList.xml index a03c40365..1fc3fb877 100644 --- a/modules/point/queries/getMemberList.xml +++ b/modules/point/queries/getMemberList.xml @@ -1,7 +1,7 @@ - -
+
+
diff --git a/modules/point/queries/getMemberListWithinGroup.xml b/modules/point/queries/getMemberListWithinGroup.xml index f3ab2fad7..b08f72757 100644 --- a/modules/point/queries/getMemberListWithinGroup.xml +++ b/modules/point/queries/getMemberListWithinGroup.xml @@ -1,8 +1,8 @@ -
-
-
+
+
+
diff --git a/modules/poll/queries/getPollLog.xml b/modules/poll/queries/getPollLog.xml index 5e1344278..d615b27af 100644 --- a/modules/poll/queries/getPollLog.xml +++ b/modules/poll/queries/getPollLog.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/spamfilter/queries/insertLog.xml b/modules/spamfilter/queries/insertLog.xml index e6a684fe1..ec11e0420 100644 --- a/modules/spamfilter/queries/insertLog.xml +++ b/modules/spamfilter/queries/insertLog.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index db75700cf..15835b611 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -402,32 +402,25 @@ // 캐시파일명을 구함 $cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type); - // 캐시 Lock 파일을 구함 - $lock_file = sprintf('%s%d.%s.lock', $this->cache_path, $widget_sequence, $lang_type); - - // 캐시 파일이 존재하면 해당 파일의 유효성 검사 (lock파일이 있을 경우 유효성 검사하지 않음) + // 캐시 파일이 존재하면 해당 파일의 유효성 검사 if(!$ignore_cache && file_exists($cache_file)) { $filemtime = filemtime($cache_file); // 수정 시간을 비교해서 캐싱중이어야 하거나 widget.controller.php 파일보다 나중에 만들어 졌다면 캐시값을 return - if(file_exists($lock_file) || ($filemtime + $widget_cache*60 > time() && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))) { + if($filemtime + $widget_cache * 60 > time() && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php')) { return FileHandler::readFile($cache_file); } } - // lock 파일 생성 - FileHandler::writeFile($lock_file, ''); + // cache 파일의 mtime 갱신하고 캐시 갱신 + touch($cache_file); - // 캐시 파일을 갱신하여야 할 경우 lock파일을 만들고 캐시 생성 $oWidget = $this->getWidgetObject($widget); if(!$oWidget || !method_exists($oWidget,'proc')) return; $widget_content = $oWidget->proc($args); FileHandler::writeFile($cache_file, $widget_content); - // lock 파일 제거 - FileHandler::removeFile($lock_file); - return $widget_content; } diff --git a/widgets/login_info/skins/xe_official/filter/login.xml b/widgets/login_info/skins/xe_official/filter/login.xml index 9ac01dbee..9ef770464 100644 --- a/widgets/login_info/skins/xe_official/filter/login.xml +++ b/widgets/login_info/skins/xe_official/filter/login.xml @@ -1,6 +1,6 @@
- +