tweet_live: comparison web/client.php

equal deleted inserted replaced

-:7c67caaafdeb
+:761ba7426984
 //  * Now redirect user to Twitter site so they can log in and
 //  * approve our access
 //  */
 // $consumer->redirect();
 $socialDomain = $_GET['CONNECT'];
+if (isset($_SESSION['SOCIAL_AUTH_STATE'])) {
+unset($_SESSION['SOCIAL_AUTH_STATE']);
+}
 $get_social_request_token($socialDomain, $config);
 } else {
 if (isset($_SESSION['TWITTER_REDIRECT_URL'])) {
 unset($_SESSION['TWITTER_REDIRECT_URL']);
 }
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Polemic Tweet &mdash; <?php echo($translate->_('config__title')); ?></title>
 <meta http-equiv="X-UA-Compatible" content="IE=9" />
 <link rel="icon" type="image/x-icon" href="<?php echo(URL_ROOT); ?>images/favico.png">
-<!-- FONT -->
-<link href='<?php echo(registry_url('PT-Sans_Narrow','font'))?>' rel='stylesheet' type='text/css'>
-<link href='<?php echo(registry_url('PT-Sans','font'))?>' rel='stylesheet' type='text/css'>
 <!-- CSS -->
-<link rel="stylesheet" href="<?php echo(registry_url('fancybox','css'));?>" type="text/css" media="screen">
+<link href='<?php echo(URL_ROOT); ?>res/css/main.css' rel='stylesheet' type='text/css'/>
-<link rel="stylesheet" href="<?php echo(registry_url('tweetcast','css'));?>?v=210512" type="text/css" media="screen, projection"/>
+<link href='<?php echo(URL_ROOT); ?>res/css/vendors.css' rel='stylesheet' type='text/css'/>
-<link href="<?php echo(registry_url('videojs','css'));?>" rel="stylesheet"-->
 <link href='<?php echo(URL_ROOT); ?>res/css/common.css' rel='stylesheet' type='text/css'/>
 <!-- JAVASCRIPT -->
-<script type="text/javascript" src="<?php echo(registry_url('jquery','js'))?>"></script>
-<?php if( isset($_REQUEST['highlight']) && !empty($_REQUEST['highlight'])) { ?>
-<script type="text/javascript" src="<?php echo(registry_url('jquery-ui','js'))?>"></script>
-<?php } ?>
-<script type="text/javascript" src="<?php echo(registry_url('jquery-mousewheel','js'))?>"></script>
-<script type="text/javascript" src="<?php echo(registry_url('jquery-scrollto','js'))?>"></script>
-<script type="text/javascript" src="<?php echo(registry_url('underscore','js'))?>"></script>
-<script type="text/javascript" src="<?php echo(registry_url('raphael','js'))?>"></script>
-<script type="text/javascript" src="<?php echo(registry_url('fancybox','js'))?>"></script>
-<script type="text/javascript" src="<?php echo(registry_url('twitter-text','js'))?>"></script>
 <?php if( isset($config['additional_js']) && !empty($config['additional_js'])) {
 foreach ($config['additional_js'] as $jsUrl) {?>
 <script type="text/javascript" src="<?php echo($jsUrl)?>"></script>
 <?php }
 } ?>
 <?php } ?>
 </style>
 <script type="text/javascript">
 <?php
