From 1ae7cb8a8e66573b9241bd45e0787935aa62bfe0 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Sun, 12 Aug 2012 08:10:19 +0000
Subject: [PATCH] html-to-bbcode fixes and WYSIWYG enabled on default install
 (switchable in real-time)

---
 e107_core/xml/default_install.xml | 2 +-
 e107_handlers/bbcode_handler.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index 0735df474..6316fb84f 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -238,7 +238,7 @@ City, State, Country
 		<core name="user_new_period">3</core>
 		<core name="user_tracking">cookie</core>
 		<core name="wmessage_sc">0</core>
-		<core name="wysiwyg">0</core>
+		<core name="wysiwyg">1</core>
 		<core name="xup_enabled">1</core>
 		<core name="xmlfeed_languagepacks">http://www.e107.org/themeupdate.php</core>
 		<core name="xmlfeed_security">http://www.e107.org/themeupdate.php</core>	
diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index 0eebbbc01..38ac18c04 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -559,11 +559,11 @@ class e_bbcode
 					
 		$text = preg_replace("/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/i","[link=$1]$2[/link]",$text);
 		$text = preg_replace('/<div style="text-align: ([\w]*);">([\s\S]*)<\/div>/i',"[$1]$2[/$1]",$text); // verified
-		$text = preg_replace('/<div class="bbcode-(?:[\w]*)" style="text-align: ([\w]*);">([\s\S]*)<\/div>/i',"[$1]$2[/$1]",$text); // left / right / center
+		$text = preg_replace('/<div class="bbcode-(?:[\w]*).* style="text-align: ([\w]*);">([\s\S]*)<\/div>/i',"[$1]$2[/$1]",$text); // left / right / center
 		$text = preg_replace('/<img(?:\s*)?(?:style="([^"]*)")?\s?(?:src="([^"]*)")(?:\s*)?(?:alt="(\S*)")?(?:\s*)?(?:width="([\d]*)")?\s*(?:height="([\d]*)")?(?:\s*)?\/>/i',"[img style=width:$4px;height:$5px;$1]$2[/img]",$text );
 		$text = preg_replace('/<img class="(?:[^"]*)"(?:\s*)?(?:style="([^"]*)")?\s?(?:src="([^"]*)")(?:\s*)?(?:alt="(\S*)")?(?:\s*)?(?:width="([\d]*)")?\s*(?:height="([\d]*)")?(?:\s*)?\/>/i',"[img style=width:$4px;height:$5px;$1]$2[/img]",$text );
 	//	$text = preg_replace('/<span (?:class="bbcode-color" )?style=\"color: ?(.*?);\">(.*?)<\/span>/i',"[color=$1]$2[/color]",$text);
-		$text = preg_replace('/<span (?:class="bbcode underline bbcode-u" )?style="text-decoration: underline;">(.*?)<\/span>/i',"[u]$1[/u]",$text);
+		$text = preg_replace('/<span (?:class="bbcode underline bbcode-u)(?:[^>]*)>(.*?)<\/span>/i',"[u]$1[/u]",$text);
 	//	$text = preg_replace('/<table([^"]*)>/i', "[table $1]",$text);
 		$text = preg_replace('/<table style="([^"]*)"([\w ="]*)?>/i', "[table style=$1]\n",$text);
 		$text = preg_replace('/<table([\w :\-_;="]*)?>/i', "[table]\n",$text);