Index: branches/1.2.x/units/widgets/widget_eh.php
===================================================================
diff -u -N -r14709 -r14983
--- branches/1.2.x/units/widgets/widget_eh.php	(.../widget_eh.php)	(revision 14709)
+++ branches/1.2.x/units/widgets/widget_eh.php	(.../widget_eh.php)	(revision 14983)
@@ -11,8 +11,11 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
-		function mapPermissions()
+		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
@@ -31,13 +34,13 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
 			);
 
-			if (in_array($event->Name, $skip_permissions_check_events)) {
+			if ( in_array($event->Name, $skip_permissions_check_events) ) {
 				return true;
 			}
 
@@ -64,16 +67,16 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
 			parent::SetCustomQuery($event);
 
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
-			if ($event->Special == 'custom-special') {
-//				$object->addFilter('primary_filter', '%1$s.Status = '.STATUS_DISABLED);
+			if ( $event->Special == 'custom-special' ) {
+//				$object->addFilter('primary_filter', '%1$s.Status = ' . STATUS_DISABLED);
 			}
 		}
 
Index: branches/1.2.x/units/sections/users/e_user_eh.php
===================================================================
diff -u -N -r14847 -r14983
--- branches/1.2.x/units/sections/users/e_user_eh.php	(.../e_user_eh.php)	(revision 14847)
+++ branches/1.2.x/units/sections/users/e_user_eh.php	(.../e_user_eh.php)	(revision 14983)
@@ -11,16 +11,16 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
-		function mapPermissions()
+		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
-				# admin
 				'OnCustomEvent1' =>	Array ('self' => true),
-
-				# front
 				'OnCustomEvent2' => Array ('self' => true),
 			);
 
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -77,7 +77,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -90,7 +90,7 @@
 			}
 
 			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
+			if ( !$this->Application->isAdminUser ) {
 //				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 		}
Index: branches/1.2.x/units/sections/articles/e_article_eh.php
===================================================================
diff -u -N -r14847 -r14983
--- branches/1.2.x/units/sections/articles/e_article_eh.php	(.../e_article_eh.php)	(revision 14847)
+++ branches/1.2.x/units/sections/articles/e_article_eh.php	(.../e_article_eh.php)	(revision 14983)
@@ -11,16 +11,16 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
-		function mapPermissions()
+		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
-				# admin
 				'OnCustomEvent1' => Array ('self' => true),
-
-				# front
 				'OnCustomEvent2' => Array ('self' => true),
 			);
 
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -77,20 +77,20 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
 			parent::SetCustomQuery($event);
 
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
-			if ($event->Special == 'custom-special') {
+			if ( $event->Special == 'custom-special' ) {
 //				$object->addFilter('primary_filter', '%1$s.Status = ' . STATUS_DISABLED);
 			}
 
 			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
+			if ( !$this->Application->isAdminUser ) {
 //				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 		}
Index: branches/1.2.x/units/sections/links/e_link_eh.php
===================================================================
diff -u -N -r14847 -r14983
--- branches/1.2.x/units/sections/links/e_link_eh.php	(.../e_link_eh.php)	(revision 14847)
+++ branches/1.2.x/units/sections/links/e_link_eh.php	(.../e_link_eh.php)	(revision 14983)
@@ -11,16 +11,16 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
 		function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
-				# admin
 				'OnCustomEvent1' => Array ('self' => true),
-
-				# front
 				'OnCustomEvent2' => Array ('self' => true),
 			);
 
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -77,20 +77,20 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
 			parent::SetCustomQuery($event);
 
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
-			if ($event->Special == 'custom-special') {
+			if ( $event->Special == 'custom-special' ) {
 //				$object->addFilter('primary_filter', '%1$s.Status = ' . STATUS_DISABLED);
 			}
 
 			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
+			if ( !$this->Application->isAdminUser ) {
 //				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 		}
Index: branches/1.2.x/units/sections/products/e_product_eh.php
===================================================================
diff -u -N -r14847 -r14983
--- branches/1.2.x/units/sections/products/e_product_eh.php	(.../e_product_eh.php)	(revision 14847)
+++ branches/1.2.x/units/sections/products/e_product_eh.php	(.../e_product_eh.php)	(revision 14983)
@@ -11,16 +11,16 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
-		function mapPermissions()
+		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
-				# admin
 				'OnCustomEvent1' => Array ('self' => true),
-
-				# front
 				'OnCustomEvent2' => Array ('self' => true),
 			);
 
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -78,7 +78,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -91,7 +91,7 @@
 			}
 
 			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
+			if ( !$this->Application->isAdminUser ) {
 //				$object->addFilter('status_filter', '%1$s.Status = '.STATUS_ACTIVE);
 			}
 		}
Index: branches/1.2.x/units/sections/categories/e_category_eh.php
===================================================================
diff -u -N -r14847 -r14983
--- branches/1.2.x/units/sections/categories/e_category_eh.php	(.../e_category_eh.php)	(revision 14847)
+++ branches/1.2.x/units/sections/categories/e_category_eh.php	(.../e_category_eh.php)	(revision 14983)
@@ -11,16 +11,16 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
-		function mapPermissions()
+		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
-				# admin
 				'OnCustomEvent1' => Array ('self' => true),
-
-				# front
 				'OnCustomEvent2' => Array ('self' => true),
 			);
 
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -77,20 +77,20 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
 			parent::SetCustomQuery($event);
 
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
-			if ($event->Special == 'custom-special') {
+			if ( $event->Special == 'custom-special' ) {
 //				$object->addFilter('primary_filter', '%1$s.Status = ' . STATUS_DISABLED);
 			}
 
 			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
+			if ( !$this->Application->isAdminUser ) {
 //				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 		}