[Fmsystem-commits] [11435] bkbooking: stavanger bugfix updatae minid login

[Kjell Arne Espedal]

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

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

Added Paths:
-----------
    branches/stavangerkommune/phpgwapi/templates/stavanger/js/minid.js

Modified: branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php  
2013-11-05 19:11:46 UTC (rev 11434)
+++ branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php  
2013-11-06 11:41:45 UTC (rev 11435)
@@ -223,7 +223,6 @@
                                header('Content-type: text/xml');
                                $ipdp = $_COOKIE['iPlanetDirectoryPro'];
                                $xmldata = 
simplexml_load_file('http://aktivby.stavanger.kommune.no:8080/spclient/auth.jsp?ipdp='.$ipdp);
-
                        $myorgnr = array();
                        
                 $orgnummbers = $this->get_organizations();                
@@ -241,7 +240,6 @@
                         } 
                                    }
                     if (count($myorgnr) > 1) {
-                                               
$xmldata->asXml('/tmp/loggeddata.xml');
                                $external_user = (object) 'ciao'; 
$external_user->login = $myorgnr[0];
                                                $orgs = array();
                                                foreach ($myorgnr as $org) {

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl   
2013-11-05 19:11:46 UTC (rev 11434)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/footer.tpl   
2013-11-06 11:41:45 UTC (rev 11435)
@@ -6,44 +6,61 @@
 Stavanger kommune | Olav Kyrres gate 19 | Postboks 8001 | 4068 Stavanger
 </div>
 <script type="text/javascript">
-       function test() {
-               var orgarray = eval('(' + '{organization_json}' + ')');
-               var div = document.createElement('div');
-               document.body.appendChild(div);
-               div.className = 'changeorg';
-               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 += '<div id="orglist"></div>';
-               var oList = document.getElementById("orglist");
-               for(var i=0,len=orgarray.length; i < len; i++) {
-                       oList.innerHTML += '<div style="padding-bottom: 
5px;"><a 
href="change.php?orgnumber='+orgarray[i]['orgnumber']+'">'+orgarray[i]['orgname']+'</a></div>';
-               }       
-               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");
-               oHeader.style.paddingBottom="5px";
-               var oClose = document.getElementById("changeClose")
-               oClose.style.cursor='pointer';
-               oClose.onclick = function(){
-                       div.parentNode.removeChild(div);
-               }
+//<!--
+function orgbox() {
+       var orgarray = eval('(' + '{organization_json}' + ')');
+       var div = document.createElement('div');
+       document.body.appendChild(div);
+       div.className = 'changeorg';
+       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 += '<div id="orglist"></div>';
+       var oList = document.getElementById("orglist");
+       for(var i=0,len=orgarray.length; i < len; i++) {
+               oList.innerHTML += '<div style="padding-bottom: 5px;"><a 
href="change.php?orgnumber='+orgarray[i]['orgnumber']+'">'+orgarray[i]['orgname']+'</a></div>';
+       }       
+       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");
+       oHeader.style.paddingBottom="5px";
+       var oClose = document.getElementById("changeClose")
+       oClose.style.cursor='pointer';
+       var oElement = document.getElementById("change");
+       oElement.onclick = function(){
+               div.parentNode.removeChild(div);
+               oElement.setAttribute('onclick', 'orgbox();');
        }
-       
-
-
+       oClose.onclick = function(){
+               div.parentNode.removeChild(div);
+               oElement.setAttribute('onclick', 'orgbox();');
+       }
+}
+function init() {
        if ('{organization_json}' != 'null' && '{organization_json}' != '') {
                var oElement = document.getElementById("change");
-               oElement.innerHTML = '<i class="fa fa-users"></i>';
-               oElement.setAttribute('onclick', 'test();');
+               oElement.innerHTML = '<i class="fa fa-users"></i>';
+               oElement.setAttribute('onclick', 'orgbox();');
                oElement.style.color='black';
                oElement.style.padding='6px 0px 0px 5px';
                oElement.style.cursor='pointer';
-               
 
+               var cookie = getCookie('orgbox');
+               if (cookie != 1) {
+                       orgbox();
+                       var oList = document.getElementById("orglist");
+                       oList.innerHTML += '<div style="padding-top: 10px">PS: 
Du kan bruke <i class="fa fa-users"></i> ikonet for å bytte 
organisasjon.</div>';                        
+                       setCookie('orgbox',1,1);
+               }
        }
-</script>
+}
+
+window.onload = init;
+
+
+//-->
+ </script>
        </body>
 </html>

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php 
2013-11-05 19:11:46 UTC (rev 11434)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php 
2013-11-06 11:41:45 UTC (rev 11435)
@@ -78,6 +78,8 @@
                }
        }
 
+       $javascripts[] = "/phpgwapi/templates/stavanger/js/minid.js";
+
        foreach ( $javascripts as $javascript )
        {
                if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
@@ -213,12 +215,12 @@
                 } else {
                        $tpl_vars['login_text'] = $bouser->orgname . ' :: ' . 
lang('Logout');
                 }
-               $tpl_vars['login_url'] = 'logout.php';
+               $tpl_vars['login_url'] = '/logout.php';
        }
        else
        {
                $tpl_vars['login_text'] = lang('Login');
-               $tpl_vars['login_url'] = 
'login.php?after='.urlencode($_SERVER['QUERY_STRING']);
+               $tpl_vars['login_url'] = 
'/login.php?after='.urlencode($_SERVER['QUERY_STRING']);
                $config         = 
CreateObject('phpgwapi.config','bookingfrontend');
                $config->read();
                $login_parameter = 
isset($config->config_data['login_parameter']) && 
$config->config_data['login_parameter'] ? 
$config->config_data['login_parameter'] : '';

Added: branches/stavangerkommune/phpgwapi/templates/stavanger/js/minid.js
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/js/minid.js          
                (rev 0)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/js/minid.js  
2013-11-06 11:41:45 UTC (rev 11435)
@@ -0,0 +1,33 @@
+function getCookie(c_name)
+{
+       var c_value = document.cookie;
+       var c_start = c_value.indexOf(" " + c_name + "=");
+       if (c_start == -1)
+       {
+               c_start = c_value.indexOf(c_name + "=");
+       }
+       if (c_start == -1)
+       {
+               c_value = null;
+       }
+       else
+       {
+               c_start = c_value.indexOf("=", c_start) + 1;
+               var c_end = c_value.indexOf(";", c_start);
+               if (c_end == -1)
+               {
+                       c_end = c_value.length;
+               }
+               c_value = unescape(c_value.substring(c_start,c_end));
+       }
+       return c_value;
+}
+function setCookie(c_name,value,exdays)
+{
+       var exdate=new Date();
+       exdate.setDate(exdate.getDate() + exdays);
+       var c_value=escape(value) + ((exdays==null) ? "" : "; 
expires="+exdate.toUTCString());
+       document.cookie=c_name + "=" + c_value;
+}
+
+