[Fmsystem-commits] [11436] bkbooking: stavanger bugfix update minid login

[Kjell Arne Espedal]

Revision: 11436
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11436
Author:   kjell
Date:     2013-11-06 12:39:27 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
bkbooking: stavanger bugfix update minid login

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

Modified: branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php  
2013-11-06 11:41:45 UTC (rev 11435)
+++ branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php  
2013-11-06 12:39:27 UTC (rev 11436)
@@ -227,10 +227,11 @@
                        
                 $orgnummbers = $this->get_organizations();                
                 
-                
if(in_array((string)$xmldata->responseHeader->underStatus->underStatusMelding['kode'],array('180','181','182')))
 {
-
+                
if(in_array((string)$xmldata->responseHeader->underStatus->underStatusMelding['kode'],array('180')))
 {
+                               $external_user = (object) 'ciao'; 
$external_user->login = '000000003';
+                               }
+                
elseif(in_array((string)$xmldata->responseHeader->underStatus->underStatusMelding['kode'],array('180','181','182')))
 {
                                $external_user = (object) 'ciao'; 
$external_user->login = '000000000';
-
                 } elseif 
($xmldata->responseHeader->underStatus->underStatusMelding[1]['kode'] == 
"1500") {
                                $external_user = (object) 'ciao'; 
$external_user->login = '000000001';
                 } else {

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php 
2013-11-06 11:41:45 UTC (rev 11435)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php 
2013-11-06 12:39:27 UTC (rev 11436)
@@ -206,7 +206,9 @@
 
                                $tpl_vars['change_org_header'] = lang('Change 
organization');
 
-                if ( $bouser->orgname == '000000002') {
+                if ( $bouser->orgname == '000000003') {
+                    $tpl_vars['login_text'] = lang('Error input is not a ssn 
or orgnr'). ' :: ' . lang('Logout');
+                } elseif ( $bouser->orgname == '000000002') {
                     $tpl_vars['login_text'] = lang('Organization not in the 
database'). ' :: ' . lang('Logout');
                 } elseif ( $bouser->orgname == '000000001') {
                     $tpl_vars['login_text'] = lang('No organization data'). ' 
:: ' . lang('Logout');