X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/da63b5b1fdcd03f375ff6b40a1d022d4e8778801..8efb262f2f1a58b3ce30d16d376bc64a56a24119:/validators.py?ds=inline

diff --git a/validators.py b/validators.py
index 68ba293..0c6fa78 100644
--- a/validators.py
+++ b/validators.py
@@ -1,6 +1,6 @@
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
-from django.core.validators import URLValidator
+from django.core.validators import RegexValidator
 import re
 
 
@@ -44,8 +44,8 @@ class TreeParentValidator(object):
 	def get_message(self):
 		return self.static_message or _(u"A %s can't be its own parent." % self.instance.__class__.__name__)
 	message = property(get_message)
-	
-	
+
+
 class TreePositionValidator(object):
 	code = 'invalid'
 	
@@ -54,7 +54,7 @@ class TreePositionValidator(object):
 		self.slug = slug
 		self.obj_class = obj_class
 		self.static_message = message
-			
+		
 		if code is not None:
 			self.code = code
 	
@@ -71,7 +71,7 @@ class TreePositionValidator(object):
 			
 			if obj.id != value.id:
 				raise ValidationError(self.message)
-				
+		
 		except self.obj_class.DoesNotExist:
 			pass
 	
@@ -80,23 +80,28 @@ class TreePositionValidator(object):
 	message = property(get_message)
 
 
-class URLRedirectValidator(URLValidator):
+class RedirectValidator(RegexValidator):
+	"""Based loosely on the URLValidator, but no option to verify_exists"""
 	regex = re.compile(
-        r'^(?:https?://' # http:// or https://
-        r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?|' #domain...
-        r'localhost|' #localhost...
-        r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
-        r'(?::\d+)?' # optional port
-        r'|)' # also allow internal redirects
-        r'(?:/?|[/?]?\S+)$', re.IGNORECASE)
+		r'^(?:https?://' # http:// or https://
+		r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?|' #domain...
+		r'localhost|' #localhost...
+		r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
+		r'(?::\d+)?' # optional port
+		r'(?:/?|[/?#]?\S+)|'
+		r'[^?#\s]\S*)$',
+		re.IGNORECASE)
+	message = _(u'Enter a valid absolute or relative redirect target')
 
 
-class URLLinkValidator(URLValidator):
+class URLLinkValidator(RegexValidator):
+	"""Based loosely on the URLValidator, but no option to verify_exists"""
 	regex = re.compile(
-        r'^(?:https?://' # http:// or https://
-        r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?|' #domain...
-        r'localhost|' #localhost...
-        r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
-        r'(?::\d+)?' # optional port
-        r'|)' # also allow internal links
-        r'(?:/?|[/?#]?\S+)$', re.IGNORECASE)
+		r'^(?:https?://' # http:// or https://
+		r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?|' #domain...
+		r'localhost|' #localhost...
+		r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
+		r'(?::\d+)?' # optional port
+		r'|)' # also allow internal links
+		r'(?:/?|[/?#]?\S+)$', re.IGNORECASE)
+	message = _(u'Enter a valid absolute or relative redirect target')