Index: feedback.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedback/feedback.module,v
retrieving revision 1.48
diff -u -r1.48 feedback.module
--- feedback.module	7 Nov 2005 01:12:51 -0000	1.48
+++ feedback.module	23 Nov 2005 06:09:53 -0000
@@ -67,66 +67,130 @@
 }
 
 function feedback_settings() {
-  $output .= form_textfield(t("Default Email Address"), "feedback_email",
-    _feedback_get_to_email(), 80, 300,
-    t("The email address which should receive all form submissions"));
-
-  $output .= form_textfield(t("Navigation link text"), "feedback_nav_link",
-    variable_get("feedback_nav_link", "feedback"), 80, 300,
-    t("The text that will be shown in the navigation link"));
-    
-  $output .= form_textfield(t("Feedback Page Header"), "feedback_pageheader",
-   variable_get("feedback_pageheader", "Use this form to send us feedback"), 80, 300,
-   t("The page header text that will be shown at the top of the feedback page"));
-
-  $output .= form_textfield (t("Subject Prefix"), "feedback_subject_prefix",
-    variable_get("feedback_subject_prefix", "Feedback: "), 80, 80, 
-    t("The prefix that should be added before the subject on each email"));
-
-  $output .= form_textarea  (t("Instructions"), "feedback_instructions",
-    variable_get("feedback_instructions", "Enter your message below: "), 60, 10, 
-    t("The instructions that will be displayed for the user on how to fill the form"));
-
-  $output .= "<br/>";
-    
-  $output .= form_textfield (t("Result Message - Success"), "feedback_rmsg_success",
-    variable_get("feedback_rmsg_success", "Thank you for your message."), 80, 80, 
-    t("The message that will be printed upon successfully completing the feedback request"));
-    
-   $output .= form_textfield (t("Result Message - Failure"), "feedback_rmsg_failure",
-    variable_get("feedback_rmsg_failure", "There are errors in your form."), 80, 80, 
-    t("The message that will be printed upon encountering an error in the feedback request"));
-
-  $output .= "<br/><p><b>" . t("Fields to include on the form:") . "</b></p>";
-
-  $output .= form_checkbox (t("Sender Email Address"), "feedback_field_email", 1,
-    variable_get("feedback_field_email", "1") );
-
-  $output .= form_checkbox (t("Sender Name"), "feedback_field_name", 1,
-    variable_get("feedback_field_name", "1") );
-
-  $output .= form_checkbox (t("Postal Address"), "feedback_field_postal", 1,
-    variable_get("feedback_field_postal", "0") );
-
-  $output .= form_checkbox (t("Phone Number"), "feedback_field_phone", 1,
-    variable_get("feedback_field_phone", "0") );
-
-  $output .= form_checkbox (t("Message Subject"), "feedback_field_subject", 1,
-    variable_get("feedback_field_subject", "1") );
-
-  $output .= form_checkbox (t("Message Body"), "feedback_field_body", 1,
-    variable_get("feedback_field_body", "1") );
-
-  $output .= "<br/><p><b>" . t("Miscellaneous Settings:") . "</b></p>";
-
-  $output .= form_checkbox (t("Validate Sender's Email Address"),
-    "feedback_validate_sender_address", 1,
-      variable_get("feedback_validate_sender_address", "0") );
-
-  $output .= form_checkbox (t("Log all feedback attempts to watchdog"), "feedback_logging", 1,
-    variable_get("feedback_logging", "1") );
+  $form['feedback_email'] = array (
+    '#type' => 'textfield',
+    '#title' => t('Default Email Address'),
+    '#default_value' => _feedback_get_to_email(),
+    '#size' => 80,
+    '#maxlength' => 300,
+    '#description' => t('The email address which should receive all form submissions'),
+  );
+
+  $form['feedback_nav_link'] = array (
+    '#type' => 'textfield',
+    '#title' => t('Navigation link text'),
+    '#default_value' => variable_get('feedback_nav_link', 'feedback'),
+    '#size' => '80',
+    '#maxlength' => '300',
+    '#description' => t('The text that will be shown in the navigation link'),
+  );
+  
+  $form['feedback_pageheader'] = array (
+    '#type' => 'textfield',
+    '#title' => t('Feedback Page Header'),
+    '#default_value' => variable_get('feedback_pageheader', 'Use this form to send us feedback'),
+    '#size' => '80',
+    '#maxlength' => '300',
+    '#description' => t('The page header text that will be shown at the top of the feedback page'),
+  );
+
+  $form['feedback_subject_prefix'] = array (
+    '#type' => 'textfield',
+    '#title' => t('Subject Prefix'),
+    '#default_value' => variable_get('feedback_subject_prefix', 'Feedback: '),
+    '#size' => '80',
+    '#maxlength' => '80',
+    '#description' => t('The prefix that should be added before the subject on each email'),
+  );
+
+  $form['feedback_instructions'] = array (
+    '#type' => 'textarea',
+    '#title' => t('Instructions'),
+    '#default_value' => variable_get('feedback_instructions', 'Enter your message below: '),
+    '#cols' => '60',
+    '#rows' => '10',
+    '#description' => t('The instructions that will be displayed for the user on how to fill the form'),
+  );
+
+  $form['feedback_rmsg_success'] = array (
+    '#type' => 'textfield',
+    '#title' => t('Result Message - Success'),
+    '#default_value' => variable_get('feedback_rmsg_success', 'Thank you for your message.'),
+    '#size' => '80',
+    '#maxlength' => '80',
+    '#description' => t('The message that will be printed upon successfully completing the feedback request'),
+  );
+
+  $form['feedback_rmsg_failure'] = array (
+    '#type' => 'textfield',
+    '#title' => t('Result Message - Failure'),
+    '#default_value' => variable_get('feedback_rmsg_failure', 'There are errors in your form.'),
+    '#size' => '80',
+    '#maxlength' => '80',
+    '#description' => t('The message that will be printed upon encountering an error in the feedback request'),
+  );
+
+  $form['feedback_fields'] = array (
+    '#type' => 'fieldset',
+    '#title' => t('Fields to include on the form:'),
+    '#tree' => FALSE,
+  );
+  
+  $form['feedback_fields']['feedback_field_email'] = array (
+    '#type' => 'checkbox',
+    '#title' => t('Sender Email Address'),
+    '#default_value' => variable_get('feedback_field_email', '1'),
+  );
+
+  $form['feedback_fields']['feedback_field_name'] = array (
+    '#type' => 'checkbox',
+    '#title' => t('Sender Name'),
+    '#default_value' => variable_get('feedback_field_name', '1'),
+  );
+
+  $form['feedback_fields']['feedback_field_postal'] = array (
+    '#type' => 'checkbox',
+    '#title' => t('Postal Address'),
+    '#default_value' => variable_get('feedback_field_postal', '0'),
+  );
+
+  $form['feedback_fields']['feedback_field_phone'] = array (
+    '#type' => 'checkbox',
+    '#title' => t('Phone Number'),
+    '#default_value' => variable_get('feedback_field_phone', '0'),
+  );
+
+  $form['feedback_fields']['feedback_field_subject'] = array (
+    '#type' => 'checkbox',
+    '#title' => t('Message Subject'),
+    '#default_value' => variable_get('feedback_field_subject', '1'),
+  );
+
+  $form['feedback_fields']['feedback_field_body'] = array (
+    '#type' => 'checkbox',
+    '#title' => t('Message Body'),
+    '#default_value' => variable_get('feedback_field_body', '1'),
+  );
+
+  $form['miscellaneous_settings'] = array (
+    '#type' => 'fieldset',
+    '#title' => t('Miscellaneous Settings:'),
+    '#tree' => FALSE,
+  );
+
+  $form['miscellaneous_settings']['feedback_validate_sender_address'] = array (
+    '#type' => 'checkbox',
+    '#title' => t('Validate Sender\'s Email Address'),
+    '#default_value' => variable_get('feedback_validate_sender_address', '0'),
+  );
+
+  $form['miscellaneous_settings']['feedback_logging'] = array (
+    '#type' => 'checkbox',
+    '#title' => t('Log all feedback attempts to watchdog'),
+    '#default_value' => variable_get('feedback_logging', '1'),
+  );
 
-  return $output;
+  return $form;
 }
 
 function feedback_page() {
@@ -219,37 +283,76 @@
   }
     
   if ( variable_get("feedback_field_name", t('Name')) )
-    $form .= form_textfield (t("Your Full Name"), "form_field_name", 
-    $edit['form_field_name'],  60, 64);
+    $form['form_field_name'] = array (
+      '#type' => 'textfield',
+      '#title' => t('Your Full Name'),
+      '#default_value' => $edit['form_field_name'],
+      '#size' => '60',
+      '#maxlength' => '64',
+    );
+    
 
   if ( variable_get("feedback_field_email", t('Email Address')) )
-    $form .= form_textfield (t("Your E-Mail Address"), "form_field_email",
-    $edit['form_field_email'], 60, 64);
+    $form['form_field_email'] = array (
+      '#type' => 'textfield',
+      '#title' => t('Your E-Mail Address'),
+      '#default_value' => $edit['form_field_email'],
+      '#size' => '60',
+      '#maxlength' => '64',
+    );
 
   if ( variable_get("feedback_field_postal", t('Postal Address')) ) 
-    $form .= form_textarea (t("Your Postal Address"), "form_field_postal",
-    $edit['form_field_postal'], 50, 4);
+    $form['form_field_postal'] = array (
+      '#type' => 'textfield',
+      '#title' => t('Your Postal Address'),
+      '#default_value' => $edit['form_field_postal'],
+      '#size' => '50',
+      '#maxlength' => '4',
+    );
 
   if ( variable_get("feedback_field_phone", t('Phone Number')) ) 
