D3Public
/
GeoIP
8
0
Vork 0
Code Pull-aanvragen Publicaties Activiteit

Componentklassse umbenennen

This commit is contained in:
Markus Gärtner 2020-04-17 13:53:46 +02:00
bovenliggende bbe2c3821d
commit 9cf4582de6
5 gewijzigde bestanden met toevoegingen van 12 en 11 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

2
copy_this/modules/d3/geoip/Application/Component/d3cmp_geoip.php → copy_this/modules/d3/geoip/Application/Component/GeoIpComponent.php
Bestand weergeven

@ -27,7 +27,7 @@ use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
use OxidEsales\Eshop\Core\Exception\StandardException; use OxidEsales\Eshop\Core\Exception\StandardException;
use OxidEsales\Eshop\Core\Registry; use OxidEsales\Eshop\Core\Registry;
class d3cmp_geoip extends BaseController class GeoIpComponent extends BaseController
{ {
/** /**
* Marking object as component * Marking object as component

2
copy_this/modules/d3/geoip/Modules/Component/d3_oxcmp_lang_geoip.php → copy_this/modules/d3/geoip/Modules/Application/Component/d3_oxcmp_lang_geoip.php
Bestand weergeven

@ -1,6 +1,6 @@
<?php <?php
namespace D3\GeoIp\Modules\Component; namespace D3\GeoIp\Modules\Application\Component;
use D3\GeoIp\Application\Model\d3geoip; use D3\GeoIp\Application\Model\d3geoip;
use D3\ModCfg\Application\Model\Configuration\d3_cfg_mod; use D3\ModCfg\Application\Model\Configuration\d3_cfg_mod;

5
copy_this/modules/d3/geoip/Modules/Controller/d3_oxshopcontrol_geoip.php → copy_this/modules/d3/geoip/Modules/Core/d3_oxshopcontrol_geoip.php
Bestand weergeven

@ -14,7 +14,7 @@
* @link http://www.oxidmodule.com * @link http://www.oxidmodule.com
*/ */
namespace D3\GeoIp\Modules\Controller; namespace D3\GeoIp\Modules\Core;
use OxidEsales\Eshop\Core\Registry; use OxidEsales\Eshop\Core\Registry;
@ -41,7 +41,8 @@ class d3_oxshopcontrol_geoip extends d3_oxshopcontrol_geoip_parent
startProfile(__METHOD__); startProfile(__METHOD__);
$aUserComponentNames = Registry::getConfig()->getConfigParam('aUserComponentNames'); $aUserComponentNames = Registry::getConfig()->getConfigParam('aUserComponentNames');
$sGeoIpCmpName = 'd3cmp_geoip'; $sGeoIpCmpName = 'GeoIpComponent';
$sGeoIpCmpName = \D3\GeoIp\Application\Component\GeoIpComponent::class;
$blDontUseCache = 1; $blDontUseCache = 1;
if (false == is_array($aUserComponentNames)) { if (false == is_array($aUserComponentNames)) {

6
copy_this/modules/d3/geoip/Setup/d3geoip_update.php
Bestand weergeven

@ -536,7 +536,7 @@ UUrZ3pOeW9TUmo3MDg4dGx0RkRUK0wzb2k=';
$aUserComponents = $this->_d3GetUserComponentsFromDb($oShop); $aUserComponents = $this->_d3GetUserComponentsFromDb($oShop);
if (is_array($aUserComponents) if (is_array($aUserComponents)
&& in_array('d3cmp_geoip', array_keys($aUserComponents)) && in_array('GeoIpComponent', array_keys($aUserComponents))
) { ) {
return true; return true;
} }
@ -559,9 +559,9 @@ UUrZ3pOeW9TUmo3MDg4dGx0RkRUK0wzb2k=';
$aUserComponents = $this->_d3GetUserComponentsFromDb($oShop); $aUserComponents = $this->_d3GetUserComponentsFromDb($oShop);
if (is_array($aUserComponents) 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)) { if (false == count($aUserComponents)) {
$aUserComponents = null; $aUserComponents = null;
} }

8
copy_this/modules/d3/geoip/metadata.php
Bestand weergeven

@ -4,15 +4,15 @@
*/ */
$sMetadataVersion = '2.0'; $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;
use D3\GeoIp\Application\Controller\Admin\d3_cfg_geoipset_licence; 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_list;
use D3\GeoIp\Application\Controller\Admin\d3_cfg_geoipset_main; use D3\GeoIp\Application\Controller\Admin\d3_cfg_geoipset_main;
use D3\GeoIp\Application\Controller\Admin\d3_country_geoip; use D3\GeoIp\Application\Controller\Admin\d3_country_geoip;
use D3\GeoIp\Application\Model\d3geoip; use D3\GeoIp\Application\Model\d3geoip;
use D3\GeoIp\Modules\Component\d3_oxcmp_lang_geoip; use D3\GeoIp\Modules\Application\Component\d3_oxcmp_lang_geoip;
use D3\GeoIp\Modules\Controller\d3_oxshopcontrol_geoip; use D3\GeoIp\Modules\Core\d3_oxshopcontrol_geoip;
use D3\GeoIp\Setup as ModuleSetup; use D3\GeoIp\Setup as ModuleSetup;
use D3\GeoIp\Setup\d3geoip_update; use D3\GeoIp\Setup\d3geoip_update;
use OxidEsales\Eshop\Application\Component\LanguageComponent; use OxidEsales\Eshop\Application\Component\LanguageComponent;
@ -40,7 +40,7 @@ $aModule = array(
ShopControl::class => d3_oxshopcontrol_geoip::class ShopControl::class => d3_oxshopcontrol_geoip::class
), ),
'controllers' => array( 'controllers' => array(
'd3cmp_geoip' => d3cmp_geoip::class, 'GeoIpComponent' => GeoIpComponent::class,
'd3_cfg_geoipset' => d3_cfg_geoipset::class, 'd3_cfg_geoipset' => d3_cfg_geoipset::class,
'd3_cfg_geoipset_list' => d3_cfg_geoipset_list::class, 'd3_cfg_geoipset_list' => d3_cfg_geoipset_list::class,
'd3_cfg_geoipset_main' => d3_cfg_geoipset_main::class, 'd3_cfg_geoipset_main' => d3_cfg_geoipset_main::class,