From 53766b4cbccce674e6a8ea99ff455167b4fb7ffa Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Thu, 5 May 2022 16:28:04 +0100 Subject: [PATCH 1/5] Removed 404 links to magento.com website --- app/Mage.php | 2 -- app/code/core/Mage/Tax/etc/config.xml | 3 --- .../wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js | 2 +- .../wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/Mage.php b/app/Mage.php index 666ca5e813c..4b24f139771 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -147,7 +147,6 @@ final class Mage /** * Gets the current Magento version string - * @link http://www.magentocommerce.com/blog/new-community-edition-release-process/ * * @return string */ @@ -160,7 +159,6 @@ public static function getVersion() /** * Gets the detailed Magento version information - * @link http://www.magentocommerce.com/blog/new-community-edition-release-process/ * * @return array */ diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml index fe510ac1d24..392c67080c5 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -298,9 +298,6 @@ 0 0 - - http://www.magentocommerce.com/knowledge-base/entry/magento-ce-18-ee-113-tax-calc - diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js index 188f8fef6bf..ce98a0fbef4 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js @@ -56,7 +56,7 @@ tinyMCE.addI18n({en:{ longname : 'Magento Variable Manager Plugin for TinyMCE 3.x', author : 'Magento Core Team', authorurl : 'http://magentocommerce.com', - infourl : 'http://magentocommerce.com', + infourl : 'https://www.openmage.org', version : "1.0" }; } diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js index 0fdaddb7d49..feb476c1b79 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js @@ -79,7 +79,7 @@ tinyMCE.addI18n({en:{ longname : 'Magento Widget Manager Plugin for TinyMCE 3.x', author : 'Magento Core Team', authorurl : 'http://magentocommerce.com', - infourl : 'http://magentocommerce.com', + infourl : 'https://www.openmage.org', version : "1.0" }; } From 8acaffc5e77fb7e9c89db7ed1bd7022a7d6b91ac Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Thu, 5 May 2022 16:51:16 +0100 Subject: [PATCH 2/5] Removed 404 links to magento.com website --- app/code/core/Mage/AdminNotification/etc/config.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml index a8151f88c7b..a1449f6d6b5 100644 --- a/app/code/core/Mage/AdminNotification/etc/config.xml +++ b/app/code/core/Mage/AdminNotification/etc/config.xml @@ -92,8 +92,6 @@ www.openmage.org/Web_Notifications/notifications_v1.rss - widgets.magentocommerce.com/notificationPopup - widgets.magentocommerce.com/%s/%s.gif 1 1 0 From a2e1783fc5a287a3a03dd071024c03e6cb675be2 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Thu, 5 May 2022 16:51:35 +0100 Subject: [PATCH 3/5] removed deprecated and unused code --- .../Mage/AdminNotification/Helper/Data.php | 56 ------------------- 1 file changed, 56 deletions(-) diff --git a/app/code/core/Mage/AdminNotification/Helper/Data.php b/app/code/core/Mage/AdminNotification/Helper/Data.php index 36f9c4d9979..3d44edc429e 100644 --- a/app/code/core/Mage/AdminNotification/Helper/Data.php +++ b/app/code/core/Mage/AdminNotification/Helper/Data.php @@ -34,22 +34,6 @@ */ class Mage_AdminNotification_Helper_Data extends Mage_Core_Helper_Abstract { - const XML_PATH_POPUP_URL = 'system/adminnotification/popup_url'; - - /** - * Widget Popup Notification Object URL - * - * @var string - */ - protected $_popupUrl; - - /** - * Is readable Popup Notification Object flag - * - * @var bool - */ - protected $_popupReadable; - /** * Last Notice object * @@ -90,44 +74,4 @@ public function getUnreadNoticeCount($severity) } return isset($this->_unreadNoticeCounts[$severity]) ? $this->_unreadNoticeCounts[$severity] : 0; } - - /** - * Retrieve Widget Popup Notification Object URL - * - * @param bool $withExt - * @return string - */ - public function getPopupObjectUrl($withExt = false) - { - if (is_null($this->_popupUrl)) { - $this->_popupUrl = 'https://' . Mage::getStoreConfig(self::XML_PATH_POPUP_URL); - } - return $this->_popupUrl . ($withExt ? '.swf' : ''); - } - - /** - * Check is readable Popup Notification Object - * @deprecated after 1.4.2.0 - * - * @return bool - */ - public function isReadablePopupObject() - { - if (is_null($this->_popupReadable)) { - $this->_popupReadable = false; - $curl = new Varien_Http_Adapter_Curl(); - $curl->setConfig(array( - 'timeout' => 2 - )); - $curl->write(Zend_Http_Client::GET, $this->getPopupObjectUrl(true)); - if ($curl->read()) { - if ($curl->getInfo(CURLINFO_HTTP_CODE) == 200) { - $this->_popupReadable = true; - } - } - - $curl->close(); - } - return $this->_popupReadable; - } } From 2910f070a91ebd6601be48ef930b9300e7d5e93a Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 6 May 2022 12:12:18 +0100 Subject: [PATCH 4/5] Reintroduced the notification link, taken from archive.org --- app/code/core/Mage/Tax/etc/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml index 392c67080c5..5df1c992125 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -298,6 +298,9 @@ 0 0 + + https://web.archive.org/web/20150315064836/https://www.magentocommerce.com/knowledge-base/entry/magento-ce-18-ee-113-tax-calc + From 8a8529eb9f6851ccb47d514e89910a0f9ba9cb9f Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 10 May 2022 23:55:34 +0100 Subject: [PATCH 5/5] restored used method and added deprecation notice --- app/code/core/Mage/AdminNotification/Helper/Data.php | 12 ++++++++++++ .../Mage/Adminhtml/Block/Notification/Window.php | 1 + 2 files changed, 13 insertions(+) diff --git a/app/code/core/Mage/AdminNotification/Helper/Data.php b/app/code/core/Mage/AdminNotification/Helper/Data.php index 3d44edc429e..1486295b238 100644 --- a/app/code/core/Mage/AdminNotification/Helper/Data.php +++ b/app/code/core/Mage/AdminNotification/Helper/Data.php @@ -74,4 +74,16 @@ public function getUnreadNoticeCount($severity) } return isset($this->_unreadNoticeCounts[$severity]) ? $this->_unreadNoticeCounts[$severity] : 0; } + + /** + * Retrieve Widget Popup Notification Object URL + * + * @param bool $withExt + * @return string + * @deprecated v19.4.16 + */ + public function getPopupObjectUrl($withExt = false) + { + return ''; + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php index 46e7c57b21b..7bfa2cd2115 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php @@ -121,6 +121,7 @@ public function canShow() * Return swf object url * * @return string + * @deprecated v19.4.16 */ public function getObjectUrl() {