From e2407022e39e2a07a399fc001cfa2be281ce1ee0 Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 10 Feb 2022 09:30:41 +0000 Subject: [PATCH 1/4] * Adjust code --- module/sonarqube/control.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php index 1971bc889b..2a4f90e9b4 100644 --- a/module/sonarqube/control.php +++ b/module/sonarqube/control.php @@ -346,6 +346,8 @@ class sonarqube extends control public function browseIssue($sonarqubeID, $projectKey = '', $orderBy = 'severity_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1) { unset($_GET['onlybody']); + ini_set('memory_limit', '256M'); + $this->app->loadClass('pager', $static = true); $keyword = fixer::input('post')->setDefault('keyword', '')->get('keyword'); From ee681782d96edb86642fa8f9c1615d43f2460d19 Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 11 Feb 2022 01:16:22 +0000 Subject: [PATCH 2/4] * Fix bug#19411 --- module/sonarqube/control.php | 24 +++++++++++----------- module/sonarqube/view/browseissue.html.php | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php index 2a4f90e9b4..aa6f0a3afa 100644 --- a/module/sonarqube/control.php +++ b/module/sonarqube/control.php @@ -346,15 +346,25 @@ class sonarqube extends control public function browseIssue($sonarqubeID, $projectKey = '', $orderBy = 'severity_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1) { unset($_GET['onlybody']); - ini_set('memory_limit', '256M'); - $this->app->loadClass('pager', $static = true); $keyword = fixer::input('post')->setDefault('keyword', '')->get('keyword'); $cacheFile = $this->sonarqube->getCacheFile($sonarqubeID, $projectKey); if(!$cacheFile or !file_exists($cacheFile) or (time() - filemtime($cacheFile)) / 60 > $this->config->sonarqube->cacheTime) { + ini_set('memory_limit', '256M'); + $sonarqubeIssueList = $this->sonarqube->apiGetIssues($sonarqubeID, $projectKey); + foreach($sonarqubeIssueList as $key => $sonarqubeIssue) + { + if(!isset($sonarqubeIssue->line)) $sonarqubeIssue->line = ''; + if(!isset($sonarqubeIssue->effort)) $sonarqubeIssue->effort = ''; + $sonarqubeIssue->message = htmlspecialchars($sonarqubeIssue->message); + $sonarqubeIssue->creationDate = date('Y-m-d H:i:s', strtotime($sonarqubeIssue->creationDate)); + + list($project, $file) = explode(':', $sonarqubeIssue->component); + $sonarqubeIssue->file = $file; + } if($cacheFile) { @@ -371,16 +381,6 @@ class sonarqube extends control $sonarqubeIssueList = unserialize(file_get_contents($cacheFile)); } - foreach($sonarqubeIssueList as $key => $sonarqubeIssue) - { - if(!isset($sonarqubeIssue->line)) $sonarqubeIssue->line = ''; - if(!isset($sonarqubeIssue->effort)) $sonarqubeIssue->effort = ''; - $sonarqubeIssue->message = htmlspecialchars($sonarqubeIssue->message); - - list($project, $file) = explode(':', $sonarqubeIssue->component); - $sonarqubeIssue->file = $file; - } - /* Data search. */ if($keyword) { diff --git a/module/sonarqube/view/browseissue.html.php b/module/sonarqube/view/browseissue.html.php index 4fb63ca3b4..df87a11a92 100644 --- a/module/sonarqube/view/browseissue.html.php +++ b/module/sonarqube/view/browseissue.html.php @@ -47,6 +47,7 @@ sonarqube->issue->file);?> sonarqube->issue->line);?> sonarqube->issue->effort);?> + sonarqube->issue->creationDate);?> actions;?> @@ -60,6 +61,7 @@ file;?> line;?> effort;?> + creationDate;?> ", '', "title='{$lang->sonarqube->createBug}' class='btn btn-primary'"); From cbd10a7370f337b9c2f11725f7272699e901ae8a Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 11 Feb 2022 03:05:03 +0000 Subject: [PATCH 3/4] * Fix bug#19415 --- module/sonarqube/css/browseissue.css | 2 ++ module/sonarqube/view/browseissue.html.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/sonarqube/css/browseissue.css b/module/sonarqube/css/browseissue.css index f32e286da6..8465817171 100644 --- a/module/sonarqube/css/browseissue.css +++ b/module/sonarqube/css/browseissue.css @@ -2,4 +2,6 @@ #mainMenu .pull-left {margin-right: 15px;} .c-message {width: 350px;} .c-file {width: 300px;} +.c-effort {width: 155px;} +.c-date {width: 130px;} #keyword {width: 240px;} diff --git a/module/sonarqube/view/browseissue.html.php b/module/sonarqube/view/browseissue.html.php index df87a11a92..4d0b838dd5 100644 --- a/module/sonarqube/view/browseissue.html.php +++ b/module/sonarqube/view/browseissue.html.php @@ -46,8 +46,8 @@ sonarqube->issue->status);?> sonarqube->issue->file);?> sonarqube->issue->line);?> - sonarqube->issue->effort);?> - sonarqube->issue->creationDate);?> + sonarqube->issue->effort);?> + sonarqube->issue->creationDate);?> actions;?> From 1c6ab456e93c81898d8ce1cccc815bcb731e326a Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 11 Feb 2022 03:09:58 +0000 Subject: [PATCH 4/4] * Adjust code --- module/sonarqube/lang/zh-cn.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/sonarqube/lang/zh-cn.php b/module/sonarqube/lang/zh-cn.php index 791445b5a4..febe818c45 100644 --- a/module/sonarqube/lang/zh-cn.php +++ b/module/sonarqube/lang/zh-cn.php @@ -35,7 +35,7 @@ $lang->sonarqube->placeholder->name = ''; $lang->sonarqube->placeholder->url = "请填写SonarQube Server首页的访问地址，如：https://sonarqube.zentao.net。"; $lang->sonarqube->placeholder->account = "请填写具有Administrator权限的SonarQube用户信息"; $lang->sonarqube->placeholder->projectName = '最多255个字符'; -$lang->sonarqube->placeholder->projectKey = "最多400个字符。 允许的字符为字母数字，'-'，'_'，'. '和':'，至少有一个非数字"; +$lang->sonarqube->placeholder->projectKey = "最多400个字符。 允许的字符为字母、数字，'-'，'_'，'. '和':'，至少有一个非数字"; $lang->sonarqube->placeholder->searchIssue = "请输入问题名称或文件"; $lang->sonarqube->nameRepeatError = "服务器名称已存在！"; @@ -69,7 +69,7 @@ $lang->sonarqube->qualitygateList['ERROR'] = 'Failed'; $lang->sonarqube->apiErrorMap[1] = "/Malformed key for Project: '([\s\S]+)'. Allowed characters are alphanumeric, '-', '_', '\.' and ':', with at least one non-digit\./"; $lang->sonarqube->apiErrorMap[2] = "/Could not create Project, key already exists: ([\s\S]+)/"; -$lang->sonarqube->errorLang[1] = "项目标识的格式不正确。允许的字符为字母数字、'-'、''、'.'和“：”，至少有一个非数字。"; +$lang->sonarqube->errorLang[1] = "项目标识的格式不正确。允许的字符为字母、数字、'-'、''、'.'和“：”，至少有一个非数字。"; $lang->sonarqube->errorLang[2] = "无法创建项目，项目标识已存在：%s"; $lang->sonarqube->issue = new stdclass();