[Phpgroupware-cvs] CVS: infolog csv_import.php,1.13,1.14

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/infolog
In directory subversions:/tmp/cvs-serv32217/infolog

Modified Files:
        csv_import.php 
Log Message:
update

Index: csv_import.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/csv_import.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** csv_import.php      29 Jun 2003 23:03:38 -0000      1.13
--- csv_import.php      6 Jul 2003 08:15:47 -0000       1.14
***************
*** 42,53 ****
        // 
$GLOBALS['phpgw']->template->set_var("navbar_text",$GLOBALS['phpgw_info']["theme"]["navbar_text"]);
  
-       // pull some vars from _POST
-       //
-       $action   = $_POST['action'];
        $csvfile  = isset($_POST['csvfile']) ? $_POST['csvfile'] : 
$_FILES['csvfile']['tmp_name'];
  
!       if ($action == 'download' && (!$_POST['fieldsep'] || !$csvfile || 
!($fp=fopen($csvfile,"r")))) 
        {
!               $action = '';
        }
        
$GLOBALS['phpgw']->template->set_var("action_url",$GLOBALS['phpgw']->link("/infolog/csv_import.php"));
--- 42,50 ----
        // 
$GLOBALS['phpgw']->template->set_var("navbar_text",$GLOBALS['phpgw_info']["theme"]["navbar_text"]);
  
        $csvfile  = isset($_POST['csvfile']) ? $_POST['csvfile'] : 
$_FILES['csvfile']['tmp_name'];
  
!       if ($_POST['action'] == 'download' && (!$_POST['fieldsep'] || !$csvfile 
|| !($fp=fopen($csvfile,"r")))) 
        {
!               $_POST['action'] = '';
        }
        
$GLOBALS['phpgw']->template->set_var("action_url",$GLOBALS['phpgw']->link("/infolog/csv_import.php"));
***************
*** 137,141 ****
  }
  
!       switch ($action) 
        {
        case '':        // Start, ask Filename
--- 134,138 ----
  }
  
!       switch ($_POST['action']) 
        {
        case '':        // Start, ask Filename
***************
*** 276,280 ****
  
        case 'import':
!               set_time_limit(0);
                $fp=fopen($_POST['csvfile'],'r');
                $csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
--- 273,277 ----
  
        case 'import':
!               @set_time_limit(0);
                $fp=fopen($_POST['csvfile'],'r');
                $csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);