[Jifty-commit] r2203 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sun Nov 26 00:03:17 2006
New Revision: 2203

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/META.yml
   jifty/trunk/lib/Jifty/LetMe.pm

Log:
 r45448 at pinglin:  jesse | 2006-11-26 00:03:09 -0500
 * Some small warning avoidances


Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml	(original)
+++ jifty/trunk/META.yml	Sun Nov 26 00:03:17 2006
@@ -68,7 +68,7 @@
   Hash::Merge: 0
   Hook::LexWrap: 0
   IPC::PubSub: 0.11
-  JSON::Syck: 0.14
+  JSON::Syck: 0.15
   Jifty::DBI: 0.29
   LWP::UserAgent: 0
   Locale::Maketext::Extract: 0.20
@@ -77,6 +77,7 @@
   MIME::Types: 0
   Module::CoreList: 0
   Module::Pluggable: 2.95
+  Module::Refresh: 0
   Module::ScanDeps: 0
   Object::Declare: 0.13
   Params::Validate: 0
@@ -85,6 +86,7 @@
   Scalar::Defer: 0.06
   Shell::Command: 0
   String::Koremutake: 0
+  Test::Base: 0
   UNIVERSAL::require: 0
   URI: 0
   XML::Simple: 0

Modified: jifty/trunk/lib/Jifty/LetMe.pm
==============================================================================
--- jifty/trunk/lib/Jifty/LetMe.pm	(original)
+++ jifty/trunk/lib/Jifty/LetMe.pm	Sun Nov 26 00:03:17 2006
@@ -89,8 +89,8 @@
 
     # get user's generic secret
     my $user;
-    return undef unless ( $user = $self->_user_from_email($self->email) );
-    return undef unless ($user->auth_token);
+    return '' unless ( $user = $self->_user_from_email($self->email) );
+    return '' unless ($user->auth_token);
 
 
 
@@ -180,6 +180,9 @@
     $self->path( shift @atoms );
     $self->checksum_provided( pop @atoms );
 
+    # If they don't even have the right number of items in the path, then we know that it's not valid
+    return undef unless (scalar @atoms % 2 == 0); 
+
     my %args = map { Jifty::I18N->maybe_decode_utf8(URI::Escape::uri_unescape($_)) } @atoms;
     $self->until( delete $args{until} ) if $args{until};