Changeset 1085 for trunk/lib/OpenGuides/CGI.pm

Timestamp:

06/17/07 00:57:32 (19 months ago)

Author:

ilmari

Message:

Clean up fallout from prefs cleanup
- Make OpenGuides::Template->output pass the provided cookies to

OpenGuides::CGI->get_prefs_from_cookie, where this overrides any
browser-supplied cookie.

- Use the prefs hash explcitly where needed (fixes #216).

Targets to commit (you may delete items from it)

M /home/ilmari/src/openguides-trunk/lib/Changes.pm
M /home/ilmari/src/openguides-trunk/lib/OpenGuides/CGI.pm
M /home/ilmari/src/openguides-trunk/lib/OpenGuides/Template.pm
M /home/ilmari/src/openguides-trunk/preferences.cgi
M /home/ilmari/src/openguides-trunk/t/59_preferences.t
M /home/ilmari/src/openguides-trunk/templates/preferences.tt
M /home/ilmari/src/openguides-trunk/templates/navbar_tools.tt

Files:

• trunk/lib/OpenGuides/CGI.pm (modified) (4 diffs)

trunk/lib/OpenGuides/CGI.pm

@@ -137 +137 @@
 
   my %prefs = OpenGuides::CGI->get_prefs_from_cookie(
-      config => $config
+      config => $config,
+      cookies => \@cookies
   );
 
 Croaks unless an L<OpenGuides::Config> object is supplied as C<config>.
 Returns default values for any parameter not specified in cookie.
+
+If C<cookies> is provided, this overrides any cookies submitted by the
+browser.
 
 =cut
@@ -150 +154 @@
     croak "Config object not an OpenGuides::Config"
         unless UNIVERSAL::isa( $config, "OpenGuides::Config" );
-    my %cookies = CGI::Cookie->fetch;
     my $cookie_name = $class->_get_cookie_name( config => $config );
+    my %cookies;
+    if ( my $cookies = $args{cookies} ) {
+        if (ref $cookies ne 'ARRAY') {
+            $cookies = [ $cookies ];
+        }
+        %cookies = map { $_->name => $_ } @{ $cookies };
+    }
+    else {
+        %cookies = CGI::Cookie->fetch;
+    }
     my %data;
     if ( $cookies{$cookie_name} ) {
@@ -157 +170 @@
     }
 
-    return $class->get_prefs_from_hash( %data );
+    my %long_forms = (
+                       user       => "username",
+                       gclink     => "include_geocache_link",
+                       prevab     => "preview_above_edit_box",
+                       lltrad     => "latlong_traditional",
+                       omithlplks => "omit_help_links",
+                       rcmined    => "show_minor_edits_in_rc",
+                       defedit    => "default_edit_type",
+                       exp        => "cookie_expires",
+                       trackrc    => "track_recent_changes_views",
+                       gmaps      => "display_google_maps",
+                     );
+    my %long_data = map { $long_forms{$_} => $data{$_} } keys %long_forms;
+
+    return $class->get_prefs_from_hash( %long_data );
 }
 
@@ -174 +201 @@
                      display_google_maps        => 1,
                    );
-    my %long_forms = (
-                       user       => "username",
-                       gclink     => "include_geocache_link",
-                       prevab     => "preview_above_edit_box",
-                       lltrad     => "latlong_traditional",
-                       omithlplks => "omit_help_links",
-                       rcmined    => "show_minor_edits_in_rc",
-                       defedit    => "default_edit_type",
-                       exp        => "cookie_expires",
-                       trackrc    => "track_recent_changes_views",
-                       gmaps      => "display_google_maps",
-                     );
     my %return;
-    foreach my $key ( keys %long_forms ) {
-        my $long_key = $long_forms{$key};
-        if ( defined $data{$key} ) {
-            $return{$long_key} = $data{$key};
-        } else {
-            $return{$long_key} = $defaults{$long_key};
-        }
-    }
+    foreach my $key ( keys %data ) {
+        $return{$key} = defined $data{$key} ? $data{$key} : $defaults{$key};
+    }
+
     return %return;
 }