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

Merge pull request #338 from conory/pr/add_function

Browse source 
lang() 함수 추가
This commit is contained in:
CONORY 2016-03-06 17:09:30 +09:00
commit cf26f20461
84 changed files with 285 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -909,7 +909,7 @@ class adminAdminController extends admin
else
{
$name = $tmpFileName = '';
Context::set('msg', Context::getLang('msg_invalid_format'));
Context::set('msg', lang('msg_invalid_format'));
}
Context::set('name', $name);
@ -936,7 +936,7 @@ class adminAdminController extends admin
if ($iconname == 'favicon.ico')
{
if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) {
Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
Context::set('msg', '*.ico '.lang('msg_possible_only_file'));
return;
}
}
@ -944,18 +944,18 @@ class adminAdminController extends admin
{
if (!preg_match('/^.*(png).*$/',$type))
{
Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
Context::set('msg', '*.png '.lang('msg_possible_only_file'));
return;
}
if (!(($height == '57' && $width == '57') || ($height == '114' && $width == '114')))
{
Context::set('msg', Context::getLang('msg_invalid_format').' (size : 57x57, 114x114)');
Context::set('msg', lang('msg_invalid_format').' (size : 57x57, 114x114)');
return;
}
}
else
{
Context::set('msg', Context::getLang('msg_invalid_format'));
Context::set('msg', lang('msg_invalid_format'));
return;
}

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

@ -112,7 +112,7 @@ class adminAdminModel extends admin
$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
if(!$connection)
{
return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
}
$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
@ -216,7 +216,7 @@ class adminAdminModel extends admin
$oFTP = new ftp();
if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
{
return new Object(1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
return new Object(1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host));
}
if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))