From 5f01ac93ee091a0b3abb7b0999fa8f8697fdbd66 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 18:02:33 +0100 Subject: [PATCH 01/31] Fixed conflicts --- .../Block/Cms/Page/Edit/Tab/Meta.php | 8 + .../System/Config/Source/Design/Robots.php | 3 + .../core/Mage/Catalog/Block/Category/View.php | 14 +- .../core/Mage/Catalog/Block/Product/View.php | 6 + .../core/Mage/Catalog/Helper/Category.php | 26 +++ .../core/Mage/Catalog/Model/Api2/Product.php | 2 +- app/code/core/Mage/Catalog/Model/Category.php | 15 ++ .../Category/Attribute/Source/Robots.php | 89 ++++++++ app/code/core/Mage/Catalog/Model/Product.php | 13 ++ .../core/Mage/Catalog/Model/Product/Api.php | 1 + .../Model/Product/Attribute/Source/Robots.php | 89 ++++++++ .../Mage/Catalog/Model/Resource/Setup.php | 20 ++ .../controllers/Product/CompareController.php | 1 + .../controllers/Seo/SitemapController.php | 2 + app/code/core/Mage/Catalog/etc/config.xml | 2 +- app/code/core/Mage/Catalog/etc/system.xml | 10 + app/code/core/Mage/Catalog/etc/wsdl.xml | 4 + app/code/core/Mage/Catalog/etc/wsi.xml | 3 + .../upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php | 60 ++++++ .../CatalogSearch/Block/Advanced/Form.php | 3 + .../CatalogSearch/Block/Advanced/Result.php | 4 + .../core/Mage/CatalogSearch/Block/Result.php | 1 + .../controllers/TermController.php | 1 + .../Checkout/controllers/CartController.php | 1 + .../controllers/OnepageController.php | 2 + app/code/core/Mage/Cms/Block/Page.php | 2 +- app/code/core/Mage/Cms/Model/Page.php | 34 ++++ .../data/cms_setup/data-install-1.6.0.0.php | 1 + app/code/core/Mage/Cms/etc/config.xml | 2 +- .../Cms/sql/cms_setup/install-1.6.0.0.php | 191 ------------------ .../sql/cms_setup/mysql4-install-0.7.0.php | 3 +- .../mysql4-upgrade-1.6.0.0-1.6.0.3.php | 38 ++++ .../Contacts/controllers/IndexController.php | 3 + app/code/core/Mage/Core/etc/system.xml | 151 ++++++++++++++ .../controllers/AccountController.php | 3 + .../core/Mage/ImportExport/Model/Import.php | 8 +- app/code/core/Mage/Page/Block/Html/Head.php | 7 +- .../core/Mage/Page/Model/Source/Robots.php | 89 ++++++++ .../Review/controllers/ProductController.php | 3 + .../Mage/Rss/controllers/IndexController.php | 1 + .../Sales/controllers/GuestController.php | 2 + .../controllers/ProductController.php | 1 + .../Mage/Tag/controllers/ListController.php | 1 + .../Tag/controllers/ProductController.php | 1 + .../Wishlist/controllers/IndexController.php | 3 + .../Wishlist/controllers/SharedController.php | 1 + .../Bundle/Test/Fixture/BundleProduct.xml | 1 + .../Catalog/Test/Fixture/CatalogCategory.xml | 1 + .../Test/Fixture/CatalogProductSimple.xml | 1 + .../Test/Fixture/CatalogProductVirtual.xml | 1 + .../Test/Fixture/ConfigurableProduct.xml | 1 + .../Catalog/Test/Fixture/GroupedProduct.xml | 1 + .../app/Mage/Cms/Test/Fixture/CmsPage.xml | 1 + .../Test/Fixture/DownloadableProduct.xml | 1 + js/tiny_mce/plugins/fullpage/fullpage.htm | 27 +-- 55 files changed, 742 insertions(+), 218 deletions(-) create mode 100644 app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php create mode 100644 app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php create mode 100644 app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php delete mode 100644 app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php create mode 100644 app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php create mode 100644 app/code/core/Mage/Page/Model/Source/Robots.php diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php index 142c8a0952c..06a2991568b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php @@ -57,6 +57,14 @@ protected function _prepareForm() 'disabled' => $isElementDisabled ]); + $fieldset->addField('meta_robots', 'select', array( + 'name' => 'meta_robots', + 'label' => Mage::helper('cms')->__('Robots'), + 'title' => Mage::helper('cms')->__('Meta Robots'), + 'options' => $model->getAvailableRobots(), + 'disabled' => $isElementDisabled + )); + Mage::dispatchEvent('adminhtml_cms_page_edit_tab_meta_prepare_form', ['form' => $form]); $form->setValues($model->getData()); diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php index 4de01d794bf..f8172aaacb3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php @@ -26,6 +26,9 @@ public function toOptionArray() ['value' => 'NOINDEX,FOLLOW', 'label' => 'NOINDEX, FOLLOW'], ['value' => 'INDEX,NOFOLLOW', 'label' => 'INDEX, NOFOLLOW'], ['value' => 'NOINDEX,NOFOLLOW', 'label' => 'NOINDEX, NOFOLLOW'], + ['value' => 'INDEX,FOLLOW,NOARCHIVE', 'label' => 'INDEX, FOLLOW, NOARCHIVE'], + ['value' => 'INDEX,NOINDEX,NOARCHIVE', 'label' => 'INDEX, NOINDEX, NOARCHIVE'], + ['value' => 'NOINDEX,NOFOLLOW,NOARCHIVE', 'label' => 'NOINDEX, NOFOLLOW, NOARCHIVE'], ]; } } diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php index bbc24c51f26..f15dba70cbf 100644 --- a/app/code/core/Mage/Catalog/Block/Category/View.php +++ b/app/code/core/Mage/Catalog/Block/Category/View.php @@ -47,12 +47,20 @@ protected function _prepareLayout() /** @var Mage_Catalog_Helper_Category $helper */ $helper = $this->helper('catalog/category'); + + if ($robots = $category->getMetaRobots()) { + if ($helper->canUseNoindexFollow() && Mage::helper('catalog/category')->isNotFirstCategoryPage()) { + $headBlock->setRobots(Mage::getSingleton('catalog/category_attribute_source_robots')->getOptionLabel(3)); + } else { + $headBlock->setRobots(Mage::getSingleton('catalog/category_attribute_source_robots')->getOptionLabel($robots)); + } + } + if ($helper->canUseCanonicalTag()) { $headBlock->addLinkRel('canonical', $category->getUrl()); } - /* - want to show rss feed in the url - */ + + // want to show rss feed in the url if ($this->isRssCatalogEnable() && $this->isTopCategory()) { $title = $this->helper('rss')->__('%s RSS Feed', $this->getCurrentCategory()->getName()); $headBlock->addItem('rss', $this->getRssLink(), 'title="' . $title . '"'); diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php index 361f158b14a..e158f0a98bc 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View.php +++ b/app/code/core/Mage/Catalog/Block/Product/View.php @@ -65,6 +65,12 @@ protected function _prepareLayout() } else { $headBlock->setDescription(Mage::helper('core/string')->substr($product->getDescription(), 0, 255)); } + $robots = $product->getMetaRobots(); + if ($robots) { + $headBlock->setRobots(Mage::getSingleton('catalog/product_attribute_source_robots')->getOptionLabel($robots)); + } else { + $headBlock->setRobots(Mage::getStoreConfig('design/head/default_robots')); + } /** @var Mage_Catalog_Helper_Product $helper */ $helper = $this->helper('catalog/product'); diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php index c1d24dbb494..182c98b7f9e 100644 --- a/app/code/core/Mage/Catalog/Helper/Category.php +++ b/app/code/core/Mage/Catalog/Helper/Category.php @@ -24,6 +24,7 @@ class Mage_Catalog_Helper_Category extends Mage_Core_Helper_Abstract public const XML_PATH_CATEGORY_URL_SUFFIX = 'catalog/seo/category_url_suffix'; public const XML_PATH_USE_CATEGORY_CANONICAL_TAG = 'catalog/seo/category_canonical_tag'; public const XML_PATH_CATEGORY_ROOT_ID = 'catalog/category/root_id'; + public const XML_PATH_CHANGE_CATEGORY_PAGES_ROBOTS = 'catalog/seo/category_pages_robots'; protected $_moduleName = 'Mage_Catalog'; @@ -173,4 +174,29 @@ public function canUseCanonicalTag($store = null) { return Mage::getStoreConfig(self::XML_PATH_USE_CATEGORY_CANONICAL_TAG, $store); } + + /** + * Check if Robots NOINDEX,FOLLOW can be used for category pages + * + * @param null|string|bool|int|Mage_Core_Model_Store $store + * @return bool + */ + public function canUseNoindexFollow($store = null) + { + return Mage::getStoreConfig(self::XML_PATH_CHANGE_CATEGORY_PAGES_ROBOTS, $store); + } + + + /** + * Check if current category is first page + * + * @return boolean + */ + public function isNotFirstCategoryPage() { + $url = Mage::helper('core/url')->getCurrentUrl(); + $parsedUrl = parse_url($url); + if(isset($parsedUrl['query']) && (preg_match("/p=/i", $parsedUrl['query'])) && (!preg_match("/p=1/i", $parsedUrl['query']))){ + return true; + } + } } diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product.php index 71fad5fe2f3..54eab76a2cd 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product.php @@ -69,7 +69,7 @@ protected function _isAttributeVisible(Mage_Catalog_Model_Resource_Eav_Attribute } else { $systemAttributesForNonAdmin = [ 'sku', 'name', 'short_description', 'description', 'tier_price', 'meta_title', 'meta_description', - 'meta_keyword', + 'meta_keyword', 'meta_robot' ]; if ($attribute->getIsUserDefined()) { $isAttributeVisible = $attribute->getIsVisibleOnFront(); diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index d2acfde2193..12bde21c468 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -56,6 +56,7 @@ * * @method string getMetaDescription() * @method string getMetaKeywords() + * @method int getMetaRobots() * @method string getMetaTitle() * @method int getMovedCategoryId() * @@ -93,6 +94,20 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract public const CACHE_TAG = 'catalog_category'; + /** + * Category robots + */ + public const META_ROBOTS_INDEX_FOLLOW = 1; + public const META_ROBOTS_INDEX_NOFOLLOW = 2; + public const META_ROBOTS_NOINDEX_FOLLOW = 3; + public const META_ROBOTS_NOINDEX_NOFOLLOW = 4; + public const META_ROBOTS_INDEX_FOLLOW_NOARCHIVE = 5; + public const META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE = 6; + public const META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE = 7; + + + const CACHE_TAG = 'catalog_category'; + /** * Prefix of model events names * diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php new file mode 100644 index 00000000000..2e5e2196257 --- /dev/null +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php @@ -0,0 +1,89 @@ + + */ +class Mage_Catalog_Model_Category_Attribute_Source_Robots extends Mage_Eav_Model_Entity_Attribute_Source_Abstract +{ + /** + * @return array + */ + public function getAllOptions() + { + return array( + Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW => + array( + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW') + ), + Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW => + array( + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW') + ), + Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_FOLLOW => + array( + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,FOLLOW') + ), + Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW => + array( + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW') + ), + Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE => + array( + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW,NOARCHIVE') + ), + Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE => + array( + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW,NOARCHIVE') + ), + Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE => + array( + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW,NOARCHIVE') + ), + ); + } + + /** + * @param int $key + * @return string + */ + public function getOptionLabel($key) { + $options = $this->getAllOptions(); + + return $options[$key]['label']; + } +} diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 2dc7513fd03..8a6ad118fb8 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -135,6 +135,7 @@ * @method array getMediaGallery() * @method $this setMediaGallery(array $value) * @method string getMessage() + * @method int getMetaRobot() * @method string getMetaDescription() * @method string getMetaKeyword() * @method string getMetaTitle() @@ -262,6 +263,18 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract */ public const ENTITY = 'catalog_product'; public const CACHE_TAG = 'catalog_product'; + + /** + * Product robots + */ + public const META_ROBOTS_INDEX_FOLLOW = 1; + public const META_ROBOTS_INDEX_NOFOLLOW = 2; + public const META_ROBOTS_NOINDEX_FOLLOW = 3; + public const META_ROBOTS_NOINDEX_NOFOLLOW = 4; + public const META_ROBOTS_INDEX_FOLLOW_NOARCHIVE = 5; + public const META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE = 6; + public const META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE = 7; + protected $_cacheTag = 'catalog_product'; protected $_eventPrefix = 'catalog_product'; protected $_eventObject = 'product'; diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php index 909eb2ff707..e5a3f2c4eb8 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api.php @@ -51,6 +51,7 @@ class Mage_Catalog_Model_Product_Api extends Mage_Catalog_Model_Api_Resource 'meta_title', 'meta_keyword', 'meta_description', + 'meta_robot', 'custom_design', 'custom_layout_update', 'options_container', diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php new file mode 100644 index 00000000000..ee5362b0108 --- /dev/null +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php @@ -0,0 +1,89 @@ + + */ +class Mage_Catalog_Model_Product_Attribute_Source_Robots extends Mage_Eav_Model_Entity_Attribute_Source_Abstract +{ + /** + * @return array + */ + public function getAllOptions() + { + return array( + Mage_Catalog_Model_Product::META_ROBOTS_INDEX_FOLLOW => + array( + 'value' => Mage_Catalog_Model_Product::META_ROBOTS_INDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW') + ), + Mage_Catalog_Model_Product::META_ROBOTS_INDEX_NOFOLLOW => + array( + 'value' => Mage_Catalog_Model_Product::META_ROBOTS_INDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW') + ), + Mage_Catalog_Model_Product::META_ROBOTS_NOINDEX_FOLLOW => + array( + 'value' => Mage_Catalog_Model_Product::META_ROBOTS_NOINDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,FOLLOW') + ), + Mage_Catalog_Model_Product::META_ROBOTS_NOINDEX_NOFOLLOW => + array( + 'value' => Mage_Catalog_Model_Product::META_ROBOTS_NOINDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW') + ), + Mage_Catalog_Model_Product::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE => + array( + 'value' => Mage_Catalog_Model_Product::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW,NOARCHIVE') + ), + Mage_Catalog_Model_Product::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE => + array( + 'value' => Mage_Catalog_Model_Product::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW,NOARCHIVE') + ), + Mage_Catalog_Model_Product::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE => + array( + 'value' => Mage_Catalog_Model_Product::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW,NOARCHIVE') + ), + ); + } + + /** + * @param int $key + * @return string + */ + public function getOptionLabel($key) { + $options = $this->getAllOptions(); + + return $options[$key]['label']; + } +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Setup.php index f994be25d82..b7d8d38fde7 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Setup.php @@ -147,6 +147,16 @@ public function getDefaultEntities() 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, 'group' => 'General Information', ], + 'meta_robots' => [ + 'type' => 'int', + 'label' => 'Robots', + 'input' => 'select', + 'source' => 'catalog/category_attribute_source_robots', + 'required' => false, + 'sort_order' => 9, + 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, + 'group' => 'General Information', + ], 'display_mode' => [ 'type' => 'varchar', 'label' => 'Display Mode', @@ -516,6 +526,16 @@ public function getDefaultEntities() 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, 'group' => 'Meta Information', ], + 'meta_robots' => [ + 'type' => 'int', + 'label' => 'Robots', + 'input' => 'select', + 'source' => 'catalog/product_attribute_source_robots', + 'default' => '1', + 'sort_order' => 4, + 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, + 'group' => 'Meta Information', + ], 'image' => [ 'type' => 'varchar', 'label' => 'Base Image', diff --git a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php index 8c9900fa15c..d45481fd764 100644 --- a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php +++ b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php @@ -53,6 +53,7 @@ public function indexAction() } $this->loadLayout(); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/compare')); $this->renderLayout(); } diff --git a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php index fbbe08f080a..29166f17779 100644 --- a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +++ b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php @@ -50,6 +50,7 @@ public function categoryAction() } $this->loadLayoutUpdates(); $this->generateLayoutXml()->generateLayoutBlocks(); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/sitemap')); $this->renderLayout(); } @@ -60,6 +61,7 @@ public function categoryAction() public function productAction() { $this->loadLayout(); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/sitemap')); $this->renderLayout(); } } diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml index 61cfb611821..c2d63d39cd8 100644 --- a/app/code/core/Mage/Catalog/etc/config.xml +++ b/app/code/core/Mage/Catalog/etc/config.xml @@ -17,7 +17,7 @@ - 1.6.0.0.19.1.6 + 1.6.0.0.19.1.7 diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml index 3b099086c8b..ffb104a25dc 100644 --- a/app/code/core/Mage/Catalog/etc/system.xml +++ b/app/code/core/Mage/Catalog/etc/system.xml @@ -299,6 +299,16 @@ 1 1 + + + select + adminhtml/system_config_source_yesno + 9 + 1 + 1 + 1 + Set robots to NOINDEX, FOLLOW when page is > 1 + diff --git a/app/code/core/Mage/Catalog/etc/wsdl.xml b/app/code/core/Mage/Catalog/etc/wsdl.xml index 8b639cb8ee9..fa45af09760 100644 --- a/app/code/core/Mage/Catalog/etc/wsdl.xml +++ b/app/code/core/Mage/Catalog/etc/wsdl.xml @@ -70,6 +70,7 @@ + @@ -101,6 +102,7 @@ + @@ -218,6 +220,7 @@ + @@ -243,6 +246,7 @@ + diff --git a/app/code/core/Mage/Catalog/etc/wsi.xml b/app/code/core/Mage/Catalog/etc/wsi.xml index 5abbda91213..a34a0f0dec3 100644 --- a/app/code/core/Mage/Catalog/etc/wsi.xml +++ b/app/code/core/Mage/Catalog/etc/wsi.xml @@ -62,6 +62,7 @@ + @@ -196,6 +197,7 @@ + @@ -221,6 +223,7 @@ + diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php new file mode 100644 index 00000000000..2492371c452 --- /dev/null +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php @@ -0,0 +1,60 @@ +startSetup(); +$installer->addAttribute(Mage_Catalog_Model_Category::ENTITY, 'meta_robots', array( + 'type' => 'int', + 'label' => 'Robots', + 'input' => 'select', + 'source' => 'catalog/category_attribute_source_robots', + 'required' => false, + 'sort_order' => 9, + 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, + 'group' => 'General Information', + 'user_defined' => false, +)); + +$installer->addAttribute(Mage_Catalog_Model_Product::ENTITY, 'meta_robots', array( + 'type' => 'int', + 'label' => 'Robots', + 'input' => 'select', + 'source' => 'catalog/product_attribute_source_robots', + 'sort_order' => 9, + 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, + 'group' => 'Meta Information', + 'visible' => true, + 'required' => false, + 'user_defined' => false, + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_in_advanced_search' => false, +)); + +$installer->endSetup(); \ No newline at end of file diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php index 7a1226bb075..756b0bf578e 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php @@ -38,6 +38,9 @@ public function _prepareLayout() 'label' => Mage::helper('catalogsearch')->__('Catalog Advanced Search') ]); } + $this->getLayout()->getBlock('head') + ->setRobots(Mage::getStoreConfig('web/robots_configuration/search')); + return parent::_prepareLayout(); } diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php index d49eaa238bf..23618447d9d 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php @@ -42,6 +42,10 @@ protected function _prepareLayout() 'label' => Mage::helper('catalogsearch')->__('Results') ]); } + + $this->getLayout()->getBlock('head') + ->setRobots(Mage::getStoreConfig('web/robots_configuration/search')); + return parent::_prepareLayout(); } diff --git a/app/code/core/Mage/CatalogSearch/Block/Result.php b/app/code/core/Mage/CatalogSearch/Block/Result.php index 78535896292..d64f2601483 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Result.php @@ -72,6 +72,7 @@ protected function _prepareLayout() // modify page title $title = $this->__("Search results for: '%s'", $helper->getEscapedQueryText()); $this->getLayout()->getBlock('head')->setTitle($title); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/search')); return parent::_prepareLayout(); } diff --git a/app/code/core/Mage/CatalogSearch/controllers/TermController.php b/app/code/core/Mage/CatalogSearch/controllers/TermController.php index e85e25faadb..ac2056b18a9 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/TermController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/TermController.php @@ -34,6 +34,7 @@ public function preDispatch() public function popularAction() { $this->loadLayout(); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/searchterms')); $this->renderLayout(); } } diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php index c82e4b05308..ff2fe770cb9 100644 --- a/app/code/core/Mage/Checkout/controllers/CartController.php +++ b/app/code/core/Mage/Checkout/controllers/CartController.php @@ -185,6 +185,7 @@ public function indexAction() ->_initLayoutMessages('checkout/session') ->_initLayoutMessages('catalog/session') ->getLayout()->getBlock('head')->setTitle($this->__('Shopping Cart')); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/checkout')); $this->renderLayout(); Varien_Profiler::stop(__METHOD__ . 'cart_display'); } diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php index e7356ff6133..9eee4760376 100644 --- a/app/code/core/Mage/Checkout/controllers/OnepageController.php +++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php @@ -200,6 +200,7 @@ public function indexAction() $this->getOnepage()->initCheckout(); $this->loadLayout(); $this->_initLayoutMessages('customer/session'); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/checkout')); $this->getLayout()->getBlock('head')->setTitle($this->__('Checkout')); $this->renderLayout(); } @@ -281,6 +282,7 @@ public function successAction() $this->loadLayout(); $this->_initLayoutMessages('checkout/session'); Mage::dispatchEvent('checkout_onepage_controller_success_action', ['order_ids' => [$lastOrderId]]); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/checkout')); $this->renderLayout(); } diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php index 4ef9e1c53be..b14d26abf52 100644 --- a/app/code/core/Mage/Cms/Block/Page.php +++ b/app/code/core/Mage/Cms/Block/Page.php @@ -100,8 +100,8 @@ protected function _prepareLayout() $head->setTitle($page->getTitle()); $head->setKeywords($page->getMetaKeywords()); $head->setDescription($page->getMetaDescription()); + $head->setRobots(Mage::getSingleton('page/source_robots')->getOptionLabel($page->getMetaRobots())); } - return parent::_prepareLayout(); } diff --git a/app/code/core/Mage/Cms/Model/Page.php b/app/code/core/Mage/Cms/Model/Page.php index 3ef300864b1..37b042139c7 100644 --- a/app/code/core/Mage/Cms/Model/Page.php +++ b/app/code/core/Mage/Cms/Model/Page.php @@ -50,6 +50,8 @@ * @method $this setMetaDescription(string $value) * @method string getMetaKeywords() * @method $this setMetaKeywords(string $value) + * @method int getMetaRobots() + * @method $this setMetaRobots(int $value) * @method string getPreviewUrl() * @method string getRootTemplate() * @method $this setRootTemplate(string $value) @@ -78,6 +80,17 @@ class Mage_Cms_Model_Page extends Mage_Core_Model_Abstract public const CACHE_TAG = 'cms_page'; protected $_cacheTag = 'cms_page'; + /** + * Page's Robots + */ + const META_ROBOTS_INDEX_FOLLOW = 1; + const META_ROBOTS_INDEX_NOFOLLOW = 2; + const META_ROBOTS_NOINDEX_FOLLOW = 3; + const META_ROBOTS_NOINDEX_NOFOLLOW = 4; + const META_ROBOTS_INDEX_FOLLOW_NOARCHIVE = 5; + const META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE = 6; + const META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE = 7; + /** * Prefix of model events names * @@ -141,4 +154,25 @@ public function getAvailableStatuses() return $statuses->getData(); } + + /** + * Prepare page's robots. + * Available event cms_page_get_available_robots to customize robots behaviour. + * + * @return array + */ + public function getAvailableRobots() + { + $robots = new Varien_Object(array( + self::META_ROBOTS_INDEX_FOLLOW => Mage::helper('cms')->__('INDEX,FOLLOW'), + self::META_ROBOTS_INDEX_NOFOLLOW => Mage::helper('cms')->__('INDEX,NOFOLLOW'), + self::META_ROBOTS_NOINDEX_FOLLOW => Mage::helper('cms')->__('NOINDEX,FOLLOW'), + self::META_ROBOTS_NOINDEX_NOFOLLOW => Mage::helper('cms')->__('NOINDEX,NOFOLLOW'), + self::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE => Mage::helper('cms')->__('INDEX,FOLLOW,NOARCHIVE'), + self::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE => Mage::helper('cms')->__('INDEX,NOFOLLOW,NOARCHIVE'), + self::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE => Mage::helper('cms')->__('NOINDEX,NOFOLLOW,NOARCHIVE'), + )); + + return $robots->getData(); + } } diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php index 033bd3ae90d..70f141865bc 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php @@ -34,6 +34,7 @@ 'meta_keywords' => 'Page keywords', 'meta_description' => 'Page description', + 'meta_robots' => 1, 'identifier' => 'no-route', 'content' => "

