LiveJournal ChangeLog

[ljcom] r6277: LJSUP-2184

Fri, 09 May 2008 00:27:39 GMT

Committer: janine

LJSUP-2184

* Don't allow OpenID users to view/use these pages.

U   trunk/htdocs/create/step2a.bml
U   trunk/htdocs/create/step2b.bml
U   trunk/htdocs/create/step3.bml
U   trunk/htdocs/create/thanks.bml

Modified: trunk/htdocs/create/step2a.bml
===================================================================
--- trunk/htdocs/create/step2a.bml	2008-05-08 19:23:21 UTC (rev 6276)
+++ trunk/htdocs/create/step2a.bml	2008-05-09 00:27:38 UTC (rev 6277)
@@ -13,6 +13,8 @@
     my $u = LJ::get_remote()
         or return "<?needlogin?>";
 
+    return BML::redirect("$LJ::SITEROOT/") if $u->is_identity;
+
     return BML::redirect("$LJ::SITEROOT/create/step2b.bml") if LJ::ab_testing_value() != 0;
 
     my %from_post;

Modified: trunk/htdocs/create/step2b.bml
===================================================================
--- trunk/htdocs/create/step2b.bml	2008-05-08 19:23:21 UTC (rev 6276)
+++ trunk/htdocs/create/step2b.bml	2008-05-09 00:27:38 UTC (rev 6277)
@@ -13,6 +13,8 @@
     my $u = LJ::get_remote()
         or return "<?needlogin?>";
 
+    return BML::redirect("$LJ::SITEROOT/") if $u->is_identity;
+
     return BML::redirect("$LJ::SITEROOT/create/step2a.bml") if LJ::ab_testing_value() == 0;
 
     my %from_post;

Modified: trunk/htdocs/create/step3.bml
===================================================================
--- trunk/htdocs/create/step3.bml	2008-05-08 19:23:21 UTC (rev 6276)
+++ trunk/htdocs/create/step3.bml	2008-05-09 00:27:38 UTC (rev 6277)
@@ -12,6 +12,8 @@
     my $u = LJ::get_remote()
         or return "<?needlogin?>";
 
