Index: branches/5.2.x/core/kernel/globals.php
===================================================================
diff -u -N -r14868 -r14870
--- branches/5.2.x/core/kernel/globals.php	(.../globals.php)	(revision 14868)
+++ branches/5.2.x/core/kernel/globals.php	(.../globals.php)	(revision 14870)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: globals.php 14868 2011-12-15 14:40:59Z alex $
+* @version	$Id: globals.php 14870 2011-12-16 11:54:01Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -135,17 +135,17 @@
 	{
 		$file = FULL_PATH . DIRECTORY_SEPARATOR . 'system' . DIRECTORY_SEPARATOR . 'config.php';
 
-		if (!file_exists($file)) {
+		if ( !file_exists($file) ) {
 			return Array ();
 		}
 
-		if (file_exists($file) && !is_readable($file)) {
+		if ( file_exists($file) && !is_readable($file) ) {
 			die('Could Not Open Ini File');
 		}
 
 		$contents = file($file);
 
-		if ($contents && $contents[0] == '<' . '?' . 'php die() ?' . ">\n") {
+		if ( $contents && $contents[0] == '<' . '?' . 'php die() ?' . ">\n" ) {
 			// format of "config.php" file before 5.1.0 version
 			array_shift($contents);
 
@@ -155,7 +155,7 @@
 		$_CONFIG = Array ();
 		require($file);
 
-		if ($parse_section) {
+		if ( $parse_section ) {
 			if ( isset($_CONFIG['Database']['LoadBalancing']) && $_CONFIG['Database']['LoadBalancing'] ) {
 				require FULL_PATH . DIRECTORY_SEPARATOR . 'system' . DIRECTORY_SEPARATOR . 'db_servers.php';
 			}
@@ -447,14 +447,7 @@
 	 */
 	public static function fputcsv($filePointer, $data, $delimiter = ',', $enclosure = '"', $recordSeparator = "\r\n")
 	{
-		foreach($data as $field_index => $field_value) {
-			// replaces an enclosure with two enclosures
-			$data[$field_index] = str_replace($enclosure, $enclosure.$enclosure, $field_value);
-		}
-
-		$line = $enclosure.implode($enclosure.$delimiter.$enclosure, $data).$enclosure.$recordSeparator;
-		$line = preg_replace('/'.preg_quote($enclosure, '/').'([0-9\.]+)'.preg_quote($enclosure, '/').'/', '$1', $line);
-		fwrite($filePointer, $line);
+		fwrite($filePointer, self::getcsvline($data, $delimiter, $enclosure, $recordSeparator));
 	}
 
 	/**
@@ -563,7 +556,7 @@
 			return ($ip >= $from && $ip <= $to);
 		}
 		elseif (strpos($network, '/') !== false) {
-			// sigle subnet specified
+			// single subnet specified
 			$ip_arr = explode('/', $network);
 
 			if (!preg_match("@\d*\.\d*\.\d*\.\d*@", $ip_arr[0], $matches)) {