X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=filex%2Fforms.py;h=4f7c8ddc7d7412ab489af324e621e8fdfa483b6c;hb=3e29cd65efbb6b29b3db8c84e625f75829e550e7;hp=e9b866f5e31dca387bd9b9477c80fcdd22fe26c9;hpb=dee5b1cbf07c44e308dbccea2e49bb484eb6f2f5;p=qcg-portal.git

diff --git a/filex/forms.py b/filex/forms.py
index e9b866f..4f7c8dd 100644
--- a/filex/forms.py
+++ b/filex/forms.py
@@ -3,17 +3,10 @@ import os
 
 from django import forms
 from django.core.exceptions import ValidationError
-from django.core.validators import RegexValidator
 from django.utils.http import urlquote
 
 from filex.models import Favorite
-
-
-msg = u'Invalid value'
-host_validator = RegexValidator(r'^(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+'
-                                r'(?:[a-zA-Z]{2,6}\.?|[a-zA-Z0-9-]{2,}(?<!-)\.?))(?::\d+)?$', msg)
-path_validator = RegexValidator(r'^~?(?:/[^/\0]*)*$', msg)
-name_validator = RegexValidator(r'^[^/\0]+$', msg)
+from filex.utils import host_validator, path_validator, name_validator
 
 
 def clean_path(path):
@@ -26,6 +19,9 @@ class FavoriteForm(forms.ModelForm):
         fields = ('owner', 'host', 'path')
         widgets = {'owner': forms.HiddenInput()}
 
+    def clean_path(self):
+        return os.path.normpath(self.cleaned_data['path'])
+
 
 class HostForm(forms.Form):
     host = forms.CharField(label=u'Host', max_length=256, validators=[host_validator], widget=forms.HiddenInput())
@@ -41,6 +37,9 @@ class HostPathForm(HostForm):
 class HostPathNameForm(HostPathForm):
     name = forms.CharField(label=u'Nazwa', max_length=256, validators=[name_validator])
 
+    def clean_name(self):
+        return clean_path(self.cleaned_data['name'])
+
 
 class HostItemsForm(HostForm):
     dirs = forms.MultipleChoiceField(label=u'Katalogi', required=False, widget=forms.MultipleHiddenInput())