+    return BML::redirect("$LJ::SITEROOT/") if $u->is_identity;
+
     return BML::redirect("$LJ::SITEROOT/create/step2a.bml") if LJ::ab_testing_value() == 0;
 
     if (LJ::did_post()) {

Modified: trunk/htdocs/create/thanks.bml
===================================================================
--- trunk/htdocs/create/thanks.bml	2008-05-08 19:23:21 UTC (rev 6276)
+++ trunk/htdocs/create/thanks.bml	2008-05-09 00:27:38 UTC (rev 6277)
@@ -12,6 +12,8 @@
     my $u = LJ::get_remote()
         or return "<?needlogin?>";
 
+    return BML::redirect("$LJ::SITEROOT/") if $u->is_identity;
+
     my $ret;
 
     $ret .= "<div id='create-page'>";

[livejournal] r13863: LJSUP-2184

Fri, 09 May 2008 00:24:04 GMT

Committer: janine

LJSUP-2184

* Update old postreg links.
* Don't show the "Post an Entry" nudge to OpenID users.

U   trunk/cgi-bin/LJ/Widget/GettingStarted.pm

Modified: trunk/cgi-bin/LJ/Widget/GettingStarted.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/GettingStarted.pm	2008-05-08 19:36:33 UTC (rev 13862)
+++ trunk/cgi-bin/LJ/Widget/GettingStarted.pm	2008-05-09 00:24:03 UTC (rev 13863)
@@ -30,15 +30,17 @@
 
     unless ($remote->postreg_completed) {
         $ret .= "<p>" . $class->ml('.widget.gettingstarted.profile.note2') . "<br />";
-        $ret .= "<a href='$LJ::SITEROOT/postreg/' class='arrow-link'>" . $class->ml('.widget.gettingstarted.profile.link') . "</a></p>";
+        $ret .= "<a href='$LJ::SITEROOT/manage/profile/' class='arrow-link'>" . $class->ml('.widget.gettingstarted.profile.link') . "</a></p>";
     }
 
     unless ($class->has_enough_friends($remote)) {
+        my $url = LJ::run_hook("remote_should_see_vertical_nav") ? "$LJ::SITEROOT/explore/" : "$LJ::SITEROOT/site/search.bml";
+
         $ret .= "<p>" . $class->ml('.widget.gettingstarted.friends.note', {'num' => $remote->friends_added_count}) . "<br />";
-        $ret .= "<a href='$LJ::SITEROOT/postreg/find.bml' class='arrow-link'>" . $class->ml('.widget.gettingstarted.friends.link') . "</a></p>";
+        $ret .= "<a href='$url' class='arrow-link'>" . $class->ml('.widget.gettingstarted.friends.link') . "</a></p>";
     }
 
-    if ($remote->number_of_posted_posts < 1) {
+    if ($remote->number_of_posted_posts < 1 && !$remote->is_identity) {
         $ret .= "<p>" . $class->ml('.widget.gettingstarted.entry.note') . "<br />";
         $ret .= "<a href='$LJ::SITEROOT/update.bml' class='arrow-link'>" . $class->ml('.widget.gettingstarted.entry.link') . "</a></p>";
     }
@@ -86,7 +88,7 @@
     return 0 unless $u->postreg_completed;
     return 0 unless $class->has_enough_friends($u);
 
-    return 0 unless $u->number_of_posted_posts > 0;
+    return 0 unless $u->number_of_posted_posts > 0 || $u->is_identity;
     return 0 unless $u->get_userpic_count > 0;
 
     return 1;

[livejournal] r13862: LJSUP-2183

Thu, 08 May 2008 19:36:34 GMT

Committer: janine

LJSUP-2183

Remove extra slash.

U   trunk/htdocs/customize/advanced/layers.bml

Modified: trunk/htdocs/customize/advanced/layers.bml
===================================================================
--- trunk/htdocs/customize/advanced/layers.bml	2008-05-08 12:59:20 UTC (rev 13861)
+++ trunk/htdocs/customize/advanced/layers.bml	2008-05-08 19:36:33 UTC (rev 13862)
@@ -1,4 +1,4 @@
-/<?_code # -*-bml-*-
+<?_code # -*-bml-*-
 {
     use strict;
     use vars qw(%GET %POST $title $body);

[ljcom] r6276: LJSUP-2182

Thu, 08 May 2008 19:23:22 GMT

Committer: janine

LJSUP-2182

Fix Spreadshirt shop links.

U   trunk/htdocs/shop/index.bml

Modified: trunk/htdocs/shop/index.bml
===================================================================
--- trunk/htdocs/shop/index.bml	2008-05-08 01:00:14 UTC (rev 6275)
+++ trunk/htdocs/shop/index.bml	2008-05-08 19:23:21 UTC (rev 6276)
@@ -144,16 +144,15 @@
     return <<"END";
 <?storefront
 id=>merchandise
-url=>/shop/view.bml?item=hoodie
+url=>https://www.spreadshirt.com/shop.php?sid=121380&op=articles&p=1
 title=><?_ml .storefront.merchandise.header _ml?> <span class='super notice'><?_ml .storefront.new _ml?></span>
 desc<= 
  $desc
  <?_ml .storefront.merchandise.intro _ml?>
 <ul style="margin-top: 0px;">
-<li><a href='http://www.spreadshirt.com/shop.php?op=article&article_id=2317961&p=1'><?_ml .storefront.merchandise.hoodie _ml?></a></li>
-<li><a href='http://www.spreadshirt.com/shop.php?op=article&article_id=2306462&_producttype_category_id=1&_producttype_id=109&p=1'><?_ml .storefront.merchandise.tshirt _ml?></a></li>
-<li><a href='http://www.spreadshirt.com/shop.php?op=article&article_id=2306548&_producttype_category_id=2&_producttype_id=221&p=1'><?_ml .storefront.merchandise.item3 _ml?></a></li>
-<li><a href='http://www.spreadshirt.com/shop.php?op=article&article_id=2306655&_producttype_category_id=17&p=1'><?_ml .storefront.merchandise.item4 _ml?></a></li>
+<li><a href='http://ljmerchandise.spreadshirt.com/us/US/Shop/Article/Index/article/2317961'><?_ml .storefront.merchandise.hoodie _ml?></a></li>
+<li><a href='http://ljmerchandise.spreadshirt.com/us/US/Shop/Article/Index/article/2306427'><?_ml .storefront.merchandise.tshirt _ml?></a></li>
+<li><a href='http://ljmerchandise.spreadshirt.com/us/US/Shop/Article/Index/article/2306514'><?_ml .storefront.merchandise.item3 _ml?></a></li>
 </ul>
 
 <=desc

[livejournal] r13861: Some of our dev servers have old version...

Thu, 08 May 2008 12:59:23 GMT

Committer: sup

Some of our dev servers have old version of table 'content_flag' without column 'reporteruniq'

U   trunk/bin/upgrading/update-db-general.pl

Modified: trunk/bin/upgrading/update-db-general.pl
===================================================================
--- trunk/bin/upgrading/update-db-general.pl	2008-05-08 11:37:00 UTC (rev 13860)
+++ trunk/bin/upgrading/update-db-general.pl	2008-05-08 12:59:20 UTC (rev 13861)
@@ -3060,6 +3060,12 @@
     my $dbh = shift;
     my $runsql = shift;
 
+    if (column_type("content_flag", "reporteruniq") eq "")
+    {
+        do_alter("content_flag",
+                 "ALTER TABLE content_flag ADD reporteruniq VARCHAR(15) AFTER reporterid");
+
+    }
     if (column_type("supportcat", "is_selectable") eq "")
     {
         do_alter("supportcat",

[livejournal] r13860: LJSUP-2131: Calendar view was fixed for ...

Thu, 08 May 2008 11:37:04 GMT

Committer: sup

LJSUP-2131: Calendar view was fixed for user with admin rights

U   trunk/cgi-bin/LJ/User.pm

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2008-05-08 00:58:42 UTC (rev 13859)
+++ trunk/cgi-bin/LJ/User.pm	2008-05-08 11:37:00 UTC (rev 13860)
@@ -6146,8 +6146,10 @@
     my $viewall = 0;
     if ($remote) {
         # do they have the viewall priv?
-        if (LJ::check_priv($remote, "canview", "suspended")) {
-            $viewall = LJ::check_priv($remote, 'canview', '*');
+        my $r = eval { Apache->request; }; # web context
+        my %getargs = $r->args if $r;
+        if (defined $getargs{'viewall'} and $getargs{'viewall'} eq '1' and LJ::check_priv($remote, 'canview', '*')) {
+            $viewall = 1;
         }
 
         if ($remote->{'userid'} == $uid || $viewall) {

[ljcom] r6275: LJSUP-2071

Thu, 08 May 2008 01:00:15 GMT

Committer: janine

LJSUP-2071

* Add copy to the members page.
* Remove ad layout option from the ad settings page for communities, since it's on /customize/ now.

U   trunk/htdocs/community/members.bml.text.local
U   trunk/htdocs/community/promotions.bml

Modified: trunk/htdocs/community/members.bml.text.local
===================================================================
--- trunk/htdocs/community/members.bml.text.local	2008-05-08 00:16:06 UTC (rev 6274)
+++ trunk/htdocs/community/members.bml.text.local	2008-05-08 01:00:14 UTC (rev 6275)
@@ -1 +1,3 @@
 ;; -*- coding: utf-8 -*-
+
+.intro=You can define the roles of each of your members here.  To learn what the different roles entail, read <a [[aopts1]]>this FAQ</a> and <a [[aopts2]]>this FAQ</a>.

Modified: trunk/htdocs/community/promotions.bml
===================================================================
--- trunk/htdocs/community/promotions.bml	2008-05-08 00:16:06 UTC (rev 6274)
+++ trunk/htdocs/community/promotions.bml	2008-05-08 01:00:14 UTC (rev 6275)
@@ -72,7 +72,6 @@
 
     my $body;
 
-    # Don't display or validate the ad layout options if in the signup process
     my $signup = 0;
     $signup = 1 if ($GET{'signup'} || $POST{'signup'});
 
@@ -96,15 +95,6 @@
     if (LJ::did_post()) {
         return LJ::bad_input($ML{'error.invalidform'})  unless LJ::check_form_auth();
 
-        unless ($signup) {
-            # ad layout
-            if ($u->prop('stylesys') == 2) {
-                unless ($POST{'ad_placement'} eq 'v' || $POST{'ad_placement'} eq 'h' || ($u->can_use_ebox_ui && $POST{'ad_placement'} eq 'e')) {
-                    $POST{'ad_placement'} = 'v';
-                }
-            }
-        }
-
         # Ad category or No Thanks must be selected
         if (! $POST{'cat'} && ! $u->in_class('paid') ) {
             push @errors, "Please choose your ad category so that we can deliver ads that interest your community. If you don't want to choose any ad categories, please select the \"No thanks\" option.";
@@ -112,16 +102,6 @@
 
         # If there are no errors save the options and proceed
         unless(@errors) {
-            # Set ad layout options
-            if ($u->prop('stylesys') == 2 && !$signup) {
-                if ($POST{'ad_placement'} eq 'e') {
-                    $u->set_prop("journal_box_entries", 1) if $u->can_use_ebox_ui;
-                } else {
-                    $u->set_prop("journal_box_placement", $POST{'ad_placement'});
-                    $u->set_prop("journal_box_entries", 0) if $u->can_use_ebox_ui;
-                }
-            }
-
             LJ::set_userprop($u, "ad_categories", $POST{'cat'});
 
             return BML::redirect("$LJ::SITEROOT/newuser.bml?authas=$authas")
@@ -193,34 +173,6 @@
     $body .= LJ::form_auth();
     $body .= "<br />$ML{'.intro_signup'}<br />" if $GET{'signup'};
 
-    unless ($signup) {
-        my $ad_placement_selected = $u->prop('journal_box_placement') eq 'h' ? 'h' : 'v';
-        $ad_placement_selected = 'e' if $u->can_use_ebox_ui && $u->prop('journal_box_entries');
-
-        $body .= "<?h1 $ML{'.sub.adlayout'} h1?>";
-        if ($u->prop('stylesys') == 2) {
-            $body .= "<table width='100%'><tr><td>\n";
-            if ($u->can_use_ebox_ui) {
-                $body .= "<?p Choose the orientation of ads on your community's journal. Select \"Horizontal Placement\" for display at the top and bottom, \"Vertical Placement\" for display on the left or right side, or \"Placement Between Entries\" for display between entries. Be sure to click \"Save\" at the bottom of the page to save your preferences. p?>";
-                $body .= LJ::html_select({ 'name' => 'ad_placement', 'selected' => $ad_placement_selected },
-                                           'v' => $ML{'.adlayout.select.vertical'},
-                                           'h' => $ML{'.adlayout.select.horizontal'},
-                                           'e' => "$ML{'.adlayout.select.entries'}*" );
-                $body .= "<div class='small-note'>*Placement between entries is only possible on recent, friends, and day views. Other pages will use your previous setting of horizontal or vertical placement.</div>"
-            } else {
-                $body .= "<?p Choose the orientation of ads on your community's journal. Select \"Horizontal Placement\" for display at the top and bottom or \"Vertical Placement\" for display on the left or right side. Be sure to click \"Save\" at the bottom of the page to save your preferences. p?>";
-                $body .= LJ::html_select({ 'name' => 'ad_placement', 'selected' => $ad_placement_selected },
-                                           'v' => $ML{'.adlayout.select.vertical'},
-                                           'h' => $ML{'.adlayout.select.horizontal'});
-            }
-            $body .= "</td><td valign='top' width='260'>";
-            $body .= " ";
-            $body .= "</td></tr></table>";
-        } else {
-            $body .= "<?p The option to change the orientation of ads is only available if your community is using the <a href=\"$LJ::HELPURL{'style_systems'}\">S2 style system</a>. p?>";
-        }
-    }
-
     # Paid communities don't choose an ad category
     unless ( $u->in_class('paid') ) {
         $body .= "<?p <span class='hilite'>Ad Categories</span><br />";

[livejournal] r13859: LJSUP-2071

Thu, 08 May 2008 00:58:43 GMT

Committer: janine

LJSUP-2071

* Add copy to this page.

U   trunk/htdocs/community/members.bml
U   trunk/htdocs/community/members.bml.text

Modified: trunk/htdocs/community/members.bml
===================================================================
--- trunk/htdocs/community/members.bml	2008-05-08 00:04:38 UTC (rev 13858)
+++ trunk/htdocs/community/members.bml	2008-05-08 00:58:42 UTC (rev 13859)
@@ -533,6 +533,9 @@
     @users = @{$items{'items'}};
 
     # output starts here
+    $ret .= BML::ml('.intro', { aopts1 => "href='$LJ::HELPURL{maintainership}'", aopts2 => "href='$LJ::HELPURL{add_to_comm}'" }) . "<br /><br />";
+    $ret .= $ML{'.intro.invite'};
+
     $ret .= "<form method='post' action='members.bml?authas=$cname'>";
     $ret .= LJ::form_auth();
 

Modified: trunk/htdocs/community/members.bml.text
===================================================================
--- trunk/htdocs/community/members.bml.text	2008-05-08 00:04:38 UTC (rev 13858)
+++ trunk/htdocs/community/members.bml.text	2008-05-08 00:58:42 UTC (rev 13859)
@@ -27,6 +27,10 @@
 
 .error.unknown=Error inviting [[user]].  Please make sure they're not already a member and try again.
 
+.intro=You can define the roles of each of your members here.
+
+.intro.invite=To invite a user to your community, enter their username in one of the empty boxes below and select the checkboxes that correspond to the roles you which the user to have.
+
 .key.admin=<b>Maintainer</b>
 
 .key.member=<b>Member</b>

[ljcom] r6274: LJSUP-2071

Thu, 08 May 2008 00:16:07 GMT

Committer: janine

LJSUP-2071

* Add "Work as user" drop-down menus to these pages.
* Create and use a common linkbar that helps people go between the different pages easily.
* Move hook.

U   trunk/cgi-bin/LJ/Hooks/CommunityManagement.pm
U   trunk/cgi-bin/ljcom.pl
U   trunk/htdocs/community/account.bml
U   trunk/htdocs/community/manage.bml.text.local

Modified: trunk/cgi-bin/LJ/Hooks/CommunityManagement.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/CommunityManagement.pm	2008-05-07 21:14:48 UTC (rev 6273)
+++ trunk/cgi-bin/LJ/Hooks/CommunityManagement.pm	2008-05-08 00:16:06 UTC (rev 6274)
@@ -6,4 +6,17 @@
     return $remote && $remote->is_in_beta('customize2007') ? 1 : 0;
 });
 
+LJ::register_hook('community_manage_actionlink', sub {
+    my $user = shift;
+    my $ret = BML::ml('Actionlink', {
+                      'link'=>"<a href='account.bml?authas=$user'>Account</a>"});
+    $ret .= "  ";
+    return $ret;
+});
+
+LJ::register_hook('community_manage_link_info', sub {
+    my $user = shift;
+    return ( url => "$LJ::SITEROOT/community/account.bml?authas=$user", text => LJ::Lang::ml('/community/manage.bml.commlist.account') );
+});
+
 1;

Modified: trunk/cgi-bin/ljcom.pl
===================================================================
--- trunk/cgi-bin/ljcom.pl	2008-05-07 21:14:48 UTC (rev 6273)
+++ trunk/cgi-bin/ljcom.pl	2008-05-08 00:16:06 UTC (rev 6274)
@@ -1849,14 +1849,6 @@
     return undef;
 });
 
-LJ::register_hook('community_manage_actionlink',  sub {
-    my $user = shift;
-    my $ret = BML::ml('Actionlink', {
-                      'link'=>"<a href='account.bml?authas=$user'>Account</a>"});
-    $ret .= "  ";
-    return $ret;
-});
-
 # args: $u
 # extra status information for subscriptions
 LJ::register_hook('sub_status_extra', sub {

Modified: trunk/htdocs/community/account.bml
===================================================================
--- trunk/htdocs/community/account.bml	2008-05-07 21:14:48 UTC (rev 6273)
+++ trunk/htdocs/community/account.bml	2008-05-08 00:16:06 UTC (rev 6274)
@@ -16,21 +16,23 @@
         return $body;
     }
 
+    $body .= "<form action='account.bml' method='GET'>\n";
+    $body .= LJ::make_authas_select($remote, { 'authas' => $GET{'authas'}, 'type' => 'C' });
+    $body .= "</form>\n\n";
+
     my $authas = $GET{'authas'} || $remote->{'user'};
     my $u = LJ::get_authas_user($authas);
     return LJ::bad_input($ML{'error.invalidauth'})
         unless $u;
 
-    $body .= "<form action='account.bml' method='GET'>\n";
-    $body .= LJ::make_authas_select($remote, { 'authas' => $GET{'authas'}, 'type' => 'C' });
-    $body .= "</form><br />\n\n";
-
     # Must be working with a community
     unless ($u->{journaltype} eq 'C') {
-        $body .= $ML{'.choose'};
+        $body .= "<br />$ML{'.choose'}";
         return $body;
     }
 
+    $body .= LJ::maintainer_linkbar($u, "account");
+
     my $warning;
     if (LJ::did_post()) {
         return LJ::bad_input($ML{'error.invalidform'})  unless LJ::check_form_auth();

Modified: trunk/htdocs/community/manage.bml.text.local
===================================================================
--- trunk/htdocs/community/manage.bml.text.local	2008-05-07 21:14:48 UTC (rev 6273)
+++ trunk/htdocs/community/manage.bml.text.local	2008-05-08 00:16:06 UTC (rev 6274)
@@ -1 +1,3 @@
 ;; -*- coding: utf-8 -*-
+
+.commlist.account=Account

[livejournal] r13858: LJSUP-2071

Thu, 08 May 2008 00:04:39 GMT

Committer: janine

LJSUP-2071

* Add "Work as user" drop-down menus to these pages.
* Create and use a common linkbar that helps people go between the different pages easily.

U   trunk/cgi-bin/communitylib.pl
U   trunk/htdocs/community/manage.bml
U   trunk/htdocs/community/manage.bml.text
U   trunk/htdocs/community/members.bml
U   trunk/htdocs/community/moderate.bml
U   trunk/htdocs/community/pending.bml
U   trunk/htdocs/community/sentinvites.bml
U   trunk/htdocs/community/settings.bml

Modified: trunk/cgi-bin/communitylib.pl
===================================================================
--- trunk/cgi-bin/communitylib.pl	2008-05-07 22:10:08 UTC (rev 13857)
+++ trunk/cgi-bin/communitylib.pl	2008-05-08 00:04:38 UTC (rev 13858)
@@ -512,5 +512,43 @@
     return $aa;
 }
 
+sub maintainer_linkbar {
+    my $comm = shift;
+    my $page = shift;
+
+    my $username = $comm->user;
+    my @links;
+
+    my %manage_link_info = LJ::run_hook('community_manage_link_info', $username);
+    if (keys %manage_link_info) {
+        push @links, $page eq "account" ?
+            "<strong>$manage_link_info{text}</strong>" :
+            "<a href='$manage_link_info{url}'>$manage_link_info{text}</a>";
+    }
+
+    push @links, (
+        $page eq "profile" ?
+            "<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.actinfo2') . "</strong>" :
+            "<a href='$LJ::SITEROOT/manage/profile/?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.actinfo2') . "</a>",
+        $page eq "customize" ?
+            "<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.customize2') . "</strong>" :
+            "<a href='$LJ::SITEROOT/customize/?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.customize2') . "</a>",
+        $page eq "settings" ?
+            "<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.actsettings2') . "</strong>" :
+            "<a href='$LJ::SITEROOT/community/settings.bml?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.actsettings2') . "</a>",
+        $page eq "invites" ?
+            "<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.actinvites') . "</strong>" :
+            "<a href='$LJ::SITEROOT/community/sentinvites.bml?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.actinvites') . "</a>",
+        $page eq "members" ?
+            "<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.actmembers2') . "</strong>" :
+            "<a href='$LJ::SITEROOT/community/members.bml?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.actmembers2') . "</a>",
+    );
+
+    my $ret .= "<strong>" . LJ::Lang::ml('/community/manage.bml.managelinks', { user => $comm->ljuser_display }) . "</strong> ";
+    $ret .= join(" | ", @links);
+
+    return "<p style='margin-bottom: 20px;'>$ret</p>";
+}
+
 1;
 

Modified: trunk/htdocs/community/manage.bml
===================================================================
--- trunk/htdocs/community/manage.bml	2008-05-07 22:10:08 UTC (rev 13857)
+++ trunk/htdocs/community/manage.bml	2008-05-08 00:04:38 UTC (rev 13858)
@@ -105,9 +105,9 @@
         if ($admin{$id}) {
             $ret .= LJ::run_hook('community_manage_actionlink', $user);
             $ret .= BML::ml('Actionlink', {
-                'link'=>"<a href='/manage/profile/?authas=$user'>$ML{'.commlist.actinfo'}</a>"}) . "  ";
+                'link'=>"<a href='/manage/profile/?authas=$user'>$ML{'.commlist.actinfo2'}</a>"}) . "  ";
             $ret .= BML::ml('Actionlink', {
-                'link'=>"<a href='$LJ::SITEROOT/customize/?authas=$user'>$ML{'.commlist.customize'}</a>"}) . "  ";
+                'link'=>"<a href='$LJ::SITEROOT/customize/?authas=$user'>$ML{'.commlist.customize2'}</a>"}) . "  ";
             $ret .= BML::ml('Actionlink', {
                 'link'=>"<a href='/community/settings.bml?authas=$user'>$ML{'.commlist.actsettings2'}</a>"}) . "  ";
             $ret .= BML::ml('Actionlink', {

Modified: trunk/htdocs/community/manage.bml.text
===================================================================
--- trunk/htdocs/community/manage.bml.text	2008-05-07 22:10:08 UTC (rev 13857)
+++ trunk/htdocs/community/manage.bml.text	2008-05-08 00:04:38 UTC (rev 13858)
@@ -1,6 +1,8 @@
 ;; -*- coding: utf-8 -*-
 .commlist.actinfo=Info
 
+.commlist.actinfo2=Profile
+
 .commlist.actinvites=Invitations
 
 .commlist.actions=<b>Actions</b>
@@ -14,6 +16,8 @@
 
 .commlist.customize=Customize
 
+.commlist.customize2=Journal Style
+
 .commlist.header=Your communities
 
 .commlist.moderation=Awaiting Moderation
@@ -46,6 +50,8 @@
 
 .joinmail.title=Administrative options
 
+.managelinks=Manage [[user]]'s:
+
 .modemail.body=For moderated communities, you can choose whether to send emails or not:
 
 .modemail.no=No email, I will manage the moderation queue manually

Modified: trunk/htdocs/community/members.bml
===================================================================
--- trunk/htdocs/community/members.bml	2008-05-07 22:10:08 UTC (rev 13857)
+++ trunk/htdocs/community/members.bml	2008-05-08 00:04:38 UTC (rev 13858)
@@ -34,6 +34,10 @@
     my $cname = $GET{authas};
     return BML::redirect("$LJ::SITEROOT/community/manage.bml") unless $cname;
 
+    $ret .= "<form action='members.bml' method='GET'>\n";
+    $ret .= LJ::make_authas_select($remote, { authas => $GET{authas}, type => 'C' });
+    $ret .= "</form>\n\n";
+
     # get $c object
     my $c = LJ::load_user($cname);
     unless ($c) {
@@ -59,6 +63,8 @@
         return $print_with_ad->($ret);
     }
 
+    $ret .= LJ::maintainer_linkbar($c, "members");
+
     my @allattribs = ('member', 'post', 'preapprove', 'moderate', 'admin');
     my %attrshort = ( X => 'member', P => 'post', N => 'preapprove', M => 'moderate', A => 'admin');
     my %attrshort_r = ( map { $attrshort{$_} => $_ } keys %attrshort ); # reversed
@@ -527,9 +533,6 @@
     @users = @{$items{'items'}};
 
     # output starts here
-    $ret .= "<?p " . BML::ml('.name', { 'name' => LJ::ljuser($cname, { 'type' => 'C' }) });
-    $ret .= " " . BML::ml('Actionlink', {'link' => "<a href='$LJ::SITEROOT/community/settings.bml?authas=$cname'>$ML{'.settings2'}</a>"}) . " p?>";
-
     $ret .= "<form method='post' action='members.bml?authas=$cname'>";
     $ret .= LJ::form_auth();
 

Modified: trunk/htdocs/community/moderate.bml
===================================================================
--- trunk/htdocs/community/moderate.bml	2008-05-07 22:10:08 UTC (rev 13857)
+++ trunk/htdocs/community/moderate.bml	2008-05-08 00:04:38 UTC (rev 13858)
@@ -23,6 +23,10 @@
         return BML::redirect("$LJ::SITEROOT/community/moderate.bml?authas=$GET{comm}");
     }
 
+    $ret .= "<form action='moderate.bml' method='GET'>\n";
+    $ret .= LJ::make_authas_select($remote, { authas => $GET{authas}, type => 'C' });
+    $ret .= "</form>\n\n";
+
     my $mode = $POST{'mode'};
     my ($saved_comm, $saved_modid) = ("", 0);
 
@@ -46,6 +50,9 @@
                 BML::ml('.error.noaccess', {'comm'=>"<?ljcomm $c->{'user'} ljcomm?>"}) . " p?>";
             return $ret;
         }
+
+        $ret .= LJ::maintainer_linkbar($c);
+
         # use dbcm to read to minimize collisions between moderators due to replication lag
         my $entry = $dbcm->selectrow_hashref("SELECT * FROM modlog WHERE journalid=? AND modid=?",
                                              undef, $c->{'userid'}, $modid);
@@ -190,6 +197,8 @@
         return $ret;
     }
 
+    $ret .= LJ::maintainer_linkbar($c) unless LJ::did_post() && ($mode eq 'approve_do' || $mode eq 'reject_do');
+
     my $formauth = LJ::form_auth();
 
     if ($mode eq 'action' && $POST{'action:approve'}) {

Modified: trunk/htdocs/community/pending.bml
===================================================================
--- trunk/htdocs/community/pending.bml	2008-05-07 22:10:08 UTC (rev 13857)
+++ trunk/htdocs/community/pending.bml	2008-05-08 00:04:38 UTC (rev 13858)
@@ -10,12 +10,6 @@
 
     return LJ::server_down_html() if $LJ::SERVER_DOWN;
 
-    # always have links at top
-    my $ret = BML::ml('Backlink', {
-        'link' => '/community/manage.bml',
-        'text' => $ML{'/community/members.bml.manage2'},
-    });
-
     # get remote
     my $remote = LJ::get_remote();
     return "<?needlogin?>" unless $remote;
@@ -28,9 +22,14 @@
     my $cname = $GET{authas};
     return BML::redirect("$LJ::SITEROOT/community/manage.bml") unless $cname;
 
+    my $ret;
+    $ret .= "<form action='pending.bml' method='GET'>\n";
+    $ret .= LJ::make_authas_select($remote, { authas => $GET{authas}, type => 'C' });
+    $ret .= "</form>\n\n";
+
     # get $c object
     my $c = LJ::load_user($cname);
-    return "<?h1 $ML{'Error'} h1?><?p $ML{'/community/members.bml.error.nocomm'} p?>"
+    return $ret . "<?h1 $ML{'Error'} h1?><?p $ML{'/community/members.bml.error.nocomm'} p?>"
         unless $c;
     my $cid = $c->{'userid'};
 
@@ -43,12 +42,14 @@
         return $ret;
     }
 
+    $ret .= LJ::maintainer_linkbar($c);
+
     # hit up the database to find pending members
     my $pendids = LJ::get_pending_members($c) || [];
     my $us = LJ::load_userids(@$pendids);
 
     # nothing pending?
-    return "<?h1 $ML{'.nopending.title'} h1?><?p $ML{'.nopending.body'} p?>"
+    return $ret . "<?h1 $ML{'.nopending.title'} h1?><?p $ML{'.nopending.body'} p?>"
         unless @$pendids || LJ::did_post();
 
     # saving a form submission
@@ -104,9 +105,6 @@
     @users = @{$items{items}};
 
     # output starts here
-    $ret .= "<?p " . BML::ml('/community/members.bml.name', { name => LJ::ljuser($cname, { type => 'C' }) });
-    $ret .= " " . BML::ml('/community/members.bml.settings', { 'link' => "settings.bml?authas=$cname"}) . " p?>";
-
     $ret .= "<form method='post' action='pending.bml?authas=$cname'>";
     $ret .= LJ::form_auth();
 
@@ -135,6 +133,11 @@
 
     $ret .= $navbar;
 
+    $ret .= BML::ml('Backlink', {
+        'link' => '/community/manage.bml',
+        'text' => $ML{'/community/members.bml.manage2'},
+    });
+
     return $ret;
 
 }

Modified: trunk/htdocs/community/sentinvites.bml
===================================================================
--- trunk/htdocs/community/sentinvites.bml	2008-05-07 22:10:08 UTC (rev 13857)
+++ trunk/htdocs/community/sentinvites.bml	2008-05-08 00:04:38 UTC (rev 13858)
@@ -28,6 +28,10 @@
     my $cname = $GET{authas};
     return BML::redirect("$LJ::SITEROOT/community/manage.bml") unless $cname;
 
+    $ret .= "<form action='sentinvites.bml' method='GET'>\n";
+    $ret .= LJ::make_authas_select($remote, { authas => $GET{authas}, type => 'C' });
+    $ret .= "</form>\n\n";
+
     # get $c object
     my $c = LJ::load_user($cname);
     unless ($c) {
@@ -53,6 +57,8 @@
         return $ret;
     }
 
+    $ret .= LJ::maintainer_linkbar($c, "invites");
+
     # columns of our table, excluding username
     my @attribs = ('post');
     my @titleattribs = ('P');
@@ -135,8 +141,6 @@
     @users = @{$items{'items'}};
 
     # output starts here
-    $ret .= "<?p " . BML::ml('/community/members.bml.name', { 'name' => LJ::ljuser($cname, { 'type' => 'C' }) });
-    $ret .= " " . BML::ml('/community/members.bml.settings', { 'link' => "settings.bml?authas=$cname"}) . " p?>";
 
     # jump to user
     if ($items{'pages'} > 1) {

Modified: trunk/htdocs/community/settings.bml
===================================================================
--- trunk/htdocs/community/settings.bml	2008-05-07 22:10:08 UTC (rev 13857)
+++ trunk/htdocs/community/settings.bml	2008-05-08 00:04:38 UTC (rev 13858)
@@ -55,6 +55,10 @@
     my $mode = "modify";
     $mode = "create" if $GET{'mode'} eq 'create';
 
+    $ret .= "<form action='$LJ::SITEROOT/community/settings.bml' method='get'>";
+    $ret .= LJ::make_authas_select($remote, { authas => $GET{authas}, type => "C" });
+    $ret .= "</form>";
+
     if (LJ::did_post())
     {
         return $print_with_ad->("<?h1 $ML{'Error'} h1?><?p $ML{'error.invalidform'} p?>")
@@ -166,6 +170,7 @@
             # since journaltype changed
             $cu->invalidate_directory_record;
 
+            $ret .= LJ::maintainer_linkbar($cu, "settings");
             $ret .= LJ::ad_display( type => 'app', orient => 'BML-App-Confirm', below_ad => LJ::CProd->full_box_for($remote, width => 300) );
             $ret .= "<?h1 $ML{'.success'} h1?>";
             if ($mode eq 'create') {
@@ -211,10 +216,6 @@
             return BML::redirect("$LJ::SITEROOT/community/manage.bml");
         }
 
-        $ret .= "<form action='$LJ::SITEROOT/community/settings.bml' method='get'>";
-        $ret .= LJ::make_authas_select($remote, { authas => $GET{authas} });
-        $ret .= "</form>";
-
         unless ($c->{'journaltype'} eq 'C') {
             $ret .= "<?h1 $ML{'Error'} h1?><?p $ML{'.error.notcomm'} p?>";
             return $print_with_ad->($ret);
@@ -244,8 +245,7 @@
       } else {
           LJ::set_active_crumb('commsettings');
             $ret .= LJ::html_hidden('cuser', $cname);
-            $ret .= "<?p " . BML::ml('.name',{'name'=>"<?ljcomm $cname ljcomm?>"});
-            $ret .= " " . BML::ml('Actionlink', {'link' => "<a href='$LJ::SITEROOT/community/members.bml?authas=$cname'>$ML{'.members2'}</a>"}) . " p?>";
+            $ret .= LJ::maintainer_linkbar($c, "settings");
         }
 
     $ret .= "<div id='left-column'>";

[livejournal] r13857: Don't put all the keywords of all userpi...

Wed, 07 May 2008 22:10:09 GMT

Committer: henrylyne

Don't put all the keywords of all userpics in the ALT attribute.
Thanks to pauamma for pointing out the fix.

U   trunk/cgi-bin/LJ/S2.pm

Modified: trunk/cgi-bin/LJ/S2.pm
===================================================================
--- trunk/cgi-bin/LJ/S2.pm	2008-05-07 21:12:54 UTC (rev 13856)
+++ trunk/cgi-bin/LJ/S2.pm	2008-05-07 22:10:08 UTC (rev 13857)
@@ -2077,7 +2077,7 @@
     my $pi = LJ::get_userpic_info($u, {load_comments => 1});
     my $p = $pi->{'pic'}->{$picid};
     my $k = $pi->{'kw'};
-    my $kwstr = join(', ', (keys %$k));
+    my $kwstr = join(', ', ( grep { $k->{$_}{'picid'} eq $picid } (keys %$k) ) );
     my $alttext = $kwstr;
 
     return Null("Image") unless $p;

[ljcom] r6273: LJSUP-2071

Wed, 07 May 2008 21:14:48 GMT

Committer: janine

LJSUP-2071

Make the administrative /community/ pages that use ?comm= as the GET arg use ?authas= instead, in preparation for a "Work as user" drop-down.

U   trunk/htdocs/manage/horizon.bml

Modified: trunk/htdocs/manage/horizon.bml
===================================================================
--- trunk/htdocs/manage/horizon.bml	2008-05-07 15:47:02 UTC (rev 6272)
+++ trunk/htdocs/manage/horizon.bml	2008-05-07 21:14:48 UTC (rev 6273)
@@ -90,8 +90,8 @@
     }
     $ret .= "<td><b>$ML{'.community'}</b><ul class='settings'>" if $comm;
     $ret .= "<li>» <a href='$LJ::SITEROOT/community/settings.bml?authas=$authas'>$ML{'.options'}</a></li>" if $comm;
-    $ret .= "<li>» <a href='$LJ::SITEROOT/community/members.bml?comm=$authas'>$ML{'.members'}</a></li>" if $comm;
-    $ret .= "<li>» <a href='$LJ::SITEROOT/community/sentinvites.bml?comm=$authas'>$ML{'.sent.invitations'}</a></li>" if $comm;
+    $ret .= "<li>» <a href='$LJ::SITEROOT/community/members.bml?authas=$authas'>$ML{'.members'}</a></li>" if $comm;
+    $ret .= "<li>» <a href='$LJ::SITEROOT/community/sentinvites.bml?authas=$authas'>$ML{'.sent.invitations'}</a></li>" if $comm;
     $ret .= "<li>» <a href='$LJ::SITEROOT/manage/comments/?authas=$authas'>$ML{'.comment.settings'}</a></li>";
     $ret .= $upgraded ? "<li>» <a href='$LJ::SITEROOT/manage/domain.bml?authas=$authas'>$ML{'.domain.mapping'}</a></li>" :
                         "<li>» <a href='$LJ::SITEROOT/didyouknow/domainmapping.bml'>$ML{'.edit.domain.mapping'}</a> $upgradeicon</li>";

[livejournal] r13856: LJSUP-2071

Wed, 07 May 2008 21:12:56 GMT

Committer: janine

LJSUP-2071

Make the administrative /community/ pages that use ?comm= as the GET arg use ?authas= instead, in preparation for a "Work as user" drop-down.

U   trunk/bin/maint/generic.pl
U   trunk/cgi-bin/LJ/Event/CommunityJoinRequest.pm
U   trunk/cgi-bin/ljprotocol.pl
U   trunk/cgi-bin/weblib.pl
U   trunk/htdocs/approve.bml
U   trunk/htdocs/community/manage.bml
U   trunk/htdocs/community/members.bml
U   trunk/htdocs/community/moderate.bml
U   trunk/htdocs/community/pending.bml
U   trunk/htdocs/community/sentinvites.bml
U   trunk/htdocs/community/settings.bml
U   trunk/htdocs/friends/edit.bml

Modified: trunk/bin/maint/generic.pl
===================================================================
--- trunk/bin/maint/generic.pl	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/bin/maint/generic.pl	2008-05-07 21:12:54 UTC (rev 13856)
@@ -46,7 +46,7 @@
                        "Over the past day or so, $row->[1] request(s) to join the \"$cuser\" community have " .
                        "been received.  To look at the currently pending membership requests, please visit the pending " .
                        "membership page:\n\n" .
-                       "\t$LJ::SITEROOT/community/pending.bml?comm=$cuser\n\n" .
+                       "\t$LJ::SITEROOT/community/pending.bml?authas=$cuser\n\n" .
                        "You may also ignore this email.  Outstanding requests to join will expire after a period of 30 days.\n\n" .
                        "If you wish to no longer receive these emails, visit the community management page and " .
                        "set the relevant options:\n\n\t$LJ::SITEROOT/community/manage.bml\n\n" .

Modified: trunk/cgi-bin/LJ/Event/CommunityJoinRequest.pm
===================================================================
--- trunk/cgi-bin/LJ/Event/CommunityJoinRequest.pm	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/cgi-bin/LJ/Event/CommunityJoinRequest.pm	2008-05-07 21:12:54 UTC (rev 13856)
@@ -41,7 +41,7 @@
 
 sub as_html {
     my $self = shift;
-    return sprintf("The user %s has <a href=\"$LJ::SITEROOT/community/pending.bml?comm=%s\">requested to join</a> the community %s.",
+    return sprintf("The user %s has <a href=\"$LJ::SITEROOT/community/pending.bml?authas=%s\">requested to join</a> the community %s.",
                    $self->requestor->ljuser_display, $self->comm->user,
                    $self->comm->ljuser_display);
 }
@@ -51,7 +51,7 @@
 
     my $ret .= "<div class='actions'>";
     $ret .= " <a href='" . $self->requestor->profile_url . "'>View Profile</a>";
-    $ret .= " <a href='$LJ::SITEROOT/community/pending.bml?comm=" . $self->comm->user . "'>Manage Members</a>";
+    $ret .= " <a href='$LJ::SITEROOT/community/pending.bml?authas=" . $self->comm->user . "'>Manage Members</a>";
     $ret .= "</div>";
 
     return $ret;
@@ -115,7 +115,7 @@
         $self->format_options($is_html, $lang, $vars,
         {
             'esn.approve_join_request'    => [ 1, $authurl ],
-            'esn.manage_membership_reqs'  => [ 2, "$LJ::SITEROOT/community/pending.bml?comm=$communityname" ],
+            'esn.manage_membership_reqs'  => [ 2, "$LJ::SITEROOT/community/pending.bml?authas=$communityname" ],
             'esn.manage_community'        => [ 3, "$LJ::SITEROOT/community/manage.bml" ],
         }
     );

Modified: trunk/cgi-bin/ljprotocol.pl
===================================================================
--- trunk/cgi-bin/ljprotocol.pl	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/cgi-bin/ljprotocol.pl	2008-05-07 21:12:54 UTC (rev 13856)
@@ -954,9 +954,9 @@
                             "   Subject: $req->{'subject'}\n\n" .
                             "Options:\n\n" .
                             "  - Accept or reject this submission\n" .
-                            "    $LJ::SITEROOT/community/moderate.bml?comm=$uowner->{'user'}&modid=$modid\n" .
+                            "    $LJ::SITEROOT/community/moderate.bml?authas=$uowner->{'user'}&modid=$modid\n" .
                             "  - View the entire moderation queue\n".
-                            "    $LJ::SITEROOT/community/moderate.bml?comm=$uowner->{'user'}\n\n" .
+                            "    $LJ::SITEROOT/community/moderate.bml?authas=$uowner->{'user'}\n\n" .
                             "--\n$LJ::SITENAME Team\n$LJ::SITEROOT/\n";
 
                 my $ct;

Modified: trunk/cgi-bin/weblib.pl
===================================================================
--- trunk/cgi-bin/weblib.pl	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/cgi-bin/weblib.pl	2008-05-07 21:12:54 UTC (rev 13856)
@@ -2780,8 +2780,8 @@
             $links{'unwatch_community'}   = "<a href='$LJ::SITEROOT/community/leave.bml?comm=$journal->{user}'>$BML::ML{'web.controlstrip.links.removecomm'}</a>";
             $links{'post_to_community'}   = "<a href='$LJ::SITEROOT/update.bml?usejournal=$journal->{user}'>$BML::ML{'web.controlstrip.links.postcomm'}</a>";
             $links{'edit_community_profile'} = "<a href='$LJ::SITEROOT/manage/profile/?authas=$journal->{user}'>$BML::ML{'web.controlstrip.links.editcommprofile'}</a>";
-            $links{'edit_community_invites'} = "<a href='$LJ::SITEROOT/community/sentinvites.bml?comm=$journal->{user}'>$BML::ML{'web.controlstrip.links.managecomminvites'}</a>";
-            $links{'edit_community_members'} = "<a href='$LJ::SITEROOT/community/members.bml?comm=$journal->{user}'>$BML::ML{'web.controlstrip.links.editcommmembers'}</a>";
+            $links{'edit_community_invites'} = "<a href='$LJ::SITEROOT/community/sentinvites.bml?authas=$journal->{user}'>$BML::ML{'web.controlstrip.links.managecomminvites'}</a>";
+            $links{'edit_community_members'} = "<a href='$LJ::SITEROOT/community/members.bml?authas=$journal->{user}'>$BML::ML{'web.controlstrip.links.editcommmembers'}</a>";
         }
     }
     my $journal_display = LJ::ljuser($journal);

Modified: trunk/htdocs/approve.bml
===================================================================
--- trunk/htdocs/approve.bml	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/htdocs/approve.bml	2008-05-07 21:12:54 UTC (rev 13856)
@@ -99,7 +99,7 @@
                '<?p ' . BML::ml('.commjoin.text', {
                            user => LJ::ljuser($username),
                            comm => LJ::ljuser($commname),
-                           aopts => "href=\"$LJ::SITEROOT/community/members.bml?comm=$commname\"",
+                           aopts => "href=\"$LJ::SITEROOT/community/members.bml?authas=$commname\"",
                         }) . ' p?>';
     }
 

Modified: trunk/htdocs/community/manage.bml
===================================================================
--- trunk/htdocs/community/manage.bml	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/htdocs/community/manage.bml	2008-05-07 21:12:54 UTC (rev 13856)
@@ -111,16 +111,16 @@
             $ret .= BML::ml('Actionlink', {
                 'link'=>"<a href='/community/settings.bml?authas=$user'>$ML{'.commlist.actsettings2'}</a>"}) . "  ";
             $ret .= BML::ml('Actionlink', {
-                'link'=>"<a href='/community/sentinvites.bml?comm=$user'>$ML{'.commlist.actinvites'}</a>"}) . "  ";
+                'link'=>"<a href='/community/sentinvites.bml?authas=$user'>$ML{'.commlist.actinvites'}</a>"}) . "  ";
             my $pend = $pending{$id} ? BML::ml('.commlist.actpending', { num => $pending{$id},
-                                               aopts => "href=\"/community/pending.bml?comm=$user\"" }) : '';
+                                               aopts => "href=\"/community/pending.bml?authas=$user\"" }) : '';
             $ret .= BML::ml('Actionlink', {
-                'link'=>"<a href='/community/members.bml?comm=$user'>$ML{'.commlist.actmembers2'}</a>$pend"}) . "  ";
+                'link'=>"<a href='/community/members.bml?authas=$user'>$ML{'.commlist.actmembers2'}</a>$pend"}) . "  ";
         }
         $ret .= "</td><td align='center'>";
         if ($mods{$id}) {
             my $num = $modcount{$id} || "0"; # relying on this to be <b>-wrapped
-            $ret .= BML::ml('.commlist.moderation.num2', {'aopts' => "href='$LJ::SITEROOT/community/moderate.bml?comm=$user'", 'num' => $num});
+            $ret .= BML::ml('.commlist.moderation.num2', {'aopts' => "href='$LJ::SITEROOT/community/moderate.bml?authas=$user'", 'num' => $num});
         } else {
             $ret .= " ";
         }

