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

* Finish task #48607.

Browse Source
This commit is contained in:
caoyanyi
2022-02-08 01:32:33 +00:00
parent 395d380c05
commit aaf21f178d
7 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/sonarqube/control.php
+1 -1
View File
@@ -165,7 +165,7 @@ class sonarqube extends control
$token = base64_encode("{$sonarqube->account}:{$sonarqube->password}");
$result = $this->sonarqube->apiValidate($sonarqube->url, $token);
if(!isset($result->valid) or !$result->valid) return $this->send(array('result' => 'fail', 'message' => array('token' => array($this->lang->sonarqube->validError))));
if(!empty($result)) return $this->send(array('result' => 'fail', 'message' => $result));
$this->post->set('token', $token);
}
module/sonarqube/lang/en.php
+4 -2
View File
@@ -29,8 +29,9 @@ $lang->sonarqube->editServer = 'Edit SonarQube Server';
$lang->sonarqube->createSuccess = 'Create success';
$lang->sonarqube->placeholder = new stdclass;
$lang->sonarqube->placeholder->name = '';
$lang->sonarqube->placeholder->url = "Please fill in the access address of the SonarQube Server homepage, as: https://sonarqube.zentao.net.";
$lang->sonarqube->placeholder->name = '';
$lang->sonarqube->placeholder->url = "Please fill in the access address of the SonarQube Server homepage, as: https://sonarqube.zentao.net.";
$lang->sonarqube->placeholder->account = "Please fill in the SonarQube user information with Administrator privileges";
$lang->sonarqube->nameRepeatError = "Server name already exists!";
$lang->sonarqube->urlRepeatError = 'Server address already exists!';
@@ -39,6 +40,7 @@ $lang->sonarqube->hostError = "Invalid SonarQube service address.";
$lang->sonarqube->confirmDelete = 'Do you want to delete this SonarQube server?';
$lang->sonarqube->confirmDeleteProject = 'Do you want to delete this SonarQube project?';
$lang->sonarqube->noReport = "No Reprot";
$lang->sonarqube->notAdminer = "Please fill in the SonarQube user information with Administrator privileges";
$lang->sonarqube->projectKey = 'Project Key';
$lang->sonarqube->projectName = 'Project Name';
module/sonarqube/lang/zh-cn.php
+4 -2
View File
@@ -29,8 +29,9 @@ $lang->sonarqube->editServer = '修改SonarQube服务器';
$lang->sonarqube->createSuccess = "创建成功";
$lang->sonarqube->placeholder = new stdclass;
$lang->sonarqube->placeholder->name = '';
$lang->sonarqube->placeholder->url = "请填写SonarQube Server首页的访问地址，如：https://sonarqube.zentao.net。";
$lang->sonarqube->placeholder->name = '';
$lang->sonarqube->placeholder->url = "请填写SonarQube Server首页的访问地址，如：https://sonarqube.zentao.net。";
$lang->sonarqube->placeholder->account = "请填写具有Administrator权限的SonarQube用户信息";
$lang->sonarqube->nameRepeatError = "服务器名称已存在！";
$lang->sonarqube->urlRepeatError = "服务器地址已存在！";
@@ -39,6 +40,7 @@ $lang->sonarqube->hostError = "无效的SonarQube服务地址。";
$lang->sonarqube->confirmDelete = '确认删除该SonarQube吗？';
$lang->sonarqube->confirmDeleteProject = '确认删除该SonarQube项目吗？';
$lang->sonarqube->noReport = "暂无报告";
$lang->sonarqube->notAdminer = "请填写具有Administrator权限的SonarQube用户信息";
$lang->sonarqube->projectKey = '项目标识';
$lang->sonarqube->projectName = '项目名称';
module/sonarqube/model.php
+9 -1
View File
@@ -42,7 +42,15 @@ class sonarqubeModel extends model
{
$url = rtrim($host, '/') . "/api/authentication/validate";
$header = 'Authorization: Basic ' . $token;
return json_decode(commonModel::http($url, null, array(), $header));
$result = json_decode(commonModel::http($url, null, array(), $header));
if(!isset($result->valid) or !$result->valid) return array('password' => array($this->lang->sonarqube->validError));
$url = rtrim($host, '/') . "/api/user_groups/search";
$header = 'Authorization: Basic ' . $token;
$adminer = json_decode(commonModel::http($url, null, array(), $header));
if(empty($adminer) or isset($adminer->errors)) return array('account' => array($this->lang->sonarqube->notAdminer));
return array();
}
/**
module/sonarqube/view/browse.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<tr class='text'>
<td class='text-center'><?php echo $id;?></td>
<td class='text-c-name' title='<?php echo $sonarqube->name;?>'><?php echo $sonarqube->name;?></td>
<td class='text' title='<?php echo $sonarqube->url;?>'><?php echo $sonarqube->url;?></td>
<td class='text'><?php echo html::a($sonarqube->url, $sonarqube->url, '_blank');?></td>
<td class='c-actions text-left'>
<?php
common::printLink('sonarqube', 'browseProject', "sonarqubeID=$id", "<i class='icon icon-list-box'></i> ", '',"title='{$lang->sonarqube->browseProject}' class='btn btn-primary'");
module/sonarqube/view/create.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
</tr>
<tr>
<th><?php echo $lang->sonarqube->account;?></th>
<td><?php echo html::input('account', '', "class='form-control'");?></td>
<td><?php echo html::input('account', '', "class='form-control' placeholder='{$lang->sonarqube->placeholder->account}'");?></td>
</tr>
<tr>
<th><?php echo $lang->sonarqube->password;?></th>
module/sonarqube/view/edit.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
</tr>
<tr>
<th><?php echo $lang->sonarqube->account;?></th>
<td><?php echo html::input('account', isset($sonarqube->account) ? $sonarqube->account : '', "class='form-control'");?></td>
<td><?php echo html::input('account', isset($sonarqube->account) ? $sonarqube->account : '', "class='form-control' placeholder='{$lang->sonarqube->placeholder->account}'");?></td>
</tr>
<tr>
<th><?php echo $lang->sonarqube->password;?></th>