urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2011-03-02 12:40:57 -04:00
parent 7e4a0c2930 f512a20c40
commit 899b8c80a0
3 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/forum/postsignin_redirect_not_working.mdwn 100644
View File

@ -0,0 +1,16 @@
I'm confused. I got a plugin working that allows a button to call up a login screen but I can't seem to get it to return to the calling page. I end up on the prefs page.
When the plugin first runs it puts the http_referer into a param:
$session->param("postsignin" => $ENV{HTTP_REFERER} );
Then when it runs for postsignin its supposed to pull it out and send the user to the original page:
my $page=$q->param("postsignin");
...
IkiWiki::redirect($q, $page);
exit;
Full code is available on the plugin page: [[plugins/contrib/justlogin]].
I searched the site and there's very little info available for postsignin or redirect. Perhaps I'm using the wrong function?

35
doc/plugins/contrib/justlogin.mdwn
View File

@ -1,4 +1,4 @@
This plugin is still in development. Currently it does bring up the login page and the login page does, with proper credentials, log in the user, but the returning page errors. This plugin is still in development. Currently it does bring up the login page and the login page does, with proper credentials, log in the user, but the returning page goes to prefs. I have no idea why.
Place this code into a page: Place this code into a page:
@ -8,11 +8,8 @@ Place this code into a page:
<input type="submit" value="Login" /></form> <input type="submit" value="Login" /></form>
This is the plugin so far: This is the plugin so far:
#!/usr/bin/perl
#!/usr/bin/perl
# Bring up a login page that returns to the calling page # Bring up a login page that returns to the calling page
package IkiWiki::Plugin::justlogin; package IkiWiki::Plugin::justlogin;
@ -22,7 +19,6 @@ This is the plugin so far:
sub import { sub import {
hook(type => "sessioncgi", id => "justlogin", call => \&sessioncgi); hook(type => "sessioncgi", id => "justlogin", call => \&sessioncgi);
hook(type => "auth", id => "justlogin", call => \&auth);
} }
sub sessioncgi ($$) { sub sessioncgi ($$) {
@ -31,35 +27,26 @@ This is the plugin so far:
debug("jl sessioncgi1 running."); debug("jl sessioncgi1 running.");
if ($q->param('do') eq 'justlogin') { if ($q->param("do") eq "justlogin") {
debug("Justlogin do=justlogin running."); debug("jl do=justlogin running.");
if (! defined $session->param("name") ) { if (! defined $session->param("name") ) {
debug("Justlogin param!defined running."); debug("jl param!defined running.");
$session->param(postsignin => $ENV{HTTP_REFERER} ); $session->param("postsignin" => $ENV{HTTP_REFERER} );
$session->param("do" => "justgoback" ); $session->param("do" => "justgoback" );
IkiWiki::cgi_savesession($session);
IkiWiki::cgi_signin($q, $session); IkiWiki::cgi_signin($q, $session);
exit; IkiWiki::cgi_savesession($session);
} }
} elsif ($session->param('do') eq 'justgoback') { exit;
} elsif ($session->param("do") eq "justgoback") {
debug("jl justgoback running."); debug("jl justgoback running.");
if (! defined $session->param("name")) { my $page=$q->param("postsignin");
debug("Justlogin redir running.");
my $page=IkiWiki::possibly_foolish_untaint($q->param('postsignin'));
$session->clear("postsignin"); $session->clear("postsignin");
$session->clear("do"); $session->clear("do");
IkiWiki::cgi_savesession($session); IkiWiki::cgi_savesession($session);
IkiWiki::redirect($q, $page); IkiWiki::redirect($q, $page);
exit;
} }
} }
}
sub auth ($$) {
# While this hook is not currently used, it needs to exist
# so ikiwiki knows that the wiki supports logins, and will
# enable the Preferences page.
}
1 1

3
doc/templates/discussion.mdwn vendored
View File

@ -22,3 +22,6 @@ Am I missing something? --[[jwalzer]]
> lines of perl - you'd just need to define a `pagetemplate` hook. --[[smcv]] > lines of perl - you'd just need to define a `pagetemplate` hook. --[[smcv]]
Is there a list of all the available variables somewhere, or do I just grep the source for TMPL_VAR? And is there a way to refer to a variable inside of a wiki page or does it have to be done from a template? Thanks. -- [[AdamShand]] Is there a list of all the available variables somewhere, or do I just grep the source for TMPL_VAR? And is there a way to refer to a variable inside of a wiki page or does it have to be done from a template? Thanks. -- [[AdamShand]]
I pulled a list of variables and posted it, its in the history for [[templates]] under my name. [[justint]]