[Jifty-commit] r1589 - in jifty/branches/moose: . lib/Jifty

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sat Jul 15 02:15:31 2006
New Revision: 1589

Modified:
   jifty/branches/moose/   (props changed)
   jifty/branches/moose/lib/Jifty/Server.pm
   jifty/branches/moose/lib/Jifty/Web.pm
   jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/RecoverPassword.pm
   jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/ResetLostPassword.pm
   jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/SendAccountConfirmation.pm
   jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/SendPasswordReminder.pm

Log:
 r13970 at pinglin (orig r1576):  jpeacock | 2006-07-14 20:32:39 -0400
  r1270 at dsl092-168-024:  jpeacock | 2006-07-14 20:31:25 -0400
  Resolve inconsistent filenames vs packages
 
 r13974 at pinglin (orig r1580):  jesse | 2006-07-14 21:27:28 -0400
  r13968 at pinglin:  jesse | 2006-07-14 21:27:22 -0400
  * Proper port support on urls. Thanks to jpeacock.
 


Modified: jifty/branches/moose/lib/Jifty/Server.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Server.pm	(original)
+++ jifty/branches/moose/lib/Jifty/Server.pm	Sat Jul 15 02:15:31 2006
@@ -98,7 +98,7 @@
 
 sub print_banner {
     my $self = shift;
-    $self->log->info("You can connect to your server at ", Jifty::Web->url, "/");
+    $self->log->info("You can connect to your server at ", Jifty::Web->url);
 } 
 
 =head2 recorder_prefix

Modified: jifty/branches/moose/lib/Jifty/Web.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Web.pm	(original)
+++ jifty/branches/moose/lib/Jifty/Web.pm	Sat Jul 15 02:15:31 2006
@@ -125,7 +125,8 @@
         $self->log->error("Jifty->web->url no longer accepts a 'scheme' argument");
     }
     my $uri = URI->new($url);
-    
+    $uri->port($port);
+
     if ($ENV{'HTTP_HOST'}) {
         return $uri->scheme ."://".$ENV{'HTTP_HOST'};
     }

Modified: jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/RecoverPassword.pm
==============================================================================
--- jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/RecoverPassword.pm	(original)
+++ jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/RecoverPassword.pm	Sat Jul 15 02:15:31 2006
@@ -3,5 +3,6 @@
 use strict;
 
 package Jifty::Plugin::Login::Action::RecoverPassword;
+use base qw/Jifty::Action Jifty::Plugin::Login/;
 
 1;

Modified: jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/ResetLostPassword.pm
==============================================================================
--- jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/ResetLostPassword.pm	(original)
+++ jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/ResetLostPassword.pm	Sat Jul 15 02:15:31 2006
@@ -13,10 +13,8 @@
 
 =cut
 
-package Jifty::Plugin::Login::Action::ResetPassword;
-use base qw/Jifty::Action/;
-
-use Jifty::Plugin::Login::Model::User;
+package Jifty::Plugin::Login::Action::ResetLostPassword;
+use base qw/Jifty::Action Jifty::Plugin::Login/;
 
 =head2 arguments
 
@@ -46,8 +44,8 @@
 
 sub take_action {
     my $self        = shift;
-    my $LoginUser   = $Jifty::Plugin::Login::LoginUserClass;
-    my $CurrentUser = $Jifty::Plugin::Login::CurrentUserClass;
+    my $LoginUser = $self->LoginUserClass();
+    my $CurrentUser = $self->CurrentUserClass();
     my $u = $LoginUser->new( current_user => $CurrentUser->superuser );
     $u->load_by_cols( email => Jifty->web->current_user->user_object->email );
 

Modified: jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/SendAccountConfirmation.pm
==============================================================================
--- jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/SendAccountConfirmation.pm	(original)
+++ jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/SendAccountConfirmation.pm	Sat Jul 15 02:15:31 2006
@@ -3,19 +3,15 @@
 
 =head1 NAME
 
-Jifty::Plugin::Login::Action::ResendConfirmation
+Jifty::Plugin::Login::Action::SendAccountConfirmation
 
 =cut
 
-package Jifty::Plugin::Login::Action::ResendConfirmation;
-use base qw/Jifty::Action/;
-my $LoginUser   = $Jifty::Plugin::Login::LoginUserClass;
-my $CurrentUser = $Jifty::Plugin::Login::CurrentUserClass;
+package Jifty::Plugin::Login::Action::SendAccountConfirmation;
+use base qw/Jifty::Action Jifty::Plugin::Login/;
 
 __PACKAGE__->mk_accessors(qw(user_object));
 
-use Jifty::Plugin::Login::Model::User;
-
 =head2 arguments
 
 The field for C<ResendConfirmation> is:
@@ -48,6 +44,8 @@
 
 sub setup {
     my $self = shift;
+    my $LoginUser = $self->LoginUserClass();
+    my $CurrentUser = $self->CurrentUserClass();
 
     $self->user_object(
         $LoginUser->new( current_user => $CurrentUser->superuser ) );
@@ -62,6 +60,8 @@
 sub validate_address {
     my $self  = shift;
     my $email = shift;
+    my $LoginUser = $self->LoginUserClass();
+    my $CurrentUser = $self->CurrentUserClass();
 
     return $self->validation_error(
         address => "That doesn't look like an email address." )

Modified: jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/SendPasswordReminder.pm
==============================================================================
--- jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/SendPasswordReminder.pm	(original)
+++ jifty/branches/moose/plugins/Login/lib/Jifty/Plugin/Login/Action/SendPasswordReminder.pm	Sat Jul 15 02:15:31 2006
@@ -3,12 +3,12 @@
 
 =head1 NAME
 
-Jifty::Plugin::Login::Action::SendLostPasswordConfirmation
+Jifty::Plugin::Login::Action::SendPasswordReminder
 
 =cut
 
-package Jifty::Plugin::Login::Action::SendLostPasswordConfirmation;
-use base qw/Jifty::Plugin::Login::Action Jifty::Action Jifty::Plugin::Login/;
+package Jifty::Plugin::Login::Action::SendPasswordReminder;
+use base qw/Jifty::Action Jifty::Plugin::Login/;
 
 __PACKAGE__->mk_accessors(qw(user_object));
 
@@ -16,7 +16,7 @@
 
 =head2 arguments
 
-The field for C<SendLostPasswordConfirmation> is:
+The field for C<SendLostPasswordReminder> is:
 
 =over 4
 
@@ -82,7 +82,7 @@
 
 =head2 take_action
 
-Send out a confirmation email giving a link to a password-reset form.
+Send out a Reminder email giving a link to a password-reset form.
 
 =cut