From 7e5abd1e211ff9b95455cdb9692b99eaaf835886 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 8 Oct 2024 04:35:10 +0200
Subject: [PATCH 1/6] Admin config: added input validation & hide disabled
 options (#4232)

* Added depend and validate node to system.xml

* update
---
 app/code/core/Mage/Api/etc/system.xml         |   1 +
 .../core/Mage/Authorizenet/etc/system.xml     |  20 ++
 app/code/core/Mage/Catalog/etc/system.xml     |  13 ++
 app/code/core/Mage/Checkout/etc/system.xml    |   1 +
 .../Mage/ConfigurableSwatches/etc/system.xml  |   9 +
 app/code/core/Mage/Contacts/etc/system.xml    |   1 +
 app/code/core/Mage/Core/etc/system.xml        |  21 +-
 app/code/core/Mage/Cron/etc/system.xml        |   6 +
 app/code/core/Mage/Customer/etc/system.xml    |   4 +
 .../core/Mage/Downloadable/etc/system.xml     |   1 +
 .../core/Mage/GoogleAnalytics/etc/system.xml  |   9 +-
 app/code/core/Mage/Log/etc/system.xml         |   7 +
 app/code/core/Mage/Oauth/etc/system.xml       |   2 +
 app/code/core/Mage/Paygate/etc/system.xml     |  28 ++-
 app/code/core/Mage/Payment/etc/system.xml     |  50 +++++
 .../core/Mage/ProductAlert/etc/system.xml     |   3 +-
 app/code/core/Mage/Reports/etc/system.xml     |   2 +
 app/code/core/Mage/Sales/etc/system.xml       |  56 ++++-
 app/code/core/Mage/Sendfriend/etc/system.xml  |   5 +
 app/code/core/Mage/Shipping/etc/system.xml    |  35 +++-
 app/code/core/Mage/Sitemap/etc/system.xml     |  14 ++
 app/code/core/Mage/Usa/etc/system.xml         | 192 +++++++++++++++++-
 app/code/core/Mage/Weee/etc/system.xml        |   7 +
 23 files changed, 467 insertions(+), 20 deletions(-)

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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </session_timeout>
                         <compliance_wsi translate="label">
                             <label>WS-I Compliance</label>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </payment_action>
                         <title translate="label">
                             <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>
                         </title>
                         <login translate="label">
                             <label>API Login ID</label>
@@ -58,6 +60,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </login>
                         <trans_key translate="label">
                             <label>Transaction Key</label>
@@ -67,6 +70,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </trans_key>
                         <signature_key translate="label">
                             <label>Signature Key</label>
@@ -76,6 +80,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </signature_key>
                         <trans_md5 translate="label">
                             <label>Merchant MD5</label>
@@ -85,6 +90,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </trans_md5>
                         <order_status translate="label">
                             <label>New Order Status</label>
@@ -94,6 +100,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </order_status>
                         <test translate="label">
                             <label>Test Mode</label>
@@ -103,6 +110,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </test>
                         <cgi_url translate="label">
                             <label>Gateway URL</label>
@@ -110,6 +118,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </cgi_url>
                         <currency translate="label">
                             <label>Accepted Currency</label>
@@ -119,6 +128,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </currency>
                         <debug translate="label">
                             <label>Debug</label>
@@ -128,6 +138,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </debug>
                         <email_customer translate="label">
                             <label>Email Customer</label>
@@ -137,6 +148,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </email_customer>
                         <merchant_email translate="label">
                             <label>Merchant's Email</label>
@@ -145,6 +157,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </merchant_email>
                         <cctypes translate="label">
                             <label>Credit Card Types</label>
@@ -154,6 +167,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </cctypes>
                         <useccv translate="label">
                             <label>Credit Card Verification</label>
@@ -163,6 +177,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </useccv>
                         <allowspecific translate="label">
                             <label>Payment from Applicable Countries</label>
@@ -172,6 +187,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </allowspecific>
                         <specificcountry translate="label">
                             <label>Payment from Specific Countries</label>
@@ -181,6 +197,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <min_order_total translate="label">
                             <label>Minimum Order Total</label>
@@ -188,6 +205,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </min_order_total>
                         <max_order_total translate="label">
                             <label>Maximum Order Total</label>
@@ -195,6 +213,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </max_order_total>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -203,6 +222,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </sort_order>
                     </fields>
                 </authorizenet_directpost>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </lines_perpage>
                     </fields>
                 </sitemap>
@@ -181,6 +182,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </base_width>
                         <small_width translate="label comment">
                             <label>Small Image Width</label>
@@ -189,6 +191,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </small_width>
                         <max_dimension translate="label comment">
                             <label>Maximum resolution for upload image</label>
@@ -197,6 +200,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </max_dimension>
                         <progressive_threshold translate="label comment">
                             <label>Enable Progressive Images Threshold</label>
@@ -204,6 +208,7 @@
                             <validate>validate-number</validate>
                             <sort_order>40</sort_order>
                             <show_in_default>1</show_in_default>
+                            <validate>validate-digits validate-greater-than-zero</validate>
                         </progressive_threshold>
                     </fields>
                 </product_image>
@@ -400,6 +405,7 @@
                             <label>Maximal Depth</label>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
+                            <frontend_class>validate-digits</frontend_class>
                         </max_depth>
                     </fields>
                 </navigation>
@@ -427,6 +433,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><use_calendar>1</use_calendar></depends>
                         </date_fields_order>
                         <time_format translate="label">
                             <label>Time Format</label>
@@ -436,6 +443,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><use_calendar>1</use_calendar></depends>
                         </time_format>
                         <year_range translate="label comment">
                             <label>Year Range</label>
@@ -445,6 +453,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><use_calendar>1</use_calendar></depends>
                         </year_range>
                     </fields>
                 </custom_options>
@@ -563,6 +572,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <comment><![CDATA[<strong style="color:red">Warning!</strong> Applying MAP by default will hide all product prices on the frontend.]]></comment>
+                            <depends><enabled>1</enabled></depends>
                         </apply_for_all>
                         <display_price_type translate="label">
                             <label>Display Actual Price</label>
@@ -572,6 +582,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </display_price_type>
                         <explanation_message translate="label">
                             <label>Default Popup Text Message</label>
@@ -580,6 +591,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </explanation_message>
                         <explanation_message_whats_this translate="label">
                             <label>Default "What's This" Text Message</label>
@@ -588,6 +600,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </explanation_message_whats_this>
                     </fields>
                 </msrp>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><display>1</display></depends>
                         </count>
                     </fields>
                 </sidebar>
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 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><enabled>1</enabled></depends>
                         </swatch_attributes>
                         <product_list_attribute translate="label">
                             <label>Product Attribute to Use for Swatches in Product Listing</label>
@@ -59,6 +60,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </product_list_attribute>
                         <product_list_price_change translate="label" module="configurableswatches">
                             <label>Dynamic Price Change for Swatches in Product Listing</label>
@@ -68,6 +70,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </product_list_price_change>
                     </fields>
                 </general>
@@ -85,6 +88,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </width>
                         <height translate="label">
                             <label>Height</label>
@@ -92,6 +96,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </height>
                     </fields>
                 </product_detail_dimensions>
@@ -109,6 +114,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </width>
                         <height translate="label">
                             <label>Height</label>
@@ -116,6 +122,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </height>
                     </fields>
                 </product_listing_dimensions>
@@ -133,6 +140,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </width>
                         <height translate="label">
                             <label>Height</label>
@@ -140,6 +148,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </height>
                     </fields>
                 </layered_nav_dimensions>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </email_template>
                     </fields>
                 </auto_reply>
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 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Number of seconds between each allowed request.</comment>
+                            <depends><active>1</active></depends>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </timeframe>
                     </fields>
                 </rate_limit>
@@ -556,6 +558,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><template_hints_admin>1</template_hints_admin></depends>
                         </template_hints_blocks_admin>
                         <head_front>
                             <label>Frontend</label>
@@ -582,6 +585,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><template_hints>1</template_hints></depends>
                         </template_hints_blocks>
                     </fields>
                 </debug>
@@ -660,6 +664,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Messages with a priority lower than the selected one will not be logged. Log Levels are ordered from highest to lowest priority.</comment>
+                            <depends><active>1</active></depends>
                         </max_level>
                         <file translate="label comment">
                             <label>System Log File Name</label>
@@ -669,6 +674,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Logging from Mage::log(). File is located in {{base_dir}}/var/log. Allowed file extensions: log, txt, html, csv</comment>
+                            <depends><active>1</active></depends>
                         </file>
                         <exception_file translate="label comment">
                             <label>Exceptions Log File Name</label>
@@ -678,6 +684,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Logging from Mage::logException(). File is located in {{base_dir}}/var/log. Allowed file extensions: log, txt, html, csv</comment>
+                            <depends><active>1</active></depends>
                         </exception_file>
                     </fields>
                 </log>
@@ -917,6 +924,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>For Windows server only.</comment>
+                            <depends><disable>0</disable></depends>
                         </host>
                         <port translate="label">
                             <label>Port (25)</label>
@@ -925,6 +933,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>For Windows server only.</comment>
+                            <depends><disable>0</disable></depends>
                         </port>
                         <!--
                         <auth translate="label">
@@ -935,6 +944,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><disable>0</disable></depends>
                         </auth>
                         <username translate="label">
                             <label>Username</label>
@@ -942,6 +952,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><disable>0</disable></depends>
                         </username>
                         <password translate="label">
                             <label>Password</label>
@@ -949,6 +960,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><disable>0</disable></depends>
                         </password>
                         -->
                         <set_return_path translate="label">
@@ -959,6 +971,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><disable>0</disable></depends>
                         </set_return_path>
                         <return_path_email translate="label">
                             <label>Return-Path Email</label>
@@ -968,7 +981,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
-                            <depends><set_return_path>2</set_return_path></depends>
+                            <depends>
+                                <disable>0</disable>
+                                <set_return_path>2</set_return_path>
+                            </depends>
                         </return_path_email>
                     </fields>
                 </smtp>
@@ -1016,6 +1032,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </configuration_update_time>
                     </fields>
                 </media_storage_configuration>
@@ -1111,6 +1128,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-greater-than-zero</validate>
                         </password_reset_link_expiration_period>
                         <admin_notification_email_template translate="label">
                             <label>New Admin User Email Template</label>
@@ -1533,6 +1551,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <frontend_class>validate-digits</frontend_class>
                         </cookie_lifetime>
                         <cookie_path translate="label">
                             <label>Cookie Path</label>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </schedule_generate_every>
                         <schedule_ahead_for translate="label">
                             <label>Schedule Ahead for</label>
@@ -39,6 +40,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </schedule_ahead_for>
                         <schedule_lifetime translate="label">
                             <label>Missed if Not Run Within</label>
@@ -46,6 +48,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </schedule_lifetime>
                         <history_cleanup_every translate="label">
                             <label>History Cleanup Every</label>
@@ -53,6 +56,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </history_cleanup_every>
                         <history_success_lifetime translate="label">
                             <label>Success History Lifetime</label>
@@ -60,6 +64,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </history_success_lifetime>
                         <history_failure_lifetime translate="label">
                             <label>Failure History Lifetime</label>
@@ -67,6 +72,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </history_failure_lifetime>
                     </fields>
                 </cron>
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 @@
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
                             <comment>Leave empty for default (15 minutes).</comment>
+                            <frontend_class>validate-digits</frontend_class>
                         </online_minutes_interval>
                     </fields>
                 </online_customers>
@@ -570,6 +571,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <depends><forgot_password_flow_secure separator=",">1,2</forgot_password_flow_secure></depends>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </forgot_password_ip_times>
                         <forgot_password_email_times translate="label">
                             <label>Forgot password requests to times per 24 hours from 1 e-mail</label>
@@ -578,6 +580,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <depends><forgot_password_flow_secure separator=",">1,3</forgot_password_flow_secure></depends>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </forgot_password_email_times>
                         <min_admin_password_length translate="label comment">
                             <label>Minimum admin password length</label>
@@ -588,6 +591,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </min_admin_password_length>
                     </fields>
                 </security>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-digits</frontend_class>
                         </downloads_number>
                         <shareable translate="label">
                             <label>Shareable</label>
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 @@
                             <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>
                         </container_id>
                     </fields>
                 </gtm>
@@ -74,6 +75,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>The tracking code to use.</comment>
+                            <depends><active>1</active></depends>
                         </type>
                         <account translate="label">
                             <label>Account Number</label>
@@ -81,6 +83,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>
                         </account>
                         <user_id translate="label comment">
                             <label>User ID tracking</label>
@@ -92,7 +95,8 @@
                             <show_in_store>1</show_in_store>
                             <comment>Enable GA4 User_id tracking for logged in customers.</comment>
                             <depends>
-                              <type>analytics4</type>
+                                <active>1</active>
+                                <type>analytics4</type>
                             </depends>
                         </user_id>
                         <debug translate="label comment">
@@ -105,7 +109,8 @@
                             <show_in_store>1</show_in_store>
                             <comment>Enable GA4 Debug Real Time view for Development IP.</comment>
                             <depends>
-                              <type>analytics4</type>
+                                <active>1</active>
+                                <type>analytics4</type>
                             </depends>
                         </debug>
                     </fields>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable_log separator=",">1,2</enable_log></depends>
                         </clean_after_day>
                         <enabled translate="label">
                             <label>Enable Log Cleaning</label>
@@ -50,6 +51,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable_log separator=",">1,2</enable_log></depends>
                         </enabled>
                         <time translate="label">
                             <label>Start Time</label>
@@ -58,6 +60,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable_log separator=",">1,2</enable_log></depends>
                         </time>
                         <frequency translate="label">
                             <label>Frequency</label>
@@ -68,6 +71,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable_log separator=",">1,2</enable_log></depends>
                         </frequency>
                         <error_email translate="label">
                             <label>Error Email Recipient</label>
@@ -76,6 +80,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable_log separator=",">1,2</enable_log></depends>
                         </error_email>
                         <error_email_identity translate="label">
                             <label>Error Email Sender</label>
@@ -85,6 +90,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable_log separator=",">1,2</enable_log></depends>
                         </error_email_identity>
                         <error_email_template translate="label">
                             <label>Error Email Template</label>
@@ -94,6 +100,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable_log separator=",">1,2</enable_log></depends>
                         </error_email_template>
                     </fields>
                 </log>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </cleanup_probability>
                         <expiration_period translate="label">
                             <label>Expiration Period</label>
@@ -46,6 +47,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </expiration_period>
                     </fields>
                 </cleanup>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </cctypes>
                         <useccv translate="label">
                             <label>Credit Card Verification</label>
@@ -52,6 +53,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </useccv>
                         <email_customer translate="label">
                             <label>Email Customer</label>
@@ -61,6 +63,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </email_customer>
                         <login translate="label">
                             <label>API Login ID</label>
@@ -70,6 +73,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </login>
                         <merchant_email translate="label">
                             <label>Merchant's Email</label>
@@ -78,6 +82,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </merchant_email>
                         <order_status translate="label">
                             <label>New Order Status</label>
@@ -87,6 +92,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </order_status>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -94,6 +100,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <test translate="label">
                             <label>Test Mode</label>
@@ -103,6 +110,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </test>
                         <debug translate="label">
                             <label>Debug</label>
@@ -112,6 +120,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </debug>
                         <title translate="label">
                             <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>
                         </title>
                         <trans_key translate="label">
                             <label>Transaction Key</label>
@@ -128,6 +138,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </trans_key>
                         <payment_action translate="label">
                             <label>Payment Action</label>
@@ -137,6 +148,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </payment_action>
                         <cgi_url>
                             <label>Gateway URL</label>
@@ -144,6 +156,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </cgi_url>
                         <cgi_url_td>
                             <label>Payment Update URL</label>
@@ -151,6 +164,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </cgi_url_td>
                         <currency translate="label">
                             <label>Accepted Currency</label>
@@ -160,6 +174,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </currency>
                         <allowspecific translate="label">
                             <label>Payment from Applicable Countries</label>
@@ -169,6 +184,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </allowspecific>
                         <specificcountry translate="label">
                             <label>Payment from Specific Countries</label>
@@ -178,6 +194,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <min_order_total translate="label">
                             <label>Minimum Order Total</label>
@@ -185,6 +202,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </min_order_total>
                         <max_order_total translate="label">
                             <label>Maximum Order Total</label>
@@ -192,6 +210,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </max_order_total>
                         <allow_partial_authorization translate="label">
                             <label>Allow Partial Authorization</label>
@@ -201,6 +220,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </allow_partial_authorization>
                         <heading_3dsecure translate="label">
                             <label>3D Secure</label>
@@ -208,6 +228,7 @@
                             <sort_order>105</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
+                            <depends><active>1</active></depends>
                         </heading_3dsecure>
                         <centinel translate="label">
                             <label>3D Secure Card Validation</label>
@@ -216,6 +237,7 @@
                             <sort_order>125</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
+                            <depends><active>1</active></depends>
                         </centinel>
                         <centinel_is_mode_strict translate="label comment">
                             <label>Severe 3D Secure Card Validation</label>
@@ -226,6 +248,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <depends><centinel>1</centinel></depends>
+                            <depends><active>1</active></depends>
                         </centinel_is_mode_strict>
                         <centinel_api_url translate="label comment">
                             <label>Centinel API URL</label>
@@ -234,7 +257,10 @@
                             <sort_order>135</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <depends><centinel>1</centinel></depends>
+                            <depends>
+                                <active>1</active>
+                                <centinel>1</centinel>
+                            </depends>
                         </centinel_api_url>
                         <model>
                         </model>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </order_status>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -56,6 +57,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <title translate="label">
                             <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>
                         </title>
                          <allowspecific translate="label">
                             <label>Payment from Applicable Countries</label>
@@ -72,6 +75,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                             <depends><active>1</active></depends>
                         </allowspecific>
                         <specificcountry translate="label">
                             <label>Payment from Specific Countries</label>
@@ -82,6 +86,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <payable_to translate="label">
                             <label>Make Check Payable to</label>
@@ -89,6 +94,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>
                         </payable_to>
                         <mailing_address translate="label">
                             <label>Send Check to</label>
@@ -97,6 +103,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>
                         </mailing_address>
                         <min_order_total translate="label">
                             <label>Minimum Order Total</label>
@@ -104,6 +111,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </min_order_total>
                         <max_order_total translate="label">
                             <label>Maximum Order Total</label>
@@ -111,6 +120,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </max_order_total>
                         <model>
                         </model>
@@ -140,6 +151,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </order_status>
                         <payment_action translate="label">
                             <label>Automatically Invoice All Items</label>
@@ -150,6 +162,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <depends>
+                                <active>1</active>
                                 <order_status separator=",">processing,processed_ogone</order_status>
                             </depends>
                         </payment_action>
@@ -160,6 +173,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <title translate="label">
                             <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>
                         </title>
                         <allowspecific translate="label">
                             <label>Payment from Applicable Countries</label>
@@ -176,6 +191,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </allowspecific>
                         <specificcountry translate="label">
                             <label>Payment from Specific Countries</label>
@@ -186,6 +202,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
 <!--
                         <min_order_total translate="label">
@@ -194,6 +211,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </min_order_total>
                         <max_order_total translate="label">
                             <label>Maximum Order Total</label>
@@ -201,6 +219,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </max_order_total>
 -->
                         <model>
@@ -231,6 +250,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </order_status>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -239,6 +259,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <title translate="label">
                             <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>
                         </title>
                         <allowspecific translate="label">
                             <label>Payment from Applicable Countries</label>
@@ -255,6 +277,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </allowspecific>
                         <specificcountry translate="label">
                             <label>Payment from Specific Countries</label>
@@ -265,6 +288,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <min_order_total translate="label">
                             <label>Minimum Order Total</label>
@@ -272,6 +296,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </min_order_total>
                         <max_order_total translate="label">
                             <label>Maximum Order Total</label>
@@ -279,6 +305,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </max_order_total>
                         <model>
                         </model>
@@ -306,6 +334,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>
                         </title>
                         <order_status translate="label">
                             <label>New Order Status</label>
@@ -315,6 +344,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </order_status>
                         <allowspecific translate="label">
                             <label>Payment from Applicable Countries</label>
@@ -324,6 +354,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </allowspecific>
                         <specificcountry translate="label">
                             <label>Payment from Specific Countries</label>
@@ -334,6 +365,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <instructions translate="label">
                             <label>Instructions</label>
@@ -342,6 +374,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>
                         </instructions>
                         <min_order_total translate="label">
                             <label>Minimum Order Total</label>
@@ -349,6 +382,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </min_order_total>
                         <max_order_total translate="label">
                             <label>Maximum Order Total</label>
@@ -356,6 +391,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </max_order_total>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -363,6 +400,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </sort_order>
                     </fields>
                 </banktransfer>
@@ -388,6 +427,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>
                         </title>
                         <order_status translate="label">
                             <label>New Order Status</label>
@@ -397,6 +437,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </order_status>
                         <allowspecific translate="label">
                             <label>Payment from Applicable Countries</label>
@@ -406,6 +447,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </allowspecific>
                         <specificcountry translate="label">
                             <label>Payment from Specific Countries</label>
@@ -416,6 +458,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <instructions translate="label">
                             <label>Instructions</label>
@@ -424,6 +467,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>
                         </instructions>
                         <min_order_total translate="label">
                             <label>Minimum Order Total</label>
@@ -431,6 +475,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </min_order_total>
                         <max_order_total translate="label">
                             <label>Maximum Order Total</label>
@@ -438,6 +484,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </max_order_total>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -445,6 +493,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><active>1</active></depends>
                         </sort_order>
                     </fields>
                 </cashondelivery>
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 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                         </allow_stock>
-
                         <email_price_template translate="label">
                             <label>Price Alert Email Template</label>
                             <frontend_type>select</frontend_type>
@@ -52,6 +51,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><allow_price>1</allow_price></depends>
                         </email_price_template>
                         <email_stock_template translate="label">
                             <label>Stock Alert Email Template</label>
@@ -61,6 +61,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><allow_stock>1</allow_stock></depends>
                         </email_stock_template>
                         <email_identity translate="label">
                             <label>Alert Email Sender</label>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <frontend_class>validate-digits</frontend_class>
                         </viewed_count>
                         <compared_count translate="label">
                             <label>Default Recently Compared Products Count</label>
@@ -47,6 +48,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <frontend_class>validate-digits</frontend_class>
                         </compared_count>
                     </fields>
                 </recently_products>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </discount>
                         <grand_total translate="label">
                             <label>Grand Total</label>
@@ -69,6 +70,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </grand_total>
                         <shipping translate="label">
                             <label>Shipping</label>
@@ -76,6 +78,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </shipping>
                         <subtotal translate="label">
                             <label>Subtotal</label>
@@ -83,6 +86,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </subtotal>
                         <tax translate="label">
                             <label>Tax</label>
@@ -90,6 +94,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <validate>required-entry validate-digits validate-zero-or-greater</validate>
                         </tax>
                     </fields>
                 </totals_sort>
@@ -152,7 +157,6 @@
                         </address>
                     </fields>
                 </identity>
-
                 <minimum_order translate="label">
                     <label>Minimum Order Amount</label>
                     <sort_order>50</sort_order>
@@ -176,6 +180,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <comment>Subtotal after discount.</comment>
+                            <depends><active>1</active></depends>
                             <validate>validate-number</validate>
                         </amount>
                         <description translate="label comment">
@@ -186,6 +191,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>This message will be shown in shopping cart when subtotal after discount less than minimum amount.</comment>
+                            <depends><active>1</active></depends>
                         </description>
                         <error_message translate="label">
                             <label>Error to Show in Shopping Cart</label>
@@ -194,6 +200,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>
                         </error_message>
                         <multi_address translate="label">
                             <label>Validate Each Address Separately in Multi-address Checkout</label>
@@ -203,6 +210,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </multi_address>
                         <multi_address_description translate="label comment">
                             <label>Multi-address Description Message</label>
@@ -212,6 +220,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>If empty, the default description above will be used.</comment>
+                            <depends><active>1</active></depends>
                         </multi_address_description>
                         <multi_address_error_message translate="label comment">
                             <label>Multi-address Error to Show in Shopping Cart</label>
@@ -221,6 +230,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>If empty, the default error above will be used.</comment>
+                            <depends><active>1</active></depends>
                         </multi_address_error_message>
                     </fields>
                 </minimum_order>
@@ -277,6 +287,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </identity>
                         <template translate="label">
                             <label>New Order Confirmation Template</label>
@@ -286,6 +297,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <guest_template translate="label">
                             <label>New Order Confirmation Template for Guest</label>
@@ -295,6 +307,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </guest_template>
                         <copy_to translate="label comment">
                             <label>Send Order Email Copy To</label>
@@ -303,6 +316,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Comma-separated.</comment>
+                            <depends><enabled>1</enabled></depends>
                         </copy_to>
                         <copy_method translate="label">
                             <label>Send Order Email Copy Method</label>
@@ -312,10 +326,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </copy_method>
                     </fields>
                 </order>
-
                 <order_comment translate="label">
                     <label>Order Comments</label>
                     <sort_order>2</sort_order>
@@ -340,6 +354,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </identity>
                         <template translate="label">
                             <label>Order Comment Email Template</label>
@@ -349,6 +364,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <guest_template translate="label">
                             <label>Order Comment Email Template for Guest</label>
@@ -358,6 +374,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </guest_template>
                         <copy_to translate="label comment">
                             <label>Send Order Comment Email Copy To</label>
@@ -366,6 +383,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Comma-separated.</comment>
+                            <depends><enabled>1</enabled></depends>
                         </copy_to>
                         <copy_method translate="label">
                             <label>Send Order Comments Email Copy Method</label>
@@ -375,10 +393,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </copy_method>
                     </fields>
                 </order_comment>
-
                 <invoice translate="label">
                     <label>Invoice</label>
                     <sort_order>3</sort_order>
@@ -403,6 +421,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </identity>
                         <template translate="label">
                             <label>Invoice Email Template</label>
@@ -412,6 +431,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <guest_template translate="label">
                             <label>Invoice Email Template for Guest</label>
@@ -421,6 +441,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </guest_template>
                         <copy_to translate="label comment">
                             <label>Send Invoice Email Copy To</label>
@@ -429,6 +450,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Comma-separated.</comment>
+                            <depends><enabled>1</enabled></depends>
                         </copy_to>
                         <copy_method translate="label">
                             <label>Send Invoice Email Copy Method</label>
@@ -438,6 +460,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </copy_method>
                     </fields>
                 </invoice>
@@ -465,6 +488,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </identity>
                         <template translate="label">
                             <label>Invoice Comment Email Template</label>
@@ -474,6 +498,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <guest_template translate="label">
                             <label>Invoice Comment Email Template for Guest</label>
@@ -483,6 +508,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </guest_template>
                         <copy_to translate="label comment">
                             <label>Send Invoice Comment Email Copy To</label>
@@ -491,6 +517,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Comma-separated.</comment>
+                            <depends><enabled>1</enabled></depends>
                         </copy_to>
                         <copy_method translate="label">
                             <label>Send Invoice Comments Email Copy Method</label>
@@ -500,10 +527,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </copy_method>
                     </fields>
                 </invoice_comment>
-
                 <shipment translate="label">
                     <label>Shipment</label>
                     <sort_order>5</sort_order>
@@ -528,6 +555,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </identity>
                         <template translate="label">
                             <label>Shipment Email Template</label>
@@ -537,6 +565,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <guest_template translate="label">
                             <label>Shipment Email Template for Guest</label>
@@ -546,6 +575,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </guest_template>
                         <copy_to translate="label comment">
                             <label>Send Shipment Email Copy To</label>
@@ -554,6 +584,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Comma-separated.</comment>
+                            <depends><enabled>1</enabled></depends>
                         </copy_to>
                         <copy_method translate="label">
                             <label>Send Shipment Email Copy Method</label>
@@ -563,6 +594,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </copy_method>
                     </fields>
                 </shipment>
@@ -590,6 +622,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </identity>
                         <template translate="label">
                             <label>Shipment Comment Email Template</label>
@@ -599,6 +632,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <guest_template translate="label">
                             <label>Shipment Comment Email Template for Guest</label>
@@ -608,6 +642,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </guest_template>
                         <copy_to translate="label comment">
                             <label>Send Shipment Comment Email Copy To</label>
@@ -616,6 +651,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Comma-separated.</comment>
+                            <depends><enabled>1</enabled></depends>
                         </copy_to>
                         <copy_method translate="label">
                             <label>Send Shipment Comments Email Copy Method</label>
@@ -625,10 +661,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </copy_method>
                     </fields>
                 </shipment_comment>
-
                 <creditmemo translate="label">
                     <label>Credit Memo</label>
                     <sort_order>7</sort_order>
@@ -653,6 +689,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </identity>
                         <template translate="label">
                             <label>Credit Memo Email Template</label>
@@ -662,6 +699,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <guest_template translate="label">
                             <label>Credit Memo Email Template for Guest</label>
@@ -671,6 +709,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </guest_template>
                         <copy_to translate="label comment">
                             <label>Send Credit Memo Email Copy To</label>
@@ -679,6 +718,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Comma-separated.</comment>
+                            <depends><enabled>1</enabled></depends>
                         </copy_to>
                         <copy_method translate="label">
                             <label>Send Credit Memo Email Copy Method</label>
@@ -688,6 +728,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </copy_method>
                     </fields>
                 </creditmemo>
@@ -715,6 +756,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </identity>
                         <template translate="label">
                             <label>Credit Memo Comment Email Template</label>
@@ -724,6 +766,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <guest_template translate="label">
                             <label>Credit Memo Comment Email Template for Guest</label>
@@ -733,6 +776,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </guest_template>
                         <copy_to translate="label comment">
                             <label>Send Credit Memo Comment Email Copy To</label>
@@ -741,6 +785,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Comma-separated.</comment>
+                            <depends><enabled>1</enabled></depends>
                         </copy_to>
                         <copy_method translate="label">
                             <label>Send Credit Memo Comments Email Copy Method</label>
@@ -750,6 +795,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </copy_method>
                     </fields>
                 </creditmemo_comment>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </template>
                         <allow_guest translate="label">
                             <label>Allow for Guests</label>
@@ -58,6 +59,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </allow_guest>
                         <max_recipients translate="label">
                             <label>Max Recipients</label>
@@ -66,6 +68,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <frontend_class>validate-digits</frontend_class>
+                            <depends><enabled>1</enabled></depends>
                         </max_recipients>
                         <max_per_hour translate="label">
                             <label>Max Products Sent in 1 Hour</label>
@@ -74,6 +77,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <frontend_class>validate-digits</frontend_class>
+                            <depends><enabled>1</enabled></depends>
                         </max_per_hour>
                         <check_by translate="label">
                             <label>Limit Sending By</label>
@@ -83,6 +87,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </check_by>
                     </fields>
                 </email>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><checkout_multiple>1</checkout_multiple></depends>
                         </checkout_multiple_maximum_qty>
                     </fields>
                 </option>
@@ -136,6 +137,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>
                         </name>
                         <price translate="label">
                             <label>Price</label>
@@ -144,6 +146,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </price>
                         <handling_type translate="label">
                             <label>Calculate Handling Fee</label>
@@ -153,6 +156,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_type>
                         <handling_fee translate="label">
                             <label>Handling Fee</label>
@@ -161,6 +165,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_fee>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -168,6 +173,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <title translate="label">
                             <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>
                         </title>
                         <type translate="label">
                             <label>Type</label>
@@ -184,6 +191,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </type>
                         <sallowspecific translate="label">
                             <label>Ship to Applicable Countries</label>
@@ -194,6 +202,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sallowspecific>
                         <specificcountry translate="label">
                             <label>Ship to Specific Countries</label>
@@ -204,6 +213,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <showmethod translate="label">
                             <label>Show Method if Not Applicable</label>
@@ -213,6 +223,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </showmethod>
                         <specificerrmsg translate="label">
                             <label>Displayed Error Message</label>
@@ -221,6 +232,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>
                         </specificerrmsg>
                     </fields>
                 </flatrate>
@@ -247,6 +259,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_subtotal>
                         <name translate="label">
                             <label>Method Name</label>
@@ -254,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>
                         </name>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -261,6 +275,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <title translate="label">
                             <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>
                         </title>
                         <sallowspecific translate="label">
                             <label>Ship to Applicable Countries</label>
@@ -278,6 +294,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sallowspecific>
                         <specificcountry translate="label">
                             <label>Ship to Specific Countries</label>
@@ -288,6 +305,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <showmethod translate="label">
                             <label>Show Method if Not Applicable</label>
@@ -297,6 +315,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </showmethod>
                         <specificerrmsg translate="label">
                             <label>Displayed Error Message</label>
@@ -305,6 +324,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>
                         </specificerrmsg>
                     </fields>
                 </freeshipping>
@@ -323,7 +343,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
-                        </handling_type>
+                             <depends><active>1</active></depends>
+                         </handling_type>
                         <handling_fee translate="label">
                             <label>Handling Fee</label>
                             <validate>validate-number validate-zero-or-greater</validate>
@@ -331,6 +352,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_fee>
                         <active translate="label">
                             <label>Enabled</label>
@@ -349,6 +371,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </condition_name>
                         <include_virtual_price translate="label">
                             <label>Include Virtual Products in Price Calculation</label>
@@ -358,6 +381,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </include_virtual_price>
                         <export translate="label">
                             <label>Export</label>
@@ -366,6 +390,7 @@
                             <show_in_default>0</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </export>
                         <import translate="label">
                             <label>Import</label>
@@ -375,6 +400,7 @@
                             <show_in_default>0</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </import>
                         <name translate="label">
                             <label>Method Name</label>
@@ -382,6 +408,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>
                         </name>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -389,6 +416,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <title translate="label">
                             <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>
                         </title>
                         <sallowspecific translate="label">
                             <label>Ship to Applicable Countries</label>
@@ -406,6 +435,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sallowspecific>
                         <specificcountry translate="label">
                             <label>Ship to Specific Countries</label>
@@ -416,6 +446,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <showmethod translate="label">
                             <label>Show Method if Not Applicable</label>
@@ -426,6 +457,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </showmethod>
                         <specificerrmsg translate="label">
                             <label>Displayed Error Message</label>
@@ -434,6 +466,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>
                         </specificerrmsg>
                     </fields>
                 </tablerate>
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 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Valid values range: from 0.0 to 1.0.</comment>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><changefreq separator=",">always,hourly,daily,weekly,monthly,yearly,never</changefreq></depends>
                         </priority>
                         <lastmod translate="label">
                             <label>Show lastmod</label>
@@ -57,6 +59,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><changefreq separator=",">always,hourly,daily,weekly,monthly,yearly,never</changefreq></depends>
                         </lastmod>
                     </fields>
                 </category>
@@ -84,6 +87,8 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Valid values range: from 0.0 to 1.0.</comment>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><changefreq separator=",">always,hourly,daily,weekly,monthly,yearly,never</changefreq></depends>
                         </priority>
                         <lastmod translate="label">
                             <label>Show lastmod</label>
@@ -93,6 +98,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><changefreq separator=",">always,hourly,daily,weekly,monthly,yearly,never</changefreq></depends>
                         </lastmod>
                     </fields>
                 </product>
@@ -120,6 +126,8 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment>Valid values range: from 0.0 to 1.0.</comment>
+                            <frontend_class>validate-number</frontend_class>
+                            <depends><changefreq separator=",">always,hourly,daily,weekly,monthly,yearly,never</changefreq></depends>
                         </priority>
                         <lastmod translate="label">
                             <label>Show lastmod</label>
@@ -129,6 +137,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><changefreq separator=",">always,hourly,daily,weekly,monthly,yearly,never</changefreq></depends>
                         </lastmod>
                     </fields>
                 </page>
@@ -155,6 +164,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </error_email>
                         <error_email_identity translate="label">
                             <label>Error Email Sender</label>
@@ -164,6 +174,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </error_email_identity>
                         <error_email_template translate="label">
                             <label>Error Email Template</label>
@@ -173,6 +184,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </error_email_template>
                         <frequency translate="label">
                             <label>Frequency</label>
@@ -183,6 +195,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </frequency>
                         <time translate="label">
                             <label>Start Time</label>
@@ -191,6 +204,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enabled>1</enabled></depends>
                         </time>
                     </fields>
                 </generate>
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 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </account>
                         <active translate="label">
                             <label>Enabled for Checkout</label>
@@ -50,6 +51,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </allowed_methods>
                         <contentdesc translate="label">
                             <label>Package Description</label>
@@ -57,6 +59,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </contentdesc>
                         <!--
                         If the free_shipping_enable flag enable, the system will check free_shipping_subtotal to give free shipping
@@ -70,6 +73,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_enable>
                         <free_shipping_subtotal translate="label">
                             <label>Minimum Order Amount for Free Shipping</label>
@@ -78,6 +82,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_subtotal>
                         <dutiable translate="label">
                             <label>Shipment Dutiable</label>
@@ -87,6 +92,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </dutiable>
                         <dutypaymenttype translate="label">
                             <label>Shipment Duty Payment Type</label>
@@ -96,6 +102,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </dutypaymenttype>
                         <free_method translate="label">
                             <label>Free Method</label>
@@ -106,6 +113,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_method>
                         <gateway_url translate="label">
                             <label>Gateway URL</label>
@@ -114,6 +122,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </gateway_url>
                         <verify_peer translate="label">
                             <label>Enable SSL Verification</label>
@@ -123,6 +132,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </verify_peer>
                         <handling_type translate="label">
                             <label>Calculate Handling Fee</label>
@@ -132,6 +142,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_type>
                         <handling_action translate="label">
                             <label>Handling Applied</label>
@@ -141,6 +152,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_action>
                         <handling_fee translate="label">
                             <label>Handling Fee</label>
@@ -149,6 +161,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_fee>
                         <max_package_weight translate="label">
                             <label>Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)</label>
