[livejournal] r18731: LJSUP-8414: URL is incorrect in some jou...

LJSUP-8414: URL is incorrect in some journals

U   trunk/cgi-bin/weblib.pl

Modified: trunk/cgi-bin/weblib.pl
===================================================================
--- trunk/cgi-bin/weblib.pl	2011-03-29 09:23:12 UTC (rev 18730)
+++ trunk/cgi-bin/weblib.pl	2011-03-29 10:24:56 UTC (rev 18731)
@@ -2191,22 +2191,25 @@
 
     my $mobile_link = '';
     if (!$LJ::DISABLED{'view_mobile_link_always'} || Apache::WURFL->is_mobile()) {
-        my $proto = $LJ::IS_SSL ? "https://" : "http://";
-        my $hostname = LJ::Request->hostname;
+        my $url;
         my $uri = LJ::Request->uri;
-        my $args = LJ::Request->args;
-        my $args_wq = $args ? "?$args" : "";
+        if ($uri =~ /\/__rpc_/) {
+            ## control strip is called from AJAX request
+            ## TODO: more secure Referer check?
+            $url = LJ::eurl( LJ::Request->header_in("Referer") );
+        } else {
+            my $hostname = LJ::Request->hostname;
+            my $args = LJ::Request->args;
+            my $args_wq = $args ? "?$args" : "";
+            $url = LJ::eurl("http://$hostname" . $uri . $args_wq);
+        }
         
-        ## HACK: remote __rpc_ (endpoint) part and all arguments
-        ## TODO: more intelligent page address (Referer?) for AJAX requests
-        if ($uri =~ s/__rpc_.*$//) {
-            $args_wq = '';
+        if ($url) {
+            $mobile_link =  
+                "<div class='b-message-mobile'><div class='b-message-mobile-wrapper'>" .
+                LJ::Lang::ml('link.mobile', { href => "href='http://m.livejournal.com/redirect?from=$url'" }) .
+	            "</div></div>";
         }
-
-        my $url = LJ::eurl ($proto.$hostname.$uri.$args_wq);
-        $mobile_link .= "<div class='b-message-mobile'><div class='b-message-mobile-wrapper'>";
-        $mobile_link .= LJ::Lang::ml('link.mobile', { href => "href='http://m.livejournal.com/redirect?from=$url'" });
-	    $mobile_link .="</div></div>";
     }
     return "<table id='lj_controlstrip' cellpadding='0' cellspacing='0'><tr valign='top'>$ret</tr></table> $message $mobile_link";
 }