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

상수 정리

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,11 +104,16 @@ class adminAdminView extends admin
return; return;
} }
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$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/';
$oAutoinstallModel = getModel('autoinstall'); $oAutoinstallModel = getModel('autoinstall');
$params = array(); $params = array();
$params["act"] = "getResourceapiLastupdate"; $params["act"] = "getResourceapiLastupdate";
$body = XmlGenerater::generate($params); $body = XmlGenerater::generate($params);
$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml"); $buff = FileHandler::getRemoteResource($download_server, $body, 3, "POST", "application/xml");
$xml_lUpdate = new XmlParser(); $xml_lUpdate = new XmlParser();
$lUpdateDoc = $xml_lUpdate->parse($buff); $lUpdateDoc = $xml_lUpdate->parse($buff);
$updateDate = $lUpdateDoc->response->updatedate->body; $updateDate = $lUpdateDoc->response->updatedate->body;

28
modules/autoinstall/autoinstall.admin.controller.php
View file

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

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

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

8
modules/autoinstall/autoinstall.class.php
View file

@ -44,7 +44,13 @@ class XmlGenerater
'ssl_verify_peer' => FALSE, 'ssl_verify_peer' => FALSE,
'ssl_verify_host' => 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) if(!$buff)
{ {
return; return;

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

@ -345,9 +345,14 @@ 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;
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleConfig('autoinstall');
$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/';
$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name); $module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name);
$module->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $module->package_srl; $module->url = $location_site . '?mid=download&package_srl=' . $module->package_srl;
if($module_name == 'page') if($module_name == 'page')
{ {