fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-27 14:22:54 +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

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

@ -33,7 +33,7 @@
$oDB->begin();
// 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;
// Delete the comment posting

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

@ -143,7 +143,7 @@ class documentController extends document {
// List variables
if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
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->homepage && !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
if($obj->notify_message != 'Y') $obj->notify_message = 'N';
@ -202,7 +202,7 @@ class documentController extends document {
$obj->lang_code = Context::getLangType();
// Insert data into the DB
if(!$obj->status) $this->_checkDocumentStatusForOldVersion(&$obj);
if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
$output = executeQuery('document.insertDocument', $obj);
if(!$output->toBool()) {
$oDB->rollback();
@ -278,7 +278,7 @@ class documentController extends document {
}
// List variables
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->homepage && !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
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){
$oLayoutModel = &getModel('layout');
$reg = '(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)';
$reg = '/(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)/i';
$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';
$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';
$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';
$content = eregi_replace($reg,$extension_content,$content);
$content = preg_replace($reg,$extension_content,$content);
return $content;
}

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

@ -16,7 +16,7 @@
$requestMethod = Context::getRequestMethod();
Context::setResponseMethod('HTML');
$oWidgetController->triggerWidgetCompile(&$page_content);
$oWidgetController->triggerWidgetCompile($page_content);
Context::setResponseMethod($requestMethod);
$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);
$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('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);
$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);
if(!$output->toBool()) return $output;

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

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