diff --git a/upload/ajax/change_tor_status.php b/upload/ajax/change_tor_status.php
index 39d9fca7a..7d63c9569 100644
--- a/upload/ajax/change_tor_status.php
+++ b/upload/ajax/change_tor_status.php
@@ -69,4 +69,4 @@ if ($tor['tor_status'] != TOR_NOT_APPROVED && $tor['checked_user_id'] != $userda
change_tor_status($attach_id, $new_status);
$this->response['attach_id'] = $attach_id;
-$this->response['status'] = $bb_cfg['tor_icons'][$new_status] .' '. $lang['TOR_STATUS_NAME'][$new_status]. ' · ' . get_username($tor['checked_user_id']) . ' · '. delta_time(time()) . $lang['BACK']. '';
\ No newline at end of file
+$this->response['status'] = $bb_cfg['tor_icons'][$new_status] .' '. $lang['TOR_STATUS_NAME'][$new_status]. ' · ' . get_username($userdata['user_id']) . ' · '. delta_time(time()) . $lang['BACK']. '';
\ No newline at end of file
diff --git a/upload/ajax/view_torrent.php b/upload/ajax/view_torrent.php
index 9ac31b5e2..384c1d66f 100644
--- a/upload/ajax/view_torrent.php
+++ b/upload/ajax/view_torrent.php
@@ -21,11 +21,11 @@ if (($file_contents = @file_get_contents($filename)) === false)
{
if(IS_AM)
{
- $this->ajax_die($lang['TOR_NOT_FOUND'] ."\n\n". htmlCHR($filename));
+ $this->ajax_die($lang['ERROR_NO_ATTACHMENT'] ."\n\n". htmlCHR($filename));
}
else
{
- $this->ajax_die($lang['TOR_NOT_FOUND']);
+ $this->ajax_die($lang['ERROR_NO_ATTACHMENT']);
}
}
diff --git a/upload/callseed.php b/upload/callseed.php
index 9d91cfca4..9ff9047de 100644
--- a/upload/callseed.php
+++ b/upload/callseed.php
@@ -31,7 +31,7 @@ function topic_info($topic_id)
return $t;
}
-function send_pm($topic_id, $t_info, $to_user_id)
+function call_seed($topic_id, $t_info, $to_user_id)
{
global $userdata, $lang, $msg_error;
@@ -126,7 +126,7 @@ function send_pm($topic_id, $t_info, $to_user_id)
{
if ($msg_error != "OK") break;
- send_pm($topic_id, $t_info, $user_id);
+ call_seed($topic_id, $t_info, $user_id);
}
$msg = '';
diff --git a/upload/config.php b/upload/config.php
index a13d3c5f2..ee7d3eed9 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1;
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.0.2';
-$bb_cfg['tp_release_state'] = 'TP II r189';
-$bb_cfg['tp_release_date'] = '3-08-2011';
+$bb_cfg['tp_release_state'] = 'TP II r190';
+$bb_cfg['tp_release_date'] = '4-08-2011';
$bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
$bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";
diff --git a/upload/download.php b/upload/download.php
index fe266c581..7e004d095 100644
--- a/upload/download.php
+++ b/upload/download.php
@@ -28,7 +28,7 @@ function send_file_to_browser($attachment, $upload_dir)
{
if (@!file_exists(@amod_realpath($filename)))
{
- message_die(GENERAL_ERROR, $lang['ERROR_NO_ATTACHMENT'] . "
404 File Not Found: The File " . $filename . " does not exist.");
+ message_die(GENERAL_ERROR, $lang['ERROR_NO_ATTACHMENT'] . "
" . $filename. "
" .$lang['TOR_NOT_FOUND']);
}
else
{
@@ -151,7 +151,7 @@ function send_file_to_browser($attachment, $upload_dir)
if (!$result)
{
- message_die(GENERAL_ERROR, $lang['ERROR_NO_ATTACHMENT'] . "
404 File Not Found: The File " . $filename . " does not exist.");
+ message_die(GENERAL_ERROR, $lang['ERROR_NO_ATTACHMENT'] . "
" . $filename. "
" .$lang['TOR_NOT_FOUND']);
}
@ftp_quit($conn_id);
@@ -166,7 +166,7 @@ function send_file_to_browser($attachment, $upload_dir)
}
else
{
- message_die(GENERAL_ERROR, $lang['ERROR_NO_ATTACHMENT'] . "
404 File Not Found: The File " . $filename . " does not exist.");
+ message_die(GENERAL_ERROR, $lang['ERROR_NO_ATTACHMENT'] . "
" . $filename. "
" .$lang['TOR_NOT_FOUND']);
}
exit;
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index a3eb3b1ea..aa04e3683 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -2734,7 +2734,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" : '');
}
-/*function send_pm($user_id, $subject, $message)
+function send_pm($user_id, $subject, $message)
{
global $userdata;
$subject = DB()->escape($subject);
@@ -2752,4 +2752,4 @@ function get_path_from_id ($id, $ext_id, $base_path, $first_div, $sec_div)
user_last_privmsg = ". TIMENOW .",
user_newest_pm_id = $pm_id
WHERE user_id = $user_id");
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 3d746f713..9eed2ae08 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -1175,6 +1175,11 @@ $lang['BT_GEN_PASSKEY_NEW'] = 'Are you sure you want to create a new passkey?';
$lang['BT_GEN_PASSKEY_OK'] = 'New personal identifier generated';
$lang['BT_NO_SEARCHABLE_FORUMS'] = 'No searchable forums found';
+$lang['SEEDS'] = 'Seed';
+$lang['LEECHS'] = 'Leech';
+$lang['SPEED_UP'] = 'Speed Up';
+$lang['SPEED_DOWN'] = 'Speed Down';
+
$lang['SEEDERS'] = 'Seeders';
$lang['LEECHERS'] = 'Leechers';
$lang['RELEASING'] = 'Self';
@@ -1212,7 +1217,8 @@ $lang['INVALID_ATTACH_ID'] = 'Missing file identifier!';
$lang['CHANGE_TOR_TYPE'] = 'Type the torrent successfully changed';
$lang['DEL_TORRENT'] = 'Are you sure you want to delete the torrent?';
$lang['DEL_MOVE_TORRENT'] = 'Are you sure you want to delete and move the topic?';
-
+$lang['UNEXECUTED_RELEASE'] = 'Do you have a shapeless release before creating a new fix his unformed!';
+$lang['STATUS_DOES_EXIST'] = 'Such status does not exist: ';
//end torrent status mod
$lang['BT_TOPIC_TITLE'] = 'Topic title';
@@ -1577,4 +1583,10 @@ $lang['SEC'] = 'sec';
$lang['ON'] = 'on';
$lang['OFF'] = 'off';
$lang['MEMORY'] = 'Mem: ';
-$lang['QUERIES'] = 'queries';
\ No newline at end of file
+$lang['QUERIES'] = 'queries';
+
+// Attach Guest
+$lang['DOWNLOAD_INFO'] = 'Download free and at maximum speed!';
+$lang['HOW_TO_DOWNLOAD'] = 'How to Download?';
+$lang['WHAT_IS_A_TORRENT'] = 'What is a torrent?';
+$lang['RATINGS_AND_LIMITATIONS'] = 'Ratings and Limitations';
\ No newline at end of file
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 0b21e73ee..51030da2f 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -151,7 +151,7 @@ $lang['NEWEST_USER'] = 'Последний зарегистрированный
// Tracker stats
$lang['TORRENTS_STAT'] = 'Раздач: %s, общий размер: %s'; // first %s = number of torrents, second %s is the total size.
-$lang['PEERS_STAT'] = 'Пиров: %s, сидеров: %s, личеров: %s'; // first %s = number of peers, second %s = number of seeders, third %s = number of leechers.
+$lang['PEERS_STAT'] = 'Пиров: %s, Сидов: %s, Личеров: %s'; // first %s = number of peers, second %s = number of seeders, third %s = number of leechers.
$lang['SPEED_STAT'] = 'Скорость обмена: %s '; // %s = total speed.
$lang['NO_NEW_POSTS_LAST_VISIT'] = 'Нет новых сообщений с последнего посещения';
@@ -328,7 +328,7 @@ $lang['OPTIONS'] = 'Настройки';
$lang['POST_ANNOUNCEMENT'] = 'Объявление';
$lang['POST_STICKY'] = 'Прилепленная';
$lang['POST_NORMAL'] = 'Обычная';
-$lang['POST_DOWNLOAD'] = 'Download';
+$lang['POST_DOWNLOAD'] = 'Скачиваемая';
$lang['CONFIRM_DELETE'] = 'Вы уверены, что хотите удалить это сообщение?';
$lang['CONFIRM_DELETE_POLL'] = 'Вы уверены, что хотите удалить этот опрос?';
@@ -1067,7 +1067,7 @@ $lang['DOWNLOAD'] = 'Скачать'; // this Language Variable is defined in la
$lang['FILESIZE'] = 'Размер';
$lang['VIEWED'] = 'Просмотров';
$lang['DOWNLOAD_NUMBER'] = '%d раз'; // replace %d with count
-$lang['EXTENSION_DISABLED_AFTER_POSTING'] = 'The Extension \'%s\' was deactivated by an board admin, therefore this Attachment is not displayed.'; // used in Posts and PM's, replace %s with mime type
+$lang['EXTENSION_DISABLED_AFTER_POSTING'] = 'Расширение \'%s\' было деактивировано администратором, поэтому это приложение не отображается.'; // used in Posts and PM's, replace %s with mime type
$lang['ATTACHMENT'] = 'Вложения';
$lang['ATTACHMENT_THUMBNAIL'] = 'Вложение Миниатюра';
@@ -1182,6 +1182,11 @@ $lang['BT_GEN_PASSKEY_NEW'] = 'Вы уверены, что хотите созд
$lang['BT_GEN_PASSKEY_OK'] = 'Новый персональный идентификатор сгенеририван';
$lang['BT_NO_SEARCHABLE_FORUMS'] = 'Доступных для поиска форумов не найдено';
+$lang['SEEDS'] = 'Сидам';
+$lang['LEECHS'] = 'Личерам';
+$lang['SPEED_UP'] = 'Скорость отдачи';
+$lang['SPEED_DOWN'] = 'Скорость скачивания';
+
$lang['SEEDERS'] = 'Сидов';
$lang['LEECHERS'] = 'Личеров';
$lang['RELEASING'] = 'Свои';
@@ -1219,13 +1224,12 @@ $lang['INVALID_ATTACH_ID'] = 'Отсутствует идентификатор
$lang['CHANGE_TOR_TYPE'] = 'Тип торрента успешно изменён';
$lang['DEL_TORRENT'] = 'Вы уверены, что хотите удалить торрент?';
$lang['DEL_MOVE_TORRENT'] = 'Вы уверены, что хотите удалить и перенести топик?';
-
+$lang['UNEXECUTED_RELEASE'] = 'У вас есть неоформленный релиз, прежде чем создавать новый исправьте свой неоформленный!';
$lang['STATUS_DOES_EXIST'] = 'Такого статуса не существует: ';
-
//end torrent status mod
$lang['BT_TOPIC_TITLE'] = 'Название темы';
-$lang['BT_SEEDER_LAST_SEEN'] = 'Последний seeder';
+$lang['BT_SEEDER_LAST_SEEN'] = 'Последний Сид';
$lang['BT_SORT_FORUM'] = 'Форум';
$lang['SIZE'] = 'Размер';
$lang['PIECE_LENGTH'] = 'Размер блока';
@@ -1257,9 +1261,9 @@ $lang['TORRENTS_FROM'] = 'Торенты за';
$lang['SHOW_ONLY'] = 'Показывать только';
$lang['SHOW_COLUMN'] = 'Показывать колонку';
-$lang['BT_ONLY_ACTIVE'] = 'Активные (есть seeder или leecher)';
+$lang['BT_ONLY_ACTIVE'] = 'Активные (есть сидер или личер)';
$lang['BT_ONLY_MY'] = 'Мои раздачи';
-$lang['BT_SEED_EXIST'] = 'Есть seeder (полный источник)';
+$lang['BT_SEED_EXIST'] = 'Есть Сид (полный источник)';
$lang['BT_ONLY_NEW'] = 'Новые с последнего посещения';
$lang['BT_SHOW_CAT'] = 'Категория';
$lang['BT_SHOW_FORUM'] = 'Форум';
@@ -1298,10 +1302,10 @@ $lang['DLCANCEL_2'] = 'Отмена';
$lang['DL_LIST_DEL'] = 'Очистить DL-List';
$lang['DL_LIST_DEL_CONFIRM'] = 'Вы уверены, что хотите удалить DL-List для этого топика?';
$lang['SHOW_DL_LIST'] = 'Список скачавших';
-$lang['SET_DL_STATUS'] = 'Download';
-$lang['UNSET_DL_STATUS'] = 'Not Download';
-$lang['TOPICS_DOWN_SETS'] = 'Выбранные темы изменили статус на: Download';
-$lang['TOPICS_DOWN_UNSETS'] = 'Выбранные темы перестали быть Download';
+$lang['SET_DL_STATUS'] = 'Разрешить скачивание';
+$lang['UNSET_DL_STATUS'] = 'Запретить скачивание';
+$lang['TOPICS_DOWN_SETS'] = 'Выбранные темы изменили статус на: Скачиваемые';
+$lang['TOPICS_DOWN_UNSETS'] = 'Выбранные темы перестали быть Скачиваемыми';
$lang['TOPIC_DL'] = 'DL';
@@ -1325,8 +1329,8 @@ $lang['ALREADY_REG'] = 'Торрент уже зарегистрирован';
$lang['NOT_TORRENT'] = 'Это не торрент-файл';
$lang['ONLY_1_TOR_PER_POST'] = 'Вы не можете зарегистрировать еще один торрент для этого сообщения';
$lang['ONLY_1_TOR_PER_TOPIC'] = 'Вы не можете зарегистрировать еще один торрент для этого топика';
-$lang['VIEWING_USER_BT_PROFILE'] = 'Torrent-профиль пользователя %s'; // %s is username
-$lang['CUR_ACTIVE_DLS'] = 'Текущие активные torrent\'ы';
+$lang['VIEWING_USER_BT_PROFILE'] = 'Торрент-профиль пользователя %s'; // %s is username
+$lang['CUR_ACTIVE_DLS'] = 'Текущие активные торренты';
$lang['UP_TOTAL'] = 'Всего отдано';
$lang['DOWN_TOTAL'] = 'Всего скачано';
@@ -1343,8 +1347,8 @@ $lang['BT_RATIO'] = 'Рейтинг';
$lang['YOUR_RATIO'] = 'Ваш рейтинг';
$lang['DOWNLOADED'] = 'Скачано';
$lang['UPLOADED'] = 'Отдано';
-$lang['RELEASED'] = 'на своих';
-$lang['BT_BONUS_UP'] = 'бонус';
+$lang['RELEASED'] = 'На своих';
+$lang['BT_BONUS_UP'] = 'Бонус';
$lang['TRACKER'] = 'Трекер';
$lang['GALLERY'] = 'Галерея';
@@ -1593,3 +1597,8 @@ $lang['OFF'] = 'выкл';
$lang['MEMORY'] = 'Память: ';
$lang['QUERIES'] = 'запр.';
+// Attach Guest
+$lang['DOWNLOAD_INFO'] = 'Скачать бесплатно и на максимальной скорости!';
+$lang['HOW_TO_DOWNLOAD'] = 'Как скачивать?';
+$lang['WHAT_IS_A_TORRENT'] = 'Что такое торрент?';
+$lang['RATINGS_AND_LIMITATIONS'] = 'Рейтинг и ограничения';
diff --git a/upload/posting.php b/upload/posting.php
index fb09d9a38..44d4e0dba 100644
--- a/upload/posting.php
+++ b/upload/posting.php
@@ -306,7 +306,7 @@ if ($mode == 'newtopic' && $topic_tpl && $post_info['topic_tpl_id'])
{
$topics .= $bb_cfg['tor_icons'][$row['tor_status']] .''. $row['topic_title'] .'';
}
- if ($topics) bb_die($topics .'У вас есть неоформленный релиз, прежде чем создавать новый исправьте свой неоформленный.');
+ if ($topics) bb_die($topics . $lang['UNEXECUTED_RELEASE']);
}
require(INC_DIR .'topic_templates.php');
}
@@ -755,7 +755,7 @@ if ($topic_dl_type || $post_info['allow_dl_topic'] || $is_auth['auth_mod'])
$dl_ch = ($mode == 'editpost' && $post_data['first_post'] && $topic_dl_type) ? ' checked="checked" ' : '';
- $topic_type_toggle .= '';
+ $topic_type_toggle .= '';
$topic_type_toggle .= $dl_hid;
}
//bt end
diff --git a/upload/privmsg.php b/upload/privmsg.php
index d7507cbcc..c2eb33c2e 100644
--- a/upload/privmsg.php
+++ b/upload/privmsg.php
@@ -18,13 +18,7 @@ $page_cfg['load_tpl_vars'] = array(
//
// Is PM disabled?
//
-if ( !empty($bb_cfg['privmsg_disable']) )
-{
- message_die(GENERAL_MESSAGE, 'PM_disabled');
-}
-
-$html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#', '#"#');
-$html_entities_replace = array('&', '<', '>', '"');
+if ($bb_cfg['privmsg_disable']) bb_die('PM_DISABLED');
//
// Parameters
@@ -1305,9 +1299,8 @@ else if ( $submit || $refresh || $mode != '' )
$replacement_word = array();
obtain_word_list($orig_word, $replacement_word);
- $preview_message = stripslashes(bbcode2html($privmsg_message));
- $privmsg_message = stripslashes(preg_replace($html_entities_match, $html_entities_replace, $privmsg_message));
-
+ $preview_message = htmlCHR($privmsg_message, false, ENT_NOQUOTES);
+ $preview_message = bbcode2html($privmsg_message);
if ( count($orig_word) )
{
@@ -1388,8 +1381,7 @@ else if ( $submit || $refresh || $mode != '' )
//
generate_smilies('inline');
- $privmsg_subject = preg_replace($html_entities_match, $html_entities_replace, $privmsg_subject);
- $privmsg_subject = str_replace('"', '"', $privmsg_subject);
+ $privmsg_subject = clean_title($privmsg_subject);
$template->assign_vars(array(
'SUBJECT' => htmlCHR($privmsg_subject),
diff --git a/upload/search.php b/upload/search.php
index ad6f7944b..943c08835 100644
--- a/upload/search.php
+++ b/upload/search.php
@@ -455,7 +455,7 @@ if ($post_mode)
if ($text_match_sql)
{
$search_match_topics_csv = '';
- if(!$forum_selected[0]) $forum_selected = array();
+ if(!is_array($forum_selected)) $forum_selected = array();
$title_match_topics = get_title_match_topics($text_match_sql, 500, $forum_selected);
if (!$search_match_topics_csv = join(',', $title_match_topics))
@@ -627,7 +627,7 @@ else
if ($text_match_sql)
{
$search_match_topics_csv = '';
- if(!$forum_selected[0]) $forum_selected = array();
+ if(!is_array($forum_selected)) $forum_selected = array();
$title_match_topics = get_title_match_topics($text_match_sql, 500, $forum_selected);
if (!$search_match_topics_csv = join(',', $title_match_topics))
diff --git a/upload/templates/default/viewtopic_attach_guest.tpl b/upload/templates/default/viewtopic_attach_guest.tpl
index 663fe14ce..445604f91 100644
--- a/upload/templates/default/viewtopic_attach_guest.tpl
+++ b/upload/templates/default/viewtopic_attach_guest.tpl
@@ -1,12 +1,12 @@
diff --git a/upload/tracker.php b/upload/tracker.php
index 412572582..79d272088 100644
--- a/upload/tracker.php
+++ b/upload/tracker.php
@@ -92,19 +92,19 @@ $order_opt = array(
'sql' => 'tor.complete_count',
),
$ord_seeders => array(
- 'lang' => 'Seeders',
+ 'lang' => $lang['SEEDS'],
'sql' => 'sn.seeders',
),
$ord_leechers => array(
- 'lang' => 'Leechers',
+ 'lang' => $lang['LEECHS'],
'sql' => 'sn.leechers',
),
$ord_sp_up => array(
- 'lang' => 'Speed UP',
+ 'lang' => $lang['SPEED_UP'],
'sql' => 'sn.speed_up',
),
$ord_sp_down => array(
- 'lang' => 'Speed DOWN',
+ 'lang' => $lang['SPEED_DOWN'],
'sql' => 'sn.speed_down',
),
$ord_repl => array(
@@ -733,11 +733,11 @@ if ($allowed_forums)
{
if ($tor['tor_type'] == TOR_TYPE_GOLD)
{
- $is_gold = '
';
+ $is_gold = ' ';
}
elseif ($tor['tor_type'] == TOR_TYPE_SILVER)
{
- $is_gold = '
';
+ $is_gold = ' ';
}
}
// END Gold/Silver releases mod
@@ -773,7 +773,7 @@ if ($allowed_forums)
'UL_SPEED' => $ul_sp,
'DL_SPEED' => $dl_sp,
'SEEDS' => ($seeds) ? $seeds : 0,
- 'SEEDS_TITLE' => ($seeds) ? 'Seeders' : (" Last seen: \n ". (($s_last) ? bb_date($s_last, $date_format) : 'Never')),
+ 'SEEDS_TITLE' => ($seeds) ? $lang['SEEDERS'] : ($lang['SEED_NOT_SEEN']. ":\n ". (($s_last) ? bb_date($s_last, $date_format) : $lang['NEVER'])),
'LEECHS' => ($leechs) ? $leechs : 0,
'COMPLETED' => ($compl) ? $compl : 0,
'REPLIES' => $tor['topic_replies'],
diff --git a/upload/viewforum.php b/upload/viewforum.php
index a706a88e4..1e7758ec3 100644
--- a/upload/viewforum.php
+++ b/upload/viewforum.php
@@ -519,11 +519,11 @@ foreach ($topic_rowset as $topic)
{
if ($topic['tor_type'] == TOR_TYPE_GOLD)
{
- $is_gold = ' ';
+ $is_gold = ' ';
}
elseif ($topic['tor_type'] == TOR_TYPE_SILVER)
{
- $is_gold = ' ';
+ $is_gold = ' ';
}
}
// END Gold/Silver releases mod