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

Fix some notices in admin panel reported by BugSnag.

Browse source
This commit is contained in:
Yuriy Pikhtarev 2017-06-15 00:41:45 +03:00
commit c8acc4b02e
No known key found for this signature in database
GPG key ID: 3A9B5A757B48ECC6
5 changed files with 71 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

29
admin/admin_rebuild_search.php
View file

@ -294,8 +294,16 @@ if ($mode == 'submit' || $mode == 'refresh') {
} }
// calculate the percent // calculate the percent
$session_percent = ($session_posts_processed / $session_posts_processing) * 100; if ($session_posts_processing > 0) {
$total_percent = ($total_posts_processed / $total_posts) * 100; $session_percent = ($session_posts_processed / $session_posts_processing) * 100;
} else {
$session_percent = 100;
}
if ($total_posts > 0) {
$total_percent = ($total_posts_processed / $total_posts) * 100;
} else {
$total_percent = 100;
}
// get the db sizes // get the db sizes
list($search_data_size, $search_index_size, $search_tables_size) = get_db_sizes(); list($search_data_size, $search_index_size, $search_tables_size) = get_db_sizes();
@ -310,7 +318,11 @@ if ($mode == 'submit' || $mode == 'refresh') {
// calculate various times // calculate various times
$session_time = $last_session_data['session_time']; $session_time = $last_session_data['session_time'];
$session_average_cycle_time = round($session_time / $last_session_data['session_cycles']); if ($last_session_data['session_cycles'] > 0) {
$session_average_cycle_time = round($session_time / $last_session_data['session_cycles']);
} else {
$session_average_cycle_time = 0;
}
$session_estimated_time = round($session_time * (100 / $session_percent)) - $session_time; $session_estimated_time = round($session_time * (100 / $session_percent)) - $session_time;
// create the percent boxes // create the percent boxes
@ -333,8 +345,8 @@ if ($mode == 'submit' || $mode == 'refresh') {
'LAST_CYCLE_TIME' => delta_time(TIMENOW), 'LAST_CYCLE_TIME' => delta_time(TIMENOW),
'SESSION_TIME' => delta_time($last_session_data['start_time']), 'SESSION_TIME' => delta_time($last_session_data['start_time']),
'SESSION_AVERAGE_CYCLE_TIME' => delta_time($session_average_cycle_time, 0), 'SESSION_AVERAGE_CYCLE_TIME' => delta_time((int)$session_average_cycle_time, 0),
'SESSION_ESTIMATED_TIME' => delta_time($session_estimated_time, 0), 'SESSION_ESTIMATED_TIME' => delta_time((int)$session_estimated_time, 0),
'SEARCH_TABLES_SIZE' => humn_size($search_tables_size), 'SEARCH_TABLES_SIZE' => humn_size($search_tables_size),
'FINAL_SEARCH_TABLES_SIZE' => humn_size($final_search_tables_size), 'FINAL_SEARCH_TABLES_SIZE' => humn_size($final_search_tables_size),
@ -516,8 +528,13 @@ function get_total_posts($mode = 'after', $post_id = 0)
} }
$row = DB()->fetch_row($sql); $row = DB()->fetch_row($sql);
$totalPosts = (int)$row['total_posts'];
return (int)$row['total_posts']; if ($totalPosts < 0) {
return 0;
}
return $totalPosts;
} }
function clear_search_tables($mode = '') function clear_search_tables($mode = '')

63
admin/admin_user_search.php
View file

@ -811,47 +811,48 @@ if (!isset($_REQUEST['dosearch'])) {
$select_sql .= ' ORDER BY '; $select_sql .= ' ORDER BY ';
switch (strtolower($_GET['sort'])) { if (isset($_GET['sort'])) {
case 'regdate': switch (strtolower($_GET['sort'])) {
$sort = 'regdate'; case 'regdate':
$select_sql .= 'u.user_regdate'; $sort = 'regdate';
break; $select_sql .= 'u.user_regdate';
break;
case 'posts': case 'posts':
$sort = 'posts'; $sort = 'posts';
$select_sql .= 'u.user_posts'; $select_sql .= 'u.user_posts';
break; break;
case 'user_email': case 'user_email':
$sort = 'user_email'; $sort = 'user_email';
$select_sql .= 'u.user_email'; $select_sql .= 'u.user_email';
break; break;
case 'lastvisit': case 'lastvisit':
$sort = 'lastvisit'; $sort = 'lastvisit';
$select_sql .= 'u.user_lastvisit'; $select_sql .= 'u.user_lastvisit';
break; break;
case 'username': case 'username':
default: $sort = 'username';
$sort = 'username'; $select_sql .= 'u.username';
$select_sql .= 'u.username'; }
} else {
$sort = 'username';
$select_sql .= 'u.username';
} }
switch ($_GET['order']) { if (isset($_GET['order'])) {
case 'DESC': $o_order = 'ASC';
$order = 'DESC'; $order = 'DESC';
$o_order = 'ASC'; } else {
break; $o_order = 'DESC';
$order = 'ASC';
default:
$o_order = 'DESC';
$order = 'ASC';
} }
$select_sql .= " $order"; $select_sql .= " $order";
$page = isset($_GET['page']) ? (int)$_GET['page'] : (int)trim($_POST['page']); $page = isset($_GET['page']) ? (int)$_GET['page'] : 0;
if ($page < 1) { if ($page < 1) {
$page = 1; $page = 1;

22
common.php
View file

@ -151,17 +151,17 @@ define('BOT_UID', -746);
/** /**
* Progressive error reporting * Progressive error reporting
*/ */
if (DBG_USER) { if ($bb_cfg['bugsnag']['enabled'] && env('APP_ENV', 'production') !== 'local') {
if ($bb_cfg['bugsnag']['enabled'] && !empty($bb_cfg['bugsnag']['api_key'])) { /** @var Bugsnag\Handler $bugsnag */
/** @var Bugsnag\Handler $bugsnag */ $bugsnag = Bugsnag\Client::make($bb_cfg['bugsnag']['api_key']);
$bugsnag = Bugsnag\Client::make($bb_cfg['bugsnag']['api_key']); Bugsnag\Handler::register($bugsnag);
Bugsnag\Handler::register($bugsnag); }
} else {
/** @var Whoops\Run $whoops */ if (DBG_USER && env('APP_ENV', 'production') === 'local') {
$whoops = new \Whoops\Run; /** @var Whoops\Run $whoops */
$whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler); $whoops = new \Whoops\Run;
$whoops->register(); $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler);
} $whoops->register();
} }
/** /**

3
composer.json
View file

@ -45,7 +45,8 @@
"rych/bencode": "^1.0", "rych/bencode": "^1.0",
"samdark/sitemap": "^2.0", "samdark/sitemap": "^2.0",
"swiftmailer/swiftmailer": "^5.4", "swiftmailer/swiftmailer": "^5.4",
"symfony/dotenv": "^3.3" "symfony/dotenv": "^3.3",
"symfony/var-dumper": "^3.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

6
library/config.php
View file

@ -36,8 +36,8 @@ $bb_cfg = [];
$bb_cfg['js_ver'] = $bb_cfg['css_ver'] = 1; $bb_cfg['js_ver'] = $bb_cfg['css_ver'] = 1;
// Version info // Version info
$bb_cfg['tp_version'] = '2.2.0'; $bb_cfg['tp_version'] = '2.2.1';
$bb_cfg['tp_release_date'] = '12-06-2017'; $bb_cfg['tp_release_date'] = '16-06-2017';
$bb_cfg['tp_release_codename'] = 'Aurochs'; $bb_cfg['tp_release_codename'] = 'Aurochs';
// Database // Database
@ -390,7 +390,7 @@ $bb_cfg['reg_email_activation'] = true; // Требовать активацию
$bb_cfg['emailer'] = [ $bb_cfg['emailer'] = [
'enabled' => true, 'enabled' => true,
'smtp' => [ 'smtp' => [
'enabled' => true, // send email via external SMTP server 'enabled' => false, // send email via external SMTP server
'host' => '', // SMTP server host 'host' => '', // SMTP server host
'port' => 25, // SMTP server port 'port' => 25, // SMTP server port
'username' => '', // SMTP username (if server requires it) 'username' => '', // SMTP username (if server requires it)