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

r494

Browse source 
Исправления багов git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@494 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
gemini_13@torba.su 2013-02-18 23:17:34 +00:00
commit d8040dc051
7 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/admin/index.php
View file

@ -127,7 +127,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
$row = DB()->sql_fetchrow($result); $row = DB()->sql_fetchrow($result);
$version = $row['mysql_version']; $version = $row['mysql_version'];
if( preg_match('/^(3\.23|4\.|5\.)/', $version) ) if( preg_match('/^(3\.23|4\.|5\.|10\.)/', $version) )
{ {
$dblist = array(); $dblist = array();
foreach($bb_cfg['db'] as $name => $row) foreach($bb_cfg['db'] as $name => $row)

2
upload/includes/cron/jobs/tr_maintenance.php
View file

@ -2,7 +2,7 @@
if (!defined('BB_ROOT')) die(basename(__FILE__)); if (!defined('BB_ROOT')) die(basename(__FILE__));
if (empty($bb_cfg['seeder_last_seen_days_keep']) || empty($bb_cfg['seeder_never_seen_days_keep'])) if ($bb_cfg['seeder_last_seen_days_keep'] == 0 || $bb_cfg['seeder_never_seen_days_keep'] == 0)
{ {
return; return;
} }

2
upload/includes/datastore/build_stats.php
View file

@ -52,7 +52,7 @@ if ($bb_cfg['gender'])
// birthday stat // birthday stat
if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled']) if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
{ {
$sql = DB()->fetch_rowset("SELECT user_id, username, user_birthday, user_birthday, user_rank FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .") AND user_birthday != 0 ORDER BY user_level DESC, username"); $sql = DB()->fetch_rowset("SELECT user_id, username, user_birthday, user_rank FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .") AND user_birthday != 0 ORDER BY user_level DESC, username");
$this_year = bb_date(TIMENOW, 'Y', 'false'); $this_year = bb_date(TIMENOW, 'Y', 'false');
$date_today = bb_date(TIMENOW, 'Ymd', 'false'); $date_today = bb_date(TIMENOW, 'Ymd', 'false');
$date_forward = bb_date(TIMENOW + ($bb_cfg['birthday_check_day']*86400), 'Ymd', 'false'); $date_forward = bb_date(TIMENOW + ($bb_cfg['birthday_check_day']*86400), 'Ymd', 'false');

2
upload/includes/functions.php
View file

@ -2802,7 +2802,7 @@ function get_path_from_id ($id, $ext_id, $base_path, $first_div, $sec_div)
return ($base_path ? "$base_path/" : '') . ($id % $sec_div) .'/'. $id . ($ext ? ".$ext" : ''); return ($base_path ? "$base_path/" : '') . ($id % $sec_div) .'/'. $id . ($ext ? ".$ext" : '');
} }
function send_pm($user_id, $subject, $message, $poster_id = false) function send_pm($user_id, $subject, $message, $poster_id = BOT_UID)
{ {
global $userdata; global $userdata;

2
upload/includes/ucp/torrent_userprofile.php
View file

@ -199,7 +199,7 @@ $template->assign_vars(array(
$template->assign_vars(array('SHOW_SEARCH_DL' => false)); $template->assign_vars(array('SHOW_SEARCH_DL' => false));
if (!IS_USER || $profile_user_id == $userdata['user_id']) if (IS_AM || $profile_user_id == $userdata['user_id'])
{ {
$page_cfg['dl_links_user_id'] = $profile_user_id; $page_cfg['dl_links_user_id'] = $profile_user_id;
} }

2
upload/includes/ucp/usercp_viewprofile.php
View file

@ -45,7 +45,7 @@ if (IS_ADMIN)
$rank_select = build_select('rank-sel', $rank_select, $user_rank); $rank_select = build_select('rank-sel', $rank_select, $user_rank);
} }
if (bf($profiledata['user_opt'], 'user_opt', 'viewemail') || IS_AM) if (bf($profiledata['user_opt'], 'user_opt', 'viewemail') || $profiledata['user_id'] == $userdata['user_id'] || IS_AM)
{ {
$email_uri = ($bb_cfg['board_email_form']) ? 'profile.php?mode=email&'. POST_USERS_URL .'='. $profiledata['user_id'] : 'mailto:'. $profiledata['user_email']; $email_uri = ($bb_cfg['board_email_form']) ? 'profile.php?mode=email&'. POST_USERS_URL .'='. $profiledata['user_id'] : 'mailto:'. $profiledata['user_email'];
$email = '<a class="editable" href="'. $email_uri .'">'. $profiledata['user_email'] .'</a>'; $email = '<a class="editable" href="'. $email_uri .'">'. $profiledata['user_email'] .'</a>';

1
upload/language/lang_russian/lang_main.php
View file

@ -1657,7 +1657,6 @@ $lang['TERMS_OFF'] = 'Я <b>не согласен</b> с этими услови
$lang['JAVASCRIPT_ON_REGISTER'] = 'Для регистрации необходимо включить JavaScript'; $lang['JAVASCRIPT_ON_REGISTER'] = 'Для регистрации необходимо включить JavaScript';
$lang['REGISTERED_IN_TIME'] = "В данный момент регистрация закрыта<br /><br />вы можете зарегистрироваться с 01:00 до 17:00 MSK (сейчас ". date('H:i') ." MSK)<br /><br />Приносим извинения за это временное неудобство"; $lang['REGISTERED_IN_TIME'] = "В данный момент регистрация закрыта<br /><br />вы можете зарегистрироваться с 01:00 до 17:00 MSK (сейчас ". date('H:i') ." MSK)<br /><br />Приносим извинения за это временное неудобство";
$lang['AUTOCOMPLETE'] = 'Сгенерировать пароль'; $lang['AUTOCOMPLETE'] = 'Сгенерировать пароль';
$lang['AUTOCOMPLETE'] = 'Сгенерировать пароль';
$lang['YOUR_NEW_PASSWORD'] = 'Ваш пароль: '; $lang['YOUR_NEW_PASSWORD'] = 'Ваш пароль: ';
$lang['REGENERATE'] = 'Перегенерировать'; $lang['REGENERATE'] = 'Перегенерировать';