[Fmsystem-commits] [14490]

[Nelson Guerra]

Revision: 14490
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14490
Author:   nelson224
Date:     2015-11-26 23:57:44 +0000 (Thu, 26 Nov 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/activitycalendar/inc/class.uicommon.inc.php

Modified: branches/dev-syncromind/activitycalendar/inc/class.uicommon.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.uicommon.inc.php 
2015-11-26 23:57:08 UTC (rev 14489)
+++ branches/dev-syncromind/activitycalendar/inc/class.uicommon.inc.php 
2015-11-26 23:57:44 UTC (rev 14490)
@@ -229,42 +229,38 @@
                 */
                public function download()
                {
-                       $list    = $this->query();
-                       $list    = $list['ResultSet']['Result'];
+            $list = $this->query();
 
-                       $keys = array();
+            $keys = array();
 
-                       if(count($list[0]) > 0)
-                       {
-                               foreach($list[0] as $key => $value)
-                               {
-                                       if(!is_array($value))
-                                       {
-                                               array_push($keys, $key);
-                                       }
-                               }
-                       }
+            if(count($list[0]) > 0) {
+                foreach($list[0] as $key => $value) {
+                    if(!is_array($value)) {
+                        array_push($keys, $key);
+                    }
+                }
+            }
+            
+            // Remove newlines from output
+            $count = count($list);
+            for($i = 0; $i < $count; $i++)
+            {
+                               foreach ($list[$i] as $key => &$data)
+                               {
+                                       $data = str_replace(array("\n","\r\n", 
"<br>"),'',$data);
+                               }
+            }
 
-                       // Remove newlines from output
-                       $count = count($list);
-                       for($i = 0; $i < $count; $i++)
-                       {
-                               foreach($list[$i] as $key => &$data)
-                               {
-                                       $data = str_replace(array("\n", "\r\n", 
"<br>"), '', $data);
-                               }
-                       }
+             // Use keys as headings
+            $headings = array();
+            $count_keys = count($keys);
+            for($j=0;$j<$count_keys;$j++)
+            {
+               array_push($headings, lang($keys[$j]));
+            }
 
-                       // Use keys as headings
-                       $headings        = array();
-                       $count_keys      = count($keys);
-                       for($j = 0; $j < $count_keys; $j++)
-                       {
-                               array_push($headings, lang($keys[$j]));
-                       }
-
-                       $property_common = CreateObject('property.bocommon');
-                       $property_common->download($list, $keys, $headings);
+            $property_common = CreateObject('property.bocommon');
+            $property_common->download($list, $keys, $headings);
                }
 
                /**