Modified: trunk/htdocs/community/members.bml
===================================================================
--- trunk/htdocs/community/members.bml	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/htdocs/community/members.bml	2008-05-07 21:12:54 UTC (rev 13856)
@@ -26,7 +26,12 @@
         return $print_with_ad->($ret);
     }
 
-    my $cname = $GET{'comm'};
+    # old GET arg
+    if ($GET{comm}) {
+        return BML::redirect("$LJ::SITEROOT/community/members.bml?authas=$GET{comm}");
+    }
+
+    my $cname = $GET{authas};
     return BML::redirect("$LJ::SITEROOT/community/manage.bml") unless $cname;
 
     # get $c object
@@ -225,7 +230,7 @@
              $ret .= "<?h1 $ML{'Error'} h1?><?p Your community, " .
                      LJ::ljuser($cname, { 'type' => 'C' }) .
                      ", must have at least one maintainer. " .
-                     "Please <a href='" . BML::get_uri() . "?comm=$cname'>" .
+                     "Please <a href='" . BML::get_uri() . "?authas=$cname'>" .
                      "go back</a> and add a maintainer. p?>";
              return $print_with_ad->($ret);
         }
@@ -432,7 +437,7 @@
             $ret .= "</ul>";
         }
         $ret .= "<?p $ML{'.success.nochanges'} p?>" unless @msgs || @invited;
-        $ret .= "<?p " . BML::ml('.success.return2', {'aopts' => "href='" . BML::get_uri() . "?comm=$cname'"}) . " p?>";
+        $ret .= "<?p " . BML::ml('.success.return2', {'aopts' => "href='" . BML::get_uri() . "?authas=$cname'"}) . " p?>";
         $ret .= LJ::Widget::GettingStarted->render;
 
         return $ret;
@@ -513,7 +518,7 @@
     # how to make links back to this page
     my $self_link = sub {
         my $sort = "&sort=$GET{'sort'}" if $GET{'sort'};
-        return "members.bml?comm=$cname&page=$_[0]$sort";
+        return "members.bml?authas=$cname&page=$_[0]$sort";
     };
 
     my %items = BML::paging(\@users, $jumppage || $GET{'page'}, $page_size);
@@ -525,7 +530,7 @@
     $ret .= "<?p " . BML::ml('.name', { 'name' => LJ::ljuser($cname, { 'type' => 'C' }) });
     $ret .= " " . BML::ml('Actionlink', {'link' => "<a href='$LJ::SITEROOT/community/settings.bml?authas=$cname'>$ML{'.settings2'}</a>"}) . " p?>";
 
-    $ret .= "<form method='post' action='members.bml?comm=$cname'>";
+    $ret .= "<form method='post' action='members.bml?authas=$cname'>";
     $ret .= LJ::form_auth();
 
     # jump to user
@@ -538,7 +543,7 @@
         $ret .= $navbar;
     }
 
-    my $sortlink = BML::get_uri() . "?comm=$cname&sort=";
+    my $sortlink = BML::get_uri() . "?authas=$cname&sort=";
     $ret .= "<br /><div align='center'><table class='alternating-rows' cellpadding='0' cellspacing='0'>\n<tr>" .
             "<th><a href='${sortlink}name'>$ML{'.key.user'}</a></th>";
     $ret .= "<th><a href='${sortlink}$_'>".$ML{".key.$_"}."</a></th>" for (@attribs);

Modified: trunk/htdocs/community/moderate.bml
===================================================================
--- trunk/htdocs/community/moderate.bml	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/htdocs/community/moderate.bml	2008-05-07 21:12:54 UTC (rev 13856)
@@ -18,6 +18,11 @@
         return $ret;
     }
 
+    # old GET arg
+    if ($GET{comm}) {
+        return BML::redirect("$LJ::SITEROOT/community/moderate.bml?authas=$GET{comm}");
+    }
+
     my $mode = $POST{'mode'};
     my ($saved_comm, $saved_modid) = ("", 0);
 
@@ -157,7 +162,7 @@
                 'text'=>$ML{'.manage'},
                 }) . "<br />";
             $ret .= BML::ml('Backlink', {
-                'link'=>"/community/moderate.bml?comm=$c->{'user'}",
+                'link'=>"/community/moderate.bml?authas=$c->{'user'}",
                 'text'=>$ML{'.moderate'},
                 }) . "<br />";
             $ret .= "</p>";
@@ -165,7 +170,7 @@
         }
     }
 
-    my $comm = $saved_comm || ($mode eq 'action' ? $POST{'comm'} : $GET{'comm'});
+    my $comm = $saved_comm || ($mode eq 'action' ? $POST{'comm'} : $GET{authas});
     my $modid = $saved_modid || ($mode eq 'action' ? $POST{'modid'} : $GET{'modid'});
     $modid += 0;
 
@@ -269,7 +274,7 @@
             my %users;
             LJ::load_userids_multiple([ map { $_->{'posterid'}, \$users{$_->{'posterid'}} } @entries ]);
             foreach (sort { $a->{'logtime'} lt $b->{'logtime'} } @entries) {
-                my $link = "/community/moderate.bml?comm=$comm&modid=" . $_->{'modid'};
+                my $link = "/community/moderate.bml?authas=$comm&modid=" . $_->{'modid'};
                 my $subject = $_->{'subject'} ? LJ::eall($_->{'subject'}) : "<i>[No Subject]</i>";
                 $ret .= "<tr><td>$_->{'logtime'}</td>" .
                     "<td><?ljuser " . $users{$_->{'posterid'}}->{'user'} . " ljuser?></td>" .
@@ -345,7 +350,7 @@
             'text'=>$ML{'.manage'},
         }) . "<br />";
         $ret .= BML::ml('Backlink', {
-            'link'=>"/community/moderate.bml?comm=$comm",
+            'link'=>"/community/moderate.bml?authas=$comm",
             'text'=>$ML{'.moderate'},
         }) . "<br />";
         $ret .= "</p>";

Modified: trunk/htdocs/community/pending.bml
===================================================================
--- trunk/htdocs/community/pending.bml	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/htdocs/community/pending.bml	2008-05-07 21:12:54 UTC (rev 13856)
@@ -20,7 +20,12 @@
     my $remote = LJ::get_remote();
     return "<?needlogin?>" unless $remote;
 
-    my $cname = $GET{'comm'};
+    # old GET arg
+    if ($GET{comm}) {
+        return BML::redirect("$LJ::SITEROOT/community/pending.bml?authas=$GET{comm}");
+    }
+
+    my $cname = $GET{authas};
     return BML::redirect("$LJ::SITEROOT/community/manage.bml") unless $cname;
 
     # get $c object
@@ -80,7 +85,7 @@
         $ret .= "<?p " . BML::ml('.success.rejected', { num => $rejected }) . " p?>" if $rejected;
         $ret .= "<?p " . BML::ml('.success.ignored', { num => $ignored }) . " p?>" if $ignored;
         $ret .= "<?p " . BML::ml('.success.previous', { num => $previous }) . " p?>" if $previous;
-        $ret .= "<?p " . BML::ml("/community/members.bml.success.return", { 'link' => BML::get_uri() . "?comm=$cname" }) . " p?>";
+        $ret .= "<?p " . BML::ml("/community/members.bml.success.return", { 'link' => BML::get_uri() . "?authas=$cname" }) . " p?>";
 
         return $ret;
     }
@@ -90,7 +95,7 @@
 
     # how to make links back to this page
     my $self_link = sub {
-        return "pending.bml?comm=$cname&page=$_[0]";
+        return "pending.bml?authas=$cname&page=$_[0]";
     };
 
     my %items = BML::paging(\@users, $GET{page}, $page_size);
@@ -100,9 +105,9 @@
 
     # output starts here
     $ret .= "<?p " . BML::ml('/community/members.bml.name', { name => LJ::ljuser($cname, { type => 'C' }) });
-    $ret .= " " . BML::ml('/community/members.bml.settings', { 'link' => "settings.bml?comm=$cname"}) . " p?>";
+    $ret .= " " . BML::ml('/community/members.bml.settings', { 'link' => "settings.bml?authas=$cname"}) . " p?>";
 
-    $ret .= "<form method='post' action='pending.bml?comm=$cname'>";
+    $ret .= "<form method='post' action='pending.bml?authas=$cname'>";
     $ret .= LJ::form_auth();
 
     # table headers

Modified: trunk/htdocs/community/sentinvites.bml
===================================================================
--- trunk/htdocs/community/sentinvites.bml	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/htdocs/community/sentinvites.bml	2008-05-07 21:12:54 UTC (rev 13856)
@@ -20,7 +20,12 @@
         return $ret;
     }
 
-    my $cname = $GET{comm};
+    # old GET arg
+    if ($GET{comm}) {
+        return BML::redirect("$LJ::SITEROOT/community/sentinvites.bml?authas=$GET{comm}");
+    }
+
+    my $cname = $GET{authas};
     return BML::redirect("$LJ::SITEROOT/community/manage.bml") unless $cname;
 
     # get $c object
@@ -82,7 +87,7 @@
     # hop out if there were no invites
     unless (%users) {
         return "$ret<?h1 $ML{'.none.title'} h1?><?p " .
-               BML::ml('.none.body', { aopts => "href='/community/members.bml?comm=$c->{user}'" }) .
+               BML::ml('.none.body', { aopts => "href='/community/members.bml?authas=$c->{user}'" }) .
                " p?>";
     }
     
@@ -121,7 +126,7 @@
     my $self_link = sub {
         my $sort = "&sort=$GET{'sort'}" if $GET{'sort'};
         my $filter = "&show=$GET{'show'}" if $GET{'show'};
-        return "sentinvites.bml?comm=$cname&page=$_[0]$sort$filter";
+        return "sentinvites.bml?authas=$cname&page=$_[0]$sort$filter";
     };
 
     my %items = BML::paging(\@users, $jumppage || $GET{'page'}, $page_size);
@@ -131,11 +136,11 @@
 
     # output starts here
     $ret .= "<?p " . BML::ml('/community/members.bml.name', { 'name' => LJ::ljuser($cname, { 'type' => 'C' }) });
-    $ret .= " " . BML::ml('/community/members.bml.settings', { 'link' => "settings.bml?comm=$cname"}) . " p?>";
+    $ret .= " " . BML::ml('/community/members.bml.settings', { 'link' => "settings.bml?authas=$cname"}) . " p?>";
 
     # jump to user
     if ($items{'pages'} > 1) {
-        $ret .= "<form method='post' action='sentinvites.bml?comm=$cname'>";
+        $ret .= "<form method='post' action='sentinvites.bml?authas=$cname'>";
         $ret .= "<div style='margin-left: 30px;'>Jump to user: ";
         $ret .= LJ::html_text({ 'name' => 'jumpto', 'value' => $POST{'jumpto'},
                                 'size' => '10', 'maxlength' => '15' }) . " ";
@@ -146,14 +151,14 @@
 
     # setup showlinks
     my $showlinks = "<form method='get' action='/community/sentinvites.bml'>";
-    $showlinks .= LJ::html_hidden('comm', $c->{user});
+    $showlinks .= LJ::html_hidden('authas', $c->{user});
     $showlinks .= "Filter to: ";
     $showlinks .= LJ::html_select({ name => 'show', selected => $GET{show} }, map { $_, $_ } qw(all accepted outstanding rejected));
     $showlinks .= LJ::html_submit(undef, 'Refresh');
     $showlinks .= "</form>";
 
     my $filter = "&show=$GET{show}" if $GET{show};
-    my $sortlink = BML::get_uri() . "?comm=$cname$filter&sort=";
+    my $sortlink = BML::get_uri() . "?authas=$cname$filter&sort=";
     $ret .= "<br /><div align='center'>$showlinks";
     $ret .= <<END; 
 <table class='borderedtable' cellpadding='2' cellspacing='0'>
@@ -201,7 +206,7 @@
     }
 
     $ret .= "</table>\n";
-    $ret .= "<br /><a href='/community/members.bml?comm=$c->{user}'>$ML{'.send'}</a>";
+    $ret .= "<br /><a href='/community/members.bml?authas=$c->{user}'>$ML{'.send'}</a>";
     $ret .= "</div>\n\n";
     $ret .= $navbar;
     return $ret;

Modified: trunk/htdocs/community/settings.bml
===================================================================
--- trunk/htdocs/community/settings.bml	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/htdocs/community/settings.bml	2008-05-07 21:12:54 UTC (rev 13856)
@@ -245,7 +245,7 @@
           LJ::set_active_crumb('commsettings');
             $ret .= LJ::html_hidden('cuser', $cname);
             $ret .= "<?p " . BML::ml('.name',{'name'=>"<?ljcomm $cname ljcomm?>"});
