Index: branches/5.2.x/core/units/helpers/deployment_helper.php
===================================================================
diff -u -N -r15728 -r15856
--- branches/5.2.x/core/units/helpers/deployment_helper.php	(.../deployment_helper.php)	(revision 15728)
+++ branches/5.2.x/core/units/helpers/deployment_helper.php	(.../deployment_helper.php)	(revision 15856)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: deployment_helper.php 15728 2013-04-11 16:41:23Z alex $
+* @version	$Id: deployment_helper.php 15856 2013-07-02 14:56:00Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -206,7 +206,7 @@
 		}
 
 		if ( !$this->isCommandLine ) {
-			echo htmlspecialchars($this->_runShellScript());
+			echo kUtil::escape($this->_runShellScript());
 			echo '</pre>' . PHP_EOL;
 		}
 
@@ -499,7 +499,8 @@
 				}
 				elseif ( $sql ) {
 					$this->toLog($sql . ' ... ', false);
-					echo mb_substr(trim(preg_replace('/(\n|\t| )+/is', ' ', ($this->isCommandLine ? $sql : htmlspecialchars($sql, null, CHARSET)))), 0, self::SQL_TRIM_LENGTH) . ' ... ';
+					$escaped_sql = $this->isCommandLine ? $sql : kUtil::escape($sql);
+					echo mb_substr(trim(preg_replace('/(\n|\t| )+/is', ' ', $escaped_sql)), 0, self::SQL_TRIM_LENGTH) . ' ... ';
 
 					$this->Conn->Query($sql);
 
@@ -640,26 +641,10 @@
 
 		$html_color = $html_color_map[$color][$bold ? 'bold' : 'normal'];
 
-		return '<span style="color: ' . $html_color . '">' . htmlspecialchars($text, null, CHARSET) . '</span>';
+		return '<span style="color: ' . $html_color . '">' . kUtil::escape($text, kUtil::ESCAPE_HTML) . '</span>';
 	}
 
 	/**
-	 * Makes given text bold
-	 *
-	 * @param string $text
-	 * @return string
-	 * @access private
-	 */
-	private function boldText($text)
-	{
-		if ( $this->isCommandLine ) {
-			return "\033[1m" . $text . "\033[0m";
-		}
-
-		return '<strong>' . htmlspecialchars($text, null, CHARSET) . '</strong>';
-	}
-
-	/**
 	 * Displays last command execution status
 	 *
 	 * @param string $status_text
@@ -688,7 +673,7 @@
 	private function out($text, $new_line = false)
 	{
 		if ( !$this->isCommandLine ) {
-			$text = htmlspecialchars($text, null, CHARSET);
+			$text = kUtil::escape($text);
 		}
 
 		echo $text . ($new_line ? PHP_EOL : '');