Index: branches/5.2.x/units/links/links_event_handler.php
===================================================================
diff -u -N -r13842 -r14100
--- branches/5.2.x/units/links/links_event_handler.php	(.../links_event_handler.php)	(revision 13842)
+++ branches/5.2.x/units/links/links_event_handler.php	(.../links_event_handler.php)	(revision 14100)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: links_event_handler.php 13550 2010-05-11 21:16:03Z alex $
+* @version	$Id: links_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
@@ -43,6 +43,7 @@
 			parent::SetCustomQuery($event);
 
 			$object =& $event->getObject();
+			/* @var $object kDBList */
 
 			if (!$this->Application->isAdminUser) {
 				$object->addFilter('expire_filter', '(Expire > '.adodb_mktime().' OR Expire IS NULL)');
@@ -60,7 +61,7 @@
 						foreach ($grouping as $group_field) {
 							$object->AddGroupByField($object->TableName.'.'.$group_field);
 						}
-						$object->addFilter('has_dupes_filter', 'DupeCount > 1', AGGREGATE_FILTER, FLT_SYSTEM);
+						$object->addFilter('has_dupes_filter', 'DupeCount > 1', kDBList::AGGREGATE_FILTER);
 						break;
 
 					case 'duplicates-sub':
@@ -165,7 +166,7 @@
 
 			}
 			else {
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 				$event->redirect = false;
 				$this->Application->SetVar($event->getPrefixSpecial().'_error', 1);
 			}
@@ -193,19 +194,19 @@
 		{
 			parent::OnCreate($event);
 
-			if ($event->status == erSUCCESS) {
+			if ($event->status == kEvent::erSUCCESS) {
 				$object =& $event->getObject();
 				/* @var $object kDBItem */
 
 				// replace 0 id in post with actual created id (used in enhancement process)
 				$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-				array_rename_key($items_info, 0, $object->GetID());
+				kUtil::array_rename_key($items_info, 0, $object->GetID());
 				$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
 
 				// listing was created -> enhance it right away
 				$enhancement_event = new kEvent('ls:OnRequestEnhancement');
 				$this->Application->HandleEvent($enhancement_event);
-				if (($enhancement_event->status == erSUCCESS) && strlen($enhancement_event->redirect)) {
+				if (($enhancement_event->status == kEvent::erSUCCESS) && strlen($enhancement_event->redirect)) {
 					$event->SetRedirectParam('next_template', $event->redirect);
 					$event->redirect = $enhancement_event->redirect;
 				}
@@ -273,21 +274,21 @@
 							/* @var $captcha_helper kCaptchaHelper */
 							$this->Application->StoreVar($event->Prefix . '_captcha_code', $captcha_helper->GenerateCaptchaCode());
 
-							$event->status = erFAIL;
+							$event->status = kEvent::erFAIL;
 							$event->redirect = false;
 						}
 					}
 					// email validation
 					elseif (!strlen($field_value) || ($field_name == 'ContactFormEmail' && !preg_match('/'.REGEX_EMAIL_USER.'@'.REGEX_EMAIL_DOMAIN.'/', $field_value))) {
 						$this->Application->SetVar('error_'.$field_name, 1);
-						$event->status = erFAIL;
+						$event->status = kEvent::erFAIL;
 						$event->redirect = false;
 					}
 
 				}
 			}
 
-			if ($event->status != erSUCCESS) {
+			if ($event->status != kEvent::erSUCCESS) {
 				// set errors var
 				$this->Application->SetVar('ContactForm_HasErrors', 1);
 				return ;
@@ -306,7 +307,7 @@
 
 			$email_event =& $this->Application->EmailEventUser('LINK.CONTACTFORM', $object->GetDBField('CreatedById'), $send_params);
 
-			if ($email_event->status == erSUCCESS) {
+			if ($email_event->status == kEvent::erSUCCESS) {
 				$event->redirect = $this->Application->GetVar('success_template');
 
 				$redirect_params = Array (
@@ -321,7 +322,7 @@
 			}
 			else {
 				$this->Application->SetVar('error_ContactFormEmail', 1);
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 				$event->redirect = false;
 			}
 		}