Changeset 1068

Timestamp:

06/11/07 21:37:06 (1 year ago)

Author:

dom

Message:

Add framework for generic content/metadata validation into commit_node

Files:

• trunk/lib/OpenGuides.pm (modified) (1 diff)
• trunk/lib/OpenGuides/Utils.pm (modified) (1 diff)

trunk/lib/OpenGuides.pm

@@ -1336 +1336 @@
-    $new_metadata{host} = $ENV{REMOTE_ADDR};
-
+    # General validation
+    eval { OpenGuides::Utils->validate_edit(
+        content  => $content,
+        metadata => \%new_metadata
+    ) };
+
+    if ( $@ ) {
+        my $output = OpenGuides::Template->output(
+            wiki     => $self->wiki,
+            config   => $config,
+            template => "validate_edit_failed.tt",
+            vars => {
+                message => $@
+            }
+        );
+        return $output if $return_output;
+        print $output;
+        return;
+    }
+
-    # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set.
-    $new_metadata{major_change} = ( $new_metadata{edit_type} eq "Normal edit" )

trunk/lib/OpenGuides/Utils.pm

@@ -356 +356 @@
-}
-
+=item B<validate_edit>
+
+    eval { OpenGuides::Utils->validate_edit(
+        id       => $node,
+        content  => $content
+        metadata => \%new_metadata
+    ) };
+
+Checks supplied content for general validity. If anything is invalid,
+dies with an error string suitable for reporting to the user.
+
+=cut
+
+sub validate_edit {
+    my ( $self, %args ) = @_;
+    die "Content missing\n" unless $args{content};
+    die "Metadata missing\n" unless $args{metadata};
+
+};
+
-=back
-