From a1e8d14b0dbc7543466686ca5fdb12d7e5047028 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 16 Feb 2016 15:27:41 +0900
Subject: [PATCH] Move whitelist file to common location

---
 classes/security/EmbedFilter.class.php          |  4 +---
 .../conf => common/defaults}/whitelist.php      | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)
 rename {classes/security/conf => common/defaults}/whitelist.php (99%)

diff --git a/classes/security/EmbedFilter.class.php b/classes/security/EmbedFilter.class.php
index a8d473ddb..2f90a753e 100644
--- a/classes/security/EmbedFilter.class.php
+++ b/classes/security/EmbedFilter.class.php
@@ -15,7 +15,6 @@ class EmbedFilter
 	 * @var int
 	 */
 	var $allowscriptaccessKey = 0;
-	var $whiteUrlDefaultFile = './classes/security/conf/whitelist.php';
 	var $whiteUrlList = array();
 	var $whiteIframeUrlList = array();
 	var $mimeTypeList = array();
@@ -257,8 +256,7 @@ class EmbedFilter
 	 */
 	function _makeWhiteDomainList($whitelist = NULL)
 	{
-		$whiteUrlDefaultFile = FileHandler::getRealPath($this->whiteUrlDefaultFile);
-		$whiteUrlDefaultList = (include $whiteUrlDefaultFile);
+		$whiteUrlDefaultList = (include RX_BASEDIR . 'common/defaults/whitelist.php');
 		$this->extList = $whiteUrlDefaultList['extensions'];
 		$this->mimeTypeList = $whiteUrlDefaultList['mime'];
 		$this->whiteUrlList = array();
diff --git a/classes/security/conf/whitelist.php b/common/defaults/whitelist.php
similarity index 99%
rename from classes/security/conf/whitelist.php
rename to common/defaults/whitelist.php
index abd276136..272da733b 100644
--- a/classes/security/conf/whitelist.php
+++ b/common/defaults/whitelist.php
@@ -1,8 +1,15 @@
 <?php
 
+/**
+ * Rhymix Default iframe/object/iframe Whitelist
+ * 
+ * Copyright (c) Rhymix Developers and Contributors
+ */
 return array(
 	
-	// Allowed domains in <object> or <embed> tag
+	/**
+	 * Allowed domains in <object> or <embed> tag
+	 */
 	'object' => array(
 		// YouTube
 		'www.youtube.com/',
@@ -49,7 +56,9 @@ return array(
 		'sbsplayer.sbs.co.kr/',
 	),
 	
-	// Allowed domains in <iframe> tag
+	/**
+	 * Allowed domains in <iframe> tag
+	 */
 	'iframe' => array(
 		// YouTube
 		'www.youtube.com/',
@@ -69,7 +78,9 @@ return array(
 		'afree.ca/',
 	),
 	
-	// Allowed extensions
+	/**
+	 * Allowed extensions in <object> or <embed> tag
+	 */
 	'extensions' => array(
 		'123' => 1,
 		'3ds' => 1,