-    $form .= form_textfield (t("Your Phone Number"), "form_field_phone",
-    $edit['form_field_phone'], 60, 64);
+    $form['form_field_phone'] = array (
+      '#type' => 'textfield',
+      '#title' => t('Your Phone Number'),
+      '#default_value' => $edit['form_field_phone'],
+      '#size' => '60',
+      '#maxlength' => '64',
+    );
 
   if ( variable_get("feedback_field_subject", t('Subject')) ) 
-    $form .= form_textfield (t("Subject"), "form_field_subject",
-    $edit['form_field_subject'], 60, 64);
+    $form['form_field_subject'] = array (
+      '#type' => 'textfield',
+      '#title' => t('Subject'),
+      '#default_value' => $edit['form_field_subject'],
+      '#size' => '60',
+      '#maxlength' => '64',
+    );
 
   if ( variable_get("feedback_field_body", t('Message')) ) 
-    $form .= form_textarea  (t("Message"), "form_field_body", 
-    $edit['form_field_body'], 60, 15);
-
-  $form .= form_hidden ("form_field_referer", $_SERVER[HTTP_REFERER]);
+    $form['form_field_body'] = array (
+      '#type' => 'textarea',
+      '#title' => t('Message'),
+      '#default_value' => $edit['form_field_body'],
+      '#cols' => '60',
+      '#rows' => '15',
+    );
+
+    $form['form_field_referer'] = array (
+      '#type' => 'hidden',
+      '#value' => $_SERVER[HTTP_REFERER],
+    );
+
+    $form['submit'] = array (
+      '#type' => 'submit',
+      '#value' => t('Send Message'),
+    );
+
+//  $output .= $message . form($form, "post");
+//  if ($title) {
+//    $output = theme("box", $title, $output);
+//  }
 
-  $form .= form_submit (t("Send Message"), "op", $edit['op'] );
-
-  $output .= $message . form($form, "post");
-  if ($title) {
-    $output = theme("box", $title, $output);
-  }
+  $output .= drupal_get_form('', $form);
 
   return $output;
 }
@@ -261,7 +364,7 @@
   $email = $edit["form_field_email"] ; 
   $subj  = $edit["form_field_subject"] ; 
 
-  $message = "feedback: $name <$email> subject: $subj";
+  $message = 'feedback: ' . $name . ' &lt;' . $email . '&gt; subject: ' . $subj;
 
   watchdog ( "user", $message )  ;
 }
@@ -505,13 +608,11 @@
 
   $headers = "";
 
-  $name = $edit["form_field_name"];
-
-  $headers .= "From: $name " . " <" . $edit["form_field_email"] . ">\n";
-  $headers .= "Reply-To: " . $edit['form_field_email']. "\n";
-  $headers .= "Return-Path: " . $edit['form_field_email']. "\n";
-  $headers .= "Errors-To: " . $edit['form_field_email'] . "\n";
-  $headers .= "X-Mailer: Drupal\n";
+  $headers .= "From: " . $edit['form_field_email'] . "\r\n";
+  $headers .= "Reply-To: " . $edit['form_field_email']. "\r\n";
+  $headers .= "Return-Path: " . $edit['form_field_email']. "\r\n";
+  $headers .= "Errors-To: " . $edit['form_field_email'] . "\r\n";
+  $headers .= "X-Mailer: Drupal\r\n";
 
   return $headers;
 }