[Phpgroupware-cvs] CVS: addressbook/inc class.uiaddressbook.inc.php,1.36.2.3,1.36.2.4 class.soaddressbook.inc.php,1.14.2.1,1.14.2.2

[Miles Lott <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.uiaddressbook.inc.php class.soaddressbook.inc.php 
Log Message:
rollback



Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.3
retrieving revision 1.36.2.4
diff -C2 -r1.36.2.3 -r1.36.2.4
*** class.uiaddressbook.inc.php 19 Feb 2002 18:48:15 -0000      1.36.2.3
--- class.uiaddressbook.inc.php 31 Mar 2002 19:51:07 -0000      1.36.2.4
***************
*** 394,401 ****
                                        $qfilter .= ',owner=' . 
$GLOBALS['phpgw_info']['user']['account_id'];
                                        break;
-                               case 'profile':
-                                       // FIXME! Needs ACL check
-                                       $qfilter = 'tid=p,owner=' . 
$GLOBALS['phpgw_info']['user']['account_id'];
-                                       break;
                                default:
                                        $qfilter .= ',owner=' . $this->filter;
--- 394,397 ----
***************
*** 435,439 ****
                        $GLOBALS['filter'] = $this->filter;
  
-                       $GLOBALS['phpgw']->nextmatchs->extra_filters[] = 
array('profile','User Profiles');
                        $search_filter = 
$GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php',
                                $this->start, 
$total_records,'&menuaction=addressbook.uiaddressbook.index&fcat_id='.$this->cat_id,'75%',
--- 431,434 ----
***************
*** 512,516 ****
                                                if 
($GLOBALS['phpgw_info']['user']['apps']['email'])
                                                {
!                                                       $ref = '<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uicompose.compose&to=' . 
urlencode($coldata)) . '" target="_new">';
                                                }
                                                else
--- 507,511 ----
                                                if 
($GLOBALS['phpgw_info']['user']['apps']['email'])
                                                {
!                                                       $ref='<a 
href="'.$GLOBALS['phpgw']->link("/email/compose.php","to=" . 
urlencode($coldata)).'" target="_new">';
                                                }
                                                else
***************
*** 530,542 ****
                                if (1)
                                {
-                                       if ($this->filter = 'profile')
-                                       {
-                                               $s = '&profile=True';
-                                       }
- 
                                        
$this->template->set_var('row_view_link',$GLOBALS['phpgw']->link('/index.php',
!                                               
'menuaction=addressbook.uiaddressbook.view&ab_id='.$entries[$i]['id'] . $s));
! 
!                                       unset($s);
                                }
                                else
--- 525,530 ----
                                if (1)
                                {
                                        
$this->template->set_var('row_view_link',$GLOBALS['phpgw']->link('/index.php',
!                                               
'menuaction=addressbook.uiaddressbook.view&ab_id='.$entries[$i]['id']));
                                }
                                else
***************
*** 551,563 ****
                                if 
($this->contacts->check_perms($this->contacts->grants[$myowner],PHPGW_ACL_EDIT) 
|| $myowner == $GLOBALS['phpgw_info']['user']['account_id'])
                                {
-                                       if ($this->filter = 'profile')
-                                       {
-                                               $s = '&profile=True';
-                                       }
- 
                                        $this->template->set_var('row_edit','<a 
href="' . $GLOBALS['phpgw']->link('/index.php',
!                                               
'menuaction=addressbook.uiaddressbook.edit&ab_id='.$entries[$i]['id'] . $s) . 
'">' . lang('Edit') . '</a>');
! 
!                                       unset($s);
                                }
                                else
--- 539,544 ----
                                if 
($this->contacts->check_perms($this->contacts->grants[$myowner],PHPGW_ACL_EDIT) 
|| $myowner == $GLOBALS['phpgw_info']['user']['account_id'])
                                {
                                        $this->template->set_var('row_edit','<a 
href="' . $GLOBALS['phpgw']->link('/index.php',
!                                               
'menuaction=addressbook.uiaddressbook.edit&ab_id='.$entries[$i]['id']) . '">' . 
lang('Edit') . '</a>');
                                }
                                else
***************
*** 685,702 ****
                                unset($_fields['referer']);
  
-                               if ($GLOBALS['profile'])
-                               {
-                                       $s = '&profile=True';
-                                       $_fields['tid'] = 'p';
-                               }
-                               else
-                               {
-                                       $_fields['tid'] = 'n';
-                               }
- 
                                $this->bo->update_entry($_fields);
  
                                Header('Location: '
!                                       . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 . $_fields['ab_id'] . '&referer=' . $referer . $s)
                                );
  
