diff -r 511810f90c93 -r 636258d3fe4b web/client.php --- a/web/client.php Wed Mar 21 17:38:20 2012 +0100 +++ b/web/client.php Thu Mar 22 12:21:22 2012 +0100 @@ -26,6 +26,10 @@ * approve our access */ $consumer->redirect(); +} else { + if (isset($_SESSION['TWITTER_REDIRECT_URL'])) { + unset($_SESSION['TWITTER_REDIRECT_URL']); + } } @@ -42,6 +46,9 @@ $embed = (isset($_REQUEST['embed']) && $_REQUEST['embed']); $videoWidth = ( $embed ? 412 : 480 ); $videoHeight = ( $embed ? 280 : 320 ); + if ($embed && !isset($_SESSION['TWITTER_ACCESS_TOKEN']) && isset($_SERVER['HTTP_REFERER'])) { + $_SESSION['TWITTER_REDIRECT_URL'] = $_SERVER['HTTP_REFERER']; + }; ?> @@ -92,17 +99,6 @@ $(document).ready(function() { -/* setTimeout(function() { - $.scrollTo(70, 1000); - }, 2000); */ - - //$("txt").hide(); - $(".loginbutton").click(function() { - document.location.href="/client.php?CONNECT=true"; - }); - $("#IDENTIFIER").click(function() { - document.location.href="/client.php?CONNECT=true"; - }); function updateCounter() { var _v = $("#status").val(); @@ -302,15 +298,17 @@

  • _('keywords')); ?>

    • -
  • -