From 0bd5bbec77915fbe5463d3f4b9418a5b3d203083 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 13 Mar 2016 10:52:32 +0000 Subject: [PATCH] remove encode/decode base64 causing issues with web hosting providers (#374) --- application/libraries/Receiving_lib.php | 6 +++--- application/libraries/Sale_lib.php | 6 +++--- application/models/Receiving.php | 5 ++--- application/models/Sale.php | 2 +- application/models/Sale_suspended.php | 2 +- application/views/receivings/receipt.php | 2 +- application/views/receivings/receiving.php | 10 +++++----- application/views/sales/invoice.php | 2 +- application/views/sales/receipt.php | 4 ++-- application/views/sales/register.php | 10 +++++----- 10 files changed, 24 insertions(+), 25 deletions(-) diff --git a/application/libraries/Receiving_lib.php b/application/libraries/Receiving_lib.php index c4b0be7c9..44d57b8a6 100644 --- a/application/libraries/Receiving_lib.php +++ b/application/libraries/Receiving_lib.php @@ -200,8 +200,8 @@ class Receiving_lib 'item_location'=>$item_location, 'stock_name'=>$this->CI->Stock_location->get_location_name($item_location), 'line'=>$insertkey, - 'name'=>base64_encode($item_info->name), - 'description'=>base64_encode($description!=null ? $description: $item_info->description), + 'name'=>$item_info->name, + 'description'=>$description!=null ? $description: $item_info->description, 'serialnumber'=>$serialnumber!=null ? $serialnumber: '', 'allow_alt_description'=>$item_info->allow_alt_description, 'is_serialized'=>$item_info->is_serialized, @@ -236,7 +236,7 @@ class Receiving_lib if(isset($items[$line])) { $line = &$items[$line]; - $line['description'] = base64_encode($description); + $line['description'] = $description; $line['serialnumber'] = $serialnumber; $line['quantity'] = $quantity; $line['discount'] = $discount; diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index 8861238b9..e6ba00a18 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -305,9 +305,9 @@ class Sale_lib 'item_location'=>$item_location, 'stock_name'=>$this->CI->Stock_location->get_location_name($item_location), 'line'=>$insertkey, - 'name'=>base64_encode($item_info->name), + 'name'=>$item_info->name, 'item_number'=>$item_info->item_number, - 'description'=>base64_encode($description!=null ? $description: $item_info->description), + 'description'=>$description!=null ? $description: $item_info->description, 'serialnumber'=>$serialnumber!=null ? $serialnumber: '', 'allow_alt_description'=>$item_info->allow_alt_description, 'is_serialized'=>$item_info->is_serialized, @@ -395,7 +395,7 @@ class Sale_lib if(isset($items[$line])) { $line = &$items[$line]; - $line['description'] = base64_encode($description); + $line['description'] = $description; $line['serialnumber'] = $serialnumber; $line['quantity'] = $quantity; $line['discount'] = $discount; diff --git a/application/models/Receiving.php b/application/models/Receiving.php index 905d4396c..2de3f5230 100644 --- a/application/models/Receiving.php +++ b/application/models/Receiving.php @@ -76,12 +76,11 @@ class Receiving extends CI_Model $cur_item_info = $this->Item->get_info($item['item_id']); - $receivings_items_data = array - ( + $receivings_items_data = array( 'receiving_id'=>$receiving_id, 'item_id'=>$item['item_id'], 'line'=>$item['line'], - 'description'=>base64_decode($item['description']), + 'description'=>$item['description'], 'serialnumber'=>$item['serialnumber'], 'quantity_purchased'=>$item['quantity'], 'receiving_quantity'=>$item['receiving_quantity'], diff --git a/application/models/Sale.php b/application/models/Sale.php index 0a30adc3e..56a6a1e00 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -296,7 +296,7 @@ class Sale extends CI_Model 'sale_id'=>$sale_id, 'item_id'=>$item['item_id'], 'line'=>$item['line'], - 'description'=>character_limiter(base64_decode($item['description']), 30), + 'description'=>character_limiter($item['description'], 30), 'serialnumber'=>character_limiter($item['serialnumber'], 30), 'quantity_purchased'=>$item['quantity'], 'discount_percent'=>$item['discount'], diff --git a/application/models/Sale_suspended.php b/application/models/Sale_suspended.php index 993e81e71..df3324616 100644 --- a/application/models/Sale_suspended.php +++ b/application/models/Sale_suspended.php @@ -86,7 +86,7 @@ class Sale_suspended extends CI_Model 'sale_id'=>$sale_id, 'item_id'=>$item['item_id'], 'line'=>$item['line'], - 'description'=>character_limiter(base64_decode($item['description']), 30), + 'description'=>character_limiter($item['description'], 30), 'serialnumber'=>character_limiter($item['serialnumber'], 30), 'quantity_purchased'=>$item['quantity'], 'discount_percent'=>$item['discount'], diff --git a/application/views/receivings/receipt.php b/application/views/receivings/receipt.php index eca4b8149..5e11b0308 100644 --- a/application/views/receivings/receipt.php +++ b/application/views/receivings/receipt.php @@ -61,7 +61,7 @@ if (isset($error_message)) { ?> - + lang->line('common_delete').']');?> -
[ in ] +
[ in ] 'description','value'=>base64_decode($item['description']),'size'=>'20')); + echo form_input(array('name'=>'description','value'=>$item['description'],'size'=>'20')); } else { - if (base64_decode($item['description'])!='') + if ($item['description']!='') { - echo base64_decode($item['description']); - echo form_hidden('description',base64_decode($item['description'])); + echo $item['description']; + echo form_hidden('description',$item['description']); } else { diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php index 2d6f1142b..7e462cbcd 100755 --- a/application/views/sales/invoice.php +++ b/application/views/sales/invoice.php @@ -75,7 +75,7 @@ if (isset($error_message)) ?> - + diff --git a/application/views/sales/receipt.php b/application/views/sales/receipt.php index ccba2159b..02d4e27c3 100644 --- a/application/views/sales/receipt.php +++ b/application/views/sales/receipt.php @@ -61,7 +61,7 @@ if (isset($error_message)) { ?> - + @@ -71,7 +71,7 @@ if (isset($error_message))
Appconfig->get('show_total_discount') ? 'total' : 'discounted_total')]); ?>
- + 0) : ?> diff --git a/application/views/sales/register.php b/application/views/sales/register.php index aea880ecd..411fba4f9 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -108,7 +108,7 @@ if (isset($success)) lang->line('common_delete').']');?> -
[ in ] +
[ in ] @@ -159,14 +159,14 @@ if (isset($success)) 'description','value'=>base64_decode($item['description']),'size'=>'20')); + echo form_input(array('name'=>'description','value'=>$item['description'],'size'=>'20')); } else { - if (base64_decode($item['description'])!='') + if ($item['description']!='') { - echo base64_decode($item['description']); - echo form_hidden('description',base64_decode($item['description'])); + echo $item['description']; + echo form_hidden('description',$item['description']); } else {