[Phpgroupware-cvs] CVS: addressbook/inc class.boaddressbook.inc.php,1.21.2.2,1.21.2.2.2.1 class.uiaddressbook.inc.php,1.36.2.15.2.1,1.36.2.15.2.2

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv32088

Modified Files:
      Tag: Version-0_9_16-branch
        class.boaddressbook.inc.php class.uiaddressbook.inc.php 
Log Message:
fixed default-filter in the prefs and custom-field-display


Index: class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.2.2.1
diff -C2 -r1.21.2.2 -r1.21.2.2.2.1
*** class.boaddressbook.inc.php 21 Mar 2003 21:00:51 -0000      1.21.2.2
--- class.boaddressbook.inc.php 6 Apr 2003 15:03:05 -0000       1.21.2.2.2.1
***************
*** 387,391 ****
                                if ($other['default_filter'])
                                {
!                                       
$GLOBALS['phpgw']->preferences->add('addressbook','default_filter',True);
                                }
  
--- 387,391 ----
                                if ($other['default_filter'])
                                {
!                                       
$GLOBALS['phpgw']->preferences->add('addressbook','default_filter',$other['default_filter']);
                                }
  

Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.1
retrieving revision 1.36.2.15.2.2
diff -C2 -r1.36.2.15.2.1 -r1.36.2.15.2.2
*** class.uiaddressbook.inc.php 6 Apr 2003 12:07:25 -0000       1.36.2.15.2.1
--- class.uiaddressbook.inc.php 6 Apr 2003 15:03:05 -0000       1.36.2.15.2.2
***************
*** 411,415 ****
                        $search_filter = 
$GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php',
                                $this->start, 
$total_records,'&menuaction=addressbook.uiaddressbook.index&fcat_id='.$this->cat_id,'75%',
!                               
$GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,1,$this->cat_id);
                        $query = $filter = '';
  
--- 411,416 ----
                        $search_filter = 
$GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php',
                                $this->start, 
$total_records,'&menuaction=addressbook.uiaddressbook.index&fcat_id='.$this->cat_id,'75%',
!                               
$GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,array('filter'=>$this->filter,'yours'=>1),
!                               $this->cat_id);
                        $query = $filter = '';
  
***************
*** 803,825 ****
                        }
  
-                       /* No prefs? */
-                       if (!$columns_to_display )
-                       {
-                               $columns_to_display = array(
-                                       'n_given'    => 'n_given',
-                                       'n_family'   => 'n_family',
-                                       'org_name'   => 'org_name',
-                                       'tel_work'   => 'tel_work',
-                                       'tel_home'   => 'tel_home',
-                                       'email'      => 'email',
-                                       'email_home' => 'email_home'
-                               );
-                               while ($column = each($columns_to_display))
-                               {
-                                       $colname[$column[0]] = $column[1];
-                               }
-                               $noprefs = ' - ' . lang('Please set your 
preferences for this application');
-                       }
- 
                        /* merge in extra fields */
                        $qfields = $this->contacts->stock_contact_fields + 
$this->extrafields + $customfields;
--- 804,807 ----
***************
*** 838,842 ****
                        }
  
!                       $this->template->set_var('lang_viewpref',lang('Address 
book - view') . $noprefs);
  
                        unset($qfields['email_type']);          // noone is 
useing that any more
--- 820,824 ----
                        }
  
!                       $this->template->set_var('lang_viewpref',lang('Address 
book - view'));
  
                        unset($qfields['email_type']);          // noone is 
useing that any more
***************
*** 1083,1100 ****
                                $custom_var = '
    <tr>
!     <td><font color="#000000" face="">'.lang('Custom').' 
'.lang('Fields').':</font></td>
!     <td></td>
!     <td></td>
    </tr>
  ';
                                while( list($cf) = each($customfields) )
                                {
!                                       $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
!                                       $custom_var .= "\n" . '<tr bgcolor="' . 
$tr_color . '">' . "\n";
                                        $custom_var .= '    <td><input 
type="checkbox" name="prefs['
                                                . strtolower($cf) . ']"'
                                                . ($this->prefs[$cf] ? ' 
checked' : '')
!                                               . '>' . $cf . '</option></td>' 
. "\n"
!                                               . '</tr>' . "\n";
                                }
                                
$this->template->set_var('custom_fields',$custom_var);
--- 1065,1092 ----
                                $custom_var = '
    <tr>
!     <td bgcolor="'.$tr_color.'" colspan="6"><font color="#000000" 
face="">'.lang('Custom Fields').':</font></td>
    </tr>
  ';
+                               $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+                               $i = 0;
                                while( list($cf) = each($customfields) )
                                {
!                                       if (!($i % 6))
!                                       {
!                                               $custom_var .= "\n  <tr 
bgcolor='$tr_color'>\n";
!                                       }
                                        $custom_var .= '    <td><input 
type="checkbox" name="prefs['
                                                . strtolower($cf) . ']"'
                                                . ($this->prefs[$cf] ? ' 
checked' : '')
!                                               . '>' . str_replace('_',' 
',$cf) . '</option></td>' . "\n";
!                                       
!                                       if (!(++$i % 6))
!                                       {
!                                               echo "</tr>\n";
!                                       }
!                               }
!                               if ($i = 6 - ($i % 6))
!                               {
!                                       $custom_var .= "    <td 
colspan=$i>&nbsp;</td>\n  </tr>\n";
                                }
                                
$this->template->set_var('custom_fields',$custom_var);
***************
*** 1119,1125 ****
  
                        $list = array(
!                               ''        => lang('All'),
!                               'private' => lang('Private'),
!                               'blank'   => lang('Blank')
                        );
                        
$this->template->set_var('lang_default_filter',lang('Default Filter'));
--- 1111,1118 ----
  
                        $list = array(
!                               'none'    => lang('Show all'),
!                               'yours'   => lang('Only yours'),
!                               'private' => lang('Private') /*,
!                               'blank'   => lang('Blank') */
                        );
                        
$this->template->set_var('lang_default_filter',lang('Default Filter'));