Merge pull request #2154 from kareila/cleanup-2017q2

Cleanup for 4/30 code push

cgi-bin/LJ/Auth.pm

@@ -109,7 +109,7 @@ sub check_sessionless_auth_token {
     my $auth_token = delete $reqvars{auth_token} or return 0;
 
     # recompute post vars
-    my $reqvars = join('&', map { $reqvars{$_} } qw(journalid moduleid preview) );
+    my $reqvars = join( '&', map { $reqvars{$_} // '' } qw(journalid moduleid preview) );
 
     # get vars out of token string
     my ($c_ver, $stime, $chal_uri, $chal_reqvars, $chalsig) = split(':', $auth_token);

cgi-bin/LJ/Entry.pm

@@ -1104,8 +1104,11 @@ sub userpic_kw {
 sub can_tellafriend {
     my ($entry, $u) = @_;
 
-    return 1 if $entry->security eq 'public';
-    return 0 if $entry->security eq 'private';
+    # this is undefined in preview
+    my $seclevel = $entry->security // '';
+
+    return 1 if $seclevel eq 'public';
+    return 0 if $seclevel eq 'private';
 
     # friends only
     return 0 unless $entry->journal->is_person;

cgi-bin/LJ/HTMLControls.pm

@@ -224,8 +224,10 @@ sub _html_option {
 
     # are there additional data-attributes?
     my $data_attribute = '';
-    if ( $item->{data} ) {
-        $data_attribute .= " data-$_='$item->{data}->{$_}'" foreach keys %{$item->{data} || {}};
+    my %item_data = $item->{data} ? %{$item->{data}} : ();
+    foreach ( keys %item_data ) {
+        my $val = $item_data{$_} // '';
+        $data_attribute .= " data-$_='$val'";
     }
 
     return "<option value=\"$value\"$id$sel$dis$data_attribute>" .

cgi-bin/LJ/S2.pm

@@ -2679,6 +2679,8 @@ sub curr_page_supports_ebox { 0 }
 sub has_quickreply
 {
     my ($page) = @_;
+    return 0 if $page->{_type} eq 'EntryPreviewPage';
+
     my $view = $page->{view};
     # Also needs adding to the list in core2.s2
     return $view eq 'entry' || $view eq 'read' || $view eq 'day' || $view eq 'recent' || $view eq 'network';

cgi-bin/LJ/User/Message.pm

@@ -275,10 +275,9 @@ sub can_add_inbox_subscription {
 
 # can this user use ESN?
 sub can_use_esn {
-    my $u = shift;
+    my $u = $_[0];
     return 0 if $u->is_community || $u->is_syndicated;
-    return 0 unless LJ::is_enabled('esn');
-    return LJ::is_enabled('esn_ui', $u);
+    return LJ::is_enabled( 'esn' );
 }
 
 

cgi-bin/LJ/Userpic.pm

@@ -883,10 +883,11 @@ sub make_default {
     $u->{'defaultpicid'} = $self->id;
 }
 
-# returns true if this picture if the default userpic
+# returns true if this picture is the default userpic
 sub is_default {
-    my $self = shift;
+    my $self = $_[0];
     my $u = $self->owner;
+    return unless defined $u->{'defaultpicid'};
 
     return $u->{'defaultpicid'} == $self->id;
 }

styles/core1.s2

@@ -2062,7 +2062,7 @@ function UserLite::base_url() [fixed] : string {
 }
 
 function UserLite::tag_manage_url() [fixed] : string {
-    return "$*SITEROOT/manage/tags.bml?authas=$.username";
+    return "$*SITEROOT/manage/tags?authas=$.username";
 }
 
 function UserLite::as_string() [fixed] : string {

styles/core2.s2

@@ -3462,7 +3462,7 @@ function UserLite::linklist_manage_url() [fixed] : string
 function UserLite::tag_manage_url() [fixed] : string
 "Returns a link to the user's tag management page. Overriding this function is NOT RECOMMENDED. Overriding this function could prevent sitewide improvements to styles, accessibility, or other functionality from operating in your layout."
 {
-    return "$*SITEROOT/manage/tags.bml?authas=$.username";
+    return "$*SITEROOT/manage/tags?authas=$.username";
 }
 
 function UserLite::icon_manage_url() [fixed] : string