@@ -157,6 +170,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </max_package_weight>
                         <id translate="label">
                             <label>Access ID</label>
@@ -166,6 +180,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </id>
                         <password translate="label">
                             <label>Password</label>
@@ -175,6 +190,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </password>
                         <shipment_requesttype translate="label">
                             <label>Packages Request Type</label>
@@ -184,6 +200,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipment_requesttype>
                         <shipment_type translate="label">
                             <label>Shipment Type</label>
@@ -193,6 +210,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipment_type>
                         <shipping_intlkey translate="label">
                             <label>Shipping Key (International)</label>
@@ -202,6 +220,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipping_intlkey>
                         <shipping_key translate="label">
                             <label>Shipping Key</label>
@@ -211,6 +230,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipping_key>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -218,6 +238,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <title translate="label">
                             <label>Title</label>
@@ -225,6 +246,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>
                         </title>
                         <sallowspecific translate="label">
                             <label>Ship to Applicable Countries</label>
@@ -235,6 +257,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sallowspecific>
                         <specificcountry translate="label">
                             <label>Ship to Specific Countries</label>
@@ -245,6 +268,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <showmethod translate="label">
                             <label>Show Method if Not Applicable</label>
@@ -255,6 +279,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </showmethod>
                         <specificerrmsg translate="label">
                             <label>Displayed Error Message</label>
