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

r79

Browse source 
Опечатка в r77 - правим. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@79 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08 2011-07-04 22:22:17 +00:00
commit f402bdefa4
2 changed files with 11 additions and 11 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 r78'; $bb_cfg['tp_release_state'] = 'TP II r79';
$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

20
upload/includes/bbcode.php
View file

@ -507,7 +507,7 @@ class bbcode
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,
'force-output' => true, 'force-output' => true,
@ -669,7 +669,7 @@ class bbcode
{ {
$text = trim($text); $text = trim($text);
$text = str_replace("\r", '', $text); $text = str_replace("\r", '', $text);
$text = preg_replace('#[ \t]+$#m', '', $text); // trailing spaces $text = preg_replace('#[ \t]+$#m', '', $text); // trailing spaces
$text = preg_replace('#\n{3,}#', "\n\n", $text); $text = preg_replace('#\n{3,}#', "\n\n", $text);
return $text; return $text;
} }
@ -771,7 +771,7 @@ class bbcode
{ {
global $bb_cfg; global $bb_cfg;
$url_regexp = array(); $url_regexp = array();
$url_regexp[] = "#\[url\]([\w]+?://[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?)\[/url\]#isu"; $url_regexp[] = "#\[url\]([\w]+?://[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?)\[/url\]#isu";
$url_regexp[] = "#\[url\]((www|ftp)\.[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?)\[/url\]#isu"; $url_regexp[] = "#\[url\]((www|ftp)\.[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?)\[/url\]#isu";
$url_regexp[] = "#\[url=([\w]+?://[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#isu"; $url_regexp[] = "#\[url=([\w]+?://[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#isu";
@ -807,15 +807,15 @@ class bbcode
if(mb_strlen($name, 'UTF-8')) if(mb_strlen($name, 'UTF-8'))
{ {
$anme = mb_substr($name, 0, $max_len - 19, 'UTF-8') .'...'. mb_substr($name, -16, 'UTF-8'); $name = mb_substr($name, 0, $max_len - 19, 'UTF-8') .'...'. mb_substr($name, -16, 'UTF-8');
} }
if(!preg_match("#{$bb_cfg['server_name']}#", $href)) if(!preg_match("#{$bb_cfg['server_name']}#", $href))
{ {
require_once(INC_DIR .'class.idna_convert.php'); require_once(INC_DIR .'class.idna_convert.php');
$IDN = new idna_convert(); $IDN = new idna_convert();
return '<a href="'. make_url('/redirect.php?url=') . base64_encode($IDN->encode($href)) .'" class="postLink" target="_blank">'. $name .'</a>'; return '<a href="'. make_url('/redirect.php?url=') . base64_encode($IDN->encode($href)) .'" class="postLink" target="_blank">'. $name .'</a>';
} }
return "<a href=\"$href\" class=\"postLink\">$name</a>"; return "<a href=\"$href\" class=\"postLink\">$name</a>";
} }