Changeset 1084 for trunk/preferences.cgi

Timestamp:

06/16/07 22:33:16 (18 months ago)

Author:

ilmari

Message:

Preferences cleanup
- Separate preference defaulting from cookie parsing.
- Remove duplicate preference defaulting from the cgi.
- Use the prefs template variable in the template.

Files:

• trunk/preferences.cgi (modified) (3 diffs)

trunk/preferences.cgi

@@ -23 +23 @@
 
 sub set_preferences {
-    my $username     = $cgi->param("username")                   || "";
-    my $gc_link      = $cgi->param("include_geocache_link")      || 0;
-    my $pre_above    = $cgi->param("preview_above_edit_box")     || 0;
-    my $latlong_trad = $cgi->param("latlong_traditional")        || 0;
-    my $omit_hlplnks = $cgi->param("omit_help_links")            || 0;
-    my $rc_minor_eds = $cgi->param("show_minor_edits_in_rc")     || 0;
-    my $edit_type    = $cgi->param("default_edit_type")          || "normal";
-    my $expires      = $cgi->param("cookie_expires")             || "month";
-    my $track_rc     = $cgi->param("track_recent_changes_views") || 0;
-    my $gmaps        = $cgi->param("display_google_maps")        || 0;
+    my %prefs = OpenGuides::CGI->get_prefs_from_hash( $cgi->Vars );
     my $prefs_cookie = OpenGuides::CGI->make_prefs_cookie(
         config => $config,
-        username => $username,
-        include_geocache_link  => $gc_link,
-        preview_above_edit_box => $pre_above,
-        latlong_traditional    => $latlong_trad,
-        omit_help_links        => $omit_hlplnks,
-        show_minor_edits_in_rc => $rc_minor_eds,
-        default_edit_type      => $edit_type,
-        cookie_expires         => $expires,
-        track_recent_changes_views => $track_rc,
-        display_google_maps    => $gmaps
+        %prefs,
     );
     my @cookies = ( $prefs_cookie );
@@ -63 +45 @@
         vars     => {
                       not_editable               => 1,
-                      username                   => $username,
-                      include_geocache_link      => $gc_link,
-                      preview_above_edit_box     => $pre_above,
-                      latlong_traditional        => $latlong_trad,
-                      omit_help_links            => $omit_hlplnks,
-                      show_minor_edits_in_rc     => $rc_minor_eds,
-                      default_edit_type          => $edit_type,
-                      cookie_expires             => $expires,
-                      track_recent_changes_views => $track_rc,
-                      display_google_maps        => $gmaps
+                      %prefs,
                     }
     );
@@ -78 +51 @@
 
 sub show_form {
-    # Get defaults for form fields from cookies.
-    my %prefs = OpenGuides::CGI->get_prefs_from_cookie( config => $config );
-
     print OpenGuides::Template->output(
         wiki     => $wiki,
         config   => $config,
         template => "preferences.tt",
-        vars     => { %prefs,
+        vars     => { 
                       not_editable => 1,
                       show_form    => 1