[Fmsystem-commits] [7313] Fixed import of description and contact persons

[Erik Holm-Larsen]

Revision: 7313
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7313
Author:   erikhl
Date:     2011-05-26 11:41:54 +0000 (Thu, 26 May 2011)
Log Message:
-----------
Fixed import of description and contact persons
fixed WS for activities

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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-26 11:04:52 UTC 
(rev 7312)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-26 11:41:54 UTC 
(rev 7313)
@@ -571,22 +571,22 @@
        
        function get_contact_person($org_id, $group_id, $cont_pers)
        {
-               if(isset($group_id))
+               if(isset($group_id) && isset($cont_pers))
                {
-                       $group_id = (int)$group_id;
+                       $cont_pers = (int)$cont_pers;
        //              $this->db->query("SELECT * FROM bb_group_contact WHERE 
id={$cont_pers}", __LINE__, __FILE__);
-                       $this->db->query("SELECT * FROM bb_group_contact WHERE 
id={$group_id}", __LINE__, __FILE__);
+                       $this->db->query("SELECT * FROM bb_group_contact WHERE 
id={$cont_pers}", __LINE__, __FILE__);
                        while($this->db->next_record()){
-                               $result = 
array($this->db->f('name'),$this->db->f('phone'),$this->db->f('email'));
+                               $result = array('name' => 
$this->db->f('name'),'phone' => $this->db->f('phone'),'email' => 
$this->db->f('email'));
                        }
                }
-               else if(isset($org_id))
+               else if(isset($org_id) && isset($cont_pers))
                {
-                       $org_id = (int)$org_id;
+                       $cont_pers = (int)$cont_pers;
        //              $this->db->query("SELECT * FROM bb_organization_contact 
WHERE id={$cont_pers}", __LINE__, __FILE__);
-                       $this->db->query("SELECT * FROM bb_organization_contact 
WHERE id={$org_id}", __LINE__, __FILE__);
+                       $this->db->query("SELECT * FROM bb_organization_contact 
WHERE id={$cont_pers}", __LINE__, __FILE__);
                        while($this->db->next_record()){
-                               $result = 
array($this->db->f('name'),$this->db->f('phone'),$this->db->f('email'));
+                               $result = array('name' => 
$this->db->f('name'),'phone' => $this->db->f('phone'),'email' => 
$this->db->f('email'));
                        }
                }
                return $result;
@@ -599,7 +599,7 @@
                        $org_id = (int)$org_id;
                        $this->db->query("SELECT * FROM bb_organization WHERE 
id={$org_id}", __LINE__, __FILE__);
                        while($this->db->next_record()){
-                               $result = 
array($this->db->f('name'),$this->db->f('shortname'),$this->db->f('homepage'),$this->db->f('phone'),$this->db->f('email'));
+                               $result = array('name' => 
$this->db->f('name'),'shortname' => $this->db->f('shortname'),'description' => 
$this->db->f('description'),'homepage' => $this->db->f('homepage'),'phone' => 
$this->db->f('phone'),'email' => $this->db->f('email'));
                        }
                }
        }
@@ -611,7 +611,7 @@
                        $group_id = (int)$group_id;
                        $this->db->query("SELECT * FROM bb_group WHERE 
id={$group_id}", __LINE__, __FILE__);
                        while($this->db->next_record()){
-                               $result = 
array($this->db->f('name'),$this->db->f('shortname'),$this->db->f('description'),$this->db->f('organization_id'));
+                               $result = array('name' => 
$this->db->f('name'),'shortname' => $this->db->f('shortname'),'description' => 
$this->db->f('description'),'organization_id' => 
$this->db->f('organization_id'));
                        }
                }
        }
@@ -623,7 +623,7 @@
                        $arena_id = (int)$arena_id;
                        $this->db->query("SELECT * FROM activity_arena WHERE 
id={$arena_id}", __LINE__, __FILE__);
                        while($this->db->next_record()){
-                               $result = 
array($this->db->f('arena_name'),$this->db->f('address'));
+                               $result = array('arena_name' => 
$this->db->f('arena_name'),'address' => $this->db->f('address'));
                        }
                }
        }

Modified: trunk/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiimport.inc.php   2011-05-26 11:04:52 UTC 
(rev 7312)
+++ trunk/activitycalendar/inc/class.uiimport.inc.php   2011-05-26 11:41:54 UTC 
(rev 7313)
@@ -208,6 +208,10 @@
                        foreach ($datalines as $data) {
                                $arenaOK = true;
                                $activityOK = true;
+                               unset($act_targets);
+                               unset($activity_persons);
+                               unset($activity_description);
+                               
                                $arena = new activitycalendar_arena();
                                //8: sted, 9:adresse
                                $arena_name = $this->decode($data[7]);
@@ -274,7 +278,7 @@
                                        }
                                        $activity_target = implode(",", 
$act_targets);
                                }
-                               unset($act_targets);
+
                                $activity_day = $this->decode($data[9]);
                                $activity_time = $this->decode($data[10]);
                                $activity_update_date = 
$this->decode($data[20]);