fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 11:33:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

update truck and tag 1.4.2.3

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7503 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-06-08 08:29:56 +00:00
parent 6900f96319
commit 762ebbf445
127 changed files with 303 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

5
classes/db/DB.class.php
View file

@ -198,12 +198,13 @@
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);
}
}
}

23
classes/db/DBCubrid.class.php
View file

@ -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,7 +258,7 @@
* @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);
$result = $this->_query($query);
if(cubrid_num_rows($result)>0) $output = true;
@ -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);
}

2
common/script.php
View file

@ -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");

2
config/config.inc.php
View file

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

12
modules/admin/lang/zh-TW.lang.php
View file

@ -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 功能。<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_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.';
$lang->msg_ftp_invalid_path = '指定的 FTP 路徑讀取失敗。';
$lang->msg_self_restart_cache_engine = '請重新啟動 Memcached 快取程式。';
?>

2
modules/autoinstall/autoinstall.lib.php
View file

@ -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);
}

25
modules/install/install.model.php
View file

@ -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,6 +56,28 @@ class installModel extends install {
return $this->getSFTPList();
}
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)) {
@ -65,9 +86,11 @@ class installModel extends install {
}
else
{
$oFtp->ftp_quit();
return new Object(-1,'msg_ftp_invalid_auth_info');
}
}
}
$list = array();
if($_list){

6
modules/member/member.model.php
View file

@ -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);

15
modules/widget/widget.controller.php
View file

@ -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;
}