D3Public/GeoIP
8
0
Fork 0
Code Pull Requests Releases Activity

language and / or currency is selectable, if shop isn't selectable

Browse Source
This commit is contained in:
Daniel Seifert 2013-04-22 09:28:59 +00:00
parent 582c3c4c25
commit 64e276125f
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
copy_this/admin/d3_country_geoip.php
View File

@ -134,7 +134,17 @@ class d3_country_geoip extends oxAdminView
{ {
$aCurrencies = array(); $aCurrencies = array();
$sQ = "select DECODE( oxvarvalue, '".$this->getConfig()->getConfigParam( 'sConfigKey' )."') as oxvarvalue from oxconfig where oxshopid = '".$this->oCountry->getFieldData('d3geoipshop')."' AND oxvarname = 'aCurrencies'"; if ($this->getModCfgValue('blChangeShop') && $this->oCountry->getFieldData('d3geoipshop'))
{
$sShopId = $this->oCountry->getFieldData('d3geoipshop');
}
else
{
$sShopId = $this->getConfig()->getActiveView()->getViewConfig()->getActiveShopId();
}
$sQ = "select DECODE( oxvarvalue, '".$this->getConfig()->getConfigParam( 'sConfigKey' )."') as oxvarvalue from oxconfig where oxshopid = '".$sShopId."' AND oxvarname = 'aCurrencies'";
$sCurs = oxDb::getDb(2)->getOne($sQ); $sCurs = oxDb::getDb(2)->getOne($sQ);
foreach (unserialize($sCurs) as $sKey => $sValue) foreach (unserialize($sCurs) as $sKey => $sValue)
{ {
@ -149,10 +159,18 @@ class d3_country_geoip extends oxAdminView
public function getLangList() public function getLangList()
{ {
if ($this->getModCfgValue('blChangeShop') && $this->oCountry->getFieldData('d3geoipshop'))
{
$sShopId = $this->oCountry->getFieldData('d3geoipshop');
}
else
{
$sShopId = $this->getConfig()->getActiveView()->getViewConfig()->getActiveShopId();
}
$aLanguages = array(); $aLanguages = array();
$aLangParams = $this->getConfig()->getShopConfVar('aLanguageParams', $this->oCountry->getFieldData('d3geoipshop')); $aLangParams = $this->getConfig()->getShopConfVar('aLanguageParams', $sShopId);
$aConfLanguages = $this->getConfig()->getShopConfVar('aLanguages', $this->oCountry->getFieldData('d3geoipshop')); $aConfLanguages = $this->getConfig()->getShopConfVar('aLanguages', $sShopId);
if ( is_array( $aConfLanguages ) ) { if ( is_array( $aConfLanguages ) ) {
$i = 0; $i = 0;

5
sources/ToDo.txt
View File

@ -5,8 +5,3 @@ IP-Syntaxcheck bei Eingabe im Admin
MaxMind-CSV-Import MaxMind-CSV-Import
IPV6-Pflege IPV6-Pflege
- metadata.php ohne Email und URL von D3
- SQL ändern in (da OXREVISION hat keinen Standardwert)
INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES
(MD5(RAND()), 'oxbaseshop', 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.2', 'PE4', 0, '', '', '', '', 0, 26);