[Phpgroupware-cvs] addressbook/inc/class.uiXport.inc.php, 1.6.2.4.2.6

[nomail]

Update of /addressbook/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.uiXport.inc.php

date: 2004/04/14 15:57:15;  author: fipsfuchs;  state: Exp;  lines: +11 -13

Log Message:
contact import now works with php globals=off
=====================================================================
No syntax errors detected in -
=====================================================================
Index: addressbook/inc/class.uiXport.inc.php
diff -u addressbook/inc/class.uiXport.inc.php:1.6.2.4.2.5 
addressbook/inc/class.uiXport.inc.php:1.6.2.4.2.6
--- addressbook/inc/class.uiXport.inc.php:1.6.2.4.2.5   Tue Feb 24 21:35:15 2004
+++ addressbook/inc/class.uiXport.inc.php       Wed Apr 14 15:57:15 2004
@@ -73,15 +73,13 @@
 
                function import()
                {
-                       global 
$convert,$download,$tsvfile,$private,$conv_type,$fcat_id;
-
-                       if ($convert) //&& ($_FILES['tsvfile']['error'] == 
UPLOAD_ERR_OK))
+                       if ($_REQUEST['convert']) //&& 
($_FILES['tsvfile']['error'] == UPLOAD_ERR_OK))
                        {
-                               $buffer = 
$this->bo->import($tsvfile,$conv_type,$private,$fcat_id);
+                               $buffer = 
$this->bo->import($_FILES['tsvfile']['tmp_name'],$_REQUEST['conv_type'],$_REQUEST['private'],$_REQUEST['fcat_id']);
 
-                               if ($download == '')
+                               if ($_REQUEST['download'] == '')
                                {
-                                       if($conv_type == 'Debug LDAP' || 
$conv_type == 'Debug SQL' )
+                                       if($_REQUEST['conv_type'] == 'Debug 
LDAP' || $_REQUEST['conv_type'] == 'Debug SQL' )
                                        {
                                                // filename, default 
application/octet-stream, length of file, default nocache True
                                                
$GLOBALS['phpgw']->browser->content_header($tsvfilename,'',strlen($buffer));
@@ -160,7 +158,7 @@
 
                function export()
                {
-                       global 
$convert,$tsvfilename,$fcat_id,$download,$conv_type,$both_types,$sub_cats;
+                       global $tsvfilename,$both_types,$sub_cats;
                        
                        // get the data to create the sql query used by the 
addressbook display 
                        $export_vars = 
$GLOBALS['phpgw']->session->appsession('export_vars','addressbook');
@@ -168,9 +166,9 @@
                        
                        //$entries = $this->bo->$get_data_function($fields, 
$this->limit, $this->start, $this->order, $this->sort, '', $criteria);
                        
-                       if ($convert)
+                       if ($_REQUEST['convert'])
                        {
-                               if ($conv_type == 'none')
+                               if ($_REQUEST['conv_type'] == 'none')
                                {
                                        
$GLOBALS['phpgw_info']['flags']['noheader'] = False;
                                        
$GLOBALS['phpgw_info']['flags']['noheader'] = True;
@@ -182,10 +180,10 @@
                                        $GLOBALS['phpgw']->common->phpgw_exit();
                                }
 
-                               $buffer = 
$this->bo->export($conv_type,$fcat_id,$both_types,$sub_cats);
+                               $buffer = 
$this->bo->export($_REQUEST['conv_type'],$_REQUEST['fcat_id'],$both_types,$sub_cats);
                                
                                // Note our use of ===.  Simply == would not 
work as expected
-                               if(!(strpos($conv_type, 'OpenOffice') === 
false))
+                               if(!(strpos($_REQUEST['conv_type'], 
'OpenOffice') === false))
                                {
                                        // filename, default 
application/octet-stream, length of file, default nocache True
                                        
//$this->browser->content_header($tsvfilename,'application/x-octet-stream',strlen($buffer));
@@ -199,7 +197,7 @@
                                        //echo $tsvfilename;
                                        
                                }
-                               elseif(($download == 'on') || ($conv_type == 
'Palm_PDB') )
+                               elseif(($_REQUEST['download'] == 'on') || 
($_REQUEST['conv_type'] == 'Palm_PDB') )
                                {
                                        // filename, default 
application/octet-stream, length of file, default nocache True
                                        
$this->browser->content_header($tsvfilename,'application/x-octet-stream',strlen($buffer));