[Phpgroupware-cvs] CVS: addressbook/inc class.uifields.inc.php,1.9,1.10

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.uifields.inc.php 
Log Message:
fix for bug #3241 (Apostrophes in custom-fields)
removed a wrong quote


Index: class.uifields.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uifields.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uifields.inc.php      6 Apr 2003 12:11:03 -0000       1.9
--- class.uifields.inc.php      18 Apr 2003 08:06:35 -0000      1.10
***************
*** 134,139 ****
                        }
  
!                       $field      = $GLOBALS['HTTP_POST_VARS']['field'];
!                       $field_name = $GLOBALS['HTTP_POST_VARS']['field_name'];
                        $start      = $GLOBALS['HTTP_POST_VARS']['start'];
                        $query      = $GLOBALS['HTTP_POST_VARS']['query'];
--- 134,139 ----
                        }
  
!                       $field      = 
stripslashes($GLOBALS['HTTP_POST_VARS']['field']);
!                       $field_name = 
stripslashes($GLOBALS['HTTP_POST_VARS']['field_name']);
                        $start      = $GLOBALS['HTTP_POST_VARS']['start'];
                        $query      = $GLOBALS['HTTP_POST_VARS']['query'];
***************
*** 162,166 ****
                                if(!$error)
                                {
-                                       $field_name = addslashes($field_name);
                                        
$this->save_custom_field($field,$field_name);
                                }
--- 162,165 ----
***************
*** 211,216 ****
                        }
  
!                       $field      = $GLOBALS['HTTP_POST_VARS']['field'] ? 
$GLOBALS['HTTP_POST_VARS']['field'] : $GLOBALS['HTTP_GET_VARS']['field'];
!                       $field_name = $GLOBALS['HTTP_POST_VARS']['field_name'];
                        $start      = $GLOBALS['HTTP_POST_VARS']['start'] ? 
$GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start'];
                        $query      = $GLOBALS['HTTP_POST_VARS']['query'] ? 
$GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query'];
--- 210,215 ----
                        }
  
!                       $field      = 
stripslashes($GLOBALS['HTTP_POST_VARS']['field'] ? 
$GLOBALS['HTTP_POST_VARS']['field'] : $GLOBALS['HTTP_GET_VARS']['field']);
!                       $field_name = 
stripslashes($GLOBALS['HTTP_POST_VARS']['field_name']);
                        $start      = $GLOBALS['HTTP_POST_VARS']['start'] ? 
$GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start'];
                        $query      = $GLOBALS['HTTP_POST_VARS']['query'] ? 
$GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query'];
***************
*** 240,245 ****
                                }
  
-                               $field_name = addslashes($field_name);
- 
                                if(!$error)
                                {
--- 239,242 ----
***************
*** 339,343 ****
  
                                $yeslinkf = 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uifieldsdelete&field_id='
 . $field_id . '&confirm=True');
!                               $yeslinkf = '<form method="POST" 
name="yesbutton" action="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uifields.delete') 
. '\">'
                                        . $hidden_vars
                                        . '<input type="hidden" name="field_id" 
 value="' . $field_id . '">'
--- 336,340 ----
  
                                $yeslinkf = 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uifieldsdelete&field_id='
 . $field_id . '&confirm=True');
!                               $yeslinkf = '<form method="POST" 
name="yesbutton" action="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uifields.delete') 
. '">'
                                        . $hidden_vars
                                        . '<input type="hidden" name="field_id" 
 value="' . $field_id . '">'