[Fmsystem-commits] [16334] handle json data

[sigurdne]

Revision: 16334
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16334
Author:   sigurdne
Date:     2017-02-17 10:17:43 -0500 (Fri, 17 Feb 2017)
Log Message:
-----------
handle json data

Modified Paths:
--------------
    trunk/property/inc/class.soentity.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2017-02-17 13:40:38 UTC (rev 
16333)
+++ trunk/property/inc/class.soentity.inc.php   2017-02-17 15:17:43 UTC (rev 
16334)
@@ -350,7 +350,7 @@
                        $j = 0;
                        while ($this->db->next_record())
                        {
-                               $jsondata = 
json_decode($this->db->f('json_representation', true), true);
+                               $jsondata = 
json_decode($this->db->f('json_representation'), true);
 
 //                             $xml = new DOMDocument('1.0', 'utf-8');
 //                             $xml->loadXML($xmldata);
@@ -357,7 +357,7 @@
 
                                foreach ($attributes as $attrib_id => $field)
                                {
-                                       if (!$value = $jsondata[$field['name']])
+                                       if (!$value = 
$this->db->stripslashes($jsondata[$field['name']]))
                                        {
                                                $value = 
$this->db->f($field['name'], true);
                                        }
@@ -1056,12 +1056,12 @@
 //                             $xmldata = $this->db->f('xml_representation');
 //                             $xml = new DOMDocument('1.0', 'utf-8');
 //                             $xml->loadXML($xmldata);
-                               $jsondata = 
json_decode($this->db->f('json_representation', true), true);
+                               $jsondata = 
json_decode($this->db->f('json_representation'), true);
 
                                foreach ($cols_return as $key => $field)
                                {
                        //              if (!$value = 
$xml->getElementsByTagName($field)->item(0)->nodeValue)
-                                       if (!$value = $jsondata[$field])
+                                       if (!$value = 
$this->db->stripslashes($jsondata[$field]))
                                        {
                                                $value = $this->db->f($field, 
true);
                                        }
@@ -2119,7 +2119,7 @@
 //                             $xml = new DOMDocument('1.0', 'utf-8');
 //                             $xml->loadXML($xmldata);
 
-                               $jsondata = 
json_decode($this->db->f('json_representation', true), true);
+                               $jsondata = 
json_decode($this->db->f('json_representation'), true);
 
                                if (isset($values['attributes']) && 
is_array($values['attributes']))
                                {
@@ -2126,7 +2126,7 @@
                                        foreach ($values['attributes'] as 
&$attr)
                                        {
 //                                             $attr['value'] = 
$xml->getElementsByTagName($attr['column_name'])->item(0)->nodeValue;
-                                               $attr['value'] = 
$jsondata[$attr['column_name']];
+                                               $attr['value'] = 
$this->db->stripslashes($jsondata[$attr['column_name']]);
                                        }
                                }
                        }
@@ -2621,8 +2621,8 @@
 //                                                     $xml = new 
DOMDocument('1.0', 'utf-8');
 //                                                     $xml->loadXML($xmldata);
 //                                                     $old_value = 
$xml->getElementsByTagName($entry['name'])->item(0)->nodeValue;
-                                                       $jsondata = 
json_decode($this->db->f('json_representation', true), true);
-                                                       $old_value = 
$jsondata[$entry['name']];
+                                                       $jsondata = 
json_decode($this->db->f('json_representation'), true);
+                                                       $old_value = 
$this->db->stripslashes($jsondata[$entry['name']]);
 
                                                }
 

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2017-02-17 13:40:38 UTC (rev 16333)
+++ trunk/property/setup/phpgw_no.lang  2017-02-17 15:17:43 UTC (rev 16334)
@@ -2097,3 +2097,12 @@
 compressed     property        no      Komprimert
 file name      property        no      Filnavn
 row    property        no      Rad
+download preview components    property        no      Last ned 
forhåndsvisning av komponenter
+new attributes property        no      Nye attributter
+new categories property        no      Nye kategorier
+save profile   property        no      Lagre profil
+columns and attributes property        no      kolonner og attributter
+attribute name for component id        property        no      Attributtnavn 
for komponent id
+category template      property        no      Kategori mal
+profile        property        no      Profil
+new attribute  property        no      Ny attributt
\ No newline at end of file