Index: branches/5.2.x/units/shipping_quote_engines/usps.php
===================================================================
diff -u -N -r16516 -r16693
--- branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 16516)
+++ branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 16693)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: usps.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: usps.php 16693 2021-08-31 09:24:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -706,8 +706,7 @@
 			reset($this->types);
 			$allowed_types = explode(", ", MODULE_SHIPPING_USPS_TYPES);
 
-	    	while (list($key, $value) = each($this->types))
-	    	{
+			foreach ( array_keys($this->types) as $key ) {
 	 		 	if ( !in_array($key, $allowed_types) ) continue;
 				$request .= '<Package ID="'.$services_count.'">'.
 				          '<Service>'.$key.'</Service>'.
@@ -720,6 +719,7 @@
 				          '</Package>';
 	     	 	$services_count++;
 			}
+
 			$request .= '</RateV3Request>';
 			$api_query = 'RateV3';
 		}
@@ -1338,4 +1338,4 @@
 
 		return $usps_data;
 	}
-}
\ No newline at end of file
+}
Index: branches/5.2.x/units/pricing/pricing_event_handler.php
===================================================================
diff -u -N -r16516 -r16693
--- branches/5.2.x/units/pricing/pricing_event_handler.php	(.../pricing_event_handler.php)	(revision 16516)
+++ branches/5.2.x/units/pricing/pricing_event_handler.php	(.../pricing_event_handler.php)	(revision 16693)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pricing_event_handler.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: pricing_event_handler.php 16693 2021-08-31 09:24:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -339,8 +339,7 @@
 			// sort brackets by 2nd column (Max values)
 			uasort($temp, 'pr_bracket_comp');
 			reset($temp);
-			$first_item=each($temp);
-			$first_item_key=$first_item['key'];
+			$first_item_key = key($temp);
 
 			$group_id = $this->Application->getVar('group_id');
 
Index: branches/5.2.x/units/products/products_event_handler.php
===================================================================
diff -u -N -r16516 -r16693
--- branches/5.2.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 16516)
+++ branches/5.2.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 16693)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_event_handler.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: products_event_handler.php 16693 2021-08-31 09:24:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -117,7 +117,7 @@
 		if ($object->GetDBField('InventoryStatus') == 2) {
 			// inventory by options (use first selected combination in grid)
 			$combinations = $this->Application->GetVar('poc_grid');
-			list ($combination_id, ) = each($combinations);
+			$combination_id = key($combinations);
 		}
 		else {
 			// inventory by product
Index: branches/5.2.x/units/taxes/taxes_tag_processor.php
===================================================================
diff -u -N -r16516 -r16693
--- branches/5.2.x/units/taxes/taxes_tag_processor.php	(.../taxes_tag_processor.php)	(revision 16516)
+++ branches/5.2.x/units/taxes/taxes_tag_processor.php	(.../taxes_tag_processor.php)	(revision 16693)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: taxes_tag_processor.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: taxes_tag_processor.php 16693 2021-08-31 09:24:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -74,7 +74,7 @@
 				$has_states = $cs_helper->getCountriesWithStates();
 
 				if ($selected_country_id && !array_key_exists($selected_country_id, $has_states)) {
-					list ($selected_country_id, ) = each($has_states);
+					$selected_country_id = key($has_states);
 					$this->Application->SetVar('CountrySelector', $selected_country_id);
 				}
 
@@ -90,7 +90,7 @@
 						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
 					else {
-						list ($selected_country_id, ) = each($has_states);
+						$selected_country_id = key($has_states);
 						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
 				}
@@ -270,4 +270,4 @@
 
 		return $table_name;
 	}
-}
\ No newline at end of file
+}
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r16516 -r16693
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16516)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16693)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: orders_event_handler.php 16693 2021-08-31 09:24:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -547,7 +547,7 @@
 			if ( $this->Application->GetVar('same_address') ) {
 				// copy shipping address to billing
 				$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
-				list($id, $field_values) = each($items_info);
+				$id = key($items_info);
 
 				$address_fields = Array (
 					'To', 'Company', 'Phone', 'Fax', 'Email',
@@ -679,7 +679,8 @@
 	{
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ( $items_info ) {
-			list($id, $field_values) = each($items_info);
+			$id = key($items_info);
+			$field_values = $items_info[$id];
 
 			/** @var kDBItem $object */
 			$object = $event->getObject();
@@ -1533,7 +1534,7 @@
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ($items_info) {
 			// updated address available from SUBMIT -> use it
-			list($id, $field_values) = each($items_info);
+			$field_values = current($items_info);
 		}
 		else {
 			// no updated address -> use current address
Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
diff -u -N -r16516 -r16693
--- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 16516)
+++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 16693)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_option_combinations_event_handler.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: product_option_combinations_event_handler.php 16693 2021-08-31 09:24:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -178,7 +178,8 @@
 			return;
 		}
 
-		list($id, $field_values) = each($items_info);
+		$id = key($items_info);
+		$field_values = $items_info[$id];
 		$object->setID($id);
 		$object->SetFieldsFromHash($field_values);
 		$event->setEventParam('form_data', $field_values);
Index: branches/5.2.x/units/coupons/coupons_event_handler.php
===================================================================
diff -u -N -r16516 -r16693
--- branches/5.2.x/units/coupons/coupons_event_handler.php	(.../coupons_event_handler.php)	(revision 16516)
+++ branches/5.2.x/units/coupons/coupons_event_handler.php	(.../coupons_event_handler.php)	(revision 16693)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: coupons_event_handler.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: coupons_event_handler.php 16693 2021-08-31 09:24:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -102,7 +102,8 @@
 		$this->setCloningRequired($object);
 
 		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-		list($id, $field_values) = each($items_info);
+		$id = key($items_info);
+		$field_values = $items_info[$id];
 		$object->setID($id);
 		$object->SetFieldsFromHash($field_values);
 		$event->setEventParam('form_data', $field_values);
Index: branches/5.2.x/units/zones/zones_tag_processor.php
===================================================================
diff -u -N -r16516 -r16693
--- branches/5.2.x/units/zones/zones_tag_processor.php	(.../zones_tag_processor.php)	(revision 16516)
+++ branches/5.2.x/units/zones/zones_tag_processor.php	(.../zones_tag_processor.php)	(revision 16693)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: zones_tag_processor.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: zones_tag_processor.php 16693 2021-08-31 09:24:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -73,7 +73,7 @@
 				$has_states = $cs_helper->getCountriesWithStates();
 
 				if ($selected_country_id && !array_key_exists($selected_country_id, $has_states)) {
-					list ($selected_country_id, ) = each($has_states);
+					$selected_country_id = key($has_states);
 					$this->Application->SetVar('CountrySelector', $selected_country_id);
 				}
 
@@ -89,7 +89,7 @@
 						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
 					else {
-						list ($selected_country_id, ) = each($has_states);
+						$selected_country_id = key($has_states);
 						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
 				}
@@ -269,4 +269,4 @@
 
 		return $table_name;
 	}
-}
\ No newline at end of file
+}