Changeset 1231 for trunk/lib/OpenGuides/Utils.pm

Timestamp:

10/18/08 19:19:22 (3 months ago)

Author:

dom

Message:

Correctly validate web site URLs during edit and display,
and truncate URLs that are too long (fixes #21)

Files:

• trunk/lib/OpenGuides/Utils.pm (modified) (3 diffs)

trunk/lib/OpenGuides/Utils.pm

@@ -11 +11 @@
 use URI::Escape;
 use MIME::Lite;
+use Data::Validate::URI qw( is_web_uri );
 
 =head1 NAME
@@ -377 +378 @@
 
     # Now do our real validation
-    # Numeric tests
     foreach my $var (qw(os_x os_y)) {
         if ($q->param($var) and $q->param($var) !~ /^-?\d+$/) {
@@ -387 +387 @@
         if ($q->param($var) and $q->param($var) !~ /^-?\d+\.?(\d+)?$/) {
             push @fails, "$var must be numeric, was: " . $q->param($var);
+        }
+    }
+
+    if ( $q->param('website') and $q->param('website') ne 'http://' ) {
+        unless ( is_web_uri( $q->param('website') ) ) {
+            push @fails, $q->param('website') . ' is not a valid web URI';
         }
     }