Index: branches/5.2.x/units/private_messages/private_message_eh.php
===================================================================
diff -u -N -r14985 -r15060
--- branches/5.2.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 14985)
+++ branches/5.2.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 15060)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_message_eh.php 14985 2012-01-04 16:04:11Z alex $
+* @version	$Id: private_message_eh.php 15060 2012-01-17 14:31:07Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -77,7 +77,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -102,7 +102,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -145,7 +145,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -168,12 +168,14 @@
 		 * Goes to next_template after post creation
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
-			if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
+			if ( $event->status == kEvent::erSUCCESS && !$this->Application->isAdmin ) {
 				$event->SetRedirectParam('opener', 's');
 				$event->redirect = $this->Application->GetVar('next_template');
 			}
@@ -183,35 +185,45 @@
 		 * Prevents user from deleting other user private messages
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
+			parent::OnBeforeItemDelete($event);
+
 			$object =& $event->getObject();
-	    	/* @var $object kDBItem */
+			/* @var $object kDBItem */
 
 			$user_id = $this->Application->RecallVar('user_id');
 			$owner_field = ($object->GetDBField('FolderId') == PM_FOLDER_INBOX) ? 'ToId' : 'FromId';
-			if ($object->GetDBField($owner_field) != $user_id) {
-	    		$event->status = kEvent::erFAIL;
-	    	}
+
+			if ( $object->GetDBField($owner_field) != $user_id ) {
+				$event->status = kEvent::erFAIL;
+			}
 		}
 
 		/**
 		 * Updates reference counter in message body record
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
-	    	$object =& $event->getObject();
-	    	/* @var $object kDBItem */
+	    	parent::OnAfterItemDelete($event);
 
-	    	$body_idfield = $this->Application->getUnitOption($event->Prefix.'-body', 'IDField');
-	    	$body_table = $this->Application->getUnitOption($event->Prefix.'-body', 'TableName');
-	    	$sql = 'UPDATE '.$body_table.'
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$body_idfield = $this->Application->getUnitOption($event->Prefix . '-body', 'IDField');
+			$body_table = $this->Application->getUnitOption($event->Prefix . '-body', 'TableName');
+
+			$sql = 'UPDATE ' . $body_table . '
 	    			SET ReferenceCount = ReferenceCount - 1
-	    			WHERE '.$body_idfield.' = '.$object->GetDBField('PMBodyId');
-	    	$this->Conn->Query($sql);
+	    			WHERE ' . $body_idfield . ' = ' . $object->GetDBField('PMBodyId');
+			$this->Conn->Query($sql);
 		}
 
 		/**
@@ -256,8 +268,10 @@
 		 * Prepares new reply & new message form
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
@@ -267,17 +281,17 @@
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if ($reply_to > 0) {
+			if ( $reply_to > 0 ) {
 				// reply to message
-				$source_msg =& $this->Application->recallObject($event->Prefix.'.-item', null, Array ('skip_autoload' => true));
+				$source_msg =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
 				/* @var $source_msg kDBItem */
 
 				$source_msg->Load($reply_to);
 
 				$object->SetDBField('ToId', $source_msg->GetDBField('FromId'));
-				$object->SetDBField('Subject', 'Re: '.$source_msg->GetDBField('Subject'));
+				$object->SetDBField('Subject', 'Re: ' . $source_msg->GetDBField('Subject'));
 			}
-			elseif ($user_id > 0) {
+			elseif ( $user_id > 0 ) {
 				// send message to any user by id
 				$object->SetDBField('ToId', $user_id);
 			}