remove encode/decode base64 causing issues with web hosting providers (#374)

This commit is contained in:
FrancescoUK
2016-03-13 10:52:32 +00:00
parent d510ab031d
commit 0bd5bbec77
10 changed files with 24 additions and 25 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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'],

View File

@@ -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'],

View File

@@ -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'],

View File

@@ -61,7 +61,7 @@ if (isset($error_message))
{
?>
<tr>
<td><span class='long_name'><?php echo base64_decode($item['name']); ?></span><span class='short_name'><?php echo character_limiter(base64_decode($item['name']),10); ?></span></td>
<td><span class='long_name'><?php echo $item['name']; ?></span><span class='short_name'><?php echo character_limiter($item['name'],10); ?></span></td>
<td><?php echo to_currency($item['price']); ?></td>
<td><?php
echo $item['quantity'] . " " . ($show_stock_locations ? " [" . $item['stock_name'] . "]" : "");

View File

@@ -90,7 +90,7 @@ else
?>
<tr>
<td><?php echo anchor("receivings/delete_item/$line",'['.$this->lang->line('common_delete').']');?></td>
<td style="align:center;"><?php echo base64_decode($item['name']); ?><br /> [<?php echo $item['in_stock']; ?> in <?php echo $item['stock_name']; ?>]
<td style="align:center;"><?php echo $item['name']; ?><br /> [<?php echo $item['in_stock']; ?> in <?php echo $item['stock_name']; ?>]
<?php echo form_hidden('location', $item['item_location']); ?></td>
<?php if ($items_module_allowed && $mode !='requisition')
@@ -158,14 +158,14 @@ else
<?php
if($item['allow_alt_description']==1)
{
echo form_input(array('name'=>'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
{

View File

@@ -75,7 +75,7 @@ if (isset($error_message))
?>
<tr class="item-row">
<td><?php echo $item['item_number']; ?></td>
<td class="item-name"><textarea rows="5" cols="6" class='long_name'><?php echo $item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']) ? base64_decode($item['description']) : base64_decode($item['name']); ?></textarea></td>
<td class="item-name"><textarea rows="5" cols="6" class='long_name'><?php echo $item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']) ? $item['description'] : $item['name']; ?></textarea></td>
<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo $item['quantity']; ?></textarea></td>
<td><textarea rows="5" cols="6"><?php echo to_currency($item['price']); ?></textarea></td>
<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo $item['discount'] .'%'; ?></textarea></td>

View File

@@ -61,7 +61,7 @@ if (isset($error_message))
{
?>
<tr>
<td><span class='long_name'> <?php echo ucfirst(base64_decode($item['name'])); ?></span></td>
<td><span class='long_name'> <?php echo ucfirst($item['name']); ?></span></td>
<td><?php echo to_currency($item['price']); ?></td>
@@ -71,7 +71,7 @@ if (isset($error_message))
<td><div class="total-value"><?php echo to_currency($item[($this->Appconfig->get('show_total_discount') ? 'total' : 'discounted_total')]); ?></div></td>
</tr>
<tr>
<td colspan="2"><?php echo base64_decode($item['description']); ?></td>
<td colspan="2"><?php echo $item['description']; ?></td>
<td ><?php echo $item['serialnumber']; ?></td>
</tr>
<?php if ($item['discount'] > 0) : ?>

View File

@@ -108,7 +108,7 @@ if (isset($success))
<tr>
<td><?php echo anchor("sales/delete_item/$line",'['.$this->lang->line('common_delete').']');?></td>
<td><?php echo $item['item_number']; ?></td>
<td style="align: center;"><?php echo base64_decode($item['name']); ?><br /> [<?php echo $item['in_stock'] ?> in <?php echo $item['stock_name']; ?>]
<td style="align: center;"><?php echo $item['name']; ?><br /> [<?php echo $item['in_stock'] ?> in <?php echo $item['stock_name']; ?>]
<?php echo form_hidden('location', $item['item_location']); ?>
</td>
@@ -159,14 +159,14 @@ if (isset($success))
<?php
if($item['allow_alt_description']==1)
{
echo form_input(array('name'=>'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
{