Index: branches/5.2.x/units/coupons/coupons_event_handler.php =================================================================== diff -u -r15149 -r16015 --- branches/5.2.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 15149) +++ branches/5.2.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ SetDBField('Expiration_time', $expiration); } - function OnApplyClone($event) + function OnApplyClone(kEvent $event) { if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) { $event->status = kEvent::erFAIL; @@ -103,8 +103,9 @@ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); list($id, $field_values) = each($items_info); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $object->setID($id); + $object->SetFieldsFromHash($field_values); + $event->setEventParam('form_data', $field_values); if ( !$object->Validate() ) { $event->status = kEvent::erFAIL; @@ -231,4 +232,4 @@ $object->SetDBField('Amount', abs($object->GetDBField('Amount'))); } -} \ No newline at end of file +} Index: branches/5.2.x/units/reports/reports_event_handler.php =================================================================== diff -u -r15172 -r16015 --- branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 15172) +++ branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ permMapping = array_merge($this->permMapping, $permissions); } - function OnRunReport($event) + function OnRunReport(kEvent $event) { $this->Application->LinkVar('reports_finish_t'); $progress_t = $this->Application->GetVar('progress_t'); $event->redirect = $progress_t; - $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); - if($items_info) $field_values = array_shift($items_info); + $field_values = $this->getSubmittedFields($event); + /** @var kDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->SetFieldsFromHash($field_values); + $event->setEventParam('form_data', $field_values); + $object->UpdateFormattersMasterFields(); $field_values['offset'] = 0; @@ -841,4 +843,4 @@ echo $ret; exit(); } -} \ No newline at end of file +} Index: branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php =================================================================== diff -u -r15540 -r16015 --- branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php (.../taxes_dst_event_handler.php) (revision 15540) +++ branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php (.../taxes_dst_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ Load($field_values['TaxZoneDestId'], "TaxZoneDestId") ) { $taxdest->SetFieldsFromHash($field_values); + $event->setEventParam('form_data', $field_values); + $taxdest->Update($field_values['TaxZoneDestId']); } else { $taxdest->SetFieldsFromHash($field_values); + $event->setEventParam('form_data', $field_values); + $taxdest->Create($field_values['TaxZoneDestId']); } } @@ -82,7 +86,10 @@ } foreach ($items_info as $field_values) { + $object->setID(0); $object->SetFieldsFromHash($field_values); + $event->setEventParam('form_data', $field_values); + $this->customProcessing($event, 'before'); if ( $object->Create() ) { @@ -173,4 +180,4 @@ } -} \ No newline at end of file +} Index: branches/5.2.x/units/orders/orders_item.php =================================================================== diff -u -r15141 -r16015 --- branches/5.2.x/units/orders/orders_item.php (.../orders_item.php) (revision 15141) +++ branches/5.2.x/units/orders/orders_item.php (.../orders_item.php) (revision 16015) @@ -1,6 +1,6 @@ GetFieldOptions('PaymentCCExpDate'); @@ -378,4 +377,4 @@ $this->Application->StoreVar('checkout_errors', serialize($errors)); } - } \ No newline at end of file + } Index: branches/5.2.x/units/pricing/pricing_event_handler.php =================================================================== diff -u -r15780 -r16015 --- branches/5.2.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 15780) +++ branches/5.2.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ Application->SetVar($event->getPrefixSpecial(true), $temp); // store pr_tang var } - function OnPreSaveBrackets($event) + function OnPreSaveBrackets(kEvent $event) { if( $this->Application->GetVar('pr_tang') ) { @@ -206,7 +206,7 @@ if (in_array($item_id, $stored_ids)) { //if it's already exist $object->Load($item_id); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); if (!$object->Validate()) { @@ -225,8 +225,8 @@ unset($stored_ids[array_search($item_id, $stored_ids)]); } else { - $object->Clear(); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->Clear(0); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); $object->SetDBField('ProductId', $product_id); @@ -522,4 +522,4 @@ $object->addFilter('price_user_group', $object->TableName . '.GroupId=' . $pricing_group); } -} \ No newline at end of file +} Index: branches/5.2.x/units/affiliates/affiliates_event_handler.php =================================================================== diff -u -r15605 -r16015 --- branches/5.2.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 15605) +++ branches/5.2.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ getObject( Array('form_name' => 'registration', 'skip_autoload' => true) ); /* @var $object kDBItem */ - $field_values = $this->getSubmittedFields($event); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $object->setID(0); + $field_values = $this->getSubmittedFields($event); + $object->SetFieldsFromHash($field_values); + $event->setEventParam('form_data', $field_values); if ( !$object->Validate() ) { $user = $event->MasterEvent->getObject(); @@ -660,4 +661,4 @@ return $object->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id'); } - } \ No newline at end of file + } Index: branches/5.2.x/units/destinations/dst_event_handler.php =================================================================== diff -u -r15780 -r16015 --- branches/5.2.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 15780) +++ branches/5.2.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->setID(0); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); $this->customProcessing($event, 'before'); @@ -132,4 +133,4 @@ } -} \ No newline at end of file +} Index: branches/5.2.x/units/orders/orders_event_handler.php =================================================================== diff -u -r15863 -r16015 --- branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15863) +++ branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ getSubmittedFields($event); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->SetFieldsFromHash($field_values); + $event->setEventParam('form_data', $field_values); $this->DoResetAddress($object, $from_tab, $to_tab); @@ -4004,4 +4005,4 @@ $ajax_form_helper->transitEvent($event, 'OnUpdate'); } -} \ No newline at end of file +} Index: branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php =================================================================== diff -u -r15780 -r16015 --- branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 15780) +++ branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->setID(0); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); $this->customProcessing($event, 'before'); @@ -297,4 +298,4 @@ $object->Update(null, null, true); } } -} \ No newline at end of file +} Index: branches/5.2.x/units/products/products_event_handler.php =================================================================== diff -u -r15605 -r16015 --- branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 15605) +++ branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ getSubmittedFields($event); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->SetFieldsFromHash($field_values); + $event->setEventParam('form_data', $field_values); if ($object->GetDBField('InventoryStatus') == 2) { // inventory by options (use first selected combination in grid) @@ -339,7 +340,7 @@ $temp->SwitchToTemp(); $temp->Load($id); - $temp->SetDBFieldsFromHash($product->GetFieldValues(), null, Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder')); + $temp->SetDBFieldsFromHash($product->GetFieldValues(), Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder')); $temp->Update(); } @@ -1592,4 +1593,4 @@ return $products; } -} \ No newline at end of file +} Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php =================================================================== diff -u -r15780 -r16015 --- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 15780) +++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ Conn->GetOne($query)); } - function CreateCombinations($event, $fields, $current_option=null) + function CreateCombinations(kEvent $event, $fields, $current_option=null) { $recursed = false; $combination = $fields['Combination']; @@ -99,6 +99,8 @@ ksort($salt); $object->Load(kUtil::crc32(serialize($salt)), 'CombinationCRC'); $object->SetFieldsFromHash($fields); + $event->setEventParam('form_data', $fields); + $this->customProcessing($event,'before'); if ( $object->isLoaded() ) { // Update if such combination already exists if( $object->Update() ) @@ -117,7 +119,7 @@ } } - function UpdateCombinations($event, $fields, $current_option=null) + function UpdateCombinations(kEvent $event, $fields, $current_option=null) { $recursed = false; $combination = $fields['Combination']; @@ -147,6 +149,7 @@ $object->Load($edit_id); } $object->SetFieldsFromHash($fields); + $event->setEventParam('form_data', $fields); $this->customProcessing($event,'before'); if( $object->Update() ) @@ -176,14 +179,14 @@ } list($id, $field_values) = each($items_info); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->setID($id); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); if ( !$object->Validate() ) { $event->status = kEvent::erFAIL; $event->redirect = false; $this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate'); - $object->setID($id); return; } @@ -208,7 +211,7 @@ foreach($items_info as $id => $field_values) { $object->Load($id); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); if (!$object->Validate()) { @@ -395,7 +398,7 @@ $temp_object->SwitchToTemp(); $temp_object->Load($id); - $temp_object->SetDBFieldsFromHash($live_object->GetFieldValues(), null, Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder')); + $temp_object->SetDBFieldsFromHash($live_object->GetFieldValues(), Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder')); $temp_object->Update(); } } @@ -442,4 +445,4 @@ } } -} \ No newline at end of file +} Index: branches/5.2.x/units/order_items/order_items_event_handler.php =================================================================== diff -u -r15780 -r16015 --- branches/5.2.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 15780) +++ branches/5.2.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 16015) @@ -1,6 +1,6 @@ Clear(); // otherwise validation errors will be passed to next object $object->Load($id); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); $this->customProcessing($event, 'before'); @@ -368,4 +368,4 @@ return false; } - } \ No newline at end of file + }