Index: branches/5.3.x/core/units/helpers/deployment_helper.php
===================================================================
diff -u -N -r15584 -r15677
--- branches/5.3.x/core/units/helpers/deployment_helper.php	(.../deployment_helper.php)	(revision 15584)
+++ branches/5.3.x/core/units/helpers/deployment_helper.php	(.../deployment_helper.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: deployment_helper.php 15584 2012-10-17 10:50:12Z alex $
+* @version	$Id: deployment_helper.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -86,13 +86,12 @@
 	{
 		parent::__construct();
 
-		set_time_limit(0);
-		ini_set('memory_limit', -1);
+		kUtil::setResourceLimit();
 
 		$this->isCommandLine = isset($GLOBALS['argv']) && count($GLOBALS['argv']);
 
 		if ( !$this->isCommandLine ) {
-			$this->ip = $_SERVER['REMOTE_ADDR'];
+			$this->ip = $this->Application->getClientIp();
 		}
 		elseif ( isset($GLOBALS['argv'][3]) ) {
 			$this->ip = $GLOBALS['argv'][3];
@@ -423,7 +422,7 @@
 				}
 				elseif ( $sql ) {
 					$this->toLog($sql . ' ... ', false);
-					echo mb_substr(trim(preg_replace('/(\n|\t| )+/is', ' ', ($this->isCommandLine ? $sql : htmlspecialchars($sql)))), 0, self::SQL_TRIM_LENGTH) . ' ... ';
+					echo mb_substr(trim(preg_replace('/(\n|\t| )+/is', ' ', ($this->isCommandLine ? $sql : htmlspecialchars($sql, null, CHARSET)))), 0, self::SQL_TRIM_LENGTH) . ' ... ';
 
 					$this->Conn->Query($sql);
 
@@ -564,7 +563,7 @@
 
 		$html_color = $html_color_map[$color][$bold ? 'bold' : 'normal'];
 
-		return '<span style="color: ' . $html_color . '">' . htmlspecialchars($text) . '</span>';
+		return '<span style="color: ' . $html_color . '">' . htmlspecialchars($text, null, CHARSET) . '</span>';
 	}
 
 	/**
@@ -580,7 +579,7 @@
 			return "\033[1m" . $text . "\033[0m";
 		}
 
-		return '<strong>' . htmlspecialchars($text) . '</strong>';
+		return '<strong>' . htmlspecialchars($text, null, CHARSET) . '</strong>';
 	}
 
 	/**
@@ -612,7 +611,7 @@
 	private function out($text, $new_line = false)
 	{
 		if ( !$this->isCommandLine ) {
-			$text = htmlspecialchars($text);
+			$text = htmlspecialchars($text, null, CHARSET);
 		}
 
 		echo $text . ($new_line ? PHP_EOL : '');