쉬운설치 인증 체크에 직접 쓰기 체크 추가

This commit is contained in:
YJSoft 2015-10-12 15:13:37 +09:00 committed by YJSoft
parent 0326a8b5d1
commit 50fd6d33fe
2 changed files with 19 additions and 7 deletions

View file

@ -164,18 +164,28 @@ class autoinstallAdminModel extends autoinstall
*/ */
function getAutoinstallAdminIsAuthed() function getAutoinstallAdminIsAuthed()
{ {
$oAdminModel = getAdminModel('autoinstall');
$package = $oAdminModel->getInstallInfo(Context::get('package_srl'));
$is_authed = 0; $is_authed = 0;
$output = $oAdminModel->checkUseDirectModuleInstall($package);
$ftp_info = Context::getFTPInfo(); if($output->toBool()==TRUE)
if(!$ftp_info->ftp_root_path)
{ {
$is_authed = -1; $is_authed = 1;
} }
else 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); $this->add('is_authed', $is_authed);
} }

View file

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