[Fmsystem-commits] [17591]

[nelson . guerra]

Revision: 17591
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17591
Author:   nelson224
Date:     2018-01-15 22:41:41 -0500 (Mon, 15 Jan 2018)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/addressbook/inc/class.uiaddressbook.inc.php

Modified: branches/dev-syncromind/addressbook/inc/class.uiaddressbook.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.uiaddressbook.inc.php 
2018-01-16 01:53:20 UTC (rev 17590)
+++ branches/dev-syncromind/addressbook/inc/class.uiaddressbook.inc.php 
2018-01-16 03:41:41 UTC (rev 17591)
@@ -387,29 +387,37 @@
 
                $total_records = $this->bo->total;
                $cols='';
-               while ($column = @each($columns_to_display))
-               {
-                       $showcol = $this->bo->display_name($column[0]);
+               //while ($column = @each($columns_to_display))
+                if (is_array($columns_to_display))
+                {
+                    foreach($columns_to_display as $key => $value)
+                    {
+                       $showcol = $this->bo->display_name($key);
 
-                       if (!$showcol) { $showcol = $column[1]; }
+                       if (!$showcol) { $showcol = $value; }
                        $cols .= '<td>';
                        $cols .= 
$GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort,
-                                       
$column[0],$this->order,"/index.php",$showcol,
+                                       $key,$this->order,"/index.php",$showcol,
                                        
'&menuaction=addressbook.uiaddressbook.index&section='.$this->section.'&fcat_id='.$this->cat_id.'&nonavbar='.$this->nonavbar);
                        $cols .= '</td>';
                        $cols .= "\n";
-               }
+                    }
+                }
                //FIXME: NEeed to determine how are we going to handle comm 
types translations
-               while ($column = @each($comms_array))
-               {
-                       $showcol = $column[0]; 
+               //while ($column = @each($comms_array))
+                if (is_array($comms_array))
+                {
+                    foreach($comms_array as $key => $value)
+                    {
+                       $showcol = $key; 
                        $cols .= '<td>';
                        $cols .= 
$GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort,
-                                       
$column[0],$this->order,"/index.php",$showcol,
+                                       $key,$this->order,"/index.php",$showcol,
                                        
'&menuaction=addressbook.uiaddressbook.index&section='.$this->section.'&fcat_id='.$this->cat_id
 .'&nonavbar='.$this->nonavbar);
                        $cols .= '</td>';
                        $cols .= "\n";
-               }
+                    }
+                }
 
                /* set basic vars and parse the header */
                
//$this->template->set_var('principal_tab',$this->get_principal_tabs($this->section));