share youtube videos

4 files changed, 92 insertions, 74 deletions

diff --git a/include/bbcode.php b/include/bbcode.php
index 674c44ec2..f1eb47bd3 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,78 +1,82 @@
 <?php
-   //BBcode 2 HTML was written by WAY2WEB.net
-
-   function bbcode($Text)
-       {
-         // Replace any html brackets with HTML Entities to prevent executing HTML or script
-            // Don't use strip_tags here because it breaks [url] search by replacing & with amp
-            $Text = str_replace("<", "&lt;", $Text);
-            $Text = str_replace(">", "&gt;", $Text);
-
-            // Convert new line chars to html <br /> tags
-            $Text = nl2br($Text);
-
-            // Set up the parameters for a URL search string
-            $URLSearchString = " a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'";
-            // Set up the parameters for a MAIL search string
-            $MAILSearchString = $URLSearchString . " a-zA-Z0-9\.@";
-
-            // Perform URL Search
-            $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="_blank">$1</a>', $Text);
-            $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="_blank">$2</a>', $Text);
-         //$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '<a href="$1" target="_blank">$2</a>', $Text);
-
-            // Perform MAIL Search
-            $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '<a href="mailto:$1">$1</a>', $Text);
-            $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.+?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $Text);
-         
-            // Check for bold text
-            $Text = preg_replace("(\[b\](.+?)\[\/b])is",'<strong>$1</strong>',$Text);
-
-            // Check for Italics text
-            $Text = preg_replace("(\[i\](.+?)\[\/i\])is",'<em>$1</em>',$Text);
-
-            // Check for Underline text
-            $Text = preg_replace("(\[u\](.+?)\[\/u\])is",'<u>$1</u>',$Text);
-
-            // Check for strike-through text
-            $Text = preg_replace("(\[s\](.+?)\[\/s\])is",'<strike>$1</strike>',$Text);
-
-            // Check for over-line text
-            $Text = preg_replace("(\[o\](.+?)\[\/o\])is",'<span class="overline">$1</span>',$Text);
-
-            // Check for colored text
-            $Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","<span style=\"color: $1\">$2</span>",$Text);
-
-            // Check for sized text
-            $Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","<span style=\"font-size: $1px\">$2</span>",$Text);
-
-            // Check for list text
-            $Text = preg_replace("/\[list\](.+?)\[\/list\]/is", '<ul class="listbullet">$1</ul>' ,$Text);
-            $Text = preg_replace("/\[list=1\](.+?)\[\/list\]/is", '<ul class="listdecimal">$1</ul>' ,$Text);
-            $Text = preg_replace("/\[list=i\](.+?)\[\/list\]/s",'<ul class="listlowerroman">$1</ul>' ,$Text);
-            $Text = preg_replace("/\[list=I\](.+?)\[\/list\]/s", '<ul class="listupperroman">$1</ul>' ,$Text);
-            $Text = preg_replace("/\[list=a\](.+?)\[\/list\]/s", '<ul class="listloweralpha">$1</ul>' ,$Text);
-            $Text = preg_replace("/\[list=A\](.+?)\[\/list\]/s", '<ul class="listupperalpha">$1</ul>' ,$Text);
-            $Text = str_replace("[*]", "<li>", $Text);
-
-            // Check for font change text
-            $Text = preg_replace("(\[font=(.+?)\](.+?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text);
-
-            // Declare the format for [code] layout
-            $CodeLayout = '<code>$1</code>';
-            // Check for [code] text
-            $Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text);
-            // Declare the format for [quote] layout
-            $QuoteLayout = '<blockquote>$1</blockquote>';                     
-            // Check for [quote] text
-            $Text = preg_replace("/\[quote\](.+?)\[\/quote\]/is","$QuoteLayout", $Text);
+	// BBcode 2 HTML was written by WAY2WEB.net
+	// Made to work with Mistpark - Mike Macgirvin
+
+function bbcode($Text) {
+	// Replace any html brackets with HTML Entities to prevent executing HTML or script
+	// Don't use strip_tags here because it breaks [url] search by replacing & with amp
+	$Text = str_replace("<", "&lt;", $Text);
+	$Text = str_replace(">", "&gt;", $Text);
+
+	// Convert new line chars to html <br /> tags
+	$Text = nl2br($Text);
+
+	// Set up the parameters for a URL search string
+	$URLSearchString = " a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'";
+	// Set up the parameters for a MAIL search string
+	$MAILSearchString = $URLSearchString . " a-zA-Z0-9\.@";
+
+	// Perform URL Search
+	$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="_blank">$1</a>', $Text);
+	$Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="_blank">$2</a>', $Text);
+	//$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '<a href="$1" target="_blank">$2</a>', $Text);
+
+	// Perform MAIL Search
+	$Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '<a href="mailto:$1">$1</a>', $Text);
+	$Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.+?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $Text);
          
