Make untainting, editing, and other things work.

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@27 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 68a9927bf113ae421c1e205f8b87f0f334fece46..467f0f97b83ffb5f01c2d55b59a3bb191c3513f8 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -32,28 +32,29 @@ sub config {
 sub set_database {
     my ($calling_class, $dsn) = @_;
     $calling_class = ref $calling_class if ref $calling_class;
-    $calling_class->config->{dsn} = $dsn;
-    $calling_class->config->{loader} = Class::DBI::Loader->new(
+    my $config = $calling_class->config;
+    $config->{model} ||= "Apache::MVC::Model::CDBI";
+    $config->{model}->require;
+    $config->{dsn} = $dsn;
+    $config->{loader} = Class::DBI::Loader->new(
         namespace => $calling_class,
         dsn => $dsn
     ); 
+    $config->{classes} = [ $config->{loader}->classes ];
+    for my $subclass (@{$config->{classes}}) {
+        no strict 'refs';
+        unshift @{$subclass."::ISA"}, $config->{model};
+        $config->{model}->adopt($subclass)
+           if $config->{model}->can("adopt");
+    }
 }
 
 sub init {
     my $class = shift;
     my $config = $class->config;
-    $config->{model} ||= "Apache::MVC::Model::CDBI";
     $config->{view}  ||= "Apache::MVC::View::TT";
-    $config->{model}->require;
     $config->{view}->require;
-    $config->{classes} = [ $class->config->{loader}->classes ];
     $config->{display_tables} ||= [ $class->config->{loader}->tables ];
-    for my $subclass (@{$config->{classes}}) {
-        no strict 'refs';
-        unshift @{$subclass."::ISA"}, $class->config->{model};
-        $config->{model}->adopt($subclass)
-           if $config->{model}->can("adopt");
-    }
     $class->view_object($class->config->{view}->new);
     $class->init_done(1);
 

diff --git a/lib/Apache/MVC/Model/CDBI.pm b/lib/Apache/MVC/Model/CDBI.pm
index f9b2087b9cd16abf7407dc612db7c999e8425ca4..695e1cbd7dec1fe0e6e6f9ed33863113df0b2c90 100644 (file)
--- a/lib/Apache/MVC/Model/CDBI.pm
+++ b/lib/Apache/MVC/Model/CDBI.pm
@@ -20,13 +20,13 @@ sub related {
     map {to_PL($_)} 
     grep { exists $r->{config}{ok_tables}{$_} }
     map {$_->table}
-    keys %{shift->__hasa_list}
+    keys %{shift->__hasa_list || {}}
 }
 
 sub do_edit :Exported {
     my ($self, $r) = @_;
     my $h = CGI::Untaint->new(%{$r->{params}});
-    my ($obj) = @{$self->objects};
+    my ($obj) = @{$r->objects};
     if ($obj) {
         # We have something to edit
         $obj->update_from_cgi($h);

diff --git a/lib/BeerDB.pm b/lib/BeerDB.pm
index dc81a68fe3022e548bd7b9c17b3931226e7a5698..7cb998f8b4a8153a54f41d3a620fa7a3b829ed49 100644 (file)
--- a/lib/BeerDB.pm
+++ b/lib/BeerDB.pm
@@ -7,6 +7,14 @@ BeerDB->set_database("dbi:mysql:beerdb");
 BeerDB->config->{template_root} = "/opt/beer";
 BeerDB->config->{uri_base} = "http://neo.trinity-house.org.uk/beerdb/";
 BeerDB->config->{display_tables} = [qw[beer brewery pub style]];
+BeerDB::Brewery->untaint_columns(
+    printable => [qw/name notes url/],
+    #url => [qw/url/]
+);
+BeerDB::Beer->untaint_columns(
+    printable => [qw/abv name price notes/],
+    date =>[ qw/date/],
+);
 
 use Class::DBI::Loader::Relationship;
 BeerDB->config->{loader}->relationship($_) for (