[Phpgroupware-cvs] addressbook/inc class.uifields.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    addressbook
Changes by:     Dave Hall <skwashd>     06/09/01 14:47:28

Modified files:
        inc            : class.uifields.inc.php 

Log message:
        more minor work

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/class.uifields.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16

Patches:
Index: class.uifields.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uifields.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.uifields.inc.php      1 Sep 2006 14:44:43 -0000       1.15
+++ class.uifields.inc.php      1 Sep 2006 14:47:28 -0000       1.16
@@ -1,5 +1,5 @@
 <?php
-  /**************************************************************************\
+/**************************************************************************\
   * phpGroupWare - Addressbook                                               *
   * http://www.phpgroupware.org                                              *
   * Written by Joseph Engo <address@hidden> and                      *
@@ -11,7 +11,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: class.uifields.inc.php,v 1.15 2006/09/01 14:44:43 skwashd Exp $ */
+/* $Id: class.uifields.inc.php,v 1.16 2006/09/01 14:47:28 skwashd Exp $ */
 
        class uifields
        {
@@ -24,9 +24,9 @@
 
                function uifields()
                {
-                       $GLOBALS['phpgw']->template = 
CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
-                       $GLOBALS['phpgw']->nextmatchs = 
CreateObject('phpgwapi.nextmatchs');
-                       $this->config = 
CreateObject('phpgwapi.config','addressbook');
+                       $GLOBALS['phpgw']->template = 
createObject('phpgwapi.Template',PHPGW_APP_TPL);
+                       $GLOBALS['phpgw']->nextmatchs = 
createObject('phpgwapi.nextmatchs');
+                       $this->config = 
createObject('phpgwapi.config','addressbook');
                }
 
                function index()
@@ -45,10 +45,10 @@
                        ));
                        
$GLOBALS['phpgw']->template->set_block('field_list_t','field_list','list');
 
-                       $field  = $GLOBALS['HTTP_POST_VARS']['field'];
-                       $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'];
-                       $sort   = $GLOBALS['HTTP_POST_VARS']['sort']  ? 
$GLOBALS['HTTP_POST_VARS']['sort']  : $GLOBALS['HTTP_GET_VARS']['sort'];
+                       $field  = $_REQUEST['field'];
+                       $start  = $_REQUEST['start'];
+                       $query  = $_REQUEST['query'];
+                       $sort   = $_REQUEST['sort'];
 
                        $common_hidden_vars =
                                '<input type="hidden" name="sort"   value="' . 
$sort   . '">' . "\n"
@@ -136,13 +136,13 @@
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
 
-                       $field      = 
stripslashes($GLOBALS['HTTP_POST_VARS']['field']);
-                       $field_name = 
stripslashes($GLOBALS['HTTP_POST_VARS']['field_name']);
-                       $apply_for  = 
stripslashes($GLOBALS['HTTP_POST_VARS']['apply_for']);
-                       $start      = $GLOBALS['HTTP_POST_VARS']['start'];
-                       $query      = $GLOBALS['HTTP_POST_VARS']['query'];
-                       $sort       = $GLOBALS['HTTP_POST_VARS']['sort'];
-                       $submit     = $GLOBALS['HTTP_POST_VARS']['submit'];
+                       $field      = stripslashes($_POST['field']);
+                       $field_name = stripslashes($_POST['field_name']);
+                       $apply_for  = stripslashes($_POST['apply_for']);
+                       $start      = $_POST['start'];
+                       $query      = $_POST['query'];
+                       $sort       = $_POST['sort'];
+                       $submit     = $_POST['submit'];
 
                        $GLOBALS['phpgw']->template->set_file(array('form' => 
'field_form.tpl'));
                        
$GLOBALS['phpgw']->template->set_block('form','add','addhandle');
@@ -222,14 +222,14 @@
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
 
-                       $field      = 
stripslashes($GLOBALS['HTTP_POST_VARS']['field'] ? 
$GLOBALS['HTTP_POST_VARS']['field'] : $GLOBALS['HTTP_GET_VARS']['field']);
+                       $field      = stripslashes($_POST['field'] ? 
$_POST['field'] : $_GET['field']);
                        $field_name = stripslashes(get_var('field_name'));
                        $apply_for  = stripslashes(get_var('apply_for'));
 
-                       $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'];
-                       $sort       = $GLOBALS['HTTP_POST_VARS']['sort']  ? 
$GLOBALS['HTTP_POST_VARS']['sort']  : $GLOBALS['HTTP_GET_VARS']['sort'];
-                       $submit     = $GLOBALS['HTTP_POST_VARS']['submit'];
+                       $start      = $_POST['start'] ? $_POST['start'] : 
$_GET['start'];
+                       $query      = $_POST['query'] ? $_POST['query'] : 
$_GET['query'];
+                       $sort       = $_POST['sort']  ? $_POST['sort']  : 
$_GET['sort'];
+                       $submit     = $_POST['submit'];
 
                        if (!$field)
                        {
@@ -343,16 +343,16 @@
                        $field_name = stripslashes(get_var('field_name'));
                        $apply_for  = stripslashes(get_var('apply_for'));
 
-                       $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'];
-                       $sort     = $GLOBALS['HTTP_POST_VARS']['sort']  ? 
$GLOBALS['HTTP_POST_VARS']['sort']  : $GLOBALS['HTTP_GET_VARS']['sort'];
+                       $start    = $_POST['start'] ? $_POST['start'] : 
$_GET['start'];
+                       $query    = $_POST['query'] ? $_POST['query'] : 
$_GET['query'];
+                       $sort     = $_POST['sort']  ? $_POST['sort']  : 
$_GET['sort'];
 
                        if(!$field)
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uifields.index'));
                        }
 
-                       if($GLOBALS['HTTP_POST_VARS']['confirm'])
+                       if($_POST['confirm'])
                        {
                                $this->save_custom_field($field, '', 
$apply_for);
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',"menuaction=addressbook.uifields.index&start=$start&query=$query&sort=$sort"));
@@ -580,7 +580,7 @@
                        
                        if($edit_contacts)
                        {
-                               $contacts = CreateObject('phpgwapi.contacts');
+                               $contacts = createObject('phpgwapi.contacts');
                                
$contacts->edit_other_by_owner($GLOBALS['phpgw_info']['server']['addressmaster'],
                                                       $new, $old_field, 
'other_name');
                        }