+echo "var social_network = '".$config['social_network']."';";
 if (isset($config['tracking_keywords']) && count($config['tracking_keywords'])) {
 echo "var tracking_keywords = ".json_encode($config['tracking_keywords']).';';
 } elseif (isset($config['hashtag'])) {
 echo "var tracking_keywords = ".json_encode(array($config['hashtag'])).";";
 }
 }
 }
 }
 </script>
 <?php if (isset($_SESSION['SOCIAL_ACCESS_TOKEN'])) { ?>
-<script type="text/javascript" src="<?php echo(registry_url('twcx-main','js'))?>"></script>
+<script type="text/javascript" src="<?php echo(URL_ROOT); ?>res/js/live-polemic.js"></script>
 <?php } ?>
 <script type="text/javascript">
 function add_grammar(value) {
 function updateCounter() {
 var _v = $("#status").val();
 if(!_v) {
 return;
 }
-var _tRes = twttr.txt.parseTweet(_v);
+var _tRes = twitter.parseTweet(_v);
 if(_tRes.valid) {
 $('#tweetCounter').removeClass("tweetCounterNegative");
 $('#sendTweet').prop("disabled",false);
 $('#sendTweet').removeClass("sendTweetDisabled");
 $('#tweetCounter').html("");
 $("#sendTweet").click(function(e){
 if($('#sendTweet').prop('disabled')) {
 return;
 }
 var MyStatus = $('#status').val();
-$.post('tweet_ajax.php', {status:MyStatus}
+$.post('tweet_ajax.php', {
+status:MyStatus,
+social_network: "<?php echo($config['social_network']) ?>",
+domain: "<?php echo(isset($_SESSION['SOCIAL_LOGIN_DOMAIN'])?$_SESSION['SOCIAL_LOGIN_DOMAIN']:'') ?>",
+hashtag: "<?php echo($config['hashtag']) ?>",
+group: "<?php echo($config['group'] ?? "") ?>"
+}
 ,function(data) {
 if(data=="true"){
 $("#messageSuccess").show('fast');
 $("#messageSuccess").delay(800).hide('slow');
 <?php
 if (isset($config['islive']) && $config['islive']) {
 $videofile = $translate->_('config__video_file');
 if ($videofile === 'config__video_file') $videofile = "https://media.iri.centrepompidou.fr/dash/livestream.mpd";
 ?>
-<script type="text/javascript" src="<?php echo(registry_url('dashjs','js'))?>"></script>
 <script type="text/javascript">
 (function(){
 var url = "<?php echo($videofile)?>";
 var player = dashjs.MediaPlayer().create();
 <div id="tweetWriter">
 <?php if (isset($_SESSION['SOCIAL_ACCESS_TOKEN'])): ?>
 <div id="tweetCounter"><?php echo(TWEET_LENGTH-strlen($config['hashtag']));?></div>
 <?php endif;?>
 <h3 class="tweetWriterTitle"><?php print $translate->_("ClientTitle1 :"); ?></h3>
-<form  action="tweet.php" method="post" id="statusform" >
 <?php if (!isset($_SESSION['SOCIAL_ACCESS_TOKEN'])){
-echo("<div class='loginbutton'><a href='".URL_ROOT."$rep/client.php?CONNECT=mastodon.svc.iri-research.org' target='_top' class='loginlink'>".$translate->_("Vous n'êtes pas connecté.")."</a></div>");
+$loginform  = "<div class='loginbutton'>";
+$socialNetwork = isset($config['social_network'])?$config['social_network']:'Twitter';
+if($socialNetwork === 'Twitter') {
+$loginform .= "<a href='".URL_ROOT."$rep/client.php?CONNECT=true' target='_top' class='loginlink'>".$translate->_("Vous n'êtes pas connecté.")."</a>";
+} else {
+$loginform .= "<form action='".URL_ROOT."$rep/client.php' method='GET' target='_top'>";
+$loginform .= "<div class='loginlink'>".$translate->_("Vous n'êtes pas connecté.")."</div>";
+$loginform .= "<input type='text' id='social_domain' name='CONNECT' value='mastodon.svc.iri-research.org'/>";
+$loginform .= "<input type='submit' value='Connect'/>";
+$loginform .= "</form>";
+}
+$loginform .= "</div>";
+echo($loginform);
 } else {
+echo('<form  action="tweet.php" method="post" id="statusform" >');
 echo("<textarea name='status' id='status' rows='3' cols='50'>$config[hashtag]</textarea>");
 }
 ?>
 <div id="messageSuccess" style="background-color:lightgreen; display: none;">
 <?php print $translate->_("Envoyé"); ?><br/><br/>
 <span class="twbLabel"><?php echo $display_parts[1]; ?></span>
 </a>
 <?php } ?>
 <div style="clear: both;"></div>
+<?php if (isset($_SESSION['SOCIAL_ACCESS_TOKEN'])){ ?>
 </form>
+<?php } ?>
 </div>
 </div>
 <?php if (isset($_SESSION['SOCIAL_ACCESS_TOKEN'])) { ?>

changeset 1558	761ba7426984
parent 1557	7c67caaafdeb
child 1560	d441b50586ba