extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for preferences bug #832083 (while to foreach conversion error)

Browse Source
This commit is contained in:
Miles Lott 2004-02-02 14:04:05 +00:00
parent 48a7a5b6bb
commit cf6e9a447a
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -301,39 +301,37 @@
/* $qfields = $contacts->stock_contact_fields + $extrafields + $customfields; */ /* $qfields = $contacts->stock_contact_fields + $extrafields + $customfields; */
/* create column list and the top row of the table based on user prefs */ /* create column list and the top row of the table based on user prefs */
// while($column = each($this->bo->stock_contact_fields)) foreach($this->bo->stock_contact_fields as $column)
foreach($this->bo->stock_contact_fields as $column => $nul)
{ {
$test = strtolower($column[0]); $test = strtolower($column);
if(isset($this->prefs[$test]) && $this->prefs[$test]) if(isset($this->prefs[$test]) && $this->prefs[$test])
{ {
$showcol = $this->display_name($column[0]); $showcol = $this->display_name($column);
$cols .= ' <td height="21">' . "\n"; $cols .= ' <td height="21">' . "\n";
$cols .= ' <font size="-1" face="Arial, Helvetica, sans-serif">'; $cols .= ' <font size="-1" face="Arial, Helvetica, sans-serif">';
$cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort, $cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort,
$column[0],$this->order,'/index.php',$showcol,'&menuaction=addressbook.uiaddressbook.index' $column,$this->order,'/index.php',$showcol,'&menuaction=addressbook.uiaddressbook.index'
); );
$cols .= "</font>\n </td>"; $cols .= "</font>\n </td>";
$cols .= "\n"; $cols .= "\n";
/* To be used when displaying the rows */ /* To be used when displaying the rows */
$columns_to_display[$column[0]] = True; $columns_to_display[$column] = True;
} }
} }
/* Setup the columns for non-standard fields, since we don't allow sorting */ /* Setup the columns for non-standard fields, since we don't allow sorting */
$nonstd = $this->extrafields + $customfields; $nonstd = $this->extrafields + $customfields;
// while($column = @each($nonstd)) foreach($nonstd as $column)
foreach($nonstd as $column => $nul)
{ {
$test = strtolower($column[1]); $test = strtolower($column);
if(isset($this->prefs[$test]) && $this->prefs[$test]) if(isset($this->prefs[$test]) && $this->prefs[$test])
{ {
$showcol = $this->display_name($column[0]); $showcol = $this->display_name($column[0]);
/* This must be a custom field */ /* This must be a custom field */
if(!$showcol) if(!$showcol)
{ {
// $showcol = $column[1]; // $showcol = $column;
$showcol = $namedfields[$column[1]]; $showcol = $namedfields[$column];
} }
$cols .= ' <td height="21">' . "\n"; $cols .= ' <td height="21">' . "\n";
$cols .= ' <font size="-1" face="Arial, Helvetica, sans-serif">'; $cols .= ' <font size="-1" face="Arial, Helvetica, sans-serif">';
@ -342,7 +340,7 @@
$cols .= "\n"; $cols .= "\n";
/* To be used when displaying the rows */ /* To be used when displaying the rows */
$columns_to_display[$column[0]] = True; $columns_to_display[$column] = True;
} }
} }