/ - Diff - FreenetIS - Redmine

« Předchozí | Další »

Revize 1903

Opravy:
- podpora cp1250 se zachovanim podpory pro utf8 v parseru Unicredit

      */
     class Web_interface_Controller extends Controller
+    {
     	// predefined QoS classes
     	const MEMBERS_QOS_PARENT			=	1;
     	const MEMBERS_QOS_ORDINARY			=	2;
     	const MEMBERS_QOS_ACTIVE				=	3;
     	const MEMBERS_QOS_HIGH_PRIORITY		=	4;
     	const MEMBERS_QOS_MEMBERS			=	5;
     	// QoS priority types
     	const MEMBERS_QOS_PRIORITY_NORMAL	=	1;
     	const MEMBERS_QOS_PRIORITY_HIGH		=	0;
     	// QoS protocol
     	const MEMBERS_QOS_PROTOCOL_ALL		=	'all';
     	/**

     			throw new UnicreditException(__('Cannot open uploaded bank listing file!'));
+    		}
     		// not in cp12540 anymore (2013-02-27)
     		//$csvData = iconv('cp1250', 'UTF-8', $csvData);
     		$data = UnicreditParser::parseCSV($csvData);
     		try
+    		{
     			// try with utf8
     			$data = UnicreditParser::parseCSV($csvData);
+    		}
     		catch (UnicreditException $ex)
+    		{
     			// continue trying with cp1250
     			$data = UnicreditParser::parseCSV(iconv('cp1250', 'UTF-8', $csvData));
+    		}
     		// clean up from needless attributes is not necessary due to changing Fio csv format
     		self::correctData($data);

Také k dispozici: Unified diff