[Fmsystem-commits] [7315] fix on WS functions

[Erik Holm-Larsen]

Revision: 7315
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7315
Author:   erikhl
Date:     2011-05-27 05:13:01 +0000 (Fri, 27 May 2011)
Log Message:
-----------
fix on WS functions

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 13:24:15 UTC 
(rev 7314)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-27 05:13:01 UTC 
(rev 7315)
@@ -401,15 +401,16 @@
        
        function get_district_name($district_id)
        {
-               $result = "Ingen";
+               //$result = "Ingen";
                if($district_id != null)
                {
-                       $sql = "SELECT name FROM fm_part_of_town where 
part_of_town_id=$district_id";
+                       $sql = "SELECT name FROM fm_part_of_town where 
part_of_town_id in ($district_id)";
                        $this->db->query($sql, __LINE__, __FILE__);
                        while($this->db->next_record()){
-                               $result = $this->db->f('name');
+                               $result[] = $this->db->f('name');
                        }
        }
+       $result = implode(",",$result);
                return $result;
        }
        
@@ -565,13 +566,13 @@
                                $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);
+       _debug_array($activities);
                return $activities;
        }
        
        function get_contact_person($org_id, $group_id, $cont_pers)
        {
-               if(isset($group_id) && isset($cont_pers))
+               if($group_id && $cont_pers)
                {
                        $cont_pers = (int)$cont_pers;
        //              $this->db->query("SELECT * FROM bb_group_contact WHERE 
id={$cont_pers}", __LINE__, __FILE__);
@@ -580,7 +581,7 @@
                                $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))
+               else if($org_id && $cont_pers)
                {
                        $cont_pers = (int)$cont_pers;
        //              $this->db->query("SELECT * FROM bb_organization_contact 
WHERE id={$cont_pers}", __LINE__, __FILE__);