Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/PAUSE.pm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ use Sys::Hostname ();
use Time::Piece;
use YAML::Syck;

# cf. https://github.com/andk/pause/issues/584
our $cpan_dot_org_mail_forwarding_ok = 0;

our $USE_RECENTFILE_HOOKS = Sys::Hostname::hostname =~ /pause/;
if ($USE_RECENTFILE_HOOKS) {
unless ($HAVE_RECENTFILE) {
Expand Down
2 changes: 1 addition & 1 deletion lib/pause_2017/templates/admin/email_for_admin.html.ep
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<thead>
<tr>
<th class="sort asc" data-sort="userid">id</th>
<th class="sort" data-sort="email"><i>id</i>@cpan.org gets forwarded to</th>
<th class="sort" data-sort="email">Contact Email</th>
</tr>
</thead>
<tbody class="list">
Expand Down
1 change: 1 addition & 0 deletions lib/pause_2017/templates/public/request_id/_form.html.ep
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Note: You can enter fairly free-form text here but it must consist of at least t
<p>
<%= text_field "pause99_request_id_email", size => 32 %>
</p>
<p><small>Note that contact information will be shared with the CPAN security team (<a href="https://security.cpan.org/">security.cpan.org</a>)<% if (!$PAUSE::cpan_dot_org_mail_forwarding_ok) {%> and the E-Mail forwarding service<% } %>.</small></p>
</div>

<div class="alternate<%= $alt++ % 2 + 1 %>">
Expand Down
6 changes: 6 additions & 0 deletions lib/pause_2017/templates/user/cred/edit.html.ep
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ for communicating with you.
</td></tr>

<tr><td class="alternate<%= $alter++ % 2 + 1 %>"><h4 class="altering">The email address <i><%= $cpan_alias %></i> should be configured to forward mail to ...</h4>
% if (!$PAUSE::cpan_dot_org_mail_forwarding_ok) {
<p class="explain"><b>
🚧 The mail forwarding service is currently not
available. Changes here will only take effect when the service can
be started up again. -- </b></p>
% }
<p class="explain">
<b>cpan.org</b> has a mail
address for you and it's your choice if you want it to point to your
Expand Down
Loading