[Fmsystem-commits] [16460] Integration: multibyte substring for text output(XML)

[sigurdne]

Revision: 16460
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16460
Author:   sigurdne
Date:     2017-03-21 07:41:59 -0400 (Tue, 21 Mar 2017)
Log Message:
-----------
Integration: multibyte substring for text output(XML)

Modified Paths:
--------------
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
    trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php

Modified: 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2017-03-20 11:48:08 UTC (rev 16459)
+++ trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2017-03-21 11:41:59 UTC (rev 16460)
@@ -116,7 +116,7 @@
                        }
                        //      $ressursnr = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['ressursnr'];
 
-                       $address = substr(htmlspecialchars($_ticket['address'], 
ENT_QUOTES, 'UTF-8', true), 0, 50);
+                       $address = 
mb_substr(htmlspecialchars($_ticket['address'], ENT_QUOTES, 'UTF-8', true), 0, 
50);
 
 
                        $buyer = array(
@@ -187,7 +187,7 @@
                                'dim6' => $dim6,                                
                        // Aktivitet - frivillig: bygningsdel, 3 siffer + 
bokstavkode
                                'vendor_id' => $_ticket['vendor_id'],
                                'vendor_name' => $vendor['name'],
-                               'vendor_address' => substr($vendor['address'], 
0, 50),
+                               'vendor_address' => 
mb_substr($vendor['address'], 0, 50),
                                'order_id' => $_ticket['order_id'],
                                'tax_code' => $_ticket['tax_code'],
                                'buyer' => $buyer,

Modified: 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
===================================================================
--- 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-03-20 11:48:08 UTC (rev 16459)
+++ 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-03-21 11:41:59 UTC (rev 16460)
@@ -163,7 +163,7 @@
                                        $address = implode(', ', $_address);
                                }
 
-                               $address = substr(htmlspecialchars($address, 
ENT_QUOTES, 'UTF-8', true), 0, 50);
+                               $address = mb_substr(htmlspecialchars($address, 
ENT_QUOTES, 'UTF-8', true), 0, 50);
 
                                $buyer = array(
                                        'Name' => $user_name,
@@ -289,7 +289,7 @@
                                        'dim6' => $dim6, // Aktivitet - 
frivillig: bygningsdel, 3 siffer + bokstavkode
                                        'vendor_id' => $workorder['vendor_id'],
                                        'vendor_name' => $vendor['name'],
-                                       'vendor_address' => 
substr($vendor['address'], 0, 50),
+                                       'vendor_address' => 
mb_substr($vendor['address'], 0, 50),
                                        'order_id' => $workorder['id'],
                                        'tax_code' => $tax_code,
                                        'buyer' => $buyer,

Modified: trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php
===================================================================
--- trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php        
2017-03-20 11:48:08 UTC (rev 16459)
+++ trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php        
2017-03-21 11:41:59 UTC (rev 16460)
@@ -95,7 +95,7 @@
                        {
                                xmlwriter_start_element($memory, 'Tree');
                                xmlwriter_write_element($memory, 'ID', 'TJ');
-                               xmlwriter_write_element($memory, 'Verdi', 
substr($this->db->f('maalepunkt_id'), -8));
+                               xmlwriter_write_element($memory, 'Verdi', 
mb_substr($this->db->f('maalepunkt_id'), -8));
                                xmlwriter_write_element($memory, 'Beskrivelse', 
$this->db->f('address'));
                                xmlwriter_write_element($memory, 'Firma', 'BB');
                                xmlwriter_write_element($memory, 'PeriodeFra', 
$PeriodFrom);