X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FActivity%2FImport%2FParser.php;h=b3b5871aff1455688526f8c966dd74e7ed123672;hb=5ec753e358cd1692934daa7f5bd99384097fdf8c;hp=664e4a0deb780d4f632d69d77852b35ad544ddfd;hpb=758eba6812e4d76ebb41f40659af438aebcb25cf;p=civicrm-core.git

diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php
index 664e4a0deb..b3b5871aff 100644
--- a/CRM/Activity/Import/Parser.php
+++ b/CRM/Activity/Import/Parser.php
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
 
@@ -36,23 +20,26 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
 
   /**
    * Imported file size.
+   * @var int
    */
   protected $_fileSize;
 
   /**
    * Separator being used.
+   * @var string
    */
   protected $_seperator;
 
   /**
    * Total number of lines in file.
+   * @var int
    */
   protected $_lineCount;
 
   /**
    * Whether the file has a column header or not.
    *
-   * @var boolean
+   * @var bool
    */
   protected $_haveColumnHeader;
 
@@ -63,6 +50,8 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
    * @param bool $skipColumnHeader
    * @param int $mode
    * @param int $onDuplicate
+   * @param int $statusID
+   * @param int $totalRowCount
    *
    * @return mixed
    * @throws Exception
@@ -240,30 +229,24 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
       }
       if ($this->_invalidRowCount) {
         // removed view url for invlaid contacts
-        $headers = array_merge([
-            ts('Line Number'),
-            ts('Reason'),
-          ],
+        $headers = array_merge(
+          [ts('Line Number'), ts('Reason')],
           $customHeaders
         );
         $this->_errorFileName = self::errorFileName(self::ERROR);
         self::exportCSV($this->_errorFileName, $headers, $this->_errors);
       }
       if ($this->_conflictCount) {
-        $headers = array_merge([
-            ts('Line Number'),
-            ts('Reason'),
-          ],
+        $headers = array_merge(
+          [ts('Line Number'), ts('Reason')],
           $customHeaders
         );
         $this->_conflictFileName = self::errorFileName(self::CONFLICT);
         self::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
       }
       if ($this->_duplicateCount) {
-        $headers = array_merge([
-            ts('Line Number'),
-            ts('View Activity History URL'),
-          ],
+        $headers = array_merge(
+          [ts('Line Number'), ts('View Activity History URL')],
           $customHeaders
         );