@@ -263,6 +288,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>
                         </specificerrmsg>
 
                         <additional_protection_enabled translate="label">
@@ -273,6 +299,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </additional_protection_enabled>
                         <additional_protection_min_value translate="label">
                             <label>Additional Protection Min Subtotal</label>
@@ -281,6 +308,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </additional_protection_min_value>
                         <additional_protection_use_subtotal translate="label">
                             <label>Additional Protection Value</label>
@@ -290,6 +318,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </additional_protection_use_subtotal>
                         <additional_protection_value translate="label comment">
                             <label>Additional Protection Configuration Value</label>
@@ -298,6 +327,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </additional_protection_value>
 
                         <additional_protection_rounding translate="label">
@@ -308,6 +338,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </additional_protection_rounding>
 
                         <hazardous_materials translate="label">
@@ -318,6 +349,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </hazardous_materials>
 
                         <default_length translate="label">
@@ -326,6 +358,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </default_length>
                         <default_width translate="label">
                             <label>Default Package Width</label>
@@ -333,6 +366,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </default_width>
                         <default_height translate="label">
                             <label>Default Package Height</label>
@@ -340,6 +374,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </default_height>
 
                         <shipment_days translate="label">
@@ -351,6 +386,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </shipment_days>
 
                         <intl_shipment_days translate="label">
@@ -362,6 +398,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </intl_shipment_days>
                         <debug translate="label">
                             <label>Debug</label>
@@ -371,6 +408,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </debug>
                     </fields>
                 </dhl>
@@ -396,6 +434,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>
                         </title>
                         <account translate="label comment">
                             <label>Account ID</label>
@@ -406,6 +445,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <comment>Please make sure to use only digits here. No dashes are allowed.</comment>
+                            <depends><active>1</active></depends>
                         </account>
                         <meter_number translate="label">
                             <label>Meter Number</label>
@@ -415,6 +455,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </meter_number>
                         <key translate="label">
                             <label>Key</label>
@@ -424,6 +465,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </key>
                         <password translate="label">
                             <label>Password</label>
@@ -433,6 +475,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </password>
                         <sandbox_mode translate="label">
                             <label>Sandbox Mode</label>
@@ -442,6 +485,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sandbox_mode>
                         <shipment_requesttype translate="label">
                             <label>Packages Request Type</label>
@@ -451,6 +495,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipment_requesttype>
                         <packaging translate="label">
                             <label>Packaging</label>
@@ -460,6 +505,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </packaging>
                         <dropoff translate="label">
                             <label>Dropoff</label>
@@ -469,6 +515,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </dropoff>
                         <unit_of_measure translate="label">
                             <label>Weight Unit</label>
