CRM-14199 QA fixes

----------------------------------------
* CRM-14199: Incorrect Math in Import routines
  https://issues.civicrm.org/jira/browse/CRM-14199

diff --git a/CRM/Activity/Import/Form/DataSource.php b/CRM/Activity/Import/Form/DataSource.php
index 9c048cc215649c22e82df9d628201cf82a885e6f..83bd6a9bac966e8e629242ab4dbc41865548e4eb 100644 (file)
--- 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 a2a414d1999be1d0b9260d42d3c09a88e4075d9f..ba0cc1d1f2f45bc6cb25c004c0b8cb4921ff746e 100644 (file)
--- 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 1c23dd9ed4b8849d9566e922c271d47563982128..0603011d220264e12bcfdd28d7504520be7185b4 100644 (file)
--- 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 a0770da02c0a2d2d724ffb0755334fbd78e29b76..80f2d1b98a411edae3155c5080ce63d60bad29dc 100644 (file)
--- 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 e93bb83ee67a0216e4bfbb565afbe15e49db9133..56482e8de41b8a68d1bcc1db127c7db9dfa4f4b6 100644 (file)
--- 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 c9cee1e0f31314a18dd106f1bba134a1323cf71a..60e90b77d945c67d8e81b89681d302d8f4d65342 100644 (file)
--- 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 57aa30ef291c12dc8a6aff8cf2d1583f18788e49..85a80d05eb6640ae2633255f3894856e68a6042c 100644 (file)
--- 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);