From 50b54be2437b21aa833a3ec94f41bbe56b02a73f Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:12:18 +0100 Subject: [PATCH 01/15] rebase --- README.md | 1 + .../System/Config/Form/Field/AbstractDate.php | 96 +++++++++++++++++++ .../Block/System/Config/Form/Field/Date.php | 57 +++++++++++ .../System/Config/Form/Field/Datetime.php | 27 +++++- .../Block/System/Config/Form/Field/Label.php | 58 +++++++++++ .../System/Config/Backend/AbstractDate.php | 92 ++++++++++++++++++ .../Model/System/Config/Backend/Date.php | 41 ++++++++ .../Model/System/Config/Backend/Datetime.php | 41 ++++++++ app/code/core/Mage/Core/Helper/Date.php | 44 +++++++++ lib/Varien/Data/Form/Element/Date.php | 2 +- 10 files changed, 454 insertions(+), 5 deletions(-) create mode 100644 app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php create mode 100644 app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php create mode 100644 app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php create mode 100644 app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php create mode 100644 app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php create mode 100644 app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php create mode 100644 app/code/core/Mage/Core/Helper/Date.php diff --git a/README.md b/README.md index 4732c0fb36c..36041ba4d70 100644 --- a/README.md +++ b/README.md @@ -202,6 +202,7 @@ Most important changes will be listed here, all other changes since `19.4.0` can - bug fixes and PHP 7.x, 8.0, 8.1 and 8.2 compatibility - added config cache for system.xml ([#1916](https://github.com/OpenMage/magento-lts/pull/1916)) - added frontend_type color ([#2945](https://github.com/OpenMage/magento-lts/pull/2945)) +- added `label`, `date` and `datetime` picker field types to system.xml [#2739](https://github.com/OpenMage/magento-lts/pull/2739) - search for "NULL" in backend grids ([#1203](https://github.com/OpenMage/magento-lts/pull/1203)) - removed `lib/flex` containing unused ActionScript "file uploader" files ([#2271](https://github.com/OpenMage/magento-lts/pull/2271)) - Mage_Catalog_Model_Resource_Abstract::getAttributeRawValue() now returns `'0'` instead of `false` if the value stored in the database is `0` ([#572](https://github.com/OpenMage/magento-lts/pull/572)) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php new file mode 100644 index 00000000000..0b1777a3a92 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php @@ -0,0 +1,96 @@ +getFieldConfig(); + + $type = $element->getType(); + if ($type !== 'date' && $type !== 'datetime' && $type !== 'text') { + Mage::throwException( + Mage::helper('adminhtml')->__( + 'Invalid frontend type for field "%s". Onyl "text", "date" and "datetime" are allowed.', + $field->descend('label') + ) + ); + } + + $format = Mage_Core_Helper_Date::getDateFormatFromString($field->format->__toString()); + $format = $this->getDateFormat($format); + + if (empty($field->editable)) { + return $this->getLocale() + ->date((int)$element->getValue()) + ->toString($format); + } + + $date = $this->getDateClass(); + $date->setData([ + 'name' => $element->getName(), + 'html_id' => $element->getId(), + 'image' => $this->getSkinUrl('images/grid-cal.gif'), + 'time' => $this->isShowTime() + ]); + $date->setFormat($format); + $date->setValue($element->getValue()); + $date->setForm($element->getForm()); + + return $date->getElementHtml(); + } + + /** + * @return Mage_Core_Model_Locale + */ + public function getLocale() + { + return Mage::app()->getLocale(); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php new file mode 100644 index 00000000000..02f25c44350 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php @@ -0,0 +1,57 @@ +getLocale()->getDateFormat($format); + } + + /** + * @return false + */ + protected function isShowTime(): bool + { + return false; + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php index ea6415eecd2..dda43b46393 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php @@ -19,11 +19,30 @@ * @category Mage * @package Mage_Adminhtml */ -class Mage_Adminhtml_Block_System_Config_Form_Field_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field +class Mage_Adminhtml_Block_System_Config_Form_Field_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field_AbstractDate { - protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) + /** + * @return Varien_Data_Form_Element_Datetime + */ + protected function getDateClass(): Varien_Data_Form_Element_Datetime { - $format = Mage::app()->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM); - return Mage::app()->getLocale()->date((int) $element->getValue())->toString($format); + return new Varien_Data_Form_Element_Datetime(); + } + + /** + * @param string $format + * @return string + */ + protected function getDateFormat(string $format): string + { + return $this->getLocale()->getDateTimeFormat($format); + } + + /** + * @return true + */ + protected function isShowTime(): bool + { + return true; } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php new file mode 100644 index 00000000000..fb0b63e3b99 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php @@ -0,0 +1,58 @@ + + */ +class Mage_Adminhtml_Block_System_Config_Form_Field_Label extends Mage_Adminhtml_Block_System_Config_Form_Field +{ + /** + * @param Varien_Data_Form_Element_Abstract $element + * @return string + */ + protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) + { + $field = $element->getFieldConfig(); + + $type = $element->getType(); + if ($type !== 'label' && $type !== 'text') { + Mage::throwException( + Mage::helper('adminhtml')->__( + 'Invalid frontend type for field "%s". Onyl "text" and "label" are allowed.', + $field->descend('label') + ) + ); + } + + $label = new Varien_Data_Form_Element_Label(); + $label->setValue($field->descend('value')); + $label->setBold(!empty($field->descend('bold'))); + + return $label->getElementHtml(); + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php new file mode 100644 index 00000000000..fa389f6838d --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php @@ -0,0 +1,92 @@ +getValue(); + if ($value !== '') { + $this->setValue($this->getLocale()->date($value)->toString(Varien_Date::DATETIME_INTERNAL_FORMAT)); + } + + return $this; + } + + /** + * @return $this + */ + protected function _beforeSave() + { + $value = (string)$this->getValue(); + if ($value !== '') { + $this->setValue($this->filterDateTime($value)); + } + + return $this; + } + + /** + * @param string $date + * @return string + */ + protected function filterDateTime(string $date): string + { + /** @var Mage_Core_Model_Config_Element $field */ + $field = $this->getFieldConfig(); + + $format = Mage_Core_Helper_Date::getDateFormatFromString($field->format->__toString()); + $format = $this->getDateFormat($format); + + $filterInput = new Zend_Filter_LocalizedToNormalized([ + 'date_format' => $format + ]); + + $date = $filterInput->filter($date); + + // convert to utc + return $this->getLocale()->utcDate(null, $date, true)->toString(Varien_Date::DATETIME_INTERNAL_FORMAT); + } + + /** + * @return Mage_Core_Model_Locale + */ + public function getLocale() + { + return Mage::app()->getLocale(); + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php new file mode 100644 index 00000000000..61621c48a34 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php @@ -0,0 +1,41 @@ +getLocale()->getDateFormat($format); + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php new file mode 100644 index 00000000000..99ddf2ea44b --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php @@ -0,0 +1,41 @@ +getLocale()->getDateTimeFormat($format); + } +} diff --git a/app/code/core/Mage/Core/Helper/Date.php b/app/code/core/Mage/Core/Helper/Date.php new file mode 100644 index 00000000000..45b0cf7633d --- /dev/null +++ b/app/code/core/Mage/Core/Helper/Date.php @@ -0,0 +1,44 @@ +addClass('input-text'); $html = sprintf( - '' + '' . ' ', $this->getName(), $this->getHtmlId(), From debc9430dea18f24a4e0eec174237944e46ae34d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:13:38 +0100 Subject: [PATCH 02/15] Update app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php --- .../Adminhtml/Block/System/Config/Form/Field/AbstractDate.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php index 0b1777a3a92..f5ca9a5d85c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php @@ -17,8 +17,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ From fe62dfbf63d2d6b531004c6c2f31b18bd912b721 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:14:59 +0100 Subject: [PATCH 03/15] Update app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php --- .../Adminhtml/Block/System/Config/Form/Field/Date.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php index 02f25c44350..edf6c542c71 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php @@ -5,15 +5,9 @@ /** * OpenMage * - * NOTICE OF LICENSE - * * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magento.com so we can send you a copy immediately. + * It is also available at https://opensource.org/license/osl-3-0-php * * @category Mage * @package Mage_Adminhtml From e0a7c910764ccb70869276515fa70543057eff7c Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:15:27 +0100 Subject: [PATCH 04/15] Update app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php --- .../Block/System/Config/Form/Field/AbstractDate.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php index f5ca9a5d85c..975314320c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/AbstractDate.php @@ -5,15 +5,9 @@ /** * OpenMage * - * NOTICE OF LICENSE - * * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magento.com so we can send you a copy immediately. + * It is also available at https://opensource.org/license/osl-3-0-php * * @category Mage * @package Mage_Adminhtml From 8c0cb76ac3a21a8a3c8921d561ff317635febe6d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:16:21 +0100 Subject: [PATCH 05/15] Update app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php --- .../Mage/Adminhtml/Block/System/Config/Form/Field/Date.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php index edf6c542c71..2e3f1cf56e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Date.php @@ -11,8 +11,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ From 89b78cd28622ec005798a054401ceb26cf82eec0 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:16:50 +0100 Subject: [PATCH 06/15] Update app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php --- .../Adminhtml/Block/System/Config/Form/Field/Label.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php index fb0b63e3b99..cade76f4a44 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php @@ -5,15 +5,9 @@ /** * OpenMage * - * NOTICE OF LICENSE - * * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magento.com so we can send you a copy immediately. + * It is also available at https://opensource.org/license/osl-3-0-php * * @category Mage * @package Mage_Adminhtml From 0dc06d130ef85ae3ba4c50f6c926b991b5df517e Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:17:08 +0100 Subject: [PATCH 07/15] Update app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php --- .../Mage/Adminhtml/Block/System/Config/Form/Field/Label.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php index cade76f4a44..538a20d3127 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Label.php @@ -11,8 +11,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ From 8519c90efc3837c350158a39b27219936acac52d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:17:28 +0100 Subject: [PATCH 08/15] Update app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php --- .../Model/System/Config/Backend/AbstractDate.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php index fa389f6838d..e631fee4914 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php @@ -5,15 +5,9 @@ /** * OpenMage * - * NOTICE OF LICENSE - * * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magento.com so we can send you a copy immediately. + * It is also available at https://opensource.org/license/osl-3-0-php * * @category Mage * @package Mage_Adminhtml From 1216b5bb09e699ff4e00020b8781f2369c68bd4d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:17:48 +0100 Subject: [PATCH 09/15] Update app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php --- .../Adminhtml/Model/System/Config/Backend/AbstractDate.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php index e631fee4914..b7341e963d2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/AbstractDate.php @@ -11,8 +11,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ From f5a74421dbc2f4eacf4f8ddce40dee62c5061b07 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:18:08 +0100 Subject: [PATCH 10/15] Update app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php --- .../Mage/Adminhtml/Model/System/Config/Backend/Date.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php index 61621c48a34..be3915abcd3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php @@ -5,15 +5,9 @@ /** * OpenMage * - * NOTICE OF LICENSE - * * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magento.com so we can send you a copy immediately. + * It is also available at https://opensource.org/license/osl-3-0-php * * @category Mage * @package Mage_Adminhtml From 56db1a86fb22c9bfa38782c7957e2184dd4fc863 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:18:25 +0100 Subject: [PATCH 11/15] Update app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php --- .../core/Mage/Adminhtml/Model/System/Config/Backend/Date.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php index be3915abcd3..b3a4f607739 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Date.php @@ -11,8 +11,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ From ef492ab95d98c64468e06fcb624f4816507663db Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:18:45 +0100 Subject: [PATCH 12/15] Update app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php --- .../Adminhtml/Model/System/Config/Backend/Datetime.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php index 99ddf2ea44b..bb60e35d714 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php @@ -5,15 +5,9 @@ /** * OpenMage * - * NOTICE OF LICENSE - * * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magento.com so we can send you a copy immediately. + * It is also available at https://opensource.org/license/osl-3-0-php * * @category Mage * @package Mage_Adminhtml From 40a67bff06900488545556bdf3c245df9271a464 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:19:03 +0100 Subject: [PATCH 13/15] Update app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php --- .../Mage/Adminhtml/Model/System/Config/Backend/Datetime.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php index bb60e35d714..1f5df282686 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datetime.php @@ -11,8 +11,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ From fd92ae44f8dde5d1980abf8c594150b75bd52693 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:19:23 +0100 Subject: [PATCH 14/15] Update app/code/core/Mage/Core/Helper/Date.php --- app/code/core/Mage/Core/Helper/Date.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/code/core/Mage/Core/Helper/Date.php b/app/code/core/Mage/Core/Helper/Date.php index 45b0cf7633d..d76eff32883 100644 --- a/app/code/core/Mage/Core/Helper/Date.php +++ b/app/code/core/Mage/Core/Helper/Date.php @@ -5,15 +5,9 @@ /** * OpenMage * - * NOTICE OF LICENSE - * * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * https://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magento.com so we can send you a copy immediately. + * It is also available at https://opensource.org/license/osl-3-0-php * * @category Mage * @package Mage_Core From 90722e5d96a0f7410087d564f5693264cfe1b4e0 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 23 May 2023 19:19:41 +0100 Subject: [PATCH 15/15] Update app/code/core/Mage/Core/Helper/Date.php --- app/code/core/Mage/Core/Helper/Date.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Core/Helper/Date.php b/app/code/core/Mage/Core/Helper/Date.php index d76eff32883..5dedaec6eed 100644 --- a/app/code/core/Mage/Core/Helper/Date.php +++ b/app/code/core/Mage/Core/Helper/Date.php @@ -11,8 +11,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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) */