Whoops, our bad...

diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml index 0b627be0d00..cbd89c10d64 100644 --- a/app/code/core/Mage/Cms/etc/config.xml +++ b/app/code/core/Mage/Cms/etc/config.xml @@ -17,7 +17,7 @@ - 1.6.0.0.2 + 1.6.0.3 diff --git a/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php b/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php deleted file mode 100644 index c76ba5810b2..00000000000 --- a/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php +++ /dev/null @@ -1,191 +0,0 @@ -startSetup(); - -/** - * Create table 'cms/block' - */ -$table = $installer->getConnection() - ->newTable($installer->getTable('cms/block')) - ->addColumn('block_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'identity' => true, - 'nullable' => false, - 'primary' => true, - ], 'Block ID') - ->addColumn('title', Varien_Db_Ddl_Table::TYPE_TEXT, 255, [ - 'nullable' => false, - ], 'Block Title') - ->addColumn('identifier', Varien_Db_Ddl_Table::TYPE_TEXT, 255, [ - 'nullable' => false, - ], 'Block String Identifier') - ->addColumn('content', Varien_Db_Ddl_Table::TYPE_TEXT, '2M', [ - ], 'Block Content') - ->addColumn('creation_time', Varien_Db_Ddl_Table::TYPE_TIMESTAMP, null, [ - ], 'Block Creation Time') - ->addColumn('update_time', Varien_Db_Ddl_Table::TYPE_TIMESTAMP, null, [ - ], 'Block Modification Time') - ->addColumn('is_active', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'nullable' => false, - 'default' => '1', - ], 'Is Block Active') - ->setComment('CMS Block Table'); -$installer->getConnection()->createTable($table); - -/** - * Create table 'cms/block_store' - */ -$table = $installer->getConnection() - ->newTable($installer->getTable('cms/block_store')) - ->addColumn('block_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'nullable' => false, - 'primary' => true, - ], 'Block ID') - ->addColumn('store_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'unsigned' => true, - 'nullable' => false, - 'primary' => true, - ], 'Store ID') - ->addIndex( - $installer->getIdxName('cms/block_store', ['store_id']), - ['store_id'] - ) - ->addForeignKey( - $installer->getFkName('cms/block_store', 'block_id', 'cms/block', 'block_id'), - 'block_id', - $installer->getTable('cms/block'), - 'block_id', - Varien_Db_Ddl_Table::ACTION_CASCADE, - Varien_Db_Ddl_Table::ACTION_CASCADE - ) - ->addForeignKey( - $installer->getFkName('cms/block_store', 'store_id', 'core/store', 'store_id'), - 'store_id', - $installer->getTable('core/store'), - 'store_id', - Varien_Db_Ddl_Table::ACTION_CASCADE, - Varien_Db_Ddl_Table::ACTION_CASCADE - ) - ->setComment('CMS Block To Store Linkage Table'); -$installer->getConnection()->createTable($table); - -/** - * Create table 'cms/page' - */ -$table = $installer->getConnection() - ->newTable($installer->getTable('cms/page')) - ->addColumn('page_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'identity' => true, - 'nullable' => false, - 'primary' => true, - ], 'Page ID') - ->addColumn('title', Varien_Db_Ddl_Table::TYPE_TEXT, 255, [ - 'nullable' => true - ], 'Page Title') - ->addColumn('root_template', Varien_Db_Ddl_Table::TYPE_TEXT, 255, [ - 'nullable' => true - ], 'Page Template') - ->addColumn('meta_keywords', Varien_Db_Ddl_Table::TYPE_TEXT, '64k', [ - 'nullable' => true, - ], 'Page Meta Keywords') - ->addColumn('meta_description', Varien_Db_Ddl_Table::TYPE_TEXT, '64k', [ - 'nullable' => true, - ], 'Page Meta Description') - ->addColumn('identifier', Varien_Db_Ddl_Table::TYPE_TEXT, 100, [ - 'nullable' => true, - 'default' => null, - ], 'Page String Identifier') - ->addColumn('content_heading', Varien_Db_Ddl_Table::TYPE_TEXT, 255, [ - 'nullable' => true, - ], 'Page Content Heading') - ->addColumn('content', Varien_Db_Ddl_Table::TYPE_TEXT, '2M', [ - ], 'Page Content') - ->addColumn('creation_time', Varien_Db_Ddl_Table::TYPE_TIMESTAMP, null, [ - ], 'Page Creation Time') - ->addColumn('update_time', Varien_Db_Ddl_Table::TYPE_TIMESTAMP, null, [ - ], 'Page Modification Time') - ->addColumn('is_active', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'nullable' => false, - 'default' => '1', - ], 'Is Page Active') - ->addColumn('sort_order', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'nullable' => false, - 'default' => '0', - ], 'Page Sort Order') - ->addColumn('layout_update_xml', Varien_Db_Ddl_Table::TYPE_TEXT, '64k', [ - 'nullable' => true, - ], 'Page Layout Update Content') - ->addColumn('custom_theme', Varien_Db_Ddl_Table::TYPE_TEXT, 100, [ - 'nullable' => true, - ], 'Page Custom Theme') - ->addColumn('custom_root_template', Varien_Db_Ddl_Table::TYPE_TEXT, 255, [ - 'nullable' => true, - ], 'Page Custom Template') - ->addColumn('custom_layout_update_xml', Varien_Db_Ddl_Table::TYPE_TEXT, '64k', [ - 'nullable' => true, - ], 'Page Custom Layout Update Content') - ->addColumn('custom_theme_from', Varien_Db_Ddl_Table::TYPE_DATE, null, [ - 'nullable' => true, - ], 'Page Custom Theme Active From Date') - ->addColumn('custom_theme_to', Varien_Db_Ddl_Table::TYPE_DATE, null, [ - 'nullable' => true, - ], 'Page Custom Theme Active To Date') - ->addIndex( - $installer->getIdxName('cms/page', ['identifier']), - ['identifier'] - ) - ->setComment('CMS Page Table'); -$installer->getConnection()->createTable($table); - -/** - * Create table 'cms/page_store' - */ -$table = $installer->getConnection() - ->newTable($installer->getTable('cms/page_store')) - ->addColumn('page_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'nullable' => false, - 'primary' => true, - ], 'Page ID') - ->addColumn('store_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, [ - 'unsigned' => true, - 'nullable' => false, - 'primary' => true, - ], 'Store ID') - ->addIndex( - $installer->getIdxName('cms/page_store', ['store_id']), - ['store_id'] - ) - ->addForeignKey( - $installer->getFkName('cms/page_store', 'page_id', 'cms/page', 'page_id'), - 'page_id', - $installer->getTable('cms/page'), - 'page_id', - Varien_Db_Ddl_Table::ACTION_CASCADE, - Varien_Db_Ddl_Table::ACTION_CASCADE - ) - ->addForeignKey( - $installer->getFkName('cms/page_store', 'store_id', 'core/store', 'store_id'), - 'store_id', - $installer->getTable('core/store'), - 'store_id', - Varien_Db_Ddl_Table::ACTION_CASCADE, - Varien_Db_Ddl_Table::ACTION_CASCADE - ) - ->setComment('CMS Page To Store Linkage Table'); -$installer->getConnection()->createTable($table); - -$installer->endSetup(); diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php index 28a5637e737..f4f01817702 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php @@ -41,6 +41,7 @@ `root_template` varchar(255) NOT NULL default '', `meta_keywords` text NOT NULL, `meta_description` text NOT NULL, + 'meta_robots int NOT NULL, `identifier` varchar(100) NOT NULL default '', `content` text, `creation_time` datetime default NULL, @@ -53,7 +54,7 @@ UNIQUE KEY `identifier` (`identifier`,`store_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS pages'; -insert into {$this->getTable('cms_page')}(`page_id`,`title`,`root_template`,`meta_keywords`,`meta_description`,`identifier`,`content`,`creation_time`,`update_time`,`is_active`,`store_id`,`sort_order`) values (1,'404 Not Found 1','right_column','Page keywords','Page description','no-route','

Whoops, our bad...

\r\n
\r\n
The page you requested was not found, and we have a fine guess why.
\r\n
\r\n
    \r\n
  • If you typed the URL directly, please make sure the spelling is correct.
    • \r\n
  • If you clicked on a link to get here, the link is outdated.
    • \r\n
\r\n
\r\n
\r\n
What can you do?
\r\n
Have no fear, help is near! There are many ways you can get back on track with Magento Store.
\r\n
\r\n
    \r\n
  • Go back to the previous page.
    • \r\n
  • Use the search bar at the top of the page to search for your products.
    • \r\n
  • Follow these links to get you back on track!
    Store Home | My Account
\r\n','2007-06-20 18:38:32','2007-08-26 19:11:13',1,0,0),(2,'Home page','right_column','','','home','

Home Page

\r\n','2007-08-23 10:03:25','2007-09-06 13:26:53',1,0,0),(3,'About Us','one_column','','','about-magento-demo-store','
\r\n

About Magento Store

\r\n
\r\n
\r\n

\"Varien\"

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.

\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta.

\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.

\r\n

Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.

\r\n

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus. Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi. Vestibulum sapien dolor, aliquet nec, porta ac, malesuada a, libero. Praesent feugiat purus eget est. Nulla facilisi. Vestibulum tincidunt sapien eu velit. Mauris purus. Maecenas eget mauris eu orci accumsan feugiat. Pellentesque eget velit. Nunc tincidunt.

\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper

\r\n

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus.

\r\n

Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi.

\r\n
\r\n

To all of you, from all of us at Magento Store - Thank you and Happy eCommerce!

\r\n

John Doe
Some important guy

\r\n
','2007-08-30 14:01:18','2007-08-30 14:01:18',1,0,0),(4,'Customer Service','three_column','','','customer-service','
\r\n

Customer Service

\r\n
\r\n\r\n
\r\n
Shipping & Delivery
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Privacy & Security
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Returns & Replacements
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Ordering
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Payment, Pricing & Promotions
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Viewing Orders
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Updating Account Information
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
','2007-08-30 14:02:20','2007-08-30 14:03:37',1,0,0); +insert into {$this->getTable('cms_page')}(`page_id`,`title`,`root_template`,`meta_keywords`,`meta_description`, 'meta_robots',`identifier`,`content`,`creation_time`,`update_time`,`is_active`,`store_id`,`sort_order`) values (1,'404 Not Found 1','right_column','Page keywords','Page description','1','no-route','

Whoops, our bad...

\r\n
\r\n
The page you requested was not found, and we have a fine guess why.
\r\n
\r\n
    \r\n
  • If you typed the URL directly, please make sure the spelling is correct.
    • \r\n
  • If you clicked on a link to get here, the link is outdated.
    • \r\n
\r\n
\r\n
\r\n
What can you do?
\r\n
Have no fear, help is near! There are many ways you can get back on track with Magento Store.
\r\n
\r\n
    \r\n
  • Go back to the previous page.
    • \r\n
  • Use the search bar at the top of the page to search for your products.
    • \r\n
  • Follow these links to get you back on track!
    Store Home | My Account
\r\n','2007-06-20 18:38:32','2007-08-26 19:11:13',1,0,0),(2,'Home page','right_column','','','home','

Home Page

\r\n','2007-08-23 10:03:25','2007-09-06 13:26:53',1,0,0),(3,'About Us','one_column','','','about-magento-demo-store','
\r\n

About Magento Store

\r\n
\r\n
\r\n

\"Varien\"

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.

\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta.

\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.

\r\n

Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.

\r\n

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus. Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi. Vestibulum sapien dolor, aliquet nec, porta ac, malesuada a, libero. Praesent feugiat purus eget est. Nulla facilisi. Vestibulum tincidunt sapien eu velit. Mauris purus. Maecenas eget mauris eu orci accumsan feugiat. Pellentesque eget velit. Nunc tincidunt.

\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper

\r\n

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus.

\r\n

Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi.

\r\n
\r\n

To all of you, from all of us at Magento Store - Thank you and Happy eCommerce!

\r\n

John Doe
Some important guy

\r\n
','2007-08-30 14:01:18','2007-08-30 14:01:18',1,0,0),(4,'Customer Service','three_column','','','customer-service','
\r\n

Customer Service

\r\n
\r\n\r\n
\r\n
Shipping & Delivery
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Privacy & Security
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Returns & Replacements
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Ordering
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Payment, Pricing & Promotions
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Viewing Orders
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
Updating Account Information
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec, justo.
\r\n
','2007-08-30 14:02:20','2007-08-30 14:03:37',1,0,0); "); diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php new file mode 100644 index 00000000000..9852f1ab8d0 --- /dev/null +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php @@ -0,0 +1,38 @@ +startSetup(); + +$installer->getConnection()->addColumn( + $installer->getTable('cms/page'), + 'meta_robots', + "INT NOT NULL DEFAULT '0' AFTER `meta_description`" +); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Contacts/controllers/IndexController.php b/app/code/core/Mage/Contacts/controllers/IndexController.php index 09b3c350855..eff51b3448e 100644 --- a/app/code/core/Mage/Contacts/controllers/IndexController.php +++ b/app/code/core/Mage/Contacts/controllers/IndexController.php @@ -42,6 +42,9 @@ public function preDispatch() public function indexAction() { $this->loadLayout(); + $this->getLayout()->getBlock('head') + ->setRobots(Mage::getStoreConfig('web/robots_configuration/contacts')); + $this->getLayout()->getBlock('contactForm') ->setFormAction(Mage::getUrl('*/*/post', ['_secure' => $this->getRequest()->isSecure()])); diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index a3bec9e5da4..ee6975c437c 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -1677,6 +1677,157 @@ + + + text + 210 + 1 + 1 + 1 + + + + select + adminhtml/system_config_source_design_robots + 10 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 20 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 30 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 40 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 50 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 60 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 70 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 80 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 90 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 100 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 110 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 110 + 1 + 1 + 1 + + + + + + select + adminhtml/system_config_source_design_robots + 120 + 1 + 1 + 1 + + + diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php index 7b72233e99a..ead1a6816cc 100644 --- a/app/code/core/Mage/Customer/controllers/AccountController.php +++ b/app/code/core/Mage/Customer/controllers/AccountController.php @@ -125,6 +125,7 @@ public function loginAction() $this->_initLayoutMessages('customer/session'); $this->_initLayoutMessages('catalog/session'); $this->getLayout()->getBlock('head')->setTitle($this->__('Customer Login')); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/customer')); $this->renderLayout(); } @@ -260,6 +261,7 @@ public function createAction() $this->loadLayout(); $this->_initLayoutMessages('customer/session'); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/customer')); $this->renderLayout(); } @@ -719,6 +721,7 @@ public function forgotPasswordAction() $this->_getSession()->unsForgottenEmail(); $this->_initLayoutMessages('customer/session'); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/customer')); $this->renderLayout(); } diff --git a/app/code/core/Mage/ImportExport/Model/Import.php b/app/code/core/Mage/ImportExport/Model/Import.php index bfce262c47a..49fa387513e 100644 --- a/app/code/core/Mage/ImportExport/Model/Import.php +++ b/app/code/core/Mage/ImportExport/Model/Import.php @@ -337,10 +337,10 @@ public function expandSource() $regExps = ['last' => '/(.*?)(\d+)$/', 'middle' => '/(.*?)(\d+)(.*)$/']; $colReg = [ 'sku' => 'last', 'name' => 'last', 'description' => 'last', 'short_description' => 'last', - 'url_key' => 'middle', 'meta_title' => 'last', 'meta_keyword' => 'last', 'meta_description' => 'last', - '_links_related_sku' => 'last', '_links_crosssell_sku' => 'last', '_links_upsell_sku' => 'last', - '_custom_option_sku' => 'middle', '_custom_option_row_sku' => 'middle', '_super_products_sku' => 'last', - '_associated_sku' => 'last' + 'url_key' => 'middle', 'meta_title' => 'last', 'meta_keyword' => 'last', 'meta_robot' => 'last', + 'meta_description' => 'last', '_links_related_sku' => 'last', '_links_crosssell_sku' => 'last', + '_links_upsell_sku' => 'last', '_custom_option_sku' => 'middle', '_custom_option_row_sku' => 'middle', + '_super_products_sku' => 'last', '_associated_sku' => 'last' ]; $size = self::DEFAULT_SIZE; diff --git a/app/code/core/Mage/Page/Block/Html/Head.php b/app/code/core/Mage/Page/Block/Html/Head.php index 1fe605ca3a7..ab79c8e50ae 100644 --- a/app/code/core/Mage/Page/Block/Html/Head.php +++ b/app/code/core/Mage/Page/Block/Html/Head.php @@ -22,6 +22,7 @@ * @method $this setCanLoadCalendarJs(bool $value) * @method $this setDescription(string $value) * @method $this setKeywords(string $value) + * @method $this setRobots(int $value) * @method $this setCanLoadTinyMce(bool $value) */ class Mage_Page_Block_Html_Head extends Mage_Core_Block_Template @@ -455,7 +456,7 @@ public function getDescription() } /** - * Retrieve content for keyvords tag + * Retrieve content for keywords tag * * @return string */ @@ -468,9 +469,9 @@ public function getKeywords() } /** - * Retrieve URL to robots file + * Retrieve values for robots tag * - * @return string + * @return integer */ public function getRobots() { diff --git a/app/code/core/Mage/Page/Model/Source/Robots.php b/app/code/core/Mage/Page/Model/Source/Robots.php new file mode 100644 index 00000000000..1d627cc02f7 --- /dev/null +++ b/app/code/core/Mage/Page/Model/Source/Robots.php @@ -0,0 +1,89 @@ + + */ +class Mage_Page_Model_Source_Robots +{ + /** + * @return array + */ + public function toOptionArray() + { + return array( + Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW => + array( + 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW') + ), + Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW => + array( + 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW') + ), + Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_FOLLOW => + array( + 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,FOLLOW') + ), + Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW => + array( + 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW') + ), + Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE => + array( + 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW,NOARCHIVE') + ), + Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE => + array( + 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW,NOARCHIVE') + ), + Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE => + array( + 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW,NOARCHIVE') + ), + ); + } + + /** + * @param int $key + * @return string + */ + public function getOptionLabel($key) { + $options = $this->toOptionArray(); + + return $options[$key]['label']; + } +} diff --git a/app/code/core/Mage/Review/controllers/ProductController.php b/app/code/core/Mage/Review/controllers/ProductController.php index 88fda946609..df778c1e797 100644 --- a/app/code/core/Mage/Review/controllers/ProductController.php +++ b/app/code/core/Mage/Review/controllers/ProductController.php @@ -239,6 +239,8 @@ public function listAction() $breadcrumbsBlock->addCrumb('reviews', ['label' => Mage::helper('review')->__('Product Reviews')]); } + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/reviews')); + $this->renderLayout(); } elseif (!$this->getResponse()->isRedirect()) { $this->_forward('noRoute'); @@ -266,6 +268,7 @@ public function viewAction() $this->loadLayout(); $this->_initLayoutMessages('review/session'); $this->_initLayoutMessages('catalog/session'); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/reviews')); $this->renderLayout(); } diff --git a/app/code/core/Mage/Rss/controllers/IndexController.php b/app/code/core/Mage/Rss/controllers/IndexController.php index 401d66dbeb5..b62df5c1cab 100644 --- a/app/code/core/Mage/Rss/controllers/IndexController.php +++ b/app/code/core/Mage/Rss/controllers/IndexController.php @@ -44,6 +44,7 @@ public function indexAction() $helper = $this->_getHelper('rss'); if ($helper->isRssEnabled()) { $this->loadLayout(); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/rss')); $this->renderLayout(); } else { $this->getResponse()->setHeader('HTTP/1.1', '404 Not Found'); diff --git a/app/code/core/Mage/Sales/controllers/GuestController.php b/app/code/core/Mage/Sales/controllers/GuestController.php index be452f9c63b..9c51f5d8056 100644 --- a/app/code/core/Mage/Sales/controllers/GuestController.php +++ b/app/code/core/Mage/Sales/controllers/GuestController.php @@ -55,6 +55,7 @@ protected function _viewAction() $this->loadLayout(); Mage::helper('sales/guest')->getBreadcrumbs($this); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/ordersreturns')); $this->renderLayout(); } @@ -69,6 +70,7 @@ public function formAction() } $this->loadLayout(); Mage::helper('sales/guest')->getBreadcrumbs($this); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/ordersreturns')); $this->renderLayout(); } diff --git a/app/code/core/Mage/Sendfriend/controllers/ProductController.php b/app/code/core/Mage/Sendfriend/controllers/ProductController.php index 498568d8685..bce93155fbc 100644 --- a/app/code/core/Mage/Sendfriend/controllers/ProductController.php +++ b/app/code/core/Mage/Sendfriend/controllers/ProductController.php @@ -125,6 +125,7 @@ public function sendAction() $block->setFormData($data); } } + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/sendfriend')); $this->renderLayout(); } diff --git a/app/code/core/Mage/Tag/controllers/ListController.php b/app/code/core/Mage/Tag/controllers/ListController.php index 0e906e067db..fc44add66d8 100644 --- a/app/code/core/Mage/Tag/controllers/ListController.php +++ b/app/code/core/Mage/Tag/controllers/ListController.php @@ -23,6 +23,7 @@ class Mage_Tag_ListController extends Mage_Core_Controller_Front_Action public function indexAction() { $this->loadLayout(); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/tags')); $this->renderLayout(); } } diff --git a/app/code/core/Mage/Tag/controllers/ProductController.php b/app/code/core/Mage/Tag/controllers/ProductController.php index a0d5ad5ab82..f9d886fddda 100644 --- a/app/code/core/Mage/Tag/controllers/ProductController.php +++ b/app/code/core/Mage/Tag/controllers/ProductController.php @@ -35,6 +35,7 @@ public function listAction() $this->loadLayout(); $this->_initLayoutMessages('checkout/session'); $this->_initLayoutMessages('tag/session'); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/tags')); $this->renderLayout(); } } diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php index d021467a559..7a221aa2ca8 100644 --- a/app/code/core/Mage/Wishlist/controllers/IndexController.php +++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php @@ -150,6 +150,8 @@ public function indexAction() $this->_initLayoutMessages('catalog/session'); $this->_initLayoutMessages('wishlist/session'); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/wishlist')); + $this->renderLayout(); } @@ -607,6 +609,7 @@ public function shareAction() $this->loadLayout(); $this->_initLayoutMessages('customer/session'); $this->_initLayoutMessages('wishlist/session'); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/wishlist')); $this->renderLayout(); } diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php index 1e904e33537..a1214bc742a 100644 --- a/app/code/core/Mage/Wishlist/controllers/SharedController.php +++ b/app/code/core/Mage/Wishlist/controllers/SharedController.php @@ -68,6 +68,7 @@ public function indexAction() $this->loadLayout(); $this->_initLayoutMessages('checkout/session'); $this->_initLayoutMessages('wishlist/session'); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/wishlist')); $this->renderLayout(); } diff --git a/dev/tests/functional/tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml index c1879c7169a..87953ba158c 100644 --- a/dev/tests/functional/tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml @@ -42,6 +42,7 @@ + diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogCategory.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogCategory.xml index f54bcd46253..c9d44e5e72d 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogCategory.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogCategory.xml @@ -39,6 +39,7 @@ + diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml index d2e02ebb48b..6e4a0045d94 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -45,6 +45,7 @@ + diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml index ed4547e79a1..c5d5b2ef14f 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -39,6 +39,7 @@ + diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml index 5ebdbb26363..6cd932a124b 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml @@ -41,6 +41,7 @@ + diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml index 535ace0769c..0a2ded08534 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml @@ -43,6 +43,7 @@ + diff --git a/dev/tests/functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml b/dev/tests/functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml index cd760e8f867..083b7e67dee 100644 --- a/dev/tests/functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml +++ b/dev/tests/functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml @@ -23,6 +23,7 @@ + diff --git a/dev/tests/functional/tests/app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml b/dev/tests/functional/tests/app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml index 2c32520e217..51b73a20fa0 100644 --- a/dev/tests/functional/tests/app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml +++ b/dev/tests/functional/tests/app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml @@ -49,6 +49,7 @@ + diff --git a/js/tiny_mce/plugins/fullpage/fullpage.htm b/js/tiny_mce/plugins/fullpage/fullpage.htm index 14ab8652eae..b9cb3beef3f 100644 --- a/js/tiny_mce/plugins/fullpage/fullpage.htm +++ b/js/tiny_mce/plugins/fullpage/fullpage.htm @@ -35,6 +35,21 @@   + +   + + + +   @@ -43,18 +58,6 @@   - -   - - - - From dc7fba623faf7571e1a66004b8f4eff1c82ab54c Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 18:18:53 +0100 Subject: [PATCH 02/31] Fixed license --- .../Category/Attribute/Source/Robots.php | 25 +++++-------------- .../Model/Product/Attribute/Source/Robots.php | 25 +++++-------------- 2 files changed, 12 insertions(+), 38 deletions(-) diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php index 2e5e2196257..b7b78a9dfbf 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php @@ -1,27 +1,15 @@ */ class Mage_Catalog_Model_Category_Attribute_Source_Robots extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php index ee5362b0108..04494cde7bd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php @@ -1,27 +1,15 @@ */ class Mage_Catalog_Model_Product_Attribute_Source_Robots extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { From 2a6c165f4a865097cc9c46f21eee1ffa41bf09f6 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 18:20:54 +0100 Subject: [PATCH 03/31] whitespace --- app/code/core/Mage/Catalog/Model/Category.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index 12bde21c468..379f0b14646 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -105,7 +105,6 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract public const META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE = 6; public const META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE = 7; - const CACHE_TAG = 'catalog_category'; /** From b63d423b5e87fc3d034ef0eafaa00e6910009d7a Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 18:21:21 +0100 Subject: [PATCH 04/31] already defined --- app/code/core/Mage/Catalog/Model/Category.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index 379f0b14646..0bc05e8071f 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -104,9 +104,6 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract public const META_ROBOTS_INDEX_FOLLOW_NOARCHIVE = 5; public const META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE = 6; public const META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE = 7; - - const CACHE_TAG = 'catalog_category'; - /** * Prefix of model events names * From a3ec6cfde2a21a095a7def6cebbfa7e8b4e002ed Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 21 Oct 2023 15:56:02 +0100 Subject: [PATCH 05/31] PHPCS --- app/code/core/Mage/Catalog/Helper/Category.php | 5 +++-- .../Mage/Catalog/Model/Category/Attribute/Source/Robots.php | 3 ++- .../Mage/Catalog/Model/Product/Attribute/Source/Robots.php | 3 ++- .../catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php | 2 +- app/code/core/Mage/Page/Model/Source/Robots.php | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php index db44e538087..963e6ce4cf8 100644 --- a/app/code/core/Mage/Catalog/Helper/Category.php +++ b/app/code/core/Mage/Catalog/Helper/Category.php @@ -192,10 +192,11 @@ public function canUseNoindexFollow($store = null) * * @return boolean */ - public function isNotFirstCategoryPage() { + public function isNotFirstCategoryPage() + { $url = Mage::helper('core/url')->getCurrentUrl(); $parsedUrl = parse_url($url); - if(isset($parsedUrl['query']) && (preg_match("/p=/i", $parsedUrl['query'])) && (!preg_match("/p=1/i", $parsedUrl['query']))){ + if (isset($parsedUrl['query']) && (preg_match("/p=/i", $parsedUrl['query'])) && (!preg_match("/p=1/i", $parsedUrl['query']))) { return true; } } diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php index b7b78a9dfbf..ab5588561df 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php @@ -68,7 +68,8 @@ public function getAllOptions() * @param int $key * @return string */ - public function getOptionLabel($key) { + public function getOptionLabel($key) + { $options = $this->getAllOptions(); return $options[$key]['label']; diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php index 04494cde7bd..e8955fd30bb 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Robots.php @@ -68,7 +68,8 @@ public function getAllOptions() * @param int $key * @return string */ - public function getOptionLabel($key) { + public function getOptionLabel($key) + { $options = $this->getAllOptions(); return $options[$key]['label']; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php index 2492371c452..f772e8ccd4a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php @@ -57,4 +57,4 @@ 'visible_in_advanced_search' => false, )); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Page/Model/Source/Robots.php b/app/code/core/Mage/Page/Model/Source/Robots.php index 1d627cc02f7..638b3cb765f 100644 --- a/app/code/core/Mage/Page/Model/Source/Robots.php +++ b/app/code/core/Mage/Page/Model/Source/Robots.php @@ -81,7 +81,8 @@ public function toOptionArray() * @param int $key * @return string */ - public function getOptionLabel($key) { + public function getOptionLabel($key) + { $options = $this->toOptionArray(); return $options[$key]['label']; From 713a9e453ae1cc81a08938d35691375a0f31ed64 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 21 Oct 2023 16:01:44 +0100 Subject: [PATCH 06/31] PHPCS --- app/code/core/Mage/Cms/Model/Page.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/code/core/Mage/Cms/Model/Page.php b/app/code/core/Mage/Cms/Model/Page.php index 12cb5d9c858..6a77ecf59c9 100644 --- a/app/code/core/Mage/Cms/Model/Page.php +++ b/app/code/core/Mage/Cms/Model/Page.php @@ -83,13 +83,13 @@ class Mage_Cms_Model_Page extends Mage_Core_Model_Abstract /** * Page's Robots */ - const META_ROBOTS_INDEX_FOLLOW = 1; - const META_ROBOTS_INDEX_NOFOLLOW = 2; - const META_ROBOTS_NOINDEX_FOLLOW = 3; - const META_ROBOTS_NOINDEX_NOFOLLOW = 4; - const META_ROBOTS_INDEX_FOLLOW_NOARCHIVE = 5; - const META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE = 6; - const META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE = 7; + public const META_ROBOTS_INDEX_FOLLOW = 1; + public const META_ROBOTS_INDEX_NOFOLLOW = 2; + public const META_ROBOTS_NOINDEX_FOLLOW = 3; + public const META_ROBOTS_NOINDEX_NOFOLLOW = 4; + public const META_ROBOTS_INDEX_FOLLOW_NOARCHIVE = 5; + public const META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE = 6; + public const META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE = 7; /** * Prefix of model events names From eb03b467be961abced2e923c720734a4b52e14be Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 21 Oct 2023 16:03:04 +0100 Subject: [PATCH 07/31] phpstan --- app/code/core/Mage/Catalog/Helper/Category.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php index 963e6ce4cf8..b58caf5c002 100644 --- a/app/code/core/Mage/Catalog/Helper/Category.php +++ b/app/code/core/Mage/Catalog/Helper/Category.php @@ -199,5 +199,7 @@ public function isNotFirstCategoryPage() if (isset($parsedUrl['query']) && (preg_match("/p=/i", $parsedUrl['query'])) && (!preg_match("/p=1/i", $parsedUrl['query']))) { return true; } + + return false; } } From 9011ccdaba18055e20629e035f4121517a27131d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 21 Oct 2023 17:22:32 +0100 Subject: [PATCH 08/31] short array syntax --- .../Category/Attribute/Source/Robots.php | 68 ++++++++----------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php index ab5588561df..43f3dc8eb93 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Robots.php @@ -25,43 +25,36 @@ class Mage_Catalog_Model_Category_Attribute_Source_Robots extends Mage_Eav_Model */ public function getAllOptions() { - return array( - Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW => - array( - 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW, - 'label' => Mage::helper('cms')->__('INDEX,FOLLOW') - ), - Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW => - array( - 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW, - 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW') - ), - Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_FOLLOW => - array( - 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_FOLLOW, - 'label' => Mage::helper('cms')->__('NOINDEX,FOLLOW') - ), - Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW => - array( - 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW, - 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW') - ), - Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE => - array( - 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE, - 'label' => Mage::helper('cms')->__('INDEX,FOLLOW,NOARCHIVE') - ), - Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE => - array( - 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE, - 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW,NOARCHIVE') - ), - Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE => - array( - 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE, - 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW,NOARCHIVE') - ), - ); + return [ + Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW => [ + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW') + ], + Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW => [ + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW') + ], + Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_FOLLOW => [ + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,FOLLOW') + ], + Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW => [ + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW') + ], + Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE => [ + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW,NOARCHIVE') + ], + Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE => [ + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW,NOARCHIVE') + ], + Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE => [ + 'value' => Mage_Catalog_Model_Category::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW,NOARCHIVE') + ] + ]; } /** @@ -71,7 +64,6 @@ public function getAllOptions() public function getOptionLabel($key) { $options = $this->getAllOptions(); - return $options[$key]['label']; } } From 03a3572879fb80bb577a5d4c99ae560af04bc579 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 21 Oct 2023 17:24:09 +0100 Subject: [PATCH 09/31] Update app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php --- .../Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php index c2926232aca..ad040f0484e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php @@ -27,7 +27,7 @@ public function toOptionArray() ['value' => 'INDEX,NOFOLLOW', 'label' => 'INDEX, NOFOLLOW'], ['value' => 'NOINDEX,NOFOLLOW', 'label' => 'NOINDEX, NOFOLLOW'], ['value' => 'INDEX,FOLLOW,NOARCHIVE', 'label' => 'INDEX, FOLLOW, NOARCHIVE'], - ['value' => 'INDEX,NOINDEX,NOARCHIVE', 'label' => 'INDEX, NOINDEX, NOARCHIVE'], + ['value' => 'INDEX,NOFOLLOW,NOARCHIVE', 'label' => 'INDEX, NOFOLLOW, NOARCHIVE'], ['value' => 'NOINDEX,NOFOLLOW,NOARCHIVE', 'label' => 'NOINDEX, NOFOLLOW, NOARCHIVE'], ]; } From 9aa1a09c7a0d94970a73982d941758c76b9c66c3 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 21 Oct 2023 17:30:47 +0100 Subject: [PATCH 10/31] short array syntax --- .../core/Mage/Page/Model/Source/Robots.php | 68 ++++++++----------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/app/code/core/Mage/Page/Model/Source/Robots.php b/app/code/core/Mage/Page/Model/Source/Robots.php index 638b3cb765f..81718406c5f 100644 --- a/app/code/core/Mage/Page/Model/Source/Robots.php +++ b/app/code/core/Mage/Page/Model/Source/Robots.php @@ -38,43 +38,36 @@ class Mage_Page_Model_Source_Robots */ public function toOptionArray() { - return array( - Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW => - array( - 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW, - 'label' => Mage::helper('cms')->__('INDEX,FOLLOW') - ), - Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW => - array( - 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW, - 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW') - ), - Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_FOLLOW => - array( - 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_FOLLOW, - 'label' => Mage::helper('cms')->__('NOINDEX,FOLLOW') - ), - Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW => - array( - 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW, - 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW') - ), - Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE => - array( - 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE, - 'label' => Mage::helper('cms')->__('INDEX,FOLLOW,NOARCHIVE') - ), - Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE => - array( - 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE, - 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW,NOARCHIVE') - ), - Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE => - array( - 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE, - 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW,NOARCHIVE') - ), - ); + return [ + Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW => [ + 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW') + ], + Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW => [ + 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW') + ], + Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_FOLLOW => [ + 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_FOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,FOLLOW') + ], + Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW => [ + 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW') + ], + Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE => [ + 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_FOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,FOLLOW,NOARCHIVE') + ], + Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE => [ + 'value' => Mage_Cms_Model_Page::META_ROBOTS_INDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('INDEX,NOFOLLOW,NOARCHIVE') + ], + Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE => [ + 'value' => Mage_Cms_Model_Page::META_ROBOTS_NOINDEX_NOFOLLOW_NOARCHIVE, + 'label' => Mage::helper('cms')->__('NOINDEX,NOFOLLOW,NOARCHIVE') + ] + ]; } /** @@ -84,7 +77,6 @@ public function toOptionArray() public function getOptionLabel($key) { $options = $this->toOptionArray(); - return $options[$key]['label']; } } From 16654698ff9b3c28a0c400e6d7dcb0cb74a17ba6 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 21 Oct 2023 17:31:28 +0100 Subject: [PATCH 11/31] whitespace --- app/code/core/Mage/Review/controllers/ProductController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/core/Mage/Review/controllers/ProductController.php b/app/code/core/Mage/Review/controllers/ProductController.php index e684b8eb92d..faebe86ff25 100644 --- a/app/code/core/Mage/Review/controllers/ProductController.php +++ b/app/code/core/Mage/Review/controllers/ProductController.php @@ -240,7 +240,6 @@ public function listAction() } $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/reviews')); - $this->renderLayout(); } elseif (!$this->getResponse()->isRedirect()) { $this->_forward('noRoute'); From 1dfeeb7ea216ed97eb83595b1f01b523ad6346de Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 21 Oct 2023 17:32:00 +0100 Subject: [PATCH 12/31] whitespace --- app/code/core/Mage/Sendfriend/controllers/ProductController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Sendfriend/controllers/ProductController.php b/app/code/core/Mage/Sendfriend/controllers/ProductController.php index 10b6a387a95..4a23cb823a9 100644 --- a/app/code/core/Mage/Sendfriend/controllers/ProductController.php +++ b/app/code/core/Mage/Sendfriend/controllers/ProductController.php @@ -125,8 +125,8 @@ public function sendAction() $block->setFormData($data); } } - $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/sendfriend')); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/sendfriend')); $this->renderLayout(); } From 4d86bfda0dc35f3aa78b4c02582a2c3ff271203d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:31:32 +0100 Subject: [PATCH 13/31] typo --- .../app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml index 0cfe8adbb36..1584efa0c78 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -46,7 +46,7 @@ - + From 139484d3a90a4010dcb443c13b9edb5a82f88ec5 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:31:46 +0100 Subject: [PATCH 14/31] typo --- .../tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml index ffd54ded883..fcf2f974a0a 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/ConfigurableProduct.xml @@ -42,7 +42,7 @@ - + From 4938bb99059d1bc66a2eca836641d8a5cd98f70e Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:31:59 +0100 Subject: [PATCH 15/31] typo --- .../tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml index f5d00ad0afc..f89a94518ea 100644 --- a/dev/tests/functional/tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Mage/Bundle/Test/Fixture/BundleProduct.xml @@ -43,7 +43,7 @@ - + From ce4ccfaca9c5638b33f3184d99fb3ca420861ceb Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:32:11 +0100 Subject: [PATCH 16/31] typo --- app/code/core/Mage/Catalog/etc/wsdl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Catalog/etc/wsdl.xml b/app/code/core/Mage/Catalog/etc/wsdl.xml index fa45af09760..12e2bc14ae8 100644 --- a/app/code/core/Mage/Catalog/etc/wsdl.xml +++ b/app/code/core/Mage/Catalog/etc/wsdl.xml @@ -102,7 +102,7 @@ - + From 08b582e3aadb3e46f95f8816f76874ce07c78bef Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:32:30 +0100 Subject: [PATCH 17/31] typo --- app/code/core/Mage/Catalog/etc/wsdl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Catalog/etc/wsdl.xml b/app/code/core/Mage/Catalog/etc/wsdl.xml index 12e2bc14ae8..90d29fcd0fa 100644 --- a/app/code/core/Mage/Catalog/etc/wsdl.xml +++ b/app/code/core/Mage/Catalog/etc/wsdl.xml @@ -70,7 +70,7 @@ - + From b2946c6818e6327f420c6dcc2c0b7e81f62bb722 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:32:42 +0100 Subject: [PATCH 18/31] typo --- app/code/core/Mage/Catalog/etc/wsi.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Catalog/etc/wsi.xml b/app/code/core/Mage/Catalog/etc/wsi.xml index a34a0f0dec3..dcf3d62aaaf 100644 --- a/app/code/core/Mage/Catalog/etc/wsi.xml +++ b/app/code/core/Mage/Catalog/etc/wsi.xml @@ -62,7 +62,7 @@ - + From f999795946b259da1996263c8c19ced10ac0b880 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:32:56 +0100 Subject: [PATCH 19/31] whitespace --- app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php index 2a27cbb6255..2bd7685c35a 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php @@ -38,8 +38,7 @@ public function _prepareLayout() 'label' => Mage::helper('catalogsearch')->__('Catalog Advanced Search') ]); } - $this->getLayout()->getBlock('head') - ->setRobots(Mage::getStoreConfig('web/robots_configuration/search')); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/search')); return parent::_prepareLayout(); } From f34ebd3ade24d61ecd35ecd30899de13e42d7705 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:33:10 +0100 Subject: [PATCH 20/31] whitespace --- app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php index 9669958d61f..00a0006c09e 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php @@ -43,8 +43,7 @@ protected function _prepareLayout() ]); } - $this->getLayout()->getBlock('head') - ->setRobots(Mage::getStoreConfig('web/robots_configuration/search')); + $this->getLayout()->getBlock('head')->setRobots(Mage::getStoreConfig('web/robots_configuration/search')); return parent::_prepareLayout(); } From da6fffcf45e4f227152fe8b4963ee918d3a50be0 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:33:29 +0100 Subject: [PATCH 21/31] typo --- app/code/core/Mage/ImportExport/Model/Import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/ImportExport/Model/Import.php b/app/code/core/Mage/ImportExport/Model/Import.php index 6b38c2a6f0d..2e78d4ee6ca 100644 --- a/app/code/core/Mage/ImportExport/Model/Import.php +++ b/app/code/core/Mage/ImportExport/Model/Import.php @@ -337,7 +337,7 @@ public function expandSource() $regExps = ['last' => '/(.*?)(\d+)$/', 'middle' => '/(.*?)(\d+)(.*)$/']; $colReg = [ 'sku' => 'last', 'name' => 'last', 'description' => 'last', 'short_description' => 'last', - 'url_key' => 'middle', 'meta_title' => 'last', 'meta_keyword' => 'last', 'meta_robot' => 'last', + 'url_key' => 'middle', 'meta_title' => 'last', 'meta_keyword' => 'last', 'meta_robots' => 'last', 'meta_description' => 'last', '_links_related_sku' => 'last', '_links_crosssell_sku' => 'last', '_links_upsell_sku' => 'last', '_custom_option_sku' => 'middle', '_custom_option_row_sku' => 'middle', '_super_products_sku' => 'last', '_associated_sku' => 'last' From d13948dbd58f57ef5283d923bd3860e030409bf9 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:33:53 +0100 Subject: [PATCH 22/31] typo --- app/code/core/Mage/Catalog/Model/Product/Api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php index b4989cfaaa0..530509de34c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api.php @@ -51,7 +51,7 @@ class Mage_Catalog_Model_Product_Api extends Mage_Catalog_Model_Api_Resource 'meta_title', 'meta_keyword', 'meta_description', - 'meta_robot', + 'meta_robots', 'custom_design', 'custom_layout_update', 'options_container', From a54a0a508539429cceed9bb5995a46117f8cd402 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:34:05 +0100 Subject: [PATCH 23/31] typo --- app/code/core/Mage/Catalog/Model/Api2/Product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product.php index bca5199418d..fe4346a4ee1 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product.php @@ -69,7 +69,7 @@ protected function _isAttributeVisible(Mage_Catalog_Model_Resource_Eav_Attribute } else { $systemAttributesForNonAdmin = [ 'sku', 'name', 'short_description', 'description', 'tier_price', 'meta_title', 'meta_description', - 'meta_keyword', 'meta_robot' + 'meta_keyword', 'meta_robots' ]; if ($attribute->getIsUserDefined()) { $isAttributeVisible = $attribute->getIsVisibleOnFront(); From 4134b105bef4e4da7f153a2d98f3571dba3a42d6 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:35:26 +0100 Subject: [PATCH 24/31] license text --- .../upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php index f772e8ccd4a..7d23a5b90d8 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php @@ -1,27 +1,15 @@ Date: Fri, 19 Apr 2024 10:36:33 +0100 Subject: [PATCH 25/31] license --- .../mysql4-upgrade-1.6.0.0-1.6.0.3.php | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php index 9852f1ab8d0..14eeb1df0fe 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php @@ -1,27 +1,15 @@ Date: Fri, 19 Apr 2024 10:37:17 +0100 Subject: [PATCH 26/31] license --- .../core/Mage/Page/Model/Source/Robots.php | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/app/code/core/Mage/Page/Model/Source/Robots.php b/app/code/core/Mage/Page/Model/Source/Robots.php index 81718406c5f..4f7464102f0 100644 --- a/app/code/core/Mage/Page/Model/Source/Robots.php +++ b/app/code/core/Mage/Page/Model/Source/Robots.php @@ -1,27 +1,15 @@ Date: Fri, 19 Apr 2024 10:37:35 +0100 Subject: [PATCH 27/31] typo --- .../app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml index 96905fc9183..13afac6aa20 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/CatalogProductVirtual.xml @@ -40,7 +40,7 @@ - + From 057ef6e808206c35c30973bf7aab9c23331ad17b Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:37:51 +0100 Subject: [PATCH 28/31] typo --- .../functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml b/dev/tests/functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml index 5b4eef5f145..bc74eae5dce 100644 --- a/dev/tests/functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml +++ b/dev/tests/functional/tests/app/Mage/Cms/Test/Fixture/CmsPage.xml @@ -24,7 +24,7 @@ - + From 4e7054a2375ed8934af804b4f0d31fe278241675 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:38:06 +0100 Subject: [PATCH 29/31] typo --- .../tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml index 4bd23964279..c918a94565f 100644 --- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml +++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Fixture/GroupedProduct.xml @@ -44,7 +44,7 @@ - + From ff9f6cb9e2d48212d9e8dfd47410161fc94d5282 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:38:17 +0100 Subject: [PATCH 30/31] typo --- .../app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml b/dev/tests/functional/tests/app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml index 375396ef5e6..1bf4fc92e12 100644 --- a/dev/tests/functional/tests/app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml +++ b/dev/tests/functional/tests/app/Mage/Downloadable/Test/Fixture/DownloadableProduct.xml @@ -50,7 +50,7 @@ - + From 0d6bbd658a9107142b5c6c2568c99b328030eaeb Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 19 Apr 2024 10:39:57 +0100 Subject: [PATCH 31/31] typo --- .../Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php index 14eeb1df0fe..313cc61c6f3 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.6.0.0-1.6.0.3.php @@ -7,7 +7,7 @@ * It is also available at https://opensource.org/license/osl-3-0-php * * @category Mage - * @package Mage_Catalog + * @package Mage_Cms * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */