PyukiWiki CVS Commit
pyuki****@lists*****
2012年 9月 12日 (水) 05:03:43 JST
Index: PyukiWiki-Devel/plugin/adminchangepassword.inc.pl diff -u PyukiWiki-Devel/plugin/adminchangepassword.inc.pl:1.528 PyukiWiki-Devel/plugin/adminchangepassword.inc.pl:1.529 --- PyukiWiki-Devel/plugin/adminchangepassword.inc.pl:1.528 Sat Sep 8 13:25:46 2012 +++ PyukiWiki-Devel/plugin/adminchangepassword.inc.pl Wed Sep 12 05:03:43 2012 @@ -1,7 +1,7 @@ ###################################################################### # adminchangepassword.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: adminchangepassword.inc.pl,v 1.528 2012/09/08 04:25:46 papu Exp $ -# Build on 2012-09-08 13:12:07 +# $Id: adminchangepassword.inc.pl,v 1.529 2012/09/11 20:03:43 papu Exp $ +# Build on 2012-09-12 05:02:23 # # "PyukiWiki" ver 0.2.1-beta2 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -65,17 +65,18 @@ sub plugin_adminchangepassword_write { my ($body,$write); +$::debug.="$::form{passwd_common},$::form{passwd_common_enc},$::form{passwd_common_token}\n"; if($::form{extpass} eq 1) { $write=<<EOM; \$::adminpass = '$adminchangepassword::dummypass'; -\$::adminpass{admin}='@{[&plugin_adminchangepassword_crypt(&password_decode($::form{passwd_admin},$::form{passwd_admin_enc},$::form{passwd_admin_token}))]}'; -\$::adminpass{frozen}='@{[&plugin_adminchangepassword_crypt(&password_decode($::form{passwd_frozen},$::form{passwd_frozen_enc},$::form{passwd_admin_token}))]}'; -\$::adminpass{attach}='@{[&plugin_adminchangepassword_crypt(&password_decode($::form{passwd_attach},$::form{passwd_attach_enc},$::form{passwd_attach_token}))]}'; +\$::adminpass{admin} = '@{[&plugin_adminchangepassword_crypt($::form{passwd_admin})]}'; +\$::adminpass{frozen} = '@{[&plugin_adminchangepassword_crypt($::form{passwd_frozen})]}'; +\$::adminpass{attach} = '@{[&plugin_adminchangepassword_crypt($::form{passwd_attach})]}'; 1; EOM } else { $write=<<EOM; -\$::adminpass = '@{[&plugin_adminchangepassword_crypt(&password_decode($::form{passwd_common},$::form{passwd_common_enc},$::form{passwd_common_token}))]}'; +\$::adminpass = '@{[&plugin_adminchangepassword_crypt($::form{passwd_common})]}'; \$::adminpass{admin}=''; \$::adminpass{frozen}=''; \$::adminpass{attach}=''; @@ -216,6 +217,8 @@ sub plugin_adminchangepassword_crypt { my($passwd)=@_; + $passwd=~s/\t.*//g; +$::debug.="passwdcrypt:$passwd\n"; my ($sec, $min, $hour, $day, $mon, $year, $weekday) = localtime(time); my (@token) = ('0'..'9', 'A'..'Z', 'a'..'z'); my $salt1 = $token[(time | $$) % scalar(@token)];
