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

r78

Browse source 
Мелочь. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@78 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08 2011-07-04 22:12:42 +00:00
commit 6d0378eb30
2 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/config.php
View file

@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.0.2'; $bb_cfg['tp_version'] = '2.0.2';
$bb_cfg['tp_release_state'] = 'TP II r77'; $bb_cfg['tp_release_state'] = 'TP II r78';
$bb_cfg['tp_release_date'] = '05-07-2011'; $bb_cfg['tp_release_date'] = '05-07-2011';
$bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger

42
upload/includes/bbcode.php
View file

@ -14,22 +14,13 @@ $page_cfg['include_bbcode_js'] = true;
function get_bbcode_tpl () function get_bbcode_tpl ()
{ {
$bbcode_tpl = array(); $bbcode_tpl = array();
// Quote // Quote
/*
<div class="q-wrap">
<div class="q-head"><b>Цитата:</b></div>
<div class="q">
*/
$bbcode_tpl['quote_open'] = <<<HTML $bbcode_tpl['quote_open'] = <<<HTML
<div class="q-wrap"> <div class="q-wrap">
<div class="q"> <div class="q">
HTML; HTML;
/*
<div class="q-wrap">
<div class="q-head"><b>\\1</b> писал(а):</div>
<div class="q">
*/
$bbcode_tpl['quote_username_open'] = <<<HTML $bbcode_tpl['quote_username_open'] = <<<HTML
<div class="q-wrap"> <div class="q-wrap">
<div class="q" head="\\1"> <div class="q" head="\\1">
@ -53,21 +44,11 @@ $bbcode_tpl['code_close'] = <<<HTML
HTML; HTML;
// Spoiler // Spoiler
/*
<div class="sp-wrap">
<div class="sp-head folded clickable">скрытый текст</div>
<div class="sp-body">
*/
$bbcode_tpl['spoiler_open'] = <<<HTML $bbcode_tpl['spoiler_open'] = <<<HTML
<div class="sp-wrap"> <div class="sp-wrap">
<div class="sp-body"> <div class="sp-body">
HTML; HTML;
/*
<div class="sp-wrap">
<div class="sp-head folded clickable">\\1</div>
<div class="sp-body">
*/
$bbcode_tpl['spoiler_title_open'] = <<<HTML $bbcode_tpl['spoiler_title_open'] = <<<HTML
<div class="sp-wrap"> <div class="sp-wrap">
<div class="sp-body" title="\\1"> <div class="sp-body" title="\\1">
@ -80,7 +61,9 @@ $bbcode_tpl['spoiler_close'] = <<<HTML
HTML; HTML;
// Image // Image
$bbcode_tpl['img'] = '<var class="postImg" title="$1">&#10;</var>'; $bbcode_tpl['img'] = <<<HTML
<var class="postImg" title="$1">&#10;</var>
HTML;
$bbcode_tpl['img_aligned'] = <<<HTML $bbcode_tpl['img_aligned'] = <<<HTML
<var class="postImg postImgAligned img-\\1" title="\\2">&#10;</var> <var class="postImg postImgAligned img-\\1" title="\\2">&#10;</var>
@ -520,10 +503,10 @@ function add_search_words ($post_id, $post_message, $post_title = '', $only_retu
class bbcode class bbcode
{ {
var $tpl = array(); // шаблоны для замены тегов var $tpl = array(); // шаблоны для замены тегов
var $smilies = null; var $smilies = null; // смайлы
var $found_spam = null; // найденные спам "слова" var $found_spam = null; // найденные спам "слова"
var $del_words = array(); // см. get_words_rate() var $del_words = array(); // см. get_words_rate()
var $tidy_cfg = array( var $tidy_cfg = array(
'drop-empty-paras' => false, 'drop-empty-paras' => false,
'fix-uri' => false, 'fix-uri' => false,
@ -532,7 +515,7 @@ class bbcode
'join-classes' => false, 'join-classes' => false,
'join-styles' => false, 'join-styles' => false,
'merge-divs' => false, 'merge-divs' => false,
# 'merge-spans' => false, // нужно будет включить после обновления версии tidy 'merge-spans' => false,
'newline' => 'LF', 'newline' => 'LF',
'output-xhtml' => true, 'output-xhtml' => true,
'preserve-entities' => true, 'preserve-entities' => true,
@ -542,7 +525,7 @@ class bbcode
'show-errors' => false, 'show-errors' => false,
'show-warnings' => false, 'show-warnings' => false,
'wrap' => 0, 'wrap' => 0,
); );
var $block_tags = array( var $block_tags = array(
'align', 'align',
'br', 'br',
@ -552,7 +535,7 @@ class bbcode
'pre', 'pre',
'quote', 'quote',
'spoiler', 'spoiler',
); );
var $preg = array(); var $preg = array();
var $str = array(); var $str = array();
var $preg_search = array(); var $preg_search = array();
@ -584,7 +567,6 @@ class bbcode
{ {
$tpl = $this->tpl; $tpl = $this->tpl;
$img_url_exp = 'http://[^\s\?&;:=\#\"<>]+?\.(jpg|jpeg|gif|png)'; $img_url_exp = 'http://[^\s\?&;:=\#\"<>]+?\.(jpg|jpeg|gif|png)';
$email_exp = '[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+'; $email_exp = '[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+';
$this->preg = array( $this->preg = array(
@ -618,7 +600,7 @@ class bbcode
'[/font]' => '</span>', '[/font]' => '</span>',
'[tab]' => ' ', '[tab]' => ' ',
'[br]' => "\n\n", '[br]' => "\n\n",
'[hr]' => $tpl['hr'], # $('.post-hr').html('<hr align="left" />'); '[hr]' => $tpl['hr'],
'[b]' => '<span class="post-b">', '[b]' => '<span class="post-b">',
'[/b]' => '</span>', '[/b]' => '</span>',
'[u]' => '<span class="post-u">', '[u]' => '<span class="post-u">',