Index: branches/5.2.x/tools/run_event.php
===================================================================
diff -u -r15130 -r15715
--- branches/5.2.x/tools/run_event.php	(.../run_event.php)	(revision 15130)
+++ branches/5.2.x/tools/run_event.php	(.../run_event.php)	(revision 15715)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version   $Id: run_event.php 15130 2012-03-03 18:38:32Z alex $
+* @version   $Id: run_event.php 15715 2013-03-18 11:26:58Z alex $
 * @package   In-Portal
 * @copyright   Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,8 +12,12 @@
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
-die('Restrictred use!');
+exit_code(1, 'This script needs to be enabled manually !');
 
+if ( php_sapi_name() != 'cli' ) {
+	exit_code(2, 'This script is intended to be used from command-line only !');
+}
+
 $start = microtime(true);
 
 define('CRON', 1);
@@ -26,8 +30,8 @@
 // in command line, then 2nd argument is password
 $password = isset($argv) && isset($argv[2]) ? $argv[2] : '';
 
-if ($password != 'b674006f3edb1d9cd4d838c150b0567d') {
-	die('Bad key' . PHP_EOL);
+if ( $password != 'b674006f3edb1d9cd4d838c150b0567d' ) {
+	exit_code(3, 'Bad key');
 }
 
 include_once(FULL_PATH . '/core/kernel/startup.php');
@@ -36,8 +40,22 @@
 $application->Init();
 
 $application->StoreVar('user_id', USER_ROOT, true);
-$application->HandleEvent(new kEvent($argv[1])); // event name in form "prefix[.special]:event_name"
 
+$run_event = new kEvent($argv[1]); // event name in form "prefix[.special]:event_name"
+$application->HandleEvent($run_event);
+
 $application->Done();
 
+$end = microtime(true);
+
+exit_code($run_event->status == kEvent::erSUCCESS ? 0 : 4);
+
+function exit_code($code, $msg = '')
+{
+	if ( $msg ) {
+		echo $msg . PHP_EOL;
+	}
+
+	exit($code);
+}
 $end = microtime(true);
\ No newline at end of file
Index: branches/5.2.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -r15683 -r15715
--- branches/5.2.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 15683)
+++ branches/5.2.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 15715)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_events_handler.php 15683 2013-02-18 19:08:25Z alex $
+* @version	$Id: admin_events_handler.php 15715 2013-03-18 11:26:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1047,18 +1047,17 @@
 		$deployment_helper = $this->Application->recallObject('DeploymentHelper');
 		/* @var $deployment_helper DeploymentHelper */
 
-		$deployment_helper->deployAll();
-
-		if ( $deployment_helper->isCommandLine ) {
-			// command line invocation -> don't render template
-			$event->status = kEvent::erSTOP;
-		}
-		else {
+		if ( !$deployment_helper->isCommandLine ) {
 			// browser invocation -> don't perform redirect
 			$event->redirect = false;
 		}
 
-		$event->SetRedirectParam('action_completed', 1);
+		if ( $deployment_helper->deployAll() ) {
+			$event->SetRedirectParam('action_completed', 1);
+		}
+		else {
+			$event->status = kEvent::erFAIL;
+		}
 	}
 
 	/**
@@ -1073,17 +1072,16 @@
 		$deployment_helper = $this->Application->recallObject('DeploymentHelper');
 		/* @var $deployment_helper DeploymentHelper */
 
+		if ( !$deployment_helper->isCommandLine ) {
+			// browser invocation -> don't perform redirect
+			$event->redirect = false;
+		}
+
 		if ( $deployment_helper->deployAll(true) ) {
 			$this->Application->SetVar('action_completed', 1);
 		}
-
-		if ( $deployment_helper->isCommandLine ) {
-			// command line invocation -> don't render template
-			$event->status = kEvent::erSTOP;
-		}
 		else {
-			// browser invocation -> don't perform redirect
-			$event->redirect = false;
+			$event->status = kEvent::erFAIL;
 		}
 	}