[Phpgroupware-cvs] CVS: addressbook/inc class.uifields.inc.php,1.3.2.5,1.3.2.6

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.uifields.inc.php 
Log Message:
fix for bug #3241 (Apostrophes in custom-fields)


Index: class.uifields.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uifields.inc.php,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -r1.3.2.5 -r1.3.2.6
*** class.uifields.inc.php      7 Apr 2003 13:45:23 -0000       1.3.2.5
--- class.uifields.inc.php      18 Apr 2003 08:00:59 -0000      1.3.2.6
***************
*** 135,140 ****
                        }
  
!                       $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'];
--- 135,140 ----
                        }
  
!                       $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'];
***************
*** 163,167 ****
                                if(!$error)
                                {
-                                       $field_name = addslashes($field_name);
                                        
$this->save_custom_field($field,$field_name);
                                }
--- 163,166 ----
***************
*** 213,218 ****
                        }
  
!                       $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'];
--- 212,217 ----
                        }
  
!                       $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'];
***************
*** 241,246 ****
                                        $error[$errorcount++] = lang('Please 
enter a name for that field !');
                                }
- 
-                               $field_name = addslashes($field_name);
  
                                if(!$error)
--- 240,243 ----