Merge branch 'sprint/184_hufangzhou_19558' into 'master'

* Fix bug #19558.

See merge request easycorp/zentaopms!1815

module/convert/control.php

@@ -300,6 +300,21 @@ class convert extends control
             }
             else
             {
+                $jiraFilePath = $this->app->getTmpRoot() . 'jirafile/';
+                if(!is_readable($jiraFilePath) or !is_writable($jiraFilePath))
+                {
+                    $response['result']  = 'fail';
+                    $response['message'] = sprintf($this->lang->convert->jira->notReadAndWrite, $jiraFilePath);
+                    return print($this->send($response));
+                }
+
+                if(!file_exists($jiraFilePath . 'entities.xml'))
+                {
+                    $response['result']  = 'fail';
+                    $response['message'] = sprintf($this->lang->convert->jira->notExistEntities, $jiraFilePath . 'entities.xml');
+                    return print($this->send($response));
+                }
+
                 $this->convert->splitFile();
                 $link = $this->createLink('convert', 'mapJira2Zentao', "method=file");
             }

module/convert/lang/en.php

@@ -144,6 +144,8 @@ $lang->convert->jira->start            = 'Start';
 $lang->convert->jira->dbNameEmpty        = 'Jira database name cannot be empty!';
 $lang->convert->jira->invalidDB          = 'Invalid database name!';
 $lang->convert->jira->invalidTable       = 'This database is not a Jira database!';
+$lang->convert->jira->notReadAndWrite    = 'Please modify the %s directory permissions!';
+$lang->convert->jira->notExistEntities   = 'The %s file does not exist!';
 $lang->convert->jira->passwordNotice     = "<span class='text-red'>Set the default password of Jira users after they are imported into ZenTao. Users can modify the password in ZenTao later.</span>";
 $lang->convert->jira->groupNotice        = "<span class='text-red'>Set the default permission grouping of Jira users after importing into ZenTao.</span>";
 $lang->convert->jira->passwordDifferent  = 'Password do not match!';

module/convert/lang/zh-cn.php

@@ -144,6 +144,8 @@ $lang->convert->jira->start            = '开始导入';
 $lang->convert->jira->dbNameEmpty        = 'Jira数据库名字不能为空！';
 $lang->convert->jira->invalidDB          = '无效的数据库名！';
 $lang->convert->jira->invalidTable       = '本数据库非Jira数据库！';
+$lang->convert->jira->notReadAndWrite    = '权限不足！请修改%s目录读写权限！';
+$lang->convert->jira->notExistEntities   = '%s 文件不存在！';
 $lang->convert->jira->passwordNotice     = "<span class='text-red'>设置Jira用户导入到禅道后的默认密码，用户后续可以在禅道中自行修改密码。</span>";
 $lang->convert->jira->groupNotice        = "<span class='text-red'>设置Jira用户导入到禅道后的默认权限分组。</span>";
 $lang->convert->jira->passwordDifferent  = '两次密码不一致！';