[Fmsystem-commits] [9966] propsert: integration

[Sigurd Nes]

Revision: 9966
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9966
Author:   sigurdne
Date:     2012-09-04 13:25:11 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
propsert: integration

Modified Paths:
--------------
    trunk/property/inc/class.uilocation.inc.php

Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2012-09-04 13:02:38 UTC (rev 
9965)
+++ trunk/property/inc/class.uilocation.inc.php 2012-09-04 13:25:11 UTC (rev 
9966)
@@ -292,6 +292,9 @@
                                        $integrationurl = 
"{$_config_section_data['url']}{$_sep}{$_param}";
                                        $integrationurl .= 
"&{$_config_section_data['auth_key_name']}={$response}";
 
+
+                                       //in the form: 
sakstittel=__loc1__.__loc4__
+
                                        $_config_section_data['location_data']= 
htmlspecialchars_decode($_config_section_data['location_data']);
 
                                        $parameters_integration = array();
@@ -1988,6 +1991,8 @@
                                )
                        );
 
+                       unset($_values);
+
                        $location_types = $this->bo->location_types;
                        $config                 = $this->bo->config;
 
@@ -2179,7 +2184,6 @@
 
                                }
                                unset($attributes_groups);
-                               unset($values['attributes']);
                        }
 
                        $documents = array();
@@ -2355,8 +2359,15 @@
                                                $_config_section_data['url']    
        = htmlspecialchars_decode($_config_section_data['url']);
                                                
$_config_section_data['parametres']     = 
htmlspecialchars_decode($_config_section_data['parametres']);
 
+                                               /*
+                                               * 'parametres' In the form:
+                                               * 
<targetparameter1>=__<attrbute_name1>__&<targetparameter2>=__<attrbute_name2>__&
+                                               * Example: 
objId=__id__&lon=__posisjon_lengde__&lat=__posisjon_bredde__
+                                               */
+
                                                
parse_str($_config_section_data['parametres'], $output);
 
+                                               $_values = array();
                                                foreach ($output as $_dummy => 
$_substitute)
                                                {
                                                        $_keys[] = $_substitute;
@@ -2406,6 +2417,8 @@
 
                                                $arguments = 
array($_config_section_data['auth_key_name'] => $response);
 
+                                               //in the form: 
sakstittel=__loc1__.__loc4__
+
                                                
if(isset($_config_section_data['location_data']) && 
$_config_section_data['location_data'])
                                                {
                                                        
$_config_section_data['location_data']  = 
htmlspecialchars_decode($_config_section_data['location_data']);
@@ -2459,6 +2472,8 @@
 // ---- END INTEGRATION -------------------------
                        }
 
+                       unset($values['attributes']);
+
                        $data = array
                        (
                                'integration'                                   
=> $integration,