case insensative image filenames

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index ea5604365bad5986dd69c40cdf0cc5257d4a638e..f801df29e8a7c206a4e6329136fb44a7c44af5b1 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -21,7 +21,7 @@ sub getconfig () { #{{{
                        wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
                        wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
                        wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]+)\]\]/,
                        wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
                        wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
                        wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]+)\]\]/,

-                       wiki_file_regexp => qr/(^[-A-Za-z0-9_.\&;:\/+]+$)/,
+                       wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,

                        verbose => 0,
                        wikiname => "wiki",
                        default_pageext => ".mdwn",
                        verbose => 0,
                        wikiname => "wiki",
                        default_pageext => ".mdwn",


@@ -34,6 +34,8 @@ sub getconfig () { #{{{
                        anonok => 0,
                        rss => 0,
                        rebuild => 0,
                        anonok => 0,
                        rss => 0,
                        rebuild => 0,

+                       refresh => 0,
+                       getctime => 0,

                        wrapper => undef,
                        wrappermode => undef,
                        srcdir => undef,
                        wrapper => undef,
                        wrappermode => undef,
                        srcdir => undef,


@@ -49,6 +51,8 @@ sub getconfig () { #{{{
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "rebuild!" => \$config{rebuild},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "rebuild!" => \$config{rebuild},

+                       "refresh!" => \$config{refresh},
+                       "getctime" => \$config{getctime},

                        "wrappermode=i" => \$config{wrappermode},
                        "svn!" => \$config{svn},
                        "anonok!" => \$config{anonok},
                        "wrappermode=i" => \$config{wrappermode},
                        "svn!" => \$config{svn},
                        "anonok!" => \$config{anonok},


@@ -238,7 +242,7 @@ sub bestlink ($$) { #{{{
 sub isinlinableimage ($) { #{{{
        my $file=shift;
        
 sub isinlinableimage ($) { #{{{
        my $file=shift;
        

-       $file=~/\.(png|gif|jpg|jpeg)$/;
+       $file=~/\.(png|gif|jpg|jpeg)$/i;

 } #}}}
 
 sub pagetitle ($) { #{{{
 } #}}}
 
 sub pagetitle ($) { #{{{


@@ -262,7 +266,7 @@ sub htmllink ($$;$$) { #{{{
                $bestlink="$page/".lc($link);
        }
 
                $bestlink="$page/".lc($link);
        }
 

-       my $linktext=pagetitle($link);
+       my $linktext=pagetitle(basename($link));

        
        return $linktext if length $bestlink && $page eq $bestlink;
        
        
        return $linktext if length $bestlink && $page eq $bestlink;
        


@@ -486,6 +490,7 @@ sub main () { #{{{
                loadindex();
                require IkiWiki::Render;
                rcs_update();
                loadindex();
                require IkiWiki::Render;
                rcs_update();

+               rcs_getctime() if $config{getctime};

                refresh();
                saveindex();
        }
                refresh();
                saveindex();
        }