From 2ff0cea9c3c20e4c05d37f36d32a2b04207feb40 Mon Sep 17 00:00:00 2001 From: "hanssem@forppl.com" Date: Mon, 10 Aug 2020 01:21:28 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=ED=94=BD=EC=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/admin.admin.view.php | 4 ++-- .../autoinstall.admin.controller.php | 12 +++++------ .../autoinstall/autoinstall.admin.view.php | 20 +++++++++---------- modules/menu/menu.admin.model.php | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index e239c82f3..c634775eb 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -104,8 +104,8 @@ class adminAdminView extends admin return; } - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $oAutoinstallModel = getModel('autoinstall'); $params = array(); diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php index eb6b2d7cf..a3b18c982 100644 --- a/modules/autoinstall/autoinstall.admin.controller.php +++ b/modules/autoinstall/autoinstall.admin.controller.php @@ -75,8 +75,8 @@ class autoinstallAdminController extends autoinstall 'ssl_verify_host' => FALSE ); - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $buff = FileHandler::getRemoteResource($config->download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config); $xml = new XmlParser(); @@ -227,8 +227,8 @@ class autoinstallAdminController extends autoinstall $oModuleInstaller = new FTPModuleInstaller($package); } - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $oModuleInstaller->setServerUrl($config->download_server); $oModuleInstaller->setPassword($ftp_password); @@ -403,8 +403,8 @@ class autoinstallAdminController extends autoinstall $oModuleInstaller = new FTPModuleInstaller($package); } - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $oModuleInstaller->setServerUrl($config->download_server); diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php index 55ab7d48a..ba3c329eb 100644 --- a/modules/autoinstall/autoinstall.admin.view.php +++ b/modules/autoinstall/autoinstall.admin.view.php @@ -27,8 +27,8 @@ class autoinstallAdminView extends autoinstall */ function init() { - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $template_path = sprintf("%stpl/", $this->module_path); Context::set('original_site', $config->location_site); @@ -195,8 +195,8 @@ class autoinstallAdminView extends autoinstall $depto = array(); - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); foreach($items as $item) { @@ -331,8 +331,8 @@ class autoinstallAdminView extends autoinstall 'ssl_verify_host' => FALSE ); - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $buff = FileHandler::getRemoteResource($config->download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config); $xml_lUpdate = new XmlParser(); @@ -428,8 +428,8 @@ class autoinstallAdminView extends autoinstall 'ssl_verify_host' => FALSE ); - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $buff = FileHandler::getRemoteResource($config->download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config); $xml_lUpdate = new XmlParser(); @@ -583,8 +583,8 @@ class autoinstallAdminView extends autoinstall 'ssl_verify_host' => FALSE ); - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $buff = FileHandler::getRemoteResource($config->download_server, $body, 3, "POST", "application/xml", array(), array(), array(), $request_config); $xml_lUpdate = new XmlParser(); diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 0f4b2c8b7..3f94c82fa 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -346,8 +346,8 @@ class menuAdminModel extends menu $module->defaultMobileSkin->skin = $defaultMobileSkin; $module->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin; - $oModel = getAdminModel('autoinstall'); - $config = $oModel->getAutoInstallAdminModuleConfig(); + $oAdminModel = getAdminModel('autoinstall'); + $config = $oAdminModel->getAutoInstallAdminModuleConfig(); $module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name); $module->url = $config->location_site . '?mid=download&package_srl=' . $module->package_srl;