diff --git a/.gitattributes b/.gitattributes
index 1bc0150..4994844 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,10 +10,10 @@ copy_this/modules/d3/d3geoip/controllers/admin/d3_country_geoip.php -text
copy_this/modules/d3/d3geoip/menu.xml -text
copy_this/modules/d3/d3geoip/metadata.php -text
copy_this/modules/d3/d3geoip/models/d3geoip.php -text
-copy_this/modules/d3/d3geoip/models/d3geoip_update.php -text
copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_cur_geoip.php -text
copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_lang_geoip.php -text
copy_this/modules/d3/d3geoip/picture.png -text
+copy_this/modules/d3/d3geoip/setup/d3geoip_update.php -text
copy_this/modules/d3/d3geoip/views/admin/de/d3_geoip_lang.php -text
copy_this/modules/d3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl -text
copy_this/modules/d3/d3geoip/views/admin/tpl/d3_country_geoip.tpl -text
diff --git a/copy_this/modules/d3/d3geoip/controllers/admin/d3_country_geoip.php b/copy_this/modules/d3/d3geoip/controllers/admin/d3_country_geoip.php
index 5caa23f..1f00486 100644
--- a/copy_this/modules/d3/d3geoip/controllers/admin/d3_country_geoip.php
+++ b/copy_this/modules/d3/d3geoip/controllers/admin/d3_country_geoip.php
@@ -160,8 +160,6 @@ class d3_country_geoip extends oxAdminView
*/
public function getCurList()
{
- $aCurrencies = array();
-
if ($this->getModCfgValue('blChangeShop') && $this->oCountry->getFieldData('d3geoipshop')) {
$sShopId = $this->oCountry->getFieldData('d3geoipshop');
} else {
@@ -173,8 +171,20 @@ class d3_country_geoip extends oxAdminView
$sCurs = oxDb::getDb(oxDb::FETCH_MODE_ASSOC)->getOne($sQ);
- if ($sCurs) {
- foreach (unserialize($sCurs) as $sKey => $sValue) {
+ return $this->d3ExtractCurList($sCurs);
+ }
+
+ /**
+ * @param $sCurrencies
+ *
+ * @return array
+ */
+ public function d3ExtractCurList($sCurrencies)
+ {
+ $aCurrencies = array();
+
+ if ($sCurrencies) {
+ foreach (unserialize($sCurrencies) as $sKey => $sValue) {
$aFields = explode('@', $sValue);
$aCurrencies[$sKey]->id = $sKey;
$aCurrencies[$sKey]->name = $aFields[0];
diff --git a/copy_this/modules/d3/d3geoip/metadata.php b/copy_this/modules/d3/d3geoip/metadata.php
index e8faecf..05a5a3f 100644
--- a/copy_this/modules/d3/d3geoip/metadata.php
+++ b/copy_this/modules/d3/d3geoip/metadata.php
@@ -24,21 +24,26 @@ $aModule = array(
'oxcmp_lang' => 'd3/d3geoip/modules/components/d3_oxcmp_lang_geoip',
),
'files' => array(
- 'd3_cfg_geoipset' => 'd3/d3geoip/controllers/admin/d3_cfg_geoipset.php',
- 'd3_cfg_geoipset_list' => 'd3/d3geoip/controllers/admin/d3_cfg_geoipset_list.php',
- 'd3_cfg_geoipset_main' => 'd3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php',
+ 'd3_cfg_geoipset' => 'd3/d3geoip/controllers/admin/d3_cfg_geoipset.php',
+ 'd3_cfg_geoipset_list' => 'd3/d3geoip/controllers/admin/d3_cfg_geoipset_list.php',
+ 'd3_cfg_geoipset_main' => 'd3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php',
'd3_cfg_geoipset_licence' => 'd3/d3geoip/controllers/admin/d3_cfg_geoipset_licence.php',
- 'd3_country_geoip' => 'd3/d3geoip/controllers/admin/d3_country_geoip.php',
- 'd3geoip' => 'd3/d3geoip/models/d3geoip.php',
- 'd3geoip_update' => 'd3/d3geoip/models/d3geoip_update.php',
+ 'd3_country_geoip' => 'd3/d3geoip/controllers/admin/d3_country_geoip.php',
+ 'd3geoip' => 'd3/d3geoip/models/d3geoip.php',
+ 'd3geoip_update' => 'd3/d3geoip/setup/d3geoip_update.php',
),
'templates' => array(
- 'd3_cfg_geoipset_main.tpl' => 'd3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl',
- 'd3_country_geoip.tpl' => 'd3/d3geoip/views/admin/tpl/d3_country_geoip.tpl',
+ 'd3_cfg_geoipset_main.tpl' => 'd3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl',
+ 'd3_country_geoip.tpl' => 'd3/d3geoip/views/admin/tpl/d3_country_geoip.tpl',
),
'events' => array(
'onActivate' => 'd3install::checkUpdateStart',
),
'blocks' => array(
),
+ 'd3FileRegister' => array(
+ 'd3/d3geoip/IntelliSenseHelper.php',
+ 'd3/d3geoip/metadata.php',
+ 'd3/d3geoip/views/admin/de/d3_geoip_lang.php',
+ ),
);
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3geoip/models/d3geoip.php b/copy_this/modules/d3/d3geoip/models/d3geoip.php
index d71df8b..a5c8a89 100644
--- a/copy_this/modules/d3/d3geoip/models/d3geoip.php
+++ b/copy_this/modules/d3/d3geoip/models/d3geoip.php
@@ -100,8 +100,25 @@ class d3GeoIP extends oxbase
) {
$sIP = $this->_getModConfig()->getValue('sTestCountryIp');
} else {
- // ToDo: use $_SERVER['X-Forwared-For'] && Client-IP in case of proxy
- $sIP = $_SERVER['REMOTE_ADDR'];
+ if(isset($_SERVER['HTTP_CF_CONNECTING_IP'])) {
+ $sIP = $_SERVER['HTTP_CF_CONNECTING_IP'];
+ } else if (isset($_SERVER['HTTP_X_REAL_IP'])) {
+ $sIP = $_SERVER['HTTP_X_REAL_IP'];
+ } else if (isset($_SERVER['HTTP_CLIENT_IP'])) {
+ $sIP = $_SERVER['HTTP_CLIENT_IP'];
+ } else if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+ $sIP = $_SERVER['HTTP_X_FORWARDED_FOR'];
+ } else if(isset($_SERVER['HTTP_X_FORWARDED'])) {
+ $sIP = $_SERVER['HTTP_X_FORWARDED'];
+ } else if(isset($_SERVER['HTTP_FORWARDED_FOR'])) {
+ $sIP = $_SERVER['HTTP_FORWARDED_FOR'];
+ } else if(isset($_SERVER['HTTP_FORWARDED'])) {
+ $sIP = $_SERVER['HTTP_FORWARDED'];
+ } else if(isset($_SERVER['REMOTE_ADDR'])) {
+ $sIP = $_SERVER['REMOTE_ADDR'];
+ } else {
+ $sIP = 'UNKNOWN';
+ }
}
stopProfile(__METHOD__);
@@ -412,7 +429,7 @@ class d3GeoIP extends oxbase
$oShoplist->getList();
$aShopUrls = array();
- foreach (array_keys($oShoplist) as $sId) {
+ foreach ($oShoplist->arrayKeys() as $sId) {
$aShopUrls[$sId] = $this->getConfig()->getShopConfVar('sMallShopURL', $sId);
}
diff --git a/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_cur_geoip.php b/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_cur_geoip.php
index 18739c3..9cc7960 100644
--- a/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_cur_geoip.php
+++ b/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_cur_geoip.php
@@ -35,6 +35,6 @@ class d3_oxcmp_cur_geoip extends d3_oxcmp_cur_geoip_parent
$oLocation->setCountryCurrency();
}
- return parent::init();
+ parent::init();
}
}
diff --git a/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_lang_geoip.php b/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_lang_geoip.php
index 7a6e026..6bd21e6 100644
--- a/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_lang_geoip.php
+++ b/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_lang_geoip.php
@@ -29,6 +29,6 @@ class d3_oxcmp_lang_geoip extends d3_oxcmp_lang_geoip_parent
$oLocation->setCountryLanguage();
}
- return parent::init();
+ parent::init();
}
}
diff --git a/copy_this/modules/d3/d3geoip/models/d3geoip_update.php b/copy_this/modules/d3/d3geoip/setup/d3geoip_update.php
similarity index 68%
rename from copy_this/modules/d3/d3geoip/models/d3geoip_update.php
rename to copy_this/modules/d3/d3geoip/setup/d3geoip_update.php
index 7249015..f275063 100644
--- a/copy_this/modules/d3/d3geoip/models/d3geoip_update.php
+++ b/copy_this/modules/d3/d3geoip/setup/d3geoip_update.php
@@ -40,6 +40,8 @@ zQ9';
'do' => 'fixGeoIpFields'),
array('check' => 'checkIndizes',
'do' => 'fixIndizes'),
+ array('check' => 'hasUnregisteredFiles',
+ 'do' => 'showUnregisteredFiles'),
array('check' => 'checkModCfgSameRevision',
'do' => 'updateModCfgSameRevision'),
);
@@ -52,101 +54,101 @@ zQ9';
'sTableName' => 'oxcountry',
'sFieldName' => 'D3GEOIPSHOP',
'sType' => 'VARCHAR(10)',
- 'blNull' => FALSE,
+ 'blNull' => false,
'sDefault' => 'oxbaseshop',
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3GEOIPLANG' => array(
'sTableName' => 'oxcountry',
'sFieldName' => 'D3GEOIPLANG',
'sType' => 'TINYINT(2)',
- 'blNull' => FALSE,
+ 'blNull' => false,
'sDefault' => '-1',
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3GEOIPCUR' => array(
'sTableName' => 'oxcountry',
'sFieldName' => 'D3GEOIPCUR',
'sType' => 'TINYINT(2)',
- 'blNull' => FALSE,
+ 'blNull' => false,
'sDefault' => '-1',
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3GEOIPURL' => array(
'sTableName' => 'oxcountry',
'sFieldName' => 'D3GEOIPURL',
'sType' => 'VARCHAR(255)',
- 'blNull' => FALSE,
- 'sDefault' => FALSE,
+ 'blNull' => false,
+ 'sDefault' => false,
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3STARTIP' => array(
'sTableName' => 'd3geoip',
'sFieldName' => 'D3STARTIP',
'sType' => 'VARCHAR(39)',
- 'blNull' => FALSE,
- 'sDefault' => FALSE,
+ 'blNull' => false,
+ 'sDefault' => false,
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3ENDIP' => array(
'sTableName' => 'd3geoip',
'sFieldName' => 'D3ENDIP',
'sType' => 'VARCHAR(39)',
- 'blNull' => FALSE,
- 'sDefault' => FALSE,
+ 'blNull' => false,
+ 'sDefault' => false,
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3STARTIPNUM' => array(
'sTableName' => 'd3geoip',
'sFieldName' => 'D3STARTIPNUM',
'sType' => 'DECIMAL(38,0)',
- 'blNull' => FALSE,
- 'sDefault' => FALSE,
+ 'blNull' => false,
+ 'sDefault' => false,
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3ENDIPNUM' => array(
'sTableName' => 'd3geoip',
'sFieldName' => 'D3ENDIPNUM',
'sType' => 'DECIMAL(38,0)',
- 'blNull' => FALSE,
- 'sDefault' => FALSE,
+ 'blNull' => false,
+ 'sDefault' => false,
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3ISO' => array(
'sTableName' => 'd3geoip',
'sFieldName' => 'D3ISO',
'sType' => 'CHAR(2)',
- 'blNull' => FALSE,
- 'sDefault' => FALSE,
+ 'blNull' => false,
+ 'sDefault' => false,
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
'D3COUNTRYNAME' => array(
'sTableName' => 'd3geoip',
'sFieldName' => 'D3COUNTRYNAME',
'sType' => 'VARCHAR(50)',
- 'blNull' => FALSE,
- 'sDefault' => FALSE,
+ 'blNull' => false,
+ 'sDefault' => false,
'sComment' => '',
'sExtra' => '',
- 'blMultilang' => FALSE,
+ 'blMultilang' => false,
),
);
@@ -175,7 +177,7 @@ zQ9';
*/
public function checkGeoIpTableExist()
{
- return $this->_checkTableExist('d3geoip');
+ return $this->_checkTableNotExist('d3geoip');
}
/**
@@ -183,13 +185,9 @@ zQ9';
*/
public function updateGeoIpTableExist()
{
- $blRet = FALSE;
- if ($this->checkGeoIpTableExist())
- {
- $aRet = $this->_addTable('d3geoip', $this->aFields, $this->aIndizes, 'GeoIP', 'MyISAM');
- $blRet = $aRet['blRet'];
- $this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
- $this->_setUpdateBreak(TRUE);
+ $blRet = false;
+ if ($this->checkGeoIpTableExist()) {
+ $blRet = $this->_addTable2('d3geoip', $this->aFields, $this->aIndizes, 'GeoIP', 'MyISAM');
}
return $blRet;
@@ -223,9 +221,8 @@ zQ9';
*/
public function checkModCfgItemExist()
{
- $blRet = FALSE;
- foreach ($this->_getShopList() as $oShop)
- {
+ $blRet = false;
+ foreach ($this->getShopList() as $oShop) {
/** @var $oShop oxshop */
$aWhere = array(
'oxmodid' => $this->sModKey,
@@ -235,8 +232,7 @@ zQ9';
$blRet = $this->_checkTableItemNotExist('d3_cfg_mod', $aWhere);
- if ($blRet)
- {
+ if ($blRet) {
return $blRet;
}
}
@@ -249,12 +245,10 @@ zQ9';
*/
public function updateModCfgItemExist()
{
- $blRet = FALSE;
+ $blRet = false;
- if ($this->checkModCfgItemExist())
- {
- foreach ($this->_getShopList() as $oShop)
- {
+ if ($this->checkModCfgItemExist()) {
+ foreach ($this->getShopList() as $oShop) {
/** @var $oShop oxshop */
$aWhere = array(
'oxmodid' => $this->sModKey,
@@ -262,8 +256,7 @@ zQ9';
'oxnewrevision' => $this->sModRevision,
);
- if ($this->_checkTableItemNotExist('d3_cfg_mod', $aWhere))
- {
+ if ($this->_checkTableItemNotExist('d3_cfg_mod', $aWhere)) {
// update don't use this property
unset($aWhere['oxnewrevision']);
@@ -271,103 +264,98 @@ zQ9';
array (
'fieldname' => 'OXID',
'content' => "md5('" . $this->sModKey . " " . $oShop->getId() . " de')",
- 'force_update' => TRUE,
- 'use_quote' => FALSE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => false,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXSHOPID',
'content' => $oShop->getId(),
- 'force_update' => TRUE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXMODID',
'content' => $this->sModKey,
- 'force_update' => TRUE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXNAME',
'content' => $this->sModName,
- 'force_update' => TRUE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXACTIVE',
'content' => "0",
- 'force_update' => FALSE,
- 'use_quote' => FALSE,
- 'use_multilang' => FALSE,
+ 'force_update' => false,
+ 'use_quote' => false,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXBASECONFIG',
'content' => $this->sBaseConf,
- 'force_update' => TRUE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXSERIAL',
'content' => "",
- 'force_update' => FALSE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => false,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXINSTALLDATE',
'content' => "NOW()",
- 'force_update' => TRUE,
- 'use_quote' => FALSE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => false,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXVERSION',
'content' => $this->sModVersion,
- 'force_update' => TRUE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXSHOPVERSION',
'content' => oxRegistry::getConfig()->getEdition(),
- 'force_update' => TRUE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array (
'fieldname' => 'OXREQUIREMENTS',
'content' => $this->sRequirements,
- 'force_update' => TRUE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array(
'fieldname' => 'OXVALUE',
'content' => $this->sBaseValue,
- 'force_update' => FALSE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => false,
+ 'use_quote' => true,
+ 'use_multilang' => false,
),
array(
'fieldname' => 'OXNEWREVISION',
'content' => $this->sModRevision,
- 'force_update' => TRUE,
- 'use_quote' => TRUE,
- 'use_multilang' => FALSE,
+ 'force_update' => true,
+ 'use_quote' => true,
+ 'use_multilang' => false,
)
);
- $aRet = $this->_updateTableItem('d3_cfg_mod', $aInsertFields, $aWhere);
- $blRet = $aRet['blRet'];
+ $blRet = $this->_updateTableItem2('d3_cfg_mod', $aInsertFields, $aWhere);
- $this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
- $this->_setUpdateBreak(FALSE);
-
- if ($this->getStepByStepMode())
- {
+ if ($this->getStepByStepMode()) {
break;
}
}
@@ -383,7 +371,7 @@ zQ9';
public function checkGeoIpFields()
{
/** @var $oShop oxshop */
- $oShop = $this->_getShopList()->current();
+ $oShop = $this->getShopList()->current();
$this->aFields['D3GEOIPSHOP']['sDefault'] = $oShop->getId();
return $this->checkFields();
@@ -396,9 +384,25 @@ zQ9';
public function fixGeoIpFields()
{
/** @var $oShop oxshop */
- $oShop = $this->_getShopList()->current();
+ $oShop = $this->getShopList()->current();
$this->aFields['D3GEOIPSHOP']['sDefault'] = $oShop->getId();
return $this->fixFields();
}
-}
\ No newline at end of file
+
+ /**
+ * @return bool
+ */
+ public function hasUnregisteredFiles()
+ {
+ return $this->_hasUnregisteredFiles('d3geoip', array('d3FileRegister'));
+ }
+
+ /**
+ * @return bool
+ */
+ public function showUnregisteredFiles()
+ {
+ return $this->_showUnregisteredFiles('d3geoip', array('d3FileRegister'));
+ }
+}
diff --git a/copy_this/modules/d3/d3geoip/views/admin/de/d3_geoip_lang.php b/copy_this/modules/d3/d3geoip/views/admin/de/d3_geoip_lang.php
index 2548d9f..0420065 100644
--- a/copy_this/modules/d3/d3geoip/views/admin/de/d3_geoip_lang.php
+++ b/copy_this/modules/d3/d3geoip/views/admin/de/d3_geoip_lang.php
@@ -28,13 +28,16 @@ $aLang = array(
'D3_GEOIP_TRANSL' => 'GeoIP-Kundenumleitungen',
- 'D3_GEOIP_SET_DEBUG_DESC' => 'Mit aktiviertem Debug-Modus wird im Frontend die aktuelle IP-Adresse des Shopbesuchers gezeigt. Beachten Sie, dass Umleitungen, die auf Weiterleitungen basieren, dann nicht ausgeführt werden können.',
+ 'D3_GEOIP_SET_DEBUG_DESC' => 'Mit aktiviertem Debug-Modus wird im Frontend die aktuelle '.
+ 'IP-Adresse des Shopbesuchers gezeigt. Beachten Sie, dass Umleitungen, die auf Weiterleitungen basieren, dann '.
+ 'nicht ausgeführt werden können.',
'D3_GEOIP_SET_OPTIONS' => 'Optionen',
'D3_GEOIP_SET_OPTIONS_CHANGESHOP' => 'Mandant wechseln, wenn eingestellt (nur EE)',
'D3_GEOIP_SET_OPTIONS_CHANGECURR' => 'Währung wechseln, wenn eingestellt',
'D3_GEOIP_SET_OPTIONS_CHANGELANG' => 'Sprache wechseln, wenn eingestellt',
'D3_GEOIP_SET_OPTIONS_CHANGEURL' => 'URL wechseln, wenn eingestellt',
- 'D3_GEOIP_SET_OPTIONS_NOCOUNTRY' => 'Shop verwendet die Einstellung dieses Landes, wenn IP nicht zuzuordnen ist',
+ 'D3_GEOIP_SET_OPTIONS_NOCOUNTRY' => 'Shop verwendet die Einstellung dieses Landes, wenn IP nicht '.
+ 'zuzuordnen ist',
'D3_GEOIP_SET_IP' => 'IP-Einstellungen',
'D3_GEOIP_SET_IP_TESTIP' => 'statt Kunden-IP immer diese IP-Adresse verwenden',
'D3_GEOIP_SET_IP_TESTCOUNTRY' => 'statt Kunden-IP immer eine IP-Adresse dieses Landes verwenden',
@@ -52,14 +55,19 @@ $aLang = array(
'D3_GEOIP_OR' => 'oder',
'D3_GEOIP_DISABLED' => '(deaktiviert)',
'D3_GEOIP_SELURL' => 'zu wechselnde URL',
- 'D3_GEOIP_SELURL_DESC' => 'Sobald im URL-Feld eine Eingabe vorhanden ist, wird bei passenden Kunden versucht, zur hinterlegten URL zu wechseln. Möchten Sie den Mandanten, die Währung und / oder die Sprache einstellen, entfernen Sie die URL.
Aktivieren / deaktivieren Sie den URL-Wechsel zusätzlich in den Modul-Grundeinstellungen.',
+ 'D3_GEOIP_SELURL_DESC' => 'Sobald im URL-Feld eine Eingabe vorhanden ist, wird bei '.
+ 'passenden Kunden versucht, zur hinterlegten URL zu wechseln. Möchten Sie den Mandanten, die Währung und / '.
+ 'oder die Sprache einstellen, entfernen Sie die URL.
Aktivieren / deaktivieren Sie den URL-Wechsel '.
+ 'zusätzlich in den Modul-Grundeinstellungen.',
'D3_GEOIP_METADATA_TITLE' => 'D³ GeoIP Vorauswahl',
'D3_GEOIP_METADATA_DESC' => 'Begrüßen Sie Ihre Kunden in seiner Landessprache.',
- 'D3_GEOIP_UPDATE_ITEMINSTALL' => 'Die umfangreiche IP-Liste kann leider nicht über die automatische Installation eingebunden werden. Bitte installieren Sie diese manuell. '.PHP_EOL.PHP_EOL.'Die erforderlichen Daten finden Sie im Installationspaket des Moduls unter "setup+doku/geoip-Data_IPv4_*.sql" ("setup+doku/geoip-Data_IPv6_*.sql" für IPv6-Adressen) oder als handlichere SQL-Dateien unter "setup+doku/geoip_data_parts/". '.PHP_EOL.PHP_EOL.'Sie benötigen entweder die Komplettdateien oder die Sammlung kleinerer Daten. Führen Sie die SQL-Datei(en) bitte in Ihrer Datenbank aus.',
+ 'D3_GEOIP_UPDATE_ITEMINSTALL' => 'Die umfangreiche IP-Liste kann leider nicht über die '.
+ 'automatische Installation eingebunden werden. Bitte installieren Sie diese manuell. '.PHP_EOL.PHP_EOL.
+ 'Die erforderlichen Daten finden Sie im Installationspaket des Moduls unter '.
+ '"setup+doku/geoip-Data_IPv4_*.sql" ("setup+doku/geoip-Data_IPv6_*.sql" für IPv6-Adressen) oder als '.
+ 'handlichere SQL-Dateien unter "setup+doku/geoip_data_parts/". '.PHP_EOL.PHP_EOL.
+ 'Sie benötigen entweder die Komplettdateien oder die Sammlung kleinerer Daten. Führen Sie die SQL-Datei(en) '.
+ 'bitte in Ihrer Datenbank aus.',
);
-
-/*
-[{ oxmultilang ident='ACTIONS_MAIN_YOUWANTTODELETE' }]
-*/
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl b/copy_this/modules/d3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl
index 768569c..e0cf578 100644
--- a/copy_this/modules/d3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl
+++ b/copy_this/modules/d3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl
@@ -59,33 +59,6 @@ function showFormatSettings(sElemId, visible, blUseOldElem)