diff --git a/config.ini b/config.ini index dff12bf..bd432f6 100644 --- a/config.ini +++ b/config.ini @@ -20,7 +20,9 @@ MAIL_BODY=Hvala, ker ste prispevali besedila in na ta način pomagali pri razvoj Lep pozdrav, ekipa RSDO MAIL_SUBJECT_PREDAVANJA=Projekt ON ({upload_id}) -MAIL_BODY_PREDAVANJA=Spoštovani, sodelavci projekta ON se vam zahvaljujemo za prispevek in sodelovanje. Morebitna vprašanja pošljite na naslov predavajalnik@cjvt.si. +MAIL_BODY_PREDAVANJA=Spoštovani, + + sodelavci projekta ON se vam zahvaljujemo za prispevek in sodelovanje. Morebitna vprašanja pošljite na naslov predavajalnik@cjvt.si. Hvala in lep pozdrav, ekipa CJVT UL diff --git a/docker-compose.yml b/docker-compose.yml index 49685b1..4829e2f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - 127.0.0.1:5000:80 volumes: - /tmp/portal-ds4-ds1/uploads:/usr/src/portal-webapp/uploads - command: gunicorn --bind 0.0.0.0:80 -w 1 --access-logfile - app:app + command: gunicorn -t 3000 --bind 0.0.0.0:80 -w 1 --access-logfile - app:app db: image: postgres:9.6.21-alpine restart: always diff --git a/portal/base.py b/portal/base.py index 11f8098..78f41d0 100644 --- a/portal/base.py +++ b/portal/base.py @@ -22,7 +22,8 @@ from jinja2 import Environment, FileSystemLoader from . model import db, UploadRegular, UploadSolar, RegisteredUser, CorpusAccess, Institution -REGEX_EMAIL = re.compile('^[a-z0-9]+[\._]?[a-z0-9]+[@]\w+[.]\w{2,3}$') +#REGEX_EMAIL = re.compile('^[a-z0-9]+[\._]?[a-z0-9]+[@]\w+[.]\w{2,3}$') +REGEX_EMAIL = re.compile('^(?:[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])$') MAX_FNAME_LEN = 100 @@ -86,6 +87,10 @@ class UploadHandler: upload_timestamp = int(time.time()) upload_id = UploadHandler.create_upload_id(corpus_name, form_data, upload_timestamp, file_hashes) + # Strip form fieds. + for key, val in form_data.items(): + form_data[key] = val.strip() + upload_metadata['corpus_name'] = corpus_name upload_metadata['form_data'] = form_data upload_metadata['upload_id'] = upload_id @@ -181,6 +186,7 @@ class UploadHandler: # Create a secure SSL context context = ssl.create_default_context() + # TODO: Implement timeout. try: with SMTP_SSL(self.config['MAIL_HOST'], self.config['SMTP_PORT'], context=context) as server: server.login(self.config['MAIL_LOGIN'], self.config['MAIL_PASS']) diff --git a/templates/basic-predavanja.html b/templates/basic-predavanja.html index af5ec0c..97cdff0 100644 --- a/templates/basic-predavanja.html +++ b/templates/basic-predavanja.html @@ -47,16 +47,16 @@ - +
- +
- +

@@ -68,12 +68,12 @@

- +

- Obvestilo o obdelavi osebnih podatkov + Obvestilo o obdelavi osebnih podatkov
@@ -136,6 +136,7 @@ var kljucneBesede = form["kljucne-besede"].value; var email = form["email"].value; var telefon = form["telefon"].value; + var privolitev = form["strojno-prevajanje"].checked; if (isEmptyOrSpaces(ime) || isEmptyOrSpaces(naslov) || isEmptyOrSpaces(predmet) || @@ -155,6 +156,8 @@ email.length > 100 || telefon.length > 100) { alert("Velikost polj je omejena na 100 znakov."); + } else if (!privolitev) { + alert("Odkljukana privolitev je pogoj za oddajo."); } else { // Hand off data to dropzone