-            $ret .= " " . BML::ml('Actionlink', {'link' => "<a href='$LJ::SITEROOT/community/members.bml?comm=$cname'>$ML{'.members2'}</a>"}) . " p?>";
+            $ret .= " " . BML::ml('Actionlink', {'link' => "<a href='$LJ::SITEROOT/community/members.bml?authas=$cname'>$ML{'.members2'}</a>"}) . " p?>";
         }
 
     $ret .= "<div id='left-column'>";

Modified: trunk/htdocs/friends/edit.bml
===================================================================
--- trunk/htdocs/friends/edit.bml	2008-05-07 15:53:05 UTC (rev 13855)
+++ trunk/htdocs/friends/edit.bml	2008-05-07 21:12:54 UTC (rev 13856)
@@ -31,7 +31,7 @@
     my $u = LJ::get_authas_user($authas);
     return $print_with_ad->(LJ::bad_input($ML{'error.invalidauth'}))
         unless $u;
-    return BML::redirect("$LJ::SITEROOT/community/members.bml?comm=$u->{'user'}")
+    return BML::redirect("$LJ::SITEROOT/community/members.bml?authas=$u->{'user'}")
         if $u->is_community;
     return $print_with_ad->(LJ::bad_input($ML{'.error.badjournaltype'}))
         unless $u->is_person || $u->is_shared || $u->is_identity;

[ljcom] r6272: Extra release r29.1

Wed, 07 May 2008 15:47:05 GMT

Committer: sup

Extra release r29.1

A   branches/r29.1/

Copied: branches/r29.1 (from rev 6271, branches/r29)

[livejournal] r13853: Extra release r29.1

Wed, 07 May 2008 15:46:57 GMT

Committer: sup

Extra release r29.1

A   branches/r29.1/

Copied: branches/r29.1 (from rev 13852, branches/r29)

[livejournal] r13852: Load MIME::Words module without Autouse ...

Wed, 07 May 2008 14:58:37 GMT

Committer: sup

Load MIME::Words module without Autouse magic.

U   trunk/cgi-bin/talklib.pl

Modified: trunk/cgi-bin/talklib.pl
===================================================================
--- trunk/cgi-bin/talklib.pl	2008-05-07 14:47:27 UTC (rev 13851)
+++ trunk/cgi-bin/talklib.pl	2008-05-07 14:58:34 UTC (rev 13852)
@@ -16,9 +16,9 @@
                       LJ::Event::UserNewComment
                       LJ::Comment
                       LJ::EventLogRecord::NewComment
-                      MIME::Words
                       Captcha::reCAPTCHA
                       );
+use MIME::Words;
 use Carp qw(croak);
 
 # dataversion for rate limit logging

[livejournal] r13851: Bug fixed with encodings in From field. ...

Wed, 07 May 2008 14:47:30 GMT

Committer: sup

Bug fixed with encodings in From field. Use 'LJ::User->mailencoding' method for detection of users' encodings.

U   trunk/cgi-bin/ljmail.pl
U   trunk/cgi-bin/talklib.pl

Modified: trunk/cgi-bin/ljmail.pl
===================================================================
--- trunk/cgi-bin/ljmail.pl	2008-05-07 14:15:39 UTC (rev 13850)
+++ trunk/cgi-bin/ljmail.pl	2008-05-07 14:47:27 UTC (rev 13851)
@@ -68,21 +68,24 @@
 
         my $body = $opt->{'wrap'} ? Text::Wrap::wrap('','',$opt->{'body'}) : $opt->{'body'};
         my $subject = $opt->{'subject'};
+        my $fromname = $opt->{'fromname'};
 
         # if it's not ascii, add a charset header to either what we were explictly told
         # it is (for instance, if the caller transcoded it), or else we assume it's utf-8.
         # Note: explicit us-ascii default charset suggested by RFC2854 sec 6.
         $opt->{'charset'} ||= "utf-8";
         my $charset;