@@ -478,6 +525,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </unit_of_measure>
                         <max_package_weight translate="label">
                             <label>Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)</label>
@@ -486,6 +534,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </max_package_weight>
                         <handling_type translate="label">
                             <label>Calculate Handling Fee</label>
@@ -495,6 +544,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_type>
                         <handling_action translate="label">
                             <label>Handling Applied</label>
@@ -504,6 +554,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_action>
                         <handling_fee translate="label">
                             <label>Handling Fee</label>
@@ -512,6 +563,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_fee>
                         <residence_delivery translate="label">
                             <label>Residential Delivery</label>
@@ -521,6 +573,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </residence_delivery>
                         <allowed_methods translate="label">
                             <label>Allowed Methods</label>
@@ -531,6 +584,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </allowed_methods>
                         <smartpost_hubid translate="label comment">
                             <label>Hub ID</label>
@@ -539,6 +593,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <comment>The field is applicable if the Smart Post method is selected.</comment>
+                            <depends><active>1</active></depends>
                         </smartpost_hubid>
                         <free_method translate="label">
                             <label>Free Method</label>
@@ -549,6 +604,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_method>
                         <free_shipping_enable translate="label">
                             <label>Free Shipping with Minimum Order Amount</label>
@@ -558,6 +614,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_enable>
                         <free_shipping_subtotal translate="label">
                             <label>Minimum Order Amount for Free Shipping</label>
@@ -566,6 +623,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_subtotal>
                         <specificerrmsg translate="label">
                             <label>Displayed Error Message</label>
@@ -574,6 +632,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>
                         </specificerrmsg>
                         <sallowspecific translate="label">
                             <label>Ship to Applicable Countries</label>
@@ -584,6 +643,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sallowspecific>
                         <specificcountry translate="label">
                             <label>Ship to Specific Countries</label>
@@ -594,6 +654,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <debug translate="label">
                             <label>Debug</label>
@@ -603,6 +664,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </debug>
                         <showmethod translate="label">
                             <label>Show Method if Not Applicable</label>
@@ -613,6 +675,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </showmethod>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -620,7 +683,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
-                        0</sort_order>
+                            <depends><active>1</active></depends>
+                        </sort_order>
                     </fields>
                 </fedex>
                 <ups translate="label" module="usa">
@@ -638,6 +702,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </access_license_number>
                         <active translate="label">
                             <label>Enabled for Checkout</label>
