diff --git a/README.md b/README.md index 666f4e3..40cdb5e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,10 @@ Installation Changelog - 25.08.2016 1.0.0 module release + 12.10.2016 1.0.1 fix reading sitemap url with user/pass + fix checking sitemap object + + 25.08.2016 1.0.0 module release for oxid 4.7, 4.8, 4.9, 4.10 License diff --git a/copy_this/modules/proudsourcing/psCacheWarmer/application/controllers/pscachewarmer.php b/copy_this/modules/proudsourcing/psCacheWarmer/application/controllers/pscachewarmer.php index 573f57e..e9f99db 100755 --- a/copy_this/modules/proudsourcing/psCacheWarmer/application/controllers/pscachewarmer.php +++ b/copy_this/modules/proudsourcing/psCacheWarmer/application/controllers/pscachewarmer.php @@ -8,7 +8,7 @@ * @copyright (c) Proud Sourcing GmbH | 2016 * @link www.proudcommerce.com * @package psCacheWarmer - * @version 1.0.0 + * @version 1.0.1 **/ class psCacheWarmer extends oxUBase { @@ -63,8 +63,12 @@ class psCacheWarmer extends oxUBase $sSitemapUrl = $this->_getSitemapUrl(); } + $sUsername = oxRegistry::getConfig()->getShopConfVar('psCacheWarmerUser'); + $sPassword = oxRegistry::getConfig()->getShopConfVar('psCacheWarmerPass'); + $sSitemapUrl = str_replace("://", "://".$sUsername.":".$sPassword."@", $sSitemapUrl); + $sSitemapXmlData = @file_get_contents($sSitemapUrl); - if(($oSitemap = @simplexml_load_string($sSitemapXmlData)) != false) { + if($oSitemap = @simplexml_load_string($sSitemapXmlData)) { if (count($oSitemap->sitemap) > 0) { foreach ($oSitemap->sitemap as $oSubSitemap) { $sNextSitemapUrl = (string)$oSubSitemap->loc; diff --git a/copy_this/modules/proudsourcing/psCacheWarmer/application/views/admin/de/pscachewarmer_lang.php b/copy_this/modules/proudsourcing/psCacheWarmer/application/views/admin/de/pscachewarmer_lang.php index cb5a397..128988c 100644 --- a/copy_this/modules/proudsourcing/psCacheWarmer/application/views/admin/de/pscachewarmer_lang.php +++ b/copy_this/modules/proudsourcing/psCacheWarmer/application/views/admin/de/pscachewarmer_lang.php @@ -8,7 +8,7 @@ * @copyright (c) Proud Sourcing GmbH | 2016 * @link www.proudcommerce.com * @package psCacheWarmer - * @version 1.0.0 + * @version 1.0.1 **/ $sLangName = "Deutsch"; // ------------------------------- diff --git a/copy_this/modules/proudsourcing/psCacheWarmer/metadata.php b/copy_this/modules/proudsourcing/psCacheWarmer/metadata.php index 722c688..fd77030 100644 --- a/copy_this/modules/proudsourcing/psCacheWarmer/metadata.php +++ b/copy_this/modules/proudsourcing/psCacheWarmer/metadata.php @@ -8,7 +8,7 @@ * @copyright (c) Proud Sourcing GmbH | 2016 * @link www.proudcommerce.com * @package psCacheWarmer - * @version 1.0.0 + * @version 1.0.1 **/ /** @@ -29,7 +29,7 @@ $aModule = array( URL: '.oxRegistry::getConfig()->getConfigParam('sShopURL').'?cl=psCacheWarmer&key='.oxRegistry::getConfig()->getShopConfVar('psCacheWarmerKey', oxRegistry::getConfig()->getShopId()).'', ), 'thumbnail' => 'logo.jpg', - 'version' => '1.0.0', + 'version' => '1.0.1', 'author' => 'Proud Sourcing GmbH', 'url' => 'http://www.proudcommerce.com/', 'email' => 'support@proudcommerce.com', diff --git a/copy_this/modules/proudsourcing/psCacheWarmer/views/admin/de/pscachewarmer_lang.php b/copy_this/modules/proudsourcing/psCacheWarmer/views/admin/de/pscachewarmer_lang.php index cb5a397..128988c 100644 --- a/copy_this/modules/proudsourcing/psCacheWarmer/views/admin/de/pscachewarmer_lang.php +++ b/copy_this/modules/proudsourcing/psCacheWarmer/views/admin/de/pscachewarmer_lang.php @@ -8,7 +8,7 @@ * @copyright (c) Proud Sourcing GmbH | 2016 * @link www.proudcommerce.com * @package psCacheWarmer - * @version 1.0.0 + * @version 1.0.1 **/ $sLangName = "Deutsch"; // -------------------------------