Skip to content
Snippets Groups Projects
Commit a6c5d36e authored by Prasad's avatar Prasad
Browse files

Merge branch 'master' of http://code.vtiger.com/vtiger/vtigercrm

parents d5e890d0 84c4f4a7
No related branches found
No related tags found
No related merge requests found
......@@ -15,7 +15,7 @@
private static $cache = array();
private static $cacheLookupType = '';
private static $mandatoryEventClass = array('VTEntityDelta', 'ModTrackerHandler');
private static $mandatoryEventClass = array('VTEntityDelta', 'ModTrackerHandler', 'PBXManagerBatchHandler');
const CACHE_LOOKUP_TYPE_ALL = 'ALL';
......
......@@ -40,7 +40,7 @@
</div>
{else}
<span class="noDataMsg">
{vtranslate('LBL_NO')} {vtranslate($MODULE_NAME, $MODULE_NAME)} {vtranslate('LBL_MATCHED_THIS_CRITERIA')}
{vtranslate('LBL_EQ_ZERO')} {vtranslate($MODULE_NAME, $MODULE_NAME)} {vtranslate('LBL_MATCHED_THIS_CRITERIA')}
</span>
{/if}
</div>
\ No newline at end of file
</div>
No preview for this file type
......@@ -16,7 +16,19 @@ class Import_Utils_Helper {
static $AUTO_MERGE_OVERWRITE = 2;
static $AUTO_MERGE_MERGEFIELDS = 3;
static $supportedFileEncoding = array('UTF-8'=>'UTF-8', 'ISO-8859-1'=>'ISO-8859-1');
static $supportedFileEncoding = array(
'UTF-8'=>'UTF-8',
'ISO-8859-1'=>'ISO-8859-1',
'Windows-1250'=>'Windows-1250',
'Windows-1251'=>'Windows-1251',
'Windows-1252'=>'Windows-1252',
'Windows-1253'=>'Windows-1253',
'Windows-1254'=>'Windows-1254',
'Windows-1255'=>'Windows-1255',
'Windows-1256'=>'Windows-1256',
'Windows-1257'=>'Windows-1257',
'Windows-1258'=>'Windows-1258',
);
static $supportedDelimiters = array(','=>'comma', ';'=>'semicolon');
static $supportedFileExtensions = array('csv','vcf');
......
......@@ -70,7 +70,10 @@ class Import_FileReader_Reader {
}
public function convertCharacterEncoding($value, $fromCharset, $toCharset) {
if (function_exists("mb_convert_encoding")) {
if (function_exists("mb_convert_encoding")
&& function_exists("mb_list_encodings")
&& in_array($fromCharset, mb_list_encodings())
&& in_array($toCharset, mb_list_encodings())) {
$value = mb_convert_encoding($value, $toCharset, $fromCharset);
} else {
$value = iconv($fromCharset, $toCharset, $value);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment