[Fmsystem-commits] [17592]

[nelson . guerra]

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


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

Modified: 
branches/dev-syncromind/addressbook/inc/class.uiaddressbook_prefs.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.uiaddressbook_prefs.inc.php   
2018-01-16 03:41:41 UTC (rev 17591)
+++ branches/dev-syncromind/addressbook/inc/class.uiaddressbook_prefs.inc.php   
2018-01-16 03:41:58 UTC (rev 17592)
@@ -179,7 +179,8 @@
                        if(is_array($ar))
                        {
                                reset($ar);
-                               while(list($k,$v)=each($ar))
+                               //while(list($k,$v)=each($ar))
+                                foreach($ar as $k => $v)
                                {
                                        if(!is_array($v))
                                        {
@@ -360,8 +361,11 @@
                        //now go translating each field
                        reset($this->contacts->stock_contact_fields);
                        //Constructing simple 'showable' fields
-                       
while(list($falsefield,$english)=each($this->contacts->stock_contact_fields))
-                       {
+                       
//while(list($falsefield,$english)=each($this->contacts->stock_contact_fields))
+                        if (is_array($this->contacts->stock_contact_fields))
+                        {
+                            foreach($this->contacts->stock_contact_fields as 
$falsefield => $english)
+                            {
                                //If it in selected_fields, then it has been 
selected, and it doesnt go into
                                //the fields_show_selectbox array
                                
if(!isset($this->selected_fields[$this->org_or_person][$falsefield]) || 
!$this->selected_fields[$this->org_or_person][$falsefield])
@@ -395,13 +399,15 @@
 
                                }
                        //Constructing commtype descriptions
-                       }
+                            }
+                        }
 
                        
$possible_comtypes=$this->linearize_query($this->contacts->get_contact_comm_descr(),'comm_description');
 
                        
if(isset($this->selected_fields[$this->org_or_person]['comm_types']) && 
is_array($possible_comtypes))
                        {
-                               while(list($k,$v)=each($possible_comtypes))
+                               //while(list($k,$v)=each($possible_comtypes))
+                                foreach($possible_comtypes as $k => $v)
                                {
                                        
if(!$this->selected_fields[$this->org_or_person]['comm_types'][$v])
                                        {
@@ -735,8 +741,11 @@
                //print "<br /><B>Selected</B><br />";
                //print_r($this->selected_fields[$this->org_or_person]);
                reset($this->selected_fields[$this->org_or_person]);
-               
while(list($k,$v)=each($this->selected_fields[$this->org_or_person]))
-               {
+               
//while(list($k,$v)=each($this->selected_fields[$this->org_or_person]))
+                if (is_array($this->selected_fields[$this->org_or_person]))
+                {
+                    foreach($this->selected_fields[$this->org_or_person] as $k 
=> $v)
+                    {
                        if(!is_array($v))
                        {
                                
$this->template->set_var('lang_selected_contact_field',$this->lang_fields[$k]);
@@ -766,7 +775,8 @@
                                $arrays[]=$v;
                        }
                                
-               }
+                    }
+                }
                if(is_array($arrays))
                {
                        if($this->current_columns_value_is_forced() && 
$this->map_tpl_to_real['adm_pref_type'] != 'forced')
@@ -779,10 +789,14 @@
                                $removelink=true;
                        }
 
-                       while(list($k,$v)=each($arrays))
+                       //while(list($k,$v)=each($arrays))
+                        foreach($arrays as $k => $v)
                        {
-                               while(list($ok,$ov)=each($v))
-                               {
+                               //while(list($ok,$ov)=each($v))
+                                if (is_array($v))
+                                {
+                                    foreach($v as $ok => $ov)
+                                    {
                                        if($removelink)
                                        {
                                                
$removelink=$GLOBALS['phpgw']->link
@@ -800,7 +814,8 @@
                                        
$this->template->set_var('lang_selected_contact_field',$this->lang_fields[$ok]);
                                        
$this->template->set_var('remove_me_link',$removelink);
                                        
$this->template->parse('V_selected_rows','B_selected_rows',True);
-                               }
+                                    }
+                                }
                        }
                }