From 05c7c40bec1db4e4a2dfbd47dc28673ce599663d Mon Sep 17 00:00:00 2001 From: Tony Zou Date: Mon, 10 Sep 2018 22:17:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/AuthController.php | 8 +++++++- app/Services/Config.php | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php index fc47decc..6a986958 100644 --- a/app/Controllers/AuthController.php +++ b/app/Controllers/AuthController.php @@ -262,7 +262,7 @@ class AuthController extends BaseController } } - public function registerHandle($request, $response, $next) + public function registerHandle($request, $response) { $name = $request->getParam('name'); $email = $request->getParam('email'); @@ -279,6 +279,7 @@ class AuthController extends BaseController $wechat = trim($wechat); // check code + if (Config::get('enable_geetest_reg') == 'true') { $ret = Geetest::verify($request->getParam('geetest_challenge'), $request->getParam('geetest_validate'), $request->getParam('geetest_seccode')); if (!$ret) { @@ -288,6 +289,7 @@ class AuthController extends BaseController } } + //dumplin:1、enable_invite_code为true则注册必须要填邀请码;2、邀请人等级为0则邀请码不可用;3、邀请人invite_num为可邀请次数,填负数则为无限 $c = InviteCode::where('code', $code)->first(); if ($c == null) { @@ -313,6 +315,8 @@ class AuthController extends BaseController } } + + // check email format if (!Check::isEmailLegal($email)) { $res['ret'] = 0; @@ -407,6 +411,7 @@ class AuthController extends BaseController } } + $user->class_expire = date("Y-m-d H:i:s", time() + Config::get('user_class_expire_default') * 3600); $user->class = Config::get('user_class_default'); $user->node_connector = Config::get('user_conn'); @@ -436,6 +441,7 @@ class AuthController extends BaseController Radius::Add($user, $user->passwd); return $response->getBody()->write(json_encode($res)); } + $res['ret'] = 0; $res['msg'] = "未知错误"; return $response->getBody()->write(json_encode($res)); diff --git a/app/Services/Config.php b/app/Services/Config.php index c30b6a47..a803baa9 100644 --- a/app/Services/Config.php +++ b/app/Services/Config.php @@ -7,10 +7,10 @@ class Config public static function get($key) { global $System_Config; - if ($System_Config[$key]){ + if (isset($System_Config[$key])){ return $System_Config[$key]; } else { - return; + return null; } }