--- 666,673 ----
                                unset($_fields['referer']);
  
                                $this->bo->update_entry($_fields);
  
                                Header('Location: '
!                                       . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 . $_fields['ab_id'] . '&referer=' . $referer)
                                );
  
***************
*** 740,749 ****
                        if (($this->contacts->grants[$check[0]['owner']] & 
PHPGW_ACL_DELETE) || $check[0]['owner'] == 
$GLOBALS['phpgw_info']['user']['account_id'])
                        {
!                               // Profiles are *ONLY* deleted when the account 
is deleted
!                               if (! $GLOBALS['profile'])
!                               {
!                                       
$this->template->set_var('delete_link','<form method="POST" 
action="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.delete')
 . '">');
!                                       
$this->template->set_var('delete_button','<input type="submit" name="delete" 
value="' . lang('Delete') . '">');
!                               }
                        }
  
--- 711,716 ----
                        if (($this->contacts->grants[$check[0]['owner']] & 
PHPGW_ACL_DELETE) || $check[0]['owner'] == 
$GLOBALS['phpgw_info']['user']['account_id'])
                        {
!                               $this->template->set_var('delete_link','<form 
method="POST" 
action="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.delete')
 . '">');
!                               
$this->template->set_var('delete_button','<input type="submit" name="delete" 
value="' . lang('Delete') . '">');
                        }
  
***************
*** 856,860 ****
                                        $colname[$column[0]] = $column[1];
                                }
!                               $noprefs = ' - ' . lang('Please set your 
preferences for this application');
                        }
  
--- 823,827 ----
                                        $colname[$column[0]] = $column[1];
                                }
!                               $noprefs = ' - ' . lang('Please set your 
preferences for this app');
                        }
  
***************
*** 936,940 ****
                                                if 
($GLOBALS['phpgw_info']['user']['apps']['email'])
                                                {
!                                                       $ref = '<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uicompose.compose&to=' . 
urlencode($coldata)) . '" target="_new">';
                                                }
                                                else
--- 903,908 ----
                                                if 
($GLOBALS['phpgw_info']['user']['apps']['email'])
                                                {
!                                                       $ref='<a href="' . 
$GLOBALS['phpgw']->link('/email/compose.php','to='
!                                                               . 
urlencode($coldata)) . '" target="_new">';
                                                }
                                                else
***************
*** 1012,1024 ****
                                }
  
-                               if ($GLOBALS['profile'])
-                               {
-                                       $s = '&profile=True';
-                               }
- 
                                
$this->template->set_var('edit_button',$this->html_1button_form('edit','Edit',
!                                       
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.edit&ab_id='
 .$ab_id . $s)));
! 
!                               unset($s);
                        }
                        
$this->template->set_var('copy_button',$this->html_1button_form('submit','copy',
--- 980,985 ----
                                }
  
                                
$this->template->set_var('edit_button',$this->html_1button_form('edit','Edit',
!                                       
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.edit&ab_id='
 .$ab_id)));
                        }
                        
$this->template->set_var('copy_button',$this->html_1button_form('submit','copy',
***************
*** 1575,1584 ****
                        if ($action)
                        {
!                               if ($GLOBALS['profile'])
!                               {
!                                       $s = '&profile=True';
!                               }
!                               echo '<FORM action="' . 
$GLOBALS['phpgw']->link('/index.php', $action . '&referer='.urlencode($referer) 
. $s).'" method="post">';
!                               unset($s);
                        }
  
--- 1536,1540 ----
                        if ($action)
                        {
!                               echo '<FORM action="' . 
$GLOBALS['phpgw']->link('/index.php', $action . 
'&referer='.urlencode($referer)).'" method="post">';
                        }
  

Index: class.soaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.soaddressbook.inc.php,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
*** class.soaddressbook.inc.php 19 Feb 2002 18:48:15 -0000      1.14.2.1
--- class.soaddressbook.inc.php 31 Mar 2002 19:51:07 -0000      1.14.2.2
***************
*** 136,141 ****
                                $access = $fields['access'];
                                $cat_id = $fields['cat_id'];
-                               $tid    = $fields['tid'];
- 
                                unset($fields['owner']);
                                unset($fields['access']);
--- 136,139 ----
***************
*** 144,148 ****
                                unset($fields['tid']);
  
!                               
$this->contacts->update($ab_id,$owner,$fields,$access,$cat_id,$tid);
                        }
                        return;
--- 142,146 ----
                                unset($fields['tid']);
  
!                               
$this->contacts->update($ab_id,$owner,$fields,$access,$cat_id);
                        }
                        return;