From 60bfcad9327e9fb503c7ee1941e66a2dbd1feb49 Mon Sep 17 00:00:00 2001
From: DanielSeifert <ds@shopmodule.com>
Date: Mon, 21 Nov 2016 15:34:21 +0000
Subject: [PATCH] fix small issues

---
 .../d3/d3geoip/components/d3cmp_geoip.php     |  3 --
 .../admin/d3_cfg_geoipset_main.php            | 35 ++++++-------------
 .../controllers/d3_oxshopcontrol_geoip.php    |  3 --
 .../d3geoip/views/admin/de/d3_geoip_lang.php  |  2 +-
 .../views/admin/tpl/d3_cfg_geoipset_main.tpl  | 22 ++----------
 5 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/copy_this/modules/d3/d3geoip/components/d3cmp_geoip.php b/copy_this/modules/d3/d3geoip/components/d3cmp_geoip.php
index 6cbc9d8..8148e78 100644
--- a/copy_this/modules/d3/d3geoip/components/d3cmp_geoip.php
+++ b/copy_this/modules/d3/d3geoip/components/d3cmp_geoip.php
@@ -25,9 +25,6 @@ class d3cmp_geoip extends oxView
 
     private $_sModId = 'd3_geoip';
 
-    /**
-     * @return null
-     */
     public function init()
     {
         if (d3_cfg_mod::get($this->_sModId)->isActive()) {
diff --git a/copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php b/copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php
index 47390bd..9da9299 100644
--- a/copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php
+++ b/copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php
@@ -20,6 +20,9 @@ class d3_cfg_geoipset_main extends d3_cfg_mod_main
     protected $_sThisTemplate = "d3_cfg_geoipset_main.tpl";
     protected $_blHasDebugSwitch = true;
     protected $_sDebugHelpTextIdent = 'D3_GEOIP_SET_DEBUG_DESC';
+    protected $_sMenuItemTitle = 'd3mxgeoip';
+    protected $_sMenuSubItemTitle = 'd3mxgeoip_settings';
+    public $oCountryList;
 
     /**
      * @param $sIP
@@ -44,46 +47,30 @@ class d3_cfg_geoipset_main extends d3_cfg_mod_main
         return $sTitle;
     }
 
-    /**
-     * @return oxcountrylist
-     */
-    public function getCountryList()
-    {
-        startProfile(__METHOD__);
-
-        /** @var $oCountryList oxcountrylist */
-        $oCountryList = oxNew('oxcountrylist');
-        $oListObject = $oCountryList->getBaseObject();
-        $sFieldList = $oListObject->getSelectFields();
-        $sQ = "select $sFieldList from " . $oListObject->getViewName();
-        $oCountryList->selectString($sQ);
-
-        stopProfile(__METHOD__);
-
-        return $oCountryList;
-    }
-
     /**
      * @return oxcountrylist
      */
     public function getIPCountryList()
     {
-        startProfile(__METHOD__);
+        if ($this->oCountryList) {
+            return $this->oCountryList;
+        }
 
+        startProfile(__METHOD__);
         /** @var $oGeoIp  d3geoip */
         $oGeoIp = oxNew('d3geoip');
         /** @var $oCountryList oxcountrylist */
-        $oCountryList = oxNew('oxcountrylist');
-        $oListObject = $oCountryList->getBaseObject();
+        $this->oCountryList = oxNew('oxcountrylist');
+        $oListObject = $this->oCountryList->getBaseObject();
         $sFieldList = $oListObject->getSelectFields();
         $sQ = "select (SELECT d3startip FROM ".$oGeoIp->getViewName().
             " WHERE D3ISO = " .$oListObject->getViewName(). ".
             oxisoalpha2 LIMIT 1) as IP,  $sFieldList from " . $oListObject->getViewName();
 
-        $oCountryList->selectString($sQ);
+        $this->oCountryList->selectString($sQ);
 
         stopProfile(__METHOD__);
 
-        return $oCountryList;
+        return $this->oCountryList;
     }
 }
diff --git a/copy_this/modules/d3/d3geoip/modules/controllers/d3_oxshopcontrol_geoip.php b/copy_this/modules/d3/d3geoip/modules/controllers/d3_oxshopcontrol_geoip.php
index bf17d26..7954aee 100644
--- a/copy_this/modules/d3/d3geoip/modules/controllers/d3_oxshopcontrol_geoip.php
+++ b/copy_this/modules/d3/d3geoip/modules/controllers/d3_oxshopcontrol_geoip.php
@@ -22,7 +22,6 @@ class d3_oxshopcontrol_geoip extends d3_oxshopcontrol_geoip_parent
      * @param null $sFunction
      * @param null $aParams
      * @param null $aViewsChain
