From 54fe5e102e0c497fdbd16127a14a36fdf7697a59 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 8 Jun 2016 16:26:58 +0900
Subject: [PATCH] Allow id attributes starting with 'user_content_'

---
 common/framework/filters/htmlfilter.php         |  3 ++-
 tests/unit/framework/filters/HTMLFilterTest.php | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/framework/filters/htmlfilter.php b/common/framework/filters/htmlfilter.php
index dc6e6a7b6..0aa0f3dcf 100644
--- a/common/framework/filters/htmlfilter.php
+++ b/common/framework/filters/htmlfilter.php
@@ -106,7 +106,8 @@ class HTMLFilter
 			// Customize the default configuration.
 			$config->set('Attr.AllowedFrameTargets', array('_blank'));
 			$config->set('Attr.DefaultImageAlt', '');
-			$config->set('Attr.EnableID', false);
+			$config->set('Attr.EnableID', true);
+			$config->set('Attr.IDPrefix', 'user_content_');
 			$config->set('AutoFormat.AutoParagraph', false);
 			$config->set('AutoFormat.DisplayLinkURI', false);
 			$config->set('AutoFormat.Linkify', false);
diff --git a/tests/unit/framework/filters/HTMLFilterTest.php b/tests/unit/framework/filters/HTMLFilterTest.php
index f388118db..1e609cdce 100644
--- a/tests/unit/framework/filters/HTMLFilterTest.php
+++ b/tests/unit/framework/filters/HTMLFilterTest.php
@@ -105,7 +105,7 @@ class HTMLFilterTest extends \Codeception\TestCase\Test
 		$target = '<iframe title="Video Test" width="640" height="360" frameborder="0" scrolling="no"></iframe>';
 		$this->assertEquals($target, Rhymix\Framework\Filters\HTMLFilter::clean($source));
 		
-		$source = '<object type="application/x-shockwave-flash" id="DaumVodPlayer_s474b7BR2zzREo0g7OT7EKo" width="640px" height="360px" align="middle" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=10,3,0,0">' .
+		$source = '<object type="application/x-shockwave-flash" width="640px" height="360px" align="middle" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=10,3,0,0">' .
 			'<param name="movie" value="http://videofarm.daum.net/controller/player/VodPlayer.swf" />' .
 			'<param name="allowScriptAccess" value="always" />' .
 			'<param name="allowFullScreen" value="true" />' .
@@ -153,11 +153,22 @@ class HTMLFilterTest extends \Codeception\TestCase\Test
 		$this->assertEquals($target, Rhymix\Framework\Filters\HTMLFilter::clean($source));
 		
 		$source = '<div somekey="somevalue" otherkey="othervalue" onload="alert(\'xss\');" id="foo" class="bar" editor_component="component_name"></div>';
-		$target = '<div somekey="somevalue" otherkey="othervalue" class="bar" editor_component="component_name"></div>';
+		$target = '<div somekey="somevalue" otherkey="othervalue" id="user_content_foo" class="bar" editor_component="component_name"></div>';
 		$this->assertEquals($target, Rhymix\Framework\Filters\HTMLFilter::clean($source));
 		
 		$source = '<div editor_component="component_name" style="width:400px;height:300px;" draggable dropzone contextmenu="whatever"></div>';
 		$target = '<div editor_component="component_name" style="width:400px;height:300px;"></div>';
 		$this->assertEquals($target, Rhymix\Framework\Filters\HTMLFilter::clean($source));
 	}
+	
+	public function testHTMLFilterUserContentID()
+	{
+		$source = '<p id="foobar">Hello World!</p>';
+		$target = '<p id="user_content_foobar">Hello World!</p>';
+		$this->assertEquals($target, Rhymix\Framework\Filters\HTMLFilter::clean($source));
+		
+		$source = '<p id="user_content_foobar">Hello World!</p>';
+		$target = '<p id="user_content_foobar">Hello World!</p>';
+		$this->assertEquals($target, Rhymix\Framework\Filters\HTMLFilter::clean($source));
+	}
 }