Author: dylan
Date: 2005-07-18 10:45:24 -0400 (Mon, 18 Jul 2005)
New Revision: 873
Added:
trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm
Removed:
trunk/perl/server/lib/Haver/Server/Wheel/AuthReg.pm
Modified:
trunk/
trunk/perl/server/lib/Haver/Server/Wheel/Login.pm
Log:
Renamed AuthReg.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1281
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
+ 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1283
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
Deleted: trunk/perl/server/lib/Haver/Server/Wheel/AuthReg.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/AuthReg.pm 2005-07-18 14:44:16 UTC
(rev 872)
+++ trunk/perl/server/lib/Haver/Server/Wheel/AuthReg.pm 2005-07-18 14:45:24 UTC
(rev 873)
@@ -1,60 +0,0 @@
-# vim: set ts=4 sw=4 noexpandtab si ai sta tw=100:
-# This module is copyrighted, see end of file for details.
-package Haver::Server::Wheel::AuthReg;
-use strict;
-use warnings;
-
-use Haver::Server::Wheel -base;
-use Digest;
-
-sub setup {
- my $self = shift;
- $self->msg(
- qw(
- AUTH:REGISTER
- AUTH:PASSCODE
- AUTH:EMAIL
- )
- );
-}
-
-sub msg_AUTH_REGISTER {
- my ($kernel, $heap, $args) = @_[KERNEL, HEAP, ARG0];
- my ($email, $passcode) = @$args;
- my $store = $heap->{store};
- my $user = $heap->{user};
-
- unless ($email =~ /[EMAIL PROTECTED]/) {
- $kernel->yield('fail', 'invalid.email', $email);
- return;
- }
- if ($store->exists('user', $user->name)) {
- $kernel->yield('fail', 'registered.user', $user->name);
- return;
- }
-
- $user->keep(1);
- $user->passcode($passcode);
- $user->email($email);
- $store->insert($user);
- $heap->{client}->put(['AUTH:REGISTER', $user->name, $email]);
-}
-
-sub msg_AUTH_PASSCODE {
- my ($kernel, $heap, $args) = @_[KERNEL, HEAP, ARG0];
- my ($passcode) = @$args;
-
- $user->passcode($passcode);
- $heap->{client}->put(['AUTH:PASSCODE', $heap->{user}->name]);
-}
-
-sub msg_AUTH_EMAIL {
- my ($kernel, $heap, $args) = @_[KERNEL, HEAP, ARG0];
- my ($email) = @$args;
-
- $user->email($email);
- $heap->{client}->put(['AUTH:EMAIL', $heap->{user}->name, $email]);
-}
-
-
-1;
Modified: trunk/perl/server/lib/Haver/Server/Wheel/Login.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Login.pm 2005-07-18 14:44:16 UTC
(rev 872)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Login.pm 2005-07-18 14:45:24 UTC
(rev 873)
@@ -78,7 +78,7 @@
$heap->{client}->put(['HELLO', $name]);
$heap->{loader}->unload_wheel(__PACKAGE__);
$heap->{loader}->load_wheel('Haver::Server::Wheel::Main');
- $heap->{loader}->load_wheel('Haver::Server::Wheel::AuthReg');
+ $heap->{loader}->load_wheel('Haver::Server::Wheel::Reg');
}
Added: trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm 2005-07-18 14:44:16 UTC
(rev 872)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm 2005-07-18 14:45:24 UTC
(rev 873)
@@ -0,0 +1,60 @@
+# vim: set ts=4 sw=4 noexpandtab si ai sta tw=100:
+# This module is copyrighted, see end of file for details.
+package Haver::Server::Wheel::Reg;
+use strict;
+use warnings;
+
+use Haver::Server::Wheel -base;
+use Digest;
+
+sub setup {
+ my $self = shift;
+ $self->msg(
+ qw(
+ REG:ACCOUNT
+ REG:PASSCODE
+ REG:EMAIL
+ )
+ );
+}
+
+sub msg_REG_REGISTER {
+ my ($kernel, $heap, $args) = @_[KERNEL, HEAP, ARG0];
+ my ($email, $passcode) = @$args;
+ my $store = $heap->{store};
+ my $user = $heap->{user};
+
+ unless ($email =~ /[EMAIL PROTECTED]/) {
+ $kernel->yield('fail', 'invalid.email', $email);
+ return;
+ }
+ if ($store->exists('user', $user->name)) {
+ $kernel->yield('fail', 'registered.user', $user->name);
+ return;
+ }
+
+ $user->keep(1);
+ $user->passcode($passcode);
+ $user->email($email);
+ $store->insert($user);
+ $heap->{client}->put(['REG:ACCOUNT', $user->name, $email]);
+}
+
+sub msg_REG_PASSCODE {
+ my ($kernel, $heap, $args) = @_[KERNEL, HEAP, ARG0];
+ my ($passcode) = @$args;
+
+ $user->passcode($passcode);
+ $heap->{client}->put(['REG:PASSCODE', $heap->{user}->name]);
+}
+
+sub msg_REG_EMAIL {
+ my ($kernel, $heap, $args) = @_[KERNEL, HEAP, ARG0];
+ my ($email) = @$args;
+
+ $user->email($email);
+ $heap->{client}->put(['REG:EMAIL', $heap->{user}->name, $email]);
+}
+
+
+1;
