From: Joey Hess Date: Sun, 29 Mar 2009 18:54:53 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.09~36 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3d8f0b1a3f749006424fb719ea1841ef366b5090?hp=b1551ed0e297e75492e578bf2445fcde99dad86a Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info Conflicts: doc/plugins/contrib/po.mdwn --- diff --git a/doc/index/openid/discussion.mdwn b/doc/index/openid/discussion.mdwn index 43575d4be..ae614e5ac 100644 --- a/doc/index/openid/discussion.mdwn +++ b/doc/index/openid/discussion.mdwn @@ -10,3 +10,20 @@ Hi, there's no return_to from a designated OpenID server page, specs requires (I > * How can one reproduce the bug? > > PS, please file bugs under [[bugs]] in future. --[[Joey]] + +>> Oops, my bad, didn't know that existed at the time I wrote this. +>> +>> What happened is that the process wouldn't complete, therefore I couldn't login with my OpenID. +>> +>> reproducibility: every time +>> +>> Should probably move this page, eh? ;) +>> I'd do that, but I dunno know other than using the SCM backend in question.... + +Here's some actual output (with my OpenID URL stripped out): + +do=postsignin&oic.time=1238224497-1450566d93097caa707f&openid.assoc_handle=%7BHMAC-SHA1%7D%7B49cdce76%7D%7BBhuXXw%3D%3D%7D&openid.identity=|<==== MY OPENID URL GOES HERE ====>|&openid.mode=id_res&openid.op_endpoint=http%3A%2F%2Fwww.myopenid.com%2Fserver&openid.response_nonce=2009-03-28T07%3A15%3A02ZDUFmG3&openid.return_to=http%3A%2F%2Fsimonraven.kisikew.org%2Fbin%2Fikiwiki.cgi%3Fdo%3Dpostsignin%26oic.time%3D1238224497-1450566d93097caa707f&openid.sig=E51Xh6Gnjku%2B0se57qCyhHbT5QY%3D&openid.signed=assoc_handle%2Cidentity%2Cmode%2Cop_endpoint%2Cresponse_nonce%2Creturn_to%2Csigned + +The `return_to` arg should NOT be `signed`, it should be the originating URL where you initially logged in. + +Also, I dunno what the assoc_handle is doing spitting out an arg like `{HMAC-SHA1}{49cdce76}{BhuXXw%3D%3D}` it should be processed further. I have the needed perl packages installed (latest for Lenny). Hrm, would endianness matter? diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index 3f5a65c05..618e16598 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -359,7 +359,7 @@ daring a timid "please pull"... or rather, please review again :) >> disabled, I fear the ones who could do this would maybe think >> it's blandly impossible and give up. >> -> + > * What's the reasoning behind checking that the link plugin > is enabled? AFAICS, the same code in the scan hook should > also work when other link plugins like camelcase are used. diff --git a/doc/tips/github.mdwn b/doc/tips/github.mdwn index 974d572f1..c3fdab734 100644 --- a/doc/tips/github.mdwn +++ b/doc/tips/github.mdwn @@ -11,51 +11,48 @@ two copies of the website in git (source and the compiled site), and all historical versions too. So it could happen. If it does, you can pay github for more space, or you can migrate your site elsewhere. -## github setup +## Github Setup -* Go to [github](http://github.com/) and sign up for an account, if you - haven't already. -* Be sure to add your laptop's ssh key to it so you can push - to github. -* Create a repository on githib named `$YOU.github.com`, substituting your - username. This repository will be used to publish your compiled website. +* Go to [github](http://github.com/) and sign up for an account, if you haven't already. +* Be sure to add your laptop's ssh key to it so you can push to github. +* Create a repository on github named `$YOU.github.com`, substituting your + *username*. This repository will be used to publish your compiled website. * Create a repository on github named `$YOU` (or anything else you like). This repository will be used to publish the source of your website. This is actually optional. -## local setup +## Local Setup -* On your laptop, create two empty git repositories to correspond to the - github repositories: - YOU=# your github username here - mkdir ~/$YOU.github.com - cd ~/$YOU.github.com - git init - git remote add origin git@github.com:$YOU/$YOU.github.com.git - mkdir ~/$YOU - cd ~/$YOU - git init - git remote add origin git@github.com:$YOU/$YOU.git +* On your laptop, create two empty git repositories to correspond to the github repositories:
+ `YOU = your github username here`
+ `mkdir ~/$YOU.github.com`
+ `cd ~/$YOU.github.com`
+ `git init`
+ `git remote add origin git@github.com:$YOU/$YOU.github.com.git`
+ `mkdir ~/$YOU`
+ `cd ~/$YOU`
+ `git init`
+ `git remote add origin git@github.com:$YOU/$YOU.git`
* Add some wiki pages, such as an `index.mdwn`, to `~/$YOU`, and check them in and commit them to git. You need something to push to github. Run `git push origin master` to push the source pages to github. -## publishing to github +## Publishing to Github -* Now build your wiki with a command such as: - ikiwiki ~/$YOU ~/$YOU.github.com --refresh +* Now build your wiki with a command such as:
+ `ikiwiki ~/$YOU ~/$YOU.github.com --refresh` * Each time you build the wiki you will need to commit the changes - to git, and push the compiled pages to github: - cd ~/YOU.github.com - git add . - git commit -a -m update - git push origin master + to git, and push the compiled pages to github:
+ `cd ~/YOU.github.com`
+ `git add .`
+ `git commit -a -m update`
+ `git push origin master`
Your wiki will show up at `http://$YOU.github.com/` within ten minutes after the first push, and changes you push to it from then on -should show up immediatly. +should show up immediately. -## enhancements +## Enhancements You can follow the instructions in [[laptop_wiki_with_git]] to set up an editable version of your wiki on your laptop. Then you can use the web diff --git a/doc/todo/inline_autotitles.mdwn b/doc/todo/inline_autotitles.mdwn deleted file mode 100644 index 8bf71deae..000000000 --- a/doc/todo/inline_autotitles.mdwn +++ /dev/null @@ -1,51 +0,0 @@ -[[!tag wishlist]] -[[!tag patch]] - -for inlines of pages which follow a certain scheme, it might not be required to -set the title for each individual post, but to automatically set the title. -this can either be based on timestamp formatting, or use the already existing -munging mechanism, which appends numbers to page titles in case that page -already exists. - -two patches ([1], [2]) set inline up for that, adding an additional `autotitle` -parameter. if that is given, the regular input of the inline postform will be -replaced with a hidden input of that text. in addition, the empty title is -permitted (both for autotitle and regular titles, as they go in the same GET -parameter, `title`). as the empty page title is illegal, munging is used, -resulting in ascending numeric page titles to be created. - -the second patch is actually a one-liner, filtering the title through strftime. - -### potential user interaction issues - -this has two side effects which have to be considered: first, the empty page -title is accepted also in normal postforms (previously, this resulted in a "bad -page name" error); second, entering a percent sign in that field might result -in unexpexted strftime substitution (strftime might not even substitute for -common uses of percent as in "reach 10% market share", but might in others as -in "the 10%-rule"). - -both can be circumvented by using another GET parameter for autotexts, as -implemented in [3]. -> this patch still does not work perfectly; especially, it should make a -> distinction between "autotitle is set but equal ''" (in which case it -> should create a page named `1.mdwn`, and "autotitle is not set, and title is -> equal ''" (in which case it should display the old error message) --[[chrysn]] - -### potential security issues - -* the autotitle's value is directly output through the template (but that's - done in other places as well, so i assume it's safe) -* i don't know if anything bad can happen if unfiltered content is passed to - POSIX::strftime. - -### further extension - -having a pre-filled input field instead of an unchangable hidden input might be -cool (eg for creating an entry with yesterday's date), but would be a bit of a -problem with static pages. javascript could help with the date part, but name -munging would be yet another thing. - -[1]: http://github.com/github076986099/ikiwiki/commit/b568eb257a3ef5ff49a84ac00a3a7465b643c1e1 -[2]: http://github.com/github076986099/ikiwiki/commit/34bc82f232be141edf036d35e8ef5aa289415072 -[3]: http://github.com/github076986099/ikiwiki/commit/40dc10a4ec7809e401b4497c2abccfba30f7a2af diff --git a/doc/todo/inline_postform_autotitles.mdwn b/doc/todo/inline_postform_autotitles.mdwn new file mode 100644 index 000000000..5005208be --- /dev/null +++ b/doc/todo/inline_postform_autotitles.mdwn @@ -0,0 +1,52 @@ +[[!tag wishlist]] +[[!tag patch]] + +for postforms in inlines of pages which follow a certain scheme, it might not +be required to set the title for each individual post, but to automatically set +the title and show no input box prompting for it. +this can either be based on timestamp formatting, or use the already existing +munging mechanism, which appends numbers to page titles in case that page +already exists. + +two patches ([1], [2]) set inline up for that, adding an additional `autotitle` +parameter. if that is given, the regular input of the inline postform will be +replaced with a hidden input of that text. in addition, the empty title is +permitted (both for autotitle and regular titles, as they go in the same GET +parameter, `title`). as the empty page title is illegal, munging is used, +resulting in ascending numeric page titles to be created. + +the second patch is actually a one-liner, filtering the title through strftime. + +### potential user interaction issues + +this has two side effects which have to be considered: first, the empty page +title is accepted also in normal postforms (previously, this resulted in a "bad +page name" error); second, entering a percent sign in that field might result +in unexpexted strftime substitution (strftime might not even substitute for +common uses of percent as in "reach 10% market share", but might in others as +in "the 10%-rule"). + +both can be circumvented by using another GET parameter for autotexts, as +implemented in [3]. +> this patch still does not work perfectly; especially, it should make a +> distinction between "autotitle is set but equal ''" (in which case it +> should create a page named `1.mdwn`, and "autotitle is not set, and title is +> equal ''" (in which case it should display the old error message) --[[chrysn]] + +### potential security issues + +* the autotitle's value is directly output through the template (but that's + done in other places as well, so i assume it's safe) +* i don't know if anything bad can happen if unfiltered content is passed to + POSIX::strftime. + +### further extension + +having a pre-filled input field instead of an unchangable hidden input might be +cool (eg for creating an entry with yesterday's date), but would be a bit of a +problem with static pages. javascript could help with the date part, but name +munging would be yet another thing. + +[1]: http://github.com/github076986099/ikiwiki/commit/b568eb257a3ef5ff49a84ac00a3a7465b643c1e1 +[2]: http://github.com/github076986099/ikiwiki/commit/34bc82f232be141edf036d35e8ef5aa289415072 +[3]: http://github.com/github076986099/ikiwiki/commit/40dc10a4ec7809e401b4497c2abccfba30f7a2af diff --git a/doc/todo/need_global_renamepage_hook.mdwn b/doc/todo/need_global_renamepage_hook.mdwn index b065c82f3..b123340af 100644 --- a/doc/todo/need_global_renamepage_hook.mdwn +++ b/doc/todo/need_global_renamepage_hook.mdwn @@ -111,3 +111,5 @@ hashes is desired, it could return the full set of hashes. >>>> It looks good. I made some small changes to it in my own po branch. >>>> Nothing significant really. If this were not tied up in the po branch, >>>> I've have merged it to master already. --[[Joey]] + +>>>> Thanks, this is great :) --[[intrigeri]]