From f0ba4e79877bf30b5f9fedbb9a35469c6ec49b8c Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 15 Feb 2022 17:12:01 +0800 Subject: [PATCH 1/3] * Fix bug #19558. --- module/convert/control.php | 15 +++++++++++++++ module/convert/lang/en.php | 2 ++ module/convert/lang/zh-cn.php | 2 ++ 3 files changed, 19 insertions(+) diff --git a/module/convert/control.php b/module/convert/control.php index 2dde7442aa..bbacc8ca58 100644 --- a/module/convert/control.php +++ b/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'] = $this->lang->convert->jira->notReadAndWrite; + return print($this->send($response)); + } + + if(!file_exists($jiraFilePath . 'entities.xml')) + { + $response['result'] = 'fail'; + $response['message'] = $this->lang->convert->jira->notExistEntities; + return print($this->send($response)); + } + $this->convert->splitFile(); $link = $this->createLink('convert', 'mapJira2Zentao', "method=file"); } diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index c6df7c07da..b8c9b09255 100644 --- a/module/convert/lang/en.php +++ b/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 jirafile directory permissions!'; +$lang->convert->jira->notExistEntities = 'The entities.xml file does not exist!'; $lang->convert->jira->passwordNotice = "Set the default password of Jira users after they are imported into ZenTao. Users can modify the password in ZenTao later."; $lang->convert->jira->groupNotice = "Set the default permission grouping of Jira users after importing into ZenTao."; $lang->convert->jira->passwordDifferent = 'Password do not match!'; diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php index f9f12f8a9f..cbbae1498e 100644 --- a/module/convert/lang/zh-cn.php +++ b/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 = '请修改jirafile目录权限！'; +$lang->convert->jira->notExistEntities = 'entities.xml 该文件不存在！'; $lang->convert->jira->passwordNotice = "设置Jira用户导入到禅道后的默认密码，用户后续可以在禅道中自行修改密码。"; $lang->convert->jira->groupNotice = "设置Jira用户导入到禅道后的默认权限分组。"; $lang->convert->jira->passwordDifferent = '两次密码不一致！'; From a67e9ce403cb8f26cbac204091514d266197007d Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 15 Feb 2022 17:21:27 +0800 Subject: [PATCH 2/3] * Adjust the file path to full path. --- module/convert/control.php | 2 +- module/convert/lang/en.php | 2 +- module/convert/lang/zh-cn.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/convert/control.php b/module/convert/control.php index bbacc8ca58..22cf6720db 100644 --- a/module/convert/control.php +++ b/module/convert/control.php @@ -311,7 +311,7 @@ class convert extends control if(!file_exists($jiraFilePath . 'entities.xml')) { $response['result'] = 'fail'; - $response['message'] = $this->lang->convert->jira->notExistEntities; + $response['message'] = sprintf($this->lang->convert->jira->notExistEntities, $jiraFilePath . 'entities.xml'); return print($this->send($response)); } diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index b8c9b09255..f3cc9b5845 100644 --- a/module/convert/lang/en.php +++ b/module/convert/lang/en.php @@ -145,7 +145,7 @@ $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 jirafile directory permissions!'; -$lang->convert->jira->notExistEntities = 'The entities.xml file does not exist!'; +$lang->convert->jira->notExistEntities = 'The %s file does not exist!'; $lang->convert->jira->passwordNotice = "Set the default password of Jira users after they are imported into ZenTao. Users can modify the password in ZenTao later."; $lang->convert->jira->groupNotice = "Set the default permission grouping of Jira users after importing into ZenTao."; $lang->convert->jira->passwordDifferent = 'Password do not match!'; diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php index cbbae1498e..77c746f9bb 100644 --- a/module/convert/lang/zh-cn.php +++ b/module/convert/lang/zh-cn.php @@ -145,7 +145,7 @@ $lang->convert->jira->dbNameEmpty = 'Jira数据库名字不能为空！'; $lang->convert->jira->invalidDB = '无效的数据库名！'; $lang->convert->jira->invalidTable = '本数据库非Jira数据库！'; $lang->convert->jira->notReadAndWrite = '请修改jirafile目录权限！'; -$lang->convert->jira->notExistEntities = 'entities.xml 该文件不存在！'; +$lang->convert->jira->notExistEntities = '%s 文件不存在！'; $lang->convert->jira->passwordNotice = "设置Jira用户导入到禅道后的默认密码，用户后续可以在禅道中自行修改密码。"; $lang->convert->jira->groupNotice = "设置Jira用户导入到禅道后的默认权限分组。"; $lang->convert->jira->passwordDifferent = '两次密码不一致！'; From 92b25b7d4ebb1011ee505d5218eb5116164811b6 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 15 Feb 2022 17:26:04 +0800 Subject: [PATCH 3/3] * Adjust the directory path to full path. --- module/convert/control.php | 2 +- module/convert/lang/en.php | 2 +- module/convert/lang/zh-cn.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/convert/control.php b/module/convert/control.php index 22cf6720db..4912fb538d 100644 --- a/module/convert/control.php +++ b/module/convert/control.php @@ -304,7 +304,7 @@ class convert extends control if(!is_readable($jiraFilePath) or !is_writable($jiraFilePath)) { $response['result'] = 'fail'; - $response['message'] = $this->lang->convert->jira->notReadAndWrite; + $response['message'] = sprintf($this->lang->convert->jira->notReadAndWrite, $jiraFilePath); return print($this->send($response)); } diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index f3cc9b5845..be6c7758d9 100644 --- a/module/convert/lang/en.php +++ b/module/convert/lang/en.php @@ -144,7 +144,7 @@ $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 jirafile directory permissions!'; +$lang->convert->jira->notReadAndWrite = 'Please modify the %s directory permissions!'; $lang->convert->jira->notExistEntities = 'The %s file does not exist!'; $lang->convert->jira->passwordNotice = "Set the default password of Jira users after they are imported into ZenTao. Users can modify the password in ZenTao later."; $lang->convert->jira->groupNotice = "Set the default permission grouping of Jira users after importing into ZenTao."; diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php index 77c746f9bb..4893ba7692 100644 --- a/module/convert/lang/zh-cn.php +++ b/module/convert/lang/zh-cn.php @@ -144,7 +144,7 @@ $lang->convert->jira->start = '开始导入'; $lang->convert->jira->dbNameEmpty = 'Jira数据库名字不能为空！'; $lang->convert->jira->invalidDB = '无效的数据库名！'; $lang->convert->jira->invalidTable = '本数据库非Jira数据库！'; -$lang->convert->jira->notReadAndWrite = '请修改jirafile目录权限！'; +$lang->convert->jira->notReadAndWrite = '权限不足！请修改%s目录读写权限！'; $lang->convert->jira->notExistEntities = '%s 文件不存在！'; $lang->convert->jira->passwordNotice = "设置Jira用户导入到禅道后的默认密码，用户后续可以在禅道中自行修改密码。"; $lang->convert->jira->groupNotice = "设置Jira用户导入到禅道后的默认权限分组。";