Do not allow the about: URI scheme

[git.ikiwiki.info.git] / IkiWiki / Plugin / table.pm

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 01ba5e5042360d218d422e56296a6161552ff8fe..20c71e1c72c23272275d7b1ab219d2fa9a5ab228 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -22,10 +22,7 @@ sub preprocess (@) { #{{{
                        return "[[table ".gettext("cannot find file")."]]";
                }
                $params{data} = readfile(srcfile($params{file}));
                        return "[[table ".gettext("cannot find file")."]]";
                }
                $params{data} = readfile(srcfile($params{file}));

-       }
-       else {
-               $params{data} = IkiWiki::linkify($params{page},
-                       $params{destpage}, $params{data});
+               add_depends($params{page}, $params{file});

        }
 
        if (lc $params{format} eq 'auto') {
        }
 
        if (lc $params{format} eq 'auto') {


@@ -40,10 +37,28 @@ sub preprocess (@) { #{{{
 
        my @data;
        if (lc $params{format} eq 'csv') {
 
        my @data;
        if (lc $params{format} eq 'csv') {

-               @data=split_csv($params{data}, $params{delimiter});
+               @data=split_csv($params{data},
+                       defined $params{delimiter} ? $params{delimiter} : ",",);
+               # linkify after parsing since html link quoting can
+               # confuse CSV parsing
+               if (! exists $params{file}) {
+                       @data=map {
+                               [ map {
+                                       IkiWiki::linkify($params{page},
+                                               $params{destpage}, $_);
+                               } @$_ ]
+                       } @data;
+               }

        }
        elsif (lc $params{format} eq 'dsv') {
        }
        elsif (lc $params{format} eq 'dsv') {

-               @data=split_dsv($params{data}, $params{delimiter});
+               # linkify before parsing since wikilinks can contain the
+               # delimiter
+               if (! exists $params{file}) {
+                       $params{data} = IkiWiki::linkify($params{page},
+                               $params{destpage}, $params{data});
+               }
+               @data=split_dsv($params{data},
+                       defined $params{delimiter} ? $params{delimiter} : "|",);

        }
        else {
                return "[[table ".gettext("unknown data format")."]]";
        }
        else {
                return "[[table ".gettext("unknown data format")."]]";


@@ -64,7 +79,7 @@ sub preprocess (@) { #{{{
        push @lines, "\t<thead>",
                genrow($params{page}, $params{destpage}, "th", @$header),
                "\t</thead>" if defined $header;
        push @lines, "\t<thead>",
                genrow($params{page}, $params{destpage}, "th", @$header),
                "\t</thead>" if defined $header;

-       push @lines, "\t<tbody>";
+       push @lines, "\t<tbody>" if defined $header;

        push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
                foreach @data;
        push @lines, "\t</tbody>" if defined $header;
        push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
                foreach @data;
        push @lines, "\t</tbody>" if defined $header;


@@ -95,7 +110,7 @@ sub split_csv ($$) { #{{{
        eval q{use Text::CSV};
        error($@) if $@;
        my $csv = Text::CSV->new({ 
        eval q{use Text::CSV};
        error($@) if $@;
        my $csv = Text::CSV->new({ 

-               sep_char        => defined $delimiter ? $delimiter : ",",
+               sep_char        => $delimiter,

                binary          => 1,
                allow_loose_quotes => 1,
        }) || error("could not create a Text::CSV object");
                binary          => 1,
                allow_loose_quotes => 1,
        }) || error("could not create a Text::CSV object");


@@ -159,17 +174,9 @@ sub genrow ($$$@) { #{{{
 sub htmlize ($$$) { #{{{
        my $page = shift;
        my $destpage = shift;
 sub htmlize ($$$) { #{{{
        my $page = shift;
        my $destpage = shift;

-       my $text = shift;
-
-       $text=IkiWiki::htmlize($page, pagetype($pagesources{$page}),
-               IkiWiki::preprocess($page, $destpage, $text));
-
-       # hack to get rid of enclosing junk added by markdown
-       $text=~s!^<p>!!;
-       $text=~s!</p>$!!;
-       chomp $text;

 
 

-       return $text;
+       return IkiWiki::htmlize($page, pagetype($pagesources{$page}),
+               IkiWiki::preprocess($page, $destpage, shift));

 }
 
 1
 }
 
 1