X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FActivity%2FImport%2FParser.php;h=3bc0feb1be7925bdae963128c4f6281bbb9a2376;hb=79c0e11ec92e46b36336f7903a537c5fcc78efef;hp=f607767d334ce1f6da8f056a3c19fc478934795d;hpb=1761553f7e28866ef0c0a9f54abbb222487cea5c;p=civicrm-core.git diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php index f607767d33..3bc0feb1be 100644 --- a/CRM/Activity/Import/Parser.php +++ b/CRM/Activity/Import/Parser.php @@ -39,7 +39,6 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { protected $_fileName; /**#@+ - * @access protected * @var integer */ @@ -76,7 +75,8 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { * @return mixed * @throws Exception */ - function run($fileName, + function run( + $fileName, $seperator = ',', &$mapper, $skipColumnHeader = FALSE, @@ -230,7 +230,6 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { fclose($fd); - if ($mode == self::MODE_PREVIEW || $mode == self::MODE_IMPORT) { $customHeaders = $mapper; @@ -281,9 +280,8 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { * @param array mapped array of values * * @return void - * @access public */ - function setActiveFields($fieldKeys) { + public function setActiveFields($fieldKeys) { $this->_activeFieldCount = count($fieldKeys); foreach ($fieldKeys as $key) { if (empty($this->_fields[$key])) { @@ -299,9 +297,8 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { * Format the field values for input to the api * * @return array (reference ) associative array of name/value pairs - * @access public */ - function &getActiveFieldParams() { + public function &getActiveFieldParams() { $params = array(); for ($i = 0; $i < $this->_activeFieldCount; $i++) { if (isset($this->_activeFields[$i]->_value) @@ -322,7 +319,7 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { * @param string $headerPattern * @param string $dataPattern */ - function addField($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//') { + public function addField($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//') { if (empty($name)) { $this->_fields['doNotImport'] = new CRM_Activity_Import_Field($name, $title, $type, $headerPattern, $dataPattern); } @@ -346,9 +343,8 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { * @param int $mode * * @return void - * @access public */ - function set($store, $mode = self::MODE_SUMMARY) { + public function set($store, $mode = self::MODE_SUMMARY) { $store->set('fileSize', $this->_fileSize); $store->set('lineCount', $this->_lineCount); $store->set('seperator', $this->_seperator); @@ -391,9 +387,8 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { * @param array $data * * @return void - * @access public */ - static function exportCSV($fileName, $header, $data) { + public static function exportCSV($fileName, $header, $data) { $output = array(); $fd = fopen($fileName, 'w'); @@ -414,4 +409,3 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { } } -