Changeset 8322

Timestamp:

04/05/08 20:24:07 (1 year ago)

Author:

FabianLange

Message:

sfValidatorUrl will accept FTP urls by default as well. closes #3000

Files:

• branches/1.1/lib/validator/sfValidatorUrl.class.php (modified) (1 diff)
• branches/1.1/test/unit/validator/sfValidatorUrlTest.php (modified) (2 diffs)

branches/1.1/lib/validator/sfValidatorUrl.class.php

@@ -27 +27 @@
-
-    $this->setOption('pattern', '~^
-https?://                               # http or https
+(https?|ftp)://                        # http or https or ftp 
-      (
-        ([a-z0-9-]+\.)+[a-z]{2,6}             # a domain name

branches/1.1/test/unit/validator/sfValidatorUrlTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+3
-
-$v = new sfValidatorUrl();
@@ -24 +24 @@
-  'http://127.0.0.1/',
-  'http://127.0.0.1:80/',
+  'ftp://google.com/foo.tgz', 
-) as $url)
-{