[Fmsystem-commits] [11068] custom auth

[Sigurd Nes]

Revision: 11068
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11068
Author:   sigurdne
Date:     2013-04-23 11:05:40 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
custom auth

Modified Paths:
--------------
    trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
    trunk/phpgwapi/inc/auth/class.auth_custom_sso.inc.php

Modified: trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
--- trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php 
2013-04-23 11:04:51 UTC (rev 11067)
+++ trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php 
2013-04-23 11:05:40 UTC (rev 11068)
@@ -52,9 +52,16 @@
                                echo 'headers:<br>';
                                _debug_array($headers);
                        }
+/*
+                       $headers['Osso-User-Dn'] = 
'cn=02035701829,cn=users,dc=usrv,dc=ubergenkom,dc=no';// test
+//                     $fodsels_nr = substr($headers['Osso-User-Dn'],3, 11);
+*/
 
-                       $fodsels_nr = substr($headers['Osso-User-Dn'],2, 11);
-       //              $fodsels_nr = '02035701829'; // test
+                       $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];
 
                        if($this->debug)
                        {

Modified: trunk/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
===================================================================
--- trunk/phpgwapi/inc/auth/class.auth_custom_sso.inc.php       2013-04-23 
11:04:51 UTC (rev 11067)
+++ trunk/phpgwapi/inc/auth/class.auth_custom_sso.inc.php       2013-04-23 
11:05:40 UTC (rev 11068)
@@ -104,9 +104,16 @@
                        }
 
                        $headers = getallheaders();
-                       $fodsels_nr = substr($headers['Osso-User-Dn'],2, 11);
 
-                       $sql = "SELECT V_ORG_PERSON.BRUKERNAVN FROM 
V_ORG_PERSON WHERE FODSELSNR ='{$fodsels_nr}'";
+//                     $headers['Osso-User-Dn'] = 
'cn=02035701829,cn=users,dc=usrv,dc=ubergenkom,dc=no';// test
+
+                       $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];
+
+                       $sql = "SELECT BRUKERNAVN FROM V_IDM_KOBLINGER WHERE 
FODSELSNR ='{$fodsels_nr}'";
                        $db->query($sql,__LINE__,__FILE__);                     
                        $db->next_record();
                        return $db->f('BRUKERNAVN',true);