상수 정리

This commit is contained in:
hanssem@forppl.com 2020-08-09 22:58:28 +09:00
parent 2e523370d7
commit 1f90c2e7c3
5 changed files with 73 additions and 26 deletions

View file

@ -18,10 +18,8 @@ class autoinstallAdminController extends autoinstall
{
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
define('_XE_LOCATION_SITE_', $location_site ? $location_site : 'https://xe1.xpressengine.com/');
define('_XE_DOWNLOAD_SERVER_', $download_server ? $download_server : 'https://download.xpressengine.com/');
$location_site = $module_info->location_site ? $module_info->location_site : 'https://xe1.xpressengine.com/';
$download_server = $module_info->download_server ? $module_info->download_server : 'https://download.xpressengine.com/';
}
/**
@ -80,7 +78,13 @@ class autoinstallAdminController extends autoinstall
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
$buff = FileHandler::getRemoteResource($download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$xml = new XmlParser();
$xmlDoc = $xml->parse($buff);
$this->updateCategory($xmlDoc);
@ -229,7 +233,12 @@ class autoinstallAdminController extends autoinstall
$oModuleInstaller = new FTPModuleInstaller($package);
}
$oModuleInstaller->setServerUrl(_XE_DOWNLOAD_SERVER_);
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
$oModuleInstaller->setServerUrl($download_server);
$oModuleInstaller->setPassword($ftp_password);
$output = $oModuleInstaller->install();
if(!$output->toBool())
@ -402,7 +411,12 @@ class autoinstallAdminController extends autoinstall
$oModuleInstaller = new FTPModuleInstaller($package);
}
$oModuleInstaller->setServerUrl(_XE_DOWNLOAD_SERVER_);
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
$oModuleInstaller->setServerUrl($download_server);
$oModuleInstaller->setPassword($ftp_password);
$output = $oModuleInstaller->uninstall();

View file

@ -29,14 +29,12 @@ class autoinstallAdminView extends autoinstall
{
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
define('_XE_LOCATION_SITE_', $location_site ? $location_site : 'https://xe1.xpressengine.com/');
define('_XE_DOWNLOAD_SERVER_', $download_server ? $download_server : 'https://download.xpressengine.com/');
$location_site = $module_info->location_site ? $module_info->location_site : 'https://xe1.xpressengine.com/';
$download_server = $module_info->download_server ? $module_info->download_server : 'https://download.xpressengine.com/';
$template_path = sprintf("%stpl/", $this->module_path);
Context::set('original_site', _XE_LOCATION_SITE_);
Context::set('uri', _XE_DOWNLOAD_SERVER_);
Context::set('original_site', $location_site);
Context::set('uri', $download_server);
$this->setTemplatePath($template_path);
$ftp_info = Context::getFTPInfo();
@ -199,12 +197,17 @@ class autoinstallAdminView extends autoinstall
$depto = array();
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
foreach($items as $item)
{
$v = $this->rearrange($item, $targets);
$v->item_screenshot_url = str_replace('./', _XE_DOWNLOAD_SERVER_, $v->item_screenshot_url);
$v->item_screenshot_url = str_replace('./', $download_server, $v->item_screenshot_url);
$v->category = $this->categories[$v->category_srl]->title;
$v->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $v->package_srl;
$v->url = $location_site . '?mid=download&package_srl=' . $v->package_srl;
if($packages[$v->package_srl])
{
@ -233,11 +236,7 @@ class autoinstallAdminView extends autoinstall
if($v->type == "core")
{
// if default, hide core
if(strpos(_XE_DOWNLOAD_SERVER_, 'xpressengine.com')!==false)
{
continue;
}
continue;
}
else if($v->type == "module")
{
@ -335,7 +334,13 @@ class autoinstallAdminView extends autoinstall
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
$buff = FileHandler::getRemoteResource($download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$xml_lUpdate = new XmlParser();
$xmlDoc = $xml_lUpdate->parse($buff);
if($xmlDoc && $xmlDoc->response->packagelist->item)
@ -428,7 +433,13 @@ class autoinstallAdminView extends autoinstall
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
$buff = FileHandler::getRemoteResource($download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$xml_lUpdate = new XmlParser();
$lUpdateDoc = $xml_lUpdate->parse($buff);
$updateDate = $lUpdateDoc->response->updatedate->body;
@ -579,7 +590,13 @@ class autoinstallAdminView extends autoinstall
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
$buff = FileHandler::getRemoteResource($download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$xml_lUpdate = new XmlParser();
$xmlDoc = $xml_lUpdate->parse($buff);
if($xmlDoc && $xmlDoc->response->packagelist->item)

View file

@ -44,7 +44,13 @@ class XmlGenerater
'ssl_verify_peer' => FALSE,
'ssl_verify_host' => FALSE
);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$location_site = $module_info->location_site;
$download_server = $module_info->download_server;
$buff = FileHandler::getRemoteResource($download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config);
if(!$buff)
{
return;