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

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

@ -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 BaseObject(-1, 'msg_ftp_invalid_auth_info');
return $this->setError('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 BaseObject(-1, sprintf(lang('msg_ftp_not_connected'), 'host'));
return $this->setError('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 BaseObject(-1, 'msg_ftp_invalid_auth_info');
return $this->setError('msg_ftp_invalid_auth_info');
}
// create temp file
@ -199,7 +199,7 @@ class adminAdminModel extends admin
{
if(!function_exists('ssh2_sftp'))
{
return new BaseObject(-1, 'disable_sftp_support');
return $this->setError('disable_sftp_support');
}
return $this->getSFTPPath();
}
@ -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 BaseObject(-1, 'msg_ftp_invalid_auth_info');
return $this->setError('msg_ftp_invalid_auth_info');
}
$sftp = ssh2_sftp($connection);
@ -294,7 +294,7 @@ class adminAdminModel extends admin
$dh = @opendir($curpwd);
if(!$dh)
{
return new BaseObject(-1, 'msg_ftp_invalid_path');
return $this->setError('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 BaseObject(-1, 'msg_ftp_invalid_auth_info');
return $this->setError('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 BaseObject(-1, 'disable_sftp_support');
return $this->setError('disable_sftp_support');
}
return $this->getSFTPList();
}
@ -359,7 +359,7 @@ class adminAdminModel extends admin
}
else
{
return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
return $this->setError('msg_ftp_invalid_auth_info');
}
}
$list = array();
@ -380,7 +380,7 @@ class adminAdminModel extends admin
}
else
{
return new BaseObject(-1, 'msg_ftp_no_directory');
return $this->setError('msg_ftp_no_directory');
}
$this->add('list', $list);
}