v1.0.7

AlekVolsk · AlekVolsk · commit f834e8898eb2 · 2021-02-17T18:02:43.000+04:00
diff --git a/assets/cfi.js b/assets/cfi.js
@@ -129,7 +129,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
         formData.append('cfifile', file);
         formData.append('cfistate', 'import');
-        formData.append('cficonvert', cfiCbConvert.checked);
+        formData.append('cficonvert', Number(cfiCbConvert.checked));
         formData.append(Joomla.getOptions('csrf.token'), '1');
         xhr.send(formData);
     }
diff --git a/cfi.php b/cfi.php
@@ -257,7 +257,8 @@ private function _importData()
         $content = trim(file_get_contents($this->_file));
 
         // convert to UTF-8
-        if ((bool) $this->_app->input->get('cficonvert', false)) {
+        $isConvert = (int) $this->_app->input->get('cficonvert', 0);
+        if ($isConvert > 0) {
             $content = mb_convert_encoding($content, 'UTF-8', $this->_cp);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ document.addEventListener('DOMContentLoaded', function () {`
`129`	`129`
`130`	`130`	`formData.append('cfifile', file);`
`131`	`131`	`formData.append('cfistate', 'import');`
`132`		`- formData.append('cficonvert', cfiCbConvert.checked);`
	`132`	`+ formData.append('cficonvert', Number(cfiCbConvert.checked));`
`133`	`133`	`formData.append(Joomla.getOptions('csrf.token'), '1');`
`134`	`134`	`xhr.send(formData);`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,8 @@ private function _importData()`
`257`	`257`	`$content = trim(file_get_contents($this->_file));`
`258`	`258`
`259`	`259`	`// convert to UTF-8`
`260`		`- if ((bool) $this->_app->input->get('cficonvert', false)) {`
	`260`	`+ $isConvert = (int) $this->_app->input->get('cficonvert', 0);`
	`261`	`+ if ($isConvert > 0) {`
`261`	`262`	`$content = mb_convert_encoding($content, 'UTF-8', $this->_cp);`
`262`	`263`	`}`
`263`	`264`