? 100577-33.patch
? 100577-34.patch
? files/.htaccess
? sites/default/settings.php
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.100
diff -u -p -r1.100 contact.module
--- modules/contact/contact.module	13 Dec 2007 09:34:38 -0000	1.100
+++ modules/contact/contact.module	13 Dec 2007 17:12:21 -0000
@@ -12,11 +12,12 @@
 function contact_help($path, $arg) {
   switch ($path) {
     case 'admin/help#contact':
-      $output = '<p>'. t('The contact module enables the use of both personal and site-wide contact forms, facilitating easy communication within the community. While personal contact forms allow users to contact each other by e-mail, site-wide forms allow community members to contact site administrators. Users can specify a subject and message in the contact form, and also request that a copy of the e-mail be sent to their own address.') .'</p>';
-      $output .= '<p>'. t("Users can activate/deactivate their personal contact forms in their account settings. Upon activation, a contact tab will appear in their user profiles. Privileged users such as site administrators are able to contact users even if they have chosen not to enable this feature.") .'</p>';
-      $output .= '<p>'. t("Note that the contact tab will not appear when a user views his or her own profile; only when viewing another user's profile, if that user's contact form is enabled.") .'</p>';
-      $output .= '<p>'. t('If the menu module is enabled, a menu item linking to the site-wide contact page is added to the navigation block. It is disabled by default, but can be enabled via the <a href="@menu-module">menu management</a> page. Links to the contact page may also be added to the primary and secondary links using the same page.', array('@menu-module' => url('admin/build/menu'))) .'</p>';
-      $output .= '<p>'. t('For more information, please read the configuration and customization handbook page for the <a href="@contact">contact module</a>.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) .'</p>';
+      $output = '<p>'. t('The contact module facilitates communication via e-mail, by allowing your site\'s visitors to contact one another (personal contact forms), and by providing a simple way to direct messages to a set of administrator-defined recipients (the <a href="@contact">contact page</a>). With either form, users specify a subject, write their message, and (optionally) have a copy of their message sent to their own e-mail address.', array('@contact' => url('contact'))) .'</p>';
+      $output .= '<p>'. t("Personal contact forms allow users to be contacted via e-mail, while keeping e-mail addresses private. Users may enable or disable their personal contact forms by editing their <em>My account</em> page. If enabled, a <em>Contact</em> tab leading to their personal contact form is available on their user profile. Site administrators may access all personal contact forms (even if they have been disabled). The <em>Contact</em> tab is only visible when viewing another user's profile (users do not see their own <em>Contact</em> tab).") .'</p>';
+      $output .= '<p>'. t('The <a href="@contact">contact page</a> provides a simple form for visitors to leave comments, feedback, or other requests. Messages are routed by selecting a category from a list of administrator-defined options; each category may be configured with its own set of e-mail recipients. Like personal contact forms, actual e-mail addresses used by the <a href="@contact">contact page</a> are not displayed. A business site, for example, may use categories to direct messages marked as "Website feedback" to an e-mail list of web site administrators, while messages marked as "Product information" are forwarded to members of the sales department. Only users in roles with the <em>access site-wide contact form</em> permission may access the <a href="@contact">contact page</a>.', array('@contact' => url('contact'))) .'</p>';
+      $output .= '<p>'. t('A link to your site\'s <a href="@contact">contact page</a> from the main <em>Navigation</em> menu may be enabled on the <a href="@navigation-menu">navigation menu settings page</a>. A similar link may be created on another menu by adding a menu item pointing to the path "contact"', array('@contact' => url('contact'), '@navigation-menu' => url('admin/build/menu-customize/navigation'))) .'</p>';
+      $output .= '<p>'. t('The <a href="@contact-settings">contact form settings page</a> allows the <a href="@contact">contact page</a> to be customized with additional information (like a physical address, mailing address, or telephone number). The <em>Hourly threshold</em> setting sets the maximum number of contact form submissions a user may perform per hour. The <em>Enable personal contact forms by default</em> determines if users\' personal contact forms are enabled by default.', array('@contact-settings' => url('admin/build/contact'), '@contact' => url('contact'))) .'</p>';
+      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@handbook">Contact page</a>.', array('@handbook' => 'http://drupal.org/handbook/modules/contact')) .'</p>';
       return $output;
     case 'admin/build/contact':
       $output = '<p>'. t('This page lets you set up <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'</p>';
