From 1daf9b7264616505b5721f7f402103de9a2eea8e Mon Sep 17 00:00:00 2001
From: fuze <fuze@localhost>
Date: Fri, 8 Apr 2016 09:26:20 +0300
Subject: [PATCH] release

---
 system/config/version.ini                          | 2 +-
 system/controllers/typograph/hooks/html_filter.php | 2 +-
 wysiwyg/redactor/js/video.js                       | 8 ++++++--
 wysiwyg/redactor/wysiwyg.class.php                 | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/system/config/version.ini b/system/config/version.ini
index 300986d76..33851ec82 100755
--- a/system/config/version.ini
+++ b/system/config/version.ini
@@ -2,4 +2,4 @@
 major = 2
 minor = 5
 build = 0
-date = 20160407
\ No newline at end of file
+date = 20160408
\ No newline at end of file
diff --git a/system/controllers/typograph/hooks/html_filter.php b/system/controllers/typograph/hooks/html_filter.php
index 4891442c4..e37115cbd 100755
--- a/system/controllers/typograph/hooks/html_filter.php
+++ b/system/controllers/typograph/hooks/html_filter.php
@@ -63,7 +63,7 @@ private function getJevix($is_auto_br){
         $jevix->cfgAllowTagParams('object', array('width' => '#int', 'height' => '#int', 'data' => array('#domain'=>array('youtube.com','rutube.ru','vimeo.com','vk.com')), 'type' => '#text'));
         $jevix->cfgAllowTagParams('param', array('name' => '#text', 'value' => '#text'));
         $jevix->cfgAllowTagParams('embed', array('src' => array('#domain'=>array('youtube.com','rutube.ru','vimeo.com','vk.com')), 'type' => '#text','allowscriptaccess' => '#text', 'allowfullscreen' => '#text','width' => '#int', 'height' => '#int', 'flashvars'=> '#text', 'wmode'=> '#text'));
-        $jevix->cfgAllowTagParams('iframe', array('width' => '#int', 'height' => '#int', 'style' => '#text', 'frameborder' => '#int', 'allowfullscreen' => '#text', 'src' => array('#domain'=>array('youtube.com','rutube.ru','vimeo.com','vk.com','my.mail.ru'))));
+        $jevix->cfgAllowTagParams('iframe', array('width' => '#int', 'height' => '#int', 'style' => '#text', 'frameborder' => '#int', 'allowfullscreen' => '#text', 'src' => array('#domain'=>array('youtube.com','rutube.ru','vimeo.com','vk.com','my.mail.ru','facebook.com'))));
         $jevix->cfgAllowTagParams('table', array('width' => '#int', 'height' => '#int', 'cellpadding' => '#int', 'cellspacing' => '#int', 'border' => '#int', 'style' => '#text', 'align'=>'#text', 'valign'=>'#text'));
         $jevix->cfgAllowTagParams('td', array('width' => '#int', 'height' => '#int', 'style' => '#text', 'align'=>'#text', 'valign'=>'#text', 'colspan'=>'#int', 'rowspan'=>'#int'));
         $jevix->cfgAllowTagParams('th', array('width' => '#int', 'height' => '#int', 'style' => '#text', 'align'=>'#text', 'valign'=>'#text', 'colspan'=>'#int', 'rowspan'=>'#int'));
diff --git a/wysiwyg/redactor/js/video.js b/wysiwyg/redactor/js/video.js
index d71dec48b..df445cc47 100755
--- a/wysiwyg/redactor/js/video.js
+++ b/wysiwyg/redactor/js/video.js
@@ -5,6 +5,7 @@
 		return {
 			reUrlYoutube: /https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig,
 			reUrlVimeo: /https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/,
+			reUrlFacebook: /https?:\/\/(?:www\.)?(?:facebook\.com(?:\/[^/\/]+\/videos\/|\/video.php\?v=))([0-9]+)(?:.+)?/,
 			getTemplate: function()
 			{
 				return String()
@@ -37,12 +38,11 @@
 			insert: function()
 			{
 				var data = $('#redactor-insert-video-area').val();
-
 				if (!data.match(/<iframe|<video/gi))
 				{
 					data = this.clean.stripTags(data);
 
-					// parse if it is link on youtube & vimeo
+					// parse if it is link on youtube, vimeo, FB
 					var iframeStart = '<iframe style="width: 500px; height: 281px;" src="',
 						iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
 
@@ -54,6 +54,10 @@
 					{
 						data = data.replace(this.video.reUrlVimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
 					}
+					else if (data.match(this.video.reUrlFacebook))
+					{
+						data = data.replace(this.video.reUrlFacebook, iframeStart + 'https://www.facebook.com/video/embed?video_id=$1' + iframeEnd);
+					}
 				}
 
 				this.selection.restore();
diff --git a/wysiwyg/redactor/wysiwyg.class.php b/wysiwyg/redactor/wysiwyg.class.php
index 7e343e981..4699ee2e0 100755
--- a/wysiwyg/redactor/wysiwyg.class.php
+++ b/wysiwyg/redactor/wysiwyg.class.php
@@ -32,6 +32,7 @@ public function displayEditor($field_id, $content=''){
 						minHeight: 190,
                         replaceDivs: false,
                         removeComments: true,
+                        convertLinks: false,
                         //linkNofollow: true,
 						<?php if ($user->is_admin) { ?>
                             buttonSource: true