From f4a17080415d051ec29d3b6cd3c132c3a12a58c5 Mon Sep 17 00:00:00 2001 From: atif-shaikh Date: Wed, 2 Jul 2014 16:39:54 +0530 Subject: [PATCH] CRM-14199 QA fixes ---------------------------------------- * CRM-14199: Incorrect Math in Import routines https://issues.civicrm.org/jira/browse/CRM-14199 --- CRM/Activity/Import/Form/DataSource.php | 3 --- CRM/Contact/Import/Form/DataSource.php | 7 +++++-- CRM/Contribute/Import/Form/DataSource.php | 3 --- CRM/Custom/Import/Form/DataSource.php | 3 --- CRM/Event/Import/Form/DataSource.php | 3 --- CRM/Import/DataSource/CSV.php | 4 +--- CRM/Member/Import/Form/DataSource.php | 3 --- 7 files changed, 6 insertions(+), 20 deletions(-) diff --git a/CRM/Activity/Import/Form/DataSource.php b/CRM/Activity/Import/Form/DataSource.php index 9c048cc215..83bd6a9bac 100644 --- a/CRM/Activity/Import/Form/DataSource.php +++ b/CRM/Activity/Import/Form/DataSource.php @@ -62,9 +62,6 @@ class CRM_Activity_Import_Form_DataSource extends CRM_Core_Form { $config = CRM_Core_Config::singleton(); $uploadFileSize = CRM_Core_Config_Defaults::formatUnitSize($config->maxFileSize.'m'); - if ($uploadFileSize >= 8388608) { - $uploadFileSize = 8388608; - } $uploadSize = round(($uploadFileSize / (1024 * 1024)), 2); $this->assign('uploadSize', $uploadSize); diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php index a2a414d199..ba0cc1d1f2 100644 --- a/CRM/Contact/Import/Form/DataSource.php +++ b/CRM/Contact/Import/Form/DataSource.php @@ -72,8 +72,11 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Core_Form { $handler = opendir($config->uploadDir); $errorFiles = array('sqlImport.errors', 'sqlImport.conflicts', 'sqlImport.duplicates', 'sqlImport.mismatch'); - // check for post max size - CRM_Core_Config_Defaults::formatUnitSize(ini_get('post_max_size'), TRUE); + // check for post max size avoid when called twice + $snippet = CRM_Utils_Array::value('snippet', $_GET, 0); + if (empty($snippet)) { + CRM_Core_Config_Defaults::formatUnitSize(ini_get('post_max_size'), TRUE); + } while ($file = readdir($handler)) { if ($file != '.' && $file != '..' && diff --git a/CRM/Contribute/Import/Form/DataSource.php b/CRM/Contribute/Import/Form/DataSource.php index 1c23dd9ed4..0603011d22 100644 --- a/CRM/Contribute/Import/Form/DataSource.php +++ b/CRM/Contribute/Import/Form/DataSource.php @@ -62,9 +62,6 @@ class CRM_Contribute_Import_Form_DataSource extends CRM_Core_Form { $config = CRM_Core_Config::singleton(); $uploadFileSize = CRM_Core_Config_Defaults::formatUnitSize($config->maxFileSize.'m'); - if ($uploadFileSize >= 8388608) { - $uploadFileSize = 8388608; - } $uploadSize = round(($uploadFileSize / (1024 * 1024)), 2); $this->assign('uploadSize', $uploadSize); diff --git a/CRM/Custom/Import/Form/DataSource.php b/CRM/Custom/Import/Form/DataSource.php index a0770da02c..80f2d1b98a 100644 --- a/CRM/Custom/Import/Form/DataSource.php +++ b/CRM/Custom/Import/Form/DataSource.php @@ -92,9 +92,6 @@ class CRM_Custom_Import_Form_DataSource extends CRM_Core_Form { $config = CRM_Core_Config::singleton(); $uploadFileSize = CRM_Core_Config_Defaults::formatUnitSize($config->maxFileSize.'m'); - if ($uploadFileSize >= 8388608) { - $uploadFileSize = 8388608; - } $uploadSize = round(($uploadFileSize / (1024 * 1024)), 2); $this->assign('uploadSize', $uploadSize); diff --git a/CRM/Event/Import/Form/DataSource.php b/CRM/Event/Import/Form/DataSource.php index e93bb83ee6..56482e8de4 100644 --- a/CRM/Event/Import/Form/DataSource.php +++ b/CRM/Event/Import/Form/DataSource.php @@ -62,9 +62,6 @@ class CRM_Event_Import_Form_DataSource extends CRM_Core_Form { $config = CRM_Core_Config::singleton(); $uploadFileSize = CRM_Core_Config_Defaults::formatUnitSize($config->maxFileSize.'m'); - if ($uploadFileSize >= 8388608) { - $uploadFileSize = 8388608; - } $uploadSize = round(($uploadFileSize / (1024 * 1024)), 2); $this->assign('uploadSize', $uploadSize); diff --git a/CRM/Import/DataSource/CSV.php b/CRM/Import/DataSource/CSV.php index c9cee1e0f3..60e90b77d9 100644 --- a/CRM/Import/DataSource/CSV.php +++ b/CRM/Import/DataSource/CSV.php @@ -70,9 +70,7 @@ class CRM_Import_DataSource_CSV extends CRM_Import_DataSource { $config = CRM_Core_Config::singleton(); - // FIXME: why do we limit the file size to 8 MiB if it's larger in config? - $sizeInBytes = CRM_Core_Config_Defaults::formatUnitSize($config->maxFileSize.'m'); - $uploadFileSize = $sizeInBytes >= 8388608 ? 8388608 : $sizeInBytes; + $uploadFileSize = CRM_Core_Config_Defaults::formatUnitSize($config->maxFileSize.'m'); $uploadSize = round(($uploadFileSize / (1024 * 1024)), 2); $form->assign('uploadSize', $uploadSize); $form->add('File', 'uploadFile', ts('Import Data File'), 'size=30 maxlength=255', TRUE); diff --git a/CRM/Member/Import/Form/DataSource.php b/CRM/Member/Import/Form/DataSource.php index 57aa30ef29..85a80d05eb 100644 --- a/CRM/Member/Import/Form/DataSource.php +++ b/CRM/Member/Import/Form/DataSource.php @@ -62,9 +62,6 @@ class CRM_Member_Import_Form_DataSource extends CRM_Core_Form { $config = CRM_Core_Config::singleton(); $uploadFileSize = CRM_Core_Config_Defaults::formatUnitSize($config->maxFileSize.'m'); - if ($uploadFileSize >= 8388608) { - $uploadFileSize = 8388608; - } $uploadSize = round(($uploadFileSize / (1024 * 1024)), 2); $this->assign('uploadSize', $uploadSize); -- 2.25.1