From 1803883e1da28d6534719838f951157ed02bcc51 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Tue, 28 Nov 2017 20:07:08 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=EA=B0=80=20new=20Object?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=EB=A7=8C=20=EC=9E=91=EC=84=B1=EB=90=9C=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EC=97=90=20=EB=8C=80=ED=95=B4=EC=84=9C?= =?UTF-8?q?=EB=8F=84=20=EB=8F=99=EC=9D=BC=ED=95=98=EA=B2=8C=20BaseObject?= =?UTF-8?q?=20=ED=98=B8=EC=B6=9C=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/admin.admin.model.php | 4 ++-- modules/advanced_mailer/advanced_mailer.admin.view.php | 2 +- modules/autoinstall/autoinstall.admin.model.php | 4 ++-- modules/comment/comment.controller.php | 6 +++--- modules/document/document.admin.controller.php | 2 +- modules/document/document.controller.php | 6 +++--- modules/install/install.admin.controller.php | 2 +- modules/krzip/krzip.model.php | 2 +- modules/member/member.controller.php | 8 ++++---- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 08ae6fde7..fe6423e3e 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -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); diff --git a/modules/advanced_mailer/advanced_mailer.admin.view.php b/modules/advanced_mailer/advanced_mailer.admin.view.php index 385c1a508..a21f88231 100644 --- a/modules/advanced_mailer/advanced_mailer.admin.view.php +++ b/modules/advanced_mailer/advanced_mailer.admin.view.php @@ -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; diff --git a/modules/autoinstall/autoinstall.admin.model.php b/modules/autoinstall/autoinstall.admin.model.php index 5cd253e62..b66b80c2c 100644 --- a/modules/autoinstall/autoinstall.admin.model.php +++ b/modules/autoinstall/autoinstall.admin.model.php @@ -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; } diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 9a0e015d9..4a5d5f0a8 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -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); diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index dacdbea91..7b421e900 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -426,7 +426,7 @@ class documentAdminController extends document $oDB->commit(); - $output = new Object(); + $output = new BaseObject(); $output->add('copied_srls', $copied_srls); return $output; } diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index fe9440c4c..b35e43ade 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -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'); diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index d04f3f9de..19c896557 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -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; } diff --git a/modules/krzip/krzip.model.php b/modules/krzip/krzip.model.php index 2b83158f1..8eb4d7a0d 100644 --- a/modules/krzip/krzip.model.php +++ b/modules/krzip/krzip.model.php @@ -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; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index ac9615440..34a3d725f 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -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 ? ('
' . lang('refused_reason') . ': ' . $member_info->refused_reason) : '';