Componentklassse umbenennen

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

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;

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)) {

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;
                 }

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,