Index: branches/5.3.x/core/kernel/globals.php
===================================================================
diff -u -N -r15580 -r15677
--- branches/5.3.x/core/kernel/globals.php	(.../globals.php)	(revision 15580)
+++ branches/5.3.x/core/kernel/globals.php	(.../globals.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: globals.php 15580 2012-10-17 10:05:59Z alex $
+* @version	$Id: globals.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -180,7 +180,7 @@
 	 */
 	public static function getConfigVars()
 	{
-		static $vars = null;
+		static $vars = NULL;
 
 		if ( !isset($vars) ) {
 			$vars = self::parseConfig();
@@ -313,7 +313,7 @@
 	 * @access public
 	 * @deprecated
 	 */
-	public static function curl_post($url, $data, $headers = null, $request_type = 'POST', $curl_options = null)
+	public static function curl_post($url, $data, $headers = NULL, $request_type = 'POST', $curl_options = NULL)
 	{
 		$application =& kApplication::Instance();
 
@@ -491,16 +491,18 @@
 	 */
 	public static function ipMatch($ip_list, $separator = ';')
 	{
-		if ( !isset($_SERVER['REMOTE_ADDR']) ) {
-			// PHP CLI used -> never match
+		if ( php_sapi_name() == 'cli' ) {
 			return false;
 		}
 
 		$ip_match = false;
 		$ip_addresses = $ip_list ? explode($separator, $ip_list) : Array ();
 
+		$application =& kApplication::Instance();
+		$client_ip = $application->getClientIp();
+
 		foreach ($ip_addresses as $ip_address) {
-			if (self::netMatch($ip_address, $_SERVER['REMOTE_ADDR'])) {
+			if ( self::netMatch($ip_address, $client_ip) ) {
 				$ip_match = true;
 				break;
 			}
@@ -675,6 +677,45 @@
 	}
 
 	/**
+	 * Returns instance of DateTime class with date set based on timestamp
+	 *
+	 * @static
+	 * @param int $timestamp
+	 * @return DateTime
+	 * @access public
+	 */
+	public static function dateFromTimestamp($timestamp)
+	{
+		if ( version_compare(PHP_VERSION, '5.3.0', '<') ) {
+			$date = new DateTime('@' . $timestamp);
+			$date->setTimezone(new DateTimeZone(getenv('TZ')));
+		}
+		else {
+			$date = new DateTime();
+			$date->setTimestamp($timestamp);
+		}
+
+		return $date;
+	}
+
+	/**
+	 * Returns timestamp from given DateTime class instance
+	 *
+	 * @static
+	 * @param DateTime $date_time
+	 * @return int|string
+	 * @access public
+	 */
+	public static function timestampFromDate(DateTime $date_time)
+	{
+		if ( version_compare(PHP_VERSION, '5.3.0', '<') ) {
+			return $date_time->format('U');
+		}
+
+		return $date_time->getTimestamp();
+	}
+
+	/**
 	 * Generates random numeric id
 	 *
 	 * @static
@@ -698,6 +739,21 @@
 
 		return $id_part_1 . $id_part_2 . $id_part_3;
 	}
+
+	/**
+	 * Changes script resource limits. Omitted argument results in limit removal.
+	 *
+	 * @static
+	 * @param string|int $memory_limit
+	 * @param int $time_limit
+	 * @return void
+	 * @access public
+	 */
+	public static function setResourceLimit($memory_limit = null, $time_limit = null)
+	{
+		set_time_limit(isset($time_limit) ? $time_limit : 0);
+		ini_set('memory_limit', isset($memory_limit) ? $memory_limit : -1);
+	}
 }
 
 /**
@@ -735,7 +791,7 @@
 	 * @param int $scanner_mode
 	 * @return Array
 	 */
-	function parse_ini_string($ini, $process_sections = false, $scanner_mode = null)
+	function parse_ini_string($ini, $process_sections = false, $scanner_mode = NULL)
 	{
 		# Generate a temporary file.
 		$tempname = tempnam('/tmp', 'ini');