Version 2.2.0 RC-1

upload/sources/classes/bbcode/class_bbcode_legacy.php

@@ -2,28 +2,18 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board 2.1.7
+|   Invision Power Board
 |   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2005 Invision Power Services, Inc.
+|   (c) 2001 - 2006 Invision Power Services, Inc.
 |   http://www.invisionpower.com
 |   =============================================
 |   Web: http://www.invisionboard.com
-|        http://www.ibresource.ru/products/invisionpowerboard/
-|   Time: Tuesday 18th of July 2006 05:56:00 PM
-|   Release: 52f408a29988b02f45b5e6f4ba5af0ae
 |   Licence Info: http://www.invisionboard.com/?license
-|                 http://www.ibresource.ru/license
 +---------------------------------------------------------------------------
-|   INVISION POWER BOARD IS NOT FREE / OPEN SOURCE!
-+---------------------------------------------------------------------------
-|   INVISION POWER BOARD ÍÅ ßÂËßÅÒÑß ÁÅÑÏËÀÒÍÛÌ ÏÐÎÃÐÀÌÌÍÛÌ ÎÁÅÑÏÅ×ÅÍÈÅÌ!
-|   Ïðàâà íà ÏÎ ïðèíàäëåæàò Invision Power Services
-|   Ïðàâà íà ïåðåâîä IBResource (http://www.ibresource.ru)
-+---------------------------------------------------------------------------
-|   > $Date: 2005-10-24 22:17:00 +0100 (Mon, 24 Oct 2005) $
-|   > $Revision: 64 $
-|   > $Author: bfarber $
+|   > $Date: 2006-09-22 11:28:54 +0100 (Fri, 22 Sep 2006) $
+|   > $Revision: 567 $
+|   > $Author: matt $
 +---------------------------------------------------------------------------
 |
 |   > BB Code LEGACY Module
@@ -60,8 +50,22 @@
 * @version		2.1
 * @ignore
 */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
 class class_bbcode extends class_bbcode_core
 {
+	var $parse_smilies    	= 0;
+	var $parse_html       	= 0;
+	var $parse_bbcode     	= 0;
+	var $parse_wordwrap   	= 0;
+	var $parse_nl2br      	= 1;
+	var $parse_custombbcode = 1;
+		
 	/*-------------------------------------------------------------------------*/
 	// CONSTRUCTOR
 	/*-------------------------------------------------------------------------*/
@@ -231,19 +235,26 @@ class class_bbcode extends class_bbcode_core
 		if ( $this->parse_smilies )
 		{
 			$txt = ' '.$txt.' ';
-		
-			usort( $this->ipsclass->cache['emoticons'] , array( 'post_parser', 'smilie_length_sort' ) );
+			$codes_seen = array();
 			
 			if ( count( $this->ipsclass->cache['emoticons'] ) > 0 )
 			{
-				foreach( $this->ipsclass->cache['emoticons']  as $a_id => $row)
+				foreach( $this->ipsclass->cache['emoticons'] as $row)
 				{
-					if ( $row['emo_set'] != $this->ipsclass->skin['_emodir'] )
+					if ( $this->ipsclass->skin['_emodir'] && $row['emo_set'] != $this->ipsclass->skin['_emodir'] )
 					{
 						continue;
 					}
 					
 					$code  = $row['typed'];
+					
+					if( in_array( $code, $codes_seen ) )
+					{
+						continue;
+					}
+					
+					$codes_seen[] = $code;
+					
 					$image = $row['image'];
 					
 					//-----------------------------------------