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

Remove unnecessary use of BaseObject

Browse source 
- 트리거 등 반환값이 필요하지 않은 곳에서 new BaseObject()를 반환하는 것 삭제
- 모듈 설치, 업데이트 후 무의미한 new BaseObject()를 반환하는 것 삭제
- 사용자에게 에러 메시지를 돌려주는 용도로 new BaseObject(-1, '에러메시지')를
  사용하는 경우는 대부분 $this->setError()로 변경함. 언어 변환과 sprintf()
  처리까지 한 번에 이루어지므로 이쪽이 더 편리함.
This commit is contained in:
Kijin Sung 2017-12-01 00:54:51 +09:00
parent 03d74a984f
commit 84e5542d77
103 changed files with 692 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

114
modules/admin/admin.admin.controller.php
View file

@ -158,8 +158,8 @@ class adminAdminController extends admin
}
// create a DesignInfo file
$output = $this->updateDefaultDesignInfo($vars);
return $this->setRedirectUrl(Context::get('error_return_url'), $output);
$this->updateDefaultDesignInfo($vars);
$this->setRedirectUrl(Context::get('error_return_url'));
}
public function updateDefaultDesignInfo($vars)
@ -209,8 +209,6 @@ class adminAdminController extends admin
}
$this->makeDefaultDesignFile($designInfo, $vars->site_srl);
return new BaseObject();
}
function makeDefaultDesignFile($designInfo, $site_srl = 0)
@ -287,7 +285,7 @@ class adminAdminController extends admin
/**
* Cleanning favorite
* @return Object
* @return object|void
*/
function cleanFavorite()
{
@ -301,7 +299,7 @@ class adminAdminController extends admin
$favoriteList = $output->get('favoriteList');
if(!$favoriteList)
{
return new BaseObject();
return;
}
$deleteTargets = array();
@ -319,7 +317,7 @@ class adminAdminController extends admin
if(!count($deleteTargets))
{
return new BaseObject();
return;
}
$args = new stdClass();
@ -329,8 +327,6 @@ class adminAdminController extends admin
{
return $output;
}
return new BaseObject();
}
/**
@ -496,7 +492,7 @@ class adminAdminController extends admin
}
else
{
return new BaseObject(-1, 'fail_to_delete');
return $this->setError('fail_to_delete');
}
$this->setMessage('success_deleted');
}
@ -520,7 +516,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::set('use_sso', $vars->use_sso === 'Y');
if (!Rhymix\Framework\Config::save())
{
return new BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_updated');
@ -540,19 +536,19 @@ class adminAdminController extends admin
// Validate the mail sender's information.
if (!$vars->mail_default_name)
{
return new BaseObject(-1, 'msg_advanced_mailer_sender_name_is_empty');
return $this->setError('msg_advanced_mailer_sender_name_is_empty');
}
if (!$vars->mail_default_from)
{
return new BaseObject(-1, 'msg_advanced_mailer_sender_email_is_empty');
return $this->setError('msg_advanced_mailer_sender_email_is_empty');
}
if (!Mail::isVaildMailAddress($vars->mail_default_from))
{
return new BaseObject(-1, 'msg_advanced_mailer_sender_email_is_invalid');
return $this->setError('msg_advanced_mailer_sender_email_is_invalid');
}
if ($vars->mail_default_reply_to && !Mail::isVaildMailAddress($vars->mail_default_reply_to))
{
return new BaseObject(-1, 'msg_advanced_mailer_reply_to_is_invalid');
return $this->setError('msg_advanced_mailer_reply_to_is_invalid');
}
// Validate the mail driver.
@ -560,7 +556,7 @@ class adminAdminController extends admin
$mail_driver = $vars->mail_driver;
if (!array_key_exists($mail_driver, $mail_drivers))
{
return new BaseObject(-1, 'msg_advanced_mailer_sending_method_is_invalid');
return $this->setError('msg_advanced_mailer_sending_method_is_invalid');
}
// Validate the mail driver settings.
@ -570,7 +566,7 @@ class adminAdminController extends admin
$conf_value = $vars->{'mail_' . $mail_driver . '_' . $conf_name} ?: null;
if (!$conf_value)
{
return new BaseObject(-1, 'msg_advanced_mailer_smtp_host_is_invalid');
return $this->setError('msg_advanced_mailer_smtp_host_is_invalid');
}
$mail_driver_config[$conf_name] = $conf_value;
}
@ -580,7 +576,7 @@ class adminAdminController extends admin
$sms_driver = $vars->sms_driver;
if (!array_key_exists($sms_driver, $sms_drivers))
{
return new BaseObject(-1, 'msg_advanced_mailer_sending_method_is_invalid');
return $this->setError('msg_advanced_mailer_sending_method_is_invalid');
}
// Validate the SMS driver settings.
@ -590,7 +586,7 @@ class adminAdminController extends admin
$conf_value = $vars->{'sms_' . $sms_driver . '_' . $conf_name} ?: null;
if (!$conf_value)
{
return new BaseObject(-1, 'msg_advanced_mailer_smtp_host_is_invalid');
return $this->setError('msg_advanced_mailer_smtp_host_is_invalid');
}
$sms_driver_config[$conf_name] = $conf_value;
}
@ -629,7 +625,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 BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_updated');
@ -684,7 +680,7 @@ class adminAdminController extends admin
return $item !== '';
}));
if (!Rhymix\Framework\Filters\IpFilter::validateRanges($allowed_ip)) {
return new BaseObject(-1, 'msg_invalid_ip');
return $this->setError('msg_invalid_ip');
}
$denied_ip = array_map('trim', preg_split('/[\r\n]/', $vars->admin_denied_ip));
@ -692,13 +688,13 @@ class adminAdminController extends admin
return $item !== '';
}));
if (!Rhymix\Framework\Filters\IpFilter::validateRanges($denied_ip)) {
return new BaseObject(-1, 'msg_invalid_ip');
return $this->setError('msg_invalid_ip');
}
$oMemberAdminModel = getAdminModel('member');
if (!$oMemberAdminModel->getMemberAdminIPCheck($allowed_ip, $denied_ip))
{
return new BaseObject(-1, 'msg_current_ip_will_be_denied');
return $this->setError('msg_current_ip_will_be_denied');
}
Rhymix\Framework\Config::set('admin.allow', array_values($allowed_ip));
@ -707,7 +703,7 @@ class adminAdminController extends admin
// Save
if (!Rhymix\Framework\Config::save())
{
return new BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_updated');
@ -746,7 +742,7 @@ class adminAdminController extends admin
}
if (!Rhymix\Framework\Cache::getDriverInstance($vars->object_cache_type, $cache_servers))
{
return new BaseObject(-1, 'msg_cache_handler_not_supported');
return $this->setError('msg_cache_handler_not_supported');
}
Rhymix\Framework\Config::set('cache', array(
'type' => $vars->object_cache_type,
@ -801,7 +797,7 @@ class adminAdminController extends admin
// Save
if (!Rhymix\Framework\Config::save())
{
return new BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_updated');
@ -839,15 +835,15 @@ class adminAdminController extends admin
), $log_filename);
if (file_exists(RX_BASEDIR . $log_filename_today) && !is_writable(RX_BASEDIR . $log_filename_today))
{
return new BaseObject(-1, 'msg_debug_log_filename_not_writable');
return $this->setError('msg_debug_log_filename_not_writable');
}
if (!file_exists(dirname(RX_BASEDIR . $log_filename)) && !FileHandler::makeDir(dirname(RX_BASEDIR . $log_filename)))
{
return new BaseObject(-1, 'msg_debug_log_filename_not_writable');
return $this->setError('msg_debug_log_filename_not_writable');
}
if (!is_writable(dirname(RX_BASEDIR . $log_filename)))
{
return new BaseObject(-1, 'msg_debug_log_filename_not_writable');
return $this->setError('msg_debug_log_filename_not_writable');
}
Rhymix\Framework\Config::set('debug.log_filename', $log_filename);
@ -857,14 +853,14 @@ class adminAdminController extends admin
return $item !== '';
}));
if (!Rhymix\Framework\Filters\IpFilter::validateRanges($allowed_ip)) {
return new BaseObject(-1, 'msg_invalid_ip');
return $this->setError('msg_invalid_ip');
}
Rhymix\Framework\Config::set('debug.allow', array_values($allowed_ip));
// Save
if (!Rhymix\Framework\Config::save())
{
return new BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_updated');
@ -896,7 +892,7 @@ class adminAdminController extends admin
// Save
if (!Rhymix\Framework\Config::save())
{
return new BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_updated');
@ -917,7 +913,7 @@ class adminAdminController extends admin
if (!Rhymix\Framework\Filters\IpFilter::validateRanges($allowed_ip))
{
return new BaseObject(-1, 'msg_invalid_ip');
return $this->setError('msg_invalid_ip');
}
Rhymix\Framework\Config::set('lock.locked', $vars->sitelock_locked === 'Y');
@ -926,7 +922,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::set('lock.allow', array_values($allowed_ip));
if (!Rhymix\Framework\Config::save())
{
return new BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_updated');
@ -947,7 +943,7 @@ class adminAdminController extends admin
$domain_info = getModel('module')->getSiteInfo($domain_srl);
if ($domain_info->domain_srl != $domain_srl)
{
return new BaseObject(-1, 'msg_domain_not_found');
return $this->setError('msg_domain_not_found');
}
}
@ -956,7 +952,7 @@ class adminAdminController extends admin
$vars->subtitle = utf8_trim($vars->subtitle);
if ($vars->title === '')
{
return new BaseObject(-1, 'msg_site_title_is_empty');
return $this->setError('msg_site_title_is_empty');
}
// Validate the domain.
@ -974,12 +970,12 @@ class adminAdminController extends admin
}
if (!$vars->domain)
{
return new BaseObject(-1, 'msg_invalid_domain');
return $this->setError('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 BaseObject(-1, 'msg_domain_already_exists');
return $this->setError('msg_domain_already_exists');
}
// Validate the ports.
@ -993,11 +989,11 @@ class adminAdminController extends admin
}
if ($vars->http_port !== 0 && ($vars->http_port < 1 || $vars->http_port > 65535 || $vars->http_port == 443))
{
return new BaseObject(-1, 'msg_invalid_http_port');
return $this->setError('msg_invalid_http_port');
}
if ($vars->https_port !== 0 && ($vars->https_port < 1 || $vars->https_port > 65535 || $vars->https_port == 80))
{
return new BaseObject(-1, 'msg_invalid_https_port');
return $this->setError('msg_invalid_https_port');
}
// Validate the security setting.
@ -1011,7 +1007,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 BaseObject(-1, 'msg_invalid_index_module_srl');
return $this->setError('msg_invalid_index_module_srl');
}
// Validate the index document setting.
@ -1020,11 +1016,11 @@ class adminAdminController extends admin
$oDocument = getModel('document')->getDocument($vars->index_document_srl);
if (!$oDocument || !$oDocument->isExists())
{
return new BaseObject(-1, 'msg_invalid_index_document_srl');
return $this->setError('msg_invalid_index_document_srl');
}
if (intval($oDocument->get('module_srl')) !== intval($vars->index_module_srl))
{
return new BaseObject(-1, 'msg_invalid_index_document_srl_module_srl');
return $this->setError('msg_invalid_index_document_srl_module_srl');
}
}
else
@ -1036,14 +1032,14 @@ class adminAdminController extends admin
$enabled_lang = Rhymix\Framework\Config::get('locale.enabled_lang');
if (!in_array($vars->default_lang, $enabled_lang))
{
return new BaseObject(-1, 'msg_lang_is_not_enabled');
return $this->setError('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 BaseObject(-1, 'msg_invalid_timezone');
return $this->setError('msg_invalid_timezone');
}
// Clean up the header and footer scripts.
@ -1166,16 +1162,16 @@ class adminAdminController extends admin
$domain_srl = strval(Context::get('domain_srl'));
if ($domain_srl === '')
{
return new BaseObject(-1, 'msg_domain_not_found');
return $this->setError('msg_domain_not_found');
}
$domain_info = getModel('module')->getSiteInfo($domain_srl);
if ($domain_info->domain_srl != $domain_srl)
{
return new BaseObject(-1, 'msg_domain_not_found');
return $this->setError('msg_domain_not_found');
}
if ($domain_info->is_default_domain === 'Y')
{
return new BaseObject(-1, 'msg_cannot_delete_default_domain');
return $this->setError('msg_cannot_delete_default_domain');
}
// Delete the domain.
@ -1208,19 +1204,19 @@ class adminAdminController extends admin
{
if (!($conn = @ftp_connect($vars->ftp_host, $vars->ftp_port, 3)))
{
return new BaseObject(-1, 'msg_ftp_not_connected');
return $this->setError('msg_ftp_not_connected');
}
if (!@ftp_login($conn, $vars->ftp_user, $vars->ftp_pass))
{
return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
return $this->setError('msg_ftp_invalid_auth_info');
}
if (!@ftp_pasv($conn, $vars->ftp_pasv === 'Y'))
{
return new BaseObject(-1, 'msg_ftp_cannot_set_passive_mode');
return $this->setError('msg_ftp_cannot_set_passive_mode');
}
if (!@ftp_chdir($conn, $vars->ftp_path))
{
return new BaseObject(-1, 'msg_ftp_invalid_path');
return $this->setError('msg_ftp_invalid_path');
}
ftp_close($conn);
}
@ -1228,23 +1224,23 @@ class adminAdminController extends admin
{
if (!function_exists('ssh2_connect'))
{
return new BaseObject(-1, 'disable_sftp_support');
return $this->setError('disable_sftp_support');
}
if (!($conn = ssh2_connect($vars->ftp_host, $vars->ftp_port)))
{
return new BaseObject(-1, 'msg_ftp_not_connected');
return $this->setError('msg_ftp_not_connected');
}
if (!@ssh2_auth_password($conn, $vars->ftp_user, $vars->ftp_pass))
{
return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
return $this->setError('msg_ftp_invalid_auth_info');
}
if (!@($sftp = ssh2_sftp($conn)))
{
return new BaseObject(-1, 'msg_ftp_sftp_error');
return $this->setError('msg_ftp_sftp_error');
}
if (!@ssh2_sftp_stat($sftp, $vars->ftp_path . 'common/defaults/config.php'))
{
return new BaseObject(-1, 'msg_ftp_invalid_path');
return $this->setError('msg_ftp_invalid_path');
}
unset($sftp, $conn);
}
@ -1259,7 +1255,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::set('ftp.sftp', $vars->ftp_sftp === 'Y');
if (!Rhymix\Framework\Config::save())
{
return new BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_updated');
@ -1280,7 +1276,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::set('ftp.sftp', false);
if (!Rhymix\Framework\Config::save())
{
return new BaseObject(-1, 'msg_failed_to_save_config');
return $this->setError('msg_failed_to_save_config');
}
$this->setMessage('success_deleted');