Telegram Bot

dev
GeekQu 7 years ago
parent 36f167c0dd
commit b889f2b366
No known key found for this signature in database
GPG Key ID: F0EEABFCD04A5891

@ -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_text = TelegramSessionManager::add_login_session();
$login = explode('|', $login_text); $login = explode('|', $login_text);
$login_token = $login[0]; $login_token = $login[0];
@ -55,7 +55,7 @@ class AuthController extends BaseController
->assign('geetest_html', $GtSdk) ->assign('geetest_html', $GtSdk)
->assign('login_token', $login_token) ->assign('login_token', $login_token)
->assign('login_number', $login_number) ->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('base_url', Config::get('baseUrl'))
->assign('recaptcha_sitekey', $recaptcha_sitekey) ->assign('recaptcha_sitekey', $recaptcha_sitekey)
->display('auth/login.tpl'); ->display('auth/login.tpl');
@ -530,7 +530,7 @@ class AuthController extends BaseController
return $response->getBody()->write(json_encode($res)); 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); $ret = TelegramSessionManager::check_login_session($token, $number);
$res['ret'] = $ret; $res['ret'] = $ret;
return $response->getBody()->write(json_encode($res)); return $response->getBody()->write(json_encode($res));
@ -542,7 +542,7 @@ class AuthController extends BaseController
public function telegram_oauth($request, $response, $args) public function telegram_oauth($request, $response, $args)
{ {
if (Config::get('enable_telegram') === true) { if (Config::get('new_telegram_enable') === true) {
$auth_data = $request->getQueryParams(); $auth_data = $request->getQueryParams();
if ($this->telegram_oauth_check($auth_data) === true) { // Looks good, proceed. if ($this->telegram_oauth_check($auth_data) === true) { // Looks good, proceed.
$telegram_id = $auth_data['id']; $telegram_id = $auth_data['id'];
@ -565,7 +565,7 @@ class AuthController extends BaseController
private function telegram_oauth_check($auth_data) private function telegram_oauth_check($auth_data)
{ {
$check_hash = $auth_data['hash']; $check_hash = $auth_data['hash'];
$bot_token = Config::get('telegram_token'); $bot_token = Config::get('new_telegram_token');
unset($auth_data['hash']); unset($auth_data['hash']);
$data_check_arr = []; $data_check_arr = [];
foreach ($auth_data as $key => $value) { foreach ($auth_data as $key => $value) {

@ -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_text = TelegramSessionManager::add_login_session();
$login = explode('|', $login_text); $login = explode('|', $login_text);
$login_token = $login[0]; $login_token = $login[0];
@ -57,7 +57,7 @@ class HomeController extends BaseController
->assign('geetest_html', $GtSdk) ->assign('geetest_html', $GtSdk)
->assign('login_token', $login_token) ->assign('login_token', $login_token)
->assign('login_number', $login_number) ->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_logincaptcha', Config::get('enable_login_captcha'))
->assign('enable_regcaptcha', Config::get('enable_reg_captcha')) ->assign('enable_regcaptcha', Config::get('enable_reg_captcha'))
->assign('base_url', Config::get('baseUrl')) ->assign('base_url', Config::get('baseUrl'))

@ -825,7 +825,7 @@ class UserController extends BaseController
->assign('isBlock', $isBlock) ->assign('isBlock', $isBlock)
->assign('Block', $Block) ->assign('Block', $Block)
->assign('bind_token', $bind_token) ->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) ->assign('config_service', $config_service)
->registerClass('URL', URL::class) ->registerClass('URL', URL::class)
->display('user/edit.tpl'); ->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'); return $this->view()->assign('logs', $logs)->assign('iplocation', $iplocation)->display('user/subscribe_log.tpl');
} }
/** /**
* 获取包含订阅信息的客户端压缩档 * 获取包含订阅信息的客户端压缩档
* *
* @param Request $request * @param Request $request
* @param Response $response * @param Response $response
* @param array $args * @param array $args
*/ */
public function getPcClient($request, $response, $args) public function getPcClient($request, $response, $args)
@ -1970,11 +1970,11 @@ class UserController extends BaseController
return $newResponse; return $newResponse;
} }
/** /**
* 清理订阅缓存 * 清理订阅缓存
* *
* @param Request $request * @param Request $request
* @param Response $response * @param Response $response
* @param array $args * @param array $args
*/ */
public function cleanSubCache($request, $response, $args) public function cleanSubCache($request, $response, $args)

@ -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_text = TelegramSessionManager::add_login_session();
$login = explode('|', $login_text); $login = explode('|', $login_text);
$login_token = $login[0]; $login_token = $login[0];
@ -53,7 +53,7 @@ class VueController extends BaseController
'geetest_html' => $GtSdk, 'geetest_html' => $GtSdk,
'login_token' => $login_token, 'login_token' => $login_token,
'login_number' => $login_number, '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_logincaptcha' => Config::get('enable_login_captcha'),
'enable_regcaptcha' => Config::get('enable_reg_captcha'), 'enable_regcaptcha' => Config::get('enable_reg_captcha'),
'enable_checkin_captcha' => Config::get('enable_checkin_captcha'), 'enable_checkin_captcha' => Config::get('enable_checkin_captcha'),
@ -66,7 +66,7 @@ class VueController extends BaseController
'appName' => Config::get('appName'), 'appName' => Config::get('appName'),
'dateY' => date('Y'), 'dateY' => date('Y'),
'isLogin' => $user->isLogin, 'isLogin' => $user->isLogin,
'enable_telegram' => Config::get('enable_telegram'), 'enable_telegram' => Config::get('new_telegram_enable'),
'enable_mylivechat' => Config::get('enable_mylivechat'), 'enable_mylivechat' => Config::get('enable_mylivechat'),
'enable_flag' => Config::get('enable_flag'), 'enable_flag' => Config::get('enable_flag'),
'payment_type' => Config::get('payment_system'), 'payment_type' => Config::get('payment_system'),

@ -41,7 +41,7 @@ class Config
'enable_analytics_code' => self::get('enable_analytics_code'), 'enable_analytics_code' => self::get('enable_analytics_code'),
'sspanelAnalysis' => self::get('sspanelAnalysis'), 'sspanelAnalysis' => self::get('sspanelAnalysis'),
'enable_donate' => self::get('enable_donate'), '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'), 'payment_system' => self::get('payment_system'),
'enable_mylivechat' => self::get('enable_mylivechat'), 'enable_mylivechat' => self::get('enable_mylivechat'),
'mylivechat_id' => self::get('mylivechat_id'), 'mylivechat_id' => self::get('mylivechat_id'),

@ -429,6 +429,7 @@
{if $user->telegram_id == 0} {if $user->telegram_id == 0}
<p>私聊发给 Telegram 机器人 <a href="https://t.me/{$telegram_bot}">@{$telegram_bot}</a> 以绑定 <p>私聊发给 Telegram 机器人 <a href="https://t.me/{$telegram_bot}">@{$telegram_bot}</a> 以绑定
Telegram</p> Telegram</p>
<p>手机如已安装 Telegram 可点击:<a class="btn btn-subscription" type="button" href="https://t.me/{$telegram_bot}?start={$bind_token}">一键绑定</a></p>
{/if} {/if}
{/if} {/if}
<div class="form-group form-group-label"> <div class="form-group form-group-label">

Loading…
Cancel
Save