--- feedback.module	Thu Jul 28 03:14:01 2005
+++ frjo_sandbox/feedback.module	Sun Aug 14 13:41:10 2005
@@ -5,12 +5,13 @@
 // Copyright 2004-2005 Khalid Baheyeldin http://2bits.com
 
 
-function feedback_help ($section = 'admin/help#feedback') {
-  $output = '';
+function feedback_help($section = 'admin/help#feedback') {
+
+  $args = array("%permissions" => url("admin/access"), "%feedback" => url("feedback"));
 
   switch($section) {
     case 'admin/help#feedback':
-      $output .= t("
+      $output = t("
       <p>Users with the correct <a href=\"%permissions\">permissions</a> can send feedback
        to the site admin via email from a form on the site.</p>
       <p>To enable its use, a user needs the \"access feedback\" permission.</p>
@@ -18,11 +19,16 @@
        parameters, such as what fields to show the user to fill (name, address, email), whether
        the user address is to be validated, and whether to log all attempts to use this form.</p>
       <p>The email address is never visible to the users, and therefore cannot be used by SPAM
-       harvesters.</p>",
-       array("%permissions" => url("admin/user/permission"), "%feedback" => url("feedback")));
+       harvesters.</p>", $args);
       break;
     case 'admin/modules#description':
-      $output = t("Enables visitors to your site to provide feedback from a web form.");
+      $output = t('Enables visitors to your site to provide feedback from a web form.');
+      break;
+    case 'admin/settings/feedback':
+      $output = t("
+      Here you can configure the feedback page.<br />
+      The user needs the correct <a href=\"%permissions\">permissions</a> to see the
+      <a href=\"%feedback\">feedback page</a>", $args);
       break;
   }
 
@@ -30,25 +36,21 @@
 }
 
 function feedback_perm() {
-  return array ('can send feedback');
+  return array('can send feedback');
 }
 
 function feedback_menu($may_cache) {
-  global $user;
   $items = array();
 
-  $access = user_access('can send feedback');
-  $title  = variable_get("feedback_nav_link", "feedback");
-
-
-  if ($may_cache) {
+  if (!$may_cache) {
     $items[] = array(
-    'path'     => 'feedback',
-    'callback' => 'feedback_page',
-    'title'    => $title,
-    'access'   => $access,
-    'weight'   => 0);
- }
+      'path'     => 'feedback',
+      'callback' => 'feedback_page',
+      'title'    => variable_get('feedback_nav_link', 'feedback'),
+      'access'   => user_access('can send feedback'),
+      'type'     => MENU_SUGGESTED_ITEM
+    );
+  }
 
   return $items;
 }
@@ -60,188 +62,191 @@
   $links = array();
 
   if ($type == 'page' && user_access('can send feedback')) {
-  $links[] = l(t('feedback'), 'feedback');
+    $links[] = l(t('feedback'), 'feedback');
   }
 
   return $links;
 }
 
 function feedback_settings() {
-  $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("Default Email Address"), "feedback_email",
-    variable_get("feedback_email", ""), 80, 300,
-    t("The email address which should receive all form submissions"));
-
-  $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_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('Default Email Address'), "feedback_email",
+    variable_get('feedback_email', ''), 80, 300,
+    t('The email address which should receive all form submissions'));
+
+  $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_checkbox (t("Message Body"), "feedback_field_body", 1,
-    variable_get("feedback_field_body", "1") );
+  $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 .= "<br/><p><b>" . t("Miscellaneous Settings:") . "</b></p>";
+   $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 .= form_checkbox (t("Validate Sender's Email Address"),
+  $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") );
+      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") );
+  $output .= form_checkbox(t('Log all feedback attempts to watchdog'), "feedback_logging", 1,
+    variable_get('feedback_logging', '1'));
 
   return $output;
 }
 
 function feedback_page() {
-  $edit = $_POST["edit"];
-  $op = arg(1);
-  
+  $edit = $_POST['edit'];
+
   // Set breadcrumbs
   $breadcrumb = array(array('path' => 'feedback'));
   menu_set_location($breadcrumb);
 
+  $output = feedback_display_form();
+
   if ($edit) {
-    if ( variable_get("feedback_logging", "1") ) {
-      feedback_watchdog_log();
-    }
+    feedback_validate_data();
 
-    $errmsg = feedback_validate_data();
-    if ($errmsg) {
-      drupal_set_message(variable_get("feedback_rmsg_failure", "There are errors in your form."));
-      print theme("page", $errmsg );
-    }
-    else {
+    if (!form_get_errors()) {
       feedback_send_email();
-      drupal_set_message(variable_get("feedback_rmsg_success", "Thank you for your message"));
-      print theme("page", "");
+
+      if (variable_get('feedback_logging', '1')) {
+        feedback_watchdog_log();
+      }
+
+      drupal_set_message(variable_get('feedback_rmsg_success', 'Thank you for your message'));
+      $output = '';
     }
   }
-  else {
-    $form = feedback_display_form () ;
-    print theme("page", $form);
-    }
+
+  print theme("page", $output);
 }
 
 function feedback_send_email() {
-  $edit = $_POST["edit"];
+  $edit = $_POST['edit'];
 
-  $subject_prefix = variable_get("feedback_subject_prefix", "");
-  
-  $subject = $subject_prefix . " " . $edit["form_field_subject"] ;
+  $subject_prefix = variable_get('feedback_subject_prefix', '');
 
-  $from_email = $edit["form_field_email"] ? $edit["form_field_email"] : 
+  $subject = $subject_prefix ." ". $edit['form_field_subject'] ;
+
+  $from_email = $edit['form_field_email'] ? $edit['form_field_email'] : 
     variable_get("site_mail", ini_get("sendmail_from"));
 
-  $to = variable_get("feedback_email", "");
+  $to = variable_get('feedback_email', '');
 
-  $body = feedback_format_body($edit["form_field_body"]) . "\n\n" . feedback_custom_footers();
+  $body = feedback_format_body($edit['form_field_body']) ."\n\n". feedback_custom_footers();
 
   $headers = feedback_custom_headers();
 
   if ($to) {
-     user_mail($to, $subject, $body, $headers);
-     $rc = true;
-     }
+    user_mail($to, $subject, $body, $headers);
+    $rc = true;
+  }
   else {
-     $rc = false;
-     }
+    $rc = false;
+  }
 
   return $rc;
 }
 
