[Fmsystem-commits] [11432] bkbooking: stavanger bugfix minid login

[Kjell Arne Espedal]

Revision: 11432
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11432
Author:   kjell
Date:     2013-11-05 11:33:16 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
bkbooking: stavanger bugfix minid login

Modified Paths:
--------------
    branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
    branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl

Modified: branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php  
2013-11-05 09:24:19 UTC (rev 11431)
+++ branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php  
2013-11-05 11:33:16 UTC (rev 11432)
@@ -224,8 +224,6 @@
                                $ipdp = $_COOKIE['iPlanetDirectoryPro'];
                                $xmldata = 
simplexml_load_file('http://aktivby.stavanger.kommune.no:8080/spclient/auth.jsp?ipdp='.$ipdp);
 
-#                              $xmldata = 
simplexml_load_file('/srv/portico/svg/stavangerkommune_xml/test.xml');
-
                        $myorgnr = array();
                        
                 $orgnummbers = $this->get_organizations();                
@@ -237,9 +235,9 @@
                 } elseif 
($xmldata->responseHeader->underStatus->underStatusMelding[1]['kode'] == 
"1500") {
                                $external_user = (object) 'ciao'; 
$external_user->login = '000000001';
                 } else {
-                    foreach ($xmldata->melding->roller as $value) {
-                        if 
(in_array((string)$value->enhet->orgnr,$orgnummbers)) {
-                                       $myorgnr[] = 
(string)$value->enhet->orgnr;
+                    foreach ($xmldata->melding->roller->enhet as $value) {
+                        if (in_array((string)$value->orgnr,$orgnummbers)) {
+                                       $myorgnr[] = (string)$value->orgnr;
                         } 
                                    }
                     if (count($myorgnr) > 1) {

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl   
2013-11-05 09:24:19 UTC (rev 11431)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl   
2013-11-05 11:33:16 UTC (rev 11432)
@@ -14,13 +14,13 @@
                div.id = 'test';
                div.innerHTML = '<div style="float: right;" id="changeClose"><i 
class="fa fa-times-circle"></i></div>';
                div.innerHTML += '<div 
id="changeHeader">{change_org_header}</div>';
-               div.innerHTML += '<ul>';
-               var lines = 1;
+               div.innerHTML += '<div id="orglist"></div>';
+               var oList = document.getElementById("orglist");
                for(var i=0,len=orgarray.length; i < len; i++) {
-                       div.innerHTML += '<li><a 
href="change.php?orgnumber='+orgarray[i]['orgnumber']+'">'+orgarray[i]['orgname']+'</a></li>';
-                       lines += 1;
+                       oList.innerHTML += '<div style="padding-bottom: 
5px;"><a 
href="change.php?orgnumber='+orgarray[i]['orgnumber']+'">'+orgarray[i]['orgname']+'</a></div>';
                }       
-               div.innerHTML += '</ul>';
+               div.style.backgroundColor= 'white';
+               div.style.border = '1px solid black';
                div.style.height = 'auto';
                div.style.padding = '5px 10px 5px 10px';
                var oHeader = document.getElementById("changeHeader");