mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Javascript fixes for TimeZone cookie and Twitter menu.

Browse Source
This commit is contained in:
Cameron
2021-01-16 05:39:32 -08:00
parent 4553da0852
commit a6406ea0d3
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_plugins/social/twitter_menu.php
View File

@@ -8,31 +8,23 @@
* *
*/ */
//@see https://dev.twitter.com/web/embedded-timelines //@see https://publish.twitter.com/
e107::lan('social',false, true); e107::lan('social',false, true);
if(deftrue('XURL_TWITTER')) 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'); $pref = e107::pref('social');
$screenName = basename(XURL_TWITTER); $screenName = basename(XURL_TWITTER);
$limit = vartrue($pref['twitter_menu_limit'], 5); $limit = vartrue($pref['twitter_menu_limit'], 5);
$height = vartrue($pref['twitter_menu_height'], 600); $height = vartrue($pref['twitter_menu_height'], 600);
$theme = vartrue($pref['twitter_menu_theme'], 'light'); $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'); e107::getRender()->tablerender('Twitter',$text,'twitter-menu');

4
e107_web/js/core/all.jquery.js
View File

@@ -1557,14 +1557,14 @@ function SyncWithServerTime(serverTime, path, domain)
if(!domain) domain = ''; if(!domain) domain = '';
else domain = '; domain=' + domain; else domain = '; domain=' + domain;
document.cookie = 'e107_tdOffset='+serverDelta+'; path='+path+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='; var tzCookie = 'e107_tzOffset=';
// if (document.cookie.indexOf(tzCookie) < 0) { // if (document.cookie.indexOf(tzCookie) < 0) {
/* set if not already set */ /* set if not already set */
var timezoneOffset = nowLocal.getTimezoneOffset(); /* client-to-GMT in minutes */ 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';
// } // }
} }