[Fmsystem-commits] [11752] bkbooking: stavanger update minid logg inn

[Kjell Arne Espedal]

Revision: 11752
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11752
Author:   kjell
Date:     2014-02-26 08:03:45 +0000 (Wed, 26 Feb 2014)
Log Message:
-----------
bkbooking: stavanger update minid logg inn

Modified Paths:
--------------
    branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
    branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
    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  
2014-02-26 07:36:01 UTC (rev 11751)
+++ branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php  
2014-02-26 08:03:45 UTC (rev 11752)
@@ -212,10 +212,12 @@
                        }
                }
         protected function get_breg_orgs($fodselsnr) {
-            $breg_conn = pg_connect("host=localhost port=5432 dbname=breg 
user=portico password=portico") or die('connection failed');
+            $breg_conn = 
pg_connect("host=".$GLOBALS['phpgw_domain']['default']['db_host']." port=5432 
dbname=breg user=".$GLOBALS['phpgw_domain']['default']['db_user']." 
password=".$GLOBALS['phpgw_domain']['default']['db_pass']) or die('connection 
failed');
             $sql = "SELECT orgnr FROM breg.personcurrent WHERE fodselsnr 
='".$fodselsnr."'";
             $results = pg_query($breg_conn, $sql);
             $orgs = pg_fetch_all($results);
+            print_r($sql);
+            print_r($orgs);
             pg_close($breg_conn);
             return $orgs;
         }
@@ -223,11 +225,10 @@
                {
                        $config         = 
CreateObject('phpgwapi.config','bookingfrontend');
                        $config->read();
-        
             if ($config->config_data['authentication_method'] === 'MinId.php') 
{
                 $ipdp = sha1($_SERVER['HTTP_UID']);
                 $bregorgs = $this->get_breg_orgs($ipdp);
-                       $myorgnr = array();
+                $myorgnr = array();
                 if ($bregorgs == array()) {
                                $external_user = (object) 'ciao'; 
$external_user->login = '000000000';
                 } else {

Modified: branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang       
2014-02-26 07:36:01 UTC (rev 11751)
+++ branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang       
2014-02-26 08:03:45 UTC (rev 11752)
@@ -112,9 +112,7 @@
 log off        bookingfrontend no      Logg ut
 login  common  no      Logg inn
 logout common  no      Logg ut
-Organization not in the database       common  no      Du er ikke registert på 
noen organisasjon som er i databasen
-No organization data   common  no      Du er ikke registert på noen 
organisasjon i Brønnøysundregisteret 
-SSN not registred      common  no      Personnummert ditt er ikke registert i 
Brønnøysundregisteret
+SSN not registred      common  no      Organisasjonen er ikke registrert eller 
mangler organisasjonesnummer i AktivBy
 male   bookingfrontend no      Mann
 mar    bookingfrontend no      mars
 may    bookingfrontend no      mai

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php 
2014-02-26 07:36:01 UTC (rev 11751)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php 
2014-02-26 08:03:45 UTC (rev 11752)
@@ -207,13 +207,7 @@
 
                $tpl_vars['change_org_header'] = lang('Change organization');
 
-        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');
-        } elseif ( $bouser->orgname == '000000000') { 
+        if ( $bouser->orgname == '000000000') {
             $tpl_vars['login_text'] = lang('SSN not registred'). ' :: ' . 
lang('Logout');
         } else {
                $tpl_vars['login_text'] = $bouser->orgname . ' :: ' . 
lang('Logout');