@@ -657,6 +722,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </allowed_methods>
                         <shipment_requesttype translate="label">
                             <label>Packages Request Type</label>
@@ -666,6 +732,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipment_requesttype>
                         <container translate="label">
                             <label>Container</label>
@@ -675,6 +742,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </container>
                         <free_shipping_enable translate="label">
                             <label>Free Shipping with Minimum Order Amount</label>
@@ -684,6 +752,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_enable>
                         <free_shipping_subtotal translate="label">
                             <label>Minimum Order Amount for Free Shipping</label>
@@ -692,6 +761,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_subtotal>
                         <dest_type translate="label">
                             <label>Destination Type</label>
@@ -701,6 +771,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </dest_type>
                         <free_method translate="label">
                             <label>Free Method</label>
@@ -712,6 +783,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_method>
                         <verify_peer translate="label">
                             <label>Enable SSL Verification</label>
@@ -721,6 +793,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </verify_peer>
                         <gateway_xml_url translate="label">
                             <label>Gateway XML URL</label>
@@ -729,6 +802,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </gateway_xml_url>
                         <gateway_rest_url translate="label">
                             <label>Gateway REST URL</label>
@@ -737,6 +811,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </gateway_rest_url>
                         <tracking_xml_url translate="label">
                             <label>Tracking XML URL</label>
@@ -745,6 +820,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </tracking_xml_url>
                         <tracking_rest_url translate="label">
                             <label>Tracking REST URL</label>
@@ -753,6 +829,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </tracking_rest_url>
                         <shipconfirm_xml_url translate="label">
                             <label>Shipping Confirm XML URL</label>
@@ -761,6 +838,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipconfirm_xml_url>
                         <shipconfirm_rest_url translate="label">
                             <label>Shipping Confirm REST URL</label>
@@ -769,6 +847,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipconfirm_rest_url>
                         <shipaccept_xml_url translate="label">
                             <label>Shipping Accept XML URL</label>
@@ -777,6 +856,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipaccept_xml_url>
                         <handling_type translate="label">
                             <label>Calculate Handling Fee</label>
@@ -786,6 +866,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_type>
                         <handling_action translate="label">
                             <label>Handling Applied</label>
@@ -795,6 +876,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_action>
                         <handling_fee translate="label">
                             <label>Handling Fee</label>
@@ -803,6 +885,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_fee>
                         <max_package_weight translate="label">
                             <label>Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)</label>
@@ -811,6 +894,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </max_package_weight>
                         <min_package_weight translate="label">
                             <label>Minimum Package Weight (Please consult your shipping carrier for minimum supported shipping weight)</label>
@@ -819,6 +903,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </min_package_weight>
                         <origin_shipment translate="label">
                             <label>Origin of the Shipment</label>
@@ -829,6 +914,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </origin_shipment>
                         <client_id translate="label comment">
                             <label>Client ID</label>
@@ -839,6 +925,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </client_id>
                         <client_secret translate="label">
                             <label>Client Secret</label>
@@ -848,6 +935,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </client_secret>
                         <password translate="label">
                             <label>Password</label>
@@ -857,6 +945,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </password>
                         <pickup translate="label">
                             <label>Pickup Method</label>
@@ -866,6 +955,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </pickup>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -873,6 +963,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <title translate="label">
                             <label>Title</label>
@@ -880,6 +971,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>
                         </title>
                         <type translate="label">
                             <label>UPS Type</label>
@@ -890,6 +982,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </type>
                         <unit_of_measure translate="label comment">
                             <label>Weight Unit</label>
@@ -899,6 +992,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </unit_of_measure>
                         <username translate="label">
                             <label>User ID</label>
@@ -908,6 +1002,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </username>
                         <negotiated_active translate="label">
                             <label>Enable Negotiated Rates</label>
@@ -917,6 +1012,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </negotiated_active>
                         <shipper_number translate="label comment">
                             <label>Shipper Number</label>
@@ -925,6 +1021,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <comment>Required for negotiated rates; 6-character UPS.</comment>
+                            <depends><active>1</active></depends>
                         </shipper_number>
                         <sallowspecific translate="label">
                             <label>Ship to Applicable Countries</label>
@@ -935,6 +1032,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sallowspecific>
                         <specificcountry translate="label">
                             <label>Ship to Specific Countries</label>
@@ -945,6 +1043,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <showmethod translate="label">
                             <label>Show Method if Not Applicable</label>
@@ -955,6 +1054,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </showmethod>
                         <specificerrmsg translate="label">
                             <label>Displayed Error Message</label>
@@ -963,6 +1063,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>
                         </specificerrmsg>
                         <mode_xml translate="label comment">
                             <label>Mode</label>
@@ -973,6 +1074,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </mode_xml>
                         <debug translate="label">
                             <label>Debug</label>
@@ -982,6 +1084,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </debug>
                     </fields>
                 </ups>
@@ -1007,6 +1110,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </gateway_url>
                         <gateway_secure_url translate="label">
                             <label>Secure Gateway URL</label>
@@ -1014,6 +1118,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </gateway_secure_url>
                         <title translate="label">
                             <label>Title</label>
@@ -1021,6 +1126,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>
                         </title>
                         <userid translate="label">
                             <label>User ID</label>
@@ -1030,6 +1136,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </userid>
                         <password translate="label">
                             <label>Password</label>
@@ -1039,6 +1146,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </password>
                         <mode translate="label">
                             <label>Mode</label>
@@ -1048,6 +1156,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </mode>
                         <shipment_requesttype translate="label">
                             <label>Packages Request Type</label>
@@ -1057,6 +1166,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </shipment_requesttype>
                         <container translate="label">
                             <label>Container</label>
@@ -1066,6 +1176,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </container>
                         <size translate="label">
                             <label>Size</label>
@@ -1075,6 +1186,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </size>
                         <width translate="label">
                             <label>Width</label>
@@ -1083,6 +1195,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <depends><size>LARGE</size></depends>
+                            <depends><active>1</active></depends>
                         </width>
                         <length translate="label">
                             <label>Length</label>
@@ -1091,6 +1204,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <depends><size>LARGE</size></depends>
+                            <depends><active>1</active></depends>
                         </length>
                         <height translate="label">
                             <label>Height</label>
@@ -1099,6 +1213,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <depends><size>LARGE</size></depends>
+                            <depends><active>1</active></depends>
                         </height>
                         <girth translate="label">
                             <label>Girth</label>
@@ -1107,6 +1222,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <depends><size>LARGE</size></depends>
+                            <depends><active>1</active></depends>
                         </girth>
                         <machinable translate="label">
                             <label>Machinable</label>
@@ -1116,6 +1232,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </machinable>
                         <max_package_weight translate="label">
                             <label>Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)</label>
@@ -1124,6 +1241,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </max_package_weight>
                         <handling_type translate="label">
                             <label>Calculate Handling Fee</label>
@@ -1133,6 +1251,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_type>
                         <handling_action translate="label">
                             <label>Handling Applied</label>
@@ -1142,6 +1261,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_action>
                         <handling_fee translate="label">
                             <label>Handling Fee</label>
@@ -1150,6 +1270,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_fee>
                         <allowed_methods translate="label">
                             <label>Allowed Methods</label>
@@ -1160,6 +1281,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </allowed_methods>
                         <free_method translate="label">
                             <label>Free Method</label>
@@ -1170,6 +1292,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_method>
                         <free_shipping_enable translate="label">
                             <label>Free Shipping with Minimum Order Amount</label>
@@ -1179,6 +1302,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_enable>
                         <free_shipping_subtotal translate="label">
                             <label>Minimum Order Amount for Free Shipping</label>
@@ -1187,6 +1311,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_subtotal>
                         <specificerrmsg translate="label">
                             <label>Displayed Error Message</label>
@@ -1195,6 +1320,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>
                         </specificerrmsg>
                         <sallowspecific translate="label">
                             <label>Ship to Applicable Countries</label>
@@ -1205,6 +1331,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sallowspecific>
                         <specificcountry translate="label">
                             <label>Ship to Specific Countries</label>
@@ -1215,6 +1342,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <debug translate="label">
                             <label>Debug</label>
@@ -1224,6 +1352,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </debug>
                         <showmethod translate="label">
                             <label>Show Method if Not Applicable</label>
@@ -1234,6 +1363,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </showmethod>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -1241,7 +1371,8 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
-                        0</sort_order>
+                            <depends><active>1</active></depends>
+                        </sort_order>
                     </fields>
                 </usps>
                 <dhlint translate="label" module="usa">
@@ -1266,6 +1397,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </gateway_url>
                         <verify_peer translate="label">
                             <label>Enable SSL Verification</label>
@@ -1275,6 +1407,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </verify_peer>
                         <title translate="label">
                             <label>Title</label>
@@ -1282,6 +1415,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>
                         </title>
                         <id translate="label">
                             <label>Access ID</label>
@@ -1291,6 +1425,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </id>
                         <password translate="label">
                             <label>Password</label>
@@ -1300,6 +1435,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </password>
                         <account translate="label">
                             <label>Account Number</label>
