From f3f40f68596dbfa2ccaaba3c4289809b8110e9d0 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Tue, 28 Nov 2017 20:01:28 +0900 Subject: [PATCH] =?UTF-8?q?php7.2=ED=98=B8=ED=99=98=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=B4=20=EB=B3=80=EA=B2=BD=ED=95=9C=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20Object=20=EB=A5=BC=20BaseObject=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/recaptcha/recaptcha.class.php | 8 +- modules/addon/addon.class.php | 4 +- modules/admin/admin.admin.controller.php | 108 +++++----- modules/admin/admin.admin.model.php | 28 +-- modules/admin/admin.admin.view.php | 2 +- modules/admin/admin.class.php | 4 +- modules/adminlogging/adminlogging.class.php | 4 +- .../advanced_mailer.admin.controller.php | 12 +- .../advanced_mailer/advanced_mailer.class.php | 4 +- .../autoinstall.admin.controller.php | 2 +- .../autoinstall/autoinstall.admin.model.php | 6 +- modules/autoinstall/autoinstall.class.php | 2 +- modules/autoinstall/autoinstall.lib.php | 82 +++---- modules/board/board.admin.controller.php | 2 +- modules/board/board.class.php | 8 +- modules/board/board.controller.php | 60 +++--- modules/board/board.view.php | 38 ++-- modules/comment/comment.admin.controller.php | 2 +- modules/comment/comment.class.php | 4 +- modules/comment/comment.controller.php | 102 ++++----- modules/comment/comment.model.php | 8 +- modules/comment/comment.view.php | 8 +- modules/communication/communication.class.php | 4 +- .../communication.controller.php | 86 ++++---- modules/communication/communication.view.php | 12 +- modules/counter/counter.class.php | 4 +- .../document/document.admin.controller.php | 24 +-- modules/document/document.class.php | 4 +- modules/document/document.controller.php | 150 ++++++------- modules/document/document.model.php | 18 +- modules/document/document.view.php | 16 +- .../components/emoticon/emoticon.class.php | 2 +- modules/editor/editor.admin.controller.php | 10 +- modules/editor/editor.class.php | 4 +- modules/editor/editor.controller.php | 16 +- modules/editor/editor.model.php | 4 +- modules/editor/editor.view.php | 4 +- modules/file/file.admin.controller.php | 4 +- modules/file/file.class.php | 4 +- modules/file/file.controller.php | 72 +++---- modules/file/file.model.php | 6 +- modules/file/file.view.php | 4 +- modules/importer/extract.class.php | 8 +- .../importer/importer.admin.controller.php | 6 +- modules/importer/importer.class.php | 4 +- modules/install/install.admin.controller.php | 4 +- modules/install/install.class.php | 4 +- modules/install/install.controller.php | 14 +- modules/install/install.model.php | 12 +- modules/install/install.view.php | 2 +- .../integration_search.class.php | 4 +- .../integration_search.model.php | 2 +- .../integration_search.view.php | 2 +- modules/krzip/krzip.class.php | 6 +- modules/krzip/krzip.model.php | 8 +- modules/layout/layout.admin.controller.php | 16 +- modules/layout/layout.admin.view.php | 4 +- modules/layout/layout.class.php | 4 +- modules/layout/layout.view.php | 6 +- modules/member/member.admin.controller.php | 30 +-- modules/member/member.class.php | 14 +- modules/member/member.controller.php | 204 +++++++++--------- modules/member/member.view.php | 12 +- modules/menu/menu.admin.controller.php | 54 ++--- modules/menu/menu.admin.model.php | 4 +- modules/menu/menu.class.php | 4 +- modules/message/message.class.php | 4 +- modules/module/module.admin.controller.php | 20 +- modules/module/module.admin.model.php | 8 +- modules/module/module.admin.view.php | 6 +- modules/module/module.class.php | 4 +- modules/module/module.controller.php | 46 ++-- modules/module/module.model.php | 2 +- modules/module/module.view.php | 8 +- .../ncenterlite.admin.controller.php | 2 +- modules/ncenterlite/ncenterlite.class.php | 10 +- .../ncenterlite/ncenterlite.controller.php | 84 ++++---- modules/ncenterlite/ncenterlite.model.php | 2 +- modules/ncenterlite/ncenterlite.view.php | 6 +- modules/page/page.admin.controller.php | 4 +- modules/page/page.admin.view.php | 2 +- modules/page/page.class.php | 4 +- modules/page/page.mobile.php | 2 +- modules/page/page.view.php | 2 +- modules/point/point.admin.controller.php | 6 +- modules/point/point.class.php | 2 +- modules/point/point.controller.php | 96 ++++----- modules/point/point.view.php | 4 +- modules/poll/poll.admin.controller.php | 4 +- modules/poll/poll.admin.model.php | 2 +- modules/poll/poll.class.php | 4 +- modules/poll/poll.controller.php | 58 ++--- modules/poll/poll.model.php | 10 +- modules/rss/rss.admin.controller.php | 10 +- modules/rss/rss.class.php | 4 +- modules/rss/rss.controller.php | 4 +- modules/rss/rss.view.php | 4 +- modules/session/session.class.php | 2 +- .../spamfilter.admin.controller.php | 2 +- modules/spamfilter/spamfilter.class.php | 4 +- modules/spamfilter/spamfilter.controller.php | 30 +-- modules/spamfilter/spamfilter.model.php | 24 +-- modules/tag/tag.class.php | 4 +- modules/tag/tag.controller.php | 12 +- modules/trash/trash.admin.controller.php | 32 +-- modules/trash/trash.admin.view.php | 2 +- modules/trash/trash.class.php | 4 +- modules/widget/widget.class.php | 4 +- modules/widget/widget.controller.php | 34 +-- 109 files changed, 976 insertions(+), 976 deletions(-) diff --git a/addons/recaptcha/recaptcha.class.php b/addons/recaptcha/recaptcha.class.php index bf1992ea1..64e0ad1a3 100644 --- a/addons/recaptcha/recaptcha.class.php +++ b/addons/recaptcha/recaptcha.class.php @@ -18,7 +18,7 @@ class reCAPTCHA $response = Context::get('g-recaptcha-response'); if (!$response) { - return new Object(-1, lang('recaptcha.msg_recaptcha_invalid_response')); + return new BaseObject(-1, lang('recaptcha.msg_recaptcha_invalid_response')); } try @@ -31,17 +31,17 @@ class reCAPTCHA } catch (\Requests_Exception $e) { - return new Object(-1, lang('recaptcha.msg_recaptcha_connection_error')); + return new BaseObject(-1, lang('recaptcha.msg_recaptcha_connection_error')); } $verify = @json_decode($verify_request->body, true); if ($verify && isset($verify['error-codes']) && in_array('invalid-input-response', $verify['error-codes'])) { - return new Object(-1, lang('recaptcha.msg_recaptcha_invalid_response')); + return new BaseObject(-1, lang('recaptcha.msg_recaptcha_invalid_response')); } elseif (!$verify || !$verify['success'] || (isset($verify['error-codes']) && $verify['error-codes'])) { - return new Object(-1, lang('recaptcha.msg_recaptcha_server_error')); + return new BaseObject(-1, lang('recaptcha.msg_recaptcha_server_error')); } else { diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php index 0f249a2d1..54d9d052a 100644 --- a/modules/addon/addon.class.php +++ b/modules/addon/addon.class.php @@ -21,7 +21,7 @@ class addon extends ModuleObject $oAddonController->doInsert('member_extra_info', 0, 'site', 'Y'); $oAddonController->doInsert('resize_image', 0, 'site', 'Y'); $oAddonController->makeCacheFile(0); - return new Object(); + return new BaseObject(); } /** @@ -89,7 +89,7 @@ class addon extends ModuleObject } } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index 0e85f1671..2a6c9c18b 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -209,7 +209,7 @@ class adminAdminController extends admin $this->makeDefaultDesignFile($designInfo, $vars->site_srl); - return new Object(); + return new BaseObject(); } function makeDefaultDesignFile($designInfo, $site_srl = 0) @@ -300,7 +300,7 @@ class adminAdminController extends admin $favoriteList = $output->get('favoriteList'); if(!$favoriteList) { - return new Object(); + return new BaseObject(); } $deleteTargets = array(); @@ -318,7 +318,7 @@ class adminAdminController extends admin if(!count($deleteTargets)) { - return new Object(); + return new BaseObject(); } $args = new stdClass(); @@ -329,7 +329,7 @@ class adminAdminController extends admin return $output; } - return new Object(); + return new BaseObject(); } /** @@ -495,7 +495,7 @@ class adminAdminController extends admin } else { - return new Object(-1, 'fail_to_delete'); + return new BaseObject(-1, 'fail_to_delete'); } $this->setMessage('success_deleted'); } @@ -519,7 +519,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::set('use_sso', $vars->use_sso === 'Y'); if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_updated'); @@ -539,19 +539,19 @@ class adminAdminController extends admin // Validate the mail sender's information. if (!$vars->mail_default_name) { - return new Object(-1, 'msg_advanced_mailer_sender_name_is_empty'); + return new BaseObject(-1, 'msg_advanced_mailer_sender_name_is_empty'); } if (!$vars->mail_default_from) { - return new Object(-1, 'msg_advanced_mailer_sender_email_is_empty'); + return new BaseObject(-1, 'msg_advanced_mailer_sender_email_is_empty'); } if (!Mail::isVaildMailAddress($vars->mail_default_from)) { - return new Object(-1, 'msg_advanced_mailer_sender_email_is_invalid'); + return new BaseObject(-1, 'msg_advanced_mailer_sender_email_is_invalid'); } if ($vars->mail_default_reply_to && !Mail::isVaildMailAddress($vars->mail_default_reply_to)) { - return new Object(-1, 'msg_advanced_mailer_reply_to_is_invalid'); + return new BaseObject(-1, 'msg_advanced_mailer_reply_to_is_invalid'); } // Validate the mail driver. @@ -559,7 +559,7 @@ class adminAdminController extends admin $mail_driver = $vars->mail_driver; if (!array_key_exists($mail_driver, $mail_drivers)) { - return new Object(-1, 'msg_advanced_mailer_sending_method_is_invalid'); + return new BaseObject(-1, 'msg_advanced_mailer_sending_method_is_invalid'); } // Validate the mail driver settings. @@ -569,7 +569,7 @@ class adminAdminController extends admin $conf_value = $vars->{'mail_' . $mail_driver . '_' . $conf_name} ?: null; if (!$conf_value) { - return new Object(-1, 'msg_advanced_mailer_smtp_host_is_invalid'); + return new BaseObject(-1, 'msg_advanced_mailer_smtp_host_is_invalid'); } $mail_driver_config[$conf_name] = $conf_value; } @@ -579,7 +579,7 @@ class adminAdminController extends admin $sms_driver = $vars->sms_driver; if (!array_key_exists($sms_driver, $sms_drivers)) { - return new Object(-1, 'msg_advanced_mailer_sending_method_is_invalid'); + return new BaseObject(-1, 'msg_advanced_mailer_sending_method_is_invalid'); } // Validate the SMS driver settings. @@ -589,7 +589,7 @@ class adminAdminController extends admin $conf_value = $vars->{'sms_' . $sms_driver . '_' . $conf_name} ?: null; if (!$conf_value) { - return new Object(-1, 'msg_advanced_mailer_smtp_host_is_invalid'); + return new BaseObject(-1, 'msg_advanced_mailer_smtp_host_is_invalid'); } $sms_driver_config[$conf_name] = $conf_value; } @@ -628,7 +628,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::set("sms.allow_split.lms", toBool($vars->allow_split_lms)); if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_updated'); @@ -683,7 +683,7 @@ class adminAdminController extends admin return $item !== ''; })); if (!Rhymix\Framework\Filters\IpFilter::validateRanges($allowed_ip)) { - return new Object(-1, 'msg_invalid_ip'); + return new BaseObject(-1, 'msg_invalid_ip'); } $denied_ip = array_map('trim', preg_split('/[\r\n]/', $vars->admin_denied_ip)); @@ -691,13 +691,13 @@ class adminAdminController extends admin return $item !== ''; })); if (!Rhymix\Framework\Filters\IpFilter::validateRanges($denied_ip)) { - return new Object(-1, 'msg_invalid_ip'); + return new BaseObject(-1, 'msg_invalid_ip'); } $oMemberAdminModel = getAdminModel('member'); if (!$oMemberAdminModel->getMemberAdminIPCheck($allowed_ip, $denied_ip)) { - return new Object(-1, 'msg_current_ip_will_be_denied'); + return new BaseObject(-1, 'msg_current_ip_will_be_denied'); } Rhymix\Framework\Config::set('admin.allow', array_values($allowed_ip)); @@ -706,7 +706,7 @@ class adminAdminController extends admin // Save if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_updated'); @@ -745,7 +745,7 @@ class adminAdminController extends admin } if (!Rhymix\Framework\Cache::getDriverInstance($vars->object_cache_type, $cache_servers)) { - return new Object(-1, 'msg_cache_handler_not_supported'); + return new BaseObject(-1, 'msg_cache_handler_not_supported'); } Rhymix\Framework\Config::set('cache', array( 'type' => $vars->object_cache_type, @@ -800,7 +800,7 @@ class adminAdminController extends admin // Save if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_updated'); @@ -838,15 +838,15 @@ class adminAdminController extends admin ), $log_filename); if (file_exists(RX_BASEDIR . $log_filename_today) && !is_writable(RX_BASEDIR . $log_filename_today)) { - return new Object(-1, 'msg_debug_log_filename_not_writable'); + return new BaseObject(-1, 'msg_debug_log_filename_not_writable'); } if (!file_exists(dirname(RX_BASEDIR . $log_filename)) && !FileHandler::makeDir(dirname(RX_BASEDIR . $log_filename))) { - return new Object(-1, 'msg_debug_log_filename_not_writable'); + return new BaseObject(-1, 'msg_debug_log_filename_not_writable'); } if (!is_writable(dirname(RX_BASEDIR . $log_filename))) { - return new Object(-1, 'msg_debug_log_filename_not_writable'); + return new BaseObject(-1, 'msg_debug_log_filename_not_writable'); } Rhymix\Framework\Config::set('debug.log_filename', $log_filename); @@ -856,14 +856,14 @@ class adminAdminController extends admin return $item !== ''; })); if (!Rhymix\Framework\Filters\IpFilter::validateRanges($allowed_ip)) { - return new Object(-1, 'msg_invalid_ip'); + return new BaseObject(-1, 'msg_invalid_ip'); } Rhymix\Framework\Config::set('debug.allow', array_values($allowed_ip)); // Save if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_updated'); @@ -895,7 +895,7 @@ class adminAdminController extends admin // Save if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_updated'); @@ -916,7 +916,7 @@ class adminAdminController extends admin if (!Rhymix\Framework\Filters\IpFilter::validateRanges($allowed_ip)) { - return new Object(-1, 'msg_invalid_ip'); + return new BaseObject(-1, 'msg_invalid_ip'); } Rhymix\Framework\Config::set('lock.locked', $vars->sitelock_locked === 'Y'); @@ -925,7 +925,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::set('lock.allow', array_values($allowed_ip)); if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_updated'); @@ -946,7 +946,7 @@ class adminAdminController extends admin $domain_info = getModel('module')->getSiteInfo($domain_srl); if ($domain_info->domain_srl != $domain_srl) { - return new Object(-1, 'msg_domain_not_found'); + return new BaseObject(-1, 'msg_domain_not_found'); } } @@ -955,7 +955,7 @@ class adminAdminController extends admin $vars->subtitle = utf8_trim($vars->subtitle); if ($vars->title === '') { - return new Object(-1, 'msg_site_title_is_empty'); + return new BaseObject(-1, 'msg_site_title_is_empty'); } // Validate the domain. @@ -973,12 +973,12 @@ class adminAdminController extends admin } if (!$vars->domain) { - return new Object(-1, 'msg_invalid_domain'); + return new BaseObject(-1, 'msg_invalid_domain'); } $existing_domain = getModel('module')->getSiteInfoByDomain($vars->domain); if ($existing_domain && $existing_domain->domain == $vars->domain && (!$domain_info || $existing_domain->domain_srl != $domain_info->domain_srl)) { - return new Object(-1, 'msg_domain_already_exists'); + return new BaseObject(-1, 'msg_domain_already_exists'); } // Validate the ports. @@ -992,11 +992,11 @@ class adminAdminController extends admin } if ($vars->http_port !== 0 && ($vars->http_port < 1 || $vars->http_port > 65535 || $vars->http_port == 443)) { - return new Object(-1, 'msg_invalid_http_port'); + return new BaseObject(-1, 'msg_invalid_http_port'); } if ($vars->https_port !== 0 && ($vars->https_port < 1 || $vars->https_port > 65535 || $vars->https_port == 80)) { - return new Object(-1, 'msg_invalid_https_port'); + return new BaseObject(-1, 'msg_invalid_https_port'); } // Validate the security setting. @@ -1010,7 +1010,7 @@ class adminAdminController extends admin $module_info = getModel('module')->getModuleInfoByModuleSrl(intval($vars->index_module_srl)); if (!$module_info || $module_info->module_srl != $vars->index_module_srl) { - return new Object(-1, 'msg_invalid_index_module_srl'); + return new BaseObject(-1, 'msg_invalid_index_module_srl'); } // Validate the index document setting. @@ -1019,11 +1019,11 @@ class adminAdminController extends admin $oDocument = getModel('document')->getDocument($vars->index_document_srl); if (!$oDocument || !$oDocument->isExists()) { - return new Object(-1, 'msg_invalid_index_document_srl'); + return new BaseObject(-1, 'msg_invalid_index_document_srl'); } if (intval($oDocument->get('module_srl')) !== intval($vars->index_module_srl)) { - return new Object(-1, 'msg_invalid_index_document_srl_module_srl'); + return new BaseObject(-1, 'msg_invalid_index_document_srl_module_srl'); } } else @@ -1035,14 +1035,14 @@ class adminAdminController extends admin $enabled_lang = Rhymix\Framework\Config::get('locale.enabled_lang'); if (!in_array($vars->default_lang, $enabled_lang)) { - return new Object(-1, 'msg_lang_is_not_enabled'); + return new BaseObject(-1, 'msg_lang_is_not_enabled'); } // Validate the default time zone. $timezone_list = Rhymix\Framework\DateTime::getTimezoneList(); if (!isset($timezone_list[$vars->default_timezone])) { - return new Object(-1, 'msg_invalid_timezone'); + return new BaseObject(-1, 'msg_invalid_timezone'); } // Clean up the header and footer scripts. @@ -1165,16 +1165,16 @@ class adminAdminController extends admin $domain_srl = strval(Context::get('domain_srl')); if ($domain_srl === '') { - return new Object(-1, 'msg_domain_not_found'); + return new BaseObject(-1, 'msg_domain_not_found'); } $domain_info = getModel('module')->getSiteInfo($domain_srl); if ($domain_info->domain_srl != $domain_srl) { - return new Object(-1, 'msg_domain_not_found'); + return new BaseObject(-1, 'msg_domain_not_found'); } if ($domain_info->is_default_domain === 'Y') { - return new Object(-1, 'msg_cannot_delete_default_domain'); + return new BaseObject(-1, 'msg_cannot_delete_default_domain'); } // Delete the domain. @@ -1207,19 +1207,19 @@ class adminAdminController extends admin { if (!($conn = @ftp_connect($vars->ftp_host, $vars->ftp_port, 3))) { - return new Object(-1, 'msg_ftp_not_connected'); + return new BaseObject(-1, 'msg_ftp_not_connected'); } if (!@ftp_login($conn, $vars->ftp_user, $vars->ftp_pass)) { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } if (!@ftp_pasv($conn, $vars->ftp_pasv === 'Y')) { - return new Object(-1, 'msg_ftp_cannot_set_passive_mode'); + return new BaseObject(-1, 'msg_ftp_cannot_set_passive_mode'); } if (!@ftp_chdir($conn, $vars->ftp_path)) { - return new Object(-1, 'msg_ftp_invalid_path'); + return new BaseObject(-1, 'msg_ftp_invalid_path'); } ftp_close($conn); } @@ -1227,23 +1227,23 @@ class adminAdminController extends admin { if (!function_exists('ssh2_connect')) { - return new Object(-1, 'disable_sftp_support'); + return new BaseObject(-1, 'disable_sftp_support'); } if (!($conn = ssh2_connect($vars->ftp_host, $vars->ftp_port))) { - return new Object(-1, 'msg_ftp_not_connected'); + return new BaseObject(-1, 'msg_ftp_not_connected'); } if (!@ssh2_auth_password($conn, $vars->ftp_user, $vars->ftp_pass)) { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } if (!@($sftp = ssh2_sftp($conn))) { - return new Object(-1, 'msg_ftp_sftp_error'); + return new BaseObject(-1, 'msg_ftp_sftp_error'); } if (!@ssh2_sftp_stat($sftp, $vars->ftp_path . 'common/defaults/config.php')) { - return new Object(-1, 'msg_ftp_invalid_path'); + return new BaseObject(-1, 'msg_ftp_invalid_path'); } unset($sftp, $conn); } @@ -1258,7 +1258,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::set('ftp.sftp', $vars->ftp_sftp === 'Y'); if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_updated'); @@ -1279,7 +1279,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::set('ftp.sftp', false); if (!Rhymix\Framework\Config::save()) { - return new Object(-1, 'msg_failed_to_save_config'); + return new BaseObject(-1, 'msg_failed_to_save_config'); } $this->setMessage('success_deleted'); diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 952773514..08ae6fde7 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -43,7 +43,7 @@ class adminAdminModel extends admin $connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port); if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password)) { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } $sftp = ssh2_sftp($connection); @@ -112,14 +112,14 @@ class adminAdminModel extends admin $connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port); if(!$connection) { - return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); + return new BaseObject(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); } $login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password); if(!$login_result) { ftp_close($connection); - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } // create temp file @@ -182,7 +182,7 @@ class adminAdminModel extends admin if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) { - return new Object(1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(1, 'msg_ftp_invalid_auth_info'); } if(!$ftp_info->ftp_host) @@ -199,7 +199,7 @@ class adminAdminModel extends admin { if(!function_exists('ssh2_sftp')) { - return new Object(-1, 'disable_sftp_support'); + return new BaseObject(-1, 'disable_sftp_support'); } return $this->getSFTPPath(); } @@ -216,12 +216,12 @@ class adminAdminModel extends admin $oFTP = new ftp(); if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) { - return new Object(1, sprintf(lang('msg_ftp_not_connected'), 'host')); + return new BaseObject(1, sprintf(lang('msg_ftp_not_connected'), 'host')); } if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) { - return new Object(1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(1, 'msg_ftp_invalid_auth_info'); } // create temp file @@ -286,7 +286,7 @@ class adminAdminModel extends admin $connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port); if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password)) { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } $sftp = ssh2_sftp($connection); @@ -294,7 +294,7 @@ class adminAdminModel extends admin $dh = @opendir($curpwd); if(!$dh) { - return new Object(-1, 'msg_ftp_invalid_path'); + return new BaseObject(-1, 'msg_ftp_invalid_path'); } $list = array(); while(($file = readdir($dh)) !== FALSE) @@ -325,7 +325,7 @@ class adminAdminModel extends admin $ftp_info = Context::getRequestVars(); if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } $this->pwd = $ftp_info->ftp_root_path; @@ -344,7 +344,7 @@ class adminAdminModel extends admin { if(!function_exists('ssh2_sftp')) { - return new Object(-1, 'disable_sftp_support'); + return new BaseObject(-1, 'disable_sftp_support'); } return $this->getSFTPList(); } @@ -359,7 +359,7 @@ class adminAdminModel extends admin } else { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } } $list = array(); @@ -380,7 +380,7 @@ class adminAdminModel extends admin } else { - return new Object(-1, 'msg_ftp_no_directory'); + return new BaseObject(-1, 'msg_ftp_no_directory'); } $this->add('list', $list); } @@ -675,7 +675,7 @@ class adminAdminModel extends admin } if(!$output->data) { - return new Object(); + return new BaseObject(); } if($isGetModuleInfo && is_array($output->data)) diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 92a00ad8f..48ee8d31f 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -662,7 +662,7 @@ class adminAdminView extends admin $domain_info = getModel('module')->getSiteInfo($domain_srl); if ($domain_info->domain_srl != $domain_srl) { - return new Object(-1, 'msg_domain_not_found'); + return new BaseObject(-1, 'msg_domain_not_found'); } } Context::set('domain_info', $domain_info); diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php index 43e208f73..43c2313cb 100644 --- a/modules/admin/admin.class.php +++ b/modules/admin/admin.class.php @@ -24,7 +24,7 @@ class admin extends ModuleObject */ function moduleInstall() { - return new Object(); + return new BaseObject(); } /** @@ -68,7 +68,7 @@ class admin extends ModuleObject } } } - return new Object(); + return new BaseObject(); } /** diff --git a/modules/adminlogging/adminlogging.class.php b/modules/adminlogging/adminlogging.class.php index f8dc29185..cd2a1ec51 100644 --- a/modules/adminlogging/adminlogging.class.php +++ b/modules/adminlogging/adminlogging.class.php @@ -18,7 +18,7 @@ class adminlogging extends ModuleObject */ function moduleInstall() { - return new Object(); + return new BaseObject(); } /** @@ -36,7 +36,7 @@ class adminlogging extends ModuleObject */ function moduleUpdate() { - return new Object(); + return new BaseObject(); } /** diff --git a/modules/advanced_mailer/advanced_mailer.admin.controller.php b/modules/advanced_mailer/advanced_mailer.admin.controller.php index 5019ba688..fff1330de 100644 --- a/modules/advanced_mailer/advanced_mailer.admin.controller.php +++ b/modules/advanced_mailer/advanced_mailer.admin.controller.php @@ -61,7 +61,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer { if ($method !== 'default' && !isset($sending_methods[$method])) { - return new Object(-1, 'msg_advanced_mailer_sending_method_is_invalid'); + return new BaseObject(-1, 'msg_advanced_mailer_sending_method_is_invalid'); } if ($method !== 'default') { @@ -69,7 +69,7 @@ class Advanced_MailerAdminController extends Advanced_Mailer { if (!Rhymix\Framework\Config::get("mail.$method.$conf_name")) { - return new Object(-1, sprintf( + return new BaseObject(-1, sprintf( Context::getLang('msg_advanced_mailer_sending_method_is_not_configured'), Context::getLang('cmd_advanced_mailer_sending_method_' . $method))); } @@ -157,11 +157,11 @@ class Advanced_MailerAdminController extends Advanced_Mailer $clear_before_days = intval(Context::get('clear_before_days')); if (!in_array($status, array('success', 'error'))) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if ($clear_before_days < 0) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $obj = new stdClass(); @@ -188,11 +188,11 @@ class Advanced_MailerAdminController extends Advanced_Mailer $clear_before_days = intval(Context::get('clear_before_days')); if (!in_array($status, array('success', 'error'))) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if ($clear_before_days < 0) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $obj = new stdClass(); diff --git a/modules/advanced_mailer/advanced_mailer.class.php b/modules/advanced_mailer/advanced_mailer.class.php index 2e4796433..bd9142851 100644 --- a/modules/advanced_mailer/advanced_mailer.class.php +++ b/modules/advanced_mailer/advanced_mailer.class.php @@ -208,7 +208,7 @@ class Advanced_Mailer extends ModuleObject public function moduleInstall() { $this->registerTriggers(); - return new Object(); + return new BaseObject(); } /** @@ -242,7 +242,7 @@ class Advanced_Mailer extends ModuleObject public function moduleUpdate() { $this->registerTriggers(); - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } public function recompileCache() diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php index 888d95d47..7acf2a06f 100644 --- a/modules/autoinstall/autoinstall.admin.controller.php +++ b/modules/autoinstall/autoinstall.admin.controller.php @@ -404,7 +404,7 @@ class autoinstallAdminController extends autoinstall $this->setMessage('success_deleted', 'update'); - return new Object(); + return new BaseObject(); } } diff --git a/modules/autoinstall/autoinstall.admin.model.php b/modules/autoinstall/autoinstall.admin.model.php index 7351053ad..5cd253e62 100644 --- a/modules/autoinstall/autoinstall.admin.model.php +++ b/modules/autoinstall/autoinstall.admin.model.php @@ -354,7 +354,7 @@ class autoinstallAdminModel extends autoinstall $packageSrl = Context::get('package_srl'); if(!$packageSrl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $package = $this->getInstallInfo($packageSrl); @@ -394,7 +394,7 @@ class autoinstallAdminModel extends autoinstall return $output; } - return new Object(); + return new BaseObject(); } public function isWritableDir($path) @@ -418,7 +418,7 @@ class autoinstallAdminModel extends autoinstall $output->add('path', FileHandler::getRealPath($check_path)); return $output; } - return new Object(); + return new BaseObject(); } } diff --git a/modules/autoinstall/autoinstall.class.php b/modules/autoinstall/autoinstall.class.php index 6a3e9eb5d..1e3feb546 100644 --- a/modules/autoinstall/autoinstall.class.php +++ b/modules/autoinstall/autoinstall.class.php @@ -157,7 +157,7 @@ class autoinstall extends ModuleObject $oDB->addColumn('autoinstall_packages', 'have_instance', 'char', '1', 'N', TRUE); } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index d2c992192..633895d60 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/modules/autoinstall/autoinstall.lib.php @@ -156,11 +156,11 @@ class ModuleInstaller $oModule = getModule($target_name, "class"); if(!$oModule) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if(!method_exists($oModule, "moduleUninstall")) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $output = $oModule->moduleUninstall(); @@ -181,7 +181,7 @@ class ModuleInstaller $oDB->dropTable($filename); } } - return new Object(); + return new BaseObject(); } /** @@ -241,7 +241,7 @@ class ModuleInstaller $this->installModule(); FileHandler::removeDir($this->temp_dir); - return new Object(); + return new BaseObject(); } /** @@ -359,12 +359,12 @@ class SFTPModuleInstaller extends ModuleInstaller { if(!function_exists('ssh2_connect')) { - return new Object(-1, 'msg_sftp_not_supported'); + return new BaseObject(-1, 'msg_sftp_not_supported'); } if(!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y') { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } if($this->ftp_info->ftp_host) @@ -378,11 +378,11 @@ class SFTPModuleInstaller extends ModuleInstaller $this->connection = ssh2_connect($ftp_host, $this->ftp_info->ftp_port); if(!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password)) { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } $_SESSION['ftp_password'] = $this->ftp_password; $this->sftp = ssh2_sftp($this->connection); - return new Object(); + return new BaseObject(); } /** @@ -411,9 +411,9 @@ class SFTPModuleInstaller extends ModuleInstaller if(!@ssh2_sftp_unlink($this->sftp, $target_path)) { - return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path)); + return new BaseObject(-1, sprintf(lang('msg_delete_file_failed'), $path)); } - return new Object(); + return new BaseObject(); } /** @@ -432,9 +432,9 @@ class SFTPModuleInstaller extends ModuleInstaller if(!@ssh2_sftp_rmdir($this->sftp, $target_path)) { - return new Object(-1, sprintf(lang('msg_delete_dir_failed'), $path)); + return new BaseObject(-1, sprintf(lang('msg_delete_dir_failed'), $path)); } - return new Object(); + return new BaseObject(); } /** @@ -447,7 +447,7 @@ class SFTPModuleInstaller extends ModuleInstaller { if(!$this->ftp_password) { - return new Object(-1, 'msg_ftp_password_input'); + return new BaseObject(-1, 'msg_ftp_password_input'); } $output = $this->_connect(); @@ -477,7 +477,7 @@ class SFTPModuleInstaller extends ModuleInstaller ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path . "/" . $org_file), $target_dir . "/" . $file); } } - return new Object(); + return new BaseObject(); } } @@ -532,14 +532,14 @@ class PHPFTPModuleInstaller extends ModuleInstaller $this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port); if(!$this->connection) { - return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); + return new BaseObject(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); } $login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password); if(!$login_result) { $this->_close(); - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } $_SESSION['ftp_password'] = $this->ftp_password; @@ -547,7 +547,7 @@ class PHPFTPModuleInstaller extends ModuleInstaller { ftp_pasv($this->connection, TRUE); } - return new Object(); + return new BaseObject(); } /** @@ -566,9 +566,9 @@ class PHPFTPModuleInstaller extends ModuleInstaller if(!@ftp_delete($this->connection, $target_path)) { - return new Object(-1, "failed to delete file " . $path); + return new BaseObject(-1, "failed to delete file " . $path); } - return new Object(); + return new BaseObject(); } /** @@ -587,9 +587,9 @@ class PHPFTPModuleInstaller extends ModuleInstaller if(!@ftp_rmdir($this->connection, $target_path)) { - return new Object(-1, "failed to delete directory " . $path); + return new BaseObject(-1, "failed to delete directory " . $path); } - return new Object(); + return new BaseObject(); } /** @@ -612,7 +612,7 @@ class PHPFTPModuleInstaller extends ModuleInstaller { if(!$this->ftp_password) { - return new Object(-1, 'msg_ftp_password_input'); + return new BaseObject(-1, 'msg_ftp_password_input'); } $output = $this->_connect(); @@ -662,7 +662,7 @@ class PHPFTPModuleInstaller extends ModuleInstaller { if(!@ftp_mkdir($this->connection, $ftp_path)) { - return new Object(-1, "msg_make_directory_failed"); + return new BaseObject(-1, "msg_make_directory_failed"); } if(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') @@ -671,14 +671,14 @@ class PHPFTPModuleInstaller extends ModuleInstaller { if(!ftp_chmod($this->connection, 0755, $ftp_path)) { - return new Object(-1, "msg_permission_adjust_failed"); + return new BaseObject(-1, "msg_permission_adjust_failed"); } } else { if(!ftp_site($this->connection, "CHMOD 755 " . $ftp_path)) { - return new Object(-1, "msg_permission_adjust_failed"); + return new BaseObject(-1, "msg_permission_adjust_failed"); } } } @@ -686,12 +686,12 @@ class PHPFTPModuleInstaller extends ModuleInstaller } if(!ftp_put($this->connection, $target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file), FTP_BINARY)) { - return new Object(-1, "msg_ftp_upload_failed"); + return new BaseObject(-1, "msg_ftp_upload_failed"); } } } $this->_close(); - return new Object(); + return new BaseObject(); } } @@ -745,15 +745,15 @@ class FTPModuleInstaller extends ModuleInstaller $this->oFtp = new ftp(); if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port)) { - return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); + return new BaseObject(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); } if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password)) { $this->_close(); - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } $_SESSION['ftp_password'] = $this->ftp_password; - return new Object(); + return new BaseObject(); } /** @@ -772,9 +772,9 @@ class FTPModuleInstaller extends ModuleInstaller if(!$this->oFtp->ftp_delete($target_path)) { - return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path)); + return new BaseObject(-1, sprintf(lang('msg_delete_file_failed'), $path)); } - return new Object(); + return new BaseObject(); } /** @@ -792,9 +792,9 @@ class FTPModuleInstaller extends ModuleInstaller if(!$this->oFtp->ftp_rmdir($target_path)) { - return new Object(-1, sprintf(lang('msg_delete_dir_failed'), $path)); + return new BaseObject(-1, sprintf(lang('msg_delete_dir_failed'), $path)); } - return new Object(); + return new BaseObject(); } /** @@ -817,7 +817,7 @@ class FTPModuleInstaller extends ModuleInstaller { if(!$this->ftp_password) { - return new Object(-1, 'msg_ftp_password_input'); + return new BaseObject(-1, 'msg_ftp_password_input'); } $output = $this->_connect(); @@ -864,7 +864,7 @@ class FTPModuleInstaller extends ModuleInstaller $this->_close(); - return new Object(); + return new BaseObject(); } } @@ -892,7 +892,7 @@ class DirectModuleInstaller extends ModuleInstaller */ function _connect() { - return new Object(); + return new BaseObject(); } /** @@ -911,9 +911,9 @@ class DirectModuleInstaller extends ModuleInstaller if(!FileHandler::removeFile($target_path)) { - return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path)); + return new BaseObject(-1, sprintf(lang('msg_delete_file_failed'), $path)); } - return new Object(); + return new BaseObject(); } /** @@ -931,7 +931,7 @@ class DirectModuleInstaller extends ModuleInstaller FileHandler::removeDir($target_path); - return new Object(); + return new BaseObject(); } /** @@ -989,7 +989,7 @@ class DirectModuleInstaller extends ModuleInstaller $this->_close(); - return new Object(); + return new BaseObject(); } } diff --git a/modules/board/board.admin.controller.php b/modules/board/board.admin.controller.php index dfe68ab91..cebba4f90 100644 --- a/modules/board/board.admin.controller.php +++ b/modules/board/board.admin.controller.php @@ -166,7 +166,7 @@ class boardAdminController extends board { $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); if($module_info->mid != $mid) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $module_info->hide_category = Context::get('hide_category') == 'Y' ? 'Y' : 'N'; diff --git a/modules/board/board.class.php b/modules/board/board.class.php index 3ff4b0232..8d0e65209 100644 --- a/modules/board/board.class.php +++ b/modules/board/board.class.php @@ -76,7 +76,7 @@ class board extends ModuleObject } } - return new Object(); + return new BaseObject(); } /** @@ -114,13 +114,13 @@ class board extends ModuleObject $oModuleController->insertTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'); } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } function moduleUninstall() { $output = executeQueryArray("board.getAllBoard"); - if(!$output->data) return new Object(); + if(!$output->data) return new BaseObject(); @set_time_limit(0); $oModuleController = getController('module'); @@ -130,6 +130,6 @@ class board extends ModuleObject $oModuleController->deleteModule($board->module_srl); } - return new Object(); + return new BaseObject(); } } diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index 642d83d6a..40d1faa4f 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -24,7 +24,7 @@ class boardController extends board // check grant if(!$this->grant->write_document) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // setup variables @@ -35,7 +35,7 @@ class boardController extends board // Return error if content is empty. if (is_empty_html_content($obj->content)) { - return new Object(-1, 'msg_empty_content'); + return new BaseObject(-1, 'msg_empty_content'); } // unset document style if not manager @@ -100,14 +100,14 @@ class boardController extends board { if(!$oDocument->isGranted()) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // Protect admin document $member_info = getModel('member')->getMemberInfoByMemberSrl($oDocument->get('member_srl')); if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_admin_document_no_modify'); + return new BaseObject(-1, 'msg_admin_document_no_modify'); } // if document status is temp @@ -131,7 +131,7 @@ class boardController extends board { if($oDocument->get('comment_count') > 0 && !$this->grant->manager) { - return new Object(-1, 'msg_protect_update_content'); + return new BaseObject(-1, 'msg_protect_update_content'); } } @@ -140,7 +140,7 @@ class boardController extends board { if($oDocument->get('regdate') < date('YmdHis', strtotime('-' . $this->module_info->protect_document_regdate . ' day'))) { - return new Object(-1, sprintf(lang('msg_protect_regdate_document'), $this->module_info->protect_document_regdate)); + return new BaseObject(-1, sprintf(lang('msg_protect_regdate_document'), $this->module_info->protect_document_regdate)); } } @@ -228,7 +228,7 @@ class boardController extends board $logged_info = Context::get('logged_info'); if(!$update_id) { - return new Object(-1, 'msg_no_update_id'); + return new BaseObject(-1, 'msg_no_update_id'); } $oDocumentModel = getModel('document'); @@ -240,13 +240,13 @@ class boardController extends board $Exists_log = $oDocumentModel->getUpdateLogAdminisExists($update_log->document_srl); if($Exists_log === true) { - return new Object(-1, 'msg_admin_update_log'); + return new BaseObject(-1, 'msg_admin_update_log'); } } if(!$update_log) { - return new Object(-1, 'msg_no_update_log'); + return new BaseObject(-1, 'msg_no_update_log'); } $oDocument = $oDocumentModel->getDocument($update_log->document_srl); @@ -275,7 +275,7 @@ class boardController extends board // if the document is not existed if(!$document_srl) { - return new Object(-1, 'msg_invalid_document'); + return new BaseObject(-1, 'msg_invalid_document'); } $oDocumentModel = &getModel('document'); @@ -285,7 +285,7 @@ class boardController extends board { if($oDocument->get('comment_count') > 0 && $this->grant->manager == false) { - return new Object(-1, 'msg_protect_delete_content'); + return new BaseObject(-1, 'msg_protect_delete_content'); } } @@ -295,7 +295,7 @@ class boardController extends board { $format = lang('msg_protect_regdate_document'); $massage = sprintf($format, $this->module_info->protect_document_regdate); - return new Object(-1, $massage); + return new BaseObject(-1, $massage); } } // generate document module controller object @@ -349,7 +349,7 @@ class boardController extends board // check grant if(!$this->grant->write_comment) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $logged_info = Context::get('logged_info'); @@ -378,7 +378,7 @@ class boardController extends board $oDocument = $oDocumentModel->getDocument($obj->document_srl); if(!$oDocument->isExists()) { - return new Object(-1,'msg_not_founded'); + return new BaseObject(-1,'msg_not_founded'); } // For anonymous use, remove writer's information and notifying information @@ -416,7 +416,7 @@ class boardController extends board $childs = $oCommentModel->getChildComments($obj->comment_srl); if(count($childs) > 0) { - return new Object(-1, 'msg_board_update_protect_comment'); + return new BaseObject(-1, 'msg_board_update_protect_comment'); } } } @@ -426,7 +426,7 @@ class boardController extends board if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_admin_comment_no_modify'); + return new BaseObject(-1, 'msg_admin_comment_no_modify'); } // INSERT if comment_srl does not exist. @@ -441,7 +441,7 @@ class boardController extends board $parent_comment = $oCommentModel->getComment($obj->parent_srl); if(!$parent_comment->comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if($parent_comment->isSecret() && $this->module_info->secret === 'Y') { @@ -470,13 +470,13 @@ class boardController extends board { $format = lang('msg_protect_regdate_comment'); $massage = sprintf($format, $this->module_info->protect_document_regdate); - return new Object(-1, $massage); + return new BaseObject(-1, $massage); } } // check the grant if(!$comment->isGranted()) { - return new Object(-1,'msg_not_permitted'); + return new BaseObject(-1,'msg_not_permitted'); } $obj->parent_srl = $comment->parent_srl; $output = $oCommentController->updateComment($obj, $this->grant->manager); @@ -510,7 +510,7 @@ class boardController extends board if(!$comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $oCommentModel = getModel('comment'); @@ -520,7 +520,7 @@ class boardController extends board $childs = $oCommentModel->getChildComments($comment_srl); if(count($childs) > 0) { - return new Object(-1, 'msg_board_delete_protect_comment'); + return new BaseObject(-1, 'msg_board_delete_protect_comment'); } } $comment = $oCommentModel->getComment($comment_srl, $this->grant->manager); @@ -530,7 +530,7 @@ class boardController extends board { $format = lang('msg_protect_regdate_comment'); $massage = sprintf($format, $this->module_info->protect_document_regdate); - return new Object(-1, $massage); + return new BaseObject(-1, $massage); } } // generate comment controller object @@ -642,13 +642,13 @@ class boardController extends board $oComment = $oCommentModel->getComment($comment_srl); if(!$oComment->isExists()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // compare the comment password and the user input password if(!$oMemberModel->isValidPassword($oComment->get('password'),$password)) { - return new Object(-1, 'msg_invalid_password'); + return new BaseObject(-1, 'msg_invalid_password'); } $oComment->setGrantForSession(); @@ -658,13 +658,13 @@ class boardController extends board $oDocument = $oDocumentModel->getDocument($document_srl); if(!$oDocument->isExists()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // compare the document password and the user input password if(!$oMemberModel->isValidPassword($oDocument->get('password'),$password)) { - return new Object(-1, 'msg_invalid_password'); + return new BaseObject(-1, 'msg_invalid_password'); } $oDocument->setGrantForSession(); @@ -681,7 +681,7 @@ class boardController extends board if(!$member_srl || !$mid) { - return new Object(); + return new BaseObject(); } $logged_info = Context::get('logged_info'); @@ -693,7 +693,7 @@ class boardController extends board if($cur_module_info->module != 'board') { - return new Object(); + return new BaseObject(); } // get the member information @@ -707,7 +707,7 @@ class boardController extends board if(!$member_info->user_id) { - return new Object(); + return new BaseObject(); } //search @@ -715,7 +715,7 @@ class boardController extends board $oMemberController = getController('member'); $oMemberController->addMemberPopupMenu($url, 'cmd_view_own_document', ''); - return new Object(); + return new BaseObject(); } /** diff --git a/modules/board/board.view.php b/modules/board/board.view.php index a5f046e64..208e0ca7d 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -657,18 +657,18 @@ class boardView extends board $document_srl = Context::get('document_srl'); if(!$document_srl) { - return new Object(-1, "msg_invalid_request"); + return new BaseObject(-1, "msg_invalid_request"); } if($this->grant->view == false || ($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)) { - return new Object(-1, "msg_not_permitted"); + return new BaseObject(-1, "msg_not_permitted"); } $oDocument = getModel('document')->getDocument($document_srl); if(!$oDocument->isExists()) { - return new Object(-1, "msg_invalid_request"); + return new BaseObject(-1, "msg_invalid_request"); } Context::set('oDocument', $oDocument); @@ -765,20 +765,20 @@ class boardView extends board { $format = lang('msg_protect_regdate_document'); $massage = sprintf($format, $this->module_info->protect_document_regdate); - return new Object(-1, $massage); + return new BaseObject(-1, $massage); } } if($this->module_info->protect_content == "Y" || $this->module_info->protect_update_content == 'Y') { if($oDocument->get('comment_count') > 0 && $this->grant->manager == false) { - return new Object(-1, 'msg_protect_update_content'); + return new BaseObject(-1, 'msg_protect_update_content'); } } } if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_admin_document_no_modify'); + return new BaseObject(-1, 'msg_admin_document_no_modify'); } // if the document is not granted, then back to the password input form @@ -892,7 +892,7 @@ class boardView extends board { $format = lang('msg_protect_regdate_document'); $massage = sprintf($format, $this->module_info->protect_document_regdate); - return new Object(-1, $massage); + return new BaseObject(-1, $massage); } } @@ -900,7 +900,7 @@ class boardView extends board { if($oDocument->get('comment_count')>0 && $this->grant->manager == false) { - return new Object(-1,'msg_protect_delete_content'); + return new BaseObject(-1,'msg_protect_delete_content'); } } @@ -977,7 +977,7 @@ class boardView extends board // if the parent comment is not existed if(!$parent_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // get the comment @@ -1039,7 +1039,7 @@ class boardView extends board // if the comment is not existed if(!$comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // get comment information @@ -1054,7 +1054,7 @@ class boardView extends board { $format = lang('msg_protect_regdate_comment'); $massage = sprintf($format, $this->module_info->protect_document_regdate); - return new Object(-1, $massage); + return new BaseObject(-1, $massage); } } if($this->module_info->protect_update_comment === 'Y' && $this->grant->manager == false) @@ -1062,13 +1062,13 @@ class boardView extends board $childs = $oCommentModel->getChildComments($comment_srl); if(count($childs) > 0) { - return new Object(-1, 'msg_board_update_protect_comment'); + return new BaseObject(-1, 'msg_board_update_protect_comment'); } } if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_admin_comment_no_modify'); + return new BaseObject(-1, 'msg_admin_comment_no_modify'); } // if the comment is not exited, alert an error message @@ -1122,7 +1122,7 @@ class boardView extends board { $format = lang('msg_protect_regdate_comment'); $massage = sprintf($format, $this->module_info->protect_document_regdate); - return new Object(-1, $massage); + return new BaseObject(-1, $massage); } } @@ -1132,7 +1132,7 @@ class boardView extends board $childs = $oCommentModel->getChildComments($comment_srl); if(count($childs) > 0) { - return new Object(-1, 'msg_board_delete_protect_comment'); + return new BaseObject(-1, 'msg_board_delete_protect_comment'); } } @@ -1212,7 +1212,7 @@ class boardView extends board if($this->grant->update_view !== true) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $updatelog = $oDocumentModel->getDocumentUpdateLog($document_srl); @@ -1232,7 +1232,7 @@ class boardView extends board if($this->grant->update_view !== true) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $update_log = $oDocumentModel->getUpdateLog($update_id); @@ -1268,7 +1268,7 @@ class boardView extends board { iF($this->grant->vote_log_view !== true) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $oMemberModel = getModel('member'); @@ -1289,7 +1289,7 @@ class boardView extends board } else { - return new Object(-1, 'msg_not_target'); + return new BaseObject(-1, 'msg_not_target'); } $output = executeQueryArray($queryId, $args); diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index 4a6960db5..50b58d0e3 100644 --- a/modules/comment/comment.admin.controller.php +++ b/modules/comment/comment.admin.controller.php @@ -96,7 +96,7 @@ class commentAdminController extends comment $comment = $oCommentModel->getComment($comment_srl); if($comment->comment_srl != $comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $document_srl = $comment->document_srl; if(!in_array($document_srl, $updated_documents_arr)) diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php index d7b4ffde9..40cdecc49 100644 --- a/modules/comment/comment.class.php +++ b/modules/comment/comment.class.php @@ -34,7 +34,7 @@ class comment extends ModuleObject // 2008. 02. 22 add comment setting when a new module added $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'); - return new Object(); + return new BaseObject(); } /** @@ -195,7 +195,7 @@ class comment extends ModuleObject $oDB->addIndex('comments', 'idx_parent_srl', array('parent_srl')); } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index e9f383958..9a0e015d9 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -29,13 +29,13 @@ class commentController extends comment { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $comment_srl = Context::get('target_srl'); if(!$comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $oCommentModel = getModel('comment'); @@ -43,14 +43,14 @@ class commentController extends comment $module_srl = $oComment->get('module_srl'); if(!$module_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $oModuleModel = getModel('module'); $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl); if($comment_config->use_vote_up == 'N') { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $point = 1; @@ -61,16 +61,16 @@ class commentController extends comment function procCommentVoteUpCancel() { - if(!Context::get('logged_info')) return new Object(-1, 'msg_invalid_request'); + if(!Context::get('logged_info')) return new BaseObject(-1, 'msg_invalid_request'); $comment_srl = Context::get('target_srl'); - if(!$comment_srl) return new Object(-1, 'msg_invalid_request'); + if(!$comment_srl) return new BaseObject(-1, 'msg_invalid_request'); $oCommentModel = getModel('comment'); $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); if($oComment->get('voted_count') <= 0) { - return new Object(-1, 'msg_comment_voted_cancel_not'); + return new BaseObject(-1, 'msg_comment_voted_cancel_not'); } $point = 1; $output = $this->updateVotedCountCancel($comment_srl, $oComment, $point); @@ -90,13 +90,13 @@ class commentController extends comment { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $comment_srl = Context::get('target_srl'); if(!$comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $oCommentModel = getModel('comment'); @@ -104,14 +104,14 @@ class commentController extends comment $module_srl = $oComment->get('module_srl'); if(!$module_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $oModuleModel = getModel('module'); $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl); if($comment_config->use_vote_down == 'N') { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $point = -1; @@ -122,16 +122,16 @@ class commentController extends comment function procCommentVoteDownCancel() { - if(!Context::get('logged_info')) return new Object(-1, 'msg_invalid_request'); + if(!Context::get('logged_info')) return new BaseObject(-1, 'msg_invalid_request'); $comment_srl = Context::get('target_srl'); - if(!$comment_srl) return new Object(-1, 'msg_invalid_request'); + if(!$comment_srl) return new BaseObject(-1, 'msg_invalid_request'); $oCommentModel = getModel('comment'); $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); if($oComment->get('blamed_count') >= 0) { - return new Object(-1, 'msg_comment_blamed_cancel_not'); + return new BaseObject(-1, 'msg_comment_blamed_cancel_not'); } $point = -1; $output = $this->updateVotedCountCancel($comment_srl, $oComment, $point); @@ -193,13 +193,13 @@ class commentController extends comment { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $comment_srl = Context::get('target_srl'); if(!$comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // if an user select message from options, message would be the option. @@ -226,7 +226,7 @@ class commentController extends comment $document_srl = $obj->document_srl; if(!$document_srl) { - return new Object(); + return new BaseObject(); } return $this->deleteComments($document_srl, $obj); @@ -241,7 +241,7 @@ class commentController extends comment $module_srl = $obj->module_srl; if(!$module_srl) { - return new Object(); + return new BaseObject(); } $oCommentController = getAdminController('comment'); @@ -297,7 +297,7 @@ class commentController extends comment { if(!$manual_inserted && !checkCSRF()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if(!is_object($obj)) @@ -359,7 +359,7 @@ class commentController extends comment $document_srl = $obj->document_srl; if(!$document_srl) { - return new Object(-1, 'msg_invalid_document'); + return new BaseObject(-1, 'msg_invalid_document'); } // creat the comment model object @@ -380,11 +380,11 @@ class commentController extends comment if($document_srl != $oDocument->document_srl) { - return new Object(-1, 'msg_invalid_document'); + return new BaseObject(-1, 'msg_invalid_document'); } if($oDocument->isLocked()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if($obj->homepage) @@ -414,7 +414,7 @@ class commentController extends comment // error display if neither of log-in info and user name exist. if(!$logged_info->member_srl && !$obj->nick_name) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if(!$obj->comment_srl) @@ -423,7 +423,7 @@ class commentController extends comment } elseif(!$is_admin && !$manual_inserted && !checkUserSequence($obj->comment_srl)) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // determine the order @@ -435,7 +435,7 @@ class commentController extends comment // Return error if content is empty. if (!$manual_inserted && is_empty_html_content($obj->content)) { - return new Object(-1, 'msg_empty_content'); + return new BaseObject(-1, 'msg_empty_content'); } // if use editor of nohtml, Remove HTML tags from the contents. @@ -700,7 +700,7 @@ class commentController extends comment { if(!$manual_updated && !checkCSRF()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if(!is_object($obj)) @@ -737,7 +737,7 @@ class commentController extends comment // check if permission is granted if(!$is_admin && !$source_obj->isGranted()) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } if($obj->password) @@ -788,7 +788,7 @@ class commentController extends comment // Return error if content is empty. if (!$manual_inserted && is_empty_html_content($obj->content)) { - return new Object(-1, 'msg_empty_content'); + return new BaseObject(-1, 'msg_empty_content'); } // if use editor of nohtml, Remove HTML tags from the contents. @@ -837,7 +837,7 @@ class commentController extends comment { if (!$obj->comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // call a trigger (before) @@ -904,7 +904,7 @@ class commentController extends comment { if (!$obj->comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // begin transaction @@ -963,7 +963,7 @@ class commentController extends comment $comment = $oCommentModel->getComment($comment_srl); if($comment->comment_srl != $comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $oMemberModel = getModel('member'); @@ -981,7 +981,7 @@ class commentController extends comment // check if permission is granted if(!$is_admin && !$comment->isGranted()) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // check if child comment exists on the comment @@ -1021,11 +1021,11 @@ class commentController extends comment if(!$deleteAllComment) { - return new Object(-1, 'fail_to_delete_have_children'); + return new BaseObject(-1, 'fail_to_delete_have_children'); } elseif(!$deleteAdminComment) { - return new Object(-1, 'msg_admin_c_comment_no_delete'); + return new BaseObject(-1, 'msg_admin_c_comment_no_delete'); } else { @@ -1042,7 +1042,7 @@ class commentController extends comment if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_admin_comment_no_delete'); + return new BaseObject(-1, 'msg_admin_comment_no_delete'); } // begin transaction $oDB = DB::getInstance(); @@ -1132,7 +1132,7 @@ class commentController extends comment $member_info = $oMemberModel->getMemberInfoByMemberSrl($oComment->get('member_srl')); if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_admin_comment_no_move_to_trash'); + return new BaseObject(-1, 'msg_admin_comment_no_move_to_trash'); } $trash_args->module_srl = $oComment->variables['module_srl']; @@ -1140,7 +1140,7 @@ class commentController extends comment if($trash_args->module_srl === 0) { - return new Object(-1, 'msg_module_srl_not_exists'); + return new BaseObject(-1, 'msg_module_srl_not_exists'); } $trash_args->document_srl = $obj->document_srl; $trash_args->comment_srl = $obj->comment_srl; @@ -1232,7 +1232,7 @@ class commentController extends comment { $this->_deleteDeclaredComments($args); $this->_deleteVotedComments($args); - return new Object(0, 'success'); + return new BaseObject(0, 'success'); } /** @@ -1259,7 +1259,7 @@ class commentController extends comment if(!$oDocument->isExists() || !$oDocument->isGranted()) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // get a list of comments and then execute a trigger(way to reduce the processing cost for delete all) @@ -1351,7 +1351,7 @@ class commentController extends comment // invalid vote if vote info exists in the session info. if($_SESSION['voted_comment'][$comment_srl]) { - return new Object(-1, $failed_voted); + return new BaseObject(-1, $failed_voted); } $oCommentModel = getModel('comment'); @@ -1361,7 +1361,7 @@ class commentController extends comment if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR']) { $_SESSION['voted_comment'][$comment_srl] = false; - return new Object(-1, $failed_voted); + return new BaseObject(-1, $failed_voted); } // if the comment author is a member @@ -1375,7 +1375,7 @@ class commentController extends comment if($member_srl && $member_srl == abs($oComment->get('member_srl'))) { $_SESSION['voted_comment'][$comment_srl] = false; - return new Object(-1, $failed_voted); + return new BaseObject(-1, $failed_voted); } } @@ -1398,7 +1398,7 @@ class commentController extends comment if($output->data->count) { $_SESSION['voted_comment'][$comment_srl] = false; - return new Object(-1, $failed_voted); + return new BaseObject(-1, $failed_voted); } // begin transaction @@ -1461,7 +1461,7 @@ class commentController extends comment // Fail if session information already has a reported document if($_SESSION['declared_comment'][$comment_srl]) { - return new Object(-1, 'failed_declared'); + return new BaseObject(-1, 'failed_declared'); } // check if already reported @@ -1496,7 +1496,7 @@ class commentController extends comment if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR']) { $_SESSION['declared_comment'][$comment_srl] = TRUE; - return new Object(-1, 'failed_declared'); + return new BaseObject(-1, 'failed_declared'); } // if the comment author is a member @@ -1510,7 +1510,7 @@ class commentController extends comment if($member_srl && $member_srl == abs($oComment->get('member_srl'))) { $_SESSION['declared_comment'][$comment_srl] = TRUE; - return new Object(-1, 'failed_declared'); + return new BaseObject(-1, 'failed_declared'); } } @@ -1532,7 +1532,7 @@ class commentController extends comment if($log_output->data->count) { $_SESSION['declared_comment'][$comment_srl] = TRUE; - return new Object(-1, 'failed_declared'); + return new BaseObject(-1, 'failed_declared'); } // begin transaction @@ -1622,13 +1622,13 @@ class commentController extends comment $module_info = $oModuleModel->getModuleInfoByModuleSrl($srl); if (!$module_info->module_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $module_grant = $oModuleModel->getGrant($module_info, $logged_info); if (!$module_grant->manager) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $module_srl[] = $srl; @@ -1681,7 +1681,7 @@ class commentController extends comment { $oModuleController = getController('module'); $oModuleController->insertModulePartConfig('comment', $srl, $comment_config); - return new Object(); + return new BaseObject(); } /** @@ -1692,7 +1692,7 @@ class commentController extends comment { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $commentSrls = Context::get('comment_srls'); diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index f04305569..9130c2a2c 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -976,7 +976,7 @@ class commentModel extends comment $comment_srl = Context::get('comment_srl'); if(!$comment_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $point = Context::get('point'); @@ -990,7 +990,7 @@ class commentModel extends comment $module_srl = $oComment->get('module_srl'); if(!$module_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $oModuleModel = getModel('module'); @@ -1002,7 +1002,7 @@ class commentModel extends comment { if($comment_config->use_vote_down != 'S') { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $args->below_point = 0; @@ -1011,7 +1011,7 @@ class commentModel extends comment { if($comment_config->use_vote_up != 'S') { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $args->more_point = 0; diff --git a/modules/comment/comment.view.php b/modules/comment/comment.view.php index 5f59da78f..498a1f86f 100644 --- a/modules/comment/comment.view.php +++ b/modules/comment/comment.view.php @@ -38,7 +38,7 @@ class commentView extends comment $current_module_srl = $current_module_info->module_srl; if(!$current_module_srl) { - return new Object(); + return new BaseObject(); } } @@ -57,7 +57,7 @@ class commentView extends comment $tpl = $oTemplate->compile($this->module_path . 'tpl', 'comment_module_config'); $obj .= $tpl; - return new Object(); + return new BaseObject(); } /** @@ -82,12 +82,12 @@ class commentView extends comment $oComment = $oCommentModel->getComment($comment_srl); if(!$oComment->isExists()) { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } // Check permissions if(!$oComment->isAccessible()) { - return new Object(-1,'msg_not_permitted'); + return new BaseObject(-1,'msg_not_permitted'); } // Browser title settings diff --git a/modules/communication/communication.class.php b/modules/communication/communication.class.php index 1da302005..780133987 100644 --- a/modules/communication/communication.class.php +++ b/modules/communication/communication.class.php @@ -31,7 +31,7 @@ class communication extends ModuleObject // Create a temporary file storage for one new private message notification FileHandler::makeDir('./files/member_extra_info/new_message_flags'); - return new Object(); + return new BaseObject(); } /** @@ -97,7 +97,7 @@ class communication extends ModuleObject FileHandler::makeDir('./files/member_extra_info/new_message_flags'); } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index b35514649..583fb514a 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -24,7 +24,7 @@ class communicationController extends communication { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $args = new stdClass(); @@ -54,7 +54,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -63,19 +63,19 @@ class communicationController extends communication $receiver_srl = Context::get('receiver_srl'); if(!$receiver_srl) { - return new Object(-1, 'msg_not_exists_member'); + return new BaseObject(-1, 'msg_not_exists_member'); } $title = trim(Context::get('title')); if(!$title) { - return new Object(-1, 'msg_title_is_null'); + return new BaseObject(-1, 'msg_title_is_null'); } $content = trim(Context::get('content')); if(!$content) { - return new Object(-1, 'msg_content_is_null'); + return new BaseObject(-1, 'msg_content_is_null'); } $send_mail = Context::get('send_mail'); @@ -91,13 +91,13 @@ class communicationController extends communication if(!$oCommunicationModel->checkGrant($config->grant_send)) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $receiver_member_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl); if($receiver_member_info->member_srl != $receiver_srl) { - return new Object(-1, 'msg_not_exists_member'); + return new BaseObject(-1, 'msg_not_exists_member'); } // check whether to allow to receive the message(pass if a top-administrator) @@ -107,12 +107,12 @@ class communicationController extends communication { if(!$oCommunicationModel->isFriend($receiver_member_info->member_srl)) { - return new object(-1, 'msg_allow_message_to_friend'); + return new BaseObject(-1, 'msg_allow_message_to_friend'); } } else if($receiver_member_info->allow_message == 'N') { - return new object(-1, 'msg_disallow_message'); + return new BaseObject(-1, 'msg_disallow_message'); } } @@ -257,7 +257,7 @@ class communicationController extends communication // create a flag that message is sent (in file format) $this->updateFlagFile($receiver_srl); - return new Object(0, 'success_sended'); + return new BaseObject(0, 'success_sended'); } /** @@ -269,7 +269,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -277,7 +277,7 @@ class communicationController extends communication $message_srl = Context::get('message_srl'); if(!$message_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // get the message @@ -285,7 +285,7 @@ class communicationController extends communication $message = $oCommunicationModel->getSelectedMessage($message_srl); if(!$message || $message->message_type != 'R') { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $args = new stdClass(); @@ -309,7 +309,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -319,7 +319,7 @@ class communicationController extends communication $message_srl = Context::get('message_srl'); if(!$message_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // Get the message @@ -327,7 +327,7 @@ class communicationController extends communication $message = $oCommunicationModel->getSelectedMessage($message_srl); if(!$message) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // Check the grant @@ -336,14 +336,14 @@ class communicationController extends communication case 'S': if($message->sender_srl != $member_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } break; case 'R': if($message->receiver_srl != $member_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } break; } @@ -369,7 +369,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -378,7 +378,7 @@ class communicationController extends communication // check variables if(!Context::get('message_srl_list')) { - return new Object(-1, 'msg_cart_is_null'); + return new BaseObject(-1, 'msg_cart_is_null'); } $message_srl_list = Context::get('message_srl_list'); @@ -389,13 +389,13 @@ class communicationController extends communication if(!count($message_srl_list)) { - return new Object(-1, 'msg_cart_is_null'); + return new BaseObject(-1, 'msg_cart_is_null'); } $message_type = Context::get('message_type'); if(!$message_type || !in_array($message_type, array('R', 'S', 'T'))) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $message_count = count($message_srl_list); @@ -412,7 +412,7 @@ class communicationController extends communication } if(!count($target)) { - return new Object(-1, 'msg_cart_is_null'); + return new BaseObject(-1, 'msg_cart_is_null'); } // Delete @@ -450,7 +450,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -458,11 +458,11 @@ class communicationController extends communication $target_srl = (int) trim(Context::get('target_srl')); if(!$target_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if($target_srl == $logged_info->member_srl) { - return new Object(-1, 'msg_no_self_friend'); + return new BaseObject(-1, 'msg_no_self_friend'); } // Check duplicate friend @@ -472,7 +472,7 @@ class communicationController extends communication $output = executeQuery('communication.isAddedFriend', $args); if($output->data->count) { - return new Object(-1, 'msg_already_friend'); + return new BaseObject(-1, 'msg_already_friend'); } // Variable @@ -512,7 +512,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -521,7 +521,7 @@ class communicationController extends communication $friend_srl_list = Context::get('friend_srl_list'); if(!$friend_srl_list) { - return new Object(-1, 'msg_cart_is_null'); + return new BaseObject(-1, 'msg_cart_is_null'); } if(!is_array($friend_srl_list)) @@ -531,7 +531,7 @@ class communicationController extends communication if(!count($friend_srl_list)) { - return new Object(-1, 'msg_cart_is_null'); + return new BaseObject(-1, 'msg_cart_is_null'); } $friend_count = count($friend_srl_list); @@ -549,7 +549,7 @@ class communicationController extends communication if(!count($target)) { - return new Object(-1, 'msg_cart_is_null'); + return new BaseObject(-1, 'msg_cart_is_null'); } // Variables @@ -579,7 +579,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -595,7 +595,7 @@ class communicationController extends communication if(!count($friend_srl_list)) { - return new Object(-1, 'msg_cart_is_null'); + return new BaseObject(-1, 'msg_cart_is_null'); } $friend_count = count($friend_srl_list); @@ -614,7 +614,7 @@ class communicationController extends communication if(!count($target)) { - return new Object(-1, 'msg_cart_is_null'); + return new BaseObject(-1, 'msg_cart_is_null'); } // Delete @@ -642,7 +642,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -656,7 +656,7 @@ class communicationController extends communication if(!$args->title) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // modify if friend_group_srl exists. @@ -718,7 +718,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -732,7 +732,7 @@ class communicationController extends communication if(!$args->title) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $output = executeQuery('communication.renameFriendGroup', $args); @@ -753,7 +753,7 @@ class communicationController extends communication // Check login information if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -831,7 +831,7 @@ class communicationController extends communication { if(!Context::get('is_logged')) { - return new Object(); + return new BaseObject(); } $oCommunicationModel = getModel('communication'); @@ -839,11 +839,11 @@ class communicationController extends communication if($config->enable_message == 'N' && $config->enable_friend == 'N') { - return new Object(); + return new BaseObject(); } if(!$oCommunicationModel->checkGrant($config->grant_send)) { - return new Object(); + return new BaseObject(); } $mid = Context::get('cur_mid'); @@ -874,7 +874,7 @@ class communicationController extends communication $target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$target_member_info->member_srl) { - return new Object(); + return new BaseObject(); } // Add a menu for sending message diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index 284b45564..da3921340 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -52,13 +52,13 @@ class communicationView extends communication { if($this->config->enable_message == 'N') { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // Error appears if not logged-in if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -86,28 +86,28 @@ class communicationView extends communication case 'R': if($message->receiver_srl != $logged_info->member_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } break; case 'S': if($message->sender_srl != $logged_info->member_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } break; case 'T': if($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } break; case 'N': if($message->receiver_srl != $logged_info->member_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } break; } diff --git a/modules/counter/counter.class.php b/modules/counter/counter.class.php index 43afca409..7aa9122b8 100644 --- a/modules/counter/counter.class.php +++ b/modules/counter/counter.class.php @@ -23,7 +23,7 @@ class counter extends ModuleObject // add a row for today's status //$oCounterController->insertTodayStatus(); - return new Object(); + return new BaseObject(); } /** @@ -68,7 +68,7 @@ class counter extends ModuleObject $oDB->addIndex('counter_log', 'idx_site_counter_log', array('site_srl', 'ipaddress'), FALSE); } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index d36b5aff9..dacdbea91 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -213,7 +213,7 @@ class documentAdminController extends document { Rhymix\Framework\Cache::delete('document_item:'. getNumberingPath($document_srl) . $document_srl); } - return new Object(); + return new BaseObject(); } /** @@ -557,7 +557,7 @@ class documentAdminController extends document $eid = Context::get('eid'); $obj = new stdClass(); - if(!$module_srl || !$name || !$eid) return new Object(-1,'msg_invalid_request'); + if(!$module_srl || !$name || !$eid) return new BaseObject(-1,'msg_invalid_request'); // set the max value if idx is not specified if(!$var_idx) { @@ -573,7 +573,7 @@ class documentAdminController extends document $output = executeQuery('document.isExistsExtraKey', $obj); if(!$output->toBool() || $output->data->count) { - return new Object(-1, 'msg_extra_name_exists'); + return new BaseObject(-1, 'msg_extra_name_exists'); } // insert or update @@ -595,7 +595,7 @@ class documentAdminController extends document { $module_srl = Context::get('module_srl'); $var_idx = Context::get('var_idx'); - if(!$module_srl || !$var_idx) return new Object(-1,'msg_invalid_request'); + if(!$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request'); $oDocumentController = getController('document'); $output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx); @@ -614,26 +614,26 @@ class documentAdminController extends document $module_srl = Context::get('module_srl'); $var_idx = Context::get('var_idx'); - if(!$type || !$module_srl || !$var_idx) return new Object(-1,'msg_invalid_request'); + if(!$type || !$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request'); $oModuleModel = getModel('module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); - if(!$module_info->module_srl) return new Object(-1,'msg_invalid_request'); + if(!$module_info->module_srl) return new BaseObject(-1,'msg_invalid_request'); $oDocumentModel = getModel('document'); $extra_keys = $oDocumentModel->getExtraKeys($module_srl); - if(!$extra_keys[$var_idx]) return new Object(-1,'msg_invalid_request'); + if(!$extra_keys[$var_idx]) return new BaseObject(-1,'msg_invalid_request'); if($type == 'up') $new_idx = $var_idx-1; else $new_idx = $var_idx+1; - if($new_idx<1) return new Object(-1,'msg_invalid_request'); + if($new_idx<1) return new BaseObject(-1,'msg_invalid_request'); $args = new stdClass(); $args->module_srl = $module_srl; $args->var_idx = $new_idx; $output = executeQuery('document.getDocumentExtraKeys', $args); if (!$output->toBool()) return $output; - if (!$output->data) return new Object(-1, 'msg_invalid_request'); + if (!$output->data) return new BaseObject(-1, 'msg_invalid_request'); unset($args); // update immediately if there is no idx to change @@ -737,7 +737,7 @@ class documentAdminController extends document $member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl')); if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_admin_document_no_move_to_trash'); + return new BaseObject(-1, 'msg_admin_document_no_move_to_trash'); } $oModuleModel = getModel('module'); @@ -882,7 +882,7 @@ class documentAdminController extends document //DB restore $output = $oDocumentController->insertDocument($originObject, false, true, false); - if(!$output->toBool()) return new Object(-1, $output->getMessage()); + if(!$output->toBool()) return new BaseObject(-1, $output->getMessage()); //FILE restore $oDocument = $oDocumentModel->getDocument($originObject->document_srl); @@ -900,7 +900,7 @@ class documentAdminController extends document // commit $oDB->commit(); - return new Object(0, 'success'); + return new BaseObject(0, 'success'); } /** diff --git a/modules/document/document.class.php b/modules/document/document.class.php index c0c691b57..451e7b323 100644 --- a/modules/document/document.class.php +++ b/modules/document/document.class.php @@ -48,7 +48,7 @@ class document extends ModuleObject // 2009. 01. 29 Added a trigger for additional setup $oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'); - return new Object(); + return new BaseObject(); } /** @@ -342,7 +342,7 @@ class document extends ModuleObject $oDB->addIndex('document_update_log', 'idx_is_admin', array('is_admin')); } - return new Object(0,'success_updated'); + return new BaseObject(0,'success_updated'); } /** diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index f9cf7ae23..fe9440c4c 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -28,21 +28,21 @@ class documentController extends document { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } } $document_srl = Context::get('target_srl'); - if(!$document_srl) return new Object(-1, 'msg_invalid_request'); + if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request'); $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl, false, false); $module_srl = $oDocument->get('module_srl'); - if(!$module_srl) return new Object(-1, 'msg_invalid_request'); + if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request'); $oModuleModel = getModel('module'); $document_config = $oModuleModel->getModulePartConfig('document',$module_srl); - if($document_config->use_vote_up=='N') return new Object(-1, 'msg_invalid_request'); + if($document_config->use_vote_up=='N') return new BaseObject(-1, 'msg_invalid_request'); $point = 1; $output = $this->updateVotedCount($document_srl, $point); @@ -60,18 +60,18 @@ class documentController extends document { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } } $document_srl = Context::get('target_srl'); - if(!$document_srl) return new Object(-1, 'msg_invalid_request'); + if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request'); $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl, false, false); if($oDocument->get('voted_count') <= 0) { - return new Object(-1, 'msg_document_voted_cancel_not'); + return new BaseObject(-1, 'msg_document_voted_cancel_not'); } $point = 1; $output = $this->updateVotedCountCancel($document_srl, $oDocument, $point); @@ -114,21 +114,21 @@ class documentController extends document { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } } $document_srl = Context::get('target_srl'); - if(!$document_srl) return new Object(-1, 'msg_invalid_request'); + if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request'); $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl, false, false); $module_srl = $oDocument->get('module_srl'); - if(!$module_srl) return new Object(-1, 'msg_invalid_request'); + if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request'); $oModuleModel = getModel('module'); $document_config = $oModuleModel->getModulePartConfig('document',$module_srl); - if($document_config->use_vote_down=='N') return new Object(-1, 'msg_invalid_request'); + if($document_config->use_vote_down=='N') return new BaseObject(-1, 'msg_invalid_request'); $point = -1; $output = $this->updateVotedCount($document_srl, $point); @@ -146,18 +146,18 @@ class documentController extends document { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } } $document_srl = Context::get('target_srl'); - if(!$document_srl) return new Object(-1, 'msg_invalid_request'); + if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request'); $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl, false, false); if($oDocument->get('blamed_count') >= 0) { - return new Object(-1, 'msg_document_voted_cancel_not'); + return new BaseObject(-1, 'msg_document_voted_cancel_not'); } $point = -1; $output = $this->updateVotedCountCancel($document_srl, $oDocument, $point); @@ -229,13 +229,13 @@ class documentController extends document { if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $document_srl = intval(Context::get('target_srl')); if(!$document_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // if an user select message from options, message would be the option. @@ -302,7 +302,7 @@ class documentController extends document function triggerDeleteModuleDocuments(&$obj) { $module_srl = $obj->module_srl; - if(!$module_srl) return new Object(); + if(!$module_srl) return new BaseObject(); // Delete the document $oDocumentAdminController = getAdminController('document'); $output = $oDocumentAdminController->deleteModuleDocument($module_srl); @@ -320,7 +320,7 @@ class documentController extends document // remove histories $this->deleteDocumentHistory(null, null, $module_srl); - return new Object(); + return new BaseObject(); } /** @@ -349,7 +349,7 @@ class documentController extends document { if(!$manual_inserted && !checkCSRF()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // begin transaction @@ -420,7 +420,7 @@ class documentController extends document } elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // Set to 0 if the category_srl doesn't exist @@ -430,7 +430,7 @@ class documentController extends document $category_list = $oDocumentModel->getCategoryList($obj->module_srl); if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0; } @@ -477,7 +477,7 @@ class documentController extends document // Return error if content is empty. if (!$manual_inserted && is_empty_html_content($obj->content)) { - return new Object(-1, 'msg_empty_content'); + return new BaseObject(-1, 'msg_empty_content'); } // if use editor of nohtml, Remove HTML tags from the contents. @@ -490,7 +490,7 @@ class documentController extends document if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content); // An error appears if both log-in info and user name don't exist. - if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request'); + if(!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-1,'msg_invalid_request'); // Fix encoding of non-BMP UTF-8 characters. $obj->title = utf8_mbencode($obj->title); @@ -578,10 +578,10 @@ class documentController extends document { if(!$manual_updated && !checkCSRF()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } - if(!$source_obj->document_srl || !$obj->document_srl) return new Object(-1,'msg_invalied_request'); + if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1,'msg_invalied_request'); // Default Status if($obj->status) @@ -735,7 +735,7 @@ class documentController extends document // Return error if content is empty. if (!$manual_inserted && is_empty_html_content($obj->content)) { - return new Object(-1, 'msg_empty_content'); + return new BaseObject(-1, 'msg_empty_content'); } // if use editor of nohtml, Remove HTML tags from the contents. @@ -926,7 +926,7 @@ class documentController extends document // Check if the documnet exists $oDocument = $oDocumentModel->getDocument($document_srl, $is_admin); } - else if($isEmptyTrash && $oDocument == null) return new Object(-1, 'document is not exists'); + else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists'); $oMemberModel = getModel('member'); $member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl')); @@ -934,13 +934,13 @@ class documentController extends document if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_document_is_admin_not_permitted'); + return new BaseObject(-1, 'msg_document_is_admin_not_permitted'); } - if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new Object(-1, 'msg_invalid_document'); + if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document'); // Check if a permossion is granted - if(!$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted'); + if(!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted'); //if empty trash, document already deleted, therefore document not delete $args = new stdClass(); @@ -1045,7 +1045,7 @@ class documentController extends document $member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl')); if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_admin_document_no_move_to_trash'); + return new BaseObject(-1, 'msg_admin_document_no_move_to_trash'); } $trash_args->module_srl = $oDocument->get('module_srl'); @@ -1245,7 +1245,7 @@ class documentController extends document */ function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid) { - if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new Object(-1,'msg_invalid_request'); + if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-1,'msg_invalid_request'); $obj = new stdClass(); $obj->module_srl = $module_srl; @@ -1282,7 +1282,7 @@ class documentController extends document */ function deleteDocumentExtraKeys($module_srl, $var_idx = null) { - if(!$module_srl) return new Object(-1,'msg_invalid_request'); + if(!$module_srl) return new BaseObject(-1,'msg_invalid_request'); $obj = new stdClass(); $obj->module_srl = $module_srl; if(!is_null($var_idx)) $obj->var_idx = $var_idx; @@ -1327,7 +1327,7 @@ class documentController extends document $oDB->commit(); Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl"); - return new Object(); + return new BaseObject(); } /** @@ -1342,7 +1342,7 @@ class documentController extends document */ function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '') { - if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new Object(-1,'msg_invalid_request'); + if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-1,'msg_invalid_request'); if(!$lang_code) $lang_code = Context::getLangType(); $obj = new stdClass; @@ -1397,7 +1397,7 @@ class documentController extends document // Return fail if session already has information about votes if($_SESSION['voted_document'][$document_srl]) { - return new Object(-1, $failed_voted); + return new BaseObject(-1, $failed_voted); } // Get the original document $oDocumentModel = getModel('document'); @@ -1406,7 +1406,7 @@ class documentController extends document if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) { $_SESSION['voted_document'][$document_srl] = false; - return new Object(-1, $failed_voted); + return new BaseObject(-1, $failed_voted); } // Create a member model object $oMemberModel = getModel('member'); @@ -1419,7 +1419,7 @@ class documentController extends document if($member_srl && $member_srl == abs($oDocument->get('member_srl'))) { $_SESSION['voted_document'][$document_srl] = false; - return new Object(-1, $failed_voted); + return new BaseObject(-1, $failed_voted); } } // Use member_srl for logged-in members and IP address for non-members. @@ -1438,7 +1438,7 @@ class documentController extends document if($output->data->count) { $_SESSION['voted_document'][$document_srl] = false; - return new Object(-1, $failed_voted); + return new BaseObject(-1, $failed_voted); } // begin transaction $oDB = DB::getInstance(); @@ -1508,7 +1508,7 @@ class documentController extends document // Fail if session information already has a reported document if($_SESSION['declared_document'][$document_srl]) { - return new Object(-1, 'failed_declared'); + return new BaseObject(-1, 'failed_declared'); } // Check if previously reported @@ -1543,7 +1543,7 @@ class documentController extends document if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) { $_SESSION['declared_document'][$document_srl] = true; - return new Object(-1, 'failed_declared'); + return new BaseObject(-1, 'failed_declared'); } // Check if document's author is a member. @@ -1556,7 +1556,7 @@ class documentController extends document if($member_srl && $member_srl == abs($oDocument->get('member_srl'))) { $_SESSION['declared_document'][$document_srl] = true; - return new Object(-1, 'failed_declared'); + return new BaseObject(-1, 'failed_declared'); } } @@ -1579,7 +1579,7 @@ class documentController extends document if($output->data->count) { $_SESSION['declared_document'][$document_srl] = true; - return new Object(-1, 'failed_declared'); + return new BaseObject(-1, 'failed_declared'); } // begin transaction @@ -1765,7 +1765,7 @@ class documentController extends document // Display an error that the category cannot be deleted if it has a child $output = executeQuery('document.getChildCategoryCount', $args); if(!$output->toBool()) return $output; - if($output->data->count>0) return new Object(-1, 'msg_cannot_delete_for_child'); + if($output->data->count>0) return new BaseObject(-1, 'msg_cannot_delete_for_child'); // Delete a category information $output = executeQuery('document.deleteCategory', $args); if(!$output->toBool()) return $output; @@ -1834,7 +1834,7 @@ class documentController extends document // Seek a full list of categories $category_list = $oDocumentModel->getCategoryList($module_srl); $category_srl_list = array_keys($category_list); - if(count($category_srl_list)<2) return new Object(); + if(count($category_srl_list)<2) return new BaseObject(); $prev_category = NULL; foreach($category_list as $key => $val) @@ -1843,9 +1843,9 @@ class documentController extends document $prev_category = $val; } // Return if the previous category doesn't exist - if(!$prev_category) return new Object(-1,lang('msg_category_not_moved')); + if(!$prev_category) return new BaseObject(-1,lang('msg_category_not_moved')); // Return if the selected category is the top level - if($category_srl_list[0]==$category_srl) return new Object(-1,lang('msg_category_not_moved')); + if($category_srl_list[0]==$category_srl) return new BaseObject(-1,lang('msg_category_not_moved')); // Information of the selected category $cur_args = new stdClass; $cur_args->category_srl = $category_srl; @@ -1859,7 +1859,7 @@ class documentController extends document $prev_args->title = $prev_category->title; $this->updateCategory($prev_args); - return new Object(); + return new BaseObject(); } /** @@ -1881,7 +1881,7 @@ class documentController extends document // Seek a full list of categories $category_list = $oDocumentModel->getCategoryList($module_srl); $category_srl_list = array_keys($category_list); - if(count($category_srl_list)<2) return new Object(); + if(count($category_srl_list)<2) return new BaseObject(); for($i=0;$ititle = $next_category->title; $this->updateCategory($next_args); - return new Object(); + return new BaseObject(); } /** @@ -1969,7 +1969,7 @@ class documentController extends document $columnList = array('module_srl', 'module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); - if(!$grant->manager) return new Object(-1,'msg_not_permitted'); + if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted'); if($args->expand !="Y") $args->expand = "N"; if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls); @@ -2039,7 +2039,7 @@ class documentController extends document $columnList = array('module_srl', 'module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList); $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); - if(!$grant->manager) return new Object(-1,'msg_not_permitted'); + if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted'); // First child of the parent_category_srl $source_args = new stdClass; @@ -2100,14 +2100,14 @@ class documentController extends document $columnList = array('module_srl', 'module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); - if(!$grant->manager) return new Object(-1,'msg_not_permitted'); + if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted'); $oDocumentModel = getModel('document'); // Get original information $category_info = $oDocumentModel->getCategory($args->category_srl); if($category_info->parent_srl) $parent_srl = $category_info->parent_srl; // Display an error that the category cannot be deleted if it has a child node - if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new Object(-1, 'msg_cannot_delete_for_child'); + if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child'); // Remove from the DB $output = $this->deleteCategory($args->category_srl); if(!$output->toBool()) @@ -2141,7 +2141,7 @@ class documentController extends document $columnList = array('module_srl', 'module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); - if(!$grant->manager) return new Object(-1,'msg_not_permitted'); + if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted'); $xml_file = $this->makeCategoryFile($module_srl); // Set return value @@ -2466,7 +2466,7 @@ class documentController extends document */ function procDocumentAddCart() { - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted'); // Get document_srl $srls = explode(',',Context::get('srls')); @@ -2486,14 +2486,14 @@ class documentController extends document $args->document_srls = implode(',',$document_srls); $args->order_type = 'asc'; $output = executeQueryArray('document.getDocuments', $args); - if(!$output->data) return new Object(); + if(!$output->data) return new BaseObject(); unset($document_srls); foreach($output->data as $key => $val) { $document_srls[$val->module_srl][] = $val->document_srl; } - if(!$document_srls || !count($document_srls)) return new Object(); + if(!$document_srls || !count($document_srls)) return new BaseObject(); // Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents) $oModuleModel = getModel('module'); @@ -2518,7 +2518,7 @@ class documentController extends document } } } - if(!count($document_srls)) return new Object(); + if(!count($document_srls)) return new BaseObject(); foreach($document_srls as $module_srl => $documents) { @@ -2540,7 +2540,7 @@ class documentController extends document function procDocumentManageCheckedDocument() { @set_time_limit(0); - if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted'); $logged_info = Context::get('logged_info'); // Get request parameters. @@ -2596,13 +2596,13 @@ class documentController extends document $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); if (!$module_info->module_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $module_grant = $oModuleModel->getGrant($module_info, $logged_info); if (!$module_grant->manager) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } } @@ -2612,22 +2612,22 @@ class documentController extends document if($type == 'move') { - if(!$target_module_srl) return new Object(-1, 'fail_to_move'); + if(!$target_module_srl) return new BaseObject(-1, 'fail_to_move'); $oDocumentAdminController = getAdminController('document'); $output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $target_module_srl, $target_category_srl); - if(!$output->toBool()) return new Object(-1, 'fail_to_move'); + if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move'); $msg_code = 'success_moved'; } else if($type == 'copy') { - if(!$target_module_srl) return new Object(-1, 'fail_to_move'); + if(!$target_module_srl) return new BaseObject(-1, 'fail_to_move'); $oDocumentAdminController = getAdminController('document'); $output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $target_module_srl, $target_category_srl); - if(!$output->toBool()) return new Object(-1, 'fail_to_move'); + if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move'); $msg_code = 'success_copied'; } @@ -2638,7 +2638,7 @@ class documentController extends document foreach ($document_srl_list as $document_srl) { $output = $this->deleteDocument($document_srl, true); - if(!$output->toBool()) return new Object(-1, 'fail_to_delete'); + if(!$output->toBool()) return new BaseObject(-1, 'fail_to_delete'); } $oDB->commit(); $msg_code = 'success_deleted'; @@ -2654,7 +2654,7 @@ class documentController extends document { $args->document_srl = $document_srl; $output = $this->moveDocumentToTrash($args); - if(!$output || !$output->toBool()) return new Object(-1, 'fail_to_trash'); + if(!$output || !$output->toBool()) return new BaseObject(-1, 'fail_to_trash'); } $oDB->commit(); $msg_code = 'success_trashed'; @@ -2712,13 +2712,13 @@ class documentController extends document $module_info = $oModuleModel->getModuleInfoByModuleSrl($srl); if (!$module_info->module_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $module_grant = $oModuleModel->getGrant($module_info, $logged_info); if (!$module_grant->manager) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $module_srl[] = $srl; @@ -2757,7 +2757,7 @@ class documentController extends document { if(!$this->module_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $obj = Context::getRequestVars(); @@ -2780,12 +2780,12 @@ class documentController extends document { if(!$oDocument->isGranted()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if($oDocument->get('status') != $this->getConfigStatus('temp')) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $output = $this->updateDocument($oDocument, $obj); @@ -2817,7 +2817,7 @@ class documentController extends document */ function procDocumentGetList() { - if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted'); $documentSrls = Context::get('document_srls'); if($documentSrls) $documentSrlList = explode(',', $documentSrls); diff --git a/modules/document/document.model.php b/modules/document/document.model.php index cb6c2a3d3..c7ff2ee0d 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -39,7 +39,7 @@ class documentModel extends document { if(!is_array($documentSrls) || count($documentSrls) == 0) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $args = new stdClass(); @@ -508,7 +508,7 @@ class documentModel extends document $oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); $module_srl = $oDocument->get('module_srl'); $member_srl = $oDocument->get('member_srl'); - if(!$module_srl) return new Object(-1, 'msg_invalid_request'); + if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request'); $oModuleModel = getModel('module'); $document_config = $oModuleModel->getModulePartConfig('document',$module_srl); @@ -915,7 +915,7 @@ class documentModel extends document */ function getDocumentCategories() { - if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted'); $module_srl = Context::get('module_srl'); $categories= $this->getCategoryList($module_srl); $lang = Context::get('lang'); @@ -1010,13 +1010,13 @@ class documentModel extends document $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); // Check permissions $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); - if(!$grant->manager) return new Object(-1,'msg_not_permitted'); + if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted'); $category_srl = Context::get('category_srl'); $category_info = $this->getCategory($category_srl); if(!$category_info) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $this->add('category_info', $category_info); @@ -1198,7 +1198,7 @@ class documentModel extends document { $args = new stdClass; $document_srl = Context::get('document_srl'); - if(!$document_srl) return new Object(-1,'msg_invalid_request'); + if(!$document_srl) return new BaseObject(-1,'msg_invalid_request'); $point = Context::get('point'); if($point != -1) $point = 1; @@ -1207,18 +1207,18 @@ class documentModel extends document $columnList = array('document_srl', 'module_srl'); $oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); $module_srl = $oDocument->get('module_srl'); - if(!$module_srl) return new Object(-1, 'msg_invalid_request'); + if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request'); $oModuleModel = getModel('module'); $document_config = $oModuleModel->getModulePartConfig('document',$module_srl); if($point == -1) { - if($document_config->use_vote_down!='S') return new Object(-1, 'msg_invalid_request'); + if($document_config->use_vote_down!='S') return new BaseObject(-1, 'msg_invalid_request'); $args->below_point = 0; } else { - if($document_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request'); + if($document_config->use_vote_up!='S') return new BaseObject(-1, 'msg_invalid_request'); $args->more_point = 0; } diff --git a/modules/document/document.view.php b/modules/document/document.view.php index 987445ca2..33227fdff 100644 --- a/modules/document/document.view.php +++ b/modules/document/document.view.php @@ -36,9 +36,9 @@ class documentView extends document $oDocumentModel = getModel('document'); // Creates an object for displaying the selected document $oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager); - if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request'); + if(!$oDocument->isExists()) return new BaseObject(-1,'msg_invalid_request'); // Check permissions - if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted'); + if(!$oDocument->isAccessible()) return new BaseObject(-1,'msg_not_permitted'); // Information setting module //Context::set('module_info', $module_info); //module_info not use in UI // Browser title settings @@ -58,7 +58,7 @@ class documentView extends document { if(!checkCSRF()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $content = Context::get('content'); @@ -87,7 +87,7 @@ class documentView extends document */ function dispDocumentManageDocument() { - if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted'); // Taken from a list of selected sessions $flag_list = $_SESSION['document_management']; if(count($flag_list)) @@ -140,7 +140,7 @@ class documentView extends document // Get information of the current module $current_module_info = Context::get('current_module_info'); $current_module_srl = $current_module_info->module_srl; - if(!$current_module_srl) return new Object(); + if(!$current_module_srl) return new BaseObject(); } $oModuleModel = getModel('module'); @@ -159,7 +159,7 @@ class documentView extends document $tpl = $oTemplate->compile($this->module_path.'tpl', 'document_module_config'); $obj .= $tpl; - return new Object(); + return new BaseObject(); } /** @@ -215,12 +215,12 @@ class documentView extends document $oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager, FALSE); if(!$oDocument->isExists()) { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } // Check permissions if(!$oDocument->isAccessible()) { - return new Object(-1,'msg_not_permitted'); + return new BaseObject(-1,'msg_not_permitted'); } // Browser title settings diff --git a/modules/editor/components/emoticon/emoticon.class.php b/modules/editor/components/emoticon/emoticon.class.php index e9392bab0..74ef76a1f 100644 --- a/modules/editor/components/emoticon/emoticon.class.php +++ b/modules/editor/components/emoticon/emoticon.class.php @@ -28,7 +28,7 @@ class emoticon extends EditorHandler function getEmoticonList() { $emoticon = Context::get('emoticon'); - if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) return new Object(-1,'msg_invalid_request'); + if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) return new BaseObject(-1,'msg_invalid_request'); $list = $this->getEmoticons($emoticon); diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php index b3584c268..9b0d0724c 100644 --- a/modules/editor/editor.admin.controller.php +++ b/modules/editor/editor.admin.controller.php @@ -39,10 +39,10 @@ class editorAdminController extends editor } $output = $this->editorListOrder($component_names,$site_module_info->site_srl); - if(!$output->toBool()) return new Object(); + if(!$output->toBool()) return new BaseObject(); $output = $this->editorCheckUse($componentList,$site_module_info->site_srl); - if(!$output->toBool()) return new Object(); + if(!$output->toBool()) return new BaseObject(); $oEditorController = getController('editor'); $oEditorController->removeCache($site_module_info->site_srl); @@ -70,7 +70,7 @@ class editorAdminController extends editor $output = executeQuery('editor.updateSiteComponent', $args); } } - if(!$output->toBool()) return new Object(); + if(!$output->toBool()) return new BaseObject(); unset($componentList); return $output; @@ -99,7 +99,7 @@ class editorAdminController extends editor $output = executeQuery('editor.updateSiteComponent', $args); } - if(!$output->toBool()) return new Object(); + if(!$output->toBool()) return new BaseObject(); $list_order_num++; } } @@ -251,7 +251,7 @@ class editorAdminController extends editor // Check if the component exists if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args); else $output = executeQuery('editor.isSiteComponentInserted', $args); - if($output->data->count) return new Object(-1, 'msg_component_is_not_founded'); + if($output->data->count) return new BaseObject(-1, 'msg_component_is_not_founded'); // Inert a component $args->list_order = getNextSequence(); if(!$site_srl) $output = executeQuery('editor.insertComponent', $args); diff --git a/modules/editor/editor.class.php b/modules/editor/editor.class.php index d6f3c4a50..4919bdd0f 100644 --- a/modules/editor/editor.class.php +++ b/modules/editor/editor.class.php @@ -84,7 +84,7 @@ class editor extends ModuleObject // 2009. 04. 14 Add a trigger from compiled codes of the editor component $oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before'); - return new Object(); + return new BaseObject(); } /** @@ -152,7 +152,7 @@ class editor extends ModuleObject $oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'); } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php index 2ceb16845..61c58ecdf 100644 --- a/modules/editor/editor.controller.php +++ b/modules/editor/editor.controller.php @@ -47,18 +47,18 @@ class editorController extends editor { $component = Context::get('component'); $method = Context::get('method'); - if(!$component) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component)); + if(!$component) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component)); $oEditorModel = getModel('editor'); $oComponent = &$oEditorModel->getComponentObject($component); if(!$oComponent->toBool()) return $oComponent; - if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component)); + if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component)); //$output = call_user_method($method, $oComponent); //$output = call_user_func(array($oComponent, $method)); if(method_exists($oComponent, $method)) $output = $oComponent->{$method}(); - else return new Object(-1,sprintf('%s method is not exists', $method)); + else return new BaseObject(-1,sprintf('%s method is not exists', $method)); if($output instanceof Object && !$output->toBool()) return $output; @@ -93,13 +93,13 @@ class editorController extends editor $module_info = $oModuleModel->getModuleInfoByModuleSrl($srl); if (!$module_info->module_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $module_grant = $oModuleModel->getGrant($module_info, $logged_info); if (!$module_grant->manager) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $module_srl[] = $srl; @@ -171,7 +171,7 @@ class editorController extends editor */ function triggerEditorComponentCompile(&$content) { - if(Context::getResponseMethod()!='HTML') return new Object(); + if(Context::getResponseMethod()!='HTML') return new BaseObject(); $module_info = Context::get('module_info'); $module_srl = $module_info->module_srl; @@ -253,7 +253,7 @@ class editorController extends editor } $content = $this->transComponent($content); - return new Object(); + return new BaseObject(); } /** @@ -350,7 +350,7 @@ class editorController extends editor function triggerDeleteSavedDoc(&$obj) { $this->deleteSavedDoc(false); - return new Object(); + return new BaseObject(); } /** diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 5755c1046..4b70f2e40 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -466,11 +466,11 @@ class editorModel extends editor // Create an object of the component and execute $class_path = sprintf('%scomponents/%s/', $this->module_path, $component); $class_file = sprintf('%s%s.class.php', $class_path, $component); - if(!file_exists($class_file)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component)); + if(!file_exists($class_file)) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component)); // Create an object after loading the class file require_once($class_file); $oComponent = new $component($editor_sequence, $class_path); - if(!$oComponent) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component)); + if(!$oComponent) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component)); // Add configuration information $component_info = $this->getComponent($component, $site_srl); $oComponent->setInfo($component_info); diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php index 1ea2fceb4..9255e17e1 100644 --- a/modules/editor/editor.view.php +++ b/modules/editor/editor.view.php @@ -88,7 +88,7 @@ class editorView extends editor // Get information of the current module $current_module_info = Context::get('current_module_info'); $current_module_srl = $current_module_info->module_srl; - if(!$current_module_srl) return new Object(); + if(!$current_module_srl) return new BaseObject(); } // Get editors settings $oEditorModel = getModel('editor'); @@ -135,7 +135,7 @@ class editorView extends editor $tpl = $oTemplate->compile($this->module_path.'tpl', 'editor_module_config'); $obj .= $tpl; - return new Object(); + return new BaseObject(); } diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php index f6f690c13..7574d76f3 100644 --- a/modules/file/file.admin.controller.php +++ b/modules/file/file.admin.controller.php @@ -105,7 +105,7 @@ class fileAdminController extends file { if ($config->allowed_filesize > 2047 || $config->allowed_attach_size > 2047) { - return new Object(-1, 'msg_32bit_max_2047mb'); + return new BaseObject(-1, 'msg_32bit_max_2047mb'); } } @@ -154,7 +154,7 @@ class fileAdminController extends file { if ($file_config->allowed_filesize > 2047 || $file_config->allowed_attach_size > 2047) { - return new Object(-1, 'msg_32bit_max_2047mb'); + return new BaseObject(-1, 'msg_32bit_max_2047mb'); } } diff --git a/modules/file/file.class.php b/modules/file/file.class.php index 30ce30b2c..ae5fa4c14 100644 --- a/modules/file/file.class.php +++ b/modules/file/file.class.php @@ -43,7 +43,7 @@ class file extends ModuleObject // 2007. 10. 19 Call a trigger to set up the file permissions before displaying $oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'); - return new Object(); + return new BaseObject(); } /** @@ -143,7 +143,7 @@ class file extends ModuleObject if(!$oDB->isColumnExists('files', 'cover_image')) $oDB->addColumn('files', 'cover_image', 'char', '1', 'N'); - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index b4a8a7df2..e69250419 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -39,7 +39,7 @@ class fileController extends file // Exit a session if there is neither upload permission nor information if(!$_SESSION['upload_info'][$editor_sequence]->enabled) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // Get upload_target_srl @@ -63,7 +63,7 @@ class fileController extends file $total_size = intval($matches[3]); if ($chunk_start < 0 || $chunk_size < 0 || $total_size < 0 || $chunk_start + $chunk_size > $total_size || $chunk_size != $file_info['size']) { - return new Object(-1, 'msg_upload_invalid_chunk'); + return new BaseObject(-1, 'msg_upload_invalid_chunk'); } $this->add('chunk_current_size', $chunk_size); $this->add('chunk_uploaded_size', $chunk_start); @@ -76,13 +76,13 @@ class fileController extends file { Rhymix\Framework\Storage::delete($temp_filename); $this->add('chunk_status', 11); - return new Object(-1, 'msg_upload_invalid_chunk'); + return new BaseObject(-1, 'msg_upload_invalid_chunk'); } if ($chunk_start != 0 && (!Rhymix\Framework\Storage::isFile($temp_filename) || Rhymix\Framework\Storage::getSize($temp_filename) != $chunk_start)) { Rhymix\Framework\Storage::delete($temp_filename); $this->add('chunk_status', 12); - return new Object(-1, 'msg_upload_invalid_chunk'); + return new BaseObject(-1, 'msg_upload_invalid_chunk'); } // Check size limit @@ -95,13 +95,13 @@ class fileController extends file if ($total_size > $allowed_filesize) { $this->add('chunk_status', 21); - return new Object(-1, 'msg_exceeds_limit_size'); + return new BaseObject(-1, 'msg_exceeds_limit_size'); } $output = executeQuery('file.getAttachedFileSize', (object)array('upload_target_srl' => $upload_target_srl)); if (intval($output->data->attached_size) + $total_size > $allowed_attach_size) { $this->add('chunk_status', 22); - return new Object(-1, 'msg_exceeds_limit_size'); + return new BaseObject(-1, 'msg_exceeds_limit_size'); } } @@ -119,14 +119,14 @@ class fileController extends file } else { - return new Object(); + return new BaseObject(); } } else { Rhymix\Framework\Storage::delete($temp_filename); $this->add('chunk_status', 40); - return new Object(-1, 'msg_upload_invalid_chunk'); + return new BaseObject(-1, 'msg_upload_invalid_chunk'); } } else @@ -207,14 +207,14 @@ class fileController extends file if(!$file_srl || !$width) { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } $oFileModel = getModel('file'); $fileInfo = $oFileModel->getFile($file_srl); if(!$fileInfo || $fileInfo->direct_download != 'Y') { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } $source_src = $fileInfo->uploaded_filename; @@ -230,7 +230,7 @@ class fileController extends file } else { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } $this->add('resized_info',$output); @@ -271,7 +271,7 @@ class fileController extends file { $oFileModel = getModel('file'); - if(isset($this->grant->access) && $this->grant->access !== true) return new Object(-1, 'msg_not_permitted'); + if(isset($this->grant->access) && $this->grant->access !== true) return new BaseObject(-1, 'msg_not_permitted'); $file_srl = Context::get('file_srl'); $sid = Context::get('sid'); @@ -554,11 +554,11 @@ class fileController extends file */ function procFileGetList() { - if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted'); $logged_info = Context::get('logged_info'); if($logged_info->is_admin !== 'Y' && !getModel('module')->isSiteAdmin($logged_info)) { - return new Object(-1,'msg_not_permitted'); + return new BaseObject(-1,'msg_not_permitted'); } $fileSrls = Context::get('file_srls'); @@ -598,12 +598,12 @@ class fileController extends file function triggerCheckAttached(&$obj) { $document_srl = $obj->document_srl; - if(!$document_srl) return new Object(); + if(!$document_srl) return new BaseObject(); // Get numbers of attachments $oFileModel = getModel('file'); $obj->uploaded_count = $oFileModel->getFilesCount($document_srl); - return new Object(); + return new BaseObject(); } /** @@ -615,12 +615,12 @@ class fileController extends file function triggerAttachFiles(&$obj) { $document_srl = $obj->document_srl; - if(!$document_srl) return new Object(); + if(!$document_srl) return new BaseObject(); $output = $this->setFilesValid($document_srl); if(!$output->toBool()) return $output; - return new Object(); + return new BaseObject(); } /** @@ -632,7 +632,7 @@ class fileController extends file function triggerDeleteAttached(&$obj) { $document_srl = $obj->document_srl; - if(!$document_srl) return new Object(); + if(!$document_srl) return new BaseObject(); $output = $this->deleteFiles($document_srl); return $output; @@ -647,12 +647,12 @@ class fileController extends file function triggerCommentCheckAttached(&$obj) { $comment_srl = $obj->comment_srl; - if(!$comment_srl) return new Object(); + if(!$comment_srl) return new BaseObject(); // Get numbers of attachments $oFileModel = getModel('file'); $obj->uploaded_count = $oFileModel->getFilesCount($comment_srl); - return new Object(); + return new BaseObject(); } /** @@ -665,12 +665,12 @@ class fileController extends file { $comment_srl = $obj->comment_srl; $uploaded_count = $obj->uploaded_count; - if(!$comment_srl || !$uploaded_count) return new Object(); + if(!$comment_srl || !$uploaded_count) return new BaseObject(); $output = $this->setFilesValid($comment_srl); if(!$output->toBool()) return $output; - return new Object(); + return new BaseObject(); } /** @@ -682,9 +682,9 @@ class fileController extends file function triggerCommentDeleteAttached(&$obj) { $comment_srl = $obj->comment_srl; - if(!$comment_srl) return new Object(); + if(!$comment_srl) return new BaseObject(); - if($obj->isMoveToTrash) return new Object(); + if($obj->isMoveToTrash) return new BaseObject(); $output = $this->deleteFiles($comment_srl); return $output; @@ -699,7 +699,7 @@ class fileController extends file function triggerDeleteModuleFiles(&$obj) { $module_srl = $obj->module_srl; - if(!$module_srl) return new Object(); + if(!$module_srl) return new BaseObject(); $oFileController = getAdminController('file'); return $oFileController->deleteModuleFiles($module_srl); @@ -817,13 +817,13 @@ class fileController extends file $allowed_filesize = $config->allowed_filesize * 1024 * 1024; $allowed_attach_size = $config->allowed_attach_size * 1024 * 1024; // An error appears if file size exceeds a limit - if($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size'); + if($allowed_filesize < filesize($file_info['tmp_name'])) return new BaseObject(-1, 'msg_exceeds_limit_size'); // Get total file size of all attachements (from DB) $size_args = new stdClass; $size_args->upload_target_srl = $upload_target_srl; $output = executeQuery('file.getAttachedFileSize', $size_args); $attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']); - if($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size'); + if($attached_size > $allowed_attach_size) return new BaseObject(-1, 'msg_exceeds_limit_size'); } } @@ -860,7 +860,7 @@ class fileController extends file // Create a directory if(!Rhymix\Framework\Storage::isDirectory($path) && !Rhymix\Framework\Storage::createDirectory($path)) { - return new Object(-1,'msg_not_permitted_create'); + return new BaseObject(-1,'msg_not_permitted_create'); } // Move the file @@ -872,7 +872,7 @@ class fileController extends file @copy($file_info['tmp_name'], $filename); if(!file_exists($filename)) { - return new Object(-1,'msg_file_upload_error'); + return new BaseObject(-1,'msg_file_upload_error'); } } } @@ -882,7 +882,7 @@ class fileController extends file { if (!Rhymix\Framework\Storage::move($file_info['tmp_name'], $filename)) { - return new Object(-1,'msg_file_upload_error'); + return new BaseObject(-1,'msg_file_upload_error'); } } } @@ -892,7 +892,7 @@ class fileController extends file { if(!@move_uploaded_file($file_info['tmp_name'], $filename)) { - return new Object(-1,'msg_file_upload_error'); + return new BaseObject(-1,'msg_file_upload_error'); } } } @@ -1033,7 +1033,7 @@ class fileController extends file $columnList = array('file_srl', 'uploaded_filename', 'module_srl'); $file_list = $oFileModel->getFiles($upload_target_srl, $columnList); // Success returned if no attachement exists - if(!is_array($file_list)||!count($file_list)) return new Object(); + if(!is_array($file_list)||!count($file_list)) return new BaseObject(); // Delete the file foreach ($file_list as $file) @@ -1107,16 +1107,16 @@ class fileController extends file $vars = Context::getRequestVars(); $logged_info = Context::get('logged_info'); - if(!$vars->editor_sequence) return new Object(-1, 'msg_invalid_request'); + if(!$vars->editor_sequence) return new BaseObject(-1, 'msg_invalid_request'); $upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl; $oFileModel = getModel('file'); $file_info = $oFileModel->getFile($vars->file_srl); - if(!$file_info) return new Object(-1, 'msg_not_founded'); + if(!$file_info) return new BaseObject(-1, 'msg_not_founded'); - if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new Object(-1, 'msg_not_permitted'); + if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new BaseObject(-1, 'msg_not_permitted'); $args = new stdClass(); $args->file_srl = $vars->file_srl; diff --git a/modules/file/file.model.php b/modules/file/file.model.php index 57dd5632d..2de5eaee8 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -45,7 +45,7 @@ class fileModel extends file $oComment = $oCommentModel->getComment($upload_target_srl); if($oComment->isExists() && $oComment->isSecret() && !$oComment->isGranted()) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } $oDocument = $oDocumentModel->getDocument($oComment->get('document_srl')); @@ -54,7 +54,7 @@ class fileModel extends file // document 권한 확인 if($oDocument->isExists() && $oDocument->isSecret() && !$oDocument->isGranted()) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // 모듈 권한 확인 @@ -63,7 +63,7 @@ class fileModel extends file $grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl')), $logged_info); if(!$grant->access) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } } diff --git a/modules/file/file.view.php b/modules/file/file.view.php index 1fbd5c904..dde4d98ec 100644 --- a/modules/file/file.view.php +++ b/modules/file/file.view.php @@ -31,7 +31,7 @@ class fileView extends file // Get information of the current module $current_module_info = Context::get('current_module_info'); $current_module_srl = $current_module_info->module_srl; - if(!$current_module_srl) return new Object(); + if(!$current_module_srl) return new BaseObject(); } // Get file configurations of the module $oFileModel = getModel('file'); @@ -47,7 +47,7 @@ class fileView extends file $tpl = $oTemplate->compile($this->module_path.'tpl', 'file_module_config'); $obj .= $tpl; - return new Object(); + return new BaseObject(); } } /* End of file file.view.php */ diff --git a/modules/importer/extract.class.php b/modules/importer/extract.class.php index 53d7bffe6..aadd55a46 100644 --- a/modules/importer/extract.class.php +++ b/modules/importer/extract.class.php @@ -124,7 +124,7 @@ class extract // If local file if(strncasecmp('http://', $this->filename, 7) !== 0) { - if(!file_exists($this->filename)) return new Object(-1,'msg_no_xml_file'); + if(!file_exists($this->filename)) return new BaseObject(-1,'msg_no_xml_file'); $this->fd = fopen($this->filename,"r"); // If remote file } @@ -135,7 +135,7 @@ class extract if(!$url_info['path']) $url_info['path'] = '/'; $this->fd = @fsockopen($url_info['host'], $url_info['port']); - if(!$this->fd) return new Object(-1,'msg_no_xml_file'); + if(!$this->fd) return new BaseObject(-1,'msg_no_xml_file'); // If the file name contains Korean, do urlencode(iconv required) $path = $url_info['path']; if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv')) @@ -157,7 +157,7 @@ class extract $buff .= $str = fgets($this->fd, 1024); if(!trim($str)) break; } - if(preg_match('/404 Not Found/i',$buff)) return new Object(-1,'msg_no_xml_file'); + if(preg_match('/404 Not Found/i',$buff)) return new BaseObject(-1,'msg_no_xml_file'); } if($this->startTag) @@ -181,7 +181,7 @@ class extract $this->isFinished = false; } - return new Object(); + return new BaseObject(); } /** diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 1abb5da25..e3164f84b 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -292,12 +292,12 @@ class importerAdminController extends importer $this->unit_count = Context::get('unit_count'); // Check if an index file exists $index_file = './files/cache/importer/'.$key.'/index'; - if(!file_exists($index_file)) return new Object(-1, 'msg_invalid_xml_file'); + if(!file_exists($index_file)) return new BaseObject(-1, 'msg_invalid_xml_file'); switch($type) { case 'ttxml' : - if(!$target_module) return new Object(-1,'msg_invalid_request'); + if(!$target_module) return new BaseObject(-1,'msg_invalid_request'); $oModuleModel = getModel('module'); $columnList = array('module_srl', 'module'); @@ -317,7 +317,7 @@ class importerAdminController extends importer break; case 'module' : // Check if the target module exists - if(!$target_module) return new Object(-1,'msg_invalid_request'); + if(!$target_module) return new BaseObject(-1,'msg_invalid_request'); $cur = $this->importModule($key, $cur, $index_file, $target_module); break; } diff --git a/modules/importer/importer.class.php b/modules/importer/importer.class.php index 13914a71b..752d663c9 100644 --- a/modules/importer/importer.class.php +++ b/modules/importer/importer.class.php @@ -16,7 +16,7 @@ class importer extends ModuleObject */ function moduleInstall() { - return new Object(); + return new BaseObject(); } /** @@ -34,7 +34,7 @@ class importer extends ModuleObject */ function moduleUpdate() { - return new Object(); + return new BaseObject(); } /** diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index 7421dfa08..d04f3f9de 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -20,7 +20,7 @@ class installAdminController extends install function procInstallAdminInstall() { $module_name = Context::get('module_name'); - if(!$module_name) return new object(-1, 'invalid_request'); + if(!$module_name) return new BaseObject(-1, 'invalid_request'); $oInstallController = getController('install'); $oInstallController->installModule($module_name, './modules/'.$module_name); @@ -35,7 +35,7 @@ class installAdminController extends install { @set_time_limit(0); $module_name = Context::get('module_name'); - if(!$module_name) return new object(-1, 'invalid_request'); + if(!$module_name) return new BaseObject(-1, 'invalid_request'); $oModule = getModule($module_name, 'class'); if($oModule) $output = $oModule->moduleUpdate(); diff --git a/modules/install/install.class.php b/modules/install/install.class.php index 9435e4a74..3f14bd415 100644 --- a/modules/install/install.class.php +++ b/modules/install/install.class.php @@ -12,7 +12,7 @@ class install extends ModuleObject */ function moduleInstall() { - return new Object(); + return new BaseObject(); } /** @@ -28,7 +28,7 @@ class install extends ModuleObject */ function moduleUpdate() { - return new Object(); + return new BaseObject(); } /** diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 5b878d265..9666fc3cb 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -76,7 +76,7 @@ class installController extends install { if ($oDB->isTableExists($table_name)) { - return new Object(-1, 'msg_table_already_exists'); + return new BaseObject(-1, 'msg_table_already_exists'); } } @@ -99,7 +99,7 @@ class installController extends install // Check if it is already installed if (Context::isInstalled()) { - return new Object(-1, 'msg_already_installed'); + return new BaseObject(-1, 'msg_already_installed'); } // Get install parameters. @@ -227,7 +227,7 @@ class installController extends install catch(Exception $e) { $oDB->rollback(); - return new Object(-1, $e->getMessage()); + return new BaseObject(-1, $e->getMessage()); } // Execute the install script. @@ -264,7 +264,7 @@ class installController extends install $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : RX_BASEURL; $this->setRedirectUrl($returnUrl); - return new Object(); + return new BaseObject(); } /** @@ -411,7 +411,7 @@ class installController extends install else { FileHandler::removeFile($this->flagLicenseAgreement); - return new Object(-1, 'msg_must_accept_license_agreement'); + return new BaseObject(-1, 'msg_must_accept_license_agreement'); } if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) @@ -505,7 +505,7 @@ class installController extends install } } - return new Object(); + return new BaseObject(); } /** @@ -534,7 +534,7 @@ class installController extends install unset($oModule); $oModule = getClass($module); if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall(); - return new Object(); + return new BaseObject(); } /** diff --git a/modules/install/install.model.php b/modules/install/install.model.php index 9c1fac416..3d12bac19 100644 --- a/modules/install/install.model.php +++ b/modules/install/install.model.php @@ -15,13 +15,13 @@ class installModel extends install $connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port); if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password)) { - return new Object(-1,'msg_ftp_invalid_auth_info'); + return new BaseObject(-1,'msg_ftp_invalid_auth_info'); } $sftp = ssh2_sftp($connection); $curpwd = "ssh2.sftp://$sftp".$this->pwd; $dh = @opendir($curpwd); - if(!$dh) return new Object(-1, 'msg_ftp_invalid_path'); + if(!$dh) return new BaseObject(-1, 'msg_ftp_invalid_path'); $list = array(); while(($file = readdir($dh)) !== false) @@ -37,7 +37,7 @@ class installModel extends install { if(!($ftp_info = Context::getRequestVars()) || !$ftp_info->ftp_user || !$ftp_info->ftp_password) { - return new Object(-1, 'msg_ftp_invalid_auth_info'); + return new BaseObject(-1, 'msg_ftp_invalid_auth_info'); } $this->pwd = $ftp_info->ftp_root_path; if(!$ftp_info->ftp_host) @@ -54,11 +54,11 @@ class installModel extends install if(function_exists('ftp_connect')) { $connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port); - if(!$connection) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); + if(!$connection) return new BaseObject(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password)) { ftp_close($connection); - return new Object(-1,'msg_ftp_invalid_auth_info'); + return new BaseObject(-1,'msg_ftp_invalid_auth_info'); } if($ftp_info->ftp_pasv != "N") @@ -82,7 +82,7 @@ class installModel extends install else { $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_invalid_auth_info'); + return new BaseObject(-1,'msg_ftp_invalid_auth_info'); } } } diff --git a/modules/install/install.view.php b/modules/install/install.view.php index 849fd35a5..1a76e4563 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -58,7 +58,7 @@ class installView extends install else { $this->setRedirectUrl(RX_BASEURL); - return new Object(); + return new BaseObject(); } } } diff --git a/modules/integration_search/integration_search.class.php b/modules/integration_search/integration_search.class.php index dffa2e014..cd43aeb96 100644 --- a/modules/integration_search/integration_search.class.php +++ b/modules/integration_search/integration_search.class.php @@ -18,7 +18,7 @@ class integration_search extends ModuleObject $oModuleController = getController('module'); $oModuleController->insertActionForward('integration_search', 'view', 'IS'); - return new Object(); + return new BaseObject(); } /** @@ -68,7 +68,7 @@ class integration_search extends ModuleObject } } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php index 92b38722d..d6ef8d796 100644 --- a/modules/integration_search/integration_search.model.php +++ b/modules/integration_search/integration_search.model.php @@ -119,7 +119,7 @@ class integration_searchModel extends module function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20) { $oTrackbackModel = getAdminModel('trackback'); - if(!$oTrackbackModel) return new Object(); + if(!$oTrackbackModel) return new BaseObject(); $args = new stdClass(); if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list); diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index 0f1fcd15f..05edfc2ea 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -49,7 +49,7 @@ class integration_searchView extends integration_search } // Check permissions - if(!$this->grant->access) return new Object(-1,'msg_not_permitted'); + if(!$this->grant->access) return new BaseObject(-1,'msg_not_permitted'); $config = $oModuleModel->getModuleConfig('integration_search'); if(!$config) $config = new stdClass; diff --git a/modules/krzip/krzip.class.php b/modules/krzip/krzip.class.php index 32ac69f6e..0aef331d7 100644 --- a/modules/krzip/krzip.class.php +++ b/modules/krzip/krzip.class.php @@ -26,12 +26,12 @@ class krzip extends ModuleObject function moduleInstall() { - return new Object(); + return new BaseObject(); } function moduleUninstall() { - return new Object(); + return new BaseObject(); } function checkUpdate() @@ -41,7 +41,7 @@ class krzip extends ModuleObject function moduleUpdate() { - return new Object(); + return new BaseObject(); } } diff --git a/modules/krzip/krzip.model.php b/modules/krzip/krzip.model.php index 794535b0a..2b83158f1 100644 --- a/modules/krzip/krzip.model.php +++ b/modules/krzip/krzip.model.php @@ -94,7 +94,7 @@ class krzipModel extends krzip $module_config = $this->getConfig(); if($module_config->api_handler != 1) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if(!isset($query)) { @@ -185,11 +185,11 @@ class krzipModel extends krzip } } - return new Object(-1, $err_msg); + return new BaseObject(-1, $err_msg); } if(!$result->post) { - return new Object(-1, 'msg_krzip_riddling_wrong'); + return new BaseObject(-1, 'msg_krzip_riddling_wrong'); } $item_list = $result->post->itemlist->item; @@ -199,7 +199,7 @@ class krzipModel extends krzip } if(!$item_list) { - return new Object(-1, 'msg_krzip_no_result'); + return new BaseObject(-1, 'msg_krzip_no_result'); } $addr_list = array(); diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index 363936fdd..27b65c839 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -130,7 +130,7 @@ class layoutAdminController extends layout $output = executeQuery('menu.getMenuItemByUrl', $tmpArgs); if(!$output->toBool()) { - return new Object(-1, 'fail_to_update'); + return new BaseObject(-1, 'fail_to_update'); } $menu_srl = $output->data->menu_srl; @@ -313,7 +313,7 @@ class layoutAdminController extends layout if(!$output->toBool()) { - return new Object(-1, $output->message); + return new BaseObject(-1, $output->message); } } } @@ -334,7 +334,7 @@ class layoutAdminController extends layout if(!$output->toBool()) return $output; - return new Object(0,'success_deleted'); + return new BaseObject(0,'success_deleted'); } /** @@ -356,7 +356,7 @@ class layoutAdminController extends layout if(!$layout_srl || !$code || !$is_post) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $oLayoutModel = getModel('layout'); @@ -377,7 +377,7 @@ class layoutAdminController extends layout function procLayoutAdminCodeReset() { $layout_srl = Context::get('layout_srl'); - if(!$layout_srl) return new Object(-1, 'msg_invalid_request'); + if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request'); // delete user layout file $oLayoutModel = getModel('layout'); @@ -480,13 +480,13 @@ class layoutAdminController extends layout $oModuleModel = getModel('module'); $mid = Context::get('mid'); - if(!$mid) return new Object(-1, 'msg_invalid_request'); + if(!$mid) return new BaseObject(-1, 'msg_invalid_request'); $site_module_info = Context::get('site_module_info'); $columnList = array('layout_srl'); $module_info = $oModuleModel->getModuleInfoByMid($mid, $site_module_info->site_srl, $columnList); $layout_srl = $module_info->layout_srl; - if(!$layout_srl) return new Object(-1, 'msg_invalid_request'); + if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request'); $oLayoutModel = getModel('layout'); @@ -589,7 +589,7 @@ class layoutAdminController extends layout function procLayoutAdminUserLayoutExport() { $layout_srl = Context::get('layout_srl'); - if(!$layout_srl) return new Object('-1','msg_invalid_request'); + if(!$layout_srl) return new BaseObject('-1','msg_invalid_request'); $oLayoutModel = getModel('layout'); diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php index 75a384088..ba1159bb4 100644 --- a/modules/layout/layout.admin.view.php +++ b/modules/layout/layout.admin.view.php @@ -295,11 +295,11 @@ class layoutAdminView extends layout $layout_srl = Context::get('layout_srl'); $code = Context::get('code'); $code_css = Context::get('code_css'); - if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request'); + if(!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request'); // Get the layout information $oLayoutModel = getModel('layout'); $layout_info = $oLayoutModel->getLayout($layout_srl); - if(!$layout_info) return new Object(-1, 'msg_invalid_request'); + if(!$layout_info) return new BaseObject(-1, 'msg_invalid_request'); // Separately handle the layout if its type is faceoff if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info); // Apply CSS directly diff --git a/modules/layout/layout.class.php b/modules/layout/layout.class.php index a5b8e41d6..4d2fefee2 100644 --- a/modules/layout/layout.class.php +++ b/modules/layout/layout.class.php @@ -16,7 +16,7 @@ class layout extends ModuleObject // Create a directory to be used in the layout FileHandler::makeDir('./files/cache/layout'); - return new Object(); + return new BaseObject(); } /** @@ -104,7 +104,7 @@ class layout extends ModuleObject } } } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php index 369f69ac5..9342baeca 100644 --- a/modules/layout/layout.view.php +++ b/modules/layout/layout.view.php @@ -319,7 +319,7 @@ class layoutView extends layout if(!checkCSRF()) { $this->stop('msg_invalid_request'); - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // admin check @@ -331,11 +331,11 @@ class layoutView extends layout $code = Context::get('code'); $code_css = Context::get('code_css'); - if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request'); + if(!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request'); // Get the layout information $oLayoutModel = getModel('layout'); $layout_info = $oLayoutModel->getLayout($layout_srl); - if(!$layout_info) return new Object(-1, 'msg_invalid_request'); + if(!$layout_info) return new BaseObject(-1, 'msg_invalid_request'); // Separately handle the layout if its type is faceoff if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info); // Apply CSS directly diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 5ace3cc27..230add37c 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -26,7 +26,7 @@ class memberAdminController extends member $logged_info = Context::get('logged_info'); if($logged_info->is_admin != 'Y' || !checkCSRF()) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date'); @@ -310,7 +310,7 @@ class memberAdminController extends member if(!$redirectModuleInfo) { - return new Object('-1', 'msg_exist_selected_module'); + return new BaseObject('-1', 'msg_exist_selected_module'); } $args->redirect_mid = $redirectModuleInfo->mid; @@ -729,7 +729,7 @@ class memberAdminController extends member // Check ID duplicated if (Context::isReservedWord($args->column_name)) { - return new Object(-1, 'msg_column_id_not_available'); + return new BaseObject(-1, 'msg_column_id_not_available'); } $oMemberModel = getModel('member'); $config = $oMemberModel->getMemberConfig(); @@ -738,7 +738,7 @@ class memberAdminController extends member if($item->name == $args->column_name) { if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue; - return new Object(-1,'msg_column_id_not_available'); + return new BaseObject(-1,'msg_column_id_not_available'); } } // Fix if member_join_form_srl exists. Add if not exists. @@ -949,7 +949,7 @@ class memberAdminController extends member function procMemberAdminDeleteMembers() { $target_member_srls = Context::get('target_member_srls'); - if(!$target_member_srls) return new Object(-1, 'msg_invalid_request'); + if(!$target_member_srls) return new BaseObject(-1, 'msg_invalid_request'); $member_srls = explode(',', $target_member_srls); $oMemberController = getController('member'); @@ -973,7 +973,7 @@ class memberAdminController extends member function procMemberAdminUpdateMembersGroup() { $member_srl = Context::get('member_srl'); - if(!$member_srl) return new Object(-1,'msg_invalid_request'); + if(!$member_srl) return new BaseObject(-1,'msg_invalid_request'); $member_srls = explode(',',$member_srl); $group_srl = Context::get('group_srls'); @@ -1246,7 +1246,7 @@ class memberAdminController extends member function updateGroup($args) { if(!$args->site_srl) $args->site_srl = 0; - if(!$args->group_srl) return new Object(-1, 'lang->msg_not_founded'); + if(!$args->group_srl) return new BaseObject(-1, 'lang->msg_not_founded'); // Call trigger (before) $trigger_output = ModuleHandler::triggerCall('member.updateGroup', 'before', $args); @@ -1290,8 +1290,8 @@ class memberAdminController extends member $columnList = array('group_srl', 'is_default'); $group_info = $oMemberModel->getGroup($group_srl, $columnList); - if(!$group_info) return new Object(-1, 'lang->msg_not_founded'); - if($group_info->is_default == 'Y') return new Object(-1, 'msg_not_delete_default'); + if(!$group_info) return new BaseObject(-1, 'lang->msg_not_founded'); + if($group_info->is_default == 'Y') return new BaseObject(-1, 'msg_not_delete_default'); // Call trigger (before) $trigger_output = ModuleHandler::triggerCall('member.deleteGroup', 'before', $group_info); @@ -1524,7 +1524,7 @@ class memberAdminController extends member // Get a list of all join forms $join_form_list = $oMemberModel->getJoinFormList(); $join_form_srl_list = array_keys($join_form_list); - if(count($join_form_srl_list)<2) return new Object(); + if(count($join_form_srl_list)<2) return new BaseObject(); $prev_member_join_form = NULL; foreach($join_form_list as $key => $val) @@ -1533,7 +1533,7 @@ class memberAdminController extends member $prev_member_join_form = $val; } // Return if no previous join form exists - if(!$prev_member_join_form) return new Object(); + if(!$prev_member_join_form) return new BaseObject(); // Information of the join form $cur_args = new stdClass; $cur_args->member_join_form_srl = $member_join_form_srl; @@ -1549,7 +1549,7 @@ class memberAdminController extends member executeQuery('member.updateMemberJoinFormListorder', $prev_args); if(!$output->toBool()) return $output; - return new Object(); + return new BaseObject(); } /** @@ -1571,7 +1571,7 @@ class memberAdminController extends member // Get information of all join forms $join_form_list = $oMemberModel->getJoinFormList(); $join_form_srl_list = array_keys($join_form_list); - if(count($join_form_srl_list)<2) return new Object(); + if(count($join_form_srl_list)<2) return new BaseObject(); for($i=0;$itoBool()) return $output; - return new Object(); + return new BaseObject(); } } /* End of file member.admin.controller.php */ diff --git a/modules/member/member.class.php b/modules/member/member.class.php index 5609402e2..080481a47 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -165,7 +165,7 @@ class member extends ModuleObject { $oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'); $oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'); - return new Object(); + return new BaseObject(); } /** @@ -403,7 +403,7 @@ class member extends ModuleObject { if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) $oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'); - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** @@ -420,7 +420,7 @@ class member extends ModuleObject { */ function recordLoginError($error = 0, $message = 'success') { - if($error == 0) return new Object($error, $message); + if($error == 0) return new BaseObject($error, $message); // Create a member model object $oMemberModel = getModel('member'); @@ -428,7 +428,7 @@ class member extends ModuleObject { // Check if there is recoding table. $oDB = &DB::getInstance(); - if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new Object($error, $message); + if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message); $args = new stdClass(); $args->ipaddress = $_SERVER['REMOTE_ADDR']; @@ -457,7 +457,7 @@ class member extends ModuleObject { $args->count = 1; $output = executeQuery('member.insertLoginCountByIp', $args); } - return new Object($error, $message); + return new BaseObject($error, $message); } /** @@ -465,7 +465,7 @@ class member extends ModuleObject { */ function recordMemberLoginError($error = 0, $message = 'success', $args = NULL) { - if($error == 0 || !$args->member_srl) return new Object($error, $message); + if($error == 0 || !$args->member_srl) return new BaseObject($error, $message); // Create a member model object $oMemberModel = getModel('member'); @@ -473,7 +473,7 @@ class member extends ModuleObject { // Check if there is recoding table. $oDB = &DB::getInstance(); - if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new Object($error, $message); + if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message); $output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args); if($output->data && $output->data->content) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 61489857f..ac9615440 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -30,7 +30,7 @@ class memberController extends member if(!$user_id && !$password && Context::getRequestMethod() == 'GET') { $this->setRedirectUrl(getNotEncodedUrl('')); - return new Object(-1, 'null_user_id'); + return new BaseObject(-1, 'null_user_id'); } // Variables @@ -42,8 +42,8 @@ class memberController extends member if(!$keep_signed) $keep_signed = Context::get('keep_signed'); // Return an error when id and password doesn't exist - if(!$user_id) return new Object(-1,'null_user_id'); - if(!$password) return new Object(-1,'null_password'); + if(!$user_id) return new BaseObject(-1,'null_user_id'); + if(!$password) return new BaseObject(-1,'null_password'); $output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false); if (!$output->toBool()) return $output; @@ -123,7 +123,7 @@ class memberController extends member $document_srl = (int) (Context::get('document_srl') ?: Context::get('target_srl')); if(!$document_srl) { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } $oDocumentModel = getModel('document'); @@ -132,7 +132,7 @@ class memberController extends member // Check document if($oDocument->isSecret() && !$oDocument->isGranted()) { - return new Object(-1, 'msg_is_secret'); + return new BaseObject(-1, 'msg_is_secret'); } $oModuleModel = getModel('module'); @@ -144,19 +144,19 @@ class memberController extends member // Check access to module of the document if(!$grant->access) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // Check grant to module of the document if(isset($grant->list) && isset($grant->view) && (!$grant->list || !$grant->view)) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // Check consultation option if(isset($grant->consultation_read) && $module_info->consultation == 'Y' && !$grant->consultation_read && !$oDocument->isGranted()) { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } // Find default scrap folder @@ -188,7 +188,7 @@ class memberController extends member $output = executeQuery('member.getScrapDocument', $args); if($output->data->count) { - return new Object(-1, 'msg_alreay_scrapped'); + return new BaseObject(-1, 'msg_alreay_scrapped'); } // Insert @@ -207,11 +207,11 @@ class memberController extends member function procMemberDeleteScrap() { // Check login information - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged'); $logged_info = Context::get('logged_info'); $document_srl = (int)Context::get('document_srl'); - if(!$document_srl) return new Object(-1,'msg_invalid_request'); + if(!$document_srl) return new BaseObject(-1,'msg_invalid_request'); // Variables $args = new stdClass; $args->member_srl = $logged_info->member_srl; @@ -227,14 +227,14 @@ class memberController extends member function procMemberMoveScrapFolder() { // Check login information - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged'); $logged_info = Context::get('logged_info'); $document_srl = (int)Context::get('document_srl'); $folder_srl = (int)Context::get('folder_srl'); if(!$document_srl || !$folder_srl) { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } // Check that the target folder exists and belongs to member @@ -244,7 +244,7 @@ class memberController extends member $output = executeQueryArray('member.getScrapFolderList', $args); if(!count($output->data)) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // Move @@ -263,7 +263,7 @@ class memberController extends member function procMemberInsertScrapFolder() { // Check login information - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged'); $logged_info = Context::get('logged_info'); // Get new folder name @@ -271,7 +271,7 @@ class memberController extends member $folder_name = escape(trim(utf8_normalize_spaces($folder_name))); if(!$folder_name) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // Check existing folder with same name @@ -281,7 +281,7 @@ class memberController extends member $output = executeQueryArray('member.getScrapFolderList', $args); if(count($output->data) || $folder_name === lang('default_folder')) { - return new Object(-1, 'msg_folder_alreay_exists'); + return new BaseObject(-1, 'msg_folder_alreay_exists'); } // Create folder @@ -302,7 +302,7 @@ class memberController extends member function procMemberRenameScrapFolder() { // Check login information - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged'); $logged_info = Context::get('logged_info'); // Get new folder name @@ -311,7 +311,7 @@ class memberController extends member $folder_name = escape(trim(utf8_normalize_spaces($folder_name))); if(!$folder_srl || !$folder_name) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // Check that the original folder exists and belongs to member @@ -321,11 +321,11 @@ class memberController extends member $output = executeQueryArray('member.getScrapFolderList', $args); if(!count($output->data)) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if(array_first($output->data)->name === '/DEFAULT/') { - return new Object(-1, 'msg_folder_is_default'); + return new BaseObject(-1, 'msg_folder_is_default'); } // Check existing folder with same name @@ -336,7 +336,7 @@ class memberController extends member $output = executeQueryArray('member.getScrapFolderList', $args); if(count($output->data) || $folder_name === lang('default_folder')) { - return new Object(-1, 'msg_folder_alreay_exists'); + return new BaseObject(-1, 'msg_folder_alreay_exists'); } // Rename folder @@ -354,14 +354,14 @@ class memberController extends member function procMemberDeleteScrapFolder() { // Check login information - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged'); $logged_info = Context::get('logged_info'); // Get folder_srl to delete $folder_srl = intval(Context::get('folder_srl')); if(!$folder_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // Check that the folder exists and belongs to member @@ -371,11 +371,11 @@ class memberController extends member $output = executeQueryArray('member.getScrapFolderList', $args); if(!count($output->data)) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if(array_first($output->data)->name === '/DEFAULT/') { - return new Object(-1, 'msg_folder_is_default'); + return new BaseObject(-1, 'msg_folder_is_default'); } // Check that the folder is empty @@ -385,7 +385,7 @@ class memberController extends member $output = executeQueryArray('member.getScrapDocumentList', $args); if(count($output->data)) { - return new Object(-1, 'msg_folder_not_empty'); + return new BaseObject(-1, 'msg_folder_not_empty'); } // Delete folder @@ -426,7 +426,7 @@ class memberController extends member */ function procMemberSaveDocument() { - return new Object(0, 'Deprecated method'); + return new BaseObject(0, 'Deprecated method'); } /** @@ -437,22 +437,22 @@ class memberController extends member function procMemberDeleteSavedDocument() { // Check login information - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged'); $logged_info = Context::get('logged_info'); $document_srl = (int)Context::get('document_srl'); - if(!$document_srl) return new Object(-1,'msg_invalid_request'); + if(!$document_srl) return new BaseObject(-1,'msg_invalid_request'); $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl); if ($oDocument->get('member_srl') != $logged_info->member_srl) { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } $configStatusList = $oDocumentModel->getStatusList(); if ($oDocument->get('status') != $configStatusList['temp']) { - return new Object(-1,'msg_invalid_request'); + return new BaseObject(-1,'msg_invalid_request'); } // Variables @@ -466,14 +466,14 @@ class memberController extends member function procMemberDeleteAutologin() { // Check login information - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged'); $logged_info = Context::get('logged_info'); $autologin_id = intval(Context::get('autologin_id')); $autologin_key = Context::get('autologin_key'); if (!$autologin_id || !$autologin_key) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $args = new stdClass; @@ -526,20 +526,20 @@ class memberController extends member { case 'user_id' : // Check denied ID - if($oMemberModel->isDeniedID($value)) return new Object(0,'denied_user_id'); + if($oMemberModel->isDeniedID($value)) return new BaseObject(0,'denied_user_id'); // Check if duplicated $member_srl = $oMemberModel->getMemberSrlByUserID($value); - if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id'); + if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_user_id'); break; case 'nick_name' : // Check denied ID if($oMemberModel->isDeniedNickName($value)) { - return new Object(0,'denied_nick_name'); + return new BaseObject(0,'denied_nick_name'); } // Check if duplicated $member_srl = $oMemberModel->getMemberSrlByNickName($value); - if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name'); + if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_nick_name'); break; case 'email_address' : @@ -557,12 +557,12 @@ class memberController extends member $hosts[] = $host->email_host; } $message = sprintf($managed_email_host[$emailhost_check],implode(', ',$hosts),'id@'.implode(', id@',$hosts)); - return new Object(0,$message); + return new BaseObject(0,$message); } // Check if duplicated $member_srl = $oMemberModel->getMemberSrlByEmailAddress($value); - if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_email_address'); + if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_email_address'); break; } } @@ -574,7 +574,7 @@ class memberController extends member */ function procMemberInsert() { - if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request"); + if (Context::getRequestMethod () == "GET") return new BaseObject (-1, "msg_invalid_request"); $oMemberModel = &getModel ('member'); $config = $oMemberModel->getMemberConfig(); @@ -645,7 +645,7 @@ class memberController extends member if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) { $message = lang('about_password_strength'); - return new Object(-1, $message[$config->password_strength]); + return new BaseObject(-1, $message[$config->password_strength]); } // Remove some unnecessary variables from all the vars @@ -804,7 +804,7 @@ class memberController extends member // Verify the current password if(!$oMemberModel->isValidPassword($member_info->password, $password)) { - return new Object(-1, 'invalid_password'); + return new BaseObject(-1, 'invalid_password'); } $_SESSION['rechecked_password_step'] = 'VALIDATE_PASSWORD'; @@ -982,10 +982,10 @@ class memberController extends member $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); // Verify the cuttent password - if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new Object(-1, 'invalid_password'); + if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new BaseObject(-1, 'invalid_password'); // Check if a new password is as same as the previous password - if($current_password == $password) return new Object(-1, 'invalid_new_password'); + if($current_password == $password) return new BaseObject(-1, 'invalid_new_password'); // Execute insert or update depending on the value of member_srl $args = new stdClass; @@ -1028,7 +1028,7 @@ class memberController extends member $columnList = array('member_srl', 'password'); $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); // Verify the cuttent password - if(!$oMemberModel->isValidPassword($member_info->password, $password)) return new Object(-1, 'invalid_password'); + if(!$oMemberModel->isValidPassword($member_info->password, $password)) return new BaseObject(-1, 'invalid_password'); $output = $this->deleteMember($member_srl); if(!$output->toBool()) return $output; @@ -1185,7 +1185,7 @@ class memberController extends member $member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl'); if(!$member_srl) { - return new Object(0,'success'); + return new BaseObject(0,'success'); } $logged_info = Context::get('logged_info'); @@ -1198,7 +1198,7 @@ class memberController extends member Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($profile_image->file)), true); $this->_clearMemberCache($member_srl); } - return new Object(0,'success'); + return new BaseObject(0,'success'); } /** @@ -1211,7 +1211,7 @@ class memberController extends member $member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl'); if(!$member_srl) { - return new Object(0,'success'); + return new BaseObject(0,'success'); } $logged_info = Context::get('logged_info'); @@ -1223,7 +1223,7 @@ class memberController extends member FileHandler::removeFile($image_name->file); Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($image_name->file)), true); } - return new Object(0,'success'); + return new BaseObject(0,'success'); } /** @@ -1294,7 +1294,7 @@ class memberController extends member $member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl'); if(!$member_srl) { - return new Object(0,'success'); + return new BaseObject(0,'success'); } $logged_info = Context::get('logged_info'); @@ -1306,7 +1306,7 @@ class memberController extends member FileHandler::removeFile($image_mark->file); Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($image_mark->file)), true); } - return new Object(0,'success'); + return new BaseObject(0,'success'); } /** @@ -1317,14 +1317,14 @@ class memberController extends member function procMemberFindAccount() { $email_address = Context::get('email_address'); - if(!$email_address) return new Object(-1, 'msg_invalid_request'); + if(!$email_address) return new BaseObject(-1, 'msg_invalid_request'); $oMemberModel = getModel('member'); $oModuleModel = getModel('module'); // Check if a member having the same email address exists $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address); - if(!$member_srl) return new Object(-1, 'msg_email_not_exists'); + if(!$member_srl) return new BaseObject(-1, 'msg_email_not_exists'); // Get information of the member $columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name'); @@ -1336,7 +1336,7 @@ class memberController extends member $chk_args = new stdClass; $chk_args->member_srl = $member_info->member_srl; $output = executeQuery('member.chkAuthMail', $chk_args); - if($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed'); + if($output->toBool() && $output->data->count != '0') return new BaseObject(-1, 'msg_user_not_confirmed'); } // Insert data into the authentication DB @@ -1407,7 +1407,7 @@ class memberController extends member $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberFindAccount'); $this->setRedirectUrl($returnUrl); } - return new Object(0,$msg); + return new BaseObject(0,$msg); } /** @@ -1417,7 +1417,7 @@ class memberController extends member */ function procMemberFindAccountByQuestion() { - return new Object(-1, 'msg_question_not_allowed'); + return new BaseObject(-1, 'msg_question_not_allowed'); } /** @@ -1510,14 +1510,14 @@ class memberController extends member { // Get an email_address $email_address = Context::get('email_address'); - if(!$email_address) return new Object(-1, 'msg_invalid_request'); + if(!$email_address) return new BaseObject(-1, 'msg_invalid_request'); // Log test by using email_address $oMemberModel = getModel('member'); $args = new stdClass; $args->email_address = $email_address; $memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address); - if(!$memberSrl) return new Object(-1, 'msg_not_exists_member'); + if(!$memberSrl) return new BaseObject(-1, 'msg_not_exists_member'); $columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address'); $member_info = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList); @@ -1531,12 +1531,12 @@ class memberController extends member $chk_args = new stdClass; $chk_args->member_srl = $member_info->member_srl; $output = executeQuery('member.chkAuthMail', $chk_args); - if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request'); + if($output->toBool() && $output->data->count == '0') return new BaseObject(-1, 'msg_invalid_request'); $auth_args = new stdClass; $auth_args->member_srl = $member_info->member_srl; $output = executeQueryArray('member.getAuthMailInfo', $auth_args); - if(!$output->data || !$output->data[0]->auth_key) return new Object(-1, 'msg_invalid_request'); + if(!$output->data || !$output->data[0]->auth_key) return new BaseObject(-1, 'msg_invalid_request'); $auth_info = $output->data[0]; // Update the regdate of authmail entry @@ -1614,7 +1614,7 @@ class memberController extends member $member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail); if($member_srl) { - return new Object(-1,'msg_exists_email_address'); + return new BaseObject(-1,'msg_exists_email_address'); } // remove all key by member_srl @@ -1729,7 +1729,7 @@ class memberController extends member { $site_module_info = Context::get('site_module_info'); $logged_info = Context::get('logged_info'); - if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request'); + if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new BaseObject(-1,'msg_invalid_request'); $oMemberModel = getModel('member'); $columnList = array('site_srl', 'group_srl', 'title'); @@ -1748,7 +1748,7 @@ class memberController extends member { $site_module_info = Context::get('site_module_info'); $logged_info = Context::get('logged_info'); - if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request'); + if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new BaseObject(-1,'msg_invalid_request'); $args = new stdClass; $args->site_srl= $site_module_info->site_srl; @@ -1791,7 +1791,7 @@ class memberController extends member $agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt'; FileHandler::writeFile($agreement_file, $agreement); - return new Object(); + return new BaseObject(); } /** @@ -1905,7 +1905,7 @@ class memberController extends member $this->_clearMemberCache($obj->member_srl, $args->site_srl); } - return new Object(); + return new BaseObject(); } @@ -1980,7 +1980,7 @@ class memberController extends member function doLogin($user_id, $password = '', $keep_signed = false) { $user_id = strtolower($user_id); - if(!$user_id) return new Object(-1, 'null_user_id'); + if(!$user_id) return new BaseObject(-1, 'null_user_id'); // Call a trigger before log-in (before) $trigger_obj = new stdClass(); $trigger_obj->user_id = $user_id; @@ -2026,7 +2026,7 @@ class memberController extends member elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).lang('unit_hour'); else $term = intval($term/86400).lang('unit_day'); - return new Object(-1, sprintf(lang('excess_ip_access_count'),$term)); + return new BaseObject(-1, sprintf(lang('excess_ip_access_count'),$term)); } else { @@ -2054,14 +2054,14 @@ class memberController extends member } $refused_reason = $member_info->refused_reason ? ('
' . lang('refused_reason') . ': ' . $member_info->refused_reason) : ''; - return new Object(-1, lang('msg_user_denied') . $refused_reason); + return new BaseObject(-1, lang('msg_user_denied') . $refused_reason); } // Notify if user is limited if($member_info->limit_date && substr($member_info->limit_date,0,8) >= date("Ymd")) { $limited_reason = $member_info->limited_reason ? ('
' . lang('refused_reason') . ': ' . $member_info->limited_reason) : ''; - return new Object(-9, sprintf(lang('msg_user_limited'), zdate($member_info->limit_date,"Y-m-d")) . $limited_reason); + return new BaseObject(-9, sprintf(lang('msg_user_limited'), zdate($member_info->limit_date,"Y-m-d")) . $limited_reason); } // Do not allow login as admin if not in allowed IP list @@ -2070,7 +2070,7 @@ class memberController extends member $oMemberAdminModel = getAdminModel('member'); if(!$oMemberAdminModel->getMemberAdminIPCheck()) { - return new Object(-1, 'msg_admin_ip_not_allowed'); + return new BaseObject(-1, 'msg_admin_ip_not_allowed'); } } @@ -2341,7 +2341,7 @@ class memberController extends member if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) { $message = lang('about_password_strength'); - return new Object(-1, $message[$config->password_strength]); + return new BaseObject(-1, $message[$config->password_strength]); } $args->password = $oMemberModel->hashPassword($args->password); } @@ -2349,27 +2349,27 @@ class memberController extends member // Check if ID is prohibited if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedID($args->user_id)) { - return new Object(-1,'denied_user_id'); + return new BaseObject(-1,'denied_user_id'); } // Check if ID is duplicate $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); if($member_srl) { - return new Object(-1,'msg_exists_user_id'); + return new BaseObject(-1,'msg_exists_user_id'); } // Check if nickname is prohibited if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedNickName($args->nick_name)) { - return new Object(-1,'denied_nick_name'); + return new BaseObject(-1,'denied_nick_name'); } // Check if nickname is duplicate $member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name); if($member_srl) { - return new Object(-1,'msg_exists_nick_name'); + return new BaseObject(-1,'msg_exists_nick_name'); } // Check managed Email Host @@ -2385,14 +2385,14 @@ class memberController extends member $hosts[] = $host->email_host; } $message = sprintf($managed_email_host[$emailhost_check],implode(', ',$hosts),'id@'.implode(', id@',$hosts)); - return new Object(-1, $message); + return new BaseObject(-1, $message); } // Check if email address is duplicate $member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address); if($member_srl) { - return new Object(-1,'msg_exists_email_address'); + return new BaseObject(-1,'msg_exists_email_address'); } // Insert data into the DB @@ -2591,7 +2591,7 @@ class memberController extends member $hosts[] = $host->email_host; } $message = sprintf($managed_email_host[$emailhost_check],implode(', ',$hosts),'id@'.implode(', id@',$hosts)); - return new Object(-1, $message); + return new BaseObject(-1, $message); } // Check if email address or user ID is duplicate @@ -2600,7 +2600,7 @@ class memberController extends member $member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address); if($member_srl && $args->member_srl != $member_srl) { - return new Object(-1,'msg_exists_email_address'); + return new BaseObject(-1,'msg_exists_email_address'); } $args->email_address = $orgMemberInfo->email_address; } @@ -2609,7 +2609,7 @@ class memberController extends member $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); if($member_srl && $args->member_srl != $member_srl) { - return new Object(-1,'msg_exists_user_id'); + return new BaseObject(-1,'msg_exists_user_id'); } $args->user_id = $orgMemberInfo->user_id; @@ -2618,7 +2618,7 @@ class memberController extends member // Check if ID is prohibited if($logged_info->is_admin !== 'Y' && $args->user_id && $oMemberModel->isDeniedID($args->user_id)) { - return new Object(-1,'denied_user_id'); + return new BaseObject(-1,'denied_user_id'); } // Check if ID is duplicate @@ -2627,21 +2627,21 @@ class memberController extends member $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); if($member_srl && $args->member_srl != $member_srl) { - return new Object(-1,'msg_exists_user_id'); + return new BaseObject(-1,'msg_exists_user_id'); } } // Check if nickname is prohibited if($logged_info->is_admin !== 'Y' && $args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name)) { - return new Object(-1, 'denied_nick_name'); + return new BaseObject(-1, 'denied_nick_name'); } // Check if nickname is duplicate $member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name); if($member_srl && $args->member_srl != $member_srl) { - return new Object(-1,'msg_exists_nick_name'); + return new BaseObject(-1,'msg_exists_nick_name'); } list($args->email_id, $args->email_host) = explode('@', $args->email_address); @@ -2655,7 +2655,7 @@ class memberController extends member if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) { $message = lang('about_password_strength'); - return new Object(-1, $message[$config->password_strength]); + return new BaseObject(-1, $message[$config->password_strength]); } $args->password = $oMemberModel->hashPassword($args->password); } @@ -2747,7 +2747,7 @@ class memberController extends member if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) { $message = lang('about_password_strength'); - return new Object(-1, $message[$config->password_strength]); + return new BaseObject(-1, $message[$config->password_strength]); } $args->password = $oMemberModel->hashPassword($args->password); @@ -2783,9 +2783,9 @@ class memberController extends member // Bringing the user's information $columnList = array('member_srl', 'is_admin'); $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); - if(!$member_info) return new Object(-1, 'msg_not_exists_member'); + if(!$member_info) return new BaseObject(-1, 'msg_not_exists_member'); // If managers can not be deleted - if($member_info->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin'); + if($member_info->is_admin == 'Y') return new BaseObject(-1, 'msg_cannot_delete_admin'); $oDB = &DB::getInstance(); $oDB->begin(); @@ -2907,12 +2907,12 @@ class memberController extends member $hosts[] = $host->email_host; } $message = sprintf($managed_email_host[$emailhost_check],implode(', ',$hosts),'id@'.implode(', id@',$hosts)); - return new Object(-1, $message); + return new BaseObject(-1, $message); } // Check if the e-mail address is already registered $member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail); - if($member_srl) return new Object(-1,'msg_exists_email_address'); + if($member_srl) return new BaseObject(-1,'msg_exists_email_address'); if($_SESSION['rechecked_password_step'] != 'INPUT_DATA') { @@ -3018,7 +3018,7 @@ class memberController extends member **/ function triggerGetDocumentMenu(&$menu_list) { - if(!Context::get('is_logged')) return new Object(); + if(!Context::get('is_logged')) return new BaseObject(); $logged_info = Context::get('logged_info'); $document_srl = Context::get('target_srl'); @@ -3029,14 +3029,14 @@ class memberController extends member $member_srl = $oDocument->get('member_srl'); $module_srl = $oDocument->get('module_srl'); - if(!$member_srl) return new Object(); - if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object(); + if(!$member_srl) return new BaseObject(); + if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new BaseObject(); $oDocumentController = getController('document'); $url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl); $oDocumentController->addDocumentPopupMenu($url,'cmd_spammer','','popup'); - return new Object(); + return new BaseObject(); } /** @@ -3048,7 +3048,7 @@ class memberController extends member **/ function triggerGetCommentMenu(&$menu_list) { - if(!Context::get('is_logged')) return new Object(); + if(!Context::get('is_logged')) return new BaseObject(); $logged_info = Context::get('logged_info'); $comment_srl = Context::get('target_srl'); @@ -3059,14 +3059,14 @@ class memberController extends member $module_srl = $oComment->get('module_srl'); $member_srl = $oComment->get('member_srl'); - if(!$member_srl) return new Object(); - if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object(); + if(!$member_srl) return new BaseObject(); + if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new BaseObject(); $oCommentController = getController('comment'); $url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl); $oCommentController->addCommentPopupMenu($url,'cmd_spammer','','popup'); - return new Object(); + return new BaseObject(); } /** @@ -3076,7 +3076,7 @@ class memberController extends member **/ function procMemberSpammerManage() { - if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted'); $logged_info = Context::get('logged_info'); $member_srl = Context::get('member_srl'); @@ -3093,7 +3093,7 @@ class memberController extends member $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $grant = $oModuleModel->getGrant($module_info, $logged_info); - if(!$grant->manager) return new Object(-1,'msg_not_permitted'); + if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted'); $proc_msg = ""; @@ -3130,7 +3130,7 @@ class memberController extends member $this->add('cnt_loop', ++$cnt_loop); $this->add('proc_type', $proc_type); - return new Object(0); + return new BaseObject(0); } /** diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 3ad39ba01..7e7eac466 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -352,7 +352,7 @@ class memberView extends member // A message appears if the user is not logged-in if(!Context::get('is_logged')) { - return new Object(-1, 'msg_not_logged'); + return new BaseObject(-1, 'msg_not_logged'); } $logged_info = Context::get('logged_info'); @@ -432,7 +432,7 @@ class memberView extends member $folder_srl = (int)Context::get('folder_srl'); if($folder_srl && !array_filter($folders, function($folder) use($folder_srl) { return $folder->folder_srl == $folder_srl; })) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if(!$folder_srl && count($folders)) { @@ -635,7 +635,7 @@ class memberView extends member */ function dispSavedDocumentList() { - return new Object(0, 'Deplicated method'); + return new BaseObject(0, 'Deplicated method'); } /** @@ -740,7 +740,7 @@ class memberView extends member **/ function dispMemberSpammer() { - if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted'); $member_srl = Context::get('member_srl'); $module_srl = Context::get('module_srl'); @@ -751,7 +751,7 @@ class memberView extends member $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); - if(!$grant->manager) return new Object(-1,'msg_not_permitted'); + if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted'); $oMemberModel = getModel('member'); @@ -783,7 +783,7 @@ class memberView extends member { if($logged_info->is_admin != 'Y') { - return new Object(-1, 'msg_not_permitted'); + return new BaseObject(-1, 'msg_not_permitted'); } } diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index bbdccdfa4..55c96fd42 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -170,7 +170,7 @@ class menuAdminController extends menu { if(!$moduleInfos || !is_array($moduleInfos) || count($moduleInfos) == 0 || $menuSrl == 0) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } foreach($moduleInfos as $moduleInfo) @@ -214,7 +214,7 @@ class menuAdminController extends menu $oMenuAdminController = getAdminController('menu'); $oMenuAdminController->makeXmlFile($menuSrl); - return new Object(); + return new BaseObject(); } @@ -252,7 +252,7 @@ class menuAdminController extends menu $oAdmin = getClass('admin'); if($menuInfo->title == $oAdmin->getAdminMenuName()) - return new Object(-1, 'msg_adminmenu_cannot_delete'); + return new BaseObject(-1, 'msg_adminmenu_cannot_delete'); // get menu properies with child menu $phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl); @@ -283,13 +283,13 @@ class menuAdminController extends menu if($isStartmenuInclude) { - return new Object(-1, 'msg_cannot_delete_homemenu'); + return new BaseObject(-1, 'msg_cannot_delete_homemenu'); } $output = $this->deleteMenu($menu_srl); if(!$output->toBool()) { - return new Object(-1, $output->message); + return new BaseObject(-1, $output->message); } $this->setMessage('success_deleted', 'info'); @@ -371,7 +371,7 @@ class menuAdminController extends menu $oDB->commit(); - return new Object(0,'success_deleted'); + return new BaseObject(0,'success_deleted'); } /** @@ -389,13 +389,13 @@ class menuAdminController extends menu if(!$request->parent_srl || !$request->menu_name) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $this->_setMenuSrl($request->parent_srl, $request->menu_srl); if(!$request->menu_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if($request->is_shortcut == 'Y') @@ -409,7 +409,7 @@ class menuAdminController extends menu if($result->error < 0) { - return new Object($result->error, $result->message); + return new BaseObject($result->error, $result->message); } // recreate menu cache file @@ -475,7 +475,7 @@ class menuAdminController extends menu $itemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target); if(!$itemInfo->menu_item_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } unset($itemInfo->normal_btn, $itemInfo->hover_btn, $itemInfo->active_btn); @@ -540,7 +540,7 @@ class menuAdminController extends menu if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // when menu copy, module already copied @@ -549,7 +549,7 @@ class menuAdminController extends menu $result = $this->_insertModule($request, $args); if(!$result->toBool()) { - return new Object(-1, $result->message); + return new BaseObject(-1, $result->message); } } @@ -560,7 +560,7 @@ class menuAdminController extends menu if(!$request->module_id) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $args->url = $request->module_id; @@ -625,7 +625,7 @@ class menuAdminController extends menu $output = $oModuleModel->getModuleInfoByMid($request->module_id); if($output->module_srl) { - return new Object(-1, 'msg_module_name_exists'); + return new BaseObject(-1, 'msg_module_name_exists'); } $oModuleController = getController('module'); @@ -644,7 +644,7 @@ class menuAdminController extends menu if(!$request->menu_item_srl || !$request->menu_name) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // variables set @@ -671,7 +671,7 @@ class menuAdminController extends menu $newItemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target); if(!$newItemInfo->menu_item_srl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $args->url = $newItemInfo->url; @@ -691,7 +691,7 @@ class menuAdminController extends menu $output = $oModuleModel->getModuleInfoByMid($request->module_id); if($output->module_srl) { - return new Object(-1, 'msg_module_name_exists'); + return new BaseObject(-1, 'msg_module_name_exists'); } } @@ -699,7 +699,7 @@ class menuAdminController extends menu $moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url); if(!$moduleInfo) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $moduleInfo->mid = $request->module_id; @@ -855,7 +855,7 @@ class menuAdminController extends menu if(!$output->toBool()) return $output; if($output->data->count > 0) { - return new Object(-1001, 'msg_cannot_delete_for_child'); + return new BaseObject(-1001, 'msg_cannot_delete_for_child'); } } @@ -892,7 +892,7 @@ class menuAdminController extends menu $this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude); if($isStartmenuInclude) { - return new Object(-1, 'msg_cannot_delete_homemenu'); + return new BaseObject(-1, 'msg_cannot_delete_homemenu'); } $oDB = DB::getInstance(); @@ -909,7 +909,7 @@ class menuAdminController extends menu $this->add('menu_title', $menu_title); $this->add('menu_item_srl', $parent_srl); - return new Object(0, 'success_deleted'); + return new BaseObject(0, 'success_deleted'); } private function _checkHomeMenuInOriginMenu($originMenu, $startMid, &$isStartmenuInclude) @@ -982,7 +982,7 @@ class menuAdminController extends menu } } } - return new Object(0, 'success'); + return new BaseObject(0, 'success'); } private function _recursiveDeleteMenuItem(&$oDB, &$menuInfo, $node) @@ -990,7 +990,7 @@ class menuAdminController extends menu $output = $this->_deleteMenuItem($oDB, $menuInfo, $node); if(!$output->toBool()) { - return new Object(-1, $output->message); + return new BaseObject(-1, $output->message); } if(is_array($node['list'])) @@ -1013,7 +1013,7 @@ class menuAdminController extends menu $source_srl = Context::get('source_srl'); // Same hierarchy's menu item serial number $target_srl = Context::get('target_srl'); // Self menu item serial number - if(!$mode || !$parent_srl || !$target_srl) return new Object(-1,'msg_invalid_request'); + if(!$mode || !$parent_srl || !$target_srl) return new BaseObject(-1,'msg_invalid_request'); $oMenuAdminModel = getAdminModel('menu'); @@ -1023,7 +1023,7 @@ class menuAdminController extends menu $targetMenuItemInfo = $oMenuAdminModel->getMenuItemInfo($target_srl); if(!$originalItemInfo->menu_item_srl || (!$targetMenuInfo->menu_srl && !$targetMenuItemInfo->menu_item_srl)) { - return new Object(-1, 'msg_empty_menu_item'); + return new BaseObject(-1, 'msg_empty_menu_item'); } // get menu properies with child menu @@ -1407,7 +1407,7 @@ class menuAdminController extends menu $oMenuAdminModel = getAdminModel('menu'); $target_item = $oMenuAdminModel->getMenuItemInfo($target_srl); - if($target_item->menu_item_srl != $target_srl) return new Object(-1,'msg_invalid_request'); + if($target_item->menu_item_srl != $target_srl) return new BaseObject(-1,'msg_invalid_request'); // Move the menu location(change the order menu appears) if($mode == 'move') { @@ -1418,7 +1418,7 @@ class menuAdminController extends menu if($source_srl) { $source_item = $oMenuAdminModel->getMenuItemInfo($source_srl); - if($source_item->menu_item_srl != $source_srl) return new Object(-1,'msg_invalid_request'); + if($source_item->menu_item_srl != $source_srl) return new BaseObject(-1,'msg_invalid_request'); $args->listorder = $source_item->listorder-1; } else diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 45c4d816a..30c0bc10b 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -614,7 +614,7 @@ class menuAdminModel extends menu $menuItemSrl = Context::get('menu_item_srl'); if(!$menuItemSrl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } $menuItemInfo = $this->getMenuItemInfo($menuItemSrl); @@ -622,7 +622,7 @@ class menuAdminModel extends menu // if menu is shortcut if($menuItemInfo->is_shortcut == 'Y') { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } // get module info diff --git a/modules/menu/menu.class.php b/modules/menu/menu.class.php index 6d3e62ce2..961c0fea8 100644 --- a/modules/menu/menu.class.php +++ b/modules/menu/menu.class.php @@ -19,7 +19,7 @@ class menu extends ModuleObject // Create a directory to use menu FileHandler::makeDir('./files/cache/menu'); - return new Object(); + return new BaseObject(); } /** @@ -183,7 +183,7 @@ class menu extends ModuleObject $this->recompileCache(); } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/message/message.class.php b/modules/message/message.class.php index 4d5320ec9..89c0f9137 100644 --- a/modules/message/message.class.php +++ b/modules/message/message.class.php @@ -12,7 +12,7 @@ class message extends ModuleObject */ function moduleInstall() { - return new Object(); + return new BaseObject(); } /** @@ -57,7 +57,7 @@ class message extends ModuleObject } } } - return new Object(); + return new BaseObject(); } /** diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 21c2afbaa..369d69efc 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -108,7 +108,7 @@ class moduleAdminController extends module { $mid = trim($args->{"mid_".$i}); if(!$mid) continue; - if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid'); + if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new BaseObject(-1, 'msg_limit_mid'); $browser_title = $args->{"browser_title_".$i}; if(!$mid) continue; if($mid && !$browser_title) $browser_title = $mid; @@ -266,7 +266,7 @@ class moduleAdminController extends module return; else { - return new Object(-1, $msg); + return new BaseObject(-1, $msg); } } @@ -282,7 +282,7 @@ class moduleAdminController extends module // Get information of the module $columnList = array('module_srl', 'module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); - if(!$module_info) return new Object(-1,'msg_invalid_request'); + if(!$module_info) return new BaseObject(-1,'msg_invalid_request'); // Register Admin ID $oModuleController->deleteAdminId($module_srl); $admin_member = Context::get('admin_member'); @@ -509,10 +509,10 @@ class moduleAdminController extends module { $vars = Context::getRequestVars(); - if(!$vars->module_srls) return new Object(-1,'msg_invalid_request'); + if(!$vars->module_srls) return new BaseObject(-1,'msg_invalid_request'); $module_srls = explode(',',$vars->module_srls); - if(count($module_srls) < 1) return new Object(-1,'msg_invalid_request'); + if(count($module_srls) < 1) return new BaseObject(-1,'msg_invalid_request'); $oModuleModel = getModel('module'); $oModuleController= getController('module'); @@ -564,10 +564,10 @@ class moduleAdminController extends module function procModuleAdminModuleGrantSetup() { $module_srls = Context::get('module_srls'); - if(!$module_srls) return new Object(-1,'msg_invalid_request'); + if(!$module_srls) return new BaseObject(-1,'msg_invalid_request'); $modules = explode(',',$module_srls); - if(count($modules) < 1) return new Object(-1,'msg_invalid_request'); + if(count($modules) < 1) return new BaseObject(-1,'msg_invalid_request'); $oModuleController = getController('module'); $oModuleModel = getModel('module'); @@ -676,7 +676,7 @@ class moduleAdminController extends module // if args->name is empty, random generate for user define language if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100)); - if(!$args->name) return new Object(-1,'msg_invalid_request'); + if(!$args->name) return new BaseObject(-1,'msg_invalid_request'); // Check whether a language code exists $output = executeQueryArray('module.getLang', $args); if(!$output->toBool()) return $output; @@ -723,7 +723,7 @@ class moduleAdminController extends module $args->name = str_replace(' ','_',Context::get('name')); $args->lang_name = str_replace(' ','_',Context::get('lang_name')); if(!empty($args->lang_name)) $args->name = $args->lang_name; - if(!$args->name) return new Object(-1,'msg_invalid_request'); + if(!$args->name) return new BaseObject(-1,'msg_invalid_request'); $output = executeQuery('module.deleteLang', $args); if(!$output->toBool()) return $output; @@ -737,7 +737,7 @@ class moduleAdminController extends module function procModuleAdminGetList() { - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted'); + if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted'); $oModuleController = getController('module'); $oModuleModel = getModel('module'); diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php index 395fcb37b..2932fd8f2 100644 --- a/modules/module/module.admin.model.php +++ b/modules/module/module.admin.model.php @@ -26,7 +26,7 @@ class moduleAdminModel extends module $args = new stdClass; $args->module_srls = Context::get('module_srls'); $output = executeQueryArray('module.getModulesInfo', $args); - if(!$output->toBool() || !$output->data) return new Object(); + if(!$output->toBool() || !$output->data) return new BaseObject(); foreach($output->data as $key => $val) { @@ -215,12 +215,12 @@ class moduleAdminModel extends module $moduleSrl = Context::get('module_srl'); if(!$targetModule || !$moduleSrl) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } if($targetModule == '_SHORTCUT') { - return new Object(0); + return new BaseObject(0); } $oModuleModel = getModel('module'); @@ -453,7 +453,7 @@ class moduleAdminModel extends module function getModuleAdminLangCode() { $name = Context::get('name'); - if(!$name) return new Object(-1,'msg_invalid_request'); + if(!$name) return new BaseObject(-1,'msg_invalid_request'); $site_module_info = Context::get('site_module_info'); $this->add('name', $name); $output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name); diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index 9e64610e3..13b95056f 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -165,7 +165,7 @@ class moduleAdminView extends module $module_srls = Context::get('module_srls'); $modules = explode(',',$module_srls); - if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request'); + if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request'); $oModuleModel = getModel('module'); $columnList = array('module_srl', 'module'); @@ -201,7 +201,7 @@ class moduleAdminView extends module $module_srls = Context::get('module_srls'); $modules = explode(',',$module_srls); - if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request'); + if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request'); // pre-define variables because you can get contents from other module (call by reference) $content = ''; // Call a trigger for additional settings @@ -224,7 +224,7 @@ class moduleAdminView extends module $module_srls = Context::get('module_srls'); $modules = explode(',',$module_srls); - if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request'); + if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request'); $oModuleModel = getModel('module'); $columnList = array('module_srl', 'module', 'site_srl'); diff --git a/modules/module/module.class.php b/modules/module/module.class.php index a23547b9b..4d409e230 100644 --- a/modules/module/module.class.php +++ b/modules/module/module.class.php @@ -46,7 +46,7 @@ class module extends ModuleObject FileHandler::makeDir('./files/cache/triggers'); FileHandler::makeDir('./files/ruleset'); - return new Object(); + return new BaseObject(); } /** @@ -394,7 +394,7 @@ class module extends ModuleObject $oDB->modifyColumn('module_config', 'config', 'bigtext'); } - return new Object(0, 'success_updated'); + return new BaseObject(0, 'success_updated'); } /** diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 78c13c055..ce4274670 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -257,7 +257,7 @@ class moduleController extends module if(isSiteID($domain)) { $oModuleModel = getModel('module'); - if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid'); + if($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-1,'msg_already_registed_vid'); } else { @@ -273,7 +273,7 @@ class moduleController extends module $columnList = array('modules.site_srl'); $oModuleModel = getModel('module'); $output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList); - if($output) return new Object(-1,'msg_already_registed_vid'); + if($output) return new BaseObject(-1,'msg_already_registed_vid'); $output = executeQuery('module.insertSite', $args); if(!$output->toBool()) return $output; @@ -299,8 +299,8 @@ class moduleController extends module if($site_info->domain != $args->domain) { $info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList); - if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain'); - if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid'); + if($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1,'msg_already_registed_domain'); + if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-1,'msg_already_registed_vid'); if($args->domain && !isSiteID($args->domain)) { @@ -329,7 +329,7 @@ class moduleController extends module unset($args->act); unset($args->page); // Test mid value - if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid'); + if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new BaseObject(-1, 'msg_limit_mid'); // Test variables (separate basic vars and other vars in modules) $extra_vars = clone($args); unset($extra_vars->module_srl); @@ -355,7 +355,7 @@ class moduleController extends module unset($extra_vars->footer_text); $args = delObjectVars($args, $extra_vars); - return new Object(); + return new BaseObject(); } /** @@ -377,7 +377,7 @@ class moduleController extends module // Check whether the module name already exists if(!$args->site_srl) $args->site_srl = 0; $oModuleModel = getModel('module'); - if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists'); + if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists'); // begin transaction $oDB = &DB::getInstance(); @@ -518,7 +518,7 @@ class moduleController extends module if(!$output->toBool() || $output->data->count) { $oDB->rollback(); - return new Object(-1, 'msg_module_name_exists'); + return new BaseObject(-1, 'msg_module_name_exists'); } // default value @@ -641,7 +641,7 @@ class moduleController extends module */ function deleteModule($module_srl, $site_srl = 0) { - if(!$module_srl) return new Object(-1,'msg_invalid_request'); + if(!$module_srl) return new BaseObject(-1,'msg_invalid_request'); $site_module_info = Context::get('site_module_info'); @@ -684,11 +684,11 @@ class moduleController extends module if($output->isSuccess) { - return new Object(0, 'success_deleted'); + return new BaseObject(0, 'success_deleted'); } else { - return new Object($output->error, $output->message); + return new BaseObject($output->error, $output->message); } } // only delete module @@ -704,13 +704,13 @@ class moduleController extends module */ public function onlyDeleteModule($module_srl) { - if(!$module_srl) return new Object(-1,'msg_invalid_request'); + if(!$module_srl) return new BaseObject(-1,'msg_invalid_request'); // check start module $oModuleModel = getModel('module'); $columnList = array('sites.index_module_srl'); $start_module = $oModuleModel->getSiteInfo(0, $columnList); - if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule'); + if($module_srl == $start_module->index_module_srl) return new BaseObject(-1, 'msg_cannot_delete_startmodule'); // Call a trigger (before) $trigger_obj = new stdClass(); @@ -756,7 +756,7 @@ class moduleController extends module */ function updateModuleSkinVars($module_srl, $skin_vars) { - return new Object(); + return new BaseObject(); } /** @@ -880,7 +880,7 @@ class moduleController extends module } getDestroyXeVars($obj); - if(!$obj || !count($obj)) return new Object(); + if(!$obj || !count($obj)) return new BaseObject(); $args = new stdClass; $args->module_srl = $module_srl; @@ -914,7 +914,7 @@ class moduleController extends module $oDB->commit(); - return new Object(); + return new BaseObject(); } /** @@ -1089,7 +1089,7 @@ class moduleController extends module if ($ajax) Context::setRequestMethod('JSON'); $logged_info = Context::get('logged_info'); - if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted'); + if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted'); $vars = Context::gets('addfile','filter'); $attributeNames = Context::get('attribute_name'); @@ -1118,7 +1118,7 @@ class moduleController extends module $filter = array_map('trim', explode(',',$vars->filter)); if (!in_array($ext, $filter)) { - return new Object(-1, 'msg_error_occured'); + return new BaseObject(-1, 'msg_error_occured'); } } @@ -1133,10 +1133,10 @@ class moduleController extends module // insert else { - if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured'); + if(!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured'); $addfile = Context::get('addfile'); - if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured'); - if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured'); + if(!is_uploaded_file($addfile['tmp_name'])) return new BaseObject(-1, 'msg_error_occured'); + if($vars->addfile['error'] != 0) return new BaseObject(-1, 'msg_error_occured'); $output = $this->insertModuleFileBox($vars); } @@ -1235,10 +1235,10 @@ class moduleController extends module function procModuleFileBoxDelete() { $logged_info = Context::get('logged_info'); - if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted'); + if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted'); $module_filebox_srl = Context::get('module_filebox_srl'); - if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request'); + if(!$module_filebox_srl) return new BaseObject(-1, 'msg_invalid_request'); $vars = new stdClass(); $vars->module_filebox_srl = $module_filebox_srl; $output = $this->deleteModuleFileBox($vars); diff --git a/modules/module/module.model.php b/modules/module/module.model.php index a994166ef..c7c6e2a95 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -2344,7 +2344,7 @@ class moduleModel extends module function getFileBoxListHtml() { $logged_info = Context::get('logged_info'); - if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted'); + if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted'); $link = parse_url($_SERVER["HTTP_REFERER"]); $link_params = explode('&',$link['query']); foreach ($link_params as $param) diff --git a/modules/module/module.view.php b/modules/module/module.view.php index 480b290d3..0ea6c6b3f 100644 --- a/modules/module/module.view.php +++ b/modules/module/module.view.php @@ -123,15 +123,15 @@ class moduleView extends module function dispModuleFileBox() { $logged_info = Context::get('logged_info'); - if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted'); + if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted'); $input_name = Context::get('input'); if(!preg_match('/^[a-z0-9_]+$/i', $input_name)) { - return new Object(-1, 'msg_invalid_request'); + return new BaseObject(-1, 'msg_invalid_request'); } - if(!$input_name) return new Object(-1, 'msg_not_permitted'); + if(!$input_name) return new BaseObject(-1, 'msg_not_permitted'); $addscript = sprintf('