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

리뷰 수정

Browse source
This commit is contained in:
hanssem@forppl.com 2020-08-20 15:29:05 +09:00
parent 6454145397
commit b630e1cea8
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,8 +104,8 @@ class adminAdminView extends admin
return; return;
} }
$oAdminModel = getAdminModel('autoinstall'); $oAutoinstallAdminModel = getAdminModel('autoinstall');
$config = $oAdminModel->getAutoInstallAdminModuleConfig(); $config = $oAutoinstallAdminModel->getAutoInstallAdminModuleConfig();
$oAutoinstallModel = getModel('autoinstall'); $oAutoinstallModel = getModel('autoinstall');
$params = array(); $params = array();

2
modules/autoinstall/autoinstall.admin.view.php
View file

@ -211,7 +211,7 @@ class autoinstallAdminView extends autoinstall
$v->current_version = $packages[$v->package_srl]->current_version; $v->current_version = $packages[$v->package_srl]->current_version;
// if version is up // if version is up
// insert Y // insert Y
if($v->current_version < $v->item_version) if(version_compare($v->item_version, $v->current_version, '>'))
{ {
$v->need_update = 'Y'; $v->need_update = 'Y';
} }

6
modules/autoinstall/lang/en.php
View file

@ -54,7 +54,7 @@ $lang->typename['skin'] = 'Skin';
$lang->typename['widgetstyle'] = 'Widget style'; $lang->typename['widgetstyle'] = 'Widget style';
$lang->typename['style'] = 'Document style'; $lang->typename['style'] = 'Document style';
$lang->location_site = 'Location Site'; $lang->location_site = 'Download Homepage';
$lang->about_location_site = 'Please type your location site. ex)https://xe1.xpressengine.com/'; $lang->about_location_site = 'Please type your download homepage. ex)https://xe1.xpressengine.com/';
$lang->download_server = 'Download Server'; $lang->download_server = 'Download Server';
$lang->about_download_server = 'Please type your download server. ex)https://download.xpressengine.com/'; $lang->about_download_server = 'Please type your download server. ex)https://download.xpressengine.com/';

7
modules/autoinstall/lang/ko.php
View file

@ -56,7 +56,8 @@ $lang->typename['skin'] = '스킨';
$lang->typename['widgetstyle'] = '위젯스타일'; $lang->typename['widgetstyle'] = '위젯스타일';
$lang->typename['style'] = '문서스타일'; $lang->typename['style'] = '문서스타일';
$lang->location_site = '로케이션 사이트'; $lang->location_site = '다운로드 홈페이지';
$lang->about_location_site = '로케이션 사이트를 입력해 주세요. 예)https://xe1.xpressengine.com/'; $lang->about_location_site = '다운로드 홈페이지를 입력해 주세요. 예)https://xe1.xpressengine.com/';
$lang->download_server = '다운로드 서버'; $lang->download_server = '다운로드 서버';
$lang->about_download_server = '다운로드 서버를 입력해 주세요. 예)https://download.xpressengine.com/'; $lang->about_download_server = '다운로드 서버를 입력해 주세요. 예)https://download.xpressengine.com/';

7
modules/menu/menu.admin.model.php
View file

@ -326,6 +326,9 @@ class menuAdminModel extends menu
Context::loadLang('modules/page/lang'); Context::loadLang('modules/page/lang');
$oAutoinstallAdminModel = getAdminModel('autoinstall');
$config = $oAutoinstallAdminModel->getAutoInstallAdminModuleConfig();
foreach($_allModules as $module_name) foreach($_allModules as $module_name)
{ {
$module = $oModuleModel->getModuleInfoXml($module_name); $module = $oModuleModel->getModuleInfoXml($module_name);
@ -345,10 +348,6 @@ class menuAdminModel extends menu
$module->defaultMobileSkin = new stdClass(); $module->defaultMobileSkin = new stdClass();
$module->defaultMobileSkin->skin = $defaultMobileSkin; $module->defaultMobileSkin->skin = $defaultMobileSkin;
$module->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin; $module->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin;
$oAdminModel = getAdminModel('autoinstall');
$config = $oAdminModel->getAutoInstallAdminModuleConfig();
$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name); $module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name);
$module->url = $config->location_site . '?mid=download&package_srl=' . $module->package_srl; $module->url = $config->location_site . '?mid=download&package_srl=' . $module->package_srl;