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

코드가 new Object으로만 작성된 코드에 대해서도 동일하게 BaseObject 호출하도록 추가.

Browse source
This commit is contained in:
BJRambo 2017-11-28 20:07:08 +09:00
parent f3f40f6859
commit 1803883e1d
9 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -689,7 +689,7 @@ class adminAdminModel extends admin
}
}
$returnObject = new Object();
$returnObject = new BaseObject();
$returnObject->add('favoriteList', $output->data);
return $returnObject;
}
@ -711,7 +711,7 @@ class adminAdminModel extends admin
return $output;
}
$returnObject = new Object();
$returnObject = new BaseObject();
if($output->data)
{
$returnObject->add('result', TRUE);

2
modules/advanced_mailer/advanced_mailer.admin.view.php
View file

@ -302,7 +302,7 @@ class Advanced_MailerAdminView extends Advanced_Mailer
$total_count = $count->data->count;
$total_page = max(1, ceil($total_count / 20));
$output = new Object();
$output = new BaseObject();
$output->total_count = $total_count;
$output->total_page = $total_page;
$output->page = $page;

4
modules/autoinstall/autoinstall.admin.model.php
View file

@ -389,7 +389,7 @@ class autoinstallAdminModel extends autoinstall
if($directModuleInstall==FALSE)
{
$output = new Object(-1, 'msg_direct_inall_invalid');
$output = new BaseObject(-1, 'msg_direct_inall_invalid');
$output->add('path', $arrUnwritableDir);
return $output;
}
@ -414,7 +414,7 @@ class autoinstallAdminModel extends autoinstall
if(FileHandler::isWritableDir($check_path)==FALSE)
{
$output = new Object(-1, 'msg_unwritable_directory');
$output = new BaseObject(-1, 'msg_unwritable_directory');
$output->add('path', FileHandler::getRealPath($check_path));
return $output;
}

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

@ -75,7 +75,7 @@ class commentController extends comment
$point = 1;
$output = $this->updateVotedCountCancel($comment_srl, $oComment, $point);
$output = new Object();
$output = new BaseObject();
$output->setMessage('success_voted_canceled');
return $output;
@ -136,7 +136,7 @@ class commentController extends comment
$point = -1;
$output = $this->updateVotedCountCancel($comment_srl, $oComment, $point);
$output = new Object();
$output = new BaseObject();
$output->setMessage('success_blamed_canceled');
return $output;
@ -1437,7 +1437,7 @@ class commentController extends comment
$oDB->commit();
// Return the result
$output = new Object(0, $success_message);
$output = new BaseObject(0, $success_message);
if($point > 0)
{
$output->add('voted_count', $obj->after_point);

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

@ -426,7 +426,7 @@ class documentAdminController extends document
$oDB->commit();
$output = new Object();
$output = new BaseObject();
$output->add('copied_srls', $copied_srls);
return $output;
}

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

@ -80,7 +80,7 @@ class documentController extends document
return $output;
}
$output = new Object();
$output = new BaseObject();
$output->setMessage('success_voted_canceled');
return $output;
}
@ -166,7 +166,7 @@ class documentController extends document
return $output;
}
$output = new Object();
$output = new BaseObject();
$output->setMessage('success_blamed_canceled');
return $output;
}
@ -1482,7 +1482,7 @@ class documentController extends document
Rhymix\Framework\Cache::delete('document_item:' . getNumberingPath($document_srl) . $document_srl);
// Return result
$output = new Object();
$output = new BaseObject();
if($point > 0)
{
$output->setMessage('success_voted');

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

@ -39,7 +39,7 @@ class installAdminController extends install
$oModule = getModule($module_name, 'class');
if($oModule) $output = $oModule->moduleUpdate();
else $output = new Object(-1, 'invalid_request');
else $output = new BaseObject(-1, 'invalid_request');
return $output;
}

2
modules/krzip/krzip.model.php
View file

@ -211,7 +211,7 @@ class krzipModel extends krzip
$addr_list[] = $this->getMigratedPostcode('(' . $postcode . ') (' . $jibun_addr . ') ' . $road_addr);
}
$output = new Object();
$output = new BaseObject();
$output->add('address_list', $addr_list);
return $output;

8
modules/member/member.controller.php
View file

@ -62,7 +62,7 @@ class memberController extends member
if($member_info->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day')))
{
$msg = sprintf(lang('msg_change_password_date'), $limit_date);
return $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'), new Object(-1, $msg));
return $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'), new BaseObject(-1, $msg));
}
}
@ -101,7 +101,7 @@ class memberController extends member
// Call a trigger after log-out (after)
ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
$output = new Object();
$output = new BaseObject();
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
@ -745,7 +745,7 @@ class memberController extends member
{
$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
$this->setMessage($msg);
return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new Object(-12, $msg));
return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new BaseObject(-12, $msg));
}
else $this->setMessage('success_registed');
@ -2050,7 +2050,7 @@ class memberController extends member
{
$_SESSION['auth_member_srl'] = $member_info->member_srl;
$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
return $this->setRedirectUrl($redirectUrl, new Object(-1,'msg_user_not_confirmed'));
return $this->setRedirectUrl($redirectUrl, new BaseObject(-1,'msg_user_not_confirmed'));
}
$refused_reason = $member_info->refused_reason ? ('<br>' . lang('refused_reason') . ': ' . $member_info->refused_reason) : '';