Index: contact_field.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_field.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 contact_field.info --- contact_field.info 16 Mar 2010 13:18:54 -0000 1.1.2.1 +++ contact_field.info 28 May 2010 04:44:17 -0000 @@ -1,6 +1,8 @@ -;$Id: contact_field.info,v 1.1.2.1 2010/03/16 13:18:54 beautifulmind Exp $ +;$Id$ name = Contact fields description = Add custom fields to site wide contact form package = Contact fields -core = 6.x -dependencies[] = contact \ No newline at end of file +core = 7.x +dependencies[] = contact +files[] = contact_field.install +files[] = contact_field.module Index: contact_field.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_field.install,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 contact_field.install --- contact_field.install 16 Mar 2010 13:18:54 -0000 1.1.2.1 +++ contact_field.install 28 May 2010 04:44:17 -0000 @@ -16,7 +16,6 @@ * @author Bhavin H. Joshi */ function contact_field_install() { - drupal_install_schema('contact_field'); } @@ -26,11 +25,9 @@ function contact_field_install() { * @author Bhavin H. Joshi */ function contact_field_uninstall() { - drupal_uninstall_schema('contact_field'); } - function contact_field_schema() { $schema = array(); $schema['contact_fields'] = array( @@ -74,4 +71,4 @@ function contact_field_schema() { 'primary key' => array('field_name'), ); return $schema; -} \ No newline at end of file +} Index: contact_field.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_field.module,v retrieving revision 1.1.2.14 diff -u -p -r1.1.2.14 contact_field.module --- contact_field.module 23 Apr 2010 12:35:17 -0000 1.1.2.14 +++ contact_field.module 28 May 2010 04:44:18 -0000 @@ -1,6 +1,5 @@ */ - - /** * Implementation of hook_menu * @@ -20,7 +17,11 @@ */ function contact_field_menu() { $item = array(); - $item['admin/build/contact/manage'] = array( + $item['admin/structure/contact/settings'] = array( + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'title' => 'Settings', + ); + $item['admin/structure/contact/manage'] = array( 'type' => MENU_LOCAL_TASK, 'title' => "Manage fields", 'title callback' => 't', @@ -31,7 +32,7 @@ function contact_field_menu() { 'weight' => 49, ); - $item['admin/build/contact/add/%'] = array( + $item['admin/structure/contact/add/%'] = array( 'type' => MENU_CALLBACK, 'page callback' => 'contact_field_add_field', 'page arguments' => array(3, 4), @@ -40,7 +41,7 @@ function contact_field_menu() { 'file path' => drupal_get_path('module', 'contact_field'), ); - $item['admin/build/contact/%/edit'] = array( + $item['admin/structure/contact/%/edit'] = array( 'type' => MENU_CALLBACK, 'page callback' => 'contact_field_add_field', 'page arguments' => array(3), @@ -49,7 +50,7 @@ function contact_field_menu() { 'file path' => drupal_get_path('module', 'contact_field'), ); - $item['admin/build/contact/%/delete'] = array( + $item['admin/structure/contact/%/delete'] = array( 'type' => MENU_CALLBACK, 'page callback' => 'contact_field_delete_field', 'page arguments' => array(3), @@ -59,30 +60,23 @@ function contact_field_menu() { return $item; } - - /** - * Implementation of hook_form_alter + * Implementation of hook_form_FORM_ID_alter(). * * @param $form * @param $form_state * @author Bhavin H. Joshi */ -function contact_field_form_alter(&$form, $form_state, $form_id) { - if (strstr($form_id, 'contact_mail') && $form_id !== 'contact_mail_user') { - $am__elements = _get_field_details(); - if (!empty($am__elements)) { - foreach ($am__elements as $name => $value) { - $form[$name] = $value; - } - } - $form['submit']['#weight'] = 10; - } +function contact_field_form_contact_site_form_alter(&$form, $form_state, $form_id) { + $am__elements = _get_field_details(); + if (!empty($am__elements)) { + foreach ($am__elements as $name => $value) { + $form[$name] = $value; + } + } + $form['submit']['#weight'] = 10; } - - - /** * contact_field_validate * @@ -93,11 +87,14 @@ function contact_field_form_alter(&$form * @author Bhavin H. Joshi */ function contact_field_validate($form, $form_state) { - $ss__field_exist = db_result(db_query("SELECT field_type FROM {contact_fields} - WHERE field_name = '%s'", $form_state['values']['contact_field_name'])); - if ($ss__field_exist) { - form_set_error('contact_field_name', t("A contact field with the same name already exists.")); - } + $ss__field_exist = db_query( + "SELECT field_type FROM {contact_fields} WHERE field_name = :field_name", + array(':field_name' => $form_state['values']['contact_field_name']) + ); + + if ($ss__field_exist->fetchCol()) { + form_set_error('contact_field_name', t("A contact field with the same name already exists.")); + } } /** @@ -107,8 +104,9 @@ function contact_field_validate($form, $ * @author Bhavin H. Joshi */ function _get_field_details() { + $am__field = array(); $r__result = db_query("SELECT * FROM {contact_fields} WHERE enabled = 1"); - while($om__result = db_fetch_object($r__result)) { + foreach ($r__result as $om__result) { $am__settings = unserialize($om__result->settings); $am__field[$om__result->field_name] = array( '#type' => $om__result->field_type, @@ -117,14 +115,12 @@ function _get_field_details() { '#weight' => $om__result->weight, ); foreach ($am__settings as $key => $value) { - $am__field[$om__result->field_name]["#". $key] = $value; + $am__field[$om__result->field_name]["#". $key] = $value; } } return $am__field; } - - /** * contact_field_delete_field * @@ -133,32 +129,31 @@ function _get_field_details() { * @author Bhavin H. Joshi */ function contact_field_delete_field($ss__field_name) { - if ($ss__field_name) { - db_query("DELETE FROM {contact_fields} WHERE field_name = '%s'", $ss__field_name); - drupal_goto("admin/build/contact/manage"); - } - + if ($ss__field_name) { + db_query("DELETE FROM {contact_fields} WHERE field_name = :field_name", array(':field_name' => $ss__field_name)); + drupal_goto("admin/structure/contact/manage"); + } } - - /** * * @param string $ss__field */ function contact_field_edit_field($ss__field) { - if ($ss__field) { - module_load_include('inc', 'contact_field', 'contact_field_admin'); - $ss__field_type = db_result(db_query("SELECT field_type FROM {contact_fields} - WHERE field_name = '%s'", $ss__field)); - switch($ss__field_type) { - case 'textfield': - return drupal_get_form('contact_field_add_field_text_form', $form_state, $ss__field, TRUE); - } - } + if ($ss__field) { + module_load_include('inc', 'contact_field', 'contact_field_admin'); + $result = db_query( + "SELECT field_type FROM {contact_fields} WHERE field_name = :field_name", + array(':field_name' => $ss__field) + ); + $ss__field_type = $result->fetchField(); + switch($ss__field_type) { + case 'textfield': + return drupal_get_form('contact_field_add_field_text_form', $form_state, $ss__field, TRUE); + } + } } - /** * _get_field_values * @@ -168,25 +163,28 @@ function contact_field_edit_field($ss__f * @author Bhavin H. Joshi */ function _get_field_values($ss__field) { - if ($ss__field) { - $r__result_field = db_query("SELECT * FROM {contact_fields} WHERE - field_name = '%s'", $ss__field); - while ($om__result_field = db_fetch_object($r__result_field)) { - $am__field = unserialize($om__result_field->settings); - $am__field_value['name'] = $om__result_field->field_name; - $am__field_value['title'] = $am__field['title']; - $am__field_value['weight'] = $om__result_field->weight; - $am__field_value['required'] = $om__result_field->required; - $am__field_value['enabled'] = $om__result_field->enabled; - foreach ($am__field as $key => $value) { - $am__field_value[$key] = $value; - } - } - return $am__field_value; - } -} + if ($ss__field) { + $am__field_value = array(); + $r__result_field = db_query( + "SELECT * FROM {contact_fields} WHERE field_name = :field_name", + array(':field_name' => $ss__field) + ); + foreach ($r__result_field as $om__result_field) { + $am__field = unserialize($om__result_field->settings); + $am__field_value['name'] = $om__result_field->field_name; + $am__field_value['title'] = $am__field['title']; + $am__field_value['weight'] = $om__result_field->weight; + $am__field_value['required'] = $om__result_field->required; + $am__field_value['enabled'] = $om__result_field->enabled; + foreach ($am__field as $key => $value) { + $am__field_value[$key] = $value; + } + } + return $am__field_value; + } +} /** * contact_field_filter_xss @@ -197,10 +195,9 @@ function _get_field_values($ss__field) { * @author Bhavin H. Joshi */ function contact_field_filter_xss($ss__string) { - return filter_xss($ss__string, _contact_field_allowed_tags()); + return filter_xss($ss__string, _contact_field_allowed_tags()); } - /** * _contact_field_allowed_tags * @@ -209,10 +206,9 @@ function contact_field_filter_xss($ss__s * @author Bhavin H. Joshi */ function _contact_field_allowed_tags() { - return array('a', 'b', 'big', 'code', 'del', 'em', 'i', 'ins', 'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img'); + return array('a', 'b', 'big', 'code', 'del', 'em', 'i', 'ins', 'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img'); } - /** * _get_field_type * @@ -222,10 +218,15 @@ function _contact_field_allowed_tags() { * @author Bhavin H. Joshi */ function _get_field_type($ss__field_name) { - return db_result(db_query("SELECT field_type FROM {contact_fields} - WHERE field_name = '%s'", $ss__field_name)); -} + $result = db_query( + "SELECT field_type FROM {contact_fields} WHERE field_name = :field_name", + array(':field_name' => $ss__field_name) + ); + + $result = $result->fetchCol(); + return $result[0]; +} /** * Implementation of hook_mail_alter @@ -233,26 +234,26 @@ function _get_field_type($ss__field_name * @param unknown_type $message * @author Bhavin H. Joshi */ -function contact_field_mail_alter($message) { - if ($message['id'] == "contact_page_mail") { - $am__fields = _get_enabled_fields(); - if (!variable_get("contact_field_use_template", 0)) { - $ss__addtional = t("Addtional information") ."\n\r"; - foreach ($am__fields as $field => $lable) { - if (is_array($message['params'][$field])) { - $ss__addtional .= $label ."\n\r"; - foreach ($message['params'][$field] as $key => $value) { - $ss__addtional .= $key .": ". $value ."\n\r"; - } - } - else { - $ss__addtional .= $lable .": \t". $message['params'][$field] ."\n\r"; - } - } - $message['body'][] = "\n\r". $ss__addtional; - } - else { - foreach ($am__fields as $field => $lable) { +function contact_field_mail_alter(&$message) { + if ($message['id'] == "contact_page_mail") { + $am__fields = _get_enabled_fields(); + if (!variable_get("contact_field_use_template", 0)) { + $ss__addtional = t("Addtional information") ."\n\r"; + foreach ($am__fields as $field => $lable) { + if (is_array($message['params'][$field])) { + $ss__addtional .= $label ."\n\r"; + foreach ($message['params'][$field] as $key => $value) { + $ss__addtional .= $key .": ". $value ."\n\r"; + } + } + else { + $ss__addtional .= $lable .": \t". $message['params'][$field] ."\n\r"; + } + } + $message['body'][] = "\n\r". $ss__addtional; + } + else { + foreach ($am__fields as $field => $lable) { if (is_array($message['params'][$field])) { foreach ($message['params'][$field] as $key => $value) { $am__value[$field] = $value; @@ -264,8 +265,8 @@ function contact_field_mail_alter($messa } $am__value['message'] = check_plain($message['body'][1]); $message['body'][1] = t(variable_get("contact_field_message_template", ""), $am__value); - } - } + } + } } @@ -277,10 +278,11 @@ function contact_field_mail_alter($messa * @author Bhavin H. Joshi */ function _get_enabled_fields() { - $r__result = db_query("SELECT field_name, settings FROM {contact_fields} WHERE enabled = 1"); - while ($om__result = db_fetch_object($r__result)) { - $am__settings = unserialize($om__result->settings); - $am__field[$om__result->field_name] = $am__settings['title']; - } - return $am__field; -} \ No newline at end of file + $r__result = db_query("SELECT field_name, settings FROM {contact_fields} WHERE enabled = 1"); + foreach ($r__result as $om__result) { + $am__settings = unserialize($om__result->settings); + $am__field[$om__result->field_name] = $am__settings['title']; + } + return $am__field; +} + Index: contact_field_admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_field_admin.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 contact_field_admin.inc --- contact_field_admin.inc 26 Mar 2010 10:58:00 -0000 1.1.2.5 +++ contact_field_admin.inc 28 May 2010 04:44:18 -0000 @@ -9,7 +9,6 @@ * @author Bhavin H. Joshi */ - /** * * @param $ss__type @@ -17,59 +16,59 @@ * @author Bhavin H. Joshi */ function contact_field_add_field($op, $ss__type = NULL) { - if ($op != 'add') { - $ss__field_type = _get_field_type($op); - switch($ss__field_type) { - case 'textfield': - if (module_exists('contact_textfield')) { - return drupal_get_form('contact_field_add_field_text_form', $op); - } - break; - case 'textarea': - if (module_exists('contact_textfield')) { - return drupal_get_form('contact_field_add_field_textarea_form', $op); - } - break; - case 'radios': - case 'checkboxes': - if (module_exists('contact_option')) { - return drupal_get_form('contact_field_add_field_option_form', $op); - } - break; - case 'select': - if (module_exists('contact_listfield')) { - return drupal_get_form('contact_field_add_field_listfield_form', $op); - } - break; - } - } - else{ - switch($ss__type) { - case 'text': - if (module_exists('contact_textfield')) { - return drupal_get_form('contact_field_add_field_text_form', $form_state); - } - break; - case 'area': - if (module_exists('contact_textfield')) { - return drupal_get_form('contact_field_add_field_textarea_form', $form_state); - } - break; - case 'option': - if (module_exists('contact_option')) { - return drupal_get_form('contact_field_add_field_option_form', $form_state); - } - break; - case 'list': - if (module_exists('contact_listfield')) { - return drupal_get_form('contact_field_add_field_listfield_form', $form_state); - } - break; - } - } + if ($op != 'add') { + $ss__field_type = _get_field_type($op); + switch($ss__field_type) { + case 'textfield': + if (module_exists('contact_textfield')) { + return drupal_get_form('contact_field_add_field_text_form', $op); + } + break; + case 'textarea': + if (module_exists('contact_textfield')) { + return drupal_get_form('contact_field_add_field_textarea_form', $op); + } + break; + case 'radios': + case 'checkboxes': + if (module_exists('contact_option')) { + return drupal_get_form('contact_field_add_field_option_form', $op); + } + break; + case 'select': + if (module_exists('contact_listfield')) { + return drupal_get_form('contact_field_add_field_listfield_form', $op); + } + break; + } + } + else{ + $form_state = NULL; + switch($ss__type) { + case 'text': + if (module_exists('contact_textfield')) { + return drupal_get_form('contact_field_add_field_text_form', $form_state); + } + break; + case 'area': + if (module_exists('contact_textfield')) { + return drupal_get_form('contact_field_add_field_textarea_form', $form_state); + } + break; + case 'option': + if (module_exists('contact_option')) { + return drupal_get_form('contact_field_add_field_option_form', $form_state); + } + break; + case 'list': + if (module_exists('contact_listfield')) { + return drupal_get_form('contact_field_add_field_listfield_form', $form_state); + } + break; + } + } } - /** * * @return unknown_type @@ -77,28 +76,31 @@ function contact_field_add_field($op, $s */ function contact_field_list_field() { drupal_set_title(t("Manage fields")); - $am__fields = module_invoke_all('info'); + $am__fields = module_invoke_all('info'); $output = _get_fields(); $links = array(); if (!empty($am__fields)) { - foreach ($am__fields as $key => $value) { - $links[] = array( - 'href' => 'admin/build/contact/add/'. $value['type'], - 'title' => t("Add a") ." ". $value['title'], - 'description' => $value['description'], - ); - } - $output .= theme('links', $links, ''); + foreach ($am__fields as $key => $value) { + $links[] = array( + 'href' => 'admin/structure/contact/add/'. $value['type'], + 'title' => t("Add a") ." ". $value['title'], + 'description' => $value['description'], + ); + } + $output .= theme('links', array('links' => $links)); } else { - drupal_set_message(t("No contact form field module is enabled. Please enable from !module", - array('!module' => l(t("module page"), 'admin/build/modules'))), 'error'); + drupal_set_message( + t("No contact form field module is enabled. Please enable from !module", + array('!module' => l(t("module page"), 'admin/modules')) + ), + 'error' + ); } return $output; } - /** * _get_fields * @@ -108,10 +110,18 @@ function contact_field_list_field() { * @author Bhavin H. Joshi */ function _get_fields() { - $header = array(t("Title"), t("Name"), t("Type"), t("Required"), - t("Enabled"), array('data' => t("Operation"), 'colspan' => 2)); + $rows = array(); + $header = array( + t("Title"), + t("Name"), + t("Type"), + t("Required"), + t("Enabled"), + array('data' => t("Operation"), 'colspan' => 2) + ); + $r__result = db_query("SELECT * FROM {contact_fields}"); - while ($om__result = db_fetch_object($r__result)) { + foreach ($r__result as $om__result) { $am__settings = unserialize($om__result->settings); $row = array( $am__settings['title'], @@ -119,14 +129,15 @@ function _get_fields() { $om__result->field_type, ($om__result->required ? t("Yes") : t("No")), ($om__result->enabled ? t("Yes") : t("No")), - l(t("edit"), 'admin/build/contact/'. $om__result->field_name ."/edit"), - l(t("delete"), 'admin/build/contact/'. $om__result->field_name ."/delete"), + l(t("edit"), 'admin/structure/contact/'. $om__result->field_name ."/edit"), + l(t("delete"), 'admin/structure/contact/'. $om__result->field_name ."/delete"), ); $rows[] = array( 'data' => $row, - 'class' => 'draggable', + 'class' => array('draggable'), ); } -// drupal_add_tabledrag('contact-field', 'order', 'order', 'sibling'); - return theme('table', $header, $rows, array('id' => 'contact-field')); -} \ No newline at end of file + + return theme('table', array('header' => $header, 'rows' => $rows)); +} + Index: contact_listfield/contact_listfield.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_listfield/Attic/contact_listfield.info,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 contact_listfield.info --- contact_listfield/contact_listfield.info 30 Mar 2010 06:10:24 -0000 1.1.2.2 +++ contact_listfield/contact_listfield.info 28 May 2010 04:44:18 -0000 @@ -1,6 +1,7 @@ -;$Id: contact_listfield.info,v 1.1.2.2 2010/03/30 06:10:24 beautifulmind Exp $ +;$Id$ name = Contact form list field description = Add select boxes on contact form package = Contact fields -core = 6.x -dependencies[] = contact_field \ No newline at end of file +core = 7.x +dependencies[] = contact_field +files[] = contact_listfield.module Index: contact_listfield/contact_listfield.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_listfield/Attic/contact_listfield.module,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 contact_listfield.module --- contact_listfield/contact_listfield.module 26 Mar 2010 12:26:06 -0000 1.1.2.7 +++ contact_listfield/contact_listfield.module 28 May 2010 04:44:18 -0000 @@ -16,64 +16,62 @@ * @author Bhavin H. Joshi */ function contact_listfield_info() { - return array( - 'select' => array( - 'type' => 'list', - 'title' => t("List"), - 'description' => t("Add select box on contact form"), - ), - ); + return array( + 'select' => array( + 'type' => 'list', + 'title' => t("List"), + 'description' => t("Add select box on contact form"), + ), + ); } - - - /** * * @author Bhavin H. Joshi */ -function contact_field_add_field_listfield_form($form_state, $ss__field = NULL) { - drupal_set_title(t("Configure list field")); - $form = array(); +function contact_field_add_field_listfield_form($form, &$form_state, $ss__field = NULL) { + drupal_set_title(t("Configure list field")); + $form = array(); if ($ss__field) { + $ss__option = ''; $am__field_values = _get_field_values($ss__field); - if (!empty($am__field_values['options'])) { - foreach ($am__field_values['options'] as $key => $value) { - $ss__option .= $key ."|". $value; - } - } - - $form['name'] = array( - '#type' => 'item', - '#title' => t("Field name"), - '#description' => t("Machine readable name of the field. This should only - contain alphanumaric charachters and underscore."), - '#value' => $am__field_values['name'], - '#weight' => -50, - ); - - $form['contact_field_name'] = array( - '#type' => 'hidden', - '#value' => $am__field_values['name'], - ); - $form['#submit'] = array('contact_field_listfield_update'); + if (!empty($am__field_values['options'])) { + foreach ($am__field_values['options'] as $key => $value) { + $ss__option .= $key ."|". $value; + } + } + + $form['name'] = array( + '#type' => 'item', + '#title' => t("Field name"), + '#description' => t("Machine readable name of the field. This should only + contain alphanumaric charachters and underscore."), + '#value' => $am__field_values['name'], + '#weight' => -50, + ); + + $form['contact_field_name'] = array( + '#type' => 'hidden', + '#value' => $am__field_values['name'], + ); + $form['#submit'] = array('contact_field_listfield_update'); } else { - $form['field_type'] = array( - '#type' => 'hidden', - '#default_value' => 'select', - ); - + $form['field_type'] = array( + '#type' => 'hidden', + '#default_value' => 'select', + ); + $form['contact_field_name'] = array( - '#type' => 'textfield', - '#title' => t("Field name"), - '#description' => t("Machine readable name of the field. This should only - contain alphanumaric charachters and underscore."), - '#required' => TRUE, - '#weight' => -50, - ); - $form['#submit'] = array('contact_field_listfield_submit'); - $form['#validate'] = array('contact_field_validate'); + '#type' => 'textfield', + '#title' => t("Field name"), + '#description' => t("Machine readable name of the field. This should only + contain alphanumaric charachters and underscore."), + '#required' => TRUE, + '#weight' => -50, + ); + $form['#submit'] = array('contact_field_listfield_submit'); + $form['#validate'] = array('contact_field_validate'); } @@ -81,7 +79,7 @@ function contact_field_add_field_listfie '#type' => 'textfield', '#title' => t("Field title"), '#description' => t("Provide the title of the field"), - '#default_value' => $am__field_values['title'], + '#default_value' => isset($am__field_values['title']) ? $am__field_values['title'] : '', '#required' => TRUE, '#weight' => -49, ); @@ -104,7 +102,7 @@ function contact_field_add_field_listfie '#type' => 'textfield', '#title' => t("Prefix"), '#description' => t("Add prefix to add style to the field."), - '#default_value' => $am__field_values['prefix'], + '#default_value' => isset($am__field_values['prefix']) ? $am__field_values['prefix'] : '', '#weight' => -47, ); @@ -112,7 +110,7 @@ function contact_field_add_field_listfie '#type' => 'textfield', '#title' => t("Suffix"), '#description' => t("Add suffix to add style to the field."), - '#default_value' => $am__field_values['suffix'], + '#default_value' => isset($am__field_values['suffix']) ? $am__field_values['suffix'] : '', '#weight' => -46, ); @@ -171,32 +169,29 @@ function contact_field_add_field_listfie '#value' => t("Save configuration"), ); - return $form; } - - /** * * @param $form - * @param $form_values + * @param $form_state * @author Bhavin H. Joshi */ -function contact_field_listfield_submit($form, $form_values) { - $ss__num_values = $form_values['values']['contact_field_num_value']; +function contact_field_listfield_submit($form, &$form_state) { + $ss__num_values = $form_state['values']['contact_field_num_value']; $ss__field_settings['multiple'] = ($ss__num_values) ? TRUE : FALSE; - $ss__field_name = $form_values['values']['contact_field_name']; - $ss__field_type = $form_values['values']['field_type']; - $ss__field_required = $form_values['values']['contact_field_require']; - $ss__field_enabled = $form_values['values']['contact_field_enabled']; - $ss__field_settings['title'] = $form_values['values']['contact_field_label']; - $ss__field_settings['prefix'] = $form_values['values']['contact_field_prefix']; - $ss__field_settings['suffix'] = $form_values['values']['contact_field_suffix']; + $ss__field_name = $form_state['values']['contact_field_name']; + $ss__field_type = $form_state['values']['field_type']; + $ss__field_required = $form_state['values']['contact_field_require']; + $ss__field_enabled = $form_state['values']['contact_field_enabled']; + $ss__field_settings['title'] = $form_state['values']['contact_field_label']; + $ss__field_settings['prefix'] = $form_state['values']['contact_field_prefix']; + $ss__field_settings['suffix'] = $form_state['values']['contact_field_suffix']; $ss__field_settings['num_value'] = $ss__num_values; - $ss__field_weight = $form_values['values']['contact_field_weight']; - $ss__field_settings['description'] = $form_values['values']['contact_field_help']; - $am__options = explode("\n", $form_values['values']['contact_field_vlaues']); + $ss__field_weight = $form_state['values']['contact_field_weight']; + $ss__field_settings['description'] = $form_state['values']['contact_field_help']; + $am__options = explode("\n", $form_state['values']['contact_field_vlaues']); foreach ($am__options as $option) { $option = contact_field_filter_xss($option); if (strpos($option, '|') !== FALSE) { @@ -205,35 +200,38 @@ function contact_field_listfield_submit( } } - db_query("INSERT INTO {contact_fields} VALUES('%s', '%s', '%s', %d, %d, '%s')", - $ss__field_name, $ss__field_type, serialize($ss__field_settings), - $ss__field_required, $ss__field_enabled, $ss__field_weight); + db_insert('contact_fields') + ->fields(array( + 'field_name' => $ss__field_name, + 'field_type' => $ss__field_type, + 'settings' => serialize($ss__field_settings), + 'required' => $ss__field_required, + 'enabled' => $ss__field_enabled, + 'weight' => $ss__field_weight, + )) + ->execute(); drupal_set_message($ss__field_settings['title'] ." ". t("created")); - drupal_goto('admin/build/contact/manage'); + $form_state['redirect'] = 'admin/structure/contact/manage'; } - - - /** * * @param unknown_type $form - * @param unknown_type $form_values + * @param unknown_type $form_state */ -function contact_field_listfield_update($form, $form_values) { - $ss__num_values = $form_values['values']['contact_field_num_value']; +function contact_field_listfield_update($form, &$form_state) { + $ss__num_values = $form_state['values']['contact_field_num_value']; $ss__field_settings['multiple'] = $ss__num_values; - $ss__field_name = $form_values['values']['contact_field_name']; - $ss__field_type = $form_values['values']['field_type']; - $ss__field_required = $form_values['values']['contact_field_require']; - $ss__field_enabled = $form_values['values']['contact_field_enabled']; - $ss__field_settings['title'] = $form_values['values']['contact_field_label']; - $ss__field_settings['prefix'] = $form_values['values']['contact_field_prefix']; - $ss__field_settings['suffix'] = $form_values['values']['contact_field_suffix']; + $ss__field_name = $form_state['values']['contact_field_name']; + $ss__field_required = $form_state['values']['contact_field_require']; + $ss__field_enabled = $form_state['values']['contact_field_enabled']; + $ss__field_settings['title'] = $form_state['values']['contact_field_label']; + $ss__field_settings['prefix'] = $form_state['values']['contact_field_prefix']; + $ss__field_settings['suffix'] = $form_state['values']['contact_field_suffix']; $ss__field_settings['num_value'] = $ss__num_values; - $ss__field_weight = $form_values['values']['contact_field_weight']; - $ss__field_settings['description'] = $form_values['values']['contact_field_help']; - $am__options = explode("\n", $form_values['values']['contact_field_vlaues']); + $ss__field_weight = $form_state['values']['contact_field_weight']; + $ss__field_settings['description'] = $form_state['values']['contact_field_help']; + $am__options = explode("\n", $form_state['values']['contact_field_vlaues']); foreach ($am__options as $option) { $option = contact_field_filter_xss($option); if (strpos($option, '|') !== FALSE) { @@ -242,10 +240,17 @@ function contact_field_listfield_update( } } - db_query("UPDATE {contact_fields} SET settings = '%s', enabled = %d, - required = %d, weight = '%s' WHERE field_name = '%s'", serialize($ss__field_settings), - $ss__field_enabled, $ss__field_required, $ss__field_weight, $ss__field_name); + db_update('contact_fields') + ->fields(array( + 'settings' => serialize($ss__field_settings), + 'enabled' => $ss__field_enabled, + 'required' => $ss__field_required, + 'weight' => $ss__field_weight, + )) + ->condition('field_name', $ss__field_name, '=') + ->execute(); drupal_set_message($ss__field_settings['title'] ." ". t("Updated")); - drupal_goto('admin/build/contact/manage'); -} \ No newline at end of file + $form_state['redirect'] = 'admin/structure/contact/manage'; +} + Index: contact_option/contact_option.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_option/Attic/contact_option.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 contact_option.info --- contact_option/contact_option.info 16 Mar 2010 13:18:54 -0000 1.1.2.1 +++ contact_option/contact_option.info 28 May 2010 04:44:18 -0000 @@ -1,6 +1,7 @@ -;$Id: contact_option.info,v 1.1.2.1 2010/03/16 13:18:54 beautifulmind Exp $ +;$Id$ name = Contact form radio/checkbox field description = Add radios and checkboxes on contact form package = Contact fields -core = 6.x -dependencies[] = contact_field \ No newline at end of file +core = 7.x +dependencies[] = contact_field +files[] = contact_option.module Index: contact_option/contact_option.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_option/Attic/contact_option.module,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 contact_option.module --- contact_option/contact_option.module 26 Mar 2010 12:26:06 -0000 1.1.2.7 +++ contact_option/contact_option.module 28 May 2010 04:44:18 -0000 @@ -15,31 +15,30 @@ * @author Bhavin H. Joshi */ function contact_option_info() { - return array( - 'option' => array( - 'type' => 'option', - 'title' => t("Radio/Checkbox"), - 'description' => t("Add opiton field on contact form"), - ), - ); + return array( + 'option' => array( + 'type' => 'option', + 'title' => t("Radio/Checkbox"), + 'description' => t("Add opiton field on contact form"), + ), + ); } - - /** * * @author Bhavin H. Joshi */ -function contact_field_add_field_option_form($form_state, $ss__field = NULL) { - drupal_set_title(t("Configure option field")); - $form = array(); - if ($ss__field) { - $am__field_values = _get_field_values($ss__field); - if (!empty($am__field_values['options'])) { - foreach ($am__field_values['options'] as $key => $value) { - $ss__option .= $key ."|". $value; - } - } +function contact_field_add_field_option_form($form, $form_state, $ss__field = NULL) { + drupal_set_title(t("Configure option field")); + $form = array(); + if ($ss__field) { + $ss__option = ''; + $am__field_values = _get_field_values($ss__field); + if (!empty($am__field_values['options'])) { + foreach ($am__field_values['options'] as $key => $value) { + $ss__option .= $key ."|". $value; + } + } $form['name'] = array( '#type' => 'item', '#title' => t("Field name"), @@ -72,7 +71,7 @@ function contact_field_add_field_option_ '#type' => 'textfield', '#title' => t("Field title"), '#description' => t("Provide the title of the field"), - '#default_value' => $am__field_values['title'], + '#default_value' => isset($am__field_values['title']) ? $am__field_values['title'] : '', '#required' => TRUE, '#weight' => -49, ); @@ -95,7 +94,7 @@ function contact_field_add_field_option_ '#type' => 'textfield', '#title' => t("Prefix"), '#description' => t("Add prefix to add style to the field."), - '#default_value' => $am__field_values['prefix'], + '#default_value' => isset($am__field_values['prefix']) ? $am__field_values['prefix'] : '', '#weight' => -47, ); @@ -103,7 +102,7 @@ function contact_field_add_field_option_ '#type' => 'textfield', '#title' => t("Suffix"), '#description' => t("Add suffix to add style to the field."), - '#default_value' => $am__field_values['suffix'], + '#default_value' => isset($am__field_values['suffix']) ? $am__field_values['suffix'] : '', '#weight' => -46, ); @@ -143,7 +142,7 @@ function contact_field_add_field_option_ '#type' => 'textarea', '#title' => t("Allowed values"), '#description' => t("Add key-value pair in key|value format. Add each pair in separate line."), - '#default_value' => $ss__option, + '#default_value' => isset($ss__option) ? $ss__option : '', '#required' => TRUE, '#weight' => -42, ); @@ -165,59 +164,63 @@ function contact_field_add_field_option_ return $form; } - /** * * @param $form - * @param $form_values + * @param $form_state * @author Bhavin H. Joshi */ -function contact_field_option_submit($form, $form_values) { - $ss__num_values = $form_values['values']['contact_field_num_value']; - $ss__field_type = ($ss__num_values) ? 'checkboxes' : 'radios'; - $ss__field_name = $form_values['values']['contact_field_name']; - $ss__field_required = $form_values['values']['contact_field_require']; - $ss__field_enabled = $form_values['values']['contact_field_enabled']; - $ss__field_settings['title'] = $form_values['values']['contact_field_label']; - $ss__field_settings['prefix'] = $form_values['values']['contact_field_prefix']; - $ss__field_settings['suffix'] = $form_values['values']['contact_field_suffix']; - $ss__field_weight = $form_values['values']['contact_field_weight']; - $am__options = explode("\n", $form_values['values']['contact_field_vlaues']); +function contact_field_option_submit($form, &$form_state) { + $ss__num_values = $form_state['values']['contact_field_num_value']; + $ss__field_type = ($ss__num_values) ? 'checkboxes' : 'radios'; + $ss__field_name = $form_state['values']['contact_field_name']; + $ss__field_required = $form_state['values']['contact_field_require']; + $ss__field_enabled = $form_state['values']['contact_field_enabled']; + $ss__field_settings['title'] = $form_state['values']['contact_field_label']; + $ss__field_settings['prefix'] = $form_state['values']['contact_field_prefix']; + $ss__field_settings['suffix'] = $form_state['values']['contact_field_suffix']; + $ss__field_weight = $form_state['values']['contact_field_weight']; + $am__options = explode("\n", $form_state['values']['contact_field_vlaues']); foreach ($am__options as $option) { - $option = contact_field_filter_xss($option); - if (strpos($option, '|') !== FALSE) { - list($key, $value) = explode("|", $option); - $ss__field_settings['options'][$key] = $value; - } + $option = contact_field_filter_xss($option); + if (strpos($option, '|') !== FALSE) { + list($key, $value) = explode("|", $option); + $ss__field_settings['options'][$key] = $value; + } } - $ss__field_settings['description'] = $form_values['values']['contact_field_help']; + $ss__field_settings['description'] = $form_state['values']['contact_field_help']; - db_query("INSERT INTO {contact_fields} VALUES('%s', '%s', '%s', %d, %d, '%s')", - $ss__field_name, $ss__field_type, serialize($ss__field_settings), - $ss__field_required, $ss__field_enabled, $ss__field_weight); + db_insert('contact_fields') + ->fields(array( + 'field_name' => $ss__field_name, + 'field_type' => $ss__field_type, + 'settings' => serialize($ss__field_settings), + 'required' => $ss__field_required, + 'enabled' => $ss__field_enabled, + 'weight' => $ss__field_weight, + )) + ->execute(); drupal_set_message($ss__field_settings['title'] ." ". t("created")); - drupal_goto('admin/build/contact/manage'); + $form_state['redirect'] = 'admin/structure/contact/manage'; } - - /** * * @param unknown_type $form - * @param unknown_type $form_values + * @param unknown_type $form_state * @author Bhavin H. Joshi */ -function contact_field_option_update($form, $form_values) { - $ss__field_name = $form_values['values']['contact_field_name']; - $ss__field_type = ($ss__num_values) ? 'checkboxes' : 'radios'; - $ss__field_required = $form_values['values']['contact_field_require']; - $ss__field_enabled = $form_values['values']['contact_field_enabled']; - $ss__field_settings['title'] = $form_values['values']['contact_field_label']; - $ss__field_settings['prefix'] = $form_values['values']['contact_field_prefix']; - $ss__field_settings['suffix'] = $form_values['values']['contact_field_suffix']; - $ss__field_weight = $form_values['values']['contact_field_weight']; - $ss__field_settings['description'] = $form_values['values']['contact_field_help']; - $am__options = explode("\n", $form_values['values']['contact_field_vlaues']); +function contact_field_option_update($form, &$form_state) { + $ss__num_values = $form_state['values']['contact_field_num_value']; + $ss__field_name = $form_state['values']['contact_field_name']; + $ss__field_required = $form_state['values']['contact_field_require']; + $ss__field_enabled = $form_state['values']['contact_field_enabled']; + $ss__field_settings['title'] = $form_state['values']['contact_field_label']; + $ss__field_settings['prefix'] = $form_state['values']['contact_field_prefix']; + $ss__field_settings['suffix'] = $form_state['values']['contact_field_suffix']; + $ss__field_weight = $form_state['values']['contact_field_weight']; + $ss__field_settings['description'] = $form_state['values']['contact_field_help']; + $am__options = explode("\n", $form_state['values']['contact_field_vlaues']); foreach ($am__options as $option) { var_dump($am__options); $option = contact_field_filter_xss($option); @@ -227,8 +230,15 @@ function contact_field_option_update($fo } } - db_query("UPDATE {contact_fields} SET settings = '%s', enabled = %d, - required = %d, weight = '%s' WHERE field_name = '%s'", serialize($ss__field_settings), - $ss__field_enabled, $ss__field_required, $ss__field_weight, $ss__field_name); - drupal_goto('admin/build/contact/manage'); -} \ No newline at end of file + db_update('contact_fields') + ->fields(array( + 'settings' => serialize($ss__field_settings), + 'enabled' => $ss__field_enabled, + 'required' => $ss__field_required, + 'weight' => $ss__field_weight, + )) + ->condition('field_name', $ss__field_name, '=') + ->execute(); + $form_state['redirect'] = 'admin/structure/contact/manage'; +} + Index: contact_textfield/contact_textfield.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_textfield/Attic/contact_textfield.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 contact_textfield.info --- contact_textfield/contact_textfield.info 16 Mar 2010 13:18:54 -0000 1.1.2.1 +++ contact_textfield/contact_textfield.info 28 May 2010 04:44:18 -0000 @@ -1,6 +1,7 @@ -;$Id: contact_textfield.info,v 1.1.2.1 2010/03/16 13:18:54 beautifulmind Exp $ +;$Id$ name = Contact form Text field description = Add text box on contact form. This module supports textbox and textarea fields. package = Contact fields -core = 6.x -dependencies[] = contact_field \ No newline at end of file +core = 7.x +dependencies[] = contact_field +files[] = contact_textfield.module Index: contact_textfield/contact_textfield.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/contact_field/contact_textfield/Attic/contact_textfield.module,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 contact_textfield.module --- contact_textfield/contact_textfield.module 26 Mar 2010 12:26:06 -0000 1.1.2.5 +++ contact_textfield/contact_textfield.module 28 May 2010 04:44:18 -0000 @@ -18,18 +18,18 @@ * @author Bhavin H. Joshi */ function contact_textfield_info() { - return array( - 'textfield' => array( - 'type' => 'text', - 'title' => t("Text field"), - 'description' => t("Add a text box on contact form") - ), - 'textarea' => array( - 'type' => 'area', - 'title' => t("Textarea"), - 'description' => t("Add a text area on contact form"), - ), - ); + return array( + 'textfield' => array( + 'type' => 'text', + 'title' => t("Text field"), + 'description' => t("Add a text box on contact form") + ), + 'textarea' => array( + 'type' => 'area', + 'title' => t("Textarea"), + 'description' => t("Add a text area on contact form"), + ), + ); } @@ -41,7 +41,7 @@ function contact_textfield_info() { * @return unknown_type * @author Bhavin H. Joshi */ -function contact_field_add_field_text_form($form_state, $ss__field = NULL) { +function contact_field_add_field_text_form($form, $form_state, $ss__field = NULL) { drupal_set_title(t("Configure text field")); $form = array(); if ($ss__field) { @@ -82,7 +82,7 @@ function contact_field_add_field_text_fo '#type' => 'textfield', '#title' => t("Field title"), '#description' => t("Provide the title of the field."), - '#default_value' => $am__field_values['title'], + '#default_value' => isset($am__field_values['title']) ? $am__field_values['title'] : '', '#required' => TRUE, '#weight' => -49, ); @@ -91,7 +91,7 @@ function contact_field_add_field_text_fo '#type' => 'textfield', '#title' => t("Prefix"), '#description' => t("Add prefix to add style to the field."), - '#default_value' => $am__field_values['prefix'], + '#default_value' => isset($am__field_values['prefix']) ? $am__field_values['prefix'] : '', '#weight' => -48, ); @@ -99,7 +99,7 @@ function contact_field_add_field_text_fo '#type' => 'textfield', '#title' => t("Suffix"), '#description' => t("Add suffix to add style to the field."), - '#default_value' => $am__field_values['suffix'], + '#default_value' => isset($am__field_values['suffix']) ? $am__field_values['suffix'] : '', '#weight' => -47, ); @@ -107,7 +107,7 @@ function contact_field_add_field_text_fo '#type' => 'textfield', '#title' => t("Maximum length"), '#description' => t("Maximum number of charcter allowed for the field. Leave blank for default length."), - '#default_value' => $am__field_values['maxlength'], + '#default_value' => isset($am__field_values['maxlength']) ? $am__field_values['maxlength'] : '', '#weight' => -46, ); @@ -115,7 +115,7 @@ function contact_field_add_field_text_fo '#type' => 'textfield', '#title' => t("Field prefix"), '#description' => t("A prefix to field itslef. Like Rs., श्री, Mr."), - '#default_value' => $am__field_values['maxlength'], + '#default_value' => isset($am__field_values['maxlength']) ? $am__field_values['maxlength'] : '', '#weight' => -45, ); @@ -123,7 +123,7 @@ function contact_field_add_field_text_fo '#type' => 'textfield', '#title' => t("Field suffix"), '#description' => t("A suffix to field itself. Like भैया, feet, gms"), - '#default_value' => $am__field_values['maxlength'], + '#default_value' => isset($am__field_values['maxlength']) ? $am__field_values['maxlength'] : '', '#weight' => -44, ); @@ -177,66 +177,72 @@ function contact_field_add_field_text_fo return $form; } - - - /** * Implementation of hook_submit * * @param $form - * @param $form_values + * @param $form_state * @return unknown_type * @author Bhavin H. Joshi */ -function contact_field_submit($form, $form_values) { - $ss__field_name = $form_values['values']['contact_field_name']; - $ss__field_type = $form_values['values']['field_type']; - $ss__field_required = $form_values['values']['contact_field_require']; - $ss__field_enabled = $form_values['values']['contact_field_enabled']; - $ss__field_settings['title'] = $form_values['values']['contact_field_label']; - $ss__field_settings['prefix'] = $form_values['values']['contact_field_prefix']; - $ss__field_settings['suffix'] = $form_values['values']['contact_field_suffix']; - $ss__field_settings['maxlength'] = $form_values['values']['contact_field_maxlength']; - $ss__field_settings['field_prefix'] = $form_values['values']['contact_field_prefix_field']; - $ss__field_settings['field_suffix'] = $form_values['values']['contact_field_suffix_field']; - $ss__field_weight = $form_values['values']['contact_field_weight']; - - db_query("INSERT INTO {contact_fields} VALUES('%s', '%s', '%s', %d, %d, '%s')", - $ss__field_name, $ss__field_type, serialize($ss__field_settings), - $ss__field_required, $ss__field_enabled, $ss__field_weight); +function contact_field_submit($form, &$form_state) { + $ss__field_name = $form_state['values']['contact_field_name']; + $ss__field_type = $form_state['values']['field_type']; + $ss__field_required = $form_state['values']['contact_field_require']; + $ss__field_enabled = $form_state['values']['contact_field_enabled']; + $ss__field_settings['title'] = $form_state['values']['contact_field_label']; + $ss__field_settings['prefix'] = $form_state['values']['contact_field_prefix']; + $ss__field_settings['suffix'] = $form_state['values']['contact_field_suffix']; + $ss__field_settings['maxlength'] = $form_state['values']['contact_field_maxlength']; + $ss__field_settings['field_prefix'] = $form_state['values']['contact_field_prefix_field']; + $ss__field_settings['field_suffix'] = $form_state['values']['contact_field_suffix_field']; + $ss__field_weight = $form_state['values']['contact_field_weight']; + + db_insert('contact_fields') + ->fields(array( + 'field_name' => $ss__field_name, + 'field_type' => $ss__field_type, + 'required' => $ss__field_required, + 'enabled' => $ss__field_enabled, + 'settings' => serialize($ss__field_settings), + )) + ->execute(); drupal_set_message($ss__field_settings['title'] ." ". t("created")); - drupal_goto('admin/build/contact/manage'); + $form_state['redirect'] = 'admin/structure/contact/manage'; } - /** * * @param unknown_type $form - * @param unknown_type $form_values + * @param unknown_type $form_state * @author Bhavin H. Joshi */ -function contact_field_update($form, $form_values) { - $ss__field_name = $form_values['values']['contact_field_name']; - $ss__field_type = $form_values['values']['field_type']; - $ss__field_required = $form_values['values']['contact_field_require']; - $ss__field_enabled = $form_values['values']['contact_field_enabled']; - $ss__field_settings['title'] = $form_values['values']['contact_field_label']; - $ss__field_settings['prefix'] = $form_values['values']['contact_field_prefix']; - $ss__field_settings['suffix'] = $form_values['values']['contact_field_suffix']; - $ss__field_settings['maxlength'] = $form_values['values']['contact_field_maxlength']; - $ss__field_settings['field_prefix'] = $form_values['values']['contact_field_prefix_field']; - $ss__field_settings['field_suffix'] = $form_values['values']['contact_field_suffix_field']; - $ss__field_weight = $form_values['values']['contact_field_weight']; - - db_query("UPDATE {contact_fields} SET settings = '%s', enabled = %d, - required = %d, weight = '%s' WHERE field_name = '%s'", serialize($ss__field_settings), - $ss__field_enabled, $ss__field_required, $ss__field_weight, $ss__field_name); - +function contact_field_update($form, &$form_state) { + $ss__field_name = $form_state['values']['contact_field_name']; + $ss__field_type = $form_state['values']['field_type']; + $ss__field_required = $form_state['values']['contact_field_require']; + $ss__field_enabled = $form_state['values']['contact_field_enabled']; + $ss__field_settings['title'] = $form_state['values']['contact_field_label']; + $ss__field_settings['prefix'] = $form_state['values']['contact_field_prefix']; + $ss__field_settings['suffix'] = $form_state['values']['contact_field_suffix']; + $ss__field_settings['maxlength'] = $form_state['values']['contact_field_maxlength']; + $ss__field_settings['field_prefix'] = $form_state['values']['contact_field_prefix_field']; + $ss__field_settings['field_suffix'] = $form_state['values']['contact_field_suffix_field']; + $ss__field_weight = $form_state['values']['contact_field_weight']; + + db_update('contact_fields') + ->fields(array( + 'settings' => serialize($ss__field_settings), + 'enabled' => $ss__field_enabled, + 'required' => $ss__field_required, + 'weight' => $ss__field_weight, + )) + ->condition('field_name', $ss__field_name, '=') + ->execute(); drupal_set_message($ss__field_settings['title'] ." ". t("updated")); - drupal_goto('admin/build/contact/manage'); + $form_state['redirect'] = 'admin/structure/contact/manage'; } - /** * contact_field_add_field_textarea_form * @@ -244,8 +250,8 @@ function contact_field_update($form, $fo * * @author Bhavin H. Joshi */ -function contact_field_add_field_textarea_form($form_state, $ss__field = NULL) { - drupal_set_title(t("Configure text area")); +function contact_field_add_field_textarea_form($form, $form_state, $ss__field = NULL) { + drupal_set_title(t("Configure text area")); $form = array(); if ($ss__field) { $am__field_values = _get_field_values($ss__field); @@ -263,29 +269,28 @@ function contact_field_add_field_textare ); } else { - $form['#submit'] = array('contact_field_textarea_submit'); - $form['#validate'] = array('contact_field_validate'); - $form['field_type'] = array( - '#type' => 'hidden', - '#default_value' => 'textarea', - ); - - $form['contact_field_name'] = array( - '#type' => 'textfield', - '#title' => t("Field name"), - '#description' => t("Machine readable name of the field. This should only - contain alphanumaric charachters and underscore."), - '#required' => TRUE, - '#weight' => -50, - ); + $form['#submit'] = array('contact_field_textarea_submit'); + $form['#validate'] = array('contact_field_validate'); + $form['field_type'] = array( + '#type' => 'hidden', + '#default_value' => 'textarea', + ); + + $form['contact_field_name'] = array( + '#type' => 'textfield', + '#title' => t("Field name"), + '#description' => t("Machine readable name of the field. This should only + contain alphanumaric charachters and underscore."), + '#required' => TRUE, + '#weight' => -50, + ); } - $form['contact_field_label'] = array( '#type' => 'textfield', '#title' => t("Field title"), '#description' => t("Provide the title of the field"), - '#default_value' => $am__field_values['title'], + '#default_value' => isset($am__field_values['title']) ? $am__field_values['title'] : '', '#required' => TRUE, '#weight' => -49, ); @@ -294,7 +299,7 @@ function contact_field_add_field_textare '#type' => 'textfield', '#title' => t("Rows"), '#description' => t("Number of rows. Leave blank for default rows"), - '#default_value' => $am__field_values['row'], + '#default_value' => isset($am__field_values['row']) ? $am__field_values['row'] : '', '#weight' => -48, ); @@ -302,7 +307,7 @@ function contact_field_add_field_textare '#type' => 'textfield', '#title' => t("Columns"), '#description' => t("Number of column. Leave blank for default columns."), - '#default_value' => $am__field_values['column'], + '#default_value' => isset($am__field_values['column']) ? $am__field_values['column'] : '', '#weight' => -47, ); @@ -352,59 +357,66 @@ function contact_field_add_field_textare '#value' => t("Save configuration"), ); - return $form; + return $form; } - - /** * * @param unknown_type $form - * @param unknown_type $form_values + * @param unknown_type $form_state * @author Bhavin H. Joshi */ -function contact_field_textarea_submit($form, $form_values) { - $ss__field_name = $form_values['values']['contact_field_name']; - $ss__field_type = $form_values['values']['field_type']; - $ss__field_required = $form_values['values']['contact_field_require']; - $ss__field_enabled = $form_values['values']['contact_field_enabled']; - $ss__field_settings['title'] = $form_values['values']['contact_field_label']; - $ss__field_settings['rows'] = $form_values['values']['contact_field_label']; - $ss__field_settings['cols'] = $form_values['values']['contact_field_label']; - $ss__field_settings['description'] = $form_values['values']['contact_field_help']; - $ss__field_weight = $form_values['values']['contact_field_weight']; - - db_query("INSERT INTO {contact_fields} VALUES('%s', '%s', '%s', %d, %d, '%s')", - $ss__field_name, $ss__field_type, serialize($ss__field_settings), - $ss__field_required, $ss__field_enabled, $ss__field_weight); +function contact_field_textarea_submit($form, &$form_state) { + $ss__field_name = $form_state['values']['contact_field_name']; + $ss__field_type = $form_state['values']['field_type']; + $ss__field_required = $form_state['values']['contact_field_require']; + $ss__field_enabled = $form_state['values']['contact_field_enabled']; + $ss__field_settings['title'] = $form_state['values']['contact_field_label']; + $ss__field_settings['rows'] = $form_state['values']['contact_field_label']; + $ss__field_settings['cols'] = $form_state['values']['contact_field_label']; + $ss__field_settings['description'] = $form_state['values']['contact_field_help']; + $ss__field_weight = $form_state['values']['contact_field_weight']; + + db_insert('contact_fields') + ->fields(array( + 'field_name' => $ss__field_name, + 'field_type' => $ss__field_type, + 'settings' => serialize($ss__field_settings), + 'required' => $ss__field_required, + 'enabled' => $ss__field_enabled, + 'weight' => $ss__field_weight, + )) + ->execute(); drupal_set_message($ss__field_settings['title'] ." ". t("created")); - drupal_goto('admin/build/contact/manage'); + $form_state['redirect'] = 'admin/structure/contact/manage'; } - - - /** * * @param $form - * @param $form_values + * @param $form_state * @author Bhavin H. Joshi */ -function contact_field_textarea_update($form, $form_values) { - $ss__field_name = $form_values['values']['contact_field_name']; - $ss__field_type = $form_values['values']['field_type']; - $ss__field_required = $form_values['values']['contact_field_require']; - $ss__field_enabled = $form_values['values']['contact_field_enabled']; - $ss__field_settings['title'] = $form_values['values']['contact_field_label']; - $ss__field_settings['rows'] = $form_values['values']['contact_field_label']; - $ss__field_settings['cols'] = $form_values['values']['contact_field_label']; - $ss__field_settings['description'] = $form_values['values']['contact_field_help']; - $ss__field_weight = $form_values['values']['contact_field_weight']; - - db_query("UPDATE {contact_fields} SET settings = '%s', enabled = %d, - required = %d, weight = '%s' WHERE field_name = '%s'", serialize($ss__field_settings), - $ss__field_enabled, $ss__field_required, $ss__field_weight, $ss__field_name); - +function contact_field_textarea_update($form, &$form_state) { + $ss__field_name = $form_state['values']['contact_field_name']; + $ss__field_required = $form_state['values']['contact_field_require']; + $ss__field_enabled = $form_state['values']['contact_field_enabled']; + $ss__field_settings['title'] = $form_state['values']['contact_field_label']; + $ss__field_settings['rows'] = $form_state['values']['contact_field_label']; + $ss__field_settings['cols'] = $form_state['values']['contact_field_label']; + $ss__field_settings['description'] = $form_state['values']['contact_field_help']; + $ss__field_weight = $form_state['values']['contact_field_weight']; + + db_update('contact_fields') + ->fields(array( + 'settings' => serialize($ss__field_settings), + 'enabled' => $ss__field_enabled, + 'required' => $ss__field_required, + 'weight' => $ss__field_weight, + )) + ->condition('field_name', $ss__field_name, '=') + ->execute(); drupal_set_message($ss__field_settings['title'] ." ". t("updated")); - drupal_goto('admin/build/contact/manage'); -} \ No newline at end of file + $form_state['redirect'] = 'admin/structure/contact/manage'; +} +