Merge branch 'master' of https://github.com/friendica/red

2 files changed, 31 insertions, 7 deletions

diff --git a/include/network.php b/include/network.php
index 170b77d7d..224d9d5e1 100644
--- a/include/network.php
+++ b/include/network.php
@@ -464,24 +464,47 @@ function allowed_email($email) {
 		return false;
 
 	$str_allowed = get_config('system','allowed_email');
-	if(! $str_allowed)
+	$str_not_allowed = get_config('system','not_allowed_email');
+		
+	if(! $str_allowed && ! $str_not_allowed)
 		return true;
 
-	$found = false;
-
+	$return = false;
+	$found_allowed = false;	
+	$found_not_allowed = false;
+	
 	$fnmatch = function_exists('fnmatch');
+
 	$allowed = explode(',',$str_allowed);
 
 	if(count($allowed)) {
 		foreach($allowed as $a) {
 			$pat = strtolower(trim($a));
-			if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
-				$found = true; 
+			if(($fnmatch && fnmatch($pat,$email)) || ($pat == $domain)) {
+				$found_allowed = true; 
 				break;
 			}
 		}
 	}
-	return $found;
+
+	$not_allowed = explode(',',$str_not_allowed);
+
+	if(count($not_allowed)) {
+		foreach($not_allowed as $na) {
+			$pat = strtolower(trim($na));
+			if(($fnmatch && fnmatch($pat,$email)) || ($pat == $domain)) {
+				$found_not_allowed = true; 
+				break;
+			}
+		}
+	}	
+	
+	if ($found_allowed) {
+		$return = true;	
+	} elseif (!$str_allowed && !$found_not_allowed) {
+		$return = true;	
+	}
+	return $return;
 }
 
 
diff --git a/include/text.php b/include/text.php
index b6e4abf24..47694a17c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -898,7 +898,8 @@ function sslify($s) {
 	$cnt = preg_match_all("/\<(.*?)src=\"(http\:.*?)\"(.*?)\>/",$s,$matches,PREG_SET_ORDER);
 	if($cnt) {
 		foreach($matches as $match) {
-			$s = str_replace($match[2],z_root() . '/sslify?f=&url=' . urlencode($match[2]),$s);
+			$filename = basename( parse_url($match[2],PHP_URL_PATH) );
+			$s = str_replace($match[2],z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($match[2]),$s);
 		}
 	}
 	return $s;