Changeset 1231 for trunk/lib/OpenGuides/Template.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/Template.pm (modified) (4 diffs)

trunk/lib/OpenGuides/Template.pm

@@ -13 +13 @@
 use Template;
 use URI::Escape;
+use Data::Validate::URI qw( is_web_uri );
 
 =head1 NAME
@@ -348 +349 @@
     } @loclist;
 
-    # The 'website' attribute might contain a URL so we wiki-format it here
-    # rather than just CGI::escapeHTMLing it all in the template.
     my $website = $args{metadata} ? $metadata{website}[0]
                                   : $q->param("website");
     my $formatted_website_text = "";
-    if ( $website && $website ne "http://" ) {
-        $formatted_website_text = $class->format_website_text(
-            formatter => $formatter,
-            text      => $website
-        );
+    if ( $website && $website ne "http://" && is_web_uri( $website ) ) {
+        my $trunc_website = substr( $website, 0, $config->website_link_max_chars );
+        unless ($website eq $trunc_website ) {
+            $trunc_website .= '...';
+        }
+        $formatted_website_text = '<a href="' . $website . '">' . $trunc_website . '</a>';
     }
 
@@ -583 +583 @@
 }
 
-sub format_website_text {
-    my ($class, %args) = @_;
-    my ($formatter, $text) = @args{ qw( formatter text ) };
-    my $formatted = $formatter->format($text);
-
-    # Strip out paragraph markers put in by formatter since we want this
-    # to be a single string to put in a <ul>.
-    $formatted =~ s/<p>//g;
-    $formatted =~ s/<\/p>//g;
-
-    return $formatted;
-}
-
-
 =back
 
@@ -605 +591 @@
 =head1 COPYRIGHT
 
-  Copyright (C) 2003-2007 The OpenGuides Project.  All Rights Reserved.
+  Copyright (C) 2003-2008 The OpenGuides Project.  All Rights Reserved.
 
 This module is free software; you can redistribute it and/or modify it