diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon index 39a7220515b..93fbb0bc400 100644 --- a/.phpstan.dist.baseline.neon +++ b/.phpstan.dist.baseline.neon @@ -70,21 +70,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php - - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute\\:\\:isScopeGlobal\\(\\)\\.$#" - count: 2 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php - - - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute\\:\\:isScopeStore\\(\\)\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php - - - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute\\:\\:isScopeWebsite\\(\\)\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php - - message: "#^Property Mage_Adminhtml_Block_Customer_Edit_Tab_View_Sales\\:\\:\\$_collection \\(Mage_Sales_Model_Entity_Sale_Collection\\) does not accept Varien_Data_Collection_Db\\.$#" count: 1 @@ -105,36 +90,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php - - - message: "#^Variable \\$d might not be defined\\.$#" - count: 2 - path: app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php - - - - message: "#^Variable \\$localmaxlength might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php - - - - message: "#^Variable \\$localmaxvalue might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php - - - - message: "#^Variable \\$localminvalue might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php - - - - message: "#^Variable \\$class might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php - - - - message: "#^Variable \\$value might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Notification_Window\\:\\:\\$_aclResourcePath\\.$#" count: 1 @@ -170,21 +125,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php - - - message: "#^Call to an undefined method Mage_Reports_Model_Resource_Report_Collection_Abstract\\:\\:addOrderStatusFilter\\(\\)\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php - - - - message: "#^Cannot call method setPeriod\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" - count: 4 - path: app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php - - - - message: "#^Method Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:addColumn\\(\\) should return Mage_Adminhtml_Block_Report_Grid_Abstract but returns Mage_Adminhtml_Block_Widget_Grid\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php - - message: "#^Property Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:\\$_columnGroupBy \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -200,11 +140,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php - - - message: "#^Call to an undefined method Mage_Reports_Model_Resource_Report_Collection_Abstract\\:\\:addRuleFilter\\(\\)\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php - - message: "#^Return type \\(int\\) of method Mage_Adminhtml_Block_Review_Grid_Filter_Type\\:\\:getCondition\\(\\) should be compatible with return type \\(array\\|null\\) of method Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select\\:\\:getCondition\\(\\)$#" count: 1 @@ -280,21 +215,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php - - - message: "#^Variable \\$createLabelUrl might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php - - - - message: "#^Variable \\$itemsGridUrl might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php - - - - message: "#^Variable \\$itemsOrderItemId might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php - - message: "#^Return type \\(Mage_Sales_Model_Order_Shipment\\) of method Mage_Adminhtml_Block_Sales_Order_Shipment_View_Items\\:\\:getSource\\(\\) should be compatible with return type \\(Mage_Sales_Model_Order_Invoice\\) of method Mage_Adminhtml_Block_Sales_Items_Abstract\\:\\:getSource\\(\\)$#" count: 1 @@ -360,61 +280,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php - - - message: "#^Variable \\$addLabel might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php - - - - message: "#^Variable \\$deleteLabel might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php - - - - message: "#^Variable \\$deleteUrl might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php - - - - message: "#^Variable \\$editLabel might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php - - - - message: "#^Variable \\$saveLabel might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php - - - - message: "#^Variable \\$groupModel might not be defined\\.$#" - count: 18 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php - - - - message: "#^Variable \\$showGroupFieldset might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php - - - - message: "#^Variable \\$showStoreFieldset might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php - - - - message: "#^Variable \\$showWebsiteFieldset might not be defined\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php - - - - message: "#^Variable \\$storeModel might not be defined\\.$#" - count: 21 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php - - - - message: "#^Variable \\$websiteModel might not be defined\\.$#" - count: 15 - path: app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php - - message: "#^Call to an undefined method Mage_Tag_Model_Resource_Tag_Collection\\:\\:addAttributeToFilter\\(\\)\\.$#" count: 1 diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php index 4ecb3350676..1b706ce573b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php @@ -51,7 +51,7 @@ public function getLabel() /** * Check "Use default" checkbox display availability * - * @param Mage_Eav_Model_Entity_Attribute $attribute + * @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute * @return bool */ public function canDisplayUseDefault($attribute) @@ -66,7 +66,7 @@ public function canDisplayUseDefault($attribute) /** * Check default value usage fact * - * @param Mage_Eav_Model_Entity_Attribute|string $attribute + * @param Mage_Catalog_Model_Resource_Eav_Attribute|string $attribute * @return bool */ public function usedDefault($attribute) @@ -104,7 +104,7 @@ public function usedDefault($attribute) * * GLOBAL | WEBSITE | STORE * - * @param Mage_Eav_Model_Entity_Attribute $attribute + * @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute * @return string */ public function getScopeLabel($attribute) @@ -127,7 +127,7 @@ public function getScopeLabel($attribute) /** * Retrieve data object related with form * - * @return Mage_Catalog_Model_Product | Mage_Catalog_Model_Category + * @return Mage_Catalog_Model_Product|Mage_Catalog_Model_Category */ public function getDataObject() { @@ -138,7 +138,7 @@ public function getDataObject() * Retrieve attribute field name * * - * @param Mage_Eav_Model_Entity_Attribute $attribute + * @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute * @return string */ public function getAttributeFieldName($attribute) @@ -153,7 +153,7 @@ public function getAttributeFieldName($attribute) /** * Check readonly attribute * - * @param Mage_Eav_Model_Entity_Attribute|string $attribute + * @param Mage_Catalog_Model_Resource_Eav_Attribute|string $attribute * @return bool */ public function getAttributeReadonly($attribute) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index 706b698b558..80bffcefa97 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -194,6 +194,7 @@ public function getChartUrl($directUrl = true) $dateStart->setTimezone($timezoneLocal); $dateEnd->setTimezone($timezoneLocal); + $d = ''; $dates = []; $datas = []; @@ -256,6 +257,9 @@ public function getChartUrl($directUrl = true) $dataDelimiter = ','; $dataSetdelimiter = '|'; $dataMissing = '_'; + $localmaxlength = []; + $localmaxvalue = []; + $localminvalue = []; // process each string in the array, and find the max length foreach ($this->getAllSeries() as $index => $serie) { @@ -276,13 +280,11 @@ public function getChartUrl($directUrl = true) } // default values - $yrange = 0; $yLabels = []; $miny = 0; $maxy = 0; $yorigin = 0; - $maxlength = max($localmaxlength); if ($minvalue >= 0 && $maxvalue >= 0) { $miny = 0; if ($maxvalue > 10) { @@ -293,15 +295,15 @@ public function getChartUrl($directUrl = true) $maxy = ceil($maxvalue + 1); $yLabels = range($miny, $maxy, 1); } - $yrange = $maxy; - $yorigin = 0; } $chartdata = []; - foreach ($this->getAllSeries() as $index => $serie) { + foreach ($this->getAllSeries() as $serie) { $thisdataarray = $serie; - for ($j = 0; $j < count($thisdataarray); $j++) { + // phpcs:ignore Ecg.Performance.Loop.ArraySize + $thisdataarrayCount = count($thisdataarray); + for ($j = 0; $j < $thisdataarrayCount; $j++) { $currentvalue = $thisdataarray[$j]; if (is_numeric($currentvalue)) { $ylocation = $yorigin + $currentvalue; @@ -320,9 +322,7 @@ public function getChartUrl($directUrl = true) $params['chd'] .= $buffer; - $labelBuffer = ''; $valueBuffer = []; - $rangeBuffer = ''; if (count($this->_axisLabels)) { $params['chxt'] = implode(',', array_keys($this->_axisLabels)); @@ -338,8 +338,7 @@ public function getChartUrl($directUrl = true) case '24h': $this->_axisLabels[$idx][$_index] = $this->formatTime( new Zend_Date($_label, 'yyyy-MM-dd HH:00'), - 'short', - false + 'short' ); break; case '7d': @@ -364,20 +363,22 @@ public function getChartUrl($directUrl = true) $tmpstring = implode('|', $this->_axisLabels[$idx]); $valueBuffer[] = $indexid . ':|' . $tmpstring; + // phpcs:ignore Ecg.Performance.Loop.ArraySize if (count($this->_axisLabels[$idx]) > 1) { + // phpcs:ignore Ecg.Performance.Loop.ArraySize $deltaX = 100 / (count($this->_axisLabels[$idx]) - 1); } else { $deltaX = 100; } } elseif ($idx === 'y') { $valueBuffer[] = $indexid . ':|' . implode('|', $yLabels); + // phpcs:ignore Ecg.Performance.Loop.ArraySize if (count($yLabels) - 1) { + // phpcs:ignore Ecg.Performance.Loop.ArraySize $deltaY = 100 / (count($yLabels) - 1); } else { $deltaY = 100; } - // setting range values for y axis - $rangeBuffer = $indexid . ',' . $miny . ',' . $maxy . '|'; } $indexid++; } diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php index 66f8d4eba14..7303c9a975d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php @@ -43,6 +43,7 @@ public function render(Varien_Object $row) $class = 'minor'; $value = $notice->getSeverities(Mage_AdminNotification_Model_Inbox::SEVERITY_MINOR); break; + default: case Mage_AdminNotification_Model_Inbox::SEVERITY_NOTICE: $class = 'notice'; $value = $notice->getSeverities(Mage_AdminNotification_Model_Inbox::SEVERITY_NOTICE); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php index 309c04c6eda..2deed455cd4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php @@ -60,7 +60,8 @@ public function getResourceCollectionName() public function getCollection() { if (is_null($this->_collection)) { - $this->setCollection(Mage::getModel('reports/grouped_collection')); + $collection = Mage::getModel('reports/grouped_collection'); + $this->setCollection($collection); } return $this->_collection; } @@ -122,7 +123,7 @@ public function addColumn($columnId, $column) /** * Get allowed store ids array intersected with selected scope in store switcher * - * @return array + * @return array */ protected function _getStoreIds() { @@ -165,7 +166,9 @@ protected function _prepareCollection() } } - $resourceCollection = Mage::getResourceModel($this->getResourceCollectionName()) + /** @var Mage_Sales_Model_Resource_Report_Collection_Abstract $resourceCollection */ + $resourceCollection = Mage::getResourceModel($this->getResourceCollectionName()); + $resourceCollection ->setPeriod($filterData->getData('period_type')) ->setDateRange($filterData->getData('from', null), $filterData->getData('to', null)) ->addStoreFilter($storeIds) @@ -193,7 +196,9 @@ protected function _prepareCollection() } if ($this->getCountTotals()) { - $totalsCollection = Mage::getResourceModel($this->getResourceCollectionName()) + /** @var Mage_Sales_Model_Resource_Report_Collection_Abstract $totalsCollection */ + $totalsCollection = Mage::getResourceModel($this->getResourceCollectionName()); + $totalsCollection ->setPeriod($filterData->getData('period_type')) ->setDateRange($filterData->getData('from', null), $filterData->getData('to', null)) ->addStoreFilter($storeIds) @@ -219,7 +224,9 @@ public function getCountTotals() { if (!$this->getTotals()) { $filterData = $this->getFilterData(); - $totalsCollection = Mage::getResourceModel($this->getResourceCollectionName()) + /** @var Mage_Sales_Model_Resource_Report_Collection_Abstract $totalsCollection */ + $totalsCollection = Mage::getResourceModel($this->getResourceCollectionName()); + $totalsCollection ->setPeriod($filterData->getData('period_type')) ->setDateRange($filterData->getData('from', null), $filterData->getData('to', null)) ->addStoreFilter($this->_getStoreIds()) @@ -244,7 +251,9 @@ public function getCountTotals() public function getSubTotals() { $filterData = $this->getFilterData(); - $subTotalsCollection = Mage::getResourceModel($this->getResourceCollectionName()) + /** @var Mage_Sales_Model_Resource_Report_Collection_Abstract $subTotalsCollection */ + $subTotalsCollection = Mage::getResourceModel($this->getResourceCollectionName()); + $subTotalsCollection ->setPeriod($filterData->getData('period_type')) ->setDateRange($filterData->getData('from', null), $filterData->getData('to', null)) ->addStoreFilter($this->_getStoreIds()) @@ -288,7 +297,7 @@ public function getRate($toCurrency) /** * Add order status filter * - * @param Mage_Reports_Model_Resource_Report_Collection_Abstract $collection + * @param Mage_Sales_Model_Resource_Report_Collection_Abstract $collection * @param Varien_Object $filterData * @return $this */ @@ -302,10 +311,11 @@ protected function _addOrderStatusFilter($collection, $filterData) * Adds custom filter to resource collection * Can be overridden in child classes if custom filter needed * - * @param Mage_Reports_Model_Resource_Report_Collection_Abstract $collection + * @param Mage_Sales_Model_Resource_Report_Collection_Abstract $collection * @param Varien_Object $filterData * @return $this */ + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed protected function _addCustomFilter($collection, $filterData) { return $this; diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php index 0fb15f4fdcb..d32c09d8e91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php @@ -148,7 +148,7 @@ protected function _prepareColumns() /** * Add price rule filter * - * @param Mage_Reports_Model_Resource_Report_Collection_Abstract $collection + * @param Mage_SalesRule_Model_Resource_Report_Collection $collection * @param Varien_Object $filterData * @return Mage_Adminhtml_Block_Report_Grid_Abstract */ @@ -162,6 +162,6 @@ protected function _addCustomFilter($collection, $filterData) } } - return parent::_addCustomFilter($filterData, $collection); + return parent::_addCustomFilter($collection, $filterData); } } 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 b7443c55e43..348a59c3be5 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 @@ -43,11 +43,14 @@ public function getConfigDataJson() $orderId = $this->getRequest()->getParam('order_id'); $urlParams = []; - $itemsQty = []; - $itemsPrice = []; - $itemsName = []; - $itemsWeight = []; - $itemsProductId = []; + $createLabelUrl = ''; + $itemsGridUrl = ''; + $itemsQty = []; + $itemsPrice = []; + $itemsName = []; + $itemsWeight = []; + $itemsProductId = []; + $itemsOrderItemId = []; if ($shipmentId) { $urlParams['shipment_id'] = $shipmentId; diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php index 2bbe9a59b27..fd96307fc56 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php @@ -28,6 +28,11 @@ public function __construct() Mage::getSingleton('admin/session')->isAllowed('system/tools/backup') && Mage::helper('core')->isModuleEnabled('Mage_Backup') && !Mage::getStoreConfigFlag('advanced/modules_disable_output/Mage_Backup'); + + $saveLabel = ''; + $deleteLabel = ''; + $deleteUrl = ''; + switch (Mage::registry('store_type')) { case 'website': $this->_objectId = 'website_id'; @@ -71,6 +76,9 @@ public function __construct() */ public function getHeaderText() { + $addLabel = ''; + $editLabel = ''; + switch (Mage::registry('store_type')) { case 'website': $editLabel = Mage::helper('core')->__('Edit Website'); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php index fbd2607b3a5..5ce1a274841 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php @@ -38,17 +38,21 @@ public function __construct() */ protected function _prepareForm() { + $showWebsiteFieldset = false; + $showGroupFieldset = false; + $showStoreFieldset = false; + $websiteModel = null; + $groupModel = null; + $storeModel = null; + if (Mage::registry('store_type') == 'website') { $websiteModel = Mage::registry('store_data'); $showWebsiteFieldset = true; - $showGroupFieldset = $showStoreFieldset = false; } elseif (Mage::registry('store_type') == 'group') { $groupModel = Mage::registry('store_data'); $showGroupFieldset = true; - $showWebsiteFieldset = $showStoreFieldset = false; } elseif (Mage::registry('store_type') == 'store') { $storeModel = Mage::registry('store_data'); - $showWebsiteFieldset = $showGroupFieldset = false; $showStoreFieldset = true; } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index a8818b9b4ef..4b83e07d74b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -328,7 +328,7 @@ public function getCollection() * * @param string $columnId * @param array $column - * @return Mage_Adminhtml_Block_Widget_Grid + * @return $this * @throws Exception */ public function addColumn($columnId, $column) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php index 34e54f3406b..bf71385667d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php @@ -38,6 +38,10 @@ class Mage_Adminhtml_Block_Widget_Grid_Column extends Mage_Adminhtml_Block_Widge protected $_type; protected $_cssClass = null; + /** + * @param Mage_Adminhtml_Block_Widget_Grid $grid + * @return $this + */ public function setGrid($grid) { $this->_grid = $grid; @@ -46,6 +50,9 @@ public function setGrid($grid) return $this; } + /** + * @return Mage_Adminhtml_Block_Widget_Grid + */ public function getGrid() { return $this->_grid; @@ -160,6 +167,7 @@ public function getRowField(Varien_Object $row) */ $frameCallback = $this->getFrameCallback(); if (is_array($frameCallback)) { + // phpcs:ignore Ecg.Security.ForbiddenFunction.Found $renderedValue = call_user_func($frameCallback, $renderedValue, $row, $this, false); } @@ -188,6 +196,7 @@ public function getRowFieldExport(Varien_Object $row) */ $frameCallback = $this->getFrameCallback(); if (is_array($frameCallback)) { + // phpcs:ignore Ecg.Security.ForbiddenFunction.Found $renderedValue = call_user_func($frameCallback, $renderedValue, $row, $this, true); } @@ -222,15 +231,22 @@ protected function &_applyDecorators($value, $decorators) return $value; } + /** + * @param string $renderer + * @return $this + */ public function setRenderer($renderer) { $this->_renderer = $renderer; return $this; } + /** + * @return string + */ protected function _getRendererByType() { - $type = strtolower((string)$this->getType()); + $type = strtolower($this->getType()); $renderers = $this->getGrid()->getColumnRenderers(); if (is_array($renderers) && isset($renderers[$type])) { @@ -317,15 +333,22 @@ public function getRenderer() return $this->_renderer; } + /** + * @param string $filterClass + * @return void + */ public function setFilter($filterClass) { $this->_filter = $this->getLayout()->createBlock($filterClass) ->setColumn($this); } + /** + * @return string + */ protected function _getFilterByType() { - $type = strtolower((string)$this->getType()); + $type = strtolower($this->getType()); $filters = $this->getGrid()->getColumnFilters(); if (is_array($filters) && isset($filters[$type])) { return $filters[$type]; @@ -424,4 +447,9 @@ public function getExportHeader() } return $this->getHeader(); } + + public function getType(): string + { + return (string) $this->_getData('type'); + } } diff --git a/app/code/core/Mage/Api/etc/system.xml b/app/code/core/Mage/Api/etc/system.xml index ebbc5b44b67..8d921ce4935 100644 --- a/app/code/core/Mage/Api/etc/system.xml +++ b/app/code/core/Mage/Api/etc/system.xml @@ -44,6 +44,7 @@ 1 1 1 + required-entry validate-digits validate-zero-or-greater diff --git a/app/code/core/Mage/Authorizenet/etc/system.xml b/app/code/core/Mage/Authorizenet/etc/system.xml index dbf9ebf4e5a..bee6d4445be 100644 --- a/app/code/core/Mage/Authorizenet/etc/system.xml +++ b/app/code/core/Mage/Authorizenet/etc/system.xml @@ -42,6 +42,7 @@ 1 1 0 + 1 <label>Title</label> @@ -49,6 +50,7 @@ <show_in_default>1</show_in_default> <show_in_website>1</show_in_website> <show_in_store>1</show_in_store> + <depends><active>1</active></depends> @@ -58,6 +60,7 @@ 1 1 0 + 1 @@ -67,6 +70,7 @@ 1 1 0 + 1 @@ -76,6 +80,7 @@ 1 1 0 + 1 @@ -85,6 +90,7 @@ 1 1 0 + 1 @@ -94,6 +100,7 @@ 1 1 0 + 1 @@ -103,6 +110,7 @@ 1 1 0 + 1 @@ -110,6 +118,7 @@ 1 1 0 + 1 @@ -119,6 +128,7 @@ 1 1 0 + 1 @@ -128,6 +138,7 @@ 1 1 0 + 1 @@ -137,6 +148,7 @@ 1 1 0 + 1 @@ -145,6 +157,7 @@ 1 1 0 + 1 @@ -154,6 +167,7 @@ 1 1 0 + 1 @@ -163,6 +177,7 @@ 1 1 0 + 1 @@ -172,6 +187,7 @@ 1 1 0 + 1 @@ -181,6 +197,7 @@ 1 1 0 + 1 @@ -188,6 +205,7 @@ 1 1 0 + 1 @@ -195,6 +213,7 @@ 1 1 0 + 1 @@ -203,6 +222,7 @@ 1 0 validate-number + 1 diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml index 3b099086c8b..ba371eaa864 100644 --- a/app/code/core/Mage/Catalog/etc/system.xml +++ b/app/code/core/Mage/Catalog/etc/system.xml @@ -164,6 +164,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -181,6 +182,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -189,6 +191,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -197,6 +200,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -204,6 +208,7 @@ validate-number 40 1 + validate-digits validate-greater-than-zero @@ -400,6 +405,7 @@ 1 1 + validate-digits @@ -427,6 +433,7 @@ 1 1 1 + 1 @@ -436,6 +443,7 @@ 1 1 1 + 1 @@ -445,6 +453,7 @@ 1 1 1 + 1 @@ -563,6 +572,7 @@ 1 0 Warning! Applying MAP by default will hide all product prices on the frontend.]]> + 1 @@ -572,6 +582,7 @@ 1 1 0 + 1 @@ -580,6 +591,7 @@ 1 1 1 + 1 @@ -588,6 +600,7 @@ 1 1 1 + 1 diff --git a/app/code/core/Mage/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml index 242b9f1c14a..3f6fd6a1134 100644 --- a/app/code/core/Mage/Checkout/etc/system.xml +++ b/app/code/core/Mage/Checkout/etc/system.xml @@ -157,6 +157,7 @@ 1 1 1 + 1 diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/system.xml b/app/code/core/Mage/ConfigurableSwatches/etc/system.xml index a26bb0128a2..3a29219ec65 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/system.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/system.xml @@ -50,6 +50,7 @@ 1 1 1 + 1 @@ -59,6 +60,7 @@ 1 1 1 + 1 @@ -68,6 +70,7 @@ 1 1 1 + 1 @@ -85,6 +88,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -92,6 +96,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -109,6 +114,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -116,6 +122,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -133,6 +140,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero @@ -140,6 +148,7 @@ 1 1 1 + required-entry validate-digits validate-greater-than-zero diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml index ef4c78f84ad..c8aaba1adaf 100644 --- a/app/code/core/Mage/Contacts/etc/system.xml +++ b/app/code/core/Mage/Contacts/etc/system.xml @@ -103,6 +103,7 @@ 1 1 1 + 1 diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php index 5a603a1e8a8..a15bf1c4b2c 100644 --- a/app/code/core/Mage/Core/Model/Translate/Inline.php +++ b/app/code/core/Mage/Core/Model/Translate/Inline.php @@ -518,7 +518,7 @@ private function findEndOfTag($body, $tagName, $from) } $length = $end - $from + $tagLength + 3; } - if (preg_match('#<\\\\?\/' . $tagName . '\s*?>#i', $body, $tagMatch, null, $end)) { + if (preg_match('#<\\\\?\/' . $tagName . '\s*?>#i', $body, $tagMatch, 0, $end)) { return $end + strlen($tagMatch[0]); } else { return false; diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 5e1149a72e5..958267e072e 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -74,6 +74,8 @@ 1 1 Number of seconds between each allowed request. + 1 + required-entry validate-digits validate-zero-or-greater @@ -556,6 +558,7 @@ 1 0 0 + 1 @@ -582,6 +585,7 @@ 1 1 1 + 1 @@ -660,6 +664,7 @@ 1 1 Messages with a priority lower than the selected one will not be logged. Log Levels are ordered from highest to lowest priority. + 1 @@ -669,6 +674,7 @@ 1 1 Logging from Mage::log(). File is located in {{base_dir}}/var/log. Allowed file extensions: log, txt, html, csv + 1 @@ -678,6 +684,7 @@ 1 1 Logging from Mage::logException(). File is located in {{base_dir}}/var/log. Allowed file extensions: log, txt, html, csv + 1 @@ -917,6 +924,7 @@ 1 1 For Windows server only. + 0 @@ -925,6 +933,7 @@ 1 1 For Windows server only. + 0 @@ -959,6 +971,7 @@ 1 0 0 + 0 @@ -968,7 +981,10 @@ 1 0 0 - 2 + + 0 + 2 + @@ -1016,6 +1032,7 @@ 1 0 0 + required-entry validate-digits validate-zero-or-greater @@ -1111,6 +1128,7 @@ 1 0 0 + required-entry validate-digits validate-greater-than-zero @@ -1533,6 +1551,7 @@ 1 1 1 + validate-digits diff --git a/app/code/core/Mage/Cron/etc/system.xml b/app/code/core/Mage/Cron/etc/system.xml index ecb957ce4c1..d9ef73359f4 100644 --- a/app/code/core/Mage/Cron/etc/system.xml +++ b/app/code/core/Mage/Cron/etc/system.xml @@ -32,6 +32,7 @@ 1 1 1 + required-entry validate-digits validate-zero-or-greater @@ -39,6 +40,7 @@ 1 1 1 + required-entry validate-digits validate-zero-or-greater @@ -46,6 +48,7 @@ 1 1 1 + required-entry validate-digits validate-zero-or-greater @@ -53,6 +56,7 @@ 1 1 1 + required-entry validate-digits validate-zero-or-greater @@ -60,6 +64,7 @@ 1 1 1 + required-entry validate-digits validate-zero-or-greater @@ -67,6 +72,7 @@ 1 1 1 + required-entry validate-digits validate-zero-or-greater diff --git a/app/code/core/Mage/Customer/etc/system.xml b/app/code/core/Mage/Customer/etc/system.xml index f5bece92add..9fc418bac27 100644 --- a/app/code/core/Mage/Customer/etc/system.xml +++ b/app/code/core/Mage/Customer/etc/system.xml @@ -64,6 +64,7 @@ 0 0 Leave empty for default (15 minutes). + validate-digits @@ -570,6 +571,7 @@ 1 1 1,2 + required-entry validate-digits validate-zero-or-greater @@ -578,6 +580,7 @@ 1 1 1,3 + required-entry validate-digits validate-zero-or-greater @@ -588,6 +591,7 @@ 1 0 0 + required-entry validate-digits validate-zero-or-greater diff --git a/app/code/core/Mage/Downloadable/etc/system.xml b/app/code/core/Mage/Downloadable/etc/system.xml index 1c51f4c6692..0d915b60378 100644 --- a/app/code/core/Mage/Downloadable/etc/system.xml +++ b/app/code/core/Mage/Downloadable/etc/system.xml @@ -40,6 +40,7 @@ 1 1 0 + validate-digits diff --git a/app/code/core/Mage/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml index f2f06b0f10d..404af575afd 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml @@ -46,6 +46,7 @@ 1 1 1 + 1 @@ -74,6 +75,7 @@ 1 1 The tracking code to use. + 1 @@ -81,6 +83,7 @@ 1 1 1 + 1 @@ -92,7 +95,8 @@ 1 Enable GA4 User_id tracking for logged in customers. - analytics4 + 1 + analytics4 @@ -105,7 +109,8 @@ 1 Enable GA4 Debug Real Time view for Development IP. - analytics4 + 1 + analytics4 diff --git a/app/code/core/Mage/Log/etc/system.xml b/app/code/core/Mage/Log/etc/system.xml index 909ffe313dc..b6f9e075df0 100644 --- a/app/code/core/Mage/Log/etc/system.xml +++ b/app/code/core/Mage/Log/etc/system.xml @@ -41,6 +41,7 @@ 1 0 0 + 1,2 @@ -50,6 +51,7 @@ 1 0 0 + 1,2 @@ -68,6 +71,7 @@ 1 0 0 + 1,2 @@ -76,6 +80,7 @@ 1 0 0 + 1,2 @@ -85,6 +90,7 @@ 1 0 0 + 1,2 @@ -94,6 +100,7 @@ 1 0 0 + 1,2 diff --git a/app/code/core/Mage/Oauth/etc/system.xml b/app/code/core/Mage/Oauth/etc/system.xml index 8e39890eac9..32ee3361185 100644 --- a/app/code/core/Mage/Oauth/etc/system.xml +++ b/app/code/core/Mage/Oauth/etc/system.xml @@ -38,6 +38,7 @@ 1 0 0 + required-entry validate-digits validate-zero-or-greater @@ -46,6 +47,7 @@ 1 0 0 + required-entry validate-digits validate-zero-or-greater diff --git a/app/code/core/Mage/Paygate/etc/system.xml b/app/code/core/Mage/Paygate/etc/system.xml index 223761fb902..4eacbc64b02 100644 --- a/app/code/core/Mage/Paygate/etc/system.xml +++ b/app/code/core/Mage/Paygate/etc/system.xml @@ -43,6 +43,7 @@ 1 1 0 + 1 @@ -52,6 +53,7 @@ 1 1 0 + 1 @@ -61,6 +63,7 @@ 1 1 0 + 1 @@ -70,6 +73,7 @@ 1 1 0 + 1 @@ -78,6 +82,7 @@ 1 1 0 + 1 @@ -87,6 +92,7 @@ 1 1 0 + 1 @@ -94,6 +100,7 @@ 1 1 0 + 1 @@ -103,6 +110,7 @@ 1 1 0 + 1 @@ -112,6 +120,7 @@ 1 1 0 + 1 <label>Title</label> @@ -119,6 +128,7 @@ <show_in_default>1</show_in_default> <show_in_website>1</show_in_website> <show_in_store>1</show_in_store> + <depends><active>1</active></depends> @@ -128,6 +138,7 @@ 1 1 0 + 1 @@ -137,6 +148,7 @@ 1 1 0 + 1 @@ -144,6 +156,7 @@ 1 1 0 + 1 @@ -151,6 +164,7 @@ 1 1 0 + 1 @@ -160,6 +174,7 @@ 1 1 0 + 1 @@ -169,6 +184,7 @@ 1 1 0 + 1 @@ -178,6 +194,7 @@ 1 1 0 + 1 @@ -185,6 +202,7 @@ 1 1 0 + 1 @@ -192,6 +210,7 @@ 1 1 0 + 1 @@ -201,6 +220,7 @@ 1 1 0 + 1 @@ -208,6 +228,7 @@ 105 1 1 + 1 @@ -216,6 +237,7 @@ 125 1 1 + 1 @@ -226,6 +248,7 @@ 1 1 1 + 1 @@ -234,7 +257,10 @@ 135 1 1 - 1 + + 1 + 1 + diff --git a/app/code/core/Mage/Payment/etc/system.xml b/app/code/core/Mage/Payment/etc/system.xml index c5f6dfca25e..c0b729176d6 100644 --- a/app/code/core/Mage/Payment/etc/system.xml +++ b/app/code/core/Mage/Payment/etc/system.xml @@ -48,6 +48,7 @@ 1 1 0 + 1 @@ -56,6 +57,7 @@ 1 0 validate-number + 1 <label>Title</label> @@ -63,6 +65,7 @@ <show_in_default>1</show_in_default> <show_in_website>1</show_in_website> <show_in_store>1</show_in_store> + <depends><active>1</active></depends> @@ -72,6 +75,7 @@ 1 1 0 + 1 @@ -82,6 +86,7 @@ 1 0 1 + 1 @@ -89,6 +94,7 @@ 1 1 1 + 1 @@ -97,6 +103,7 @@ 1 1 1 + 1 @@ -104,6 +111,8 @@ 1 1 0 + validate-number + 1 @@ -111,6 +120,8 @@ 1 1 0 + validate-number + 1 @@ -140,6 +151,7 @@ 1 1 0 + 1 @@ -150,6 +162,7 @@ 1 0 + 1 processing,processed_ogone @@ -160,6 +173,7 @@ 1 0 validate-number + 1 <label>Title</label> @@ -167,6 +181,7 @@ <show_in_default>1</show_in_default> <show_in_website>1</show_in_website> <show_in_store>1</show_in_store> + <depends><active>1</active></depends> @@ -176,6 +191,7 @@ 1 1 0 + 1 @@ -186,6 +202,7 @@ 1 0 1 + 1 @@ -231,6 +250,7 @@ 1 1 0 + 1 @@ -239,6 +259,7 @@ 1 0 validate-number + 1 <label>Title</label> @@ -246,6 +267,7 @@ <show_in_default>1</show_in_default> <show_in_website>1</show_in_website> <show_in_store>1</show_in_store> + <depends><active>1</active></depends> @@ -255,6 +277,7 @@ 1 1 0 + 1 @@ -265,6 +288,7 @@ 1 0 1 + 1 @@ -272,6 +296,8 @@ 1 1 0 + validate-number + 1 @@ -279,6 +305,8 @@ 1 1 0 + validate-number + 1 @@ -306,6 +334,7 @@ 1 1 1 + 1 @@ -315,6 +344,7 @@ 1 1 0 + 1 @@ -324,6 +354,7 @@ 1 1 0 + 1 @@ -334,6 +365,7 @@ 1 0 1 + 1 @@ -342,6 +374,7 @@ 1 1 1 + 1 @@ -349,6 +382,8 @@ 1 1 0 + validate-number + 1 @@ -356,6 +391,8 @@ 1 1 0 + validate-number + 1 @@ -363,6 +400,8 @@ 1 1 0 + validate-number + 1 @@ -388,6 +427,7 @@ 1 1 1 + 1 @@ -397,6 +437,7 @@ 1 1 0 + 1 @@ -406,6 +447,7 @@ 1 1 0 + 1 @@ -416,6 +458,7 @@ 1 0 1 + 1 @@ -424,6 +467,7 @@ 1 1 1 + 1 @@ -431,6 +475,8 @@ 1 1 0 + validate-number + 1 @@ -438,6 +484,8 @@ 1 1 0 + validate-number + 1 @@ -445,6 +493,8 @@ 1 1 0 + validate-number + 1 diff --git a/app/code/core/Mage/ProductAlert/etc/system.xml b/app/code/core/Mage/ProductAlert/etc/system.xml index f577f413a34..688e4361e30 100644 --- a/app/code/core/Mage/ProductAlert/etc/system.xml +++ b/app/code/core/Mage/ProductAlert/etc/system.xml @@ -43,7 +43,6 @@ 1 0 - select @@ -52,6 +51,7 @@ 1 1 1 + 1 @@ -61,6 +61,7 @@ 1 1 1 + 1 diff --git a/app/code/core/Mage/Reports/etc/system.xml b/app/code/core/Mage/Reports/etc/system.xml index 28b5d893d1a..e5866a9d11c 100644 --- a/app/code/core/Mage/Reports/etc/system.xml +++ b/app/code/core/Mage/Reports/etc/system.xml @@ -40,6 +40,7 @@ 1 1 1 + validate-digits @@ -47,6 +48,7 @@ 1 1 1 + validate-digits diff --git a/app/code/core/Mage/Sales/etc/system.xml b/app/code/core/Mage/Sales/etc/system.xml index 9740b0aab91..6b37c395b27 100644 --- a/app/code/core/Mage/Sales/etc/system.xml +++ b/app/code/core/Mage/Sales/etc/system.xml @@ -62,6 +62,7 @@ 1 1 0 + required-entry validate-digits validate-zero-or-greater @@ -69,6 +70,7 @@ 1 1 0 + required-entry validate-digits validate-zero-or-greater @@ -76,6 +78,7 @@ 1 1 0 + required-entry validate-digits validate-zero-or-greater @@ -83,6 +86,7 @@ 1 1 0 + required-entry validate-digits validate-zero-or-greater @@ -90,6 +94,7 @@ 1 1 0 + required-entry validate-digits validate-zero-or-greater @@ -152,7 +157,6 @@ - 50 @@ -176,6 +180,7 @@ 1 0 Subtotal after discount. + 1 validate-number @@ -186,6 +191,7 @@ 1 1 This message will be shown in shopping cart when subtotal after discount less than minimum amount. + 1 @@ -194,6 +200,7 @@ 1 1 1 + 1 @@ -203,6 +210,7 @@ 1 1 0 + 1 @@ -212,6 +220,7 @@ 1 1 If empty, the default description above will be used. + 1 @@ -221,6 +230,7 @@ 1 1 If empty, the default error above will be used. + 1 @@ -277,6 +287,7 @@ 1 1 1 + 1 @@ -295,6 +307,7 @@ 1 1 1 + 1 @@ -303,6 +316,7 @@ 1 1 Comma-separated. + 1 @@ -312,10 +326,10 @@ 1 1 1 + 1 - 2 @@ -340,6 +354,7 @@ 1 1 1 + 1 @@ -358,6 +374,7 @@ 1 1 1 + 1 @@ -366,6 +383,7 @@ 1 1 Comma-separated. + 1 @@ -375,10 +393,10 @@ 1 1 1 + 1 - 3 @@ -403,6 +421,7 @@ 1 1 1 + 1 @@ -421,6 +441,7 @@ 1 1 1 + 1 @@ -429,6 +450,7 @@ 1 1 Comma-separated. + 1 @@ -438,6 +460,7 @@ 1 1 1 + 1 @@ -465,6 +488,7 @@ 1 1 1 + 1 @@ -483,6 +508,7 @@ 1 1 1 + 1 @@ -491,6 +517,7 @@ 1 1 Comma-separated. + 1 @@ -500,10 +527,10 @@ 1 1 1 + 1 - 5 @@ -528,6 +555,7 @@ 1 1 1 + 1 @@ -546,6 +575,7 @@ 1 1 1 + 1 @@ -554,6 +584,7 @@ 1 1 Comma-separated. + 1 @@ -563,6 +594,7 @@ 1 1 1 + 1 @@ -590,6 +622,7 @@ 1 1 1 + 1 @@ -608,6 +642,7 @@ 1 1 1 + 1 @@ -616,6 +651,7 @@ 1 1 Comma-separated. + 1 @@ -625,10 +661,10 @@ 1 1 1 + 1 - 7 @@ -653,6 +689,7 @@ 1 1 1 + 1 @@ -671,6 +709,7 @@ 1 1 1 + 1 @@ -679,6 +718,7 @@ 1 1 Comma-separated. + 1 @@ -688,6 +728,7 @@ 1 1 1 + 1 @@ -715,6 +756,7 @@ 1 1 1 + 1 @@ -733,6 +776,7 @@ 1 1 1 + 1 @@ -741,6 +785,7 @@ 1 1 Comma-separated. + 1 @@ -750,6 +795,7 @@ 1 1 1 + 1 diff --git a/app/code/core/Mage/Sendfriend/etc/system.xml b/app/code/core/Mage/Sendfriend/etc/system.xml index dc748326d8d..cb5f4597726 100644 --- a/app/code/core/Mage/Sendfriend/etc/system.xml +++ b/app/code/core/Mage/Sendfriend/etc/system.xml @@ -49,6 +49,7 @@ 1 1 1 + 1 @@ -58,6 +59,7 @@ 1 1 1 + 1 @@ -66,6 +68,7 @@ 1 1 validate-digits + 1 @@ -74,6 +77,7 @@ 1 1 validate-digits + 1 @@ -83,6 +87,7 @@ 1 1 1 + 1 diff --git a/app/code/core/Mage/Shipping/etc/system.xml b/app/code/core/Mage/Shipping/etc/system.xml index 0aa00b485e0..0112f8e6b5f 100644 --- a/app/code/core/Mage/Shipping/etc/system.xml +++ b/app/code/core/Mage/Shipping/etc/system.xml @@ -47,6 +47,7 @@ 1 1 0 + 1 @@ -136,6 +137,7 @@ 1 1 1 + 1 @@ -144,6 +146,7 @@ 1 1 0 + 1 @@ -153,6 +156,7 @@ 1 1 0 + 1 @@ -161,6 +165,7 @@ 1 1 0 + 1 @@ -168,6 +173,7 @@ 1 1 0 + 1 <label>Title</label> @@ -175,6 +181,7 @@ <show_in_default>1</show_in_default> <show_in_website>1</show_in_website> <show_in_store>1</show_in_store> + <depends><active>1</active></depends> @@ -184,6 +191,7 @@ 1 1 0 + 1 @@ -194,6 +202,7 @@ 1 1 0 + 1 @@ -204,6 +213,7 @@ 1 0 1 + 1 @@ -213,6 +223,7 @@ 1 1 0 + 1 @@ -221,6 +232,7 @@ 1 1 1 + 1 @@ -247,6 +259,7 @@ 1 1 0 + 1 @@ -254,6 +267,7 @@ 1 1 1 + 1 @@ -261,6 +275,7 @@ 1 1 0 + 1 <label>Title</label> @@ -268,6 +283,7 @@ <show_in_default>1</show_in_default> <show_in_website>1</show_in_website> <show_in_store>1</show_in_store> + <depends><active>1</active></depends> @@ -278,6 +294,7 @@ 1 1 0 + 1 @@ -288,6 +305,7 @@ 1 0 1 + 1 @@ -297,6 +315,7 @@ 1 1 0 + 1 @@ -305,6 +324,7 @@ 1 1 1 + 1 @@ -323,7 +343,8 @@ 1 1 0 - + 1 + validate-number validate-zero-or-greater @@ -331,6 +352,7 @@ 1 1 0 + 1 @@ -349,6 +371,7 @@ 1 1 0 + 1 @@ -358,6 +381,7 @@ 1 1 0 + 1 @@ -366,6 +390,7 @@ 0 1 0 + 1 @@ -375,6 +400,7 @@ 0 1 0 + 1 @@ -382,6 +408,7 @@ 1 1 1 + 1 @@ -389,6 +416,7 @@ 1 1 0 + 1 <label>Title</label> @@ -396,6 +424,7 @@ <show_in_default>1</show_in_default> <show_in_website>1</show_in_website> <show_in_store>1</show_in_store> + <depends><active>1</active></depends> @@ -406,6 +435,7 @@ 1 1 0 + 1 @@ -416,6 +446,7 @@ 1 0 1 + 1 @@ -426,6 +457,7 @@ 1 1 0 + 1 @@ -434,6 +466,7 @@ 1 1 1 + 1 diff --git a/app/code/core/Mage/Sitemap/etc/system.xml b/app/code/core/Mage/Sitemap/etc/system.xml index a06663f6ae0..216e6c29a98 100644 --- a/app/code/core/Mage/Sitemap/etc/system.xml +++ b/app/code/core/Mage/Sitemap/etc/system.xml @@ -48,6 +48,8 @@ 1 1 Valid values range: from 0.0 to 1.0. + validate-number + always,hourly,daily,weekly,monthly,yearly,never @@ -57,6 +59,7 @@ 1 1 1 + always,hourly,daily,weekly,monthly,yearly,never @@ -84,6 +87,8 @@ 1 1 Valid values range: from 0.0 to 1.0. + validate-number + always,hourly,daily,weekly,monthly,yearly,never @@ -93,6 +98,7 @@ 1 1 1 + always,hourly,daily,weekly,monthly,yearly,never @@ -120,6 +126,8 @@ 1 1 Valid values range: from 0.0 to 1.0. + validate-number + always,hourly,daily,weekly,monthly,yearly,never @@ -129,6 +137,7 @@ 1 1 1 + always,hourly,daily,weekly,monthly,yearly,never @@ -155,6 +164,7 @@ 1 1 1 + 1 @@ -164,6 +174,7 @@ 1 1 0 + 1 @@ -173,6 +184,7 @@ 1 1 0 + 1 @@ -183,6 +195,7 @@ 1 1 1 + 1 diff --git a/app/code/core/Mage/Usa/etc/system.xml b/app/code/core/Mage/Usa/etc/system.xml index 33e8ba786f9..2a2dcbf859e 100644 --- a/app/code/core/Mage/Usa/etc/system.xml +++ b/app/code/core/Mage/Usa/etc/system.xml @@ -31,6 +31,7 @@ 1 1 0 + 1 @@ -50,6 +51,7 @@ 1 0 1 + 1 @@ -57,6 +59,7 @@ 1 1 0 + 1