[dw-free] Crossposting links don't display on site scheme pages

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/758fec157a83]

http://bugs.dwscoalition.org/show_bug.cgi?id=2671

Add crosspost links to site scheme pages, when viewing the entry or
replying.

Patch by fu.

Files modified:

• bin/upgrading/en.dat
• htdocs/shop/account.bml
• htdocs/talkpost.bml
• htdocs/talkread.bml

--------------------------------------------------------------------------------
diff -r edc95acb4e6a -r 758fec157a83 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Mon Jun 07 12:18:28 2010 +0800
+++ b/bin/upgrading/en.dat	Tue Jun 08 21:38:54 2010 +0800
@@ -3575,6 +3575,8 @@ talk.curname_music=<b>Current music:</b>
 
 talk.curname_tags=<b>Entry tags:</b>
 
+talk.curname_xpost=<b>Crossposts:</b>
+
 talk.error.bogusargs=Bogus arguments
 
 talk.error.cantedit=You cannot edit comments.
diff -r edc95acb4e6a -r 758fec157a83 htdocs/shop/account.bml
--- a/htdocs/shop/account.bml	Mon Jun 07 12:18:28 2010 +0800
+++ b/htdocs/shop/account.bml	Tue Jun 08 21:38:54 2010 +0800
@@ -94,8 +94,7 @@ body<=
     $ret .= LJ::form_auth();
     $ret .= "<table class='shop-table'><tr>";
     $ret .= "<td>" . LJ::Widget::ShopItemOptions->render( option_name => 'accttype', item => 'prem' ) . "</td>";
-    $ret .= "<td>" . LJ::Widget::ShopItemOptions->render( option_name => 'accttype', item => 'paid' ) . "</td>"
-        unless $for eq 'self' && $account_type eq 'premium';
+    $ret .= "<td>" . LJ::Widget::ShopItemOptions->render( option_name => 'accttype', item => 'paid' ) . "</td>";
     $ret .= "</tr>";
 
     if ( DW::Pay::num_permanent_accounts_available() > 0 ) {
diff -r edc95acb4e6a -r 758fec157a83 htdocs/talkpost.bml
--- a/htdocs/talkpost.bml	Mon Jun 07 12:18:28 2010 +0800
+++ b/htdocs/talkpost.bml	Tue Jun 08 21:38:54 2010 +0800
@@ -319,6 +319,21 @@ body<=
     my $group_names = $entry->group_names;
     $current{'Groups'} = $group_names if $group_names;
 
+    if ($props->{xpostdetail} ) {
+        my $xposthash = DW::External::Account->xpost_string_to_hash( $props->{xpostdetail} );
+        my $xpostlinks = "";
+        foreach my $xpostkey ( keys %$xposthash ) {
+            my $xpostvalue = $xposthash->{$xpostkey};
+            if ( $xpostvalue->{url} ) {
+                my $xpost_url = LJ::no_utf8_flag( $xpostvalue->{url} );
+                if ( $xpostlinks ) {
+                    $xpostlinks = $xpostlinks . " ";
+                }
+                $xpostlinks = $xpostlinks . '<a href = "' .  $xpost_url . '">' .  $xpost_url . '</a>';
+            }
+        }
+        $current{Xpost} = $xpostlinks;
+    }
 
     $ret .= "<div id='entry' class='usercontent' style='margin-left: 30px'>";
 
diff -r edc95acb4e6a -r 758fec157a83 htdocs/talkread.bml
--- a/htdocs/talkread.bml	Mon Jun 07 12:18:28 2010 +0800
+++ b/htdocs/talkread.bml	Tue Jun 08 21:38:54 2010 +0800
@@ -357,6 +357,22 @@ body<=
                                map { "<a href='$base/tag/" . LJ::eurl($_) . "'>" . LJ::ehtml($_) . "</a>" }
                                sort values %{$logtags->{$itemid}}
                            );
+    }
+
+    if ($props->{xpostdetail} ) {
+        my $xposthash = DW::External::Account->xpost_string_to_hash( $props->{xpostdetail} );
+        my $xpostlinks = "";
+        foreach my $xpostkey ( keys %$xposthash ) {
+            my $xpostvalue = $xposthash->{$xpostkey};
+            if ( $xpostvalue->{url} ) {
+                my $xpost_url = LJ::no_utf8_flag( $xpostvalue->{url} );
+                if ( $xpostlinks ) {
+                    $xpostlinks = $xpostlinks . " ";
+                }
+                $xpostlinks = $xpostlinks . '<a href = "' .  $xpost_url . '">' .  $xpost_url . '</a>';
+            }
+        }
+        $current{Xpost} = $xpostlinks;
     }
 
     $ret .= "<div id='entry' class='usercontent' style='margin-left: 30px'>";
--------------------------------------------------------------------------------