Index: branches/5.2.x/units/listings/listings_event_handler.php
===================================================================
diff -u -N -r13842 -r14100
--- branches/5.2.x/units/listings/listings_event_handler.php	(.../listings_event_handler.php)	(revision 13842)
+++ branches/5.2.x/units/listings/listings_event_handler.php	(.../listings_event_handler.php)	(revision 14100)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listings_event_handler.php 12738 2009-10-20 19:36:22Z alex $
+* @version	$Id: listings_event_handler.php 14100 2010-12-28 18:10:11Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -311,7 +311,7 @@
 		// get listing by link's resource_id
 		$object->Load($resource_id, 'ItemResourceId');
 		if ($object->isLoaded()) {
-			$original_values = $object->FieldValues;
+			$original_values = $object->GetFieldValues();
 		}
 		else {
 			// set initial fields to listing
@@ -359,7 +359,7 @@
 
 		$action = $object->isLoaded() ? 'Update' : 'Create';
 		if ($object->$action()) {
-			$event->status = erSUCCESS;
+			$event->status = kEvent::erSUCCESS;
 			switch ($event->Name) {
 				case 'EnhanceLinkAfterOrderApprove':
 				case 'EnhancedLinkOnCompleteOrder':
@@ -383,7 +383,7 @@
 
 		}
 		else {
-			$event->status = erFAIL;
+			$event->status = kEvent::erFAIL;
 		}
 
 
@@ -477,20 +477,25 @@
 				WHERE ItemResourceId = '.$item_data['LinkId'];
 		$listing_id = $this->Conn->GetOne($sql);
 		$object->Load($listing_id);
-		$original_values = $object->FieldValues;
+		$original_values = $object->GetFieldValues();
 		$object->SetDBField('Status', 2);
 
 		if($object->Update())
 		{
-			$event->status = erSUCCESS;
+			$event->status = kEvent::erSUCCESS;
 			$this->ResetLink($original_values);
 		}
 		else
 		{
-			$event->status = erFAIL;
+			$event->status = kEvent::erFAIL;
 		}
 	}
 
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
 	function iterateItems(&$event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
@@ -500,7 +505,7 @@
 			foreach ($ids as $id) {
 				$object->Load($id);
 				if ($object->GetDBField('Status') != STATUS_ACTIVE) {
-					$original_values = $object->FieldValues;
+					$original_values = $object->GetFieldValues();
 					$object->SetDBField('Status', STATUS_ACTIVE);
 					$this->EnhanceLink($object, $original_values);
 				}
@@ -511,7 +516,7 @@
 			foreach ($ids as $id) {
 				$object->Load($id);
 				if ($object->GetDBField('Status') == STATUS_ACTIVE) {
-					$original_values = $object->FieldValues;
+					$original_values = $object->GetFieldValues();
 					$this->ResetLink($original_values);
 
 					$sql = 'SELECT CreatedById
@@ -559,13 +564,13 @@
 					$object->SetDBField('PendingRenewal', 0);
 
 					if ($object->Update()) {
-						$event->status = erSUCCESS;
-						$event->redirect_params = Array('opener' => 's'); //stay!
+						$event->status = kEvent::erSUCCESS;
+						$event->setRedirectParams(Array('opener' => 's'), true);
 						$email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.RENEW', $owner_id);
 						$email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.RENEW');
 					}
 					else {
-						$event->status=erFAIL;
+						$event->status=kEvent::erFAIL;
 						$event->redirect=false;
 						break;
 					}
@@ -609,7 +614,7 @@
 		$resource_id = $this->Conn->GetOne($sql);
 
 		if (!$resource_id) {
-			$event->status = erFAIL;
+			$event->status = kEvent::erFAIL;
 			return false;
 		}
 
@@ -640,6 +645,11 @@
 		$email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.EXTEND');
 	}
 
+	/**
+	 * Cancels enhancement
+	 *
+	 * @param kEvent $event
+	 */
 	function OnCancelEnhancement(&$event)
 	{
 		$listing_id = $this->verifyListingOwner($event);
@@ -650,7 +660,7 @@
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$object->Load($listing_id);
 
-		$original_values = $object->FieldValues;
+		$original_values = $object->GetFieldValues();
 		$original_values['Status'] = 1;
 		$this->ResetLink($original_values);
 
@@ -663,6 +673,11 @@
 		$event->redirect = $this->Application->GetVar('success_template');
 	}
 
+	/**
+	 * Checks expired paid listings
+	 *
+	 * @param kEvent $event
+	 */
 	function OnCheckExpiredPaidListings(&$event)
 	{
 		$sql = 'SELECT ListingId FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').'
@@ -671,10 +686,12 @@
 		if(is_array($expired_listings) && count($expired_listings) > 0)
 		{
 			$object =& $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
+			/* @var $object kDBItem */
+
 			foreach($expired_listings as $listing_id)
 			{
 				$object->Load($listing_id);
-				$original_values = $object->FieldValues;
+				$original_values = $object->GetFieldValues();
 				$this->ResetLink($original_values);
 				$object->SetDBField('Status', 2);
 				$object->Update();
@@ -711,6 +728,11 @@
 		}
 	}
 
+	/**
+	 * Removes enhancements on listing delete
+	 *
+	 * @param kEvent $event
+	 */
 	function OnMassDelete(&$event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
@@ -721,7 +743,7 @@
 			$object->Load($id);
 			if($object->GetDBField('Status') == 1)
 			{
-				$original_values = $object->FieldValues;
+				$original_values = $object->GetFieldValues();
 				$this->ResetLink($original_values);
 			}
 		}