From 9cf4582de6c04c5d02a68e2f922db0101343e10d Mon Sep 17 00:00:00 2001
From: gaertnermarkus <mg@shopmodule.com>
Date: Fri, 17 Apr 2020 13:53:46 +0200
Subject: [PATCH] Componentklassse umbenennen

---
 .../Component/{d3cmp_geoip.php => GeoIpComponent.php}     | 2 +-
 .../{ => Application}/Component/d3_oxcmp_lang_geoip.php   | 2 +-
 .../{Controller => Core}/d3_oxshopcontrol_geoip.php       | 5 +++--
 copy_this/modules/d3/geoip/Setup/d3geoip_update.php       | 6 +++---
 copy_this/modules/d3/geoip/metadata.php                   | 8 ++++----
 5 files changed, 12 insertions(+), 11 deletions(-)
 rename copy_this/modules/d3/geoip/Application/Component/{d3cmp_geoip.php => GeoIpComponent.php} (98%)
 rename copy_this/modules/d3/geoip/Modules/{ => Application}/Component/d3_oxcmp_lang_geoip.php (94%)
 rename copy_this/modules/d3/geoip/Modules/{Controller => Core}/d3_oxshopcontrol_geoip.php (91%)

diff --git a/copy_this/modules/d3/geoip/Application/Component/d3cmp_geoip.php b/copy_this/modules/d3/geoip/Application/Component/GeoIpComponent.php
similarity index 98%
rename from copy_this/modules/d3/geoip/Application/Component/d3cmp_geoip.php
rename to copy_this/modules/d3/geoip/Application/Component/GeoIpComponent.php
index da5aeac..1bf8042 100644
--- a/copy_this/modules/d3/geoip/Application/Component/d3cmp_geoip.php
+++ b/copy_this/modules/d3/geoip/Application/Component/GeoIpComponent.php
@@ -27,7 +27,7 @@ use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
 use OxidEsales\Eshop\Core\Exception\StandardException;
 use OxidEsales\Eshop\Core\Registry;
 