-        if (!LJ::is_ascii($subject) || !LJ::is_ascii($body) || ($opt->{html} && !LJ::is_ascii($opt->{html}))) {
+        if (!LJ::is_ascii($subject)
+         || !LJ::is_ascii($body) 
+         || ($opt->{html} && !LJ::is_ascii($opt->{html}))
+         || !LJ::is_ascii($fromname)) {
             $charset = $opt->{'charset'};
-        }
-        else {
+        } else {
             $charset = 'us-ascii';
         }
 
         # Don't convert from us-ascii and utf-8 charsets.
-        unless (($charset eq 'us-ascii') || ($charset =~ m/^utf-8$/i)) {
+        unless (($charset =~ m/us-ascii/i) || ($charset =~ m/^utf-8$/i)) {
             from_to($body,              "utf-8", $charset);
             # Convert also html-part if we has it.
             if ($opt->{html}) {
@@ -91,12 +94,20 @@
         }
 
         from_to($subject, "utf-8", $charset) unless $charset =~ m/^utf-8$/i;
-        $subject = MIME::Words::encode_mimeword($subject, 'B', $charset);
+        if (!LJ::is_ascii($subject)) {
+            $subject = MIME::Words::encode_mimeword($subject, 'B', $charset);
+        }
 
+        from_to($fromname, "utf-8", $charset) unless $charset =~ m/^utf-8$/i;
+        if (!LJ::is_ascii($fromname)) {
+            $fromname = MIME::Words::encode_mimeword($fromname, 'B', $charset);
+        }
+        $fromname = $clean_name->($fromname, $opt->{'from'});
+
         if ($opt->{html}) {
             # do multipart, with plain and HTML parts
 
-            $msg = new MIME::Lite ('From'    => $clean_name->($opt->{'fromname'}, $opt->{'from'}),
+            $msg = new MIME::Lite ('From'    => $fromname,
                                    'To'      => $clean_name->($opt->{'toname'},   $opt->{'to'}),
                                    'Cc'      => $opt->{'cc'},
                                    'Bcc'     => $opt->{'bcc'},
@@ -121,7 +132,7 @@
 
         } else {
             # no html version, do simple email
-            $msg = new MIME::Lite ('From'    => $clean_name->($opt->{'fromname'}, $opt->{'from'}),
+            $msg = new MIME::Lite ('From'    => $fromname,
                                    'To'      => $clean_name->($opt->{'toname'},   $opt->{'to'}),
                                    'Cc'      => $opt->{'cc'},
                                    'Bcc'     => $opt->{'bcc'},
@@ -137,7 +148,6 @@
                 $msg->add($tag, $value);
             }
         }
-
     }
 
     # at this point $msg is a MIME::Lite

Modified: trunk/cgi-bin/talklib.pl
===================================================================
--- trunk/cgi-bin/talklib.pl	2008-05-07 14:15:39 UTC (rev 13850)
+++ trunk/cgi-bin/talklib.pl	2008-05-07 14:47:27 UTC (rev 13851)
@@ -2143,15 +2143,6 @@
         $headersubject = LJ::Lang::get_text($lang, $key, undef, $vars);
     }
 
-    if ($LJ::UNICODE && $encoding ne "UTF-8") {
-        $headersubject = Unicode::MapUTF8::from_utf8({-string=>$headersubject, -charset=>$encoding});
-    }
-
-    if (!LJ::is_ascii($headersubject)) {
-        eval { MIME::Words->can("autouse"); };
-        $headersubject = MIME::Words::encode_mimeword($headersubject, 'B', $encoding);
-    }
-
     if ($comment->{u}) {
         # external users has lj-logins as 'ext_*', so
         # we call external user by name, our user - by login.
@@ -2161,6 +2152,19 @@
         $fromname = LJ::Lang::get_text($lang, 'esn.mail_comments.fromname.anonymous', undef, $vars);
     }
 
+    if ($LJ::UNICODE && $encoding ne "UTF-8") {
+        $fromname = Unicode::MapUTF8::from_utf8({-string=>$fromname, -charset=>$encoding});
+        $headersubject = Unicode::MapUTF8::from_utf8({-string=>$headersubject, -charset=>$encoding});
+    }
+
+    if (!LJ::is_ascii($fromname)) {
+        $fromname = MIME::Words::encode_mimeword($fromname, 'B', $encoding);
+    }
+
+    if (!LJ::is_ascii($headersubject)) {
+        $headersubject = MIME::Words::encode_mimeword($headersubject, 'B', $encoding);
+    }
+
     return ( $headersubject, $fromname );
 }
 
@@ -2234,9 +2238,6 @@
 
         if ($paruserid) {
             $paru = LJ::load_userid($paruserid);
-            LJ::load_user_props($paru, 'mailencoding');
-            LJ::load_codes({ "encoding" => \%LJ::CACHE_ENCODINGS } )
-                unless %LJ::CACHE_ENCODINGS;
 
             # we don't want to send email to a parent if the email address on the
             # parent's user is the same as the email address on this comment's user
@@ -2259,7 +2260,7 @@
                 )
             {
                 $parentmailed = $paru->email_raw;
-                $encoding = $paru->{'mailencoding'} ? $LJ::CACHE_ENCODINGS{$paru->{'mailencoding'}} : "UTF-8";
+                $encoding = $paru->mailencoding || "UTF-8";
                 my $part;
 
                 # Now we going to send email to '$paru'.
@@ -2327,7 +2328,7 @@
 
         # Now we going to send email to '$entryu'.
         $lang = $entryu->prop('browselang');
-        $encoding = $entryu->{'mailencoding'} ? $LJ::CACHE_ENCODINGS{$entryu->{'mailencoding'}} : "UTF-8";
+        $encoding = $entryu->mailencoding || "UTF-8";
         ($headersubject, $fromname) = _format_headers($lang, $encoding, $comment, $entryu, $edited, $parent, $paru);
 
         my $msg =  new MIME::Lite ('From' => "\"$fromname\" <$LJ::BOGUS_EMAIL>",
@@ -2391,14 +2392,14 @@
     # they couldn't have posted if they were.  (and if they did somehow, we're just emailing
     # them, so it shouldn't matter.)
     my $u = $comment->{u};
-    LJ::load_user_props($u, 'opt_getselfemail', 'mailencoding') if $u;
+    LJ::load_user_props($u, 'opt_getselfemail') if $u;
     if ($u && $u->{'opt_getselfemail'} && LJ::get_cap($u, 'getselfemail')
         && !$u->gets_notified(journal => $journalu, arg1 => $ditemid, arg2 => $comment->{talkid})) {
         my $part;
 
         # Now we going to send email to '$u'.
         $lang = $u->prop('browselang');
-        $encoding = $entryu->{'mailencoding'} ? $LJ::CACHE_ENCODINGS{$entryu->{'mailencoding'}} : "UTF-8";
+        $encoding = $u->mailencoding || "UTF-8";
         ($headersubject, $fromname) = _format_headers($lang, $encoding, $comment, $u, $edited, $parent, $paru);
 
         my $msg = new MIME::Lite ('From' => "\"$fromname\" <$LJ::BOGUS_EMAIL>",

[livejournal] r13850: LJSUP-2131

Wed, 07 May 2008 14:15:42 GMT

Committer: sup

LJSUP-2131
Remote user in calendar view will see the number of post accessible to him (security permissions are respected now)

U   trunk/cgi-bin/LJ/User.pm

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2008-05-07 14:00:22 UTC (rev 13849)
+++ trunk/cgi-bin/LJ/User.pm	2008-05-07 14:15:39 UTC (rev 13850)
@@ -6141,8 +6141,29 @@
 
     my $uid = LJ::want_userid($u) or return undef;
 
+    my $memkind = 'p'; # public only, changed below
+    my $secwhere = "AND security='public'";
+    my $viewall = 0;
+    if ($remote) {
+        # do they have the viewall priv?
+        if (LJ::check_priv($remote, "canview", "suspended")) {
+            $viewall = LJ::check_priv($remote, 'canview', '*');
+        }
+
+        if ($remote->{'userid'} == $uid || $viewall) {
+            $secwhere = "";   # see everything
+            $memkind = 'a'; # all
+        } elsif ($remote->{'journaltype'} eq 'P') {
+            my $gmask = LJ::get_groupmask($u, $remote);
+            if ($gmask) {
+                $secwhere = "AND (security='public' OR (security='usemask' AND allowmask & $gmask))";
+                $memkind = 'g' . $gmask; # friends case: allowmask == gmask == 1
+            }
+        }
+    }
+
     my @days;
-    my $memkey = [$uid,"dayct:$uid"];
+    my $memkey = [$uid, "dayct:$uid:$memkind"];
     unless ($not_memcache) {
         my $list = LJ::MemCache::get($memkey);
         return $list if $list;
@@ -6150,14 +6171,14 @@
 
     my $dbcr = LJ::get_cluster_def_reader($u) or return undef;
     my $sth = $dbcr->prepare("SELECT year, month, day, COUNT(*) ".
-                             "FROM log2 WHERE journalid=? GROUP BY 1, 2, 3");
+                             "FROM log2 WHERE journalid=? $secwhere GROUP BY 1, 2, 3");
     $sth->execute($uid);
     while (my ($y, $m, $d, $c) = $sth->fetchrow_array) {
         # we force each number from string scalars (from DBI) to int scalars,
         # so they store smaller in memcache
         push @days, [ int($y), int($m), int($d), int($c) ];
     }
-    LJ::MemCache::add($memkey, \@days);
+    LJ::MemCache::add($memkey, \@days, 3600);
     return \@days;
 }

[ljcom] r6271: LJSUP-2095

Wed, 07 May 2008 14:01:03 GMT

Committer: sup

LJSUP-2095
Links "next day", "previous day" will lead to days with journal entries.

U   trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
U   trunk/bin/upgrading/s2layers/cuteness/layout.s2
U   trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
U   trunk/bin/upgrading/s2layers/nebula/layout.s2
U   trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
U   trunk/bin/upgrading/s2layers/unearthed/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2

Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2008-05-06 21:26:44 UTC (rev 6270)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2008-05-07 14:00:54 UTC (rev 6271)
@@ -900,8 +900,17 @@
     </div>""";
     var string tprev = ehtml($*text_day_prev);
     var string tnext = ehtml($*text_day_next);
-    """<center><h2><a href="$.prev_url">$tprev</a> · <a href="$.next_url">$tnext</a></h2></center>""";
-
+    """<center><h2>""";
+    if ($.prev_url != "") {
+        """<a href="$.prev_url">$tprev</a>""";
+    }
+    if ($.prev_url != "" and $.next_url != "") {
+        """ · """;
+    }
+    if ($.next_url != "") {
+        """<a href="$.next_url">$tnext</a>""";
+    }
+    """</h2></center>""";
 }
 
 function MonthPage::print_body() {

Modified: trunk/bin/upgrading/s2layers/cuteness/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/cuteness/layout.s2	2008-05-06 21:26:44 UTC (rev 6270)
+++ trunk/bin/upgrading/s2layers/cuteness/layout.s2	2008-05-07 14:00:54 UTC (rev 6271)
@@ -1219,7 +1219,15 @@
         var string tnext = ehtml($*text_day_next);
 
         print "<div id=\"footer\"><p>";
-        print "<a href=\"$.prev_url\" title=\"laquo; $tprev\">« $*text_day_prev</a> | <a href=\"$.next_url\" title=\"$tnext »\">$*text_day_next »</a>";
+        if ($.prev_url != "") {
+            print "<a href=\"$.prev_url\" title=\"« $tprev\">« $*text_day_prev</a>";
+        }
+        if ($.prev_url != "" and $.next_url != "") {
+            print " | ";
+        }
+        if ($.next_url != "") {
+            print "<a href=\"$.next_url\" title=\"$tnext »\">$*text_day_next »</a>";
+        }
         print "</p></div>";
 }
 

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2008-05-06 21:26:44 UTC (rev 6270)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2008-05-07 14:00:54 UTC (rev 6271)
@@ -2228,13 +2228,24 @@
 # -----------------------------------
 
 
+function DayPage_near_days(DayPage p) { 
+    if ($p.prev_url != "") {
+        """<a href="$p.prev_url">$*text_day_prev</a>""";
+    }
+    if ($p.prev_url != "" and $p.next_url != "") {
+        """ | """;
+    }
+    if ($p.next_url != "") {
+        """<a href="$p.next_url">$*text_day_next</a>""";
+    }
+}
+
 function DayPage::print_body() {
      """
      <div class="clear"> </div>
-       <div class="skiplinks">
-        <a href="$.prev_url">$*text_day_prev</a> |
-        <a href="$.next_url">$*text_day_next</a>
-    </div>
+       <div class="skiplinks">""";
+    DayPage_near_days($this);
+    """</div>
     <div class="clear"> </div>""";
     if ($.has_entries)
     {
@@ -2257,10 +2268,9 @@
     }
     """
        <div class="clear"> </div>
-       <div class="skiplinks">
-        <a href="$.prev_url">$*text_day_prev</a> |
-        <a href="$.next_url">$*text_day_next</a>\n
-    </div>
+       <div class="skiplinks">""";
+    DayPage_near_days($this);
+    """\n</div>
     <div class="clear"> </div>
     """;
 }

Modified: trunk/bin/upgrading/s2layers/nebula/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/nebula/layout.s2	2008-05-06 21:26:44 UTC (rev 6270)
+++ trunk/bin/upgrading/s2layers/nebula/layout.s2	2008-05-07 14:00:54 UTC (rev 6271)
@@ -1107,9 +1107,9 @@
 }
 
 function DayPage::lay_nav_links() : string[] {
-    var string[] ret = [];
-    $ret[0] = """<a href="$.prev_url">$*text_day_prev</a>""";
-    $ret[1] = """<a href="$.next_url">$*text_day_next</a>""";
+    var string[] ret = []; var int i;
+    if ($.prev_url != "") { $ret[$i] = """<a href="$.prev_url">$*text_day_prev</a>"""; $i++; }
+    if ($.next_url != "") { $ret[$i] = """<a href="$.next_url">$*text_day_next</a>"""; $i++; }
     return $ret;
 }
 

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2008-05-06 21:26:44 UTC (rev 6270)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2008-05-07 14:00:54 UTC (rev 6271)
@@ -972,7 +972,15 @@
     var string tnext = ehtml($*text_day_next);
 
     print "<div id=\"footer\"><p>";
-    print "<a href=\"$.prev_url\" title=\"laquo; $tprev\">« $*text_day_prev</a> | <a href=\"$.next_url\" title=\"$tnext »\">$*text_day_next »</a>";
+    if ($.prev_url != "") {
+        print "<a href=\"$.prev_url\" title=\"« $tprev\">« $*text_day_prev</a>";
+    }
+    if ($.prev_url != "" and $.next_url != "") {
+        print " | ";
+    }
+    if ($.next_url != "") {
+        print "<a href=\"$.next_url\" title=\"$tnext »\">$*text_day_next »</a>";
+    }
     print "</p></div>";
 }
 

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2008-05-06 21:26:44 UTC (rev 6270)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2008-05-07 14:00:54 UTC (rev 6271)
@@ -1635,16 +1635,16 @@
 #
 
 function DayPage::lay_sub_menu() : string[] {
-    var string[] ret = [];
-    $ret[0] = """<a href="$.prev_url">$*text_day_prev</a>""";
-    $ret[1] = """<a href="$.next_url">$*text_day_next</a>""";
+    var string[] ret = []; var int i;
+    if ($.prev_url != "") { $ret[$i] = """<a href="$.prev_url">$*text_day_prev</a>"""; $i++; }
+    if ($.next_url != "") { $ret[$i] = """<a href="$.next_url">$*text_day_next</a>"""; $i++; }
     return $ret;
 }
 
 function DayPage::lay_footer_menu() : string[] {
-    var string[] ret = [];
-    $ret[0] = """<a href="$.prev_url">$*text_day_prev</a>""";
-    $ret[1] = """<a href="$.next_url">$*text_day_next</a>""";
+    var string[] ret = []; var int i;
+    if ($.prev_url != "") { $ret[$i] = """<a href="$.prev_url">$*text_day_prev</a>"""; $i++; }
+    if ($.next_url != "") { $ret[$i] = """<a href="$.next_url">$*text_day_next</a>"""; $i++; }
     return $ret;
 }
 

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2008-05-06 21:26:44 UTC (rev 6270)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2008-05-07 14:00:54 UTC (rev 6271)
@@ -2334,8 +2334,16 @@
     }
 
     "<div class=\"skiplinks\">\n";
-    "<a href=\"$.prev_url\">$*text_day_prev</a> | ";
-    "<a href=\"$.next_url\">$*text_day_next</a>\n</div>";
+    if ($.prev_url != "") {
+        "<a href=\"$.prev_url\">$*text_day_prev</a>";
+    }
+    if ($.prev_url != "" and $.next_url != "") {
+        " | ";
+    }
+    if ($.next_url != "") {
+        "<a href=\"$.next_url\">$*text_day_next</a>";
+    }
+    "\n</div>";
 
 }