fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 19:51:42 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge with 1.4.5.7

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8356 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-05-06 02:42:14 +00:00
parent 25d2f6af1e
commit b5d2e05282
12 changed files with 48 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -693,5 +693,14 @@
return $arr;
}
/**
* @brief Just like numbers, and operations needed to remove the rest
**/
function _filterNumber(&$value)
{
$value = preg_replace('/[^\d\w\+\-\*\/\.\(\)]/', '', $value);
if(!$value) $value = 0;
}
}
?>

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

@ -678,9 +678,7 @@
}
}
}
elseif (!$value || is_numeric ($value)) {
$value = (int) $value;
}
else $this->_filterNumber(&$value);
$column_list[] = '"'.$name.'"';
$value_list[] = $value;
@ -733,9 +731,7 @@
$check_column = false;
$value = "'".$this->addQuotes ($value)."'";
}
elseif (!$value || is_numeric ($value)) {
$value = (int) $value;
}
else $this->_filterNumber(&$value);
$column_list[] = sprintf ("\"%s\" = %s", $name, $value);
}

3
classes/db/DBFirebird.class.php
View file

@ -688,7 +688,8 @@
}
else if($output->column_type[$name]!='number') {
// if(!$value) $value = 'null';
} elseif(!$value || is_numeric($value)) $value = (int)$value;
}
else $this->_filterNumber(&$value);
$column_list[] = '"'.$name.'"';
$value_list[] = $value;

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

@ -547,6 +547,8 @@
} elseif(!$value){
$value = '';
}
// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
else $this->_filterNumber(&$value);
$column_list[] = '['.$name.']';
$value_list[] = '?';
@ -591,10 +593,9 @@
$column_list[] = sprintf("[%s] = ?", $name);
}else{
if(!$value) $value = '';
$this->_filterNumber(&$value);
$column_list[] = sprintf("[%s] = %s", $name, $value);
}
}
}
// List the conditional clause

6
classes/db/DBMysql.class.php
View file

@ -443,7 +443,9 @@
}
}
} elseif(!$value || is_numeric($value)) $value = (int)$value;
}
//elseif(!$value || is_numeric($value)) $value = (int)$value;
else $this->_filterNumber(&$value);
$column_list[] = '`'.$name.'`';
$value_list[] = $value;
@ -473,7 +475,7 @@
if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
else {
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
elseif(!$value || is_numeric($value)) $value = (int)$value;
else $this->_filterNumber(&$value);
$column_list[] = sprintf("`%s` = %s", $name, $value);
}

10
classes/db/DBPostgresql.class.php
View file

@ -566,8 +566,10 @@ class DBPostgresql extends DB
$value = "'" . $this->addQuotes($value) . "'";
if (!$value)
$value = 'null';
} elseif (!$value || is_numeric($value))
$value = (int)$value;
}
// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
// elseif (!$value || is_numeric($value)) $value = (int)$value;
else $this->_filterNumber(&$value);
$column_list[] = $name;
$value_list[] = $value;
@ -599,8 +601,8 @@ class DBPostgresql extends DB
else {
if ($output->column_type[$name] != 'number')
$value = "'" . $this->addQuotes($value) . "'";
elseif (!$value || is_numeric($value))
$value = (int)$value;
// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
else $this->_filterNumber(&$value);
$column_list[] = sprintf("%s = %s", $name, $value);
}

8
classes/db/DBSqlite2.class.php
View file

@ -422,7 +422,10 @@
if($output->column_type[$name]!='number') {
$value = "'".$this->addQuotes($value)."'";
if(!$value) $value = 'null';
} elseif(!$value || is_numeric($value)) $value = (int)$value;
}
// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
// elseif(!$value || is_numeric($value)) $value = (int)$value;
else $this->_filterNumber(&$value);
$column_list[] = $name;
$value_list[] = $value;
@ -450,7 +453,8 @@
if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
else {
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
elseif(!$value || is_numeric($value)) $value = (int)$value;
// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
else $this->_filterNumber(&$value);
$column_list[] = sprintf("%s = %s", $name, $value);
}

4
classes/db/DBSqlite3_pdo.class.php
View file

@ -460,7 +460,7 @@
if($output->column_type[$name]!='number') $val_list[] = $this->addQuotes($value);
else {
if(!$value || is_numeric($value)) $value = (int)$value;
$this->_filterNumber(&$value);
$val_list[] = $value;
}
@ -495,7 +495,7 @@
if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
else {
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
elseif(!$value || is_numeric($value)) $value = (int)$value;
else $this->_filterNumber(&$value);
$column_list[] = sprintf("%s = %s", $name, $value);
}

4
common/lang/zh-TW.lang.php
View file

@ -255,6 +255,7 @@ $lang->confirm_submit = '確定要送出嗎?';
$lang->confirm_logout = '確定要登出嗎?';
$lang->confirm_vote = '確定要推薦嗎?';
$lang->confirm_delete = '確定要刪除嗎?';
$lang->confirm_restore = '確定要復原嗎?';
$lang->confirm_move = '確定要移動嗎?';
$lang->confirm_reset = '確定要重置嗎?';
$lang->confirm_leave = '確定要退出嗎?';
@ -305,7 +306,6 @@ $lang->ftp_path_title = '請輸入 FTP 路經';
$lang->msg_ftp_installed_realpath = 'XE絕對路經';
$lang->msg_ftp_installed_ftp_realpath = 'XE的 FTP 絕對路經';
// 在 xml filter 中所使用的 JavaScript 警告訊息
$lang->filter->isnull = '請輸入%s';
$lang->filter->outofrange = '請確認%s字數';
@ -320,5 +320,5 @@ $lang->filter->invalid_alpha_number = '%s只能輸入英文或數字';
$lang->filter->invalid_number = '%s只能輸入數字';
$lang->security_warning_embed = "由於安全的關係，管理員無法檢視嵌入的物件。<BR /> 請使用其他非管理員帳號檢視。";
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
$lang->msg_pc_to_mobile = '此頁面有手機頁面，要移至手機頁面嗎？';
?>

2
config/config.inc.php
View file

@ -160,4 +160,4 @@
require(_XE_PATH_.'classes/mobile/Mobile.class.php');
if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
}
?>
?>

16
modules/install/script/welcome_content/welcome_content_zh-TW.html
View file

@ -1,26 +1,26 @@
<div>
<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
<h1>XE core '{$version}' has been successfully installed!</h1>
<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
<h1>XE core '{$version}' 飓惕圜晚颌涮睇枨圜！</h1>
<p>瞍艘惴孙亍匮笞颀铖，綦嗷撷鸲螽闫埕<EFBFBD>攸。<br />綦塔?欷<><E6ACB7>偻<EFBFBD>煦憷茭飓镝<E9A393>颌涮睇枨圜。<br />师瞍畏租戡<EFBFBD>攸耖首谈岫牦疒遂。</p>
<ol>
<li>
When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
幼 <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">鼹攸噔酮</a></strong> 飓圜晚颌涮睇懔，师首谈镖肆匮<E88286>钴 <strong><EFBFBD>庀</strong>，<strong>耶榛瘾赭</strong>妯 <strong><EFBFBD>诃</strong>。
</li>
<li>
When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
幼 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">嘣婴偌疒</a></strong> 飓圜晚颌涮睇懔，师首谈 <strong>瘾嘣婴<EFBFBD>憝嘣婴</strong>。
</li>
<li>
When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
幼 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">猡泓偌疒</a></strong> 飓圜晚颌涮睇懔，师首谈 <strong>猡泓?</strong>。
</li>
<li>
When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
幼 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> 飓圜晚颌涮睇懔，师首谈 <strong>贼忑?</strong>。
</li>
<li>
When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
幼 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank"><EFBFBD>攸偌疒</a></strong> 飓圜晚颌涮睇懔，靓师首谈螽<E8B088>。
</li>
</ol>
<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
<p>?濂师欷瞍 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">噔镆<EFBFBD>攸</a></strong> 耖麴<E88096>徐鲡钴偌疒。</p>
</div>
</div>
</div>

5
modules/member/lang/zh-TW.lang.php
View file

@ -214,7 +214,6 @@
$lang->find_account_question = '密碼提示問答';
$lang->find_account_answer = '비밀번호 찾기 답변';
$lang->about_find_account_question = '可透過帳號、電子郵件和設定提示問答來獲得臨時密碼。';
$lang->find_account_question_items = array(''
,'其他電子郵件?'
@ -236,5 +235,7 @@
$lang->change_password_date = '密碼更新';
$lang->about_change_password_date = '可設定密碼更新週期，將會定期通知更換密碼。 (設為零則不使用)';
$lang->msg_kr_address = '읍, 면, 동 이름으로 검색하세요.';
$lang->msg_kr_address_etc = '請輸入剩餘的地址(街道)。';
$lang->cmd_search_again = '再找一次';
?>