From e69be078a35765f5ef6bcf8d39aa3274dfd80f78 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 12 Jan 2022 01:46:35 +0000
Subject: [PATCH] * Adjust code

---
 module/sonarqube/config.php           | 5 +++++
 module/sonarqube/control.php          | 6 +-----
 module/sonarqube/view/create.html.php | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 module/sonarqube/config.php

diff --git a/module/sonarqube/config.php b/module/sonarqube/config.php
new file mode 100644
index 0000000000..32f0451daf
--- /dev/null
+++ b/module/sonarqube/config.php
@@ -0,0 +1,5 @@
+<?php
+$config->sonarqube = new stdclass();
+
+$config->sonarqube->create = new stdclass();
+$config->sonarqube->create->requiredFields = 'name,url,account,password';
diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php
index 84897e9fb5..f6dd4434cc 100644
--- a/module/sonarqube/control.php
+++ b/module/sonarqube/control.php
@@ -82,11 +82,7 @@ class sonarqube extends control
     protected function checkToken()
     {
         $sonarqube = fixer::input('post')->get();
-        $this->dao->update('sonarqube')->data($sonarqube)
-            ->check('name', 'notempty')
-            ->check('url', 'notempty')
-            ->check('account', 'notempty')
-            ->check('password', 'notempty');
+        $this->dao->update('sonarqube')->data($sonarqube)->batchCheck($this->config->sonarqube->create->requiredFields, 'notempty');
         if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
         if(strpos($sonarqube->url, 'http') !== 0) return $this->send(array('result' => 'fail', 'message' => array('url' => array($this->lang->sonarqube->hostError))));
 
diff --git a/module/sonarqube/view/create.html.php b/module/sonarqube/view/create.html.php
index 21b72b46e9..15253bb19e 100644
--- a/module/sonarqube/view/create.html.php
+++ b/module/sonarqube/view/create.html.php
@@ -21,20 +21,20 @@
         <table class='table table-form'>
           <tr>
             <th class='c-name'><?php echo $lang->sonarqube->name;?></th>
-            <td class='required'><?php echo html::input('name', '', "class='form-control' placeholder='{$lang->sonarqube->placeholder->name}'");?></td>
+            <td><?php echo html::input('name', '', "class='form-control' placeholder='{$lang->sonarqube->placeholder->name}'");?></td>
             <td class="tips-git"></td>
           </tr>
           <tr>
             <th><?php echo $lang->sonarqube->url;?></th>
-            <td class='required'><?php echo html::input('url', '', "class='form-control' placeholder='{$lang->sonarqube->placeholder->url}'");?></td>
+            <td><?php echo html::input('url', '', "class='form-control' placeholder='{$lang->sonarqube->placeholder->url}'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->sonarqube->account;?></th>
-            <td class='required'><?php echo html::input('account', '', "class='form-control'");?></td>
+            <td><?php echo html::input('account', '', "class='form-control'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->sonarqube->password;?></th>
-            <td class='required'><?php echo html::password('password', '', "class='form-control'");?></td>
+            <td><?php echo html::password('password', '', "class='form-control'");?></td>
           </tr>
           <tr>
             <th></th>