[Fmsystem-commits] [16201] more on integration

[sigurdne]

Revision: 16201
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16201
Author:   sigurdne
Date:     2017-01-27 06:44:54 -0500 (Fri, 27 Jan 2017)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/class.solocation.inc.php
    trunk/property/inc/class.uiwo_hour.inc.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php

Modified: trunk/property/inc/class.solocation.inc.php
===================================================================
--- trunk/property/inc/class.solocation.inc.php 2017-01-26 16:45:00 UTC (rev 
16200)
+++ trunk/property/inc/class.solocation.inc.php 2017-01-27 11:44:54 UTC (rev 
16201)
@@ -1325,7 +1325,7 @@
                                {
                                        foreach ($values['attributes'] as 
&$attr)
                                        {
-                                               $attr['value'] = 
$this->db->f($attr['column_name']);
+                                               $attr['value'] = 
$this->db->f($attr['column_name'], true);
                                                if ($attr['lookup_form'])
                                                {
                                                        
$values[$attr['column_name']] = $attr['value'];

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2017-01-26 16:45:00 UTC (rev 
16200)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2017-01-27 11:44:54 UTC (rev 
16201)
@@ -3350,7 +3350,7 @@
                                phpgw::no_access();
                        }
 
-                       $start_from = 45000000;
+                       $start_from = 45000100;
                        $sql = "SELECT id, status FROM fm_workorder WHERE id >= 
$start_from";
                        $db = & $GLOBALS['phpgw']->db;
                        $db->query($sql, __LINE__, __FILE__);

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-01-26 16:45:00 UTC (rev 16200)
+++ trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2017-01-27 11:44:54 UTC (rev 16201)
@@ -116,11 +116,14 @@
                        }
                        //      $ressursnr = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['ressursnr'];
 
+                       $address = substr(htmlspecialchars($_ticket['address'], 
ENT_QUOTES, 'UTF-8', true), 0, 50);
+
+
                        $buyer = array(
                                'Name' => $user_name,
                                'AddressInfo' => array(
                                        array(
-                                               'Address' => $_ticket['address']
+                                               'Address' => 
htmlspecialchars_decode($address, ENT_QUOTES)
                                        )
                                ),
                                'BuyerReferences' => array(
@@ -184,7 +187,7 @@
                                'dim6' => $dim6,                                
                        // Aktivitet - frivillig: bygningsdel, 3 siffer + 
bokstavkode
                                'vendor_id' => $_ticket['vendor_id'],
                                'vendor_name' => $vendor['name'],
-                               'vendor_address' => $vendor['address'],
+                               'vendor_address' => 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-01-26 16:45:00 UTC (rev 16200)
+++ 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-01-27 11:44:54 UTC (rev 16201)
@@ -163,11 +163,13 @@
                                        $address = implode(', ', $_address);
                                }
 
+                               $address = substr(htmlspecialchars($address, 
ENT_QUOTES, 'UTF-8', true), 0, 50);
+
                                $buyer = array(
                                        'Name' => $user_name,
                                        'AddressInfo' => array(
                                                array(
-                                                       'Address' => $address
+                                                       'Address' => 
htmlspecialchars_decode($address, ENT_QUOTES)
                                                )
                                        ),
                                        'BuyerReferences' => array(
@@ -287,7 +289,7 @@
                                        'dim6' => $dim6, // Aktivitet - 
frivillig: bygningsdel, 3 siffer + bokstavkode
                                        'vendor_id' => $workorder['vendor_id'],
                                        'vendor_name' => $vendor['name'],
-                                       'vendor_address' => $vendor['address'],
+                                       'vendor_address' => 
substr($vendor['address'], 0, 50),
                                        'order_id' => $workorder['id'],
                                        'tax_code' => $tax_code,
                                        'buyer' => $buyer,