[Fmsystem-commits] [13434] update soap call

[Sigurd Nes]

Revision: 13434
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13434
Author:   sigurdne
Date:     2015-06-15 12:58:15 +0000 (Mon, 15 Jun 2015)
Log Message:
-----------
update soap call

Modified Paths:
--------------
    trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php

Modified: trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
--- trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php 
2015-06-15 11:30:34 UTC (rev 13433)
+++ trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php 
2015-06-15 12:58:15 UTC (rev 13434)
@@ -52,23 +52,14 @@
                                _debug_array($headers);
                        }
 
-                       $header_regular_expression =  '/^cn=(.*),cn=users.*$/';
-                       $header_key = 'Osso-User-Dn';
-                       $matches = array();
-                       
preg_match_all($header_regular_expression,$headers[$header_key], $matches);
-                       $fodsels_nr = $matches[1][0];
-                       $uid = $headers['uid'];
+                       $fodsels_nr = $headers['uid'];
 
                        if($this->debug)
                        {
                                echo 'fødselsnr:<br>';
                                _debug_array($fodsels_nr);
-                               echo 'uid:<br>';
-                               _debug_array($uid);
                        }
 
-                       $fodsels_nr = $uid ? $uid : $fodsels_nr;
-
                        $request =
                        "<soapenv:Envelope
                                 
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";
@@ -82,7 +73,6 @@
                                </soapenv:Body>
                        </soapenv:Envelope>";
 
-
                        $location_URL = 
isset($this->config->config_data['soap_location']) && 
$this->config->config_data['soap_location'] ? 
$this->config->config_data['soap_location'] : 
"http://wsm01e-t.usrv.ubergenkom.no:8888/gateway/services/AltinnReporteesService";;
 #A-test
 
                        $soap_login = $this->config->config_data['soap_login'];
@@ -98,7 +88,8 @@
 
                        try
                        {
-                               $response = 
$client->__doRequest($request,$location_URL,$location_URL,1);
+                               $action = "";
+                               $response = 
$client->__doRequest($request,$location_URL,$action,1);
                                $reader = new XMLReader();
                                $reader->xml($response);