@@ -1307,6 +1443,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </account>
                         <content_type translate="label">
                             <label>Content Type</label>
@@ -1316,6 +1453,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </content_type>
                         <handling_type translate="label">
                             <label>Calculate Handling Fee</label>
@@ -1325,6 +1463,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_type>
                         <handling_action translate="label comment">
                             <label>Handling Applied</label>
@@ -1335,6 +1474,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_action>
                         <handling_fee translate="label">
                             <label>Handling Fee</label>
@@ -1343,6 +1483,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </handling_fee>
                         <divide_order_weight translate="label comment">
                             <label>Divide Order Weight</label>
@@ -1353,6 +1494,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>
                         </divide_order_weight>
                         <unit_of_measure translate="label">
                             <label>Weight Unit</label>
@@ -1363,6 +1505,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>
                         </unit_of_measure>
                         <size translate="label">
                             <label>Size</label>
@@ -1372,6 +1515,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>
                         </size>
                         <height translate="label">
                             <label>Height</label>
@@ -1379,7 +1523,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                            <depends><size>1</size></depends>
+                            <depends>
+                                <active>1</active>
+                                <size>1</size>
+                            </depends>
                         </height>
                         <depth translate="label">
                             <label>Depth</label>
@@ -1387,7 +1534,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                            <depends><size>1</size></depends>
+                            <depends>
+                                <active>1</active>
+                                <size>1</size>
+                            </depends>
                         </depth>
                         <width translate="label">
                             <label>Width</label>
@@ -1395,7 +1545,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                            <depends><size>1</size></depends>
+                            <depends>
+                                <active>1</active>
+                                <size>1</size>
+                            </depends>
                         </width>
                         <doc_methods translate="label">
                             <label>Allowed Methods</label>
@@ -1405,7 +1558,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
-                            <depends><content_type>D</content_type></depends>
+                            <depends>
+                                <active>1</active>
+                                <content_type>D</content_type>
+                            </depends>
                         </doc_methods>
                         <nondoc_methods translate="label">
                             <label>Allowed Methods</label>
@@ -1415,7 +1571,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
-                            <depends><content_type>N</content_type></depends>
+                            <depends>
+                                <active>1</active>
+                                <content_type>N</content_type>
+                            </depends>
                         </nondoc_methods>
                         <ready_time>
                             <label>Ready time</label>
@@ -1424,6 +1583,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </ready_time>
                         <specificerrmsg translate="label">
                             <label>Displayed Error Message</label>
@@ -1432,6 +1592,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>
                         </specificerrmsg>
                         <!--
                         If the free_shipping_enable flag enable, the system will check free_shipping_subtotal to give free shipping
@@ -1446,7 +1607,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
-                            <depends><content_type>D</content_type></depends>
+                            <depends>
+                                <active>1</active>
+                                <content_type>D</content_type>
+                            </depends>
                         </free_method_doc>
                         <free_method_nondoc translate="label">
                             <label>Free Method</label>
@@ -1457,7 +1621,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
-                            <depends><content_type>N</content_type></depends>
+                            <depends>
+                                <active>1</active>
+                                <content_type>N</content_type>
+                            </depends>
                         </free_method_nondoc>
                         <free_shipping_enable translate="label">
                             <label>Free Shipping with Minimum Order Amount</label>
@@ -1467,6 +1634,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_enable>
                         <free_shipping_subtotal translate="label">
                             <label>Minimum Order Amount for Free Shipping</label>
@@ -1475,6 +1643,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </free_shipping_subtotal>
                         <sallowspecific translate="label">
                             <label>Ship to Applicable Countries</label>
@@ -1485,6 +1654,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sallowspecific>
                         <specificcountry translate="label">
                             <label>Ship to Specific Countries</label>
@@ -1495,6 +1665,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                             <can_be_empty>1</can_be_empty>
+                            <depends><active>1</active></depends>
                         </specificcountry>
                         <showmethod translate="label">
                             <label>Show Method if Not Applicable</label>
@@ -1505,6 +1676,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </showmethod>
                         <sort_order translate="label">
                             <label>Sort Order</label>
@@ -1512,6 +1684,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </sort_order>
                         <debug translate="label">
                             <label>Debug</label>
@@ -1521,6 +1694,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><active>1</active></depends>
                         </debug>
                     </fields>
                 </dhlint>
diff --git a/app/code/core/Mage/Weee/etc/system.xml b/app/code/core/Mage/Weee/etc/system.xml
index b9a6608f04b..f28fd6364ba 100644
--- a/app/code/core/Mage/Weee/etc/system.xml
+++ b/app/code/core/Mage/Weee/etc/system.xml
@@ -42,6 +42,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </display_list>
                         <display translate="label">
                             <label>Display Prices On Product View Page</label>
@@ -51,6 +52,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </display>
                         <display_sales translate="label">
                             <label>Display Prices In Sales Modules</label>
@@ -60,6 +62,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </display_sales>
                         <display_email translate="label">
                             <label>Display Prices In Emails</label>
@@ -69,6 +72,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </display_email>
                         <discount translate="label">
                             <label>Apply Discounts To FPT</label>
@@ -78,6 +82,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </discount>
                         <apply_vat translate="label">
                             <label>FPT Tax Configuration</label>
@@ -87,6 +92,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </apply_vat>
                         <include_in_subtotal translate="label">
                             <label>Include FPT In Subtotal</label>
@@ -96,6 +102,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </include_in_subtotal>
                     </fields>
                 </weee>

From 468eaf3f823411d26ebb0dad7ba6f05211cf9f17 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 8 Oct 2024 04:56:56 +0200
Subject: [PATCH 2/6] phpstan, ref #3784 (#4241)

---
 .phpstan.dist.baseline.neon                   | 135 ------------------
 .../Catalog/Product/Helper/Form/Gallery.php   |  12 +-
 .../Mage/Adminhtml/Block/Dashboard/Graph.php  |  25 ++--
 .../Notification/Grid/Renderer/Severity.php   |   1 +
 .../Adminhtml/Block/Report/Grid/Abstract.php  |  26 ++--
 .../Block/Report/Sales/Coupons/Grid.php       |   4 +-
 .../Block/Sales/Order/Shipment/Packaging.php  |  13 +-
 .../Adminhtml/Block/System/Store/Edit.php     |   8 ++
 .../Block/System/Store/Edit/Form.php          |  10 +-
 .../core/Mage/Adminhtml/Block/Widget/Grid.php |   2 +-
 10 files changed, 64 insertions(+), 172 deletions(-)

diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
index 8e50e08bf4f..ac4747f7801 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)

From d3bfa19e9eb066cdc299d83d46ecb507ce0d2226 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 8 Oct 2024 12:08:43 +0200
Subject: [PATCH 3/6] PHP8.1: Added getter method for
 `Mage_Adminhtml_Block_Widget_Grid_Column::getType()` to return string (#4238)

* Added getter method to return string

* Added test

* Added test

* Fixed test

* Fixed test
---
 .../Adminhtml/Block/Widget/Grid/Column.php    | 32 +++++++++++++-
 .../Block/Widget/Grid/ColumnTest.php          | 44 +++++++++++++++++++
 tests/unit/Mage/Core/Model/ConfigTest.php     | 13 ++++++
 tests/unit/Mage/Core/Model/UrlTest.php        |  9 ++++
 4 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php

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/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php b/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php
new file mode 100644
index 00000000000..f5589b383c2
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Widget/Grid/ColumnTest.php
@@ -0,0 +1,44 @@
+<?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   OpenMage
+ * @package    OpenMage_Tests
+ * @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);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Widget\Grid;
+
+use Mage_Adminhtml_Block_Widget_Grid_Column;
+use PHPUnit\Framework\TestCase;
+
+class ColumnTest extends TestCase
+{
+    public Mage_Adminhtml_Block_Widget_Grid_Column $subject;
+
+    public function setUp(): void
+    {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_Widget_Grid_Column();
+    }
+
+    /**
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     */
+    public function testGetType(): void
+    {
+        $this->assertSame('', $this->subject->getType());
+
+        $this->subject->setType('text');
+        $this->assertSame('text', $this->subject->getType());
+    }
+}
diff --git a/tests/unit/Mage/Core/Model/ConfigTest.php b/tests/unit/Mage/Core/Model/ConfigTest.php
index 7e90bd5d27a..c6cfba9530d 100644
--- a/tests/unit/Mage/Core/Model/ConfigTest.php
+++ b/tests/unit/Mage/Core/Model/ConfigTest.php
@@ -1,5 +1,18 @@
 <?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   OpenMage
+ * @package    OpenMage_Tests
+ * @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);
 
 namespace OpenMage\Tests\Unit\Mage\Core\Model;