-     * @return null
      */
     public function start ($sClass = null, $sFunction = null, $aParams = null, $aViewsChain = null)
     {
@@ -33,8 +32,6 @@ class d3_oxshopcontrol_geoip extends d3_oxshopcontrol_geoip_parent
     
     /**
      * check, if developer mode has to be enabled
-     *
-     * @return bool
      */
     protected function _d3AddGeoIpComponent()
     {
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 0420065..f7feaac 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
@@ -21,7 +21,7 @@ $iLangNr    = 0;
 // -------------------------------
 $aLang = array(
     'charset'                                       => 'ISO-8859-15',
-    'd3mxgeoip'                                     => 'GeoIP',
+    'd3mxgeoip'                                     => "<i class='fa fa-globe'></i> GeoIP",
     'd3mxgeoip_settings'                            => 'Einstellungen',
     'd3tbclgeoip_settings_main'                     => 'Grundeinstellungen',
     'tbclcountry_geoip'                             => 'GeoIP-Kundenumleitungen',
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 e0cf578..530068d 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
@@ -126,7 +126,6 @@ td.edittext {
                                 <input id="blChangeShop" class="edittext ext_edittext" type="checkbox" name="value[blChangeShop]" value='1' [{if $edit->getValue('blChangeShop') == 1}]checked[{/if}]>
                                 [{oxinputhelp ident="D3_GEOIP_SET_OPTIONS_CHANGESHOP_DESC"}]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
@@ -137,7 +136,6 @@ td.edittext {
                                 <input id="blChangeCurr" class="edittext ext_edittext" type="checkbox" name="value[blChangeCurr]" value='1' [{if $edit->getValue('blChangeCurr') == 1}]checked[{/if}]>
                                 [{oxinputhelp ident="D3_GEOIP_SET_OPTIONS_CHANGECURR_DESC"}]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
@@ -148,7 +146,6 @@ td.edittext {
                                 <input id="blChangeLang" class="edittext ext_edittext" type="checkbox" name="value[blChangeLang]" value='1' [{if $edit->getValue('blChangeLang') == 1}]checked[{/if}]>
                                 [{oxinputhelp ident="D3_GEOIP_SET_OPTIONS_CHANGELANG_DESC"}]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
@@ -159,7 +156,6 @@ td.edittext {
                                 <input id="blChangeURL" class="edittext ext_edittext" type="checkbox" name="value[blChangeURL]" value='1' [{if $edit->getValue('blChangeURL') == 1}]checked[{/if}]>
                                 [{oxinputhelp ident="D3_GEOIP_SET_OPTIONS_CHANGEURL_DESC"}]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
@@ -169,13 +165,12 @@ td.edittext {
                             </dt>
                             <dd>
                                 <select id="sFallbackCountryId" size="5" name="value[sFallbackCountryId]">
-                                    [{foreach from=$oView->getCountryList() item="oCountry"}]
+                                    [{foreach from=$oView->getIPCountryList() item="oCountry"}]
                                         <option value="[{$oCountry->getId()}]" [{if $edit->getValue('sFallbackCountryId') == $oCountry->getId()}] selected[{/if}]>[{$oCountry->oxcountry__oxtitle->value}]</option>
                                     [{/foreach}]
                                 </select>
                                 [{oxinputhelp ident="D3_GEOIP_SET_OPTIONS_NOCOUNTRY_DESC"}]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -197,7 +192,6 @@ td.edittext {
                                 <input id="sTestIp" type="text" maxlength="39" size="17" name="value[sTestIp]" value="[{$edit->getValue('sTestIp')}]">
                                 [{oxinputhelp ident="D3_GEOIP_SET_IP_TESTIP_DESC"}]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
@@ -213,7 +207,6 @@ td.edittext {
                                 </select>
                                 [{oxinputhelp ident="D3_GEOIP_SET_IP_TESTCOUNTRY_DESC"}]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
@@ -227,7 +220,6 @@ td.edittext {
                                     [{$oView->getIpCountry($edit->getValue('sCheckIp'))}]
                                 [{/if}]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -247,14 +239,4 @@ td.edittext {
     </table>
 </form>
 
-[{include file="d3_cfg_mod_inc.tpl"}]
-
-<script type="text/javascript">
-    if (parent.parent) {
-        parent.parent.sShopTitle = "[{$actshopobj->oxshops__oxname->getRawValue()|oxaddslashes}]";
-        parent.parent.sMenuItem = "[{oxmultilang ident="d3mxgeoip"}]";
-        parent.parent.sMenuSubItem = "[{oxmultilang ident="d3mxgeoip_settings"}]";
-        parent.parent.sWorkArea = "[{$_act}]";
-        parent.parent.setTitle();
-    }
-</script>
\ No newline at end of file
+[{include file="d3_cfg_mod_inc.tpl"}]
\ No newline at end of file