[Fmsystem-commits] [7314] activitycalendar: charset

[Sigurd Nes]

Revision: 7314
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7314
Author:   sigurdne
Date:     2011-05-26 13:24:15 +0000 (Thu, 26 May 2011)
Log Message:
-----------
activitycalendar: charset

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-26 11:41:54 UTC 
(rev 7313)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-26 13:24:15 UTC 
(rev 7314)
@@ -540,16 +540,16 @@
                        $activities[]= array
                        (
                                'id'                            => (int) 
$this->db->f('id'),
-                               'title'                         => 
$this->db->f('title',true),
+                               'title'                         => 
utf8_decode($this->db->f('title',true)),
                                'organization_id'       => 
$this->db->f('organization_id',true),
                                'group_id'                      => 
$this->db->f('group_id'),
                                'district'                      => 
$this->db->f('district',true),
                                'category'                      => 
$this->db->f('category'),
                                'state'                         => 
$this->db->f('state',true),
                                'target'                        => 
$this->db->f('target'),
-                               'description'           => 
$this->db->f('description'),
+                               'description'           => 
utf8_decode($this->db->f('description')),
                                'arena'                         => 
$this->db->f('arena'),
-                               'time'                          => 
$this->db->f('time'),
+                               'time'                          => 
utf8_decode($this->db->f('time')),
                                'contact_person_1'      => 
$this->db->f('contact_person_1'),
                                'contact_person_2'      => 
$this->db->f('contact_person_2'),
                                'special_adaptation'=> 
$this->db->f('special_adaptation'),
@@ -558,11 +558,11 @@
 
                foreach ($activities as &$activity)
                {
-                               $activity['organization_info']  = 
$this->get_org_info($activity['organization_id']);
-                               $activity['group_info']                 = 
$this->get_group_info($activity['group_id']);
-                               $activity['district_name']              = 
$this->get_district_name($activity['district']);
-                               $activity['category_name']              = 
$this->get_category_name($activity['category']);
-                               $activity['arena_info']                 = 
$this->get_arena_info($activity['arena']);
+                               $activity['organization_info']  = 
utf8_decode($this->get_org_info($activity['organization_id']));
+                               $activity['group_info']                 = 
utf8_decode($this->get_group_info($activity['group_id']));
+                               $activity['district_name']              = 
utf8_decode($this->get_district_name($activity['district']));
+                               $activity['category_name']              = 
utf8_decode($this->get_category_name($activity['category']));
+                               $activity['arena_info']                 = 
utf8_decode($this->get_arena_info($activity['arena']));
                                $activity['contact_person']             = 
$this->get_contact_person($activity['organization_id'],$activity['group_id'],$activity['contact_person_1']);
                }
 //     _debug_array($activities);
@@ -577,7 +577,7 @@
        //              $this->db->query("SELECT * FROM bb_group_contact WHERE 
id={$cont_pers}", __LINE__, __FILE__);
                        $this->db->query("SELECT * FROM bb_group_contact WHERE 
id={$cont_pers}", __LINE__, __FILE__);
                        while($this->db->next_record()){
-                               $result = array('name' => 
$this->db->f('name'),'phone' => $this->db->f('phone'),'email' => 
$this->db->f('email'));
+                               $result = array('name' => 
utf8_decode($this->db->f('name')),'phone' => $this->db->f('phone'),'email' => 
$this->db->f('email'));
                        }
                }
                else if(isset($org_id) && isset($cont_pers))
@@ -586,7 +586,7 @@
        //              $this->db->query("SELECT * FROM bb_organization_contact 
WHERE id={$cont_pers}", __LINE__, __FILE__);
                        $this->db->query("SELECT * FROM bb_organization_contact 
WHERE id={$cont_pers}", __LINE__, __FILE__);
                        while($this->db->next_record()){
-                               $result = array('name' => 
$this->db->f('name'),'phone' => $this->db->f('phone'),'email' => 
$this->db->f('email'));
+                               $result = array('name' => 
utf8_decode($this->db->f('name')),'phone' => $this->db->f('phone'),'email' => 
$this->db->f('email'));
                        }
                }
                return $result;