From 715387180d6262f7fe6764dfb737dac788dfe1b0 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 7 Sep 2023 13:15:58 +0800 Subject: [PATCH] * Fix bug #38623. --- module/gitea/control.php | 4 ++-- module/gitlab/control.php | 4 +++- module/gogs/control.php | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/module/gitea/control.php b/module/gitea/control.php index a3594ed85e..2af20f9237 100644 --- a/module/gitea/control.php +++ b/module/gitea/control.php @@ -206,8 +206,8 @@ class gitea extends control if($_POST) { $this->gitea->bindUser($giteaID); - if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->server->http_referer)); + if(dao::isError()) return $this->sendError(dao::getError()); + return $this->sendSuccess(array('message' => $this->lang->saveSuccess, 'load' => helper::createLink('space', 'browse'))); } $userList = array(); diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 941a684eb3..de9139a8d8 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -196,7 +196,9 @@ class gitlab extends control $this->loadModel('action')->create('gitlabuser', $openID, 'bind', '', sprintf($this->lang->gitlab->bindDynamic, $gitlabNames[$openID], $zentaoUsers[$account]->realname)); } } - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true)); + + if(dao::isError()) return $this->sendError(dao::getError()); + return $this->sendSuccess(array('message' => $this->lang->saveSuccess, 'load' => helper::createLink('space', 'browse'))); } $userList = array(); diff --git a/module/gogs/control.php b/module/gogs/control.php index 3eb2ae56ec..0779c7fd1b 100644 --- a/module/gogs/control.php +++ b/module/gogs/control.php @@ -204,8 +204,8 @@ class gogs extends control if($_POST) { $this->gogs->bindUser($gogsID); - if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->server->http_referer)); + if(dao::isError()) return $this->sendError(dao::getError()); + return $this->sendSuccess(array('message' => $this->lang->saveSuccess, 'load' => helper::createLink('space', 'browse'))); } $userList = array();