Skip to content

Commit

Permalink
Merge 62177af into 18cb04a
Browse files Browse the repository at this point in the history
  • Loading branch information
slint committed Nov 13, 2020
2 parents 18cb04a + 62177af commit 68ed055
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions zenodo/modules/deposit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ def is_user_verified(confirmation_period=timedelta(days=7)):
blacklisted_email_domains = current_app.config.get(
'ZENODO_BLACKLISTED_EMAIL_DOMAINS', [])
has_blacklisted_domain = email_domain in blacklisted_email_domains
matured_confirmation = current_user.confirmed_at > \
immature_confirmation = current_user.confirmed_at > \
(datetime.utcnow() - confirmation_period)
if has_blacklisted_domain and matured_confirmation:
if has_blacklisted_domain and immature_confirmation:
return False, (
'You have registered on Zenodo using an email address domain '
'that has recently been used to upload spam on Zenodo. Your '
Expand Down
2 changes: 1 addition & 1 deletion zenodo/modules/theme/templates/zenodo_theme/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h5>{{_('Funded by')}}</h5>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-sm-pull-6 text-center-xs">
<p>Powered by <a href="https://home.cern/science/computing/data-centre">CERN Data Centre</a> &amp; <a href="http://inveniosoftware.org">Invenio</a></p>
<p><a title="Except where otherwise noted, content on this site is licensed under a Creative Commons Attribution 4.0 International License." rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons Licence" height="20" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a>&nbsp; Powered by <a href="https://home.cern/science/computing/data-centre">CERN Data Centre</a> &amp; <a href="http://inveniosoftware.org">Invenio</a>.</p>
</div>
</div>
</div>
Expand Down

0 comments on commit 68ed055

Please sign in to comment.