Merge remote-tracking branch 'upstream/master'

1 files changed, 28 insertions, 0 deletions

diff --git a/include/oembed.php b/include/oembed.php
index 7c577b6c2..cac0154f6 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -3,6 +3,34 @@ function oembed_replacecb($matches){
 
 	$embedurl=$matches[1];
 
+
+	// site white/black list
+
+	if(($x = get_config('system','embed_deny'))) {
+		$l = explode("\n",$x);
+		if($l) {
+			foreach($l as $ll) {
+				if(trim($ll) && strpos($embedurl,trim($ll)) !== false)
+					return '<a href="' . $embedurl . '">' . $embedurl . '</a>';
+			}
+		}
+	}
+	if(($x = get_config('system','embed_allow'))) {
+		$found = false;
+		$l = explode("\n",$x);
+		if($l) {
+			foreach($l as $ll) {
+				if(trim($ll) && strpos($embedurl,trim($ll)) !== false) {
+					$found = true;
+					break;
+				}
+			}
+		}
+		if(! $found) {
+			return '<a href="' . $embedurl . '">' . $embedurl . '</a>';
+		}
+	}
+
 	// implements a personal embed white/black list for logged in members
 	if(local_channel()) {
 		if(($x = get_pconfig(local_channel(),'system','embed_deny'))) {