-            // Images
-            // [img]pathtoimage[/img]
-            $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1">', $Text);
+	// Check for bold text
+	$Text = preg_replace("(\[b\](.+?)\[\/b])is",'<strong>$1</strong>',$Text);
+
+	// Check for Italics text
+	$Text = preg_replace("(\[i\](.+?)\[\/i\])is",'<em>$1</em>',$Text);
+
+	// Check for Underline text
+	$Text = preg_replace("(\[u\](.+?)\[\/u\])is",'<u>$1</u>',$Text);
+
+	// Check for strike-through text
+	$Text = preg_replace("(\[s\](.+?)\[\/s\])is",'<strike>$1</strike>',$Text);
+
+	// Check for over-line text
+	$Text = preg_replace("(\[o\](.+?)\[\/o\])is",'<span class="overline">$1</span>',$Text);
+
+	// Check for colored text
+	$Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","<span style=\"color: $1\">$2</span>",$Text);
+
+	// Check for sized text
+	$Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","<span style=\"font-size: $1px\">$2</span>",$Text);
+
+	// Check for list text
+	$Text = preg_replace("/\[list\](.+?)\[\/list\]/is", '<ul class="listbullet">$1</ul>' ,$Text);
+	$Text = preg_replace("/\[list=1\](.+?)\[\/list\]/is", '<ul class="listdecimal">$1</ul>' ,$Text);
+	$Text = preg_replace("/\[list=i\](.+?)\[\/list\]/s",'<ul class="listlowerroman">$1</ul>' ,$Text);
+	$Text = preg_replace("/\[list=I\](.+?)\[\/list\]/s", '<ul class="listupperroman">$1</ul>' ,$Text);
+	$Text = preg_replace("/\[list=a\](.+?)\[\/list\]/s", '<ul class="listloweralpha">$1</ul>' ,$Text);
+	$Text = preg_replace("/\[list=A\](.+?)\[\/list\]/s", '<ul class="listupperalpha">$1</ul>' ,$Text);
+	$Text = str_replace("[*]", "<li>", $Text);
+
+	// Check for font change text
+	$Text = preg_replace("(\[font=(.+?)\](.+?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text);
+
+	// Declare the format for [code] layout
+	$CodeLayout = '<code>$1</code>';
+	// Check for [code] text
+	$Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text);
+	// Declare the format for [quote] layout
+	$QuoteLayout = '<blockquote>$1</blockquote>';                     
+	// Check for [quote] text
+	$Text = preg_replace("/\[quote\](.+?)\[\/quote\]/is","$QuoteLayout", $Text);
          
-            // [img=widthxheight]image source[/img]
-            $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '<img src="$3" height="$2" width="$1">', $Text);
+	// Images
+	// [img]pathtoimage[/img]
+	$Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1">', $Text);
          
-           return $Text;
-      }
+	// [img=widthxheight]image source[/img]
+	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '<img src="$3" height="$2" width="$1">', $Text);
+
+	// Youtube extensions
+        $Text = preg_replace("/\[youtube\]http:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); 
+	$Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/$1"></param><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350"></embed></object>', $Text);
+
+	return $Text;
+}
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 22e425463..b13a324bb 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -73,6 +73,13 @@ tinyMCE.init({
 		}
 	}
 
+	function jotGetVideo() {
+		reply = prompt("Please enter a YouTube link:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
+		}
+	}
+
 	function linkdropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
 		if(linkFound)
diff --git a/view/jot.tpl b/view/jot.tpl
index 718277210..481ab125b 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -21,6 +21,9 @@
 	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
 		<img id="profile-link" src="images/link-icon.gif" alt="Insert web link" title="Insert web link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
 	</div> 
+	<div id="profile-youtube-wrapper" style="display: $visitor;" >
+		<img id="profile-video" src="images/youtube_icon.gif" alt="Insert YouTube video" title="Insert YouTube video" onclick="jotGetVideo();" />
+	</div> 
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
 	</div> 
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 53bbbd7a9..872fb1f61 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -716,6 +716,10 @@ input#dfrn-url {
 	float: left;
 	margin-left: 20px;
 }
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 20px;
+}
 
 #profile-jot-perms {
 	float: left;