From a6406ea0d35b44a85bf8250c09be54c1edf2e594 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sat, 16 Jan 2021 05:39:32 -0800
Subject: [PATCH] Javascript fixes for TimeZone cookie and Twitter menu.

---
 e107_plugins/social/twitter_menu.php | 14 +++-----------
 e107_web/js/core/all.jquery.js       |  4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/e107_plugins/social/twitter_menu.php b/e107_plugins/social/twitter_menu.php
index c94ecd3a8..4e20d48ca 100644
--- a/e107_plugins/social/twitter_menu.php
+++ b/e107_plugins/social/twitter_menu.php
@@ -8,31 +8,23 @@
 *
 */
 
-//@see https://dev.twitter.com/web/embedded-timelines
+//@see https://publish.twitter.com/
 e107::lan('social',false, true);
 
 if(deftrue('XURL_TWITTER'))	
 {
 
-	e107::js('footer-inline',	'
-
-	!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?\'http\':\'https\';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
-
-	');
-
-
 	$pref = e107::pref('social');
 
 	$screenName     = basename(XURL_TWITTER);
 	$limit          = vartrue($pref['twitter_menu_limit'], 5);
 	$height         = vartrue($pref['twitter_menu_height'], 600);
 	$theme          = vartrue($pref['twitter_menu_theme'], 'light');
-	$widgetId       = '585932823665647616'; //@e107
 
 
+	$extras = 'data-theme="'.$theme.'" data-tweet-limit="'.$limit.'"  style="height:'.$height.'px;max-width:100%" data-screen-name="'.$screenName.'" data-chrome="noheader nofooter transparent noscrollbar"';
 
-	$text = '<a class="twitter-timeline" data-theme="'.$theme.'" href="'.XURL_TWITTER.'" data-tweet-limit="'.$limit.'" data-widget-id="'.$widgetId.'" style="height:'.$height.'px;max-width:100%" data-screen-name="'.$screenName.'" data-chrome="noheader nofooter transparent noscrollbar">'.LAN_SOCIAL_201."@".$screenName.'</a>';
-
+	$text = '<a class="twitter-timeline" href="https://twitter.com/'.$screenName.'?ref_src=twsrc%5Etfw" '.$extras.'>'.LAN_SOCIAL_201."@".$screenName.'</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>';
 
 	e107::getRender()->tablerender('Twitter',$text,'twitter-menu');
 
diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js
index 6ade325de..a7cfa0534 100644
--- a/e107_web/js/core/all.jquery.js
+++ b/e107_web/js/core/all.jquery.js
@@ -1557,14 +1557,14 @@ function SyncWithServerTime(serverTime, path, domain)
 		if(!domain) domain = '';
 		else domain = '; domain=' + domain;
 	  	document.cookie = 'e107_tdOffset='+serverDelta+'; path='+path+domain;
-	  	document.cookie = 'e107_tdSetTime='+(localTime-serverDelta)+'; path='+path+domain; /* server time when set */
+	  	document.cookie = 'e107_tdSetTime='+(localTime-serverDelta)+'; path='+path+domain+'; samesite=strict'; /* server time when set */
 	}
 
 	var tzCookie = 'e107_tzOffset=';
 //	if (document.cookie.indexOf(tzCookie) < 0) {
 		/* set if not already set */
 		var timezoneOffset = nowLocal.getTimezoneOffset(); /* client-to-GMT in minutes */
-		document.cookie = tzCookie + timezoneOffset+'; path='+path+domain;
+		document.cookie = tzCookie + timezoneOffset+'; path='+path+domain+'; samesite=strict';
 //	}
 }