-class d3cmp_geoip extends BaseController
+class GeoIpComponent extends BaseController
 {
     /**
      * Marking object as component
diff --git a/copy_this/modules/d3/geoip/Modules/Component/d3_oxcmp_lang_geoip.php b/copy_this/modules/d3/geoip/Modules/Application/Component/d3_oxcmp_lang_geoip.php
similarity index 94%
rename from copy_this/modules/d3/geoip/Modules/Component/d3_oxcmp_lang_geoip.php
rename to copy_this/modules/d3/geoip/Modules/Application/Component/d3_oxcmp_lang_geoip.php
index ce3c351..fc8baf0 100644
--- a/copy_this/modules/d3/geoip/Modules/Component/d3_oxcmp_lang_geoip.php
+++ b/copy_this/modules/d3/geoip/Modules/Application/Component/d3_oxcmp_lang_geoip.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace D3\GeoIp\Modules\Component;
+namespace D3\GeoIp\Modules\Application\Component;
 
 use D3\GeoIp\Application\Model\d3geoip;
 use D3\ModCfg\Application\Model\Configuration\d3_cfg_mod;
diff --git a/copy_this/modules/d3/geoip/Modules/Controller/d3_oxshopcontrol_geoip.php b/copy_this/modules/d3/geoip/Modules/Core/d3_oxshopcontrol_geoip.php
similarity index 91%
rename from copy_this/modules/d3/geoip/Modules/Controller/d3_oxshopcontrol_geoip.php
rename to copy_this/modules/d3/geoip/Modules/Core/d3_oxshopcontrol_geoip.php
index d2f71f8..248b73f 100644
--- a/copy_this/modules/d3/geoip/Modules/Controller/d3_oxshopcontrol_geoip.php
+++ b/copy_this/modules/d3/geoip/Modules/Core/d3_oxshopcontrol_geoip.php
@@ -14,7 +14,7 @@
  * @link      http://www.oxidmodule.com
  */
 
-namespace D3\GeoIp\Modules\Controller;
+namespace D3\GeoIp\Modules\Core;
 
 use OxidEsales\Eshop\Core\Registry;
 
@@ -41,7 +41,8 @@ class d3_oxshopcontrol_geoip extends d3_oxshopcontrol_geoip_parent
         startProfile(__METHOD__);
 
         $aUserComponentNames = Registry::getConfig()->getConfigParam('aUserComponentNames');
-        $sGeoIpCmpName = 'd3cmp_geoip';
+        $sGeoIpCmpName = 'GeoIpComponent';
+        $sGeoIpCmpName = \D3\GeoIp\Application\Component\GeoIpComponent::class;
         $blDontUseCache = 1;
 
         if (false == is_array($aUserComponentNames)) {
diff --git a/copy_this/modules/d3/geoip/Setup/d3geoip_update.php b/copy_this/modules/d3/geoip/Setup/d3geoip_update.php
index 6edbe16..1916c56 100644
--- a/copy_this/modules/d3/geoip/Setup/d3geoip_update.php
+++ b/copy_this/modules/d3/geoip/Setup/d3geoip_update.php
@@ -536,7 +536,7 @@ UUrZ3pOeW9TUmo3MDg4dGx0RkRUK0wzb2k=';
             $aUserComponents = $this->_d3GetUserComponentsFromDb($oShop);
 
             if (is_array($aUserComponents)
-                && in_array('d3cmp_geoip', array_keys($aUserComponents))
+                && in_array('GeoIpComponent', array_keys($aUserComponents))
             ) {
                 return true;
             }
@@ -559,9 +559,9 @@ UUrZ3pOeW9TUmo3MDg4dGx0RkRUK0wzb2k=';
             $aUserComponents = $this->_d3GetUserComponentsFromDb($oShop);
 
             if (is_array($aUserComponents)
-                && in_array('d3cmp_geoip', array_keys($aUserComponents))
+                && in_array('GeoIpComponent', array_keys($aUserComponents))
             ) {
-                unset($aUserComponents['d3cmp_geoip']);
+                unset($aUserComponents['GeoIpComponent']);
                 if (false == count($aUserComponents)) {
                     $aUserComponents = null;
                 }
diff --git a/copy_this/modules/d3/geoip/metadata.php b/copy_this/modules/d3/geoip/metadata.php
index fd62875..0d0dc20 100644
--- a/copy_this/modules/d3/geoip/metadata.php
+++ b/copy_this/modules/d3/geoip/metadata.php
@@ -4,15 +4,15 @@
  */
 $sMetadataVersion = '2.0';
 
-use D3\GeoIp\Application\Component\d3cmp_geoip;
+use D3\GeoIp\Application\Component\GeoIpComponent;
 use D3\GeoIp\Application\Controller\Admin\d3_cfg_geoipset;
 use D3\GeoIp\Application\Controller\Admin\d3_cfg_geoipset_licence;
 use D3\GeoIp\Application\Controller\Admin\d3_cfg_geoipset_list;
 use D3\GeoIp\Application\Controller\Admin\d3_cfg_geoipset_main;
 use D3\GeoIp\Application\Controller\Admin\d3_country_geoip;
 use D3\GeoIp\Application\Model\d3geoip;
-use D3\GeoIp\Modules\Component\d3_oxcmp_lang_geoip;
-use D3\GeoIp\Modules\Controller\d3_oxshopcontrol_geoip;
+use D3\GeoIp\Modules\Application\Component\d3_oxcmp_lang_geoip;
+use D3\GeoIp\Modules\Core\d3_oxshopcontrol_geoip;
 use D3\GeoIp\Setup as ModuleSetup;
 use D3\GeoIp\Setup\d3geoip_update;
 use OxidEsales\Eshop\Application\Component\LanguageComponent;
@@ -40,7 +40,7 @@ $aModule = array(
         ShopControl::class => d3_oxshopcontrol_geoip::class
     ),
     'controllers'       => array(
-        'd3cmp_geoip'               => d3cmp_geoip::class,
+        'GeoIpComponent'            => GeoIpComponent::class,
         'd3_cfg_geoipset'           => d3_cfg_geoipset::class,
         'd3_cfg_geoipset_list'      => d3_cfg_geoipset_list::class,
         'd3_cfg_geoipset_main'      => d3_cfg_geoipset_main::class,