diff --git a/tests/unit/Mage/Core/Model/UrlTest.php b/tests/unit/Mage/Core/Model/UrlTest.php
index c6c644783ec..86841586f7b 100644
--- a/tests/unit/Mage/Core/Model/UrlTest.php
+++ b/tests/unit/Mage/Core/Model/UrlTest.php
@@ -31,6 +31,15 @@ public function setUp(): void
         $this->subject = Mage::getModel('core/url');
     }
 
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Model
+     */
+    public function testEscape(): void
+    {
+        $this->assertSame('%22%27%3E%3C', $this->subject->escape('"\'><'));
+    }
+
     /**
      * @group Mage_Core
      * @group Mage_Core_Model

From da1c7491f479d607e9c109029a76c4e048d05634 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 8 Oct 2024 12:10:14 +0200
Subject: [PATCH 4/6] Active admin links (#4246)

---
 skin/adminhtml/default/default/menu.css        | 1 +
 skin/adminhtml/default/openmage/menu.css       | 2 +-
 skin/adminhtml/default/openmage/menu.css.map   | 2 +-
 skin/adminhtml/default/openmage/scss/menu.scss | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/skin/adminhtml/default/default/menu.css b/skin/adminhtml/default/default/menu.css
index 7d530269da2..2c7d67e4ee6 100644
--- a/skin/adminhtml/default/default/menu.css
+++ b/skin/adminhtml/default/default/menu.css
@@ -47,6 +47,7 @@
 /************ 2ND LEVEL ************/
 #nav ul { position:absolute; width:189px; top:27px; left:-10000px; padding-bottom:3px; border-top:1px solid #2d444f; }
 #nav ul ul  { border-top:0; background:url(images/nav3_bg.png) 0 0 no-repeat; padding-top:2px; left:100px; top:13px; }
+#nav ul li a.active { background-color: #d0dfe2;}
 
 /* Show menu */
 #nav li.over ul { left:-1px; }
diff --git a/skin/adminhtml/default/openmage/menu.css b/skin/adminhtml/default/openmage/menu.css
index 3adbae627f9..ca302b59a2f 100644
--- a/skin/adminhtml/default/openmage/menu.css
+++ b/skin/adminhtml/default/openmage/menu.css
@@ -133,7 +133,7 @@
   cursor: pointer;
 }
 #nav li.level1 > a.active:not(:hover), #nav li.level2 > a.active:not(:hover), #nav li.level3 > a.active:not(:hover) {
-  background: #e6e6e6;
+  background: #f4f4f4;
 }
 #nav li#bubblelauncher-status a {
   background-position: center 8px;
diff --git a/skin/adminhtml/default/openmage/menu.css.map b/skin/adminhtml/default/openmage/menu.css.map
index efc96494ea3..36b6bb67934 100644
--- a/skin/adminhtml/default/openmage/menu.css.map
+++ b/skin/adminhtml/default/openmage/menu.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACwEA;EACE;EACA;EACA;EACA;;;AAwIF;EACE,OD5PgB;EC6PhB;EACA;EACA;;;AFhTF;EACE,YCPmB;EDQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE,OCGc;;ADAhB;EACE;;AAEA;EACE;;AAGF;EACE,OCTY;EDUZ;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA,OCgBE;EDfF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OCLA;EDMA;EACA;;AAEA;EACE;EACA,OCXF;;ADeF;EACE;EACA;EACA,OCtCS;EDuCT,QCxCS;EDyCT;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,OC7BA;;ADkCF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAOF;EACE;;AAMJ;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OC7FI;ED8FJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OCnKY;EDoKZ;;AAIJ;EACE,YC5HA;ED6HA;EACA,OC3Kc;ED4Kd;;AAEA;EACE,YC/KY;EDgLZ,OCnIF;;ADwIA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YC3NI;;AD6NF;EAEE,YC5Qc;;AD8QhB;EACE;;AAMF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;;AACA;EACE,OCzTY;ED0TZ;EACA,YChOQ;EDiOR;;AAIN;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACwEA;EACE;EACA;EACA;EACA;;;AAwIF;EACE,OD5PgB;EC6PhB;EACA;EACA;;;AFhTF;EACE,YCPmB;EDQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE,OCGc;;ADAhB;EACE;;AAEA;EACE;;AAGF;EACE,OCTY;EDUZ;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA,OCgBE;EDfF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OCLA;EDMA;EACA;;AAEA;EACE;EACA,OCXF;;ADeF;EACE;EACA;EACA,OCtCS;EDuCT,QCxCS;EDyCT;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,OC7BA;;ADkCF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAOF;EACE,YCtIE;;AD4IN;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OC7FI;ED8FJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OCnKY;EDoKZ;;AAIJ;EACE,YC5HA;ED6HA;EACA,OC3Kc;ED4Kd;;AAEA;EACE,YC/KY;EDgLZ,OCnIF;;ADwIA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YC3NI;;AD6NF;EAEE,YC5Qc;;AD8QhB;EACE;;AAMF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;;AACA;EACE,OCzTY;ED0TZ;EACA,YChOQ;EDiOR;;AAIN;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"}
\ No newline at end of file
diff --git a/skin/adminhtml/default/openmage/scss/menu.scss b/skin/adminhtml/default/openmage/scss/menu.scss
index 5777a526b57..4ceb9a70161 100644
--- a/skin/adminhtml/default/openmage/scss/menu.scss
+++ b/skin/adminhtml/default/openmage/scss/menu.scss
@@ -148,7 +148,7 @@
     &.level1, &.level2, &.level3 {
       > a {
         &.active:not(:hover) {
-          background: darken($white,10);
+          background: $wild_sand;
         }
       }
     }

From df37dba44808847ccbb90a4ec8a53cb6065e832c Mon Sep 17 00:00:00 2001
From: ADDISON <8360474+ADDISON74@users.noreply.github.com>
Date: Wed, 9 Oct 2024 02:09:18 +0300
Subject: [PATCH 5/6] Deprecated functionality: preg_match(): Passing null to
 parameter #4 ($flags) of type int is deprecated (#4251)

- This PR fixes #4250.
---
 app/code/core/Mage/Core/Model/Translate/Inline.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;

From 7f61f77dd6fd06cf987b97d99e44eda3b3993194 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2024 04:07:24 +0300
Subject: [PATCH 6/6] Bump composer/composer from 2.7.9 to 2.8.1 (#4253)

Bumps [composer/composer](https://github.com/composer/composer) from 2.7.9 to 2.8.1.
- [Release notes](https://github.com/composer/composer/releases)
- [Changelog](https://github.com/composer/composer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/composer/composer/compare/2.7.9...2.8.1)

---
updated-dependencies:
- dependency-name: composer/composer
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.lock | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2be66f6bc6b..43940bf95cb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2353,16 +2353,16 @@
         },
         {
             "name": "composer/class-map-generator",
-            "version": "1.3.4",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3"
+                "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
-                "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
+                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/98bbf6780e56e0fd2404fe4b82eb665a0f93b783",
+                "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783",
                 "shasum": ""
             },
             "require": {
@@ -2375,8 +2375,8 @@
                 "phpstan/phpstan-deprecation-rules": "^1",
                 "phpstan/phpstan-phpunit": "^1",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/filesystem": "^5.4 || ^6",
-                "symfony/phpunit-bridge": "^5"
+                "phpunit/phpunit": "^8",
+                "symfony/filesystem": "^5.4 || ^6"
             },
             "type": "library",
             "extra": {
@@ -2406,7 +2406,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.3.4"
+                "source": "https://github.com/composer/class-map-generator/tree/1.4.0"
             },
             "funding": [
                 {
@@ -2422,25 +2422,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-12T14:13:04+00:00"
+            "time": "2024-10-03T18:14:00+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "2.7.9",
+            "version": "2.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "e30ccdd665828ae66eb1be78f056e39e1d5f55ab"
+                "reference": "e52b8672276cf436670cdd6bd5de4353740e83b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/e30ccdd665828ae66eb1be78f056e39e1d5f55ab",
-                "reference": "e30ccdd665828ae66eb1be78f056e39e1d5f55ab",
+                "url": "https://api.github.com/repos/composer/composer/zipball/e52b8672276cf436670cdd6bd5de4353740e83b2",
+                "reference": "e52b8672276cf436670cdd6bd5de4353740e83b2",
                 "shasum": ""
             },
             "require": {
                 "composer/ca-bundle": "^1.5",
-                "composer/class-map-generator": "^1.3.3",
+                "composer/class-map-generator": "^1.4.0",
                 "composer/metadata-minifier": "^1.0",
                 "composer/pcre": "^2.2 || ^3.2",
                 "composer/semver": "^3.3",
@@ -2480,7 +2480,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.7-dev"
+                    "dev-main": "2.8-dev"
                 },
                 "phpstan": {
                     "includes": [
@@ -2520,7 +2520,7 @@
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
                 "security": "https://github.com/composer/composer/security/policy",
-                "source": "https://github.com/composer/composer/tree/2.7.9"
+                "source": "https://github.com/composer/composer/tree/2.8.1"
             },
             "funding": [
                 {
@@ -2536,7 +2536,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-04T12:43:28+00:00"
+            "time": "2024-10-04T09:31:01+00:00"
         },
         {
             "name": "composer/metadata-minifier",