From f43b3e5802044245c27624a1cc1f103b50f297ae Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Mon, 22 Apr 2013 09:38:13 +0000 Subject: [PATCH] basic implementation 4.7/5.0 --- .gitattributes | 28 ++++++------ .../controllers}/admin/d3_cfg_geoipset.php | 0 .../admin/d3_cfg_geoipset_licence.php | 0 .../admin/d3_cfg_geoipset_list.php | 0 .../admin/d3_cfg_geoipset_main.php | 0 .../controllers}/admin/d3_country_geoip.php | 0 .../modules/{d3_geoip => d3/d3geoip}/menu.xml | 0 copy_this/modules/d3/d3geoip/metadata.php | 40 ++++++++++++++++++ .../d3/d3geoip/models}/d3geoip.php | 0 .../components}/d3_oxcmp_cur_geoip.php | 0 .../components}/d3_oxcmp_lang_geoip.php | 0 .../{d3_geoip => d3/d3geoip}/picture.png | Bin .../d3geoip/views}/admin/de/d3_geoip_lang.php | 0 .../views}/admin/tpl/d3_cfg_geoipset_main.tpl | 0 .../views}/admin/tpl/d3_country_geoip.tpl | 0 copy_this/modules/d3_geoip/metadata.php | 23 ---------- 16 files changed, 54 insertions(+), 37 deletions(-) rename copy_this/{ => modules/d3/d3geoip/controllers}/admin/d3_cfg_geoipset.php (100%) rename copy_this/{ => modules/d3/d3geoip/controllers}/admin/d3_cfg_geoipset_licence.php (100%) rename copy_this/{ => modules/d3/d3geoip/controllers}/admin/d3_cfg_geoipset_list.php (100%) rename copy_this/{ => modules/d3/d3geoip/controllers}/admin/d3_cfg_geoipset_main.php (100%) rename copy_this/{ => modules/d3/d3geoip/controllers}/admin/d3_country_geoip.php (100%) rename copy_this/modules/{d3_geoip => d3/d3geoip}/menu.xml (100%) create mode 100644 copy_this/modules/d3/d3geoip/metadata.php rename copy_this/{core => modules/d3/d3geoip/models}/d3geoip.php (100%) rename copy_this/modules/{d3_geoip/views => d3/d3geoip/modules/components}/d3_oxcmp_cur_geoip.php (100%) rename copy_this/modules/{d3_geoip/views => d3/d3geoip/modules/components}/d3_oxcmp_lang_geoip.php (100%) rename copy_this/modules/{d3_geoip => d3/d3geoip}/picture.png (100%) rename {changed_full/420-461/out => copy_this/modules/d3/d3geoip/views}/admin/de/d3_geoip_lang.php (100%) rename {changed_full/420-461/out => copy_this/modules/d3/d3geoip/views}/admin/tpl/d3_cfg_geoipset_main.tpl (100%) rename {changed_full/420-461/out => copy_this/modules/d3/d3geoip/views}/admin/tpl/d3_country_geoip.tpl (100%) delete mode 100644 copy_this/modules/d3_geoip/metadata.php diff --git a/.gitattributes b/.gitattributes index f0b6200..dbffcc2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,19 +1,19 @@ * text=auto !eol /Doxyfile -text -changed_full/420-461/out/admin/de/d3_geoip_lang.php -text -changed_full/420-461/out/admin/tpl/d3_cfg_geoipset_main.tpl -text -changed_full/420-461/out/admin/tpl/d3_country_geoip.tpl -text -copy_this/admin/d3_cfg_geoipset.php -text -copy_this/admin/d3_cfg_geoipset_licence.php -text -copy_this/admin/d3_cfg_geoipset_list.php -text -copy_this/admin/d3_cfg_geoipset_main.php -text -copy_this/admin/d3_country_geoip.php -text -copy_this/core/d3geoip.php -text -copy_this/modules/d3_geoip/menu.xml -text -copy_this/modules/d3_geoip/metadata.php -text -copy_this/modules/d3_geoip/picture.png -text -copy_this/modules/d3_geoip/views/d3_oxcmp_cur_geoip.php -text -copy_this/modules/d3_geoip/views/d3_oxcmp_lang_geoip.php -text +copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset.php -text +copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_licence.php -text +copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_list.php -text +copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php -text +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/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/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 setup+doku/EE/install.sql -text setup+doku/EE/update.sql -text setup+doku/Installation.pdf -text diff --git a/copy_this/admin/d3_cfg_geoipset.php b/copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset.php similarity index 100% rename from copy_this/admin/d3_cfg_geoipset.php rename to copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset.php diff --git a/copy_this/admin/d3_cfg_geoipset_licence.php b/copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_licence.php similarity index 100% rename from copy_this/admin/d3_cfg_geoipset_licence.php rename to copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_licence.php diff --git a/copy_this/admin/d3_cfg_geoipset_list.php b/copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_list.php similarity index 100% rename from copy_this/admin/d3_cfg_geoipset_list.php rename to copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_list.php diff --git a/copy_this/admin/d3_cfg_geoipset_main.php b/copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php similarity index 100% rename from copy_this/admin/d3_cfg_geoipset_main.php rename to copy_this/modules/d3/d3geoip/controllers/admin/d3_cfg_geoipset_main.php diff --git a/copy_this/admin/d3_country_geoip.php b/copy_this/modules/d3/d3geoip/controllers/admin/d3_country_geoip.php similarity index 100% rename from copy_this/admin/d3_country_geoip.php rename to copy_this/modules/d3/d3geoip/controllers/admin/d3_country_geoip.php diff --git a/copy_this/modules/d3_geoip/menu.xml b/copy_this/modules/d3/d3geoip/menu.xml similarity index 100% rename from copy_this/modules/d3_geoip/menu.xml rename to copy_this/modules/d3/d3geoip/menu.xml diff --git a/copy_this/modules/d3/d3geoip/metadata.php b/copy_this/modules/d3/d3geoip/metadata.php new file mode 100644 index 0000000..3cc1557 --- /dev/null +++ b/copy_this/modules/d3/d3geoip/metadata.php @@ -0,0 +1,40 @@ + 'd3geoip', + 'title' => (class_exists('d3utils') ? d3utils::getInstance()->getD3Logo() : 'D³') . ' GeoIP Vorauswahl', + 'description' => array( + 'de' => 'Begrüßen Sie Ihre Kunden in seiner Landessprache.', + 'en' => '', + ), + 'thumbnail' => 'picture.png', + 'version' => '3.0.0.0', + 'author' => 'D³ Data Development (Inh.: Thomas Dartsch)', + 'email' => 'support@shopmodule.com', + 'url' => 'http://www.oxidmodule.com/', + 'extend' => array( + 'oxcmp_cur' => 'd3/d3geoip/modules/components/d3_oxcmp_cur_geoip', + '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', + 'd3geoip' => 'd3/d3geoip/models/d3geoip.php', + ), + 'templates' => array( + 'd3_cfg_geoipset_main.tpl' => 'd3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl', + ), + 'events' => array( + 'onActivate' => 'd3install::checkUpdateStart', + ), + 'blocks' => array( + ), +); \ No newline at end of file diff --git a/copy_this/core/d3geoip.php b/copy_this/modules/d3/d3geoip/models/d3geoip.php similarity index 100% rename from copy_this/core/d3geoip.php rename to copy_this/modules/d3/d3geoip/models/d3geoip.php diff --git a/copy_this/modules/d3_geoip/views/d3_oxcmp_cur_geoip.php b/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_cur_geoip.php similarity index 100% rename from copy_this/modules/d3_geoip/views/d3_oxcmp_cur_geoip.php rename to copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_cur_geoip.php diff --git a/copy_this/modules/d3_geoip/views/d3_oxcmp_lang_geoip.php b/copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_lang_geoip.php similarity index 100% rename from copy_this/modules/d3_geoip/views/d3_oxcmp_lang_geoip.php rename to copy_this/modules/d3/d3geoip/modules/components/d3_oxcmp_lang_geoip.php diff --git a/copy_this/modules/d3_geoip/picture.png b/copy_this/modules/d3/d3geoip/picture.png similarity index 100% rename from copy_this/modules/d3_geoip/picture.png rename to copy_this/modules/d3/d3geoip/picture.png diff --git a/changed_full/420-461/out/admin/de/d3_geoip_lang.php b/copy_this/modules/d3/d3geoip/views/admin/de/d3_geoip_lang.php similarity index 100% rename from changed_full/420-461/out/admin/de/d3_geoip_lang.php rename to copy_this/modules/d3/d3geoip/views/admin/de/d3_geoip_lang.php diff --git a/changed_full/420-461/out/admin/tpl/d3_cfg_geoipset_main.tpl b/copy_this/modules/d3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl similarity index 100% rename from changed_full/420-461/out/admin/tpl/d3_cfg_geoipset_main.tpl rename to copy_this/modules/d3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl diff --git a/changed_full/420-461/out/admin/tpl/d3_country_geoip.tpl b/copy_this/modules/d3/d3geoip/views/admin/tpl/d3_country_geoip.tpl similarity index 100% rename from changed_full/420-461/out/admin/tpl/d3_country_geoip.tpl rename to copy_this/modules/d3/d3geoip/views/admin/tpl/d3_country_geoip.tpl diff --git a/copy_this/modules/d3_geoip/metadata.php b/copy_this/modules/d3_geoip/metadata.php deleted file mode 100644 index 4a606e0..0000000 --- a/copy_this/modules/d3_geoip/metadata.php +++ /dev/null @@ -1,23 +0,0 @@ - 'd3_geoip', - 'title' => oxLang::getInstance()->translateString('D3_GEOIP_METADATA_TITLE'), - 'description' => oxLang::getInstance()->translateString('D3_GEOIP_METADATA_DESC'), - 'thumbnail' => 'picture.png', - 'version' => '2.1.1', - 'author' => oxLang::getInstance()->translateString('D3_MOD_LIB_METADATA_AUTHOR'), - 'email' => 'support@shopmodule.com', - 'url' => 'http://www.oxidmodule.com/', - 'extend' => array( - 'oxcmp_cur' => 'd3_geoip/views/d3_oxcmp_cur_geoip', - 'oxcmp_lang' => 'd3_geoip/views/d3_oxcmp_lang_geoip', - ) -); \ No newline at end of file