diff -r 5f9b76ecccf0 -r 7c67caaafdeb web/client.php --- a/web/client.php Thu Dec 02 13:52:58 2021 +0100 +++ b/web/client.php Mon Nov 20 18:10:58 2023 +0100 @@ -15,7 +15,7 @@ /** * Do we already have a valid Access Token or need to go get one? */ -if (!isset($_SESSION['TWITTER_ACCESS_TOKEN']) && isset($_GET['CONNECT']) ) { +if (!isset($_SESSION['SOCIAL_ACCESS_TOKEN']) && isset($_GET['CONNECT']) ) { // /** // * Guess we need to go get one! // */ @@ -27,7 +27,8 @@ // * approve our access // */ // $consumer->redirect(); - $get_twitter_request_token(); + $socialDomain = $_GET['CONNECT']; + $get_social_request_token($socialDomain, $config); } else { if (isset($_SESSION['TWITTER_REDIRECT_URL'])) { unset($_SESSION['TWITTER_REDIRECT_URL']); @@ -51,7 +52,7 @@ (isset($config['islive_embed']) && $config['islive_embed']) || (isset($config['islive']) && $config['islive']); $videoWidth = ( $embed ? 412 : 480 ); $videoHeight = ( $embed ? 280 : 320 ); -if ($embed && !isset($_SESSION['TWITTER_ACCESS_TOKEN']) && (isset($_REQUEST['auth_redirect']) || isset($_SERVER['HTTP_REFERER']))) { +if ($embed && !isset($_SESSION['SOCIAL_ACCESS_TOKEN']) && (isset($_REQUEST['auth_redirect']) || isset($_SERVER['HTTP_REFERER']))) { $_SESSION['TWITTER_REDIRECT_URL'] = isset($_REQUEST['auth_redirect']) ? $_REQUEST['auth_redirect'] : $_SERVER['HTTP_REFERER']; }; @@ -74,7 +75,7 @@ Polemic Tweet — <?php echo($translate->_('config__title')); ?> - + ' rel='stylesheet' type='text/css'> ' rel='stylesheet' type='text/css'> @@ -116,11 +117,11 @@ $hVal = intval(($annot_def['colors']['h']<1.0)?floatval($annot_def['colors']['h']) * 360.0:$annot_def['colors']['h']); $sVal = intval(floatval($annot_def['colors']['s']) * 100.0); - $baseColor = "hsl($hVal, ${sVal}%, 90%)"; - $borderColor = "hsl($hVal, ${sVal}%, 60%)"; + $baseColor = "hsl($hVal, {$sVal}%, 90%)"; + $borderColor = "hsl($hVal, {$sVal}%, 60%)"; $selectedColor = "hsl($hVal, 15%, 70%)"; $selectedBorderColor = "hsl($hVal, 15%, 60%)"; - $gradientColor = "hsl($hVal, ${sVal}%, 50%)"; + $gradientColor = "hsl($hVal, {$sVal}%, 50%)"; ?> .tweetButton. { background: ; @@ -165,7 +166,7 @@ } } - + @@ -182,6 +183,9 @@ const TWEET_LENGTH = ; function updateCounter() { var _v = $("#status").val(); + if(!_v) { + return; + } var _tRes = twttr.txt.parseTweet(_v); if(_tRes.valid) { $('#tweetCounter').removeClass("tweetCounterNegative"); @@ -489,13 +493,13 @@
- +

_("ClientTitle1 :"); ?>

- ".$translate->_("Vous n'êtes pas connecté.")."
"); + ".$translate->_("Vous n'êtes pas connecté.")."
"); } else { echo(""); } @@ -527,7 +531,7 @@ - +
@@ -555,7 +559,7 @@ -

_('You must be connected with your Twitter account to read the conversation'); ?>

+

_('You must be connected with your Twitter account to read the conversation'); ?>

@@ -578,7 +582,7 @@ ".$translate->_('config__partenaires').""); - if (isset($_SESSION['TWITTER_ACCESS_TOKEN'])){ + if (isset($_SESSION['SOCIAL_ACCESS_TOKEN'])){ echo("| ".$translate->_("Déconnexion").""); } ?>