In-Portal Issue Tracker

Index: kernel/db/cat_dbitem.php
===================================================================
--- kernel/db/cat_dbitem.php	(revision 13936)
+++ kernel/db/cat_dbitem.php	(working copy)
@@ -59,25 +59,6 @@
 	function Create($force_id = false, $system_create = false)
 	{
 		// TODO: move to OnBeforeItemCreate method
-		if ($this->Validate()) {
-			// TODO: such approach will not respect changes from OnBeforeItemCreate event
-			$this->SetDBField('ResourceId', $this->Application->NextResourceId());
-		}
-
-		$this->SetDBField('Modified_date', adodb_mktime() );
-		$this->SetDBField('Modified_time', adodb_mktime() );
-
-		$is_admin = $this->Application->isAdminUser;
-		$owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField');
-
-		if (!$owner_field) {
-			$owner_field = 'CreatedById';
-		}
-
-		if ((!$this->IsTempTable() && !$is_admin) || ($is_admin && !$this->GetDBField($owner_field))) {
-			$this->SetDBField($owner_field, $this->Application->RecallVar('user_id'));
-		}
-
 		if ($this->useFilenames) {
 			$this->checkFilename();
 			$this->generateFilename();
Index: kernel/db/cat_event_handler.php
===================================================================
--- kernel/db/cat_event_handler.php	(revision 13987)
+++ kernel/db/cat_event_handler.php	(working copy)
@@ -2197,29 +2197,54 @@
 	 */
 	function OnBeforeItemCreate(&$event)
 	{
-		if ($this->Application->isAdminUser) {
-			// don't set permission-based status, when creating categories in admin
-			return true;
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
+		$is_admin = $this->Application->isAdminUser;
+		$owner_field = $this->getOwnerField($event->Prefix);
+
+		if ((!$object->IsTempTable() && !$is_admin) || ($is_admin && !$object->GetDBField($owner_field))) {
+			// Front-end OR owner not specified -> set to currently logged-in user
+			$object->SetDBField($owner_field, $this->Application->RecallVar('user_id'));
 		}
 
+		if ( $object->Validate() ) {
+			$object->SetDBField('ResourceId', $this->Application->NextResourceId());
+		}
+
+		if (!$this->Application->isAdmin) {
+			$this->setItemStatusByPermission($event);
+		}
+	}
+
+	/**
+	 * Sets category item status based on user permissions (only on Front-end)
+	 *
+	 * @param kEvent $event
+	 */
+	function setItemStatusByPermission(&$event)
+	{
 		$use_pending_editing = $this->Application->getUnitOption($event->Prefix, 'UsePendingEditing');
-		if ($use_pending_editing) {
-			$object =& $event->getObject();
-			/* @var $object kDBItem */
 
-			$perm_helper =& $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
+		if (!$use_pending_editing) {
+			return ;
+		}
 
-			$primary_category = $object->GetDBField('CategoryId') > 0 ? $object->GetDBField('CategoryId') : $this->Application->GetVar('m_cat_id');
-			$item_status = $perm_helper->AddCheckPermission($primary_category, $event->Prefix);
-			if ($item_status == STATUS_DISABLED) {
-				$event->status = erFAIL;
-				return false;
-			}
-			else {
-				$object->SetDBField('Status', $item_status);
-			}
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
+		$perm_helper =& $this->Application->recallObject('PermissionsHelper');
+		/* @var $perm_helper kPermissionsHelper */
+
+		$primary_category = $object->GetDBField('CategoryId') > 0 ? $object->GetDBField('CategoryId') : $this->Application->GetVar('m_cat_id');
+		$item_status = $perm_helper->AddCheckPermission($primary_category, $event->Prefix);
+
+		if ($item_status == STATUS_DISABLED) {
+			$event->status = erFAIL;
 		}
+		else {
+			$object->SetDBField('Status', $item_status);
+		}
 	}
 
 	/**

Index: in-bulletin/units/topics/topics_config.php
===================================================================
--- in-bulletin/units/topics/topics_config.php	(revision 13958)
+++ in-bulletin/units/topics/topics_config.php	(working copy)
@@ -401,7 +401,7 @@
 			            	'left_key_field' => 'PortalUserId',
 			            	'left_title_field' => 'Login',
 			            	'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
-			            	'required' => 1, 'default' => NULL,
+			            	'default' => NULL,
 						),
 			            'ResourceId'			=>	Array ('type' => 'int', 'default' => null),
 			            'TopicType'				=>	Array (
Index: in-commerce/units/products/products_config.php
===================================================================
--- in-commerce/units/products/products_config.php	(revision 13959)
+++ in-commerce/units/products/products_config.php	(working copy)
@@ -493,7 +493,7 @@
 					    'Type'					=>	Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1=> 'la_product_tangible',  2=> 'la_product_subscription', 4=> 'la_product_downloadable', 3=> 'la_product_service'/*, 6=> 'la_gift_certificate', 5=> 'la_product_package'*/), 'not_null' => 1, 'default' => 1 ),
 					    'Modified'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 					    'ModifiedById'			=>	Array ('type' => 'int', 'default' => NULL),
-					    'CreatedById'			=>	Array ('type' => 'int', 'default' => NULL),
+					    'CreatedById'			=>	Array ('type' => 'int', 'required' => 1, 'default' => NULL),
 					    'ResourceId'			=>	Array ('type' => 'int', 'default' => null),
 					    'CachedReviewsQty'		=>	Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
 					    'InventoryStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Disabled', 1 => 'la_by_product', 2 => 'la_by_options'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
Index: in-commerce/units/products/products_event_handler.php
===================================================================
--- in-commerce/units/products/products_event_handler.php	(revision 13936)
+++ in-commerce/units/products/products_event_handler.php	(working copy)
@@ -59,18 +59,21 @@
 	 */
 	function OnBeforeItemCreate(&$event)
 	{
+		parent::OnBeforeItemCreate($event);
+
 		$object =& $event->getObject();
 
-		$product_approve_events = Array(2 => 'p:OnSubscriptionApprove',
-										4 => 'p:OnDownloadableApprove',
-										5 => 'p:OnPackageApprove');
+		$product_approve_events = Array(
+			2 => 'p:OnSubscriptionApprove',
+			4 => 'p:OnDownloadableApprove',
+			5 => 'p:OnPackageApprove'
+		);
 
 		$product_type = $object->GetDBField('Type');
 
 		$type_found = in_array($product_type, array_keys($product_approve_events) );
 
-		if($type_found && !$object->GetDBField('ProcessingData') )
-		{
+		if ($type_found && !$object->GetDBField('ProcessingData') ) {
 			$processing_data = Array('ApproveEvent' => $product_approve_events[$product_type] );
 			$object->SetDBField( 'ProcessingData', serialize($processing_data) );
 		}
Index: in-link/units/links/links_config.php
===================================================================
--- in-link/units/links/links_config.php	(revision 13960)
+++ in-link/units/links/links_config.php	(working copy)
@@ -463,7 +463,7 @@
 			            'CachedRating'		=>	Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kFormatter', 'default' => 0),
 			            'CachedVotesQty'	=>	Array ('type' => 'int', 'formatter' => 'kFormatter', 'not_null' => 1, 'default' => 0),
 			            'CachedReviewsQty'	=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			            'CreatedById'		=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL),
+			            'CreatedById'		=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' => 1, 'default' => NULL),
 			            'ModifiedById'		=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL),
 			            'Priority'			=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			            'Status'			=>	Array (