Index: branches/5.2.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r14678 -r14703 --- branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 14678) +++ branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 14703) @@ -1,6 +1,6 @@ getObject( Array('skip_autoload' => true) ); + /* @var $object kDBItem */ switch ($event->Name) { case 'EnhanceLinkAfterOrderApprove': @@ -451,6 +455,8 @@ function EnhanceLinkAfterOrderApprove(&$event) { $object =& $event->getObject( Array('skip_autoload' => true) ); + /* @var $object kDBItem */ + $fields = $event->getEventParam('field_values'); $item_data = unserialize($fields['ItemData']); @@ -501,23 +507,25 @@ */ function ExpireLink(&$event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object =& $event->getObject(Array ('skip_autoload' => true)); + /* @var $object kDBItem */ + $fields = $event->getEventParam('field_values'); $item_data = unserialize($fields['ItemData']); - $sql = 'SELECT ListingId FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').' - WHERE ItemResourceId = '.$item_data['LinkId']; + + $sql = 'SELECT ListingId FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . ' + WHERE ItemResourceId = ' . $item_data['LinkId']; $listing_id = $this->Conn->GetOne($sql); + $object->Load($listing_id); $original_values = $object->GetFieldValues(); $object->SetDBField('Status', 2); - if($object->Update()) - { + if ( $object->Update() ) { $event->status = kEvent::erSUCCESS; $this->ResetLink($original_values); } - else - { + else { $event->status = kEvent::erFAIL; } } @@ -688,21 +696,23 @@ function OnCancelEnhancement(&$event) { $listing_id = $this->verifyListingOwner($event); - if (!$listing_id) { - return ; + if ( !$listing_id ) { + return; } - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object =& $event->getObject(Array ('skip_autoload' => true)); + /* @var $object kDBItem */ + $object->Load($listing_id); $original_values = $object->GetFieldValues(); $original_values['Status'] = 1; $this->ResetLink($original_values); - $sql = 'SELECT CreatedById FROM '.$this->Application->getUnitOption('l', 'TableName').' - WHERE ResourceId = '.$object->GetDBField('ItemResourceId'); - $email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.CANCEL', $this->Conn->GetOne($sql)); - $email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.CANCEL'); + $sql = 'SELECT CreatedById FROM ' . $this->Application->getUnitOption('l', 'TableName') . ' + WHERE ResourceId = ' . $object->GetDBField('ItemResourceId'); + $this->Application->EmailEventUser('LINK.ENHANCE.CANCEL', $this->Conn->GetOne($sql)); + $this->Application->EmailEventAdmin('LINK.ENHANCE.CANCEL'); $object->Delete(); $event->redirect = $this->Application->GetVar('success_template'); @@ -772,8 +782,8 @@ */ protected function OnMassDelete(&$event) { - $object =& $event->getObject( Array ('skip_autoload' => true) ); - /*@var $object kDBItem */ + $object =& $event->getObject(Array ('skip_autoload' => true)); + /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); Index: branches/5.2.x/install/prerequisites.php =================================================================== diff -u -N -r14254 -r14703 --- branches/5.2.x/install/prerequisites.php (.../prerequisites.php) (revision 14254) +++ branches/5.2.x/install/prerequisites.php (.../prerequisites.php) (revision 14703) @@ -1,6 +1,6 @@ StoreSelectedIDs($event); if (!$ids) { - return true; + return ; } // check, that user has not selected multiple links from same group @@ -134,7 +134,8 @@ } if (!$groping_error) { - $temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); + $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); + /* @var $temp_handler kTempTablesHandler */ $categories_sql = 'SELECT main_table.ResourceId, ci.CategoryId, main_table.'.$id_field.' FROM '.$table_name.' main_table @@ -163,7 +164,7 @@ } // delete all links from group except primary - $temp->DeleteItems($event->Prefix, $event->Special, array_values($group_links)); + $temp_handler->DeleteItems($event->Prefix, $event->Special, array_values($group_links)); }