Index: branches/5.2.x/core/kernel/event_manager.php
===================================================================
diff -u -N -r14699 -r14879
--- branches/5.2.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 14699)
+++ branches/5.2.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 14879)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: event_manager.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: event_manager.php 14879 2011-12-16 15:07:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -25,12 +25,12 @@
 	protected $Hooks = null;
 
 	/**
-	 * Instance of agent manager
+	 * Instance of scheduled task manager
 	 *
-	 * @var kAgentManager
+	 * @var kScheduledTaskManager
 	 * @access protected
 	 */
-	protected $Agents = null;
+	protected $ScheduledTasks = null;
 
 	/**
 	 * Instance of request manager
@@ -66,7 +66,7 @@
 		parent::__construct();
 
 		$this->Hooks =& $this->Application->makeClass('kHookManager');
-		$this->Agents =& $this->Application->makeClass('kAgentManager');
+		$this->ScheduledTasks =& $this->Application->makeClass('kScheduledTaskManager');
 		$this->Request =& $this->Application->makeClass('kRequestManager');
 	}
 
@@ -79,7 +79,7 @@
 	public function setFromCache(&$data)
 	{
 		$this->Hooks->setFromCache($data);
-		$this->Agents->setFromCache($data);
+		$this->ScheduledTasks->setFromCache($data);
 
 		$this->buildEvents = $data['EventManager.buildEvents'];
 	}
@@ -94,66 +94,66 @@
 	{
 		return array_merge(
 			$this->Hooks->getToCache(),
-			$this->Agents->getToCache(),
+			$this->ScheduledTasks->getToCache(),
 			Array (
 				'EventManager.buildEvents' => $this->buildEvents,
 			)
 		);
 	}
 
 	/**
-	 * Returns information about registered agents
+	 * Returns information about registered scheduled tasks
 	 *
 	 * @param bool $from_cache
 	 * @return Array
 	 * @access public
 	 */
-	public function getAgents($from_cache = false)
+	public function getScheduledTasks($from_cache = false)
 	{
-		return $this->Agents->getAll($from_cache);
+		return $this->ScheduledTasks->getAll($from_cache);
 	}
 
 	/**
-	 * Add new agent
+	 * Add new scheduled task
 	 *
-	 * @param string $short_name name to be used to store last maintenace run info
+	 * @param string $short_name name to be used to store last maintenance run info
 	 * @param string $event_name
 	 * @param int $run_interval run interval in seconds
-	 * @param int $type before or after agent
+	 * @param int $type before or after scheduled task
 	 * @param int $status
 	 * @access public
 	 */
-	public function registerAgent($short_name, $event_name, $run_interval, $type = reBEFORE, $status = STATUS_ACTIVE)
+	public function registerScheduledTask($short_name, $event_name, $run_interval, $type = reBEFORE, $status = STATUS_ACTIVE)
 	{
-		$this->Agents->add($short_name, $event_name, $run_interval, $type, $status);
+		$this->ScheduledTasks->add($short_name, $event_name, $run_interval, $type, $status);
 	}
 
 	/**
-	 * Run registred agents with specified event type
+	 * Run registered scheduled tasks with specified event type
 	 *
 	 * @param int $event_type
 	 * @param bool $from_cron
 	 * @access public
 	 */
-	public function runAgents($event_type = reBEFORE, $from_cron = false)
+	public function runScheduledTasks($event_type = reBEFORE, $from_cron = false)
 	{
-		$this->Agents->runAgents($event_type, $from_cron);
+		$this->ScheduledTasks->runAll($event_type, $from_cron);
 	}
 
 	/**
-	 * Runs agent based on given data
+	 * Runs scheduled task based on given data
 	 *
-	 * @param Array $agent_data
+	 * @param Array $scheduled_task_data
 	 * @return bool
 	 * @access public
 	 */
-	public function runAgent($agent_data)
+	public function runScheduledTask($scheduled_task_data)
 	{
-		return $this->Agents->runAgent($agent_data);
+		return $this->ScheduledTasks->run($scheduled_task_data);
 	}
 
 	/**
-	 * Registers Hook from subprefix event to master prefix event
+	 * Registers Hook from sub-prefix event to master prefix event
 	 *
 	 * Pattern: Observer
 	 *