Nofollow

Добавляем атрибут nofollow для внешних ссылок + успрощение сортировки смайликов.

install/sql/mysql.sql

@@ -1228,7 +1228,6 @@ INSERT INTO `bb_smilies` VALUES (52, ':bz:', 'bz.gif', 'bz');
 INSERT INTO `bb_smilies` VALUES (53, ':ca:', 'ca.gif', 'ca');
 INSERT INTO `bb_smilies` VALUES (54, ':cb:', 'cb.gif', 'cb');
 INSERT INTO `bb_smilies` VALUES (55, ':cc:', 'cc.gif', 'cc');
-INSERT INTO `bb_smilies` VALUES (56, ':cd:', 'cd.gif', 'cd');
 
 -- --------------------------------------------------------
 

upload/config.php

@@ -57,6 +57,7 @@
  * Misc
  * Captcha
  * Atom feed
+ * Nofollow
 **/
 
 if (!defined('BB_ROOT')) die(basename(__FILE__));
@@ -605,4 +606,10 @@ $bb_cfg['atom'] = array(
 	'url'  => './atom',         # without '/'
 );
 
+// Nofollow
+$bb_cfg['nofollow'] = array(
+	'disabled'    => false,
+	'allowed_url' => array($domain_name), // 'allowed.site', 'www.allowed.site'
+);
+
 define('BB_CFG_LOADED', true);

upload/includes/bbcode.php

@@ -497,10 +497,9 @@ class bbcode
 	*/
 	function init_replacements ()
 	{
-		$tpl         = $this->tpl;
-		$img_url_exp = '(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png)([a-z0-9/?&%;][^\[\]]*)?';
-		$email_exp   = '[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+';
-		$url_exp     = '[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?';
+		$tpl       = $this->tpl;
+		$img_exp   = '(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png)([a-z0-9/?&%;][^\[\]]*)?';
+		$email_exp = '[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+';
 
 		$this->preg = array(
 			'#\[quote="(.+?)"\]#isu'                                 => $tpl['quote_username_open'],
@@ -514,12 +513,8 @@ class bbcode
 			'#\[size=([1-2]?[0-9])\]#isu'                            => '<span style="font-size: $1px; line-height: normal;">',
 			'#\[align=(left|right|center|justify)\]#isu'             => '<span class="post-align" style="text-align: $1;">',
 			'#\[font="([\w\- \']+)"\]#isu'                           => '<span style="font-family: $1;">',
-			"#\[img\]($img_url_exp)\[/img\]#isu"                     => $tpl['img'],
-			"#\[img=(left|right)\]($img_url_exp)\[/img\]\s*#isu"     => $tpl['img_aligned'],
-			"#\[url\](https?://$url_exp)\[/url\]#isu"                => '<a href="$1" class="postLink">$1</a>',
-			"#\[url\](www\.$url_exp)\[/url\]#isu"                    => '<a href="http://$1" class="postLink">$1</a>',
-			"#\[url=(https?://$url_exp)\]([^?\n\t].*?)\[/url\]#isu"  => '<a href="$1" class="postLink">$2</a>',
-			"#\[url=(www\.$url_exp)\]([^?\n\t].*?)\[/url\]#isu"      => '<a href="http://$1" class="postLink">$2</a>',
+			"#\[img\]($img_exp)\[/img\]#isu"                         => $tpl['img'],
+			"#\[img=(left|right|center)\]($img_exp)\[/img\]\s*#isu"  => $tpl['img_aligned'],
 			"#\[email\]($email_exp)\[/email\]#isu"                   => '<a href="mailto:$1">$1</a>',
 			"#\[qpost=([0-9]*)\]#isu"                                => '<u class="q-post">$1</u>',
 		);
@@ -570,15 +565,22 @@ class bbcode
 		$text = $this->clean_up($text);
 		$text = $this->spam_filter($text);
 
-		// парсинг тегов
+		// Tag parse
 		if (strpos($text, '[') !== false)
 		{
-			// [CODE]
+			// [code]
 			$text = preg_replace_callback('#(\s*)\[code\](.+?)\[/code\](\s*)#s', array(&$this, 'code_callback'), $text);
 
 			// Escape tags inside tiltes in [quote="tilte"]
 			$text = preg_replace_callback('#(\[(quote|spoiler)=")(.+?)("\])#', array(&$this, 'escape_tiltes_callback'), $text);
 
+			// [url]
+			$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=(www\.$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text);
+
 			// Normalize block level tags wrapped with new lines
 			$block_tags = join('|', $this->block_tags);
 			$text = str_replace("\n\n[hr]\n\n", '[br][hr][br]', $text);
@@ -692,6 +694,28 @@ class bbcode
 		return $this->tpl['code_open'] . $code . $this->tpl['code_close'];
 	}
 
+	/**
+	* [url] callback
+	*/
+	function url_callback ($m)
+	{
+		global $bb_cfg;
+
+		$url = trim($m[1]);
+		$url_name = (isset($m[2])) ? trim($m[2]) : $url;
+
+		if (in_array(parse_url($url, PHP_URL_HOST), $bb_cfg['nofollow']['allowed_url']) || $bb_cfg['nofollow']['disabled'])
+		{
+			$link = "<a href=\"$url\" class=\"postLink\">$url_name</a>";
+		}
+		else
+		{
+			$link = "<a href=\"$url\" class=\"postLink\" rel=\"nofollow\">$url_name</a>";
+		}
+
+		return $link;
+	}
+
 	/**
 	* Escape tags inside tiltes in [quote="tilte"]
 	*/
@@ -739,11 +763,22 @@ class bbcode
 	*/
 	function make_url_clickable_callback ($m)
 	{
+		global $bb_cfg;
+
 		$max_len = 70;
 		$href    = $m[1];
 		$name    = (mb_strlen($href, 'UTF-8') > $max_len) ? mb_substr($href, 0, $max_len - 19) .'...'. mb_substr($href, -16) : $href;
 
-		return "<a href=\"$href\" class=\"postLink\">$name</a>";
+		if (in_array(parse_url($href, PHP_URL_HOST), $bb_cfg['nofollow']['allowed_url']) || $bb_cfg['nofollow']['disabled'])
+		{
+			$link = "<a href=\"$href\" class=\"postLink\">$name</a>";
+		}
+		else
+		{
+			$link = "<a href=\"$href\" class=\"postLink\" rel=\"nofollow\">$name</a>";
+		}
+
+		return $link;
 	}
 
 	/**

upload/includes/datastore/build_smilies.php

@@ -7,7 +7,7 @@ global $bb_cfg;
 $smilies = array();
 
 $rowset = DB()->fetch_rowset("SELECT * FROM ". BB_SMILIES);
-usort($rowset, 'smiley_sort');
+sort($rowset, 'SORT_NUMERIC');
 
 foreach ($rowset as $smile)
 {

upload/includes/functions.php

@@ -1777,16 +1777,6 @@ function obtain_word_list (&$orig_word, &$replacement_word)
 	return true;
 }
 
-function smiley_sort ($a, $b)
-{
-	if (strlen($a['code']) == strlen($b['code']))
-	{
-		return 0;
-	}
-
-	return (strlen($a['code']) > strlen($b['code'])) ? -1 : 1;
-}
-
 function bb_die ($msg_text)
 {
 	global $ajax, $bb_cfg, $lang, $template, $theme, $userdata;