From d126924ae0a9c9dd2b9b96e107e44848078b6bde Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Wed, 2 Oct 2013 22:17:56 +0200
Subject: [PATCH] Vimeo videos are now embedded via SSL.

---
 include/bbcode.php   | 7 ++++---
 include/diaspora.php | 7 +++----
 include/notifier.php | 8 +++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index f07c1aa6c..0f8c2df74 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -38,7 +38,8 @@ function tryoembed($match){
 	$url = ((count($match)==2)?$match[1]:$match[2]);
 
 	// Always embed the SSL version
-	$url = str_replace("http://www.youtube.com/", "https://www.youtube.com/", $url);
+	$url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
+				array("https://www.youtube.com/", "https://player.vimeo.com/"), $url);
 
 	//logger("tryoembed: $url");
 
@@ -666,9 +667,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	$Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
 
 	if ($tryoembed)
-		$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="http://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
+		$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="https://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
 	else
-		$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
+		$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "https://vimeo.com/$1", $Text);
 
 //	$Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
 
diff --git a/include/diaspora.php b/include/diaspora.php
index 4f1eb2223..f4ce6cb76 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2667,16 +2667,15 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch,$queue_run=false)
 		$return_code = 0;
 	}
 	else {
-		if(! intval(get_config('system','diaspora_test'))) {
+		if (!intval(get_config('system','diaspora_test'))) {
 			post_url($dest_url . '/', $slap);
 			$return_code = $a->get_curl_code();
-		}
-		else {
+		} else {
 			logger('diaspora_transmit: test_mode');
 			return 200;
 		}
 	}
-	
+
 	logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_code);
 
 	if((! $return_code) || (($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))) {
diff --git a/include/notifier.php b/include/notifier.php
index 74597c30d..3f9c286ed 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -663,7 +663,7 @@ function notifier_run(&$argv, &$argc){
 
 							// if contact's ssl policy changed, which we just determined
 							// is on our own server, update our contact links
-							
+
 							$ssl_policy = get_config('system','ssl_policy');
 							fix_contact_ssl_policy($x[0],$ssl_policy);
 
@@ -675,17 +675,15 @@ function notifier_run(&$argv, &$argc){
 							require_once('library/simplepie/simplepie.inc');
 							logger('mod-delivery: local delivery');
 							local_delivery($x[0],$atom);
-							break;					
+							break;
 						}
 					}
 
-
-
 					logger('notifier: dfrndelivery: ' . $contact['name']);
 					$deliver_status = dfrn_deliver($owner,$contact,$atom);
 
 					logger('notifier: dfrn_delivery returns ' . $deliver_status);
-	
+
 					if($deliver_status == (-1)) {
 						logger('notifier: delivery failed: queuing message');
 						// queue message for redelivery