[Fmsystem-commits] [10004] fix on transfer of arena-info to portal

[Erik Holm-Larsen]

Revision: 10004
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10004
Author:   erikhl
Date:     2012-09-18 05:17:15 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
fix on transfer of arena-info to portal

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-09-17 08:19:13 UTC 
(rev 10003)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-09-18 05:17:15 UTC 
(rev 10004)
@@ -788,7 +788,7 @@
                                $activity['district_name']              = $soap 
? $this->get_district_name($activity['district']) : 
utf8_decode($this->get_district_name($activity['district']));
                                $activity['category_name']              = $soap 
? $this->get_category_name($activity['category']) : 
utf8_decode($this->get_category_name($activity['category']));
                                $activity['description']                = 
$this->get_activity_description($activity['organization_id'],$activity['group_id']);
-                               $activity['arena_info']                 = 
$this->get_arena_info($activity['arena']);
+                               $activity['arena_info']                 = 
$this->get_all_arena_info($activity['arena'], $activity['internal_arena']);
                                $activity['internal_arena_info']= 
$this->get_internal_arena_info($activity['internal_arena']);
                                $activity['contact_person']             = 
$this->get_contact_person($activity['organization_id'],$activity['group_id'],$activity['contact_person_1']);
                }
@@ -945,6 +945,34 @@
                return $result;
        }
        
+       function get_all_arena_info($arena_id, $int_arena_id)
+       {
+               $result = array();
+               if($arena_id && is_numeric($arena_id))
+               {
+                       $arena_id = (int)$arena_id;
+                       $this->db->query("SELECT * FROM activity_arena WHERE 
id={$arena_id}", __LINE__, __FILE__);
+                       $this->db->next_record();
+                       $result = array
+                       (
+                               'arena_name' => $this->soap ? 
$this->db->f('arena_name') : utf8_decode($this->db->f('arena_name')),
+                               'address' => $this->soap ? 
$this->db->f('address') : utf8_decode($this->db->f('address'))
+                       );
+               }
+               else if($int_arena_id && is_numeric($int_arena_id))
+               {
+                       $int_arena_id = (int)$int_arena_id;
+                       $this->db->query("SELECT id, name, street FROM 
bb_building WHERE id={$int_arena_id}", __LINE__, __FILE__);
+                       $this->db->next_record();
+                       $result = array
+                       (
+                               'arena_name' => $this->soap ? 
$this->db->f('name') : utf8_decode($this->db->f('name')),
+                               'address' => $this->soap ? 
$this->db->f('street') : utf8_decode($this->db->f('street'))
+                       );
+               }
+               return $result;
+       }
+       
        function get_arena_info($arena_id)
        {
                $result = array();