Index: branches/5.2.x/units/helpers/ecb_currency_rates.php
===================================================================
--- branches/5.2.x/units/helpers/ecb_currency_rates.php	(revision 16600)
+++ branches/5.2.x/units/helpers/ecb_currency_rates.php	(revision 16601)
@@ -1,56 +1,62 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ECBCurrencyRates extends CurrencyRates {
 
 	public function __construct()
 	{
-		$this->RateSource = 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml';
+		$this->RateSource = 'http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml';
 
 		parent::__construct();
 	}
 
 	function GetRatesData()
 	{
 		$xml_parser = xml_parser_create();
 
 		/** @var kCurlHelper $curl_helper */
 		$curl_helper = $this->Application->recallObject('CurlHelper');
+		$curl_helper->followLocation = true;
 
 		$xml = $curl_helper->Send($this->RateSource);
 
+		if ( !$curl_helper->isGoodResponseCode() || strlen($xml) == 0 ) {
+			return;
+		}
+
 		xml_parse_into_struct($xml_parser, $xml, $struct, $index);
 		$data_res = Array();
 		foreach($struct as $element)
 		{
 			if(isset($element['attributes']) && isset($element['attributes']['CURRENCY']))
 			{
 				$currency = $element['attributes']['CURRENCY'];
 				$data_res[$currency]['ID'] = $currency;
 				$data_res[$currency]['TARGET'] = 'EUR';
 				$data_res[$currency]['UNITS'] = 1;
 				$data_res[$currency]['RATE'] = ($element['attributes']['RATE'] == 0) ? 0 : 1 / $element['attributes']['RATE'];
 			}
 		}
-		if(!$data_res['EUR'])
-		{
+
+		if ( !isset($data_res['EUR']) ) {
 			$data_res['EUR']['ID'] = 'EUR';
 			$data_res['EUR']['UNITS'] = 1;
 			$data_res['EUR']['TARGET'] = 'EUR';
 			$data_res['EUR']['RATE'] = 1;
 		}
+
 		$this->ExchangeRates = $data_res;
 	}
 }
Index: branches/5.2.x/units/helpers/bank_lv_currency_rates.php
===================================================================
--- branches/5.2.x/units/helpers/bank_lv_currency_rates.php	(revision 16600)
+++ branches/5.2.x/units/helpers/bank_lv_currency_rates.php	(revision 16601)
@@ -1,65 +1,70 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class BankLVCurrencyRates extends CurrencyRates  {
 
 	public function __construct()
 	{
 		$this->RateSource = 'http://www.bank.lv/ValutuKursi/XML/xml.cfm';
 
 		parent::__construct();
 	}
 
 	function GetRatesData()
 	{
 		$xml_parser = xml_parser_create();
 
 		/** @var kCurlHelper $curl_helper */
 		$curl_helper = $this->Application->recallObject('CurlHelper');
+		$curl_helper->followLocation = true;
 
 		$xml = $curl_helper->Send($this->RateSource);
 
+		if ( !$curl_helper->isGoodResponseCode() || strlen($xml) == 0 ) {
+			return;
+		}
+
 		xml_parse_into_struct($xml_parser, $xml, $struct, $index);
 		$data_res = Array();
 		$currency = '';
 		foreach($struct as $element)
 		{
 			switch($element['tag'])
 			{
 				case 'ID':
 					$currency = $element['value'];
 					$data_res[$currency]['ID'] = $currency;
 					$data_res[$currency]['TARGET'] = 'LVL';
 				break;
 				case 'UNITS':
 					$data_res[$currency]['UNITS'] = $element['value'];
 				break;
 				case 'RATE':
 					$data_res[$currency]['RATE'] = $element['value'];
 				break;
 				default:
 			}
 		}
 
 		if(!$data_res['LVL'])
 		{
 			$data_res['LVL']['ID'] = 'LVL';
 			$data_res['LVL']['UNITS'] = 1;
 			$data_res['LVL']['TARGET'] = 'LVL';
 			$data_res['LVL']['RATE'] = 1;
 		}
 		$this->ExchangeRates = $data_res;
 	}
 }
Index: branches/5.2.x/units/helpers/frny_currency_rates.php
===================================================================
--- branches/5.2.x/units/helpers/frny_currency_rates.php	(revision 16600)
+++ branches/5.2.x/units/helpers/frny_currency_rates.php	(revision 16601)
@@ -1,86 +1,91 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class FRNYCurrencyRates extends CurrencyRates {
 
 	public function __construct()
 	{
 		$this->RateSource = 'http://www.ny.frb.org/markets/fxrates/FXtoXML.cfm?FEXdate=%s&FEXtime=1200';
 
 		parent::__construct();
 	}
 
 	function GetRatesData()
 	{
 		/** @var kCurlHelper $curl_helper */
 		$curl_helper = $this->Application->recallObject('CurlHelper');
+		$curl_helper->followLocation = true;
 
 		for($i = 0; $i < 10; $i++)
 		{
 			$time = adodb_mktime() - $i * 3600 * 24;
 			$source_file = sprintf($this->RateSource, adodb_date('Y-m-d', $time));
 			$xml = $curl_helper->Send($source_file);
 
+			if ( !$curl_helper->isGoodResponseCode() || strlen($xml) == 0 ) {
+				continue;
+			}
+
 			$xml_parser = xml_parser_create();
 			xml_parse_into_struct($xml_parser, $xml, $struct, $index);
 			foreach($struct as $element)
 			{
 				if($element['tag'] == 'FRBNY:DATASET')
 				{
 					break;
 				}
 			}
 			if($element['type'] == 'open')
 			{
 				break;
 			}
 		}
 		if($element['type'] != 'open')
 		{
 			return false;
 		}
 
 		foreach($struct as $element)
 		{
 			switch($element['tag'])
 			{
 				case 'FRBNY:SERIES':
 					$currency = $element['attributes']['UNIT'];
 					if($currency)
 					{
 						$data_res[$currency]['ID'] = $currency;
 						$data_res[$currency]['UNITS'] = 1;
 					}
 				break;
 				case 'FRBNY:CURR':
 					$data_res[$currency]['TARGET'] = $element['value'];
 				break;
 				case 'FRBNY:OBS_VALUE':
 					$data_res[$currency]['RATE'] = ($element['value'] == 0) ? 0 : 1 / $element['value'];
 				break;
 				default:
 			}
 		}
 		if(!$data_res['USD'])
 		{
 			$data_res['USD']['ID'] = 'USD';
 			$data_res['USD']['UNITS'] = 1;
 			$data_res['USD']['TARGET'] = 'USD';
 			$data_res['USD']['RATE'] = 1;
 		}
 		$this->ExchangeRates = $data_res;
 	}
 
 }
Index: branches/5.2.x/units/currencies/currencies_event_handler.php
===================================================================
--- branches/5.2.x/units/currencies/currencies_event_handler.php	(revision 16600)
+++ branches/5.2.x/units/currencies/currencies_event_handler.php	(revision 16601)
@@ -1,322 +1,324 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class CurrenciesEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			// admin
 			'OnUpdateRate' => Array ('self' => 'add|edit'),
 			'OnUpdateRates' => Array ('self' => 'advanced:update_rate|add|edit'),
 			'OnDisableUnused' => Array ('self' => 'edit'),
 
 			// front
 			'OnChangeCurrency' => Array ('self' => true),
 			'OnItemBuild' => Array ('self' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Returns ID of current item to be edited
 	 * by checking ID passed in get/post as prefix_id
 	 * or by looking at first from selected ids, stored.
 	 * Returned id is also stored in Session in case
 	 * it was explicitly passed as get/post
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 * @access public
 	 */
 	public function getPassedID(kEvent $event)
 	{
 		if ( $event->Special == 'current' ) {
 			return Array ('ISO' => $this->Application->RecallVar('curr_iso'));
 		}
 
 		return parent::getPassedID($event);
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSetPrimary($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
 			return;
 		}
 
 		/** @var kDBItem $object */
 		$object = $event->getObject();
 
 		$object->SetDBField('IsPrimary', 1);
 		$object->Update();
 	}
 
 	/**
 	 * Occurs before updating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		/** @var kDBItem $object */
 		$object = $event->getObject();
 
 		if ( $object->GetDBField('IsPrimary') && $object->Validate() ) {
 			$sql = 'UPDATE ' . $this->Application->getUnitOption($this->Prefix, 'TableName') . '
 					SET IsPrimary = 0
 					WHERE CurrencyId <> ' . $object->GetDBField('CurrencyId');
 			$this->Conn->Query($sql);
 
 			$object->SetDBField('Status', 1);
 		}
 
 		$object->SetDBField('Modified_date', adodb_mktime());
 		$object->SetDBField('Modified_time', adodb_mktime());
 
 		if ( $object->GetDBField('Status') == 0 ) {
 			$sql = 'DELETE FROM ' . $this->Application->getUnitOption('ptc', 'TableName') . '
 					WHERE CurrencyId = ' . $object->GetDBField('CurrencyId');
 			$this->Conn->Query($sql);
 		}
 	}
 
 	/**
 	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
 		/** @var kDBList $object */
 		$object = $event->getObject();
 
 		if ( $event->Special == 'active' ) {
 			$object->addFilter('status_filter', '%1$s.Status = 1');
 		}
 
 		if ( !$this->Application->isAdminUser ) {
 			$object->addFilter('status_filter', $object->TableName . '.Status = 1');
 		}
 
 		// site domain currency picker
 		if ( $event->Special == 'selected' || $event->Special == 'available' ) {
 			/** @var EditPickerHelper $edit_picker_helper */
 			$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
 
 			$edit_picker_helper->applyFilter($event, 'Currencies');
 			$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 		}
 
 		// apply domain-based currency filtering
 		$currencies = $this->Application->siteDomainField('Currencies');
 
 		if ( strlen($currencies) ) {
 			$currencies = explode('|', substr($currencies, 1, -1));
 			$object->addFilter('domain_filter', '%1$s.CurrencyId IN (' . implode(',', $currencies) . ')');
 		}
 	}
 
 	/**
 	 * Saves content of temp table into live and
 	 * redirects to event' default redirect (normally grid template)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSave(kEvent $event)
 	{
 		$this->Application->StoreVar('saved_curr_ids', $this->Application->RecallVar($event->Prefix . '_selected_ids'));
 
 		parent::OnSave($event);
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnDisableUnused($event)
 	{
 		$unused_ids = $this->Application->GetVar('unused_ids');
 
 		if ( $unused_ids ) {
 			$sql = 'UPDATE ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
 					SET Status = 0
 					WHERE CurrencyId IN(' . $unused_ids . ') AND IsPrimary <> 1';
 			$this->Conn->Query($sql);
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnUpdateRate($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
 			return;
 		}
 
 		$event->CallSubEvent('OnPreSave');
 		$rate_source = $this->Application->ConfigValue('Comm_ExchangeRateSource');
 		$rate_source_classes = Array(	2 => 'FRNYCurrencyRates',
 										3 => 'ECBCurrencyRates',
 										1 => 'BankLVCurrencyRates'
 									);
 		$rates_class = $rate_source_classes[$rate_source];
 		$rates = $this->Application->recallObject($rates_class);
 
 		$rates->GetRatesData();
 
 		/** @var kDBItem $object */
 		$object = $event->getObject();
 
 		$iso = $object->GetDBField('ISO');
 		$rates->StoreRates($iso);
 		if($rates->GetRate($iso, 'PRIMARY'))
 		{
 			$event->status=kEvent::erSUCCESS;
 		}
 		else
 		{
 			$event->status=kEvent::erFAIL;
 			$event->redirect=false;
 			$object->SetError('RateToPrimary', 'couldnt_retrieve_rate', 'la_couldnt_retrieve_rate');
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnUpdateRates($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
 			return;
 		}
 
 		$ids = $this->StoreSelectedIDs($event);
 		$event->setEventParam('ids', $ids);
 		$ids = $event->getEventParam('ids');
 
-		$object = $event->getObject();
-		if(is_array($ids) && $ids[0])
-		{
-			$sql = 'SELECT ISO FROM '.$object->TableName.' WHERE CurrencyId IN ('.implode(',', $ids).')';
+		if ( $ids ) {
+			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$sql = 'SELECT ISO FROM ' . $table_name . ' WHERE CurrencyId IN (' . implode(',', $ids) . ')';
 			$iso_list = $this->Conn->GetCol($sql);
 		}
+		else {
+			$iso_list = array();
+		}
 
 		$rate_source = $this->Application->ConfigValue('Comm_ExchangeRateSource');
 		$rate_source_classes = Array(	2 => 'FRNYCurrencyRates',
 										3 => 'ECBCurrencyRates',
 										1 => 'BankLVCurrencyRates'
 									);
 		$rates_class = $rate_source_classes[$rate_source];
 		$rates = $this->Application->recallObject($rates_class);
 
 		$rates->GetRatesData();
 
 		if($iso_list)
 		{
 			$rates->StoreRates($iso_list);
 		}
 		else
 		{
 			$rates->StoreRates();
 		}
 	}
 
 	/**
 	 * Allows to change currency to given one
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnChangeCurrency($event)
 	{
 		$currency_iso = $this->Application->GetVar('curr_iso');
 		$available_currencies = $this->Application->siteDomainField('Currencies');
 
 		if ($available_currencies) {
 			if (strpos($available_currencies, '|' . $currency_iso . '|') === false) {
 				// currency isn't allowed in site domain
 				return ;
 			}
 		}
 
 		$this->Application->StoreVar('curr_iso', $currency_iso);
 
 		$passed = explode(',', $this->Application->GetVar('passed'));
 		$prefix_index = array_search($event->getPrefixSpecial(), $passed);
 
 		if ( $prefix_index !== false ) {
 			unset($passed[$prefix_index]);
 			$this->Application->SetVar('passed', implode(',', $passed));
 		}
 	}
 
 	/**
 	 * Changes default module to custom (when available)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
 		// make sure, that currency Translation is on current language
 		$language_id = $this->Application->GetVar('m_lang');
 		$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
 
 		foreach ($calculated_fields[''] as $field_name => $field_expression) {
 			$calculated_fields[''][$field_name] = str_replace('%4$s', $language_id, $field_expression);
 		}
 
 		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
 	}
-}
\ No newline at end of file
+}