Added text fields sanitization on upgrdae to 2.2.

[fa-stable.git] / sales / includes / cart_class.inc

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index d85136c531b1fa1cfc1967c7e683ed523493215c..b3d5ac966a19d3fd17af6542801342daa0d2c0d5 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -100,7 +100,8 @@ class cart
                global $SysPrefs, $Refs;
 
                if (!is_array($trans_no)) $trans_no = array($trans_no);
-               if ($trans_no[0]) {
+               if ($trans_no[0]) 
+               {
                        if ($type == ST_SALESORDER || $type == ST_SALESQUOTE) { // sales order || sales quotation
                                read_sales_order($trans_no[0], $this, $type);
                                if ($view) {    // prepare for DN/IV entry
@@ -120,7 +121,7 @@ class cart
                                                $this->delivery_to = $sodata["deliver_to"];
                                                $this->delivery_address = $sodata["delivery_address"];
                                        }
-                                       if (!$view && ($type!=11 || $this->trans_link!=0)) {
+                                       if (!$view && ($type!=ST_CUSTCREDIT || $this->trans_link!=0)) {
                                                $src_type = get_parent_type($type);
                                                $src_details = 0;
                                                if ($src_type == ST_SALESORDER) { // get src data from sales_orders
@@ -148,7 +149,7 @@ class cart
                                                }
                                        }
                                }
-                       } else {
+               } else {
                                $this->trans_type = $type;
                                $this->trans_no = 0;
                                // set new sales document defaults here
@@ -227,11 +228,11 @@ class cart
                        $this->trans_no = 0;
                        $this->order_no= $this->trans_type==ST_CUSTDELIVERY ? key($src->trans_no) : $src->order_no;
                }
-               $this->reference = @html_entity_decode($this->reference);
-               $this->Comments = @html_entity_decode($this->Comments);
+               $this->reference = @html_entity_decode($this->reference, ENT_QUOTES);
+               $this->Comments = @html_entity_decode($this->Comments, ENT_QUOTES);
                foreach($this->line_items as $lineno => $line) {
-                       $this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id);
-                       $this->line_items[$lineno]->item_description = @html_entity_decode($line->item_description);
+                       $this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id, ENT_QUOTES);
+                       $this->line_items[$lineno]->item_description = @html_entity_decode($line->item_description, ENT_QUOTES);
                }
                switch($this->trans_type) {
                        case ST_SALESINVOICE: