Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Merge 18.9 caselib module.

Browse Source
This commit is contained in:
hufangzhou
2023-11-30 15:56:51 +08:00
parent d61330787d
commit 478128ee02
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/caselib/control.php
+3 -3
View File
@@ -378,16 +378,16 @@ class caselib extends control
list($header, $columns) = $this->caselibZen->getImportHeaderAndColumns($fileName, $fields);
if(count($columns) != count($header) || $this->post->encode != 'utf-8')
if(count($columns) <= 3 || $this->post->encode != 'utf-8')
{
$fc = file_get_contents($fileName);
$encode = $this->post->encode != 'utf-8' ? $this->post->encode : 'gbk';
$fc = file_get_contents($fileName);
$fc = helper::convertEncoding($fc, $encode, 'utf-8');
file_put_contents($fileName, $fc);
list($header, $columns) = $this->caselibZen->getImportHeaderAndColumns($fileName, $fields);
if(count($columns) != count($header)) return $this->send(array('result' => 'fail', 'message' => $this->lang->testcase->errorEncode));
if(count($columns) == 0) return $this->send(array('result' => 'fail', 'message' => $this->lang->testcase->errorEncode));
}
$this->session->set('fileImport', $fileName);