-function feedback_display_form () {
+function feedback_display_form() {
   global $user;
 
-  $edit = $_POST["edit"];
+  $edit = $_POST['edit'];
 
-  $edit['form_field_name']  = "";
-  $edit['form_field_email'] = "";
+  $edit['form_field_name']  = '';
+  $edit['form_field_email'] = '';
 
   if ($user->name) {
-  $edit['form_field_name'] = $user->name ;
+    $edit['form_field_name'] = $user->name ;
   }
 
   if ($user->mail) {
-  $edit['form_field_email'] = $user->mail ;
+    $edit['form_field_email'] = $user->mail ;
   }
 
-  if (variable_get("feedback_pageheader", "")) {
-    $title .= variable_get("feedback_pageheader", "");
+  if (variable_get('feedback_pageheader', '')) {
+    $title .= variable_get('feedback_pageheader', '');
   }
 
-  $instructions = variable_get("feedback_instructions", "");
+  $instructions = variable_get('feedback_instructions', '');
 
   if ($instructions) {
     $message .= $instructions;
   }
   else {
-    $message .= t("Enter your message below:");
+    $message .= t('Enter your message below:');
+  }
+
+  if (variable_get('feedback_field_name', '')) {
+    $form .= form_textfield(t('Your Full Name'), "form_field_name", 
+      $edit['form_field_name'],  60, 64, NULL, NULL, TRUE);
   }
-    
-  if ( variable_get("feedback_field_name", "") )
-    $form .= form_textfield (t("Your Full Name"), "form_field_name", 
-    $edit['form_field_name'],  60, 64);
 
-  if ( variable_get("feedback_field_email", "") )
-    $form .= form_textfield (t("Your E-Mail Address"), "form_field_email",
-    $edit['form_field_email'], 60, 64);
+  if (variable_get('feedback_field_email', '')) {
+    $form .= form_textfield(t('Your E-Mail Address'), "form_field_email",
+      $edit['form_field_email'], 60, 64, NULL, NULL, TRUE);
+  }
 
-  if ( variable_get("feedback_field_postal", "") ) 
-    $form .= form_textarea (t("Your Postal Address"), "form_field_postal",
-    $edit['form_field_postal'], 50, 4);
+  if (variable_get('feedback_field_postal', '')) {
+    $form .= form_textarea(t('Your Postal Address'), "form_field_postal",
+      $edit['form_field_postal'], 50, 4, NULL, NULL, TRUE);
+  }
 
-  if ( variable_get("feedback_field_phone", "") ) 
-    $form .= form_textfield (t("Your Phone Number"), "form_field_phone",
-    $edit['form_field_phone'], 60, 64);
+  if (variable_get('feedback_field_phone', '')) {
+    $form .= form_textfield(t('Your Phone Number'), "form_field_phone",
+      $edit['form_field_phone'], 60, 64, NULL, NULL, TRUE);
+  }
 
-  if ( variable_get("feedback_field_subject", "") ) 
-    $form .= form_textfield (t("Subject"), "form_field_subject",
-    $edit['form_field_subject'], 60, 64);
+  if (variable_get('feedback_field_subject', '')) {
+    $form .= form_textfield(t('Subject'), "form_field_subject",
+      $edit['form_field_subject'], 60, 64, NULL, NULL, TRUE);
+  }
 
-  if ( variable_get("feedback_field_body", "") ) 
-    $form .= form_textarea  (t("Message"), "form_field_body", 
-    $edit['form_field_body'], 60, 15);
+  if (variable_get('feedback_field_body', '')) {
+    $form .= form_textarea (t('Message'), "form_field_body", 
+      $edit['form_field_body'], 60, 15, NULL, NULL, TRUE);
+  }
 
-  $form .= form_hidden ("form_field_referer", $_SERVER[HTTP_REFERER]);
+  $form .= form_hidden("form_field_referer", $_SERVER[HTTP_REFERER]);
 
-  $form .= form_submit (t("Send Message"), "op", $edit['op'] );
+  $form .= form_submit(t('Send Message'), "op", $edit['op']);
 
   $output .= $message . form($form, "post");
   if ($title) {
@@ -252,209 +257,212 @@
 }
 
 function feedback_watchdog_log() {
-  $edit = $_POST["edit"];
+  $edit = $_POST['edit'];
 
-  $name  = $edit["form_field_name"] ;
-  $email = $edit["form_field_email"] ; 
-  $subj  = $edit["form_field_subject"] ; 
+  $name    = $edit['form_field_name'] ;
+  $email   = $edit['form_field_email'] ;
+  $subject = $edit['form_field_subject'] ;
 
-  $message = "feedback: $name <$email> subject: $subj";
+  $message = "feedback: $name <$email> subject: $subject";
 
-  watchdog ( "user", $message )  ;
+  watchdog("user", $message)  ;
 }
 
 function feedback_validate_data() {
   global $user;
-  $edit = $_POST["edit"];
+  $edit = $_POST['edit'];
 
-  $name  = $edit["form_field_name"] ;
-  $email = $edit["form_field_email"] ; 
-  $subj  = $edit["form_field_subject"] ; 
-  $body  = $edit["form_field_body"] ; 
-  $postal= $edit["form_field_postal"] ; 
-  $phone = $edit["form_field_phone"] ; 
+  $name    = $edit['form_field_name'] ;
+  $email   = $edit['form_field_email'] ;
+  $subject = $edit['form_field_subject'] ;
+  $body    = $edit['form_field_body'] ;
+  $postal  = $edit['form_field_postal'] ;
+  $phone   = $edit['form_field_phone'] ;
 
-  $error_msg = "";
+  $error_msg = '';
 
-  if (empty ($email) && variable_get ("feedback_field_email", "") ) {
-     $error_msg .= t("Error: E-Mail address is required") . "<br/>";
+  if (empty($email) && variable_get('feedback_field_email', '')) {
+     $error_msg .= form_set_error('form_field_email', t('Error: E-Mail address is required'));
      }
   else {
-     $smtp_err = feedback_validate_email ($email);
-     if ( $smtp_err != "" ) {
-        $error_msg .= t("Error: E-Mail address error:") . "<br/>" . t("SMTP Info:") . $smtp_err . "<br/>";
+     $smtp_err = feedback_validate_email($email);
+     if ($smtp_err != '') {
+        $error_msg .= form_set_error('form_field_email', t('Error: E-Mail address error ') . $smtp_err);
         }
      }
 
-  if (empty($name) && variable_get("feedback_field_name", "") ) {
-    $error_msg .= t("Error: Full name is required") . "<br/>";
-    }
+  if (empty($name) && variable_get('feedback_field_name', '')) {
+    $error_msg .= form_set_error('feedback_field_name', t('Error: Full name is required'));
+  }
 
-  if (empty($body) && variable_get ("feedback_field_body", "") ) {
-    $error_msg .= t("Error: Message Body is required") . "<br/>";
-    }
+  if (empty($body) && variable_get('feedback_field_body', '')) {
+    $error_msg .= form_set_error('feedback_field_body', t('Error: Message Body is required'));
+  }
 
-  if (empty($subj) && variable_get ("feedback_field_subject", "") ) {
-    $error_msg .= t("Error: Subject is required") . "<br/>";
-    }
+  if (empty($subject) && variable_get('feedback_field_subject', '')) {
+    $error_msg .= form_set_error('feedback_field_subject', t('Error: Subject is required'));
+  }
 
-  if (empty($postal) && variable_get ("feedback_field_postal", "") ) {
-    $error_msg .= t("Error: Postal is required") . "<br/>";
-    }
+  if (empty($postal) && variable_get('feedback_field_postal', '')) {
+    $error_msg .= form_set_error('feedback_field_postal', t('Error: Postal is required'));
+  }
 
-  if (empty($phone) && variable_get ("feedback_field_phone", "") ) {
-    $error_msg .= t("Error: Phone is required") . "<br/>";
-    }
+  if (empty($phone) && variable_get('feedback_field_phone', '')) {
+    $error_msg .= form_set_error('feedback_field_phone', t('Error: Phone is required'));
+  }
 
- if (empty($error_msg)) {
-    return "";
-    }
- else {
-    $error_msg = t("The form could not be processed due to the following errors:") .
-      "<br/>" . $error_msg;
-  
-    return $error_msg;
-    }
+  return $error_msg;
 }
 
 function feedback_validate_email($email) {
 
- if (valid_email_address($email)) {
+  if (valid_email_address($email)) {
     // It looks like a valid email address
-    if ( variable_get ("feedback_validate_sender_address", "") ) {
-       $rc = feedback_try_to_feedback_address ( $email );
-       }
-    else {
-       $rc = "";
-       }
+    if (variable_get('feedback_validate_sender_address', '')) {
+      $rc = feedback_try_to_feedback_address($email);
     }
- else {
-    $rc = t("Invalid E-mail address structure");
+    else {
+      $rc = '';
     }
+  }
+  else {
+    $rc = t('Invalid E-mail address structure');
+  }
 
- return $rc;    
+ return $rc;
 }
 
 function feedback_try_to_feedback_address($email) {
 
- // This function is based on one that was written by
- // Jon S. Stevens jon AT clearink.com
- // Copyright 1998 Jon S. Stevens, Clear Ink
- // This code has all the normal disclaimers.
- // It is free for any use, just keep the credits intact.
-
-$server_name = $_SERVER['SERVER_NAME'];
-    
-$rc = "Undefined error";
-
-list ( $user, $domain )  = split ( "@", $email, 2 );
-$arr = explode ( ".", $domain );
-$count = count ( $arr );
-$tld = $arr[$count - 2] . "." . $arr[$count - 1];
-
-if ( !$tld ) {
-   $rc = "Error: Invalid domain part in e-mail";
-   return $rc;
-   }
-
-if ( checkdnsrr ( $tld, "MX" ) ) {
-  if ( getmxrr ( $tld, $mxhosts, $weight ) ) {
-    for ( $i = 0; $i < count ( $mxhosts ); $i++ ) {
-      $fp = fsockopen ( $mxhosts[$i], 25 );
-      if ( $fp ) {
-        $s = 0;
-        $c = 0;
-        $out = "";
-        set_socket_blocking ( $fp, false );
-        do {
-          $out = fgets ( $fp, 2500 );
-          if ( ereg ( "^220", $out ) ) {
-            $s = 0;
-            $out = "";
-            $c++;
-          }
-          else
-          if ( ( $c > 0 ) && ( $out == "" ) ) {
-            break;
+  // This function is based on one that was written by
+  // Jon S. Stevens jon AT clearink.com
+  // Copyright 1998 Jon S. Stevens, Clear Ink
+  // This code has all the normal disclaimers.
+  // It is free for any use, just keep the credits intact.
+
+  $server_name = $_SERVER['SERVER_NAME'];
+
+  $rc = "Undefined error";
+
+  list($user, $domain) = split("@", $email, 2);
+  $arr = explode(".", $domain);
+  $count = count($arr);
+  $tld = $arr[$count - 2] .".". $arr[$count - 1];
+
+  if (!$tld) {
+    $rc = "Error: Invalid domain part in e-mail";
+    return $rc;
+  }
+
+  if (checkdnsrr($tld, "MX")) {
+    if (getmxrr($tld, $mxhosts, $weight)) {
+      for ($i = 0; $i < count($mxhosts); $i++) {
+        $fp = fsockopen($mxhosts[$i], 25);
+        if ($fp) {
+          $s = 0;
+          $c = 0;
+          $out = '';
+          set_socket_blocking($fp, false);
+          do {
+            $out = fgets($fp, 2500);
+            if (ereg("^220", $out)) {
+              $s = 0;
+              $out = '';
+              $c++;
+            }
+            else
+            if (($c > 0) && ($out == '')) {
+              break;
+            }
+            else {
+              $s++;
+            }
+            if ($s == 9999) {
+              break;
+            }
+          } while ($out == '');
+
+          set_socket_blocking($fp, true);
+
+          fputs($fp, "HELO $server_name\n");
+          $output = fgets($fp, 2000);
+          fputs($fp, "MAIL FROM: <info@". $tld .">\n");
+          $output = fgets($fp, 2000);
+          fputs($fp, "RCPT TO: <$email>\n");
+          $output = fgets($fp, 2000);
+          if (ereg("^250", $output)) {
+            $rc = '';
           }
           else {
-            $s++;
+            $rc = $output;
           }
-          if ( $s == 9999 ) {
-            break;
-          }
-        } while ( $out == "" );
-
-        set_socket_blocking ( $fp, true );
-
-        fputs ( $fp, "HELO $server_name\n" );
-        $output = fgets ( $fp, 2000 );
-        fputs ( $fp, "MAIL FROM: <info@" . $tld . ">\n" );
-        $output = fgets ( $fp, 2000 );
-        fputs ( $fp, "RCPT TO: <$email>\n" );            
-        $output = fgets ( $fp, 2000 );
-        if ( ereg ( "^250", $output ) ) {
-          $rc = "";
-        }
-        else {
-          $rc = $output;
-        }
 
-        fputs ( $fp, "QUIT\n" );
-        fclose( $fp );
+          fputs($fp, "QUIT\n");
+          fclose($fp);
 
-        if ($rc == "") {
-          break;
+          if ($rc == '') {
+            break;
           }
         }
       }
     }
   }
-return $rc;
+
+  return $rc;
 }
 
 function feedback_custom_footers() {
   global $user;
 
-  $edit = $_POST["edit"];
-  $site_name =  variable_get("site_name", "") ;
+  $edit = $_POST['edit'];
+  $site_name =  variable_get('site_name', '') ;
 
   $footer .= "\n----------------------------------";
-  if ( $site_name )
-    $footer .= "\nSite Name       : " . variable_get("site_name", "") ;
-  if ( $user->name )
-    $footer .= "\nRegistered name : " . $user->name;
-  if ( isset($edit['form_field_name']))
-    $footer .= "\nFull Name       : " . $edit['form_field_name'];
-  if ( isset($edit['form_field_email']))
-    $footer .= "\nE-mail address  : " . $edit['form_field_email'];
-  if ( isset($edit['form_field_postal']))
-    $footer .= "\nPostal address  : " . $edit['form_field_postal'];
-  if ( isset($edit['form_field_phone']))
-    $footer .= "\nPhone Number    : " . $edit['form_field_phone'];
-  if ( isset($edit['form_field_referer']))
-    $footer .= "\nReferring page  : " . $edit['form_field_referer'];
-  if ( isset($_SERVER['REMOTE_ADDR']))
-    $footer .= "\nIP Address      : " . 'http://whois.sc/' . $_SERVER['REMOTE_ADDR'];
-  if ( isset($_SERVER['REMOTE_HOST']))
-    $footer .= "\nMachine name    : " . $_SERVER['REMOTE_HOST'];
-  if ( isset($_SERVER['HTTP_USER_AGENT']))
-    $footer .= "\nBrowser info    : " . $_SERVER['HTTP_USER_AGENT'];
+  if ($site_name) {
+    $footer .= "\nSite Name       : ". variable_get('site_name', '') ;
+  }
+  if ($user->name) {
+    $footer .= "\nRegistered name : ". $user->name;
+  }
+  if (isset($edit['form_field_name'])) {
+    $footer .= "\nFull Name       : ". $edit['form_field_name'];
+  }
+  if (isset($edit['form_field_email'])) {
+    $footer .= "\nE-mail address  : ". $edit['form_field_email'];
+  }
+  if (isset($edit['form_field_postal'])) {
+    $footer .= "\nPostal address  : ". $edit['form_field_postal'];
+  }
+  if (isset($edit['form_field_phone'])) {
+    $footer .= "\nPhone Number    : ". $edit['form_field_phone'];
+  }
+  if (isset($edit['form_field_referer'])) {
+    $footer .= "\nReferring page  : ". $edit['form_field_referer'];
+  }
+  if (isset($_SERVER['REMOTE_ADDR'])) {
+    $footer .= "\nIP Address      : ". 'http://whois.sc/' . $_SERVER['REMOTE_ADDR'];
+  }
+  if (isset($_SERVER['REMOTE_HOST'])) {
+    $footer .= "\nMachine name    : ". $_SERVER['REMOTE_HOST'];
+  }
+  if (isset($_SERVER['HTTP_USER_AGENT'])) {
+    $footer .= "\nBrowser info    : ". $_SERVER['HTTP_USER_AGENT'];
+  }
 
   return $footer;
 }
 
 function feedback_custom_headers() {
-  $edit = $_POST["edit"];
+  $edit = $_POST['edit'];
 
-  $headers = "";
+  $headers = '';
 
-  $name = $edit["form_field_name"];
+  $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 .= "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";
 
   return $headers;
@@ -466,9 +474,9 @@
   $trans = array_flip($trans);
 
   $output  = t("-- The following message was sent using the feedback page --\n\n");
-  $output .= wordwrap(strip_tags($body),72);
+  $output .= wordwrap(strip_tags($body), 72);
 
-  $output = strtr(wordwrap(strip_tags($output),72), $trans);
+  $output = strtr(wordwrap(strip_tags($output), 72), $trans);
 
   return $output;
 }