[Fmsystem-commits] [8904] activitycalendar: enable soap

[Sigurd Nes]

Revision: 8904
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8904
Author:   sigurdne
Date:     2012-02-16 14:34:06 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
activitycalendar: enable soap

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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-02-16 14:27:51 UTC 
(rev 8903)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-02-16 14:34:06 UTC 
(rev 8904)
@@ -654,6 +654,7 @@
        
        function get_activities($parameters = array())
        {
+               $soap = isset($parameters['soap']) && $parameters['soap'] ? 
true : false:
                //fromdate -> innparam for uthenting av delta - timestamp
                $whereclause_date = "";
                if($parameters['fromdate'])
@@ -669,7 +670,7 @@
                        $activities[]= array
                        (
                                'id'                            => (int) 
$this->db->f('id'),
-                               'title'                         => 
utf8_decode($this->db->f('title',true)),
+                               'title'                         => $soap ? 
$this->db->f('title',true) : 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),
@@ -677,7 +678,7 @@
                                'state'                         => 
$this->db->f('state',true),
                                'target'                        => 
$this->db->f('target'),
                                'arena'                         => 
$this->db->f('arena'),
-                               'time'                          => 
utf8_decode($this->db->f('time')),
+                               'time'                          => $soap ? 
$this->db->f('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'),