Committer: ailyin
LJSUP-6867 (Twitter auth)U trunk/cgi-bin/LJ/Identity.pm U trunk/htdocs/talkpost.bml.text
Modified: trunk/cgi-bin/LJ/Identity.pm =================================================================== --- trunk/cgi-bin/LJ/Identity.pm 2010-09-21 08:32:24 UTC (rev 17424) +++ trunk/cgi-bin/LJ/Identity.pm 2010-09-21 10:42:17 UTC (rev 17425) @@ -194,4 +194,28 @@ sub enabled { 1 } +sub unpack_forwhat { + my ($class, $forwhat) = @_; + + my ($returl, $returl_fail); + if ($forwhat eq 'login') { + $returl = $LJ::SITEROOT; + $returl_fail = "$LJ::SITEROOT/identity/login.bml?type=facebook" + } elsif ($forwhat =~ /^comment-(\d+)-(\d+)$/) { + my ($journalid, $pendcid) = ($1, $2); + + $returl = "$LJ::SITEROOT/talkpost_do.bml?" . + "jid=$journalid&" . + "pendcid=$pendcid"; + $returl_fail = $returl . '&failed=1'; + } else { + # the warning will sit in error logs, and the exception + # will be handled + warn "invalid forwhat passed: $forwhat"; + die; + } + + return ($returl, $returl_fail); +} + 1; Modified: trunk/htdocs/talkpost.bml.text =================================================================== --- trunk/htdocs/talkpost.bml.text 2010-09-21 08:32:24 UTC (rev 17424) +++ trunk/htdocs/talkpost.bml.text 2010-09-21 10:42:17 UTC (rev 17425) @@ -27,8 +27,6 @@ .error.noreply_suspended|staleness=1 .error.noreply_suspended=This entry is suspended. You cannot reply to it. -.facebook.who.you.are=We will figure who you are - .label.picturetouse2=<a [[aopts]]>Picture</a> to use: .loganonip=<b>Notice!</b> This user has turned on the option that logs IP addresses of anonymous posters.