diff --git a/fillpdf.admin.inc b/fillpdf.admin.inc
index 892c0283277cdb662452a4df9508911c9bd7ccd6..db7d32571f76e2c4ef35b7bae372bcb7dcd19b09 100644
--- a/fillpdf.admin.inc
+++ b/fillpdf.admin.inc
@@ -364,7 +364,7 @@ function fillpdf_form_edit($form, &$form_state, $fid) {
// @@TODO: order by weight, and add dragable ala http://www.computerminds.co.uk/quick-guide-using-drupal-add-tabledrag-and-enjoying-jquery-drag-and-drop-loveliness
$q = db_query('SELECT * FROM {fillpdf_fields} WHERE fid = :fid', array(':fid' => $fid));
- $header = array(t('Label'), t('PDF-field key'), t('Value'), t('Transformed'), array(
+ $header = array(t('Label'), t('PDF-field key'), t('Prefix'), t('Value'), t('Suffix'), t('Transformed'), array(
'data' => t('Operations'),
'colspan' => 2,
));
@@ -373,7 +373,9 @@ function fillpdf_form_edit($form, &$form_state, $fid) {
$row = array(
check_plain($field->label), // editable
check_plain($field->pdf_key),
+ $field->prefix,
$field->value, // editable, expandable
+ $field->suffix,
($field->replacements ? 'Yes' : 'No'),
// rawurlencode() is needed twice to fully protect "/". Otherwise, "/" is
// taken as a separator when looking for a match in hook_menu().
@@ -679,6 +681,13 @@ function fillpdf_field_edit($form, &$form_state, $pdf_form, $field) {
'#description' => t('An optional label to help you identify the field.'),
'#weight' => 1,
);
+ $form['prefix'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Prefix'),
+ '#default_value' => $field->prefix,
+ '#description' => t('<p>If there is some text you always want to appear before the main value if it isn\'t empty, enter it here. <strong>This value only appears if the token pattern in <em>Value</em> doesn\'t result in blank text.</strong></p>'),
+ '#weight' => 3,
+ );
$form['value'] = array(
'#type' => 'textarea',
'#title' => t('Value'),
@@ -701,12 +710,19 @@ function fillpdf_field_edit($form, &$form_state, $pdf_form, $field) {
'#theme' => 'token_tree',
'#token_types' => array('node', 'webform'),
);
+ $form['suffix'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Suffix'),
+ '#default_value' => $field->suffix,
+ '#description' => t('<p>If there is some text you always want to appear after the main value if it isn\'t empty, enter it here. <strong>This value only appears if the token pattern in <em>Value</em> doesn\'t result in blank text.</strong></p>'),
+ '#weight' => 6,
+ );
$form['extra'] = array(
'#type' => 'fieldset',
'#title' => t('Transform values on this field'),
'#collapsible' => TRUE,
'#collapsed' => ($field->replacements ? FALSE : TRUE),
- '#weight' => 6,
+ '#weight' => 7,
);
$form['extra']['replacements'] = array(
@@ -748,11 +764,13 @@ function fillpdf_field_edit_submit($form, &$form_state) {
$edit_field = (object) $form_state['values'];
db_insert('fillpdf_fields')
->fields(array(
- 'fid' => $form_state['values']['#pdf_form']->fid,
- 'label' => $form_state['values']['label'],
- 'pdf_key' => $form_state['values']['pdf_key'],
- 'value' => empty($form_state['values']['value']) ? '' : $form_state['values']['value'],
- 'replacements' => $form_state['values']['replacements'],
+ 'fid' => $form_state['values']['#pdf_form']->fid,
+ 'label' => $form_state['values']['label'],
+ 'pdf_key' => $form_state['values']['pdf_key'],
+ 'prefix' => $form_state['values']['prefix'],
+ 'value' => empty($form_state['values']['value']) ? '' : $form_state['values']['value'],
+ 'suffix' => $form_state['values']['suffix'],
+ 'replacements' => $form_state['values']['replacements'],
))
->execute();
}
@@ -764,14 +782,16 @@ function fillpdf_field_edit_submit($form, &$form_state) {
*/
function fillpdf_update_field(&$pdf_form, &$field, $old_key) {
db_update('fillpdf_fields')
- ->fields(array(
- 'label' => $field->label,
- 'value' => empty($field->value) ? '' : $field->value,
- 'replacements' => $field->replacements,
- ))
- ->condition('fid', $pdf_form->fid)
- ->condition('pdf_key', $old_key)
- ->execute();
+ ->fields(array(
+ 'label' => $field->label,
+ 'prefix' => $field->prefix,
+ 'value' => empty($field->value) ? '' : $field->value,
+ 'suffix' => $field->suffix,
+ 'replacements' => $field->replacements,
+ ))
+ ->condition('fid', $pdf_form->fid)
+ ->condition('pdf_key', $old_key)
+ ->execute();
}
function _fillpdf_admin_token_form() {
diff --git a/fillpdf.install b/fillpdf.install
index 77b934eff4228b1354be155ee955e62504bc8774..b3b262ec7c84cba0efdf20befd70ad64f639fa75 100644
--- a/fillpdf.install
+++ b/fillpdf.install
@@ -69,15 +69,25 @@ function fillpdf_schema() {
'length' => 255,
'not null' => TRUE,
),
+ 'prefix' => array(
+ 'type' => 'varchar',
+ 'length' => 4096,
+ 'not null' => FALSE,
+ ),
'value' => array(
'type' => 'text',
'size' => 'medium',
'not null' => TRUE,
),
+ 'suffix' => array(
+ 'type' => 'varchar',
+ 'length' => 4096,
+ 'not null' => FALSE,
+ ),
'replacements' => array(
'type' => 'text',
'size' => 'normal',
- 'not null' => FALSE
+ 'not null' => FALSE,
),
),
'primary key' => array('fid', 'pdf_key'),
@@ -166,3 +176,16 @@ function fillpdf_update_7005() {
db_add_field('fillpdf_forms', 'destination_redirect', array('type' => 'int', 'size' => 'tiny', 'unsigned' => TRUE, 'not null' => FALSE));
}
}
+
+/**
+ * Add database fields for prefix and suffix.
+ */
+function fillpdf_update_7006() {
+ $schema = drupal_get_schema_unprocessed('fillpdf', 'fillpdf_fields');
+ if (!db_field_exists('fillpdf_fields', 'prefix')) {
+ db_add_field('fillpdf_fields', 'prefix', $schema['fields']['prefix']);
+ }
+ if (!db_field_exists('fillpdf_fields', 'suffix')) {
+ db_add_field('fillpdf_fields', 'suffix', $schema['fields']['suffix']);
+ }
+}
diff --git a/fillpdf.module b/fillpdf.module
index a0698b7e5aaed49f223723b7d23f3d004f1e99de..9409c9fb408a2bdc5e768d17aa71f0633d0559e3 100644
--- a/fillpdf.module
+++ b/fillpdf.module
@@ -393,6 +393,16 @@ function fillpdf_merge_pdf($fid, $nids = NULL, $webform_arr = NULL, $sample = NU
$fields[$obj->pdf_key] = $str;
}
}
+
+ // Apply prefix and suffix, if applicable
+ if ($fields[$obj->pdf_key]) {
+ if ($obj->prefix) {
+ $fields[$obj->pdf_key] = $obj->prefix . $fields[$obj->pdf_key];
+ }
+ if ($obj->suffix) {
+ $fields[$obj->pdf_key] .= $obj->suffix;
+ }
+ }
}
// Provide hook_fillpdf_merge_fields_alter() to let other modules
diff --git a/fillpdf_2014673_prefix_suffix_1.patch b/fillpdf_2014673_prefix_suffix_1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..42a3dfbe31e846f04d0e97251430c418f1a0efed
--- /dev/null
+++ b/fillpdf_2014673_prefix_suffix_1.patch
@@ -0,0 +1,171 @@
+diff --git a/fillpdf.admin.inc b/fillpdf.admin.inc
+index 892c028..db7d325 100644
+--- a/fillpdf.admin.inc
++++ b/fillpdf.admin.inc
+@@ -364,7 +364,7 @@ function fillpdf_form_edit($form, &$form_state, $fid) {
+
+ // @@TODO: order by weight, and add dragable ala http://www.computerminds.co.uk/quick-guide-using-drupal-add-tabledrag-and-enjoying-jquery-drag-and-drop-loveliness
+ $q = db_query('SELECT * FROM {fillpdf_fields} WHERE fid = :fid', array(':fid' => $fid));
+- $header = array(t('Label'), t('PDF-field key'), t('Value'), t('Transformed'), array(
++ $header = array(t('Label'), t('PDF-field key'), t('Prefix'), t('Value'), t('Suffix'), t('Transformed'), array(
+ 'data' => t('Operations'),
+ 'colspan' => 2,
+ ));
+@@ -373,7 +373,9 @@ function fillpdf_form_edit($form, &$form_state, $fid) {
+ $row = array(
+ check_plain($field->label), // editable
+ check_plain($field->pdf_key),
++ $field->prefix,
+ $field->value, // editable, expandable
++ $field->suffix,
+ ($field->replacements ? 'Yes' : 'No'),
+ // rawurlencode() is needed twice to fully protect "/". Otherwise, "/" is
+ // taken as a separator when looking for a match in hook_menu().
+@@ -679,6 +681,13 @@ function fillpdf_field_edit($form, &$form_state, $pdf_form, $field) {
+ '#description' => t('An optional label to help you identify the field.'),
+ '#weight' => 1,
+ );
++ $form['prefix'] = array(
++ '#type' => 'textarea',
++ '#title' => t('Prefix'),
++ '#default_value' => $field->prefix,
++ '#description' => t('<p>If there is some text you always want to appear before the main value if it isn\'t empty, enter it here. <strong>This value only appears if the token pattern in <em>Value</em> doesn\'t result in blank text.</strong></p>'),
++ '#weight' => 3,
++ );
+ $form['value'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Value'),
+@@ -701,12 +710,19 @@ function fillpdf_field_edit($form, &$form_state, $pdf_form, $field) {
+ '#theme' => 'token_tree',
+ '#token_types' => array('node', 'webform'),
+ );
++ $form['suffix'] = array(
++ '#type' => 'textarea',
++ '#title' => t('Suffix'),
++ '#default_value' => $field->suffix,
++ '#description' => t('<p>If there is some text you always want to appear after the main value if it isn\'t empty, enter it here. <strong>This value only appears if the token pattern in <em>Value</em> doesn\'t result in blank text.</strong></p>'),
++ '#weight' => 6,
++ );
+ $form['extra'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Transform values on this field'),
+ '#collapsible' => TRUE,
+ '#collapsed' => ($field->replacements ? FALSE : TRUE),
+- '#weight' => 6,
++ '#weight' => 7,
+ );
+
+ $form['extra']['replacements'] = array(
+@@ -748,11 +764,13 @@ function fillpdf_field_edit_submit($form, &$form_state) {
+ $edit_field = (object) $form_state['values'];
+ db_insert('fillpdf_fields')
+ ->fields(array(
+- 'fid' => $form_state['values']['#pdf_form']->fid,
+- 'label' => $form_state['values']['label'],
+- 'pdf_key' => $form_state['values']['pdf_key'],
+- 'value' => empty($form_state['values']['value']) ? '' : $form_state['values']['value'],
+- 'replacements' => $form_state['values']['replacements'],
++ 'fid' => $form_state['values']['#pdf_form']->fid,
++ 'label' => $form_state['values']['label'],
++ 'pdf_key' => $form_state['values']['pdf_key'],
++ 'prefix' => $form_state['values']['prefix'],
++ 'value' => empty($form_state['values']['value']) ? '' : $form_state['values']['value'],
++ 'suffix' => $form_state['values']['suffix'],
++ 'replacements' => $form_state['values']['replacements'],
+ ))
+ ->execute();
+ }
+@@ -764,14 +782,16 @@ function fillpdf_field_edit_submit($form, &$form_state) {
+ */
+ function fillpdf_update_field(&$pdf_form, &$field, $old_key) {
+ db_update('fillpdf_fields')
+- ->fields(array(
+- 'label' => $field->label,
+- 'value' => empty($field->value) ? '' : $field->value,
+- 'replacements' => $field->replacements,
+- ))
+- ->condition('fid', $pdf_form->fid)
+- ->condition('pdf_key', $old_key)
+- ->execute();
++ ->fields(array(
++ 'label' => $field->label,
++ 'prefix' => $field->prefix,
++ 'value' => empty($field->value) ? '' : $field->value,
++ 'suffix' => $field->suffix,
++ 'replacements' => $field->replacements,
++ ))
++ ->condition('fid', $pdf_form->fid)
++ ->condition('pdf_key', $old_key)
++ ->execute();
+ }
+
+ function _fillpdf_admin_token_form() {
+diff --git a/fillpdf.install b/fillpdf.install
+index 77b934e..b3b262e 100644
+--- a/fillpdf.install
++++ b/fillpdf.install
+@@ -69,15 +69,25 @@ function fillpdf_schema() {
+ 'length' => 255,
+ 'not null' => TRUE,
+ ),
++ 'prefix' => array(
++ 'type' => 'varchar',
++ 'length' => 4096,
++ 'not null' => FALSE,
++ ),
+ 'value' => array(
+ 'type' => 'text',
+ 'size' => 'medium',
+ 'not null' => TRUE,
+ ),
++ 'suffix' => array(
++ 'type' => 'varchar',
++ 'length' => 4096,
++ 'not null' => FALSE,
++ ),
+ 'replacements' => array(
+ 'type' => 'text',
+ 'size' => 'normal',
+- 'not null' => FALSE
++ 'not null' => FALSE,
+ ),
+ ),
+ 'primary key' => array('fid', 'pdf_key'),
+@@ -166,3 +176,16 @@ function fillpdf_update_7005() {
+ db_add_field('fillpdf_forms', 'destination_redirect', array('type' => 'int', 'size' => 'tiny', 'unsigned' => TRUE, 'not null' => FALSE));
+ }
+ }
++
++/**
++ * Add database fields for prefix and suffix.
++ */
++function fillpdf_update_7006() {
++ $schema = drupal_get_schema_unprocessed('fillpdf', 'fillpdf_fields');
++ if (!db_field_exists('fillpdf_fields', 'prefix')) {
++ db_add_field('fillpdf_fields', 'prefix', $schema['fields']['prefix']);
++ }
++ if (!db_field_exists('fillpdf_fields', 'suffix')) {
++ db_add_field('fillpdf_fields', 'suffix', $schema['fields']['suffix']);
++ }
++}
+diff --git a/fillpdf.module b/fillpdf.module
+index a0698b7..9409c9f 100644
+--- a/fillpdf.module
++++ b/fillpdf.module
+@@ -393,6 +393,16 @@ function fillpdf_merge_pdf($fid, $nids = NULL, $webform_arr = NULL, $sample = NU
+ $fields[$obj->pdf_key] = $str;
+ }
+ }
++
++ // Apply prefix and suffix, if applicable
++ if ($fields[$obj->pdf_key]) {
++ if ($obj->prefix) {
++ $fields[$obj->pdf_key] = $obj->prefix . $fields[$obj->pdf_key];
++ }
++ if ($obj->suffix) {
++ $fields[$obj->pdf_key] .= $obj->suffix;
++ }
++ }
+ }
+
+ // Provide hook_fillpdf_merge_fields_alter() to let other modules