From 3141d02c2fbbfb1d7684b0de9c3e7adb7f338f3a Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 14 Nov 2005 22:23:11 +0000
Subject: [PATCH] - Patch #28062 by Souvent22: make it possible to assign
weights to contact form categories and fixed some small glitches.
---
database/database.mysql | 2 ++
database/database.pgsql | 2 ++
database/updates.inc | 21 +++++++++++++++++--
modules/contact.module | 37 ++++++++++++++++++++--------------
modules/contact/contact.module | 37 ++++++++++++++++++++--------------
5 files changed, 67 insertions(+), 32 deletions(-)
diff --git a/database/database.mysql b/database/database.mysql
index c70982086d54..5449d420a416 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -208,6 +208,8 @@ CREATE TABLE contact (
category varchar(255) NOT NULL default '',
recipients longtext NOT NULL default '',
reply longtext NOT NULL default '',
+ weight tinyint(3) NOT NULL default '0',
+ selected tinyint(1) NOT NULL default '0',
PRIMARY KEY (cid),
UNIQUE KEY category (category)
) TYPE=MyISAM;
diff --git a/database/database.pgsql b/database/database.pgsql
index 2c7e45b9c9d5..0b4139a734d5 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -203,6 +203,8 @@ CREATE TABLE contact (
category varchar(255) NOT NULL default '',
recipients text NOT NULL default '',
reply text NOT NULL default '',
+ weight smallint NOT NULL default '0',
+ selected smallint NOT NULL default '0',
PRIMARY KEY (cid),
UNIQUE (category)
);
diff --git a/database/updates.inc b/database/updates.inc
index 20e11e835727..8463ddc3e8c4 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -103,7 +103,8 @@
"2005-10-15" => "update_150",
"2005-10-23" => "update_151",
"2005-10-28" => "update_152",
- "2005-11-03" => "update_153"
+ "2005-11-03" => "update_153",
+ "2005-11-14" => "update_154"
);
function update_110() {
@@ -1128,7 +1129,7 @@ function update_153(){
case 'pgsql':
$ret[] = update_sql("ALTER TABLE {contact} DROP CONSTRAINT {contact}_pkey");
$ret[] = update_sql("CREATE SEQUENCE {contact}_cid_seq");
- db_add_column($ret, 'contact', 'cid', 'integer', array('not null' => TRUE, 'default' => "nextval('{contact}_cid_seq')"));
+ db_add_column($ret, 'contact', 'cid', 'int', array('not null' => TRUE, 'default' => "nextval('{contact}_cid_seq')"));
$ret[] = update_sql("ALTER TABLE {contact} ADD PRIMARY KEY (cid)");
$ret[] = update_sql("ALTER TABLE {contact} ADD CONSTRAINT {contact}_category_key UNIQUE (category)");
break;
@@ -1142,6 +1143,22 @@ function update_153(){
return $ret;
}
+function update_154() {
+ $ret = array();
+ switch ($GLOBALS['db_type']) {
+ case 'pgsql':
+ db_add_column($ret, 'contact', 'weight', 'smallint', array('not null' => TRUE, 'default' => 0));
+ db_add_column($ret, 'contact', 'selected', 'smallint', array('not null' => TRUE, 'default' => 0));
+ break;
+ case 'mysql':
+ case 'mysqli':
+ $ret[] = update_sql("ALTER TABLE {contact} ADD COLUMN weight tinyint(3) NOT NULL DEFAULT 0");
+ $ret[] = update_sql("ALTER TABLE {contact} ADD COLUMN selected tinyint(1) NOT NULL DEFAULT 0");
+ break;
+ }
+ return $ret;
+}
+
/**
diff --git a/modules/contact.module b/modules/contact.module
index f86a43522804..ec4aa7c51776 100644
--- a/modules/contact.module
+++ b/modules/contact.module
@@ -87,7 +87,6 @@ function contact_user($type, $edit, &$user, $category = NULL) {
$form['contact'] = array('#type' => 'fieldset', '#title' => t('Contact settings'), '#weight' => 5, '#collapsible' => TRUE);
$form['contact']['contact'] = array('#type' => 'checkbox', '#title' => t('Personal contact form'), '#default_value' => $edit['contact'], '#description' => t('Allow other users to contact you by e-mail via <a href="%url">your personal contact form</a>. Note that your e-mail address is not made public and that privileged users such as site administrators are able to contact you even if you choose not to enable this feature.', array('%url' => url("user/$user->uid/contact"))));
return $form;
- //return array(array('title' => t('Contact settings'), 'data' => drupal_get_form('contact_user', $form), 'weight' => 2));
}
if ($type == 'validate') {
return array('contact' => $edit['contact']);
@@ -188,28 +187,33 @@ function contact_admin_edit($cid = NULL) {
if (!form_get_errors()) {
db_query("DELETE FROM {contact} WHERE cid = %d", $cid);
- db_query("INSERT INTO {contact} (category, recipients, reply) VALUES ('%s', '%s', '%s')", $edit['category'], $edit['recipients'], $edit['reply']);
+ db_query("INSERT INTO {contact} (category, recipients, reply, weight, selected) VALUES ('%s', '%s', '%s', %d, %d)", $edit['category'], $edit['recipients'], $edit['reply'], $edit['weight'], $edit['selected']);
+ drupal_set_message(t('Category %category has been updated.', array('%category' => theme('placeholder', $edit['category']))));
drupal_goto('admin/contact');
}
}
else {
$category = db_fetch_object(db_query("SELECT * FROM {contact} WHERE cid = %d", $cid));
- $edit['cid'] = $category->cid;
+ $edit['cid'] = $category->cid;
$edit['category'] = $category->category;
$edit['recipients'] = $category->recipients;
$edit['reply'] = $category->reply;
+ $edit['weight'] = $category->weight;
+ $edit['selected'] = $category->selected;
}
$form['category'] = array('#type' => 'textfield', '#title' => t('Category'), '#maxlength' => 255, '#default_value' => $edit['category'], '#description' => t("Example: 'website feedback' or 'product information'."), '#required' => TRUE);
$form['recipients'] = array('#type' => 'textarea', '#title' => t('Recipients'), '#default_value' => $edit['recipients'], '#description' => t("Example: 'webmaster@yoursite.com' or 'sales@yoursite.com'. To specify multiple repecients, separate each e-mail address with a comma."), '#required' => TRUE);
$form['reply'] = array('#type' => 'textarea', '#title' => t('Auto-reply'), '#default_value' => $edit['reply'], '#description' => t("Optional auto-reply. Leave empty if you don't want to send the user an auto-reply message."));
+ $form['weight'] = array('#type' => 'weight', '#title' => t('Weight'), '#default_value' => $edit['weight'], '#description' => t('When listing categories, those with with light (small) weights get listed before categories with heavier (larger) weights. Categories with equal weights are sorted alphabetically.'));
+ $form['selected'] = array('#type' => 'select', '#title' => t('Selected'), '#options' => array('0' => t('No'), '1' => t('Yes')), '#default_value' => $edit['selected'], '#description' => t('Set this to <em>Yes</em> if you would like this category to be selected by default.'));
$form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
return drupal_get_form('contact_admin_edit', $form);
}
function contact_admin_delete($cid) {
- $info = db_fetch_object(db_query("SELECT cid, category FROM {contact} WHERE cid = %d",$cid));
+ $info = db_fetch_object(db_query("SELECT cid, category FROM {contact} WHERE cid = %d", $cid));
if ($_POST['op'] != t('Delete')) {
return confirm_form('contact_admin_delete', array(),
t('Are you sure you want to delete %category?', array('%category' => theme('placeholder', $info->category))),
@@ -226,12 +230,12 @@ function contact_admin_delete($cid) {
function contact_admin() {
- $result = db_query('SELECT cid, category, recipients FROM {contact} ORDER BY category');
+ $result = db_query('SELECT cid, category, recipients, selected FROM {contact} ORDER BY weight, category');
$rows = array();
while ($category = db_fetch_object($result)) {
- $rows[] = array($category->category, $category->recipients, l(t('edit'), 'admin/contact/edit/'. $category->cid), l(t('delete'), 'admin/contact/delete/'. $category->cid));
+ $rows[] = array($category->category, $category->recipients, ($category->selected ? t('Yes') : t('No')), l(t('edit'), 'admin/contact/edit/'. $category->cid), l(t('delete'), 'admin/contact/delete/'. $category->cid));
}
- $header = array(t('Category'), t('Recipients'), array('data' => t('Operations'), 'colspan' => 2));
+ $header = array(t('Category'), t('Recipients'), t('Selected'), array('data' => t('Operations'), 'colspan' => 2));
return theme('table', $header, $rows);
}
@@ -247,10 +251,13 @@ function contact_mail_page() {
$edit['mail'] = $user->mail;
}
- $result = db_query('SELECT category FROM {contact} ORDER BY category');
+ $result = db_query('SELECT cid, category, selected FROM {contact} ORDER BY weight, category');
$categories[] = '--';
while ($category = db_fetch_object($result)) {
- $categories[$category->category] = $category->category;
+ $categories[$category->cid] = $category->category;
+ if ($category->selected) {
+ $default_category = $category->cid;
+ }
}
if (count($categories) > 1) {
@@ -260,7 +267,7 @@ function contact_mail_page() {
$form['mail'] = array('#type' => 'textfield', '#title' => t('Your e-mail address'), '#maxlength' => 255, '#default_value' => $edit['mail'], '#required' => TRUE);
$form['subject'] = array('#type' => 'textfield', '#title' => t('Subject'), '#maxlength' => 255, '#default_value' => $edit['subject'], '#required' => TRUE);
if (count($categories) > 2) {
- $form['category'] = array('#type' => 'select', '#title' => t('Category'), '#size' => 60, '#maxlength' => 255, '#default_value' => $edit['category'], '#options' => $categories, '#required' => TRUE);
+ $form['cid'] = array('#type' => 'select', '#title' => t('Category'), '#default_value' => $default_category, '#options' => $categories, '#required' => TRUE);
}
$form['message'] = array('#type' => 'textarea', '#title' => t('Message'), '#default_value' => $edit['message'], '#required' => TRUE);
$form['copy'] = array('#type' => 'checkbox', '#title' => t('Send me a copy.'), '#default_value' => $edit['copy']);
@@ -277,7 +284,7 @@ function contact_mail_page() {
function contact_mail_page_validate($form_id, &$form) {
global $form_values;
- if (!$form['category']) {
+ if (!$form['cid']) {
// Look if there is only one category
$result = db_query('SELECT category FROM {contact}');
if (db_num_rows($result) == 1) {
@@ -304,15 +311,15 @@ function contact_mail_page_execute($form_id, $edit) {
$message[$key] = wordwrap($value);
}
+ // Load the category information:
+ $contact = db_fetch_object(db_query("SELECT * FROM {contact} WHERE cid = %d", $edit['cid']));
+
// Format the category:
- $subject = '['. $edit['category'] .'] '. $edit['subject'];
+ $subject = '['. $contact->category .'] '. $edit['subject'];
// Prepare the body:
$body = implode("\n\n", $message);
- // Load the category information:
- $contact = db_fetch_object(db_query("SELECT * FROM {contact} WHERE category = '%s'", $edit['category']));
-
// Send the e-mail to the recipients:
user_mail($contact->recipients, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index f86a43522804..ec4aa7c51776 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -87,7 +87,6 @@ function contact_user($type, $edit, &$user, $category = NULL) {
$form['contact'] = array('#type' => 'fieldset', '#title' => t('Contact settings'), '#weight' => 5, '#collapsible' => TRUE);
$form['contact']['contact'] = array('#type' => 'checkbox', '#title' => t('Personal contact form'), '#default_value' => $edit['contact'], '#description' => t('Allow other users to contact you by e-mail via <a href="%url">your personal contact form</a>. Note that your e-mail address is not made public and that privileged users such as site administrators are able to contact you even if you choose not to enable this feature.', array('%url' => url("user/$user->uid/contact"))));
return $form;
- //return array(array('title' => t('Contact settings'), 'data' => drupal_get_form('contact_user', $form), 'weight' => 2));
}
if ($type == 'validate') {
return array('contact' => $edit['contact']);
@@ -188,28 +187,33 @@ function contact_admin_edit($cid = NULL) {
if (!form_get_errors()) {
db_query("DELETE FROM {contact} WHERE cid = %d", $cid);
- db_query("INSERT INTO {contact} (category, recipients, reply) VALUES ('%s', '%s', '%s')", $edit['category'], $edit['recipients'], $edit['reply']);
+ db_query("INSERT INTO {contact} (category, recipients, reply, weight, selected) VALUES ('%s', '%s', '%s', %d, %d)", $edit['category'], $edit['recipients'], $edit['reply'], $edit['weight'], $edit['selected']);
+ drupal_set_message(t('Category %category has been updated.', array('%category' => theme('placeholder', $edit['category']))));
drupal_goto('admin/contact');
}
}
else {
$category = db_fetch_object(db_query("SELECT * FROM {contact} WHERE cid = %d", $cid));
- $edit['cid'] = $category->cid;
+ $edit['cid'] = $category->cid;
$edit['category'] = $category->category;
$edit['recipients'] = $category->recipients;
$edit['reply'] = $category->reply;
+ $edit['weight'] = $category->weight;
+ $edit['selected'] = $category->selected;
}
$form['category'] = array('#type' => 'textfield', '#title' => t('Category'), '#maxlength' => 255, '#default_value' => $edit['category'], '#description' => t("Example: 'website feedback' or 'product information'."), '#required' => TRUE);
$form['recipients'] = array('#type' => 'textarea', '#title' => t('Recipients'), '#default_value' => $edit['recipients'], '#description' => t("Example: 'webmaster@yoursite.com' or 'sales@yoursite.com'. To specify multiple repecients, separate each e-mail address with a comma."), '#required' => TRUE);
$form['reply'] = array('#type' => 'textarea', '#title' => t('Auto-reply'), '#default_value' => $edit['reply'], '#description' => t("Optional auto-reply. Leave empty if you don't want to send the user an auto-reply message."));
+ $form['weight'] = array('#type' => 'weight', '#title' => t('Weight'), '#default_value' => $edit['weight'], '#description' => t('When listing categories, those with with light (small) weights get listed before categories with heavier (larger) weights. Categories with equal weights are sorted alphabetically.'));
+ $form['selected'] = array('#type' => 'select', '#title' => t('Selected'), '#options' => array('0' => t('No'), '1' => t('Yes')), '#default_value' => $edit['selected'], '#description' => t('Set this to <em>Yes</em> if you would like this category to be selected by default.'));
$form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
return drupal_get_form('contact_admin_edit', $form);
}
function contact_admin_delete($cid) {
- $info = db_fetch_object(db_query("SELECT cid, category FROM {contact} WHERE cid = %d",$cid));
+ $info = db_fetch_object(db_query("SELECT cid, category FROM {contact} WHERE cid = %d", $cid));
if ($_POST['op'] != t('Delete')) {
return confirm_form('contact_admin_delete', array(),
t('Are you sure you want to delete %category?', array('%category' => theme('placeholder', $info->category))),
@@ -226,12 +230,12 @@ function contact_admin_delete($cid) {
function contact_admin() {
- $result = db_query('SELECT cid, category, recipients FROM {contact} ORDER BY category');
+ $result = db_query('SELECT cid, category, recipients, selected FROM {contact} ORDER BY weight, category');
$rows = array();
while ($category = db_fetch_object($result)) {
- $rows[] = array($category->category, $category->recipients, l(t('edit'), 'admin/contact/edit/'. $category->cid), l(t('delete'), 'admin/contact/delete/'. $category->cid));
+ $rows[] = array($category->category, $category->recipients, ($category->selected ? t('Yes') : t('No')), l(t('edit'), 'admin/contact/edit/'. $category->cid), l(t('delete'), 'admin/contact/delete/'. $category->cid));
}
- $header = array(t('Category'), t('Recipients'), array('data' => t('Operations'), 'colspan' => 2));
+ $header = array(t('Category'), t('Recipients'), t('Selected'), array('data' => t('Operations'), 'colspan' => 2));
return theme('table', $header, $rows);
}
@@ -247,10 +251,13 @@ function contact_mail_page() {
$edit['mail'] = $user->mail;
}
- $result = db_query('SELECT category FROM {contact} ORDER BY category');
+ $result = db_query('SELECT cid, category, selected FROM {contact} ORDER BY weight, category');
$categories[] = '--';
while ($category = db_fetch_object($result)) {
- $categories[$category->category] = $category->category;
+ $categories[$category->cid] = $category->category;
+ if ($category->selected) {
+ $default_category = $category->cid;
+ }
}
if (count($categories) > 1) {
@@ -260,7 +267,7 @@ function contact_mail_page() {
$form['mail'] = array('#type' => 'textfield', '#title' => t('Your e-mail address'), '#maxlength' => 255, '#default_value' => $edit['mail'], '#required' => TRUE);
$form['subject'] = array('#type' => 'textfield', '#title' => t('Subject'), '#maxlength' => 255, '#default_value' => $edit['subject'], '#required' => TRUE);
if (count($categories) > 2) {
- $form['category'] = array('#type' => 'select', '#title' => t('Category'), '#size' => 60, '#maxlength' => 255, '#default_value' => $edit['category'], '#options' => $categories, '#required' => TRUE);
+ $form['cid'] = array('#type' => 'select', '#title' => t('Category'), '#default_value' => $default_category, '#options' => $categories, '#required' => TRUE);
}
$form['message'] = array('#type' => 'textarea', '#title' => t('Message'), '#default_value' => $edit['message'], '#required' => TRUE);
$form['copy'] = array('#type' => 'checkbox', '#title' => t('Send me a copy.'), '#default_value' => $edit['copy']);
@@ -277,7 +284,7 @@ function contact_mail_page() {
function contact_mail_page_validate($form_id, &$form) {
global $form_values;
- if (!$form['category']) {
+ if (!$form['cid']) {
// Look if there is only one category
$result = db_query('SELECT category FROM {contact}');
if (db_num_rows($result) == 1) {
@@ -304,15 +311,15 @@ function contact_mail_page_execute($form_id, $edit) {
$message[$key] = wordwrap($value);
}
+ // Load the category information:
+ $contact = db_fetch_object(db_query("SELECT * FROM {contact} WHERE cid = %d", $edit['cid']));
+
// Format the category:
- $subject = '['. $edit['category'] .'] '. $edit['subject'];
+ $subject = '['. $contact->category .'] '. $edit['subject'];
// Prepare the body:
$body = implode("\n\n", $message);
- // Load the category information:
- $contact = db_fetch_object(db_query("SELECT * FROM {contact} WHERE category = '%s'", $edit['category']));
-
// Send the e-mail to the recipients:
user_mail($contact->recipients, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
--
GitLab