web commit by PaulWise: add pabs' site/blog

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e23f7b9036949fef04f840eb9a6d49f61d704bc7..30b09d1ad260088d540011f10924b5cf4e3a9832 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -4,12 +4,14 @@ package IkiWiki::Plugin::inline;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use Encode;

 use IkiWiki 2.00;
 use URI;
 
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
 use IkiWiki 2.00;
 use URI;
 
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);

+       hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);

        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",


@@ -19,6 +21,7 @@ sub import { #{{{
        # pings interrupting page builds.
        hook(type => "change", id => "inline", 
                call => \&IkiWiki::pingurl);
        # pings interrupting page builds.
        hook(type => "change", id => "inline", 
                call => \&IkiWiki::pingurl);

+

 } # }}}
 
 sub getopt () { #{{{
 } # }}}
 
 sub getopt () { #{{{


@@ -43,6 +46,28 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub sessioncgi () { #{{{
+       my $q=shift;
+       my $session=shift;
+
+       if ($q->param('do') eq 'blog') {
+               my $page=decode_utf8($q->param('title'));
+               $page=~s/\///g; # no slashes in blog posts
+               # if the page already exists, munge it to be unique
+               my $from=$q->param('from');
+               my $add="";
+               while (exists $IkiWiki::pagecase{lc($from."/".IkiWiki::titlepage($page).$add)}) {
+                       $add=1 unless length $add;
+                       $add++;
+               }
+               $q->param('page', $page.$add);
+               # now go create the page
+               $q->param('do', 'create');
+               IkiWiki::cgi_editpage($q, $session);
+               exit;
+       }
+}
+

 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin.
 package IkiWiki;
 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin.
 package IkiWiki;


@@ -155,6 +180,7 @@ sub preprocess_inline (@) { #{{{
                $ret.=$linktemplate->output;
        }
        
                $ret.=$linktemplate->output;
        }
        

+       require HTML::Template;

        my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
        if (! @params) {
                return sprintf(gettext("nonexistant template %s"), $params{template});
        my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
        if (! @params) {
                return sprintf(gettext("nonexistant template %s"), $params{template});


@@ -289,7 +315,7 @@ sub date_3339 ($) { #{{{
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");

-       my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", localtime($time));
+       my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));

        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
 } #}}}
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
 } #}}}


@@ -302,9 +328,9 @@ sub absolute_urls ($$) { #{{{
        my $url=$baseurl;
        $url=~s/[^\/]+$//;
        
        my $url=$baseurl;
        $url=~s/[^\/]+$//;
        

-       $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(#[^"]+)"/$1 href="$baseurl$2"/ig;
-       $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/ig;
-       $content=~s/(<img(?:\s+(?:class|id)="?\w+"?)?)\s+src="(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/ig;
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/mig;
+       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/mig;

        return $content;
 } #}}}
 
        return $content;
 } #}}}
 


@@ -336,8 +362,10 @@ sub genfeed ($$$$@) { #{{{
                        title => pagetitle(basename($p)),
                        url => $u,
                        permalink => $u,
                        title => pagetitle(basename($p)),
                        url => $u,
                        permalink => $u,

-                       date_822 => date_822($pagectime{$p}),
-                       date_3339 => date_3339($pagectime{$p}),
+                       cdate_822 => date_822($pagectime{$p}),
+                       mdate_822 => date_822($pagemtime{$p}),
+                       cdate_3339 => date_3339($pagectime{$p}),
+                       mdate_3339 => date_3339($pagemtime{$p}),

                );
 
                if ($itemtemplate->query(name => "enclosure")) {
                );
 
                if ($itemtemplate->query(name => "enclosure")) {


@@ -372,7 +400,7 @@ sub genfeed ($$$$@) { #{{{
                $content.=$itemtemplate->output;
                $itemtemplate->clear_params;
 
                $content.=$itemtemplate->output;
                $itemtemplate->clear_params;
 

-               $lasttime = $pagectime{$p} if $pagectime{$p} > $lasttime;
+               $lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;

        }
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
        }
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);