Index: branches/5.1.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 12657)
+++ branches/5.1.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: email_events_event_handler.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
@@ -85,6 +85,11 @@
 		 */
 		function OnFrontOnly(&$event)
 		{
+			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+				$event->status = erFAIL;
+				return ;
+			}
+
 			$ids = implode(',', $this->StoreSelectedIDs($event));
 
 			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
@@ -108,6 +113,11 @@
 				return ;
 			}
 
+			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+				$event->status = erFAIL;
+				return ;
+			}
+
 			$items_info = $this->Application->GetVar('u');
 			if ($items_info) {
 				$user_id = array_shift( array_keys($items_info) );
@@ -165,7 +175,7 @@
 				return false;
 			}
 
-			if ($email_event->GetDBField('FrontEndOnly') && $this->Application->IsAdmin()) {
+			if ($email_event->GetDBField('FrontEndOnly') && $this->Application->isAdmin) {
 				return false;
 			}
 
@@ -328,6 +338,11 @@
 			$message_headers = Array ();
 			list($headers, $message_body) = explode('&|&', $message, 2);
 
+			$category_helper =& $this->Application->recallObject('CategoryHelper');
+			/* @var $category_helper CategoryHelper */
+
+			$message_body = $category_helper->replacePageIds($message_body);
+
 			$headers = explode("\n", $headers);
 			foreach ($headers as $header) {
 				$header = explode(':', $header, 2);