From 5aeb8305fc5162a7ef2ef5c64827087dd673f47c Mon Sep 17 00:00:00 2001
From: Jeroen van Riet Paap <jeroenpraat@users.noreply.github.com>
Date: Sat, 3 Dec 2016 11:47:10 +0100
Subject: Fix full screen for embedded videos

---
 include/oembed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/oembed.php b/include/oembed.php
index 52fb04058..eb7b76437 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -338,7 +338,7 @@ function oembed_iframe($src,$width,$height) {
 
 	// Make sure any children are sandboxed within their own iframe.
 
-	return '<iframe ' . $scroll . 'height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' 
+	return '<iframe ' . $scroll . 'height="' . $height . '" width="' . $width . '" src="' . $s . '" allowfullscreen frameborder="no" >' 
 		. t('Embedded content') . '</iframe>'; 
 
 }
-- 
cgit v1.2.3


From f5f1b9602a381193205d7089516dfbcb2ed2f84b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 3 Dec 2016 12:08:58 -0800
Subject: rename api endpoint yet again. item/store appears to be blacklisted
 in some hosting environments.

---
 include/api_zot.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/api_zot.php b/include/api_zot.php
index 2bbae244c..256339bad 100644
--- a/include/api_zot.php
+++ b/include/api_zot.php
@@ -28,8 +28,8 @@
 		api_register_func('api/z/1.0/group','api_group', true);
 		api_register_func('api/red/xchan','api_red_xchan',true);
 		api_register_func('api/z/1.0/xchan','api_red_xchan',true);
-		api_register_func('api/red/item/store','red_item_store', true);
-		api_register_func('api/z/1.0/item/store','red_item_store', true);
+		api_register_func('api/red/item/update','zot_item_update', true);
+		api_register_func('api/z/1.0/item/update','zot_item_update', true);
 		api_register_func('api/red/item/full','red_item', true);
 		api_register_func('api/z/1.0/item/full','red_item', true);
 
@@ -266,7 +266,7 @@
 		require_once('include/hubloc.php');
 
 		if($_SERVER['REQUEST_METHOD'] === 'POST') {
-			$r = xchan_store($_REQUEST);
+			// $r = xchan_store($_REQUEST);
 		}
 		$r = xchan_fetch($_REQUEST);
 		json_return_and_die($r);
@@ -341,7 +341,7 @@
 
 	}
 
-	function red_item_store($type) {
+	function zot_item_update($type) {
 
 		if (api_user() === false) {
 			logger('api_red_item_store: no user');
-- 
cgit v1.2.3


From 25ea754502d958d005c7666cfb229e81b5751e7c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 3 Dec 2016 13:16:04 -0800
Subject: item_store: parent wasn't being returned in api call

---
 include/items.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index e20c41d29..215f70031 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1813,6 +1813,7 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 		$x = q("update item set parent = id where id = %d",
 			intval($r[0]['id'])
 		);
+		$arr['parent'] = $r[0]['id'];
 	}
 
 
-- 
cgit v1.2.3


From b12d4c03cbc2627774b279f17a413860d868e854 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 4 Dec 2016 12:51:23 +0100
Subject: fixes for toc bbcode and bbcode wiki toc

---
 include/bbcode.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 6794fca96..396cbcb29 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -824,12 +824,14 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		$Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
 	}
 	// Check for table of content without params
-	if (strpos($Text,'[toc]') !== false) {
-		$Text = preg_replace("/\[toc\]/ism",'<ul id="toc"></ul>',$Text);
+	while(strpos($Text,'[toc]') !== false) {
+		$toc_id = 'toc-' . random_string(10);
+		$Text = preg_replace("/\[toc\]/ism",  '<strong>' . t('Contents:') . '</strong><ul id="' . $toc_id . '" class="toc" data-toc=".section-content-wrapper"></ul><script>$("#' . $toc_id . '").toc();</script>', $Text, 1);
 	}
 	// Check for table of content with params
-	if (strpos($Text,'[toc') !== false) {
-		$Text = preg_replace("/\[toc([^\]]+?)\]/ism",'<ul$1></ul>',$Text);
+	while(strpos($Text,'[toc') !== false) {
+		$toc_id = 'toc-' . random_string(10);
+		$Text = preg_replace("/\[toc([^\]]+?)\]/ism", '<strong>' . t('Contents:') . '</strong><ul id="' . $toc_id . '" class="toc"$1></ul><script>$("#' . $toc_id . '").toc();</script>', $Text, 1);
 	}
 	// Check for centered text
 	if (strpos($Text,'[/center]') !== false) {
-- 
cgit v1.2.3