[Vtigercrm-commits] [vtiger-commits] r4381 - /vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: jeffk
Date: Tue Mar 21 11:21:03 2006
New Revision: 4381

Log:
refs #62 and #17. merging changeset r4358 to vtigercrm/branches/4.2_postgresql_integration

Modified:
    vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php

Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php Tue Mar 21 11:21:03 2006
@@ -89,7 +89,7 @@
 {
 	$has_header = 1;
 }
-if($_REQUEST['modulename'] != '')
+if(isset( $_REQUEST['modulename']) && $_REQUEST['modulename'] != '')
 	$_REQUEST['module'] = $_REQUEST['modulename'];
 
 if (! isset( $_REQUEST['module'] ) || $_REQUEST['module'] == 'Contacts')
@@ -239,23 +239,21 @@
 {
 	$datarows = $xrows;
 }
-if($_REQUEST['skipped_record_count'] != '')
+if(isset($_SESSION['skipped_record_count']) && $_REQUEST['skipped_record_count'] != '')
 	$skipped_record_count = $_REQUEST['skipped_record_count'];
 else
 	$_REQUEST['skipped_record_count'] = 0;
 
-if($_REQUEST['noofrows'] != '')
+if(isset($_REQUEST['noofrows']) && $_REQUEST['noofrows'] != '')
 	$totalnoofrows = $_REQUEST['noofrows'];
 else
 	$totalnoofrows = count($datarows);
 
-$loopcount = ($totalnoofrows/$RECORDCOUNT)+1;
-
-if($_REQUEST['startval'] != '')
+if(isset($_REQUEST['startval']) && $_REQUEST['startval'] != '')
 	$START = $_REQUEST['startval'];
 else
 	$START = $_SESSION['startval'];
-if($_REQUEST['recordcount'] != '')
+if(isset($_REQUEST['recordcount']) && $_REQUEST['recordcount'] != '')
 	$RECORDCOUNT = $_REQUEST['recordcount'];
 else
 	$RECORDCOUNT = $_SESSION['recordcount'];