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

Cleaning

Browse source 
Несколько фиксов в бб-коды, небольшая чистка шаблонов, мелочи.
This commit is contained in:
Exile 2014-08-31 16:54:11 +04:00
commit 022fe7ea21
27 changed files with 102 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

1
contributors.txt
View file

@ -35,6 +35,7 @@ Nightwolf
nord51
Вася
Alexander.S (http://torrent.dchub.ws/)
sasha20072007
*****************************
** Прочая информация **

10
upload/config.php
View file

@ -73,7 +73,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Version info
$bb_cfg['tp_version'] = '2.1 (RC)';
$bb_cfg['tp_release_date'] = '31-08-2014';
$bb_cfg['tp_release_state'] = 'R599b';
$bb_cfg['tp_release_state'] = 'R599c';
// Database
$charset = 'utf8';
@ -81,9 +81,11 @@ $pconnect = false;
// Настройка баз данных ['db']['srv_name'] => (array) srv_cfg;
// порядок параметров srv_cfg (хост, название базы, пользователь, пароль, charset, pconnect);
$bb_cfg['db']['db1'] = array('localhost', 'dbase', 'user', 'pass', $charset, $pconnect);
//$bb_cfg['db']['db2'] = array('localhost2', 'dbase2', 'user2', 'pass2', $charset, $pconnect);
//$bb_cfg['db']['db3'] = array('localhost3', 'dbase3', 'user2', 'pass3', $charset, $pconnect);
$bb_cfg['db'] = array(
'db1' => array('localhost', 'dbase', 'user', 'pass', $charset, $pconnect),
//'db2' => array('localhost2', 'dbase2', 'user2', 'pass2', $charset, $pconnect),
//'db3' => array('localhost3', 'dbase3', 'user2', 'pass3', $charset, $pconnect),
);
$bb_cfg['db_alias'] = array(
// 'alias' => 'srv_name'

4
upload/includes/bbcode.php
View file

@ -578,7 +578,7 @@ class bbcode
$url_exp = '[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?';
$text = preg_replace_callback("#\[url\]((?:https?://)?$url_exp)\[/url\]#isu", array(&$this, 'url_callback'), $text);
$text = preg_replace_callback("#\[url\](www\.$url_exp)\[/url\]#isu", array(&$this, 'url_callback'), $text);
$text = preg_replace_callback("#\[url=(https?://$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text);
$text = preg_replace_callback("#\[url=((?:https?://)?$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text);
$text = preg_replace_callback("#\[url=(www\.$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text);
// Normalize block level tags wrapped with new lines
@ -619,7 +619,7 @@ class bbcode
/**
* Spam filter
*/
static function spam_filter ($text)
private function spam_filter ($text)
{
global $bb_cfg;
static $spam_words = null;

4
upload/language/uk/main.php
View file

@ -2198,8 +2198,8 @@ $lang['SEED_BONUS_RELEASE'] = 'до N-числа релізів';
$lang['SEED_BONUS_POINTS'] = 'бонусів на годину';
$lang['SEED_BONUS_TOR_SIZE'] = '<h4>Мінімальний розмір роздачі, за який будуть нараховуватися бонуси</h4><h6>Якщо хочете нараховувати бонуси за все роздачі, залиште поле порожнім.</h6>';
$lang['SEED_BONUS_USER_REGDATA'] = '<h4>Мінімальний стаж користувача на трекері, після якого будуть нараховуватися бонуси</h4><h6>Якщо хочете нараховувати бонуси всім користувачам, залиште поле порожнім.</h6>';
$lang['SEED_BONUS_WARNING'] = 'УВАГА! Сид Бонуси повинні бути в порядку зростання';
$lang['SEED_BONUS_EXCHANGE'] = 'Налаштування обміну Сид Бонусів';
$lang['SEED_BONUS_WARNING'] = 'УВАГА! Сидбонуси повинні бути в порядку зростання';
$lang['SEED_BONUS_EXCHANGE'] = 'Налаштування обміну сидбонусів';
$lang['SEED_BONUS_ROPORTION'] = 'Додавання пропорції для обміну бонусів на GB';
// Modules, this replaces the keys used

5
upload/poll.php
View file

@ -158,14 +158,11 @@ switch ($mode)
bb_die("Invalid mode: ". htmlCHR($mode));
}
// ----------------------------------------------------------- //
// Functions
//
class bb_poll
{
var $err_msg = '';
var $poll_votes = array(); // array(vote_id => vote_text)
var $poll_votes = array();
var $max_votes = 0;
function bb_poll ()

4
upload/templates/admin/admin_attach_cp.tpl
View file

@ -1,4 +1,3 @@
<h1>{L_CONTROL_PANEL_TITLE}</h1>
<p>{L_CONTROL_PANEL_EXPLAIN}</p>
@ -191,7 +190,8 @@
<form method="post" name="attach_list" action="{S_MODE_ACTION}">
<table width="100%">
<tr>
<td align="right" nowrap="nowrap"><span class="med">{L_VIEW}:&nbsp;{S_VIEW_SELECT}&nbsp;&nbsp;{L_SORT_BY}:&nbsp;{S_MODE_SELECT}&nbsp;&nbsp;{L_ORDER}&nbsp;{S_ORDER_SELECT}&nbsp;&nbsp;
<td align="right" nowrap="nowrap">
<span class="med">{L_VIEW}:&nbsp;{S_VIEW_SELECT}&nbsp;&nbsp;{L_SORT_BY}:&nbsp;{S_MODE_SELECT}&nbsp;&nbsp;{L_ORDER}&nbsp;{S_ORDER_SELECT}&nbsp;&nbsp;
<input type="submit" name="submit" value="{L_SUBMIT}" class="liteoption" />
</span>
</td>

1
upload/templates/admin/admin_bt_forum_cfg.tpl
View file

@ -175,4 +175,3 @@
</form>
<br clear="all" />

1
upload/templates/admin/admin_disallow.tpl
View file

@ -1,4 +1,3 @@
<h1>{L_DISALLOW_CONTROL}</h1>
<p>{L_DISALLOW_EXPLAIN}</p>

2
upload/templates/admin/admin_extensions.tpl
View file

@ -1,4 +1,3 @@
<!-- IF TPL_ATTACH_EXTENSIONS -->
<!--========================================================================-->
@ -217,4 +216,3 @@
<!-- ENDIF / TPL_ATTACH_EXTENSION_GROUPS_PERMISSIONS -->
<br clear="all" />

1
upload/templates/admin/admin_forum_prune.tpl
View file

@ -1,4 +1,3 @@
<h1>{L_FORUM_PRUNE}</h1>
<p>{L_FORUM_PRUNE_EXPLAIN}</p>

2
upload/templates/admin/admin_forumauth_list.tpl
View file

@ -1,4 +1,3 @@
<!-- IF TPL_AUTH_FORUM_LIST -->
<!--========================================================================-->
@ -91,4 +90,3 @@
<!--========================================================================-->
<!-- ENDIF / TPL_AUTH_CAT -->

1
upload/templates/admin/admin_forums.tpl
View file

@ -1,4 +1,3 @@
<!-- IF TPL_EDIT_FORUM -->
<!--========================================================================-->

1
upload/templates/admin/admin_log.tpl
View file

@ -1,4 +1,3 @@
<style type="text/css">
.log_msg { max-height: 100px; overflow: auto; }
table.log_filters { padding: 6px; width: 100%; }

1
upload/templates/admin/admin_mass_email.tpl
View file

@ -1,4 +1,3 @@
<h1>{L_EMAIL}</h1>
<p>{L_MASS_EMAIL_EXPLAIN}</p>

1
upload/templates/admin/admin_ranks.tpl
View file

@ -1,4 +1,3 @@
<!-- IF TPL_RANKS_EDIT -->
<!--========================================================================-->

2
upload/templates/admin/admin_rebuild_search.tpl
View file

@ -1,4 +1,3 @@
<!-- IF TPL_REBUILD_SEARCH_MAIN -->
<!--========================================================================-->
@ -256,4 +255,3 @@ function updateButton()
<!--========================================================================-->
<!-- ENDIF / TPL_REBUILD_SEARCH_PROGRESS -->

4
upload/templates/admin/admin_smilies.tpl
View file

@ -1,10 +1,9 @@
<!-- IF TPL_SMILE_MAIN -->
<!--========================================================================-->
<h1>{L_SMILEY_TITLE}</h1>
<P>{L_SMILE_DESC}</p>
<p>{L_SMILE_DESC}</p>
<br />
<form method="post" action="{S_SMILEY_ACTION}">
@ -115,4 +114,3 @@ function update_smiley(newimage)
<!--========================================================================-->
<!-- ENDIF / TPL_SMILE_IMPORT -->

1
upload/templates/admin/admin_terms.tpl
View file

@ -1,4 +1,3 @@
<h1>{L_TERMS}</h1>
<p>{L_TERMS_EXPLAIN}</p>

1
upload/templates/admin/admin_ug_auth.tpl
View file

@ -323,4 +323,3 @@ function mark_changed (f_id, acl_id)
<!--========================================================================-->
<!-- ENDIF / TPL_SELECT_GROUP -->

1
upload/templates/admin/admin_user_ban.tpl
View file

@ -1,4 +1,3 @@
<h1>{L_BAN_CONTROL}</h1>
<p>{L_BAN_EXPLAIN}</p>

2
upload/templates/admin/admin_words.tpl
View file

@ -1,4 +1,3 @@
<!-- IF TPL_ADMIN_WORDS_LIST -->
<!--========================================================================-->
@ -60,4 +59,3 @@
<!--========================================================================-->
<!-- ENDIF / TPL_ADMIN_WORDS_EDIT -->

1
upload/templates/admin/index.tpl
View file

@ -1,4 +1,3 @@
<!-- IF TPL_ADMIN_FRAMESET -->
<!--========================================================================-->
<!DOCTYPE html>

1
upload/templates/default/login.tpl
View file

@ -1,4 +1,3 @@
<h1 class="pagetitle">{PAGE_TITLE}</h1>
<form action="{S_LOGIN_ACTION}" method="post">

8
upload/templates/default/modcp_split.tpl
View file

@ -19,8 +19,12 @@ function toggle_cbox (cb_id, tr_id)
<table width="100%">
<tr>
<td style="padding-left: 0;" class="nav"><a href="{U_INDEX}" class="nav">{T_INDEX}</a><span class="nav">
&raquo;&nbsp;<a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
<td style="padding-left: 0;" class="nav">
<a href="{U_INDEX}" class="nav">{T_INDEX}</a>
<span class="nav">
&raquo;&nbsp;<a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a>
</span>
</td>
</tr>
</table>

1
upload/templates/default/usercp_bonus.tpl
View file

@ -1,4 +1,3 @@
<span class="maintitle">{PAGE_TITLE}</span>
<table width="100%">

1
upload/templates/default/viewtopic_poll.tpl
View file

@ -1,4 +1,3 @@
<script type="text/javascript">
var bb_poll = {};
bb_poll.data = {POLL_VOTES_JS}; // [["заголовок", "result"], ...]