[Fmsystem-commits] [6580] bkbooking: fix for problem with national characters in application on bookingfrontend

[Kjell Arne Espedal]

Revision: 6580
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6580
Author:   kjell
Date:     2010-11-11 08:58:39 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
bkbooking: fix for problem with national characters in application on 
bookingfrontend

Modified Paths:
--------------
    trunk/booking/inc/class.uiapplication.inc.php

Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php       2010-11-10 22:41:51 UTC 
(rev 6579)
+++ trunk/booking/inc/class.uiapplication.inc.php       2010-11-11 08:58:39 UTC 
(rev 6580)
@@ -384,8 +384,15 @@
                        array_set_default($application, 'resources', 
array(get_var('resource', int, 'GET')));
                        }
                        array_set_default($application, 'building_id', 
phpgw::get_var('building_id', 'GET'));
-                       array_set_default($application, 'building_name', 
phpgw::get_var('building_name', 'GET'));
+
+                       array_set_default($application, 'building_name', 
mb_detect_encoding(phpgw::get_var('building_name', 'GET')));
                        
+                       if (strstr($application['building_name'],"%")){
+                               $search = array('%C3%85', '%C3%A5', '%C3%98', 
'%C3%B8', '%C3%86', '%C3%A6');
+                               $replace = array ('Å','å','Ø','ø','Æ','æ');
+                               $application['building_name'] = 
str_replace($search, $replace, $application['building_name']);
+                       }
+                       
                        if(phpgw::get_var('from_', 'GET'))
                        {
                                $default_dates = array_map(array(self, 
'_combine_dates'), phpgw::get_var('from_', 'GET'), phpgw::get_var('to_', 
'GET'));