Merge lp:~felmas/mvhub/add_referer_contact_email into lp:mvhub

[Ferhat Elmas]

improve of contact email with referer

[Dan MacNeil (omacneil)]

Looks like these lines:

58 +
59 + <td><span class="warning">
60 + <!-- tmpl_var error-referer --></span></td>

... are still there.

If FormBuilder requires <!-- tmpl_var error-referer --> , that is fine but no need for the <span></span> which inserts blank line.

This is a really, really microscopic flaw, but it is also very easy to fix.

[lp:~felmas/mvhub/add_referer_contact_email]

573. By Ferhat Elmas <ferhat@veteran-linux> on 2011-07-01

associate with bug 539662 ( improve contact form with referer info )

=== modified file 'app-mvhub/DocumentRoot/cgi-bin/mvhub/contact_form.pl'
--- app-mvhub/DocumentRoot/cgi-bin/mvhub/contact_form.pl	2010-10-22 19:49:21 +0000
+++ app-mvhub/DocumentRoot/cgi-bin/mvhub/contact_form.pl	2011-07-01 20:06:38 +0000
@@ -31,6 +31,11 @@
     );
 
     $form->field(
+        name     => 'referer',
+        type     => 'hidden',
+        required => 1
+    );
+    $form->field(
         name     => 'name',
         size     => 45,
         label    => 'Your name',
@@ -75,7 +80,7 @@
             From    => $fields->{name} . ' <' . $fields->{liame} . '>',
             To      => $cfg->param('NOTIFICATION.admin_email'),
             Subject => $subject,
-            Data    => $fields->{question},
+            Data => $fields->{question} . " \nREFERER: " . $fields->{referer},
         );
         MVHub::Common::sendmail($mail);
 
@@ -89,6 +94,21 @@
 
     }
     else {
+        if ( $ENV{HTTP_REFERER} ) {
+            $form->field(
+                name  => 'referer',
+                value => $ENV{HTTP_REFERER},
+                force => 1
+            );
+        }
+        else {
+            $form->field(
+                name  => 'referer',
+                value => 'not available, user came to contact directly',
+                force => 1
+            );
+        }
+
         my $show_nsp_left_menu = 0;
         if ( $site_code eq 'nsp' ) {
             $show_nsp_left_menu = 1;

=== modified file 'app-mvhub/conf/templates/html/contact_form.tmpl'
--- app-mvhub/conf/templates/html/contact_form.tmpl	2010-07-21 20:00:54 +0000
+++ app-mvhub/conf/templates/html/contact_form.tmpl	2011-07-01 20:06:38 +0000
@@ -23,9 +23,13 @@
                     comments, please <strong>fill out the form
                     below</strong>, and we will respond within 2
                     business days.</p><!-- tmpl_var form-start -->
-
-                    <table summary='contact form'>
-                        <tr>
+		    <!-- tmpl_var field-referer -->
+		    <span class="warning"> 
+                    <!-- tmpl_var error-referer --></span>
+                    
+		    <table summary='contact form'>
+			
+			<tr>
                             <td><!-- tmpl_var label-name -->:</td>
 
                             <td><!-- tmpl_var field-name --></td>