OpenMage · justinbeaty · Aug 3, 2022 · Aug 3, 2022 · Jul 29, 2023 · Jul 29, 2023
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -105,6 +105,6 @@ protected function _prepareColumns()
  public function getRowUrl($row)
  {
  return $this->getUrl('*/*/edit', ['id' => $row->getId()]);
- //return $this->getUrl('*/*/view', array('id' => $row->getId()));
+ //return $this->getUrl('*/*/view', ['id' => $row->getId()]);
  }
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Api2
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Block.php b/app/code/core/Mage/Cms/Model/Block.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block.php b/app/code/core/Mage/Cms/Model/Mysql4/Block.php
@@ -10,7 +10,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
@@ -10,7 +10,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page.php b/app/code/core/Mage/Cms/Model/Mysql4/Page.php
@@ -10,7 +10,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
@@ -10,7 +10,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php
@@ -10,7 +10,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Page.php b/app/code/core/Mage/Cms/Model/Page.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Cms
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_CurrencySymbol
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * OpenMage
+ *
+ * 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 at https://opensource.org/license/osl-3-0-php
+ *
+ * @category Mage
+ * @package Mage_Eav
+ * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+/**
+ * Adminhtml attributes block
+ *
+ * @category Mage
+ * @package Mage_Eav
+ */
+class Mage_Eav_Block_Adminhtml_Attribute extends Mage_Adminhtml_Block_Widget_Grid_Container
+{
+ public function __construct()
+ {
+ $this->_blockGroup = 'eav';
+ $this->_controller = 'adminhtml_attribute';
+ if ($entity_type = Mage::registry('entity_type')) {
+ $this->_headerText = Mage::helper('eav')->__('Manage %s Attributes', Mage::helper('eav')->formatTypeCode($entity_type));
+ } else {
+ $this->_headerText = Mage::helper('eav')->__('Manage Attributes');
+ }
+ $this->_addButtonLabel = Mage::helper('eav')->__('Add New Attribute');
+ parent::__construct();
+ }
+
+ public function getHeaderCssClass(): string
+ {
+ return 'icon-head head-eav-attribute';
+ }
+}
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * OpenMage
+ *
+ * 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 at https://opensource.org/license/osl-3-0-php
+ *
+ * @category Mage
+ * @package Mage_Eav
+ * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+/**
+ * @category Mage
+ * @package Mage_Eav
+ */
+class Mage_Eav_Block_Adminhtml_Attribute_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
+{
+ public function __construct()
+ {
+ $this->_objectId = 'attribute_id';
+ $this->_blockGroup = 'eav';
+ $this->_controller = 'adminhtml_attribute';
+
+ parent::__construct();
+
+ $this->_addButton(
+ 'save_and_edit_button',
+ [
+ 'label' => Mage::helper('eav')->__('Save and Continue Edit'),
+ 'onclick' => 'saveAndContinueEdit()',
+ 'class' => 'save'
+ ],
+ 100
+ );
+
+ $this->_updateButton('save', 'label', Mage::helper('eav')->__('Save Attribute'));
+ $this->_updateButton('save', 'onclick', 'saveAttribute()');
+
+ if (!Mage::registry('entity_attribute')->getIsUserDefined()) {
+ $this->_removeButton('delete');
+ } else {
+ $this->_updateButton('delete', 'label', Mage::helper('eav')->__('Delete Attribute'));
+ }
+ }
+
+ public function getHeaderText(): string
+ {
+ if (Mage::registry('entity_attribute')->getId()) {
+ $frontendLabel = Mage::registry('entity_attribute')->getFrontendLabel();
+ if (is_array($frontendLabel)) {
+ $frontendLabel = $frontendLabel[0];
+ }
+ return Mage::helper('eav')->__('Edit %s Attribute "%s"', Mage::helper('eav')->formatTypeCode(Mage::registry('entity_type')), $this->escapeHtml($frontendLabel));
+ } else {
+ return Mage::helper('eav')->__('New %s Attribute', Mage::helper('eav')->formatTypeCode(Mage::registry('entity_type')));
+ }
+ }
+
+ public function getValidationUrl(): string
+ {
+ return $this->getUrl('*/*/validate', ['_current' => true]);
+ }
+
+ public function getSaveUrl(): string
+ {
+ return $this->getUrl('*/*/save', ['_current' => true, 'back' => null]);
+ }
+
+ public function getHeaderCssClass(): string
+ {
+ return 'icon-head head-eav-attribute';
+ }
+}
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Form.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Form.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * OpenMage
+ *
+ * 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 at https://opensource.org/license/osl-3-0-php
+ *
+ * @category Mage
+ * @package Mage_Eav
+ * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+/**
+ * @category Mage
+ * @package Mage_Eav
+ */
+class Mage_Eav_Block_Adminhtml_Attribute_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
+{
+ protected function _prepareForm()
+ {
+ $form = new Varien_Data_Form([
+ 'id' => 'edit_form',
+ 'action' => $this->getData('action'),
+ 'method' => 'post'
+ ]);
+ $form->setUseContainer(true);
+ $this->setForm($form);
+
+ return parent::_prepareForm();
+ }
+}