Index: branches/5.3.x/units/destinations/dst_event_handler.php =================================================================== diff -u -r15899 -r16106 --- branches/5.3.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 15899) +++ branches/5.3.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 16106) @@ -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.3.x/install/upgrades.sql =================================================================== diff -u -r15925 -r16106 --- branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15925) +++ branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 16106) @@ -294,4 +294,6 @@ # ===== v 5.2.1-RC1 ===== +# ===== v 5.2.1 ===== + # ===== v 5.3.0-B1 ===== Index: branches/5.3.x/units/product_option_combinations/product_option_combinations_event_handler.php =================================================================== diff -u -r15899 -r16106 --- branches/5.3.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 15899) +++ branches/5.3.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 16106) @@ -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.3.x/admin_templates/user_order_item_tab.tpl =================================================================== diff -u -r15492 -r16106 --- branches/5.3.x/admin_templates/user_order_item_tab.tpl (.../user_order_item_tab.tpl) (revision 15492) +++ branches/5.3.x/admin_templates/user_order_item_tab.tpl (.../user_order_item_tab.tpl) (revision 16106) @@ -17,7 +17,7 @@ $Catalog.setItemCount('', ''); - $Catalog.setCurrentCategory('', ); + $Catalog.setCurrentCategory('', ); $Catalog.saveSearch('', '', ''); @@ -33,4 +33,4 @@ - \ No newline at end of file + Index: branches/5.3.x/units/pricing/pricing_event_handler.php =================================================================== diff -u -r15899 -r16106 --- branches/5.3.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 15899) +++ branches/5.3.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 16106) @@ -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.3.x/admin_templates/catalog_tab.tpl =================================================================== diff -u -r15492 -r16106 --- branches/5.3.x/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 15492) +++ branches/5.3.x/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 16106) @@ -67,7 +67,7 @@ $Catalog.setItemCount('', ''); - $Catalog.setCurrentCategory('', ); + $Catalog.setCurrentCategory('', ); $Catalog.saveSearch('', '', ''); @@ -99,4 +99,4 @@ - \ No newline at end of file + Index: branches/5.3.x/admin_templates/products/products_pricing_grid.tpl =================================================================== diff -u -r15492 -r16106 --- branches/5.3.x/admin_templates/products/products_pricing_grid.tpl (.../products_pricing_grid.tpl) (revision 15492) +++ branches/5.3.x/admin_templates/products/products_pricing_grid.tpl (.../products_pricing_grid.tpl) (revision 16106) @@ -5,8 +5,8 @@ if ($request_visible) { - document.getElementById('_div').setAttribute('group_id', ); - maximizeElement( jq('#_div') ); + document.getElementById('_div').setAttribute('group_id', ); + maximizeElement( jq('#_div') ); } document.getElementById('save_warning').style.display = 'block'; @@ -107,4 +107,4 @@ - \ No newline at end of file + Index: branches/5.3.x/units/affiliates/affiliates_event_handler.php =================================================================== diff -u -r15936 -r16106 --- branches/5.3.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 15936) +++ branches/5.3.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 16106) @@ -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(); @@ -671,4 +672,4 @@ return $object->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id'); } - } \ No newline at end of file + } Index: branches/5.3.x/units/reports/reports_event_handler.php =================================================================== diff -u -r15925 -r16106 --- branches/5.3.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 15925) +++ branches/5.3.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 16106) @@ -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; @@ -758,6 +760,7 @@ } foreach($report->Records as $a_row) { + // TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside. $ReportItem->SetFieldsFromHash($a_row); $row = ''; foreach ($a_fields AS $field => $a_props) @@ -769,6 +772,7 @@ } // totals + // TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside. $ReportItem->SetFieldsFromHash($a_totals); $counter = 0; foreach ($a_fields AS $field => $a_props) @@ -816,4 +820,4 @@ echo $ret; exit(); } -} \ No newline at end of file +} Index: branches/5.3.x/units/shipping_costs/shipping_costs_event_handler.php =================================================================== diff -u -r15899 -r16106 --- branches/5.3.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 15899) +++ branches/5.3.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 16106) @@ -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.3.x/units/product_options/product_options_tag_processor.php =================================================================== diff -u -r15899 -r16106 --- branches/5.3.x/units/product_options/product_options_tag_processor.php (.../product_options_tag_processor.php) (revision 15899) +++ branches/5.3.x/units/product_options/product_options_tag_processor.php (.../product_options_tag_processor.php) (revision 16106) @@ -1,6 +1,6 @@ PrintList2($params); } -} \ No newline at end of file +} Index: branches/5.3.x/units/affiliates/affiliates_tag_processor.php =================================================================== diff -u -r15492 -r16106 --- branches/5.3.x/units/affiliates/affiliates_tag_processor.php (.../affiliates_tag_processor.php) (revision 15492) +++ branches/5.3.x/units/affiliates/affiliates_tag_processor.php (.../affiliates_tag_processor.php) (revision 16106) @@ -1,6 +1,6 @@ getObject($params); + $object = $this->getObject(kUtil::array_merge_recursive($params, array('skip_autoload' => true))); /* @var $object kDBItem */ $object->Load(array('PortalUserId' => $this->Application->RecallVar('user_id'))); Index: branches/5.3.x/install/upgrades.php =================================================================== diff -u -r15925 -r16106 --- branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 15925) +++ branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 16106) @@ -1,6 +1,6 @@ Array ('Core' => '5.2.1-B1'), '5.2.1-B2' => Array ('Core' => '5.2.1-B2'), '5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'), + '5.2.1' => Array ('Core' => '5.2.1'), '5.3.0-B1' => Array ('Core' => '5.3.0-B1'), ); } Index: branches/5.3.x/units/taxesdestinations/taxes_dst_event_handler.php =================================================================== diff -u -r15671 -r16106 --- branches/5.3.x/units/taxesdestinations/taxes_dst_event_handler.php (.../taxes_dst_event_handler.php) (revision 15671) +++ branches/5.3.x/units/taxesdestinations/taxes_dst_event_handler.php (.../taxes_dst_event_handler.php) (revision 16106) @@ -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.3.x/admin_templates/user_item_tab.tpl =================================================================== diff -u -r15492 -r16106 --- branches/5.3.x/admin_templates/user_item_tab.tpl (.../user_item_tab.tpl) (revision 15492) +++ branches/5.3.x/admin_templates/user_item_tab.tpl (.../user_item_tab.tpl) (revision 16106) @@ -16,7 +16,7 @@ $Catalog.setItemCount('', ''); - $Catalog.setCurrentCategory('', ); + $Catalog.setCurrentCategory('', ); $Catalog.saveSearch('', '', ''); @@ -40,4 +40,4 @@ - \ No newline at end of file + Index: branches/5.3.x/units/orders/orders_event_handler.php =================================================================== diff -u -r15936 -r16106 --- branches/5.3.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15936) +++ branches/5.3.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 16106) @@ -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); @@ -4025,4 +4026,4 @@ $ajax_form_helper->transitEvent($event, 'OnUpdate'); } -} \ No newline at end of file +} Index: branches/5.3.x/units/gateways/gw_classes/paypal.php =================================================================== diff -u -r15925 -r16106 --- branches/5.3.x/units/gateways/gw_classes/paypal.php (.../paypal.php) (revision 15925) +++ branches/5.3.x/units/gateways/gw_classes/paypal.php (.../paypal.php) (revision 16106) @@ -1,6 +1,6 @@ '???', ); + // TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside. $order->SetFieldsFromHash($info); $order->SetDBField('Status', ORDER_STATUS_PROCESSED); @@ -265,4 +266,4 @@ return $success; } - } \ No newline at end of file + } Index: branches/5.3.x/units/orders/order_manager.php =================================================================== diff -u -r15695 -r16106 --- branches/5.3.x/units/orders/order_manager.php (.../order_manager.php) (revision 15695) +++ branches/5.3.x/units/orders/order_manager.php (.../order_manager.php) (revision 16106) @@ -1,6 +1,6 @@ $operation['BackOrderFlag'], 'ItemData' => serialize($item_data), 'PackageNum' => $operation['PackageNum'], + 'OptionsSalt' => $operation['OptionsSalt'], ); $order_item->SetDBFieldsFromHash($fields_hash); @@ -482,4 +483,4 @@ return $this->Conn->GetRow($sql); } - } \ No newline at end of file + } Index: branches/5.3.x/units/coupons/coupons_event_handler.php =================================================================== diff -u -r15925 -r16106 --- branches/5.3.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 15925) +++ branches/5.3.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 16106) @@ -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.3.x/units/products/products_event_handler.php =================================================================== diff -u -r15983 -r16106 --- branches/5.3.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 15983) +++ branches/5.3.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 16106) @@ -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) @@ -341,7 +342,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(); } @@ -1607,4 +1608,4 @@ return $products; } -} \ No newline at end of file +} Index: branches/5.3.x/units/order_items/order_items_event_handler.php =================================================================== diff -u -r15899 -r16106 --- branches/5.3.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 15899) +++ branches/5.3.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 16106) @@ -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'); @@ -366,4 +366,4 @@ return false; } - } \ No newline at end of file + } Index: branches/5.3.x/units/order_items/order_items_tag_processor.php =================================================================== diff -u -r15899 -r16106 --- branches/5.3.x/units/order_items/order_items_tag_processor.php (.../order_items_tag_processor.php) (revision 15899) +++ branches/5.3.x/units/order_items/order_items_tag_processor.php (.../order_items_tag_processor.php) (revision 16106) @@ -1,6 +1,6 @@ $val) { if ( !is_array($val) ) { - $val = htmlspecialchars_decode($val); + $val = kUtil::unescape($val, kUtil::ESCAPE_HTML); // TODO: Not sure why we're unescaping. } $key_data = $opt_helper->ConvertKey($opt, $object->GetDBField('ProductId')); @@ -177,7 +177,7 @@ $i = 0; foreach ($values as $val) { $i++; - $val = htmlspecialchars_decode($val); + $val = kUtil::unescape($val, kUtil::ESCAPE_HTML); // TODO: Not sure why we're unescaping. // TODO: consider escaping in template instead $block_params['value'] = kUtil::escape($val); @@ -302,4 +302,4 @@ return $order_helper->eligibleForFreePromoShipping($object); } -} \ No newline at end of file +} Index: branches/5.3.x/units/orders/orders_item.php =================================================================== diff -u -r15695 -r16106 --- branches/5.3.x/units/orders/orders_item.php (.../orders_item.php) (revision 15695) +++ branches/5.3.x/units/orders/orders_item.php (.../orders_item.php) (revision 16106) @@ -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.3.x/units/orders/order_calculator.php =================================================================== diff -u -r15695 -r16106 --- branches/5.3.x/units/orders/order_calculator.php (.../order_calculator.php) (revision 15695) +++ branches/5.3.x/units/orders/order_calculator.php (.../order_calculator.php) (revision 16106) @@ -1,6 +1,6 @@ manager->getTable($prefix); } - } \ No newline at end of file + }