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

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

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 0cf2a26ea99380b6dd395824945bfcebd42c33b9..3bdd9de2ed01919ab2fa6559ba6658977bac7628 100644 (file)
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -251,6 +251,12 @@ sub formbuilder_setup (@) {
                                                my $name=shift;
                                                length $name &&
                                                $name=~/$config{wiki_file_regexp}/ &&
+                                               # don't allow registering
+                                               # accounts that look like
+                                               # openids, or email
+                                               # addresses, even if the
+                                               # file regexp allows it
+                                               $name!~/[\/:\@]/ &&
                                                ! IkiWiki::userinfo_get($name, "regdate");
                                        },
                                );
@@ -277,7 +283,7 @@ sub formbuilder_setup (@) {
        }
        elsif ($form->title eq "preferences") {
                my $user=$session->param("name");
-               if (! IkiWiki::openiduser($user)) {
+               if (! IkiWiki::openiduser($user) && ! IkiWiki::emailuser($user)) {
                        $form->field(name => "name", disabled => 1, 
                                value => $user, force => 1,
                                fieldset => "login");