X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter%2FTag.pm;h=7ee8531d4278f6dd5036080714ba85d4fcf238c3;hb=d40a8e202ca38008031a0cb882f5c3ae1c58fce8;hp=43591e5de342562a144934dcde930326032dd7a8;hpb=f383c4239b5f1f41d47e8bd92814fb9f241760ad;p=kivitendo-erp.git

diff --git a/SL/Presenter/Tag.pm b/SL/Presenter/Tag.pm
index 43591e5de..7ee8531d4 100644
--- a/SL/Presenter/Tag.pm
+++ b/SL/Presenter/Tag.pm
@@ -2,10 +2,12 @@ package SL::Presenter::Tag;
 
 use strict;
 
+use SL::HTML::Restrict;
+
 use parent qw(Exporter);
 
 use Exporter qw(import);
-our @EXPORT = qw(html_tag input_tag man_days_tag name_to_id select_tag stringify_attributes);
+our @EXPORT = qw(html_tag input_tag man_days_tag name_to_id select_tag stringify_attributes restricted_html);
 
 use Carp;
 
@@ -146,6 +148,10 @@ sub select_tag {
   my $list_to_code = sub {
     my ($sub_collection) = @_;
 
+    if ('ARRAY' ne ref $sub_collection) {
+      $sub_collection = [ $sub_collection ];
+    }
+
     my @options;
     foreach my $entry ( @{ $sub_collection } ) {
       my $value;
@@ -184,13 +190,25 @@ sub select_tag {
 }
 
 sub _set_id_attribute {
-  my ($attributes, $name) = @_;
+  my ($attributes, $name, $unique) = @_;
 
-  $attributes->{id} = name_to_id(undef, $name) if !delete($attributes->{no_id}) && !$attributes->{id};
+  if (!delete($attributes->{no_id}) && !$attributes->{id}) {
+    $attributes->{id}  = name_to_id(undef, $name);
+    $attributes->{id} .= '_' . $attributes->{value} if $unique;
+  }
 
   return %{ $attributes };
 }
 
+my $html_restricter;
+
+sub restricted_html {
+  my ($self, $value) = @_;
+
+  $html_restricter ||= SL::HTML::Restrict->create;
+  return $html_restricter->process($value);
+}
+
 1;
 __END__
 
@@ -204,7 +222,7 @@ SL::Presenter::Tag - Layouting / tag generation
 
 =head1 SYNOPSIS
 
-Usage from a template:
+Usage in a template:
 
   [% USE P %]
 
@@ -212,14 +230,14 @@ Usage from a template:
 
   [% P.select_tag('direction', [ { direction => 'left',  display => 'To the left'  },
                                  { direction => 'right', display => 'To the right' } ],
-                               value_key => 'direction', title_key => 'display', default => 'right')) %]
+                               value_key => 'direction', title_key => 'display', default => 'right') %]
 
   [% P.select_tag('direction', [ { direction => 'left',  display => 'To the left'  },
                                  { direction => 'right', display => 'To the right', selected => 1 } ],
-                               value_key => 'direction', title_key => 'display')) %]
+                               value_key => 'direction', title_key => 'display') %]
 
-  # Use an RDBO object and it's n:m relatioship as the default
-  # values. For example, a user can be a member in many groups. "All
+  # Use an RDBO object and its n:m relationship as the default
+  # values. For example, a user can be a member of many groups. "All
   # groups" is therefore the full collection and "$user->groups" is a
   # list of RDBO AuthGroup objects whose IDs must match the ones in
   # "All groups". This could look like the following:
@@ -260,6 +278,10 @@ Creates a string from all elements in C<%items> suitable for usage as
 HTML tag attributes. Keys and values are HTML escaped even though keys
 must not contain non-ASCII characters for browsers to accept them.
 
+=item C<restricted_html $html>
+
+Returns HTML stripped of unknown tags. See L<SL::HTML::Restrict>.
+
 =back
 
 =head2 HIGH-LEVEL FUNCTIONS
@@ -294,7 +316,7 @@ defaults to 5.
 
 =item C<select_tag $name, \@collection, %attributes>
 
-Creates a HTML 'select' tag named C<$name> with the contents of one
+Creates an HTML 'select' tag named C<$name> with the contents of one
 'E<lt>optionE<gt>' tag for each element in C<\@collection> and with arbitrary
 HTML attributes from C<%attributes>. The value
 to use and the title to display are extracted from the elements in
@@ -365,23 +387,23 @@ value to select by default. Constructs a hash that's treated like 3.
 
 =back
 
-5. also applies for single RDBO instances (due to 'wantarray'
-shenanigangs assigning RDBO's relationships to a hash key will result
+5. also applies to single RDBO instances (due to 'wantarray'
+shenanigans assigning RDBO's relationships to a hash key will result
 in a single RDBO object being assigned instead of an array reference
 containing that single RDBO object).
 
 If the option C<with_optgroups> is set then this function expects
 C<\@collection> to be one level deeper. The upper-most level is
-translated into a HTML C<optgroup> tag. So the structure becomes:
+translated into an HTML C<optgroup> tag. So the structure becomes:
 
 =over 4
 
 =item 1. Array of array references. Each element in the
 C<\@collection> is converted into an optgroup.
 
-=item 2. The optgroup's C<label> attribute will be set to the the
+=item 2. The optgroup's C<label> attribute will be set to the
 first element in the array element. The second array element is then
-converted to a list of C<option> tags like it is described above.
+converted to a list of C<option> tags as described above.
 
 =back
 
@@ -389,7 +411,7 @@ Example for use of optgroups:
 
   # First in a controller:
   my @collection = (
-    [ t8("First optgroup with two items"),
+    [ t8("First optgroup with three items"),
       [ { id => 42, name => "item one" },
         { id => 54, name => "second item" },
         { id => 23, name => "and the third one" },