__('Any data created since the backup was made will be lost including admin users, customers and orders.')?>
- __('Are you sure you want to proceed?')?>
- 
Enéias Ramos de Melo
Scott Moore
');
+ ini_set('error_append_string', '');
}
/**
@@ -220,7 +222,7 @@ public static function getOpenMageVersionInfo()
return array(
'major' => '20',
'minor' => '0',
- 'patch' => '14',
+ 'patch' => '15',
'stability' => '', // beta,alpha,rc
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
);
@@ -229,7 +231,7 @@ public static function getOpenMageVersionInfo()
return array(
'major' => '19',
'minor' => '4',
- 'patch' => '16',
+ 'patch' => '17',
'stability' => '', // beta,alpha,rc
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
);
@@ -305,10 +307,7 @@ public static function unregister($key)
*/
public static function registry($key)
{
- if (isset(self::$_registry[$key])) {
- return self::$_registry[$key];
- }
- return null;
+ return self::$_registry[$key] ?? null;
}
/**
@@ -529,13 +528,13 @@ public static function getModel($modelClass = '', $arguments = array())
* @param array $arguments
* @return Mage_Core_Model_Abstract
*/
- public static function getSingleton($modelClass='', array $arguments=array())
+ public static function getSingleton($modelClass = '', array $arguments=array())
{
- $registryKey = '_singleton/'.$modelClass;
+ $registryKey = '_singleton/' . $modelClass;
if (!isset(self::$_registry[$registryKey])) {
self::register($registryKey, self::getModel($modelClass, $arguments));
}
- return self::registry($registryKey);
+ return self::$_registry[$registryKey];
}
/**
@@ -573,11 +572,11 @@ public static function getControllerInstance($class, $request, $response, array
*/
public static function getResourceSingleton($modelClass = '', array $arguments = array())
{
- $registryKey = '_resource_singleton/'.$modelClass;
+ $registryKey = '_resource_singleton/' . $modelClass;
if (!isset(self::$_registry[$registryKey])) {
self::register($registryKey, self::getResourceModel($modelClass, $arguments));
}
- return self::registry($registryKey);
+ return self::$_registry[$registryKey];
}
/**
@@ -605,7 +604,7 @@ public static function helper($name)
$helperClass = self::getConfig()->getHelperClassName($name);
self::register($registryKey, new $helperClass);
}
- return self::registry($registryKey);
+ return self::$_registry[$registryKey];
}
/**
@@ -621,8 +620,7 @@ public static function getResourceHelper($moduleName)
$helperClass = self::getConfig()->getResourceHelper($moduleName);
self::register($registryKey, $helperClass);
}
-
- return self::registry($registryKey);
+ return self::$_registry[$registryKey];
}
/**
@@ -983,7 +981,7 @@ public static function printException(Throwable $e, $extra = '')
} else {
$reportData = array(
- !empty($extra) ? $extra . "\n\n" : '' . $e->getMessage(),
+ (!empty($extra) ? $extra . "\n\n" : '') . $e->getMessage(),
$e->getTraceAsString()
);
@@ -1059,14 +1057,4 @@ public static function getScriptSystemUrl($folder, $exitIfNot = false)
return $baseUrl;
}
-
- /**
- * Set is downloader flag
- *
- * @deprecated
- */
- public static function setIsDownloader()
- {
-
- }
}
diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl.php b/app/code/core/Mage/Admin/Model/Resource/Acl.php
index 14f8290d5c4..71175b717e7 100644
--- a/app/code/core/Mage/Admin/Model/Resource/Acl.php
+++ b/app/code/core/Mage/Admin/Model/Resource/Acl.php
@@ -145,26 +145,8 @@ public function loadRules(Mage_Admin_Model_Acl $acl, array $rulesArr)
$acl->deny($role, $resource, $privileges, $assert);
}
} catch (Exception $e) {
- //$m = $e->getMessage();
- //if ( eregi("^Resource '(.*)' not found", $m) ) {
- // Deleting non existent resource rule from rules table
- //$cond = $this->_write->quoteInto('resource_id = ?', $resource);
- //$this->_write->delete(Mage::getSingleton('core/resource')->getTableName('admin/rule'), $cond);
- //} else {
- //TODO: We need to log such exceptions to somewhere like a system/errors.log
- //}
+ Mage::logException($e);
}
- /*
- switch ($rule['permission']) {
- case Mage_Admin_Model_Acl::RULE_PERM_ALLOW:
- $acl->allow($role, $resource, $privileges, $assert);
- break;
-
- case Mage_Admin_Model_Acl::RULE_PERM_DENY:
- $acl->deny($role, $resource, $privileges, $assert);
- break;
- }
- */
}
return $this;
}
diff --git a/app/code/core/Mage/AdminNotification/Model/Feed.php b/app/code/core/Mage/AdminNotification/Model/Feed.php
index 7f861fd1b19..5b82673dceb 100644
--- a/app/code/core/Mage/AdminNotification/Model/Feed.php
+++ b/app/code/core/Mage/AdminNotification/Model/Feed.php
@@ -131,7 +131,6 @@ public function getFrequency()
public function getLastUpdate()
{
return Mage::app()->loadCache('admin_notifications_lastcheck');
-// return Mage::getStoreConfig(self::XML_LAST_UPDATE_PATH);
}
/**
@@ -142,9 +141,6 @@ public function getLastUpdate()
public function setLastUpdate()
{
Mage::app()->saveCache(time(), 'admin_notifications_lastcheck');
-// $config = Mage::getModel('core/config');
-// /* @var $config Mage_Core_Model_Config */
-// $config->saveConfig(self::XML_LAST_UPDATE_PATH, time());
return $this;
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
index ee45783d0ea..82e9e1fb31a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
@@ -42,7 +42,7 @@ public function __construct() {
&& $item->getApiPermission() == 'allow')
{
$resources[$item->getResource_id()]['checked'] = true;
- array_push($selrids, $item->getResource_id());
+ $selrids[] = $item->getResource_id();
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Backup.php b/app/code/core/Mage/Adminhtml/Block/Backup.php
deleted file mode 100644
index 48b44ee040d..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/Backup.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
-{
- /**
- * Block's template
- *
- * @var string
- */
- protected $_template = 'backup/list.phtml';
-
- protected function _prepareLayout()
- {
- parent::_prepareLayout();
- $this->setChild('createButton',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData(array(
- 'label' => Mage::helper('backup')->__('Database Backup'),
- 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_DB . "')",
- 'class' => 'task'
- ))
- );
- $this->setChild('createSnapshotButton',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData(array(
- 'label' => Mage::helper('backup')->__('System Backup'),
- 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_SYSTEM_SNAPSHOT . "')",
- 'class' => ''
- ))
- );
- $this->setChild('createMediaBackupButton',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData(array(
- 'label' => Mage::helper('backup')->__('Database and Media Backup'),
- 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_MEDIA . "')",
- 'class' => ''
- ))
- );
- $this->setChild('backupsGrid',
- $this->getLayout()->createBlock('adminhtml/backup_grid')
- );
-
- $this->setChild('dialogs', $this->getLayout()->createBlock('adminhtml/backup_dialogs'));
- return $this;
- }
-
- public function getCreateButtonHtml()
- {
- return $this->getChildHtml('createButton');
- }
-
- /**
- * Generate html code for "Create System Snapshot" button
- *
- * @return string
- */
- public function getCreateSnapshotButtonHtml()
- {
- return $this->getChildHtml('createSnapshotButton');
- }
-
- /**
- * Generate html code for "Create Media Backup" button
- *
- * @return string
- */
- public function getCreateMediaBackupButtonHtml()
- {
- return $this->getChildHtml('createMediaBackupButton');
- }
-
- public function getGridHtml()
- {
- return $this->getChildHtml('backupsGrid');
- }
-
- /**
- * Generate html code for pop-up messages that will appear when user click on "Rollback" link
- *
- * @return string
- */
- public function getDialogsHtml()
- {
- return $this->getChildHtml('dialogs');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php
deleted file mode 100644
index f67d700f249..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Backup_Dialogs extends Mage_Adminhtml_Block_Template
-{
- /**
- * Block's template
- *
- * @var string
- */
- protected $_template = 'backup/dialogs.phtml';
-
- /**
- * Include backup.js file in page before rendering
- *
- * @see Mage_Core_Block_Abstract::_prepareLayout()
- */
- protected function _prepareLayout()
- {
- $this->getLayout()->getBlock('head')->addJs('mage/adminhtml/backup.js');
- return parent::_prepareLayout();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php
deleted file mode 100644
index b4b8e40c122..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php
+++ /dev/null
@@ -1,141 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Backup_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
-
- protected function _construct()
- {
- $this->setSaveParametersInSession(true);
- $this->setId('backupsGrid');
- $this->setDefaultSort('time', 'desc');
- }
-
- /**
- * Init backups collection
- */
- protected function _prepareCollection()
- {
- $collection = Mage::getSingleton('backup/fs_collection');
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- /**
- * Prepare mass action controls
- *
- * @return $this
- */
- protected function _prepareMassaction()
- {
- $this->setMassactionIdField('id');
- $this->getMassactionBlock()->setFormFieldName('ids');
-
- $this->getMassactionBlock()->addItem('delete', array(
- 'label'=> Mage::helper('adminhtml')->__('Delete'),
- 'url' => $this->getUrl('*/*/massDelete'),
- 'confirm' => Mage::helper('backup')->__('Are you sure you want to delete the selected backup(s)?')
- ));
-
- return $this;
- }
-
- /**
- * Configuration of grid
- *
- * @return $this
- */
- protected function _prepareColumns()
- {
- $url7zip = Mage::helper('adminhtml')->__('The archive can be uncompressed with %s on Windows systems', 'http://www.7-zip.org/', '7-Zip');
-
- $this->addColumn('time', array(
- 'header' => Mage::helper('backup')->__('Time'),
- 'index' => 'date_object',
- 'type' => 'datetime',
- 'width' => 200
- ));
-
- $this->addColumn('display_name', array(
- 'header' => Mage::helper('backup')->__('Name'),
- 'index' => 'display_name',
- 'filter' => false,
- 'sortable' => true,
- 'width' => 350
- ));
-
- $this->addColumn('size', array(
- 'header' => Mage::helper('backup')->__('Size, Bytes'),
- 'index' => 'size',
- 'type' => 'number',
- 'sortable' => true,
- 'filter' => false
- ));
-
- $this->addColumn('type', array(
- 'header' => Mage::helper('backup')->__('Type'),
- 'type' => 'options',
- 'options' => Mage::helper('backup')->getBackupTypes(),
- 'index' => 'type',
- 'width' => 300
- ));
-
- $this->addColumn('download', array(
- 'header' => Mage::helper('backup')->__('Download'),
- 'format' => '$extension ('.$url7zip.')',
- 'index' => 'type',
- 'sortable' => false,
- 'filter' => false
- ));
-
- if (Mage::helper('backup')->isRollbackAllowed()){
- $this->addColumn('action', array(
- 'header' => Mage::helper('backup')->__('Action'),
- 'type' => 'action',
- 'width' => '80px',
- 'filter' => false,
- 'actions' => array(array(
- 'url' => '#',
- 'caption' => Mage::helper('backup')->__('Rollback'),
- 'onclick' => 'return backup.rollback(\'$type\', \'$time\');'
- )),
- 'index' => 'type',
- 'sortable' => false
- ));
- }
-
- return $this;
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php
index 0bd86a24b4f..a4d1cfc475f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php
@@ -101,24 +101,6 @@ protected function _prepareColumns()
'frame_callback' => array($this, 'decorateStatus')
));
-// $this->addColumn('action',
-// array(
-// 'header' => $this->__('Action'),
-// 'width' => '100',
-// 'type' => 'action',
-// 'getter' => 'getId',
-// 'actions' => array(
-// array(
-// 'caption' => $this->__('Refresh'),
-// 'url' => array('base'=> '*/*/refresh'),
-// 'field' => 'type'
-// ),
-// ),
-// 'filter' => false,
-// 'sortable' => false,
-// 'is_system' => true,
-// ));
-
return parent::_prepareColumns();
}
@@ -145,12 +127,11 @@ public function decorateStatus($value, $row, $column, $isExport)
/**
* Get row edit url
*
- * @return string
+ * @return false
*/
public function getRowUrl($row)
{
return false;
- //return $this->getUrl('*/*/edit', array('type'=>$row->getId()));
}
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
index 19670fc77c2..5d2c9a45497 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
@@ -98,7 +98,7 @@ public function getStoreConfigurationUrl()
{
$storeId = (int) $this->getRequest()->getParam('store');
$params = array();
-// $params = array('section'=>'catalog');
+
if ($storeId) {
$store = Mage::app()->getStore($storeId);
$params['website'] = $store->getWebsite()->getCode();
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
index 5fa6d8d2c82..c2fca275d66 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
@@ -60,16 +60,6 @@ public function _prepareLayout()
$fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('catalog')->__('General Information')));
if (!$this->getCategory()->getId()) {
-// $fieldset->addField('path', 'select', array(
-// 'name' => 'path',
-// 'label' => Mage::helper('catalog')->__('Parent Category'),
-// 'value' => base64_decode($this->getRequest()->getParam('parent')),
-// 'values'=> $this->_getParentCategoryOptions(),
-// //'required' => true,
-// //'class' => 'required-entry'
-// ),
-// 'name'
-// );
$parentId = $this->getRequest()->getParam('parent');
if (!$parentId) {
$parentId = Mage_Catalog_Model_Category::TREE_ROOT_ID;
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php
index 3ac6975a6c9..33e6c3c1ed4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php
@@ -87,14 +87,12 @@ protected function _prepareForm()
),
));
-// if ($model->getIsUserDefined() || !$model->getId()) {
- $fieldset->addField('is_visible_on_front', 'select', array(
- 'name' => 'is_visible_on_front',
- 'label' => Mage::helper('catalog')->__('Visible on Catalog Pages on Front-end'),
- 'title' => Mage::helper('catalog')->__('Visible on Catalog Pages on Front-end'),
- 'values' => $yesno,
- ));
-// }
+ $fieldset->addField('is_visible_on_front', 'select', array(
+ 'name' => 'is_visible_on_front',
+ 'label' => Mage::helper('catalog')->__('Visible on Catalog Pages on Front-end'),
+ 'title' => Mage::helper('catalog')->__('Visible on Catalog Pages on Front-end'),
+ 'values' => $yesno,
+ ));
$form->setValues($model->getData());
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
index 1cc766bbd27..5975b5b4022 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
@@ -216,7 +216,6 @@ public function getTemplatesHtml()
public function getOptionValues()
{
$optionsArr = array_reverse($this->getProduct()->getOptions(), true);
-// $optionsArr = $this->getProduct()->getOptions();
if (!$this->_values) {
$showPrice = $this->getCanReadPrice();
@@ -245,9 +244,6 @@ public function getOptionValues()
}
if ($option->getGroupByType() == Mage_Catalog_Model_Product_Option::OPTION_GROUP_SELECT) {
-
-// $valuesArr = array_reverse($option->getValues(), true);
-
$i = 0;
$itemCount = 0;
foreach ($option->getValues() as $_value) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php
index e9a8e585ee2..6350182a790 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php
@@ -35,26 +35,12 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tabs_Configurable extends Mage_A
{
protected function _prepareLayout()
{
-// $product = $this->getProduct();
+ $this->addTab('super_settings', array(
+ 'label' => Mage::helper('catalog')->__('Configurable Product Settings'),
+ 'content' => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_super_settings')->toHtml(),
+ 'active' => true
+ ));
-// if (!($superAttributes = $product->getTypeInstance()->getUsedProductAttributeIds())) {
- $this->addTab('super_settings', array(
- 'label' => Mage::helper('catalog')->__('Configurable Product Settings'),
- 'content' => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_super_settings')->toHtml(),
- 'active' => true
- ));
-
-// } else {
-// parent::_prepareLayout();
-//
-// $this->addTab('configurable', array(
-// 'label' => Mage::helper('catalog')->__('Associated Products'),
-// 'content' => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_super_config', 'admin.super.config.product')
-// ->setProductId($this->getRequest()->getParam('id'))
-// ->toHtml(),
-// ));
-// $this->bindShadowTabs('configurable', 'customer_options');
-// }
return $this;
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
index 8a29d3f3109..52fa611de0d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
@@ -24,7 +24,6 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
/**
* Catalog product form gallery content
*
@@ -47,6 +46,9 @@ public function __construct()
$this->setTemplate('catalog/product/helper/gallery.phtml');
}
+ /**
+ * @inheritDoc
+ */
protected function _prepareLayout()
{
$this->setChild('uploader',
@@ -57,16 +59,16 @@ protected function _prepareLayout()
->setFileParameterName('image')
->setTarget(Mage::getModel('adminhtml/url')->addSessionParam()->getUrl(
'*/catalog_product_gallery/upload',
- array('_query' => false)
+ ['_query' => false]
));
$browseConfig = $this->getUploader()->getButtonConfig();
$browseConfig
- ->setAttributes(array(
+ ->setAttributes([
'accept' => $browseConfig->getMimeTypesByExtensions('gif, png, jpeg, jpg')
- ));
+ ]);
- Mage::dispatchEvent('catalog_product_gallery_prepare_layout', array('block' => $this));
+ Mage::dispatchEvent('catalog_product_gallery_prepare_layout', ['block' => $this]);
return parent::_prepareLayout();
}
@@ -91,11 +93,17 @@ public function getUploaderHtml()
return $this->getChildHtml('uploader');
}
+ /**
+ * @return string
+ */
public function getJsObjectName()
{
return $this->getHtmlId() . 'JsObject';
}
+ /**
+ * @return string
+ */
public function getAddImagesButton()
{
return $this->getButtonHtml(
@@ -106,6 +114,9 @@ public function getAddImagesButton()
);
}
+ /**
+ * @return string
+ */
public function getImagesJson()
{
if(is_array($this->getElement()->getValue())) {
@@ -121,14 +132,16 @@ public function getImagesJson()
return '[]';
}
+ /**
+ * @return string
+ */
public function getImagesValuesJson()
{
- $values = array();
+ $values = [];
foreach ($this->getMediaAttributes() as $attribute) {
- /* @var $attribute Mage_Eav_Model_Entity_Attribute */
- $values[$attribute->getAttributeCode()] = $this->getElement()->getDataObject()->getData(
- $attribute->getAttributeCode()
- );
+ /* @var Mage_Eav_Model_Entity_Attribute $attribute */
+ $attributeCode = $attribute->getAttributeCode();
+ $values[$attributeCode] = $this->getElement()->getDataObject()->getData($attributeCode);
}
return Mage::helper('core')->jsonEncode($values);
}
@@ -140,18 +153,21 @@ public function getImagesValuesJson()
*/
public function getImageTypes()
{
- $imageTypes = array();
+ $imageTypes = [];
foreach ($this->getMediaAttributes() as $attribute) {
- /* @var $attribute Mage_Eav_Model_Entity_Attribute */
- $imageTypes[$attribute->getAttributeCode()] = array(
+ /* @var Mage_Eav_Model_Entity_Attribute $attribute */
+ $imageTypes[$attribute->getAttributeCode()] = [
'label' => $attribute->getFrontend()->getLabel() . ' '
. Mage::helper('catalog')->__($this->getElement()->getScopeLabel($attribute)),
'field' => $this->getElement()->getAttributeFieldName($attribute)
- );
+ ];
}
return $imageTypes;
}
+ /**
+ * @return bool
+ */
public function hasUseDefault()
{
foreach ($this->getMediaAttributes() as $attribute) {
@@ -173,6 +189,9 @@ public function getMediaAttributes()
return $this->getElement()->getDataObject()->getMediaAttributes();
}
+ /**
+ * @return string
+ */
public function getImageTypesJson()
{
return Mage::helper('core')->jsonEncode($this->getImageTypes());
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
index 40e26e89a9b..70c484f0de3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
@@ -116,14 +116,6 @@ function(v, elem){
$renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element');
$form->getElement('website_id')->setRenderer($renderer);
-// if (Mage::app()->isSingleStoreMode()) {
-// $fieldset->removeField('website_id');
-// $fieldset->addField('website_id', 'hidden', array(
-// 'name' => 'website_id'
-// ));
-// $customer->setWebsiteId(Mage::app()->getStore(true)->getWebsiteId());
-// }
-
$customerStoreId = null;
if ($customer->getId()) {
$customerStoreId = Mage::app()->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php
index 0878dba5f1b..09519dcb3d8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php
@@ -141,7 +141,6 @@ protected function _prepareColumns()
'header' => Mage::helper('customer')->__('Type'),
'type' => 'options',
'options' => $typeOptions,
-// 'renderer' => 'adminhtml/customer_online_grid_renderer_type',
'index' => 'visitor_type'
));
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
index 8672db23994..3a896f8798b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
@@ -322,12 +322,12 @@ public function getChartUrl($directUrl = true)
$currentvalue = $thisdataarray[$j];
if (is_numeric($currentvalue)) {
$ylocation = $yorigin + $currentvalue;
- array_push($chartdata, $ylocation . $dataDelimiter);
+ $chartdata[] = $ylocation . $dataDelimiter;
} else {
- array_push($chartdata, $dataMissing . $dataDelimiter);
+ $chartdata[] = $dataMissing . $dataDelimiter;
}
}
- array_push($chartdata, $dataSetdelimiter);
+ $chartdata[] = $dataSetdelimiter;
}
$buffer = implode('', $chartdata);
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
index d04b228324d..15bcb65cfd8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
@@ -245,9 +245,7 @@ public function getIsTextType()
*/
public function getCanResume()
{
- return in_array($this->getQueue()->getQueueStatus(), array(
- Mage_Newsletter_Model_Queue::STATUS_PAUSE
- ));
+ return $this->getQueue()->getQueueStatus() == Mage_Newsletter_Model_Queue::STATUS_PAUSE;
}
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php
index 7e2a4cf962d..639c2136d96 100644
--- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php
@@ -109,8 +109,6 @@ protected function _prepareMassaction()
'confirm' => Mage::helper('adminnotification')->__('Are you sure?')
));
-// $this->getColumn('massaction')->setWidth('30px');
-
return $this;
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php
index 7bfa2cd2115..7fe7fc5f24e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php
+++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php
@@ -168,7 +168,6 @@ public function getSeverityText()
/**
* Check if current block allowed in ACL
*
- * @param string $resourcePath
* @return bool
*/
protected function _isAllowed()
@@ -176,8 +175,7 @@ protected function _isAllowed()
if (!is_null($this->_aclResourcePath)) {
return Mage::getSingleton('admin/session')
->isAllowed('admin/system/adminnotification/show_toolbar');
- }
- else {
+ } else {
return true;
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
index 057004a45b9..2f505529a78 100644
--- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
+++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
@@ -114,9 +114,6 @@ protected function _getHelperValue(Varien_Simplexml_Element $child)
if (isset($childAttributes['module'])) {
$helperName = (string)$childAttributes['module'];
}
-// if (isset($childAttributes['translate'])) {
-// $titleNodeName = (string)$childAttributes['translate'];
-// }
return Mage::helper($helperName)->__((string)$child->$titleNodeName);
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php
index 519eb2545dc..c0ade190065 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php
@@ -105,7 +105,7 @@ public function __construct()
if (array_key_exists(strtolower($itemResourceId), $resources)) {
if ($item->isAllowed()) {
$resources[$itemResourceId]['checked'] = true;
- array_push($selrids, $itemResourceId);
+ $selrids[] = $itemResourceId;
}
}
}
@@ -119,7 +119,7 @@ public function __construct()
$undefinedResourceId
) == Mage_Admin_Model_Rules::RULE_PERMISSION_ALLOWED
) {
- array_push($selrids, $undefinedResourceId);
+ $selrids[] = $undefinedResourceId;
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php
index 27ca31c16be..d1cb1599fa3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php
@@ -66,10 +66,6 @@ public function getShipment()
protected function _prepareLayout()
{
-// $infoBlock = $this->getLayout()->createBlock('adminhtml/sales_order_view_info')
-// ->setOrder($this->getShipment()->getOrder());
-// $this->setChild('order_info', $infoBlock);
-
$this->setChild(
'items',
$this->getLayout()->createBlock('adminhtml/sales_order_shipment_create_items')
@@ -78,11 +74,7 @@ protected function _prepareLayout()
'tracking',
$this->getLayout()->createBlock('adminhtml/sales_order_shipment_create_tracking')
);
-// $paymentInfoBlock = $this->getLayout()->createBlock('adminhtml/sales_order_payment')
-// ->setPayment($this->getShipment()->getOrder()->getPayment());
-// $this->setChild('payment_info', $paymentInfoBlock);
-// return parent::_prepareLayout();
return $this;
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
index da7e996fa1f..f37cd5d3158 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
@@ -53,25 +53,26 @@ public function getConfigDataJson()
{
$shipmentId = $this->getShipment()->getId();
$orderId = $this->getRequest()->getParam('order_id');
- $urlParams = array();
+ $urlParams = [];
- $itemsQty = array();
- $itemsPrice = array();
- $itemsName = array();
- $itemsWeight = array();
- $itemsProductId = array();
+ $itemsQty = [];
+ $itemsPrice = [];
+ $itemsName = [];
+ $itemsWeight = [];
+ $itemsProductId = [];
if ($shipmentId) {
$urlParams['shipment_id'] = $shipmentId;
$createLabelUrl = $this->getUrl('*/sales_order_shipment/createLabel', $urlParams);
$itemsGridUrl = $this->getUrl('*/sales_order_shipment/getShippingItemsGrid', $urlParams);
foreach ($this->getShipment()->getAllItems() as $item) {
- $itemsQty[$item->getId()] = $item->getQty();
- $itemsPrice[$item->getId()] = $item->getPrice();
- $itemsName[$item->getId()] = $item->getName();
- $itemsWeight[$item->getId()] = $item->getWeight();
- $itemsProductId[$item->getId()] = $item->getProductId();
- $itemsOrderItemId[$item->getId()] = $item->getOrderItemId();
+ $itemId = $item->getId();
+ $itemsQty[$itemId] = $item->getQty();
+ $itemsPrice[$itemId] = $item->getPrice();
+ $itemsName[$itemId] = $item->getName();
+ $itemsWeight[$itemId] = $item->getWeight();
+ $itemsProductId[$itemId] = $item->getProductId();
+ $itemsOrderItemId[$itemId] = $item->getOrderItemId();
}
} else if ($orderId) {
$urlParams['order_id'] = $orderId;
@@ -79,15 +80,16 @@ public function getConfigDataJson()
$itemsGridUrl = $this->getUrl('*/sales_order_shipment/getShippingItemsGrid', $urlParams);
foreach ($this->getShipment()->getAllItems() as $item) {
- $itemsQty[$item->getOrderItemId()] = $item->getQty()*1;
- $itemsPrice[$item->getOrderItemId()] = $item->getPrice();
- $itemsName[$item->getOrderItemId()] = $item->getName();
- $itemsWeight[$item->getOrderItemId()] = $item->getWeight();
- $itemsProductId[$item->getOrderItemId()] = $item->getProductId();
- $itemsOrderItemId[$item->getOrderItemId()] = $item->getOrderItemId();
+ $orderItemId = $item->getOrderItemId();
+ $itemsQty[$orderItemId] = $item->getQty()*1;
+ $itemsPrice[$orderItemId] = $item->getPrice();
+ $itemsName[$orderItemId] = $item->getName();
+ $itemsWeight[$orderItemId] = $item->getWeight();
+ $itemsProductId[$orderItemId] = $item->getProductId();
+ $itemsOrderItemId[$orderItemId] = $orderItemId;
}
}
- $data = array(
+ $data = [
'createLabelUrl' => $createLabelUrl,
'itemsGridUrl' => $itemsGridUrl,
'errorQtyOverLimit' => Mage::helper('sales')->__('The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)'),
@@ -100,7 +102,7 @@ public function getConfigDataJson()
'shipmentItemsProductId' => $itemsProductId,
'shipmentItemsOrderItemId' => $itemsOrderItemId,
'customizable' => $this->_getCustomizableContainers(),
- );
+ ];
return Mage::helper('core')->jsonEncode($data);
}
@@ -117,14 +119,14 @@ public function getContainers()
$carrier = $order->getShippingCarrier();
$countryShipper = Mage::getStoreConfig(Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, $storeId);
if ($carrier) {
- $params = new Varien_Object(array(
+ $params = new Varien_Object([
'method' => $order->getShippingMethod(true)->getMethod(),
'country_shipper' => $countryShipper,
'country_recipient' => $address->getCountryId(),
- ));
+ ]);
return $carrier->getContainerTypes($params);
}
- return array();
+ return [];
}
/**
@@ -138,7 +140,7 @@ protected function _getCustomizableContainers()
if ($carrier) {
return $carrier->getCustomizableContainerTypes();
}
- return array();
+ return [];
}
/**
@@ -169,7 +171,7 @@ public function getDeliveryConfirmationTypeByCode($code)
$countryId = $this->getShipment()->getOrder()->getShippingAddress()->getCountryId();
$carrier = $this->getShipment()->getOrder()->getShippingCarrier();
if ($carrier) {
- $params = new Varien_Object(array('country_recipient' => $countryId));
+ $params = new Varien_Object(['country_recipient' => $countryId]);
$confirmationTypes = $carrier->getDeliveryConfirmationTypes($params);
$confirmationType = !empty($confirmationTypes[$code]) ? $confirmationTypes[$code] : '';
return $confirmationType;
@@ -203,7 +205,7 @@ public function getPackages()
if ($packages) {
$packages = unserialize($packages, ['allowed_classes' => false]);
} else {
- $packages = array();
+ $packages = [];
}
return $packages;
}
@@ -258,11 +260,11 @@ public function getDeliveryConfirmationTypes()
{
$countryId = $this->getShipment()->getOrder()->getShippingAddress()->getCountryId();
$carrier = $this->getShipment()->getOrder()->getShippingCarrier();
- $params = new Varien_Object(array('country_recipient' => $countryId));
+ $params = new Varien_Object(['country_recipient' => $countryId]);
if ($carrier && is_array($carrier->getDeliveryConfirmationTypes($params))) {
return $carrier->getDeliveryConfirmationTypes($params);
}
- return array();
+ return [];
}
/**
@@ -276,10 +278,10 @@ public function getPrintButton()
$url = $this->getUrl('*/sales_order_shipment/printPackage', $data);
return $this->getLayout()
->createBlock('adminhtml/widget_button')
- ->setData(array(
+ ->setData([
'label' => Mage::helper('sales')->__('Print'),
'onclick' => 'setLocation(\'' . $url . '\')'
- ))
+ ])
->toHtml();
}
@@ -310,14 +312,14 @@ public function getContentTypes()
$carrier = $order->getShippingCarrier();
$countryShipper = Mage::getStoreConfig(Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, $storeId);
if ($carrier) {
- $params = new Varien_Object(array(
+ $params = new Varien_Object([
'method' => $order->getShippingMethod(true)->getMethod(),
'country_shipper' => $countryShipper,
'country_recipient' => $address->getCountryId(),
- ));
+ ]);
return $carrier->getContentTypes($params);
}
- return array();
+ return [];
}
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
index 8afdbaef14b..26765117c2c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
@@ -325,29 +325,4 @@ public function getHeaderHtml()
{
return '->getSkinUrl('images/grid-cal.gif') . ' "' . $this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')) . '")
'
. '' . Mage::helper('adminhtml')->__('From').':'
+ . '' . Mage::helper('adminhtml')->__('From').''
. ''
. ''
. '__('From').': '; -// print_r($this->_dataflow_profile); -// print ''; - if (!$this->_actions) { $e = new Mage_Dataflow_Model_Convert_Exception("Could not find any actions for this profile"); $e->setLevel(Mage_Dataflow_Model_Convert_Exception::FATAL); diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php index 5976c8400e1..4b95895f0de 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Profile.php @@ -295,10 +295,6 @@ public function run() echo $e; } -// if ($batch) { -// $batch->delete(); -// } - $this->setExceptions($profile->getExceptions()); return $this; } @@ -310,13 +306,8 @@ public function _parseGuiData() $p = $this->getGuiData(); if ($this->getDataTransfer()==='interactive') { -// $p['file']['type'] = 'file'; -// $p['file']['filename'] = $p['interactive']['filename']; -// $p['file']['path'] = 'var/export'; - $interactiveXml = '
__('Backups') ?> |
- - getCreateSnapshotButtonHtml(); ?> - getCreateMediaBackupButtonHtml(); ?> - getCreateButtonHtml(); ?> - | -
| - - | -- __('External full page cache.')?> - | -
OpenMage supports PHP 7.0.0 or newer. Find out how to install OpenMage using PHP-CGI as a work-around.