web/client.php
changeset 561 e2b5cb558dcd
parent 559 64b3376aef6a
child 563 0dd745105665
--- a/web/client.php	Thu Mar 22 16:26:04 2012 +0100
+++ b/web/client.php	Fri Mar 23 14:41:53 2012 +0100
@@ -43,12 +43,13 @@
     $head_logo = URL_ROOT."$rep/".$translate->_('config__head_logo');
 }
 
-    $embed = (isset($_REQUEST['embed']) && $_REQUEST['embed']);
-    $videoWidth = ( $embed ? 412 : 480 );
-    $videoHeight = ( $embed ? 280 : 320 );
-    if ($embed && !isset($_SESSION['TWITTER_ACCESS_TOKEN']) && (isset($_REQUEST['auth_redirect']) || isset($_SERVER['HTTP_REFERER']))) {
-        $_SESSION['TWITTER_REDIRECT_URL'] = isset($_REQUEST['auth_redirect']) ? $_REQUEST['auth_redirect'] : $_SERVER['HTTP_REFERER'];
-    };
+$embed = (isset($_REQUEST['embed']) && $_REQUEST['embed']);
+$videoWidth = ( $embed ? 412 : 480 );
+$videoHeight = ( $embed ? 280 : 320 );
+if ($embed && !isset($_SESSION['TWITTER_ACCESS_TOKEN']) && isset($_REQUEST['auth_redirect']) && !isset($_GET['CONNECT'])) {
+    $_SESSION['TWITTER_REDIRECT_URL'] = isset($_REQUEST['auth_redirect']) ? $_REQUEST['auth_redirect'] : $_SERVER['HTTP_REFERER'];
+};
+
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
    "http://www.w3.org/TR/html4/strict.dtd">
@@ -210,7 +211,13 @@
   </head>
   <body<?php if ($embed) { echo ' class="embed"'; } ?>>
     <div id="sendUsFeedBack"><a href="<?php echo($C_feedback_form_url); ?>" target="_blank"><img src="<?php echo(URL_ROOT); ?>images/sendusfeedback.png"></a></div>
-
+    <div style="display: none;">
+<?php
+    echo '$_REQUEST["auth_redirect"] : '.$_REQUEST['auth_redirect'].'<br />';
+    echo '$_SERVER["HTTP_REFERER"] : '.$_SERVER['HTTP_REFERER'].'<br />';
+    echo '$_SESSION["TWITTER_REDIRECT_URL"] :' . $_SESSION['TWITTER_REDIRECT_URL'] . '<br />';
+?>
+</div>
         <div id="container">
             
             <div id="coldroite">