Merge pull request #1179 from ikedas/racke/pr/info-hide-archive-downl…

…oad by racke & ikedas

 Hide archive download link from users without proper permissions #1176

default/web_tt2/info.tt2

@@ -134,13 +134,14 @@
                             <li>
                                 <i class="fa-li fa fa-arrow-right"></i><a href="[% 'edit_list_request' | url_rel([list,'archives']) %]">[%|loc%]Change settings for who can view archives[%END%]</a>
                             </li>
+                            [% IF arc_access %]
                             <li>
                                 <i class="fa-li fa fa-arrow-right"></i><a href="[% 'arc_manage' | url_rel([list]) %]">[%|loc%]Download archives[%END%]</a>
                             </li>
+                            [% END %]
                         </ul>
                     </div>
                 </div>
-
                 <div class="item">
                     <div class="item_content">
                         <a class="item_title" href="[% 'edit_list_request' | url_rel([list,'data_source']) %]">

default/web_tt2/my.tt2

@@ -53,7 +53,7 @@
                                 <li><a href="[% 'review' | url_rel([l.key]) %]"><i class="fa fa-users"></i> [%|loc%]Review members[%END%]</a></li>
                             [% END %]
 
-                            [% IF is_user_allowed_to('archive_web_access', l.key) %]
+                            [% IF l.value.arc_access %]
                                 <li><a href="[% 'arc' | url_rel([l.key]) %]"><i class="fa fa-archive"></i> [%|loc%]Archives[%END%]</a></li>
                             [% END %]
                         </ul>

default/web_tt2/suspend_request.tt2

@@ -11,9 +11,9 @@
         <p>[%|loc%]You are subscribed to the following lists[%END%]</p>
 
         <form class="noborder toggleContainer" data-toggle-selector="input[name='listname']" action="[% path_cgi %]" method="POST" name="suspend_request">
-            [% IF which_info.size %]
+            [% IF which.size %]
                 <div class="item_list">
-                    [% FOREACH l = which_info %]
+                    [% FOREACH l = which %]
                         [% suspended = 0 %]
                         [% suspendable = 0 %]
                         [% additional_class = '' %]
@@ -63,7 +63,7 @@
                                             </a>
                                         </li>
                                     [% END %]
-                                    [% IF is_user_allowed_to('archive_web_access', l.key) %]
+                                    [% IF l.value.arc_access %]
                                         <li>
                                             <a href="[% 'arc' | url_rel([l.key]) %]">
                                                 [%|loc%]Archives[%END%]

src/cgi/wwsympa.fcgi.in

@@ -1619,30 +1619,8 @@ while ($query = Sympa::WWW::FastCGI->new) {
         $param->{'title_clear_txt'} = $param->{'title'};
     }
 
-    $param->{'is_user_allowed_to'} = sub {
-        my $function = shift;
-        my $list     = shift;
-        return 0 unless $function and $list;
-
-        $list = Sympa::List->new($list, $robot)
-            unless ref $list eq 'Sympa::List';
-
-        return 0
-            if $function eq 'subscribe'
-            and $param->{'user'}{'email'}
-            and $list->is_list_member($param->{'user'}{'email'});
-
-        my $result = Sympa::Scenario->new($list, $function)->authz(
-            $param->{'auth_method'},
-            {   'sender'      => $param->{'user'}{'email'},
-                'remote_host' => $param->{'remote_host'},
-                'remote_addr' => $param->{'remote_addr'}
-            }
-        );
-        return 0 unless ref $result eq 'HASH';
-        return 0 if $result->{action} =~ /\Areject\b/i;
-        return 1;
-    };
+    # Deprecated tt2 function. Compat. <= 6.2.62
+    $param->{'is_user_allowed_to'} = sub { 0 };
 
     ## store in session table this session contexte
     $session->store();
@@ -14184,9 +14162,10 @@ sub do_suspend_request {
 sub _set_my_lists_info {
     my $which = {};
 
-    # Set which_info unless in one list page
+    # Set 'which' unless in one list page
     if ($param->{'user'}{'email'} and ref $list ne 'Sympa::List') {
         my %get_which;
+        my %all_lists;
 
         foreach my $role (qw(member owner editor)) {
             $get_which{$role} = Sympa::List::get_lists(
@@ -14212,6 +14191,8 @@ sub _set_my_lists_info {
                 unless ref $result eq 'HASH'
                 and $result->{'action'} eq 'do_it';
 
+            $all_lists{$list->{'name'}} = $list;
+
             my $l = $list->{'name'};
             $which->{$l}{'subject'} = $list->{'admin'}{'subject'};
             $which->{$l}{'status'}  = $list->{'admin'}{'status'}; # new 6.2.46
@@ -14268,6 +14249,8 @@ sub _set_my_lists_info {
             $which->{$l}{'display'} = $which->{$l}{'listsuspend'};
         }
         foreach my $list (@{$get_which{owner}}) {
+            $all_lists{$list->{'name'}} = $list;
+
             my $l = $list->{'name'};
 
             $which->{$l}{'subject'} = $list->{'admin'}{'subject'};
@@ -14280,6 +14263,8 @@ sub _set_my_lists_info {
             $which->{$l}{'host'} = $list->{'domain'};
         }
         foreach my $list (@{$get_which{editor}}) {
+            $all_lists{$list->{'name'}} = $list;
+
             my $l = $list->{'name'};
 
             $which->{$l}{'subject'} = $list->{'admin'}{'subject'};
@@ -14291,6 +14276,25 @@ sub _set_my_lists_info {
             # Compat. < 6.2.32 (Not used by default)
             $which->{$l}{'host'} = $list->{'domain'};
         }
+
+        foreach my $list (values %all_lists) {
+            # Archives Access control
+            if (defined $list->is_archiving_enabled) {
+                my $result =
+                    Sympa::Scenario->new($list, 'archive_web_access')->authz(
+                    $param->{'auth_method'},
+                    {   'sender'      => $param->{'user'}{'email'},
+                        'remote_host' => $param->{'remote_host'},
+                        'remote_addr' => $param->{'remote_addr'}
+                    }
+                    );
+                my $r_action;
+                $r_action = $result->{'action'} if ref $result eq 'HASH';
+
+                $which->{$list->{'name'}}{arc_access} = 1
+                    if $r_action =~ /do_it/i;
+            }
+        }
     }
 
     $param->{'which'} = $which;