[haver-commits] r796 - in trunk: . perl/server/lib/Haver/Server/Wheel

[haver]

Author: dylan
Date: 2005-06-22 15:00:23 -0400 (Wed, 22 Jun 2005)
New Revision: 796

Modified:
   trunk/
   trunk/perl/server/lib/Haver/Server/Wheel/Login.pm
   trunk/perl/server/lib/Haver/Server/Wheel/Main.pm
Log:
 [EMAIL PROTECTED]:  dylan | 2005-06-22 15:00:11 -0400
 updated error messages.



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:1141
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:1142
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238

Modified: trunk/perl/server/lib/Haver/Server/Wheel/Login.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Login.pm   2005-06-22 19:00:19 UTC 
(rev 795)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Login.pm   2005-06-22 19:00:23 UTC 
(rev 796)
@@ -34,7 +34,7 @@
        if ($lobby->contains($ns, $name)) {
                $kernel->yield('fail', "exists.$ns", $name);
        } elsif (not is_valid_name($name)) {
-               $kernel->yield('fail', "invalid.$ns", $name);
+               $kernel->yield('fail', "invalid.name", $name);
        } elsif ($ns eq 'user' and is_reserved_name($name)) {
                $kernel->yield('fail', "reserved.$ns", $name);
        } else {

Modified: trunk/perl/server/lib/Haver/Server/Wheel/Main.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Main.pm    2005-06-22 19:00:19 UTC 
(rev 795)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Main.pm    2005-06-22 19:00:23 UTC 
(rev 796)
@@ -60,7 +60,7 @@
                return;
        }
        if ($chan->contains('user', $user->name)) {
-               $kernel->yield('fail', 'moron');
+               $kernel->yield('fail', 'already.joined');
                return;
        }
 
@@ -108,7 +108,7 @@
                return;
        }
        unless ($chan->contains('user', $user->name)) {
-               $kernel->yield('fail', 'moron');
+               $kernel->yield('fail', 'already.parted');
                return;
        }
 
@@ -134,7 +134,7 @@
                return;
        }
        unless (defined $type) {
-               $kernel->yield('fail', 'missing.type');
+               $kernel->yield('fail', 'invalid.type');
                return;
        }
 
@@ -159,7 +159,7 @@
                return;
        }
        unless (defined $type) {
-               $kernel->yield('fail', 'missing.type');
+               $kernel->yield('fail', 'invalid.type');
                return;
        }