fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1777 사이트 메뉴 관리/사이트 디자인 관리 쉬운설치 인증 체크에 직접 쓰기 체크 추가 by YJSoft

Browse source 
* pr/1777:
  쉬운설치 인증 체크에 직접 쓰기 체크 추가
This commit is contained in:
Kijin Sung 2015-10-14 14:41:49 +09:00
commit 092622e6c6
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/autoinstall/autoinstall.admin.model.php
View file

@ -164,18 +164,28 @@ class autoinstallAdminModel extends autoinstall
*/
function getAutoinstallAdminIsAuthed()
{
$oAdminModel = getAdminModel('autoinstall');
$package = $oAdminModel->getInstallInfo(Context::get('package_srl'));
$is_authed = 0;
$ftp_info = Context::getFTPInfo();
if(!$ftp_info->ftp_root_path)
$output = $oAdminModel->checkUseDirectModuleInstall($package);
if($output->toBool()==TRUE)
{
$is_authed = -1;
$is_authed = 1;
}
else
{
$is_authed = (int) isset($_SESSION['ftp_password']);
$ftp_info = Context::getFTPInfo();
if(!$ftp_info->ftp_root_path)
{
$is_authed = -1;
}
else
{
$is_authed = (int) isset($_SESSION['ftp_password']);
}
}
$this->add('is_authed', $is_authed);
}

4
modules/menu/tpl/sitemap.html
View file

@ -3797,7 +3797,9 @@ jQuery(function($){
function installPackage(sPackageSrl, sPackageType, $item){
//act=getAutoinstallAdminIsAuthed
$.exec_json("admin.getAutoinstallAdminIsAuthed", {}, function(htData){
var params = {};
params.package_srl = sPackageSrl;
$.exec_json("admin.getAutoinstallAdminIsAuthed", params, function(htData){
// FTP 비밀번호 뿐만 아니라 정보가 전혀 없을 경우?
switch(htData.is_authed){
case -1: