github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 22:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Тестовый переход на новый запрос конфета для капчи, удаление ее языка (Google смотрит на локаль ОС)

Browse source
This commit is contained in:
Exile 2016-02-14 03:20:55 +03:00
commit 5fc441b2b3
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
library/config.php
View file

@ -177,19 +177,16 @@ $config = [
'name' => 'Русский', 'name' => 'Русский',
'locale' => 'ru_RU.UTF-8', 'locale' => 'ru_RU.UTF-8',
'encoding' => 'UTF-8', 'encoding' => 'UTF-8',
'captcha' => 'ru',
], ],
'uk' => [ 'uk' => [
'name' => 'Український', 'name' => 'Український',
'locale' => 'uk_UA.UTF-8', 'locale' => 'uk_UA.UTF-8',
'encoding' => 'UTF-8', 'encoding' => 'UTF-8',
'captcha' => 'uk',
], ],
'en' => [ 'en' => [
'name' => 'English', 'name' => 'English',
'locale' => 'en_US.UTF-8', 'locale' => 'en_US.UTF-8',
'encoding' => 'UTF-8', 'encoding' => 'UTF-8',
'captcha' => 'en',
], ],
], ],

13
library/includes/functions.php
View file

@ -2600,12 +2600,13 @@ function hash_search ($hash)
function bb_captcha ($mode, $callback = '') function bb_captcha ($mode, $callback = '')
{ {
global $bb_cfg, $lang, $userdata; global $lang;
$secret = $bb_cfg['captcha']['secret_key']; $di = \TorrentPier\Di::getInstance();
$public = $bb_cfg['captcha']['public_key'];
$cp_theme = $bb_cfg['captcha']['theme']; $secret = $di->config->get('captcha.secret_key');
$cp_lang = $bb_cfg['lang'][$userdata['user_lang']]['captcha']; $public = $di->config->get('captcha.public_key');
$cp_theme = $di->config->get('captcha.theme');
if (!$public || !$secret) if (!$public || !$secret)
{ {
@ -2628,7 +2629,7 @@ function bb_captcha ($mode, $callback = '')
}; };
</script> </script>
<div id=\"tp-captcha\"></div> <div id=\"tp-captcha\"></div>
<script src=\"https://www.google.com/recaptcha/api.js?onload=onloadCallback&hl=" . $cp_lang . "&render=explicit\" async defer></script>"; <script src=\"https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit\" async defer></script>";
break; break;
case 'check': case 'check':

3
library/includes/viewtopic_torrent.php
View file

@ -358,7 +358,7 @@ if ($tor_reged)
if (!defined('SEEDER_EXIST')) if (!defined('SEEDER_EXIST'))
{ {
define('SEEDER_EXIST', true); define('SEEDER_EXIST', true);
$seed_order_action = "viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&amp;spmode=full#seeders"; $seed_order_action = "viewtopic.php?". POST_TOPIC_URL ."=$topic_id&amp;spmode=full#seeders";
$template->assign_block_vars("$x_full", array( $template->assign_block_vars("$x_full", array(
'SEED_ORD_ACT' => $seed_order_action, 'SEED_ORD_ACT' => $seed_order_action,
@ -415,7 +415,6 @@ if ($tor_reged)
$sp_down = ($peer['speed_down']) ? humn_size($peer['speed_down'], 0, 'KB') .'/s' : '-'; $sp_down = ($peer['speed_down']) ? humn_size($peer['speed_down'], 0, 'KB') .'/s' : '-';
$template->assign_block_vars("$x_full.$x_row", array( $template->assign_block_vars("$x_full.$x_row", array(
'ROW_BGR' => $row_bgr,
'NAME' => ($peer['update_time']) ? $name : "<s>$name</s>", 'NAME' => ($peer['update_time']) ? $name : "<s>$name</s>",
'COMPL_PRC' => $compl_perc, 'COMPL_PRC' => $compl_perc,
'UP_TOTAL' => ($max_up_id[$x] == $pid) ? "<b>$up_tot</b>" : $up_tot, 'UP_TOTAL' => ($max_up_id[$x] == $pid) ? "<b>$up_tot</b>" : $up_tot,