diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php index d9aa464b..9ca865e0 100644 --- a/app/Controllers/AuthController.php +++ b/app/Controllers/AuthController.php @@ -41,7 +41,7 @@ class AuthController extends BaseController } } - if (Config::get('enable_telegram') === true) { + if (Config::get('new_telegram_enable') === true) { $login_text = TelegramSessionManager::add_login_session(); $login = explode('|', $login_text); $login_token = $login[0]; @@ -55,7 +55,7 @@ class AuthController extends BaseController ->assign('geetest_html', $GtSdk) ->assign('login_token', $login_token) ->assign('login_number', $login_number) - ->assign('telegram_bot', Config::get('telegram_bot')) + ->assign('telegram_bot', Config::get('new_telegram_username')) ->assign('base_url', Config::get('baseUrl')) ->assign('recaptcha_sitekey', $recaptcha_sitekey) ->display('auth/login.tpl'); @@ -530,7 +530,7 @@ class AuthController extends BaseController return $response->getBody()->write(json_encode($res)); } - if (Config::get('enable_telegram') === true) { + if (Config::get('new_telegram_enable') === true) { $ret = TelegramSessionManager::check_login_session($token, $number); $res['ret'] = $ret; return $response->getBody()->write(json_encode($res)); @@ -542,7 +542,7 @@ class AuthController extends BaseController public function telegram_oauth($request, $response, $args) { - if (Config::get('enable_telegram') === true) { + if (Config::get('new_telegram_enable') === true) { $auth_data = $request->getQueryParams(); if ($this->telegram_oauth_check($auth_data) === true) { // Looks good, proceed. $telegram_id = $auth_data['id']; @@ -565,7 +565,7 @@ class AuthController extends BaseController private function telegram_oauth_check($auth_data) { $check_hash = $auth_data['hash']; - $bot_token = Config::get('telegram_token'); + $bot_token = Config::get('new_telegram_token'); unset($auth_data['hash']); $data_check_arr = []; foreach ($auth_data as $key => $value) { diff --git a/app/Controllers/HomeController.php b/app/Controllers/HomeController.php index b839e17f..60223eab 100644 --- a/app/Controllers/HomeController.php +++ b/app/Controllers/HomeController.php @@ -40,7 +40,7 @@ class HomeController extends BaseController } } - if (Config::get('enable_telegram') == true) { + if (Config::get('new_telegram_enable') == true) { $login_text = TelegramSessionManager::add_login_session(); $login = explode('|', $login_text); $login_token = $login[0]; @@ -57,7 +57,7 @@ class HomeController extends BaseController ->assign('geetest_html', $GtSdk) ->assign('login_token', $login_token) ->assign('login_number', $login_number) - ->assign('telegram_bot', Config::get('telegram_bot')) + ->assign('telegram_bot', Config::get('new_telegram_username')) ->assign('enable_logincaptcha', Config::get('enable_login_captcha')) ->assign('enable_regcaptcha', Config::get('enable_reg_captcha')) ->assign('base_url', Config::get('baseUrl')) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 32d3c20c..5b6d9a7d 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -825,7 +825,7 @@ class UserController extends BaseController ->assign('isBlock', $isBlock) ->assign('Block', $Block) ->assign('bind_token', $bind_token) - ->assign('telegram_bot', Config::get('telegram_bot')) + ->assign('telegram_bot', Config::get('new_telegram_username')) ->assign('config_service', $config_service) ->registerClass('URL', URL::class) ->display('user/edit.tpl'); @@ -1912,11 +1912,11 @@ class UserController extends BaseController return $this->view()->assign('logs', $logs)->assign('iplocation', $iplocation)->display('user/subscribe_log.tpl'); } - /** + /** * 获取包含订阅信息的客户端压缩档 - * - * @param Request $request - * @param Response $response + * + * @param Request $request + * @param Response $response * @param array $args */ public function getPcClient($request, $response, $args) @@ -1970,11 +1970,11 @@ class UserController extends BaseController return $newResponse; } - /** + /** * 清理订阅缓存 - * - * @param Request $request - * @param Response $response + * + * @param Request $request + * @param Response $response * @param array $args */ public function cleanSubCache($request, $response, $args) diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php index 92d0f6dc..528bb061 100644 --- a/app/Controllers/VueController.php +++ b/app/Controllers/VueController.php @@ -39,7 +39,7 @@ class VueController extends BaseController } } - if (Config::get('enable_telegram') == true) { + if (Config::get('new_telegram_enable') == true) { $login_text = TelegramSessionManager::add_login_session(); $login = explode('|', $login_text); $login_token = $login[0]; @@ -53,7 +53,7 @@ class VueController extends BaseController 'geetest_html' => $GtSdk, 'login_token' => $login_token, 'login_number' => $login_number, - 'telegram_bot' => Config::get('telegram_bot'), + 'telegram_bot' => Config::get('new_telegram_username'), 'enable_logincaptcha' => Config::get('enable_login_captcha'), 'enable_regcaptcha' => Config::get('enable_reg_captcha'), 'enable_checkin_captcha' => Config::get('enable_checkin_captcha'), @@ -66,7 +66,7 @@ class VueController extends BaseController 'appName' => Config::get('appName'), 'dateY' => date('Y'), 'isLogin' => $user->isLogin, - 'enable_telegram' => Config::get('enable_telegram'), + 'enable_telegram' => Config::get('new_telegram_enable'), 'enable_mylivechat' => Config::get('enable_mylivechat'), 'enable_flag' => Config::get('enable_flag'), 'payment_type' => Config::get('payment_system'), diff --git a/app/Services/Config.php b/app/Services/Config.php index ddd167f6..b85b73b5 100644 --- a/app/Services/Config.php +++ b/app/Services/Config.php @@ -41,7 +41,7 @@ class Config 'enable_analytics_code' => self::get('enable_analytics_code'), 'sspanelAnalysis' => self::get('sspanelAnalysis'), 'enable_donate' => self::get('enable_donate'), - 'enable_telegram' => self::get('enable_telegram'), + 'enable_telegram' => self::get('new_telegram_enable'), 'payment_system' => self::get('payment_system'), 'enable_mylivechat' => self::get('enable_mylivechat'), 'mylivechat_id' => self::get('mylivechat_id'), diff --git a/resources/views/material/user/edit.tpl b/resources/views/material/user/edit.tpl index 735c8ff8..3fc69324 100755 --- a/resources/views/material/user/edit.tpl +++ b/resources/views/material/user/edit.tpl @@ -429,6 +429,7 @@ {if $user->telegram_id == 0}
私聊发给 Telegram 机器人 @{$telegram_bot} 以绑定 Telegram
+手机如已安装 Telegram 可点击:一键绑定
{/if} {/if}