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

issue 77 Remove PHP 5.3.x deprecated features

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8599 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-07-14 08:18:04 +00:00
parent 3fe79a4d1c
commit 61e00415d6
16 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
addons/captcha/captcha.addon.php
View file

@ -250,15 +250,15 @@
$oAddonCaptcha = &$GLOBALS['__AddonCaptcha__']; $oAddonCaptcha = &$GLOBALS['__AddonCaptcha__'];
if(method_exists(&$oAddonCaptcha, $called_position)) if(method_exists($oAddonCaptcha, $called_position))
{ {
if(!call_user_func(array(&$oAddonCaptcha, $called_position), &$this)) return false; if(!call_user_func(array(&$oAddonCaptcha, $called_position), $this)) return false;
} }
$addon_act = Context::get('captcha_action'); $addon_act = Context::get('captcha_action');
if($addon_act && method_exists(&$oAddonCaptcha, $called_position.'_'.$addon_act)) if($addon_act && method_exists($oAddonCaptcha, $called_position.'_'.$addon_act))
{ {
if(!call_user_func(array(&$oAddonCaptcha, $called_position.'_'.$addon_act), &$this)) return false; if(!call_user_func(array(&$oAddonCaptcha, $called_position.'_'.$addon_act), $this)) return false;
} }
?> ?>

6
addons/mobile/classes/mobile.class.php
View file

@ -174,12 +174,12 @@
$userAgent = $_SERVER['HTTP_USER_AGENT']; $userAgent = $_SERVER['HTTP_USER_AGENT'];
$wap_sid = $_SERVER['HTTP_X_UP_SUBNO']; $wap_sid = $_SERVER['HTTP_X_UP_SUBNO'];
if(eregi("SKT11", $userAgent) || eregi("skt", $browserAccept)) { if(preg_match("/SKT11/i", $userAgent) || preg_match("/skt/i", $browserAccept)) {
Context::set('mobile_skt',1); Context::set('mobile_skt',1);
return "wml"; return "wml";
} }
elseif(eregi("hdml", $browserAccept)) return "hdml"; elseif(preg_match("/hdml/i", $browserAccept)) return "hdml";
elseif(eregi("CellPhone", $userAgent)) return "mhtml"; elseif(preg_match("/CellPhone/i", $userAgent)) return "mhtml";
return null; return null;
} }

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

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

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

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

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

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

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

@ -116,7 +116,7 @@
**/ **/
function addQuotes($string) { function addQuotes($string) {
if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string)); if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
if(!is_numeric($string)) $string = @mysql_escape_string($string); if(!is_numeric($string)) $string = @mysql_real_escape_string($string, $this->fd);
return $string; return $string;
} }
@ -445,7 +445,7 @@
} }
//elseif(!$value || is_numeric($value)) $value = (int)$value; //elseif(!$value || is_numeric($value)) $value = (int)$value;
else $this->_filterNumber(&$value); else $this->_filterNumber($value);
$column_list[] = '`'.$name.'`'; $column_list[] = '`'.$name.'`';
$value_list[] = $value; $value_list[] = $value;
@ -475,7 +475,7 @@
if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value; if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
else { else {
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'"; if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
else $this->_filterNumber(&$value); else $this->_filterNumber($value);
$column_list[] = sprintf("`%s` = %s", $name, $value); $column_list[] = sprintf("`%s` = %s", $name, $value);
} }

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

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

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

@ -425,7 +425,7 @@
} }
// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환 // sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
// elseif(!$value || is_numeric($value)) $value = (int)$value; // elseif(!$value || is_numeric($value)) $value = (int)$value;
else $this->_filterNumber(&$value); else $this->_filterNumber($value);
$column_list[] = $name; $column_list[] = $name;
$value_list[] = $value; $value_list[] = $value;
@ -454,7 +454,7 @@
else { else {
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'"; if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환 // sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
else $this->_filterNumber(&$value); else $this->_filterNumber($value);
$column_list[] = sprintf("%s = %s", $name, $value); $column_list[] = sprintf("%s = %s", $name, $value);
} }
@ -473,7 +473,7 @@
// List the conditional clause // List the conditional clause
$condition = $this->getCondition($output); $condition = $this->getCondition($output);
foreach($table_list as $key => $val) { foreach($table_list as $key => $val) {
$condition = eregi_replace($key.'\\.', $val.'.', $condition); $condition = preg_replace('/'.$key.'\\./i', $val.'.', $condition);
} }
// List columns // List columns
foreach($output->columns as $key => $val) { foreach($output->columns as $key => $val) {

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

@ -460,7 +460,7 @@
if($output->column_type[$name]!='number') $val_list[] = $this->addQuotes($value); if($output->column_type[$name]!='number') $val_list[] = $this->addQuotes($value);
else { else {
$this->_filterNumber(&$value); $this->_filterNumber($value);
$val_list[] = $value; $val_list[] = $value;
} }
@ -495,7 +495,7 @@
if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value; if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
else { else {
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'"; if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
else $this->_filterNumber(&$value); else $this->_filterNumber($value);
$column_list[] = sprintf("%s = %s", $name, $value); $column_list[] = sprintf("%s = %s", $name, $value);
} }
@ -514,7 +514,7 @@
// List where cluase // List where cluase
$condition = $this->getCondition($output); $condition = $this->getCondition($output);
foreach($table_list as $key => $val) { foreach($table_list as $key => $val) {
$condition = eregi_replace($key.'\\.', $val.'.', $condition); $condition = preg_replace('/'.$key.'\\./i', $val.'.', $condition);
} }
// List columns // List columns
foreach($output->columns as $key => $val) { foreach($output->columns as $key => $val) {

2
modules/comment/comment.admin.controller.php
View file

@ -33,7 +33,7 @@
$oDB->begin(); $oDB->begin();
// comment into trash // comment into trash
if($isTrash == 'true') $this->_moveCommentToTrash($comment_srl_list, &$oCommentController, &$oDB); if($isTrash == 'true') $this->_moveCommentToTrash($comment_srl_list, $oCommentController, $oDB);
$deleted_count = 0; $deleted_count = 0;
// Delete the comment posting // Delete the comment posting

6
modules/document/document.controller.php
View file

@ -143,7 +143,7 @@ class documentController extends document {
// List variables // List variables
if($obj->comment_status) $obj->commentStatus = $obj->comment_status; if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
if(!$obj->commentStatus) $obj->commentStatus = 'DENY'; if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion(&$obj); if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N'; if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
if($obj->homepage && !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage; if($obj->homepage && !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
if($obj->notify_message != 'Y') $obj->notify_message = 'N'; if($obj->notify_message != 'Y') $obj->notify_message = 'N';
@ -202,7 +202,7 @@ class documentController extends document {
$obj->lang_code = Context::getLangType(); $obj->lang_code = Context::getLangType();
// Insert data into the DB // Insert data into the DB
if(!$obj->status) $this->_checkDocumentStatusForOldVersion(&$obj); if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
$output = executeQuery('document.insertDocument', $obj); $output = executeQuery('document.insertDocument', $obj);
if(!$output->toBool()) { if(!$output->toBool()) {
$oDB->rollback(); $oDB->rollback();
@ -278,7 +278,7 @@ class documentController extends document {
} }
// List variables // List variables
if(!$obj->commentStatus) $obj->commentStatus = 'DENY'; if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion(&$obj); if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N'; if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
if($obj->homepage && !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage; if($obj->homepage && !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
if($obj->notify_message != 'Y') $obj->notify_message = 'N'; if($obj->notify_message != 'Y') $obj->notify_message = 'N';

16
modules/layout/layout.admin.controller.php
View file

@ -404,21 +404,21 @@
**/ **/
function addExtension($layout_srl,$arg,$content){ function addExtension($layout_srl,$arg,$content){
$oLayoutModel = &getModel('layout'); $oLayoutModel = &getModel('layout');
$reg = '(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)'; $reg = '/(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)/i';
$extension_content = '\1' .stripslashes($arg->e1) . '\3'; $extension_content = '\1' .stripslashes($arg->e1) . '\3';
$content = eregi_replace($reg,$extension_content,$content); $content = preg_replace($reg,$extension_content,$content);
$reg = '(<\!\-\- start\-e2 \-\->)(.*)(<\!\-\- end\-e2 \-\->)'; $reg = '/(<\!\-\- start\-e2 \-\->)(.*)(<\!\-\- end\-e2 \-\->)/i';
$extension_content = '\1' .stripslashes($arg->e2) . '\3'; $extension_content = '\1' .stripslashes($arg->e2) . '\3';
$content = eregi_replace($reg,$extension_content,$content); $content = preg_replace($reg,$extension_content,$content);
$reg = '(<\!\-\- start\-neck \-\->)(.*)(<\!\-\- end\-neck \-\->)'; $reg = '/(<\!\-\- start\-neck \-\->)(.*)(<\!\-\- end\-neck \-\->)/i';
$extension_content = '\1' .stripslashes($arg->neck) . '\3'; $extension_content = '\1' .stripslashes($arg->neck) . '\3';
$content = eregi_replace($reg,$extension_content,$content); $content = preg_replace($reg,$extension_content,$content);
$reg = '(<\!\-\- start\-knee \-\->)(.*)(<\!\-\- end\-knee \-\->)'; $reg = '/(<\!\-\- start\-knee \-\->)(.*)(<\!\-\- end\-knee \-\->)/i';
$extension_content = '\1' .stripslashes($arg->knee) . '\3'; $extension_content = '\1' .stripslashes($arg->knee) . '\3';
$content = eregi_replace($reg,$extension_content,$content); $content = preg_replace($reg,$extension_content,$content);
return $content; return $content;
} }

2
modules/page/page.api.php
View file

@ -16,7 +16,7 @@
$requestMethod = Context::getRequestMethod(); $requestMethod = Context::getRequestMethod();
Context::setResponseMethod('HTML'); Context::setResponseMethod('HTML');
$oWidgetController->triggerWidgetCompile(&$page_content); $oWidgetController->triggerWidgetCompile($page_content);
Context::setResponseMethod($requestMethod); Context::setResponseMethod($requestMethod);
$oModule->add('page_content',$page_content); $oModule->add('page_content',$page_content);

4
modules/page/page.view.php
View file

@ -45,7 +45,9 @@
if($this->module_srl) Context::set('module_srl',$this->module_srl); if($this->module_srl) Context::set('module_srl',$this->module_srl);
$page_type_name = strtolower($this->module_info->page_type); $page_type_name = strtolower($this->module_info->page_type);
$page_content = call_user_method('_get'.ucfirst($page_type_name).'Content', &$this); $method = '_get' . ucfirst($page_type_name) . 'Content';
if (method_exists($this, $method)) $page_content = $this->{$method}();
else return new Object(-1, sprintf('%s method is not exists', $method));
Context::set('module_info', $this->module_info); Context::set('module_info', $this->module_info);
Context::set('page_content', $page_content); Context::set('page_content', $page_content);

2
modules/syndication/syndication.admin.controller.php
View file

@ -85,7 +85,7 @@
$site_url = preg_replace('/^(http|https):\/\//i','',$config->site_url); $site_url = preg_replace('/^(http|https):\/\//i','',$config->site_url);
$method = 'getSyndicationStatus' . ucfirst(strtolower($target_service)); $method = 'getSyndicationStatus' . ucfirst(strtolower($target_service));
if(!method_exists(&$this, $method)) return new Object(-1,'msg_syndication_status_not_support'); if(!method_exists($this, $method)) return new Object(-1,'msg_syndication_status_not_support');
$output = call_user_func(array(&$this,$method),$site_url); $output = call_user_func(array(&$this,$method),$site_url);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;

4
modules/trash/trash.model.php
View file

@ -13,7 +13,7 @@ class trashModel extends trash
$args->trashSrl = $trashSrl; $args->trashSrl = $trashSrl;
$output = executeQuery('trash.getTrash', $args, $columnList); $output = executeQuery('trash.getTrash', $args, $columnList);
$this->_setTrashObject(&$oTrashVO, $output->data); $this->_setTrashObject($oTrashVO, $output->data);
$output->data = $oTrashVO; $output->data = $oTrashVO;
return $output; return $output;
@ -31,7 +31,7 @@ class trashModel extends trash
foreach($output->data AS $key=>$value) foreach($output->data AS $key=>$value)
{ {
$oTrashVO = new TrashVO(); $oTrashVO = new TrashVO();
$this->_setTrashObject(&$oTrashVO, $value); $this->_setTrashObject($oTrashVO, $value);
$output->data[$key] = $oTrashVO; $output->data[$key] = $oTrashVO;
} }
} }