From 8051256ee9776271dc6bc61bac64065f45e77c15 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 14 Jul 2022 15:31:26 +0800
Subject: [PATCH] * Fix bug #25152.

---
 lib/scm/gitea.class.php     | 6 +++---
 module/gitea/lang/de.php    | 5 +++--
 module/gitea/lang/en.php    | 5 +++--
 module/gitea/lang/fr.php    | 5 +++--
 module/gitea/lang/vi.php    | 5 +++--
 module/gitea/lang/zh-cn.php | 5 +++--
 module/gitea/model.php      | 1 +
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/scm/gitea.class.php b/lib/scm/gitea.class.php
index aa8b7c6a4a..ebb0706cac 100644
--- a/lib/scm/gitea.class.php
+++ b/lib/scm/gitea.class.php
@@ -503,8 +503,8 @@ class gitea
 
         if(!empty($version) and $count == 1)
         {
-            $api .= '/' . $version;
-            $commit = $this->fetch($api, array('limit' => 1));
+            $commits = $this->fetch($api, array('limit' => 1, 'sha' => $version));
+            $commit  = $commits[0];
             if(isset($commit->sha))
             {
                 $log = new stdclass;
@@ -789,6 +789,6 @@ class gitea
     {
         $params['token'] = $this->token;
 
-        return "{$this->root}archive/{$branch}.{$ext}" . '?' . http_build_query($params);
+        return "{$this->root}archive/" . urlencode($branch) . ".{$ext}" . '?' . http_build_query($params);
     }
 }
diff --git a/module/gitea/lang/de.php b/module/gitea/lang/de.php
index b4716e7bed..064ceb7d3e 100644
--- a/module/gitea/lang/de.php
+++ b/module/gitea/lang/de.php
@@ -24,8 +24,9 @@ $lang->gitea->name  = "Server Name";
 $lang->gitea->url   = 'Server URL';
 $lang->gitea->token = 'Token';
 
-$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
-$lang->gitea->hostError  = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
+$lang->gitea->tokenLimit    = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
+$lang->gitea->hostError     = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
+$lang->gitea->bindUserError = "Can not bind users repeatedly %s";
 
 $lang->gitea->server        = "Server List";
 $lang->gitea->lblCreate     = 'Create Gitea Server';
diff --git a/module/gitea/lang/en.php b/module/gitea/lang/en.php
index b4716e7bed..064ceb7d3e 100644
--- a/module/gitea/lang/en.php
+++ b/module/gitea/lang/en.php
@@ -24,8 +24,9 @@ $lang->gitea->name  = "Server Name";
 $lang->gitea->url   = 'Server URL';
 $lang->gitea->token = 'Token';
 
-$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
-$lang->gitea->hostError  = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
+$lang->gitea->tokenLimit    = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
+$lang->gitea->hostError     = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
+$lang->gitea->bindUserError = "Can not bind users repeatedly %s";
 
 $lang->gitea->server        = "Server List";
 $lang->gitea->lblCreate     = 'Create Gitea Server';
diff --git a/module/gitea/lang/fr.php b/module/gitea/lang/fr.php
index b4716e7bed..064ceb7d3e 100644
--- a/module/gitea/lang/fr.php
+++ b/module/gitea/lang/fr.php
@@ -24,8 +24,9 @@ $lang->gitea->name  = "Server Name";
 $lang->gitea->url   = 'Server URL';
 $lang->gitea->token = 'Token';
 
-$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
-$lang->gitea->hostError  = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
+$lang->gitea->tokenLimit    = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
+$lang->gitea->hostError     = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
+$lang->gitea->bindUserError = "Can not bind users repeatedly %s";
 
 $lang->gitea->server        = "Server List";
 $lang->gitea->lblCreate     = 'Create Gitea Server';
diff --git a/module/gitea/lang/vi.php b/module/gitea/lang/vi.php
index b4716e7bed..064ceb7d3e 100644
--- a/module/gitea/lang/vi.php
+++ b/module/gitea/lang/vi.php
@@ -24,8 +24,9 @@ $lang->gitea->name  = "Server Name";
 $lang->gitea->url   = 'Server URL';
 $lang->gitea->token = 'Token';
 
-$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
-$lang->gitea->hostError  = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
+$lang->gitea->tokenLimit    = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
+$lang->gitea->hostError     = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
+$lang->gitea->bindUserError = "Can not bind users repeatedly %s";
 
 $lang->gitea->server        = "Server List";
 $lang->gitea->lblCreate     = 'Create Gitea Server';
diff --git a/module/gitea/lang/zh-cn.php b/module/gitea/lang/zh-cn.php
index 7e273df350..35d94b0dd5 100644
--- a/module/gitea/lang/zh-cn.php
+++ b/module/gitea/lang/zh-cn.php
@@ -24,8 +24,9 @@ $lang->gitea->name  = "服务器名称";
 $lang->gitea->url   = '服务器地址';
 $lang->gitea->token = 'Token';
 
-$lang->gitea->tokenLimit = "Gitea Token权限不足。";
-$lang->gitea->hostError  = "当前Gitea服务器地址无效，请确认当前服务器可被访问";
+$lang->gitea->tokenLimit    = "Gitea Token权限不足。";
+$lang->gitea->hostError     = "当前Gitea服务器地址无效，请确认当前服务器可被访问";
+$lang->gitea->bindUserError = "不能重复绑定用户 %s";
 
 $lang->gitea->server        = "服务器列表";
 $lang->gitea->lblCreate     = '添加Gitea服务器';
diff --git a/module/gitea/model.php b/module/gitea/model.php
index 8849c51eb2..86cba73100 100644
--- a/module/gitea/model.php
+++ b/module/gitea/model.php
@@ -113,6 +113,7 @@ class giteaModel extends model
      */
     public function bindUser($giteaID)
     {
+        $userPairs   = $this->loadModel('user')->getPairs('noclosed|noletter');
         $users       = $this->post->zentaoUsers;
         $giteaNames  = $this->post->giteaUserNames;
         $accountList = array();