Merge pull request #2752 from aaronschachter/signup_form_text_variable

Signup Form copy text variable

Author: aaronschachter

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.module

@@ -225,7 +225,8 @@ function dosomething_campaign_admin_paths() {
  * Page access callback for admin custom settings form.
  */
 function dosomething_campaign_admin_custom_settings_page_access($node) {
-  if ($node->type != 'campaign') { return FALSE; }
+  $settings_nodes = array('campaign', 'campaign_group');
+  if (!in_array($node->type, $settings_nodes)) { return FALSE; }
 
   return (user_access('edit any campaign content') || user_access('bypass node access'));
 }

lib/modules/dosomething/dosomething_campaign/dosomething_campaign.theme.inc

@@ -313,9 +313,8 @@ function dosomething_campaign_preprocess_signup_data_form(&$vars) {
  *   The corresponding entity wrapper for the node in $vars.
  */
 function dosomething_campaign_preprocess_pitch_page(&$vars, &$wrapper) {
-  // Check for a signup button label override.
-  $label_varname = 'dosomething_campaign_nid_' . $vars['nid']. '_pitch_page_label';
-  $label = variable_get($label_varname, '');
+  // Check for a signup button copy override.
+  $label = $vars['campaign']->variables['signup_button_copy'];
   // If no override:
   if (empty($label)) {
     // Don't pass the $label parameter, using the default defined in function.

lib/modules/dosomething/dosomething_helpers/dosomething_helpers.module

@@ -332,169 +332,38 @@ function dosomething_helpers_form_extras(&$form, &$form_state) {
 
   // If this is a node create form, display help text and exit out of extras.
   if (!isset($form['nid']['#value'])) {
-    $form['custom'] = array(
-      '#markup' => t('The signup data form and custom settings for this !type will be available upon save.', array('!type' => $type)),
-      '#weight' => 60,
-    );
     return;
   }
-
-  // Set prefix for custom variables.
-  $prefix = dosomething_helpers_get_custom_var_prefix($type, $form['nid']['#value']);
   $form['custom'] = array(
     '#type' => 'fieldset',
     '#title' => t('Custom settings'),
     '#weight' => 80,
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
-  $pitch_page_label = $prefix . 'pitch_page_label';
-  $form['custom'][$pitch_page_label] = array(
-    '#type' => 'textfield',
-    '#title' => t('Signup Form Button Label'),
-    '#default_value' => variable_get($pitch_page_label),
-    '#description' => t('If set, this will override the label on the signup form.'),
-  );
-  $form['custom']['styles'] = array(
+  $form['custom']['optins'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Styles'),
+    '#title' => t('Third Party Opt-ins'),
+    '#description' => t('Custom campaign opt-in values.'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
-  $alt_color = $prefix . 'alt_color';
-  $form['custom']['styles'][$alt_color] = array(
+  $form['custom']['optins']['mailchimp_grouping_id'] = array(
     '#type' => 'textfield',
-    '#title' => t('Alt color'),
-    '#default_value' => variable_get($alt_color),
-    '#field_prefix' => '#',
-    '#size' => 6,
+    '#title' => t('MailChimp Grouping ID'),
+    '#default_value' => variable_get('dosomething_signup_nid_' . $form['nid']['#value'] . '_mailchimp_grouping_id'),
+    '#disabled' => TRUE,
   );
-
-  if ($type == 'campaign') {
-    $form['custom']['optins'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Third Party Opt-ins'),
-      '#description' => t('Custom campaign opt-in values.'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
-    );
-    $form['custom']['optins']['mailchimp_grouping_id'] = array(
-      '#type' => 'textfield',
-      '#title' => t('MailChimp Grouping ID'),
-      '#default_value' => variable_get('dosomething_signup_nid_' . $form['nid']['#value'] . '_mailchimp_grouping_id'),
-      '#disabled' => TRUE,
-    );
-    $form['custom']['optins']['mailchimp_group_name'] = array(
-      '#type' => 'textfield',
-      '#title' => t('MailChimp Group Name'),
-      '#default_value' => variable_get('dosomething_signup_nid_' . $form['nid']['#value'] . '_mailchimp_group_name'),
-      '#disabled' => TRUE,
-    );
-    $form['custom']['optins']['mobilecommons'] = array(
-      '#type' => 'textfield',
-      '#title' => t('MobileCommons Opt-in Path'),
-      '#default_value' => variable_get('dosomething_signup_nid_' . $form['nid']['#value'] . '_mobilecommons_id'),
-      '#disabled' => TRUE,
-    );
-  }
-
-  $form['#submit'][] = 'dosomething_helpers_save_custom_vars';
-}
-
-/**
- * Returns string of prefix used to identify a campaign or campaign group's custom variables.
- */
-function dosomething_helpers_get_custom_var_prefix($type, $nid) {
-  return "dosomething_{$type}_nid_{$nid}_";
-}
-
-/**
- * Saves custom variables.
- */
-function dosomething_helpers_save_custom_vars(&$form, &$form_state) {
-  $values = $form_state['values'];
-  $nid = $values['nid'];
-  // Gather all possible custom vars.
-  $type = $form['type']['#value'];
-  $prefix = dosomething_helpers_get_custom_var_prefix($type, $nid);
-  $variables = array(
-    'alt_color',
-    'alt_bg_fid',
-    'pitch_page_label',
+  $form['custom']['optins']['mailchimp_group_name'] = array(
+    '#type' => 'textfield',
+    '#title' => t('MailChimp Group Name'),
+    '#default_value' => variable_get('dosomething_signup_nid_' . $form['nid']['#value'] . '_mailchimp_group_name'),
+    '#disabled' => TRUE,
+  );
+  $form['custom']['optins']['mobilecommons'] = array(
+    '#type' => 'textfield',
+    '#title' => t('MobileCommons Opt-in Path'),
+    '#default_value' => variable_get('dosomething_signup_nid_' . $form['nid']['#value'] . '_mobilecommons_id'),
+    '#disabled' => TRUE,
   );
-  foreach ($variables as $variable) {
-    $$variable = "{$prefix}{$variable}";
-    // Save alt color and pitch page label.
-    if (in_array($variable, array('alt_color', 'pitch_page_label'))) {
-      dosomething_helpers_save_custom_var($$variable, $values[$$variable]);
-    }
-  }
-
-  // If a bg fid is set, or if a value already exists:
-  if (!empty($values[$alt_bg_fid]) || variable_get($alt_bg_fid)) {
-    // Save the bg fid.
-    dosomething_helpers_save_alt_bg_fid($alt_bg_fid, $nid, $values[$alt_bg_fid], $type);
-  }
-}
-
-/**
- * Handles saving a given variable $varname with given $value.
- *
- * @param string $varname
- *   The variable.name field to save (or delete).
- * @param string $value
- *   The variable.value to save. If empty, deletes variable $varname.
- */
-function dosomething_helpers_save_custom_var($varname, $value) {
-  if (empty($value)) {
-    variable_del($varname);
-  }
-  else {
-    variable_set($varname, $value);
-  }
-}
-
-/**
- * Handles saving a given $fid as alt_bg_fid variable for given node $nid.
- *
- * @param int $nid
- *   The node nid associated with the fid.
- * @param int $fid
- *   The file fid to save.
- */
-function dosomething_helpers_save_alt_bg_fid($varname, $nid, $fid, $type) {
-  // Get current value.
-  $current_value = variable_get($varname);
-  $module = "dosomething_{$type}";
-
-  // If it's the same, nothing to see here.  Keep moving.
-  if ($current_value == $fid) {
-    return;
-  }
-  // If we had a value and now we don't:
-  if (empty($fid) && is_numeric($current_value)) {
-    $file = file_load($current_value);
-    // Decrease the file's usage.
-    file_usage_delete($file, $module, 'node', $nid);
-    // Delete the variable.
-    variable_del($varname);
-    return;
-  }
-  // If we've made this far, we've got a new file to save.
-  $file = file_load($fid);
-  // And a value to set.
-  variable_set($varname, $fid);
-  // If file status not permanent, make it permanent.
-  if ($file->status != FILE_STATUS_PERMANENT) {
-    $file->status = FILE_STATUS_PERMANENT;
-    file_save($file);
-  }
-  // Increase file usage to avoid errors per https://drupal.org/comment/6866102.
-  file_usage_add($file, $module, 'node', $nid);
-  // If there was a file before:
-  if ($file = file_load($current_value)) {
-    // Decrease its usage.
-    file_usage_delete($file, $module, 'node', $nid);
-  }
 }
-

lib/modules/dosomething/dosomething_helpers/dosomething_helpers.variable.inc

@@ -39,6 +39,13 @@ function dosomething_helpers_variable_form($form, &$form_state, $node) {
     '#default_value' => $vars['alt_image_campaign_cover_nid'],
     '#size' => 6,
   );
+  $form['styles']['signup_button_copy'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Signup Button Copy'),
+    '#description' => t('Override the copy on the signup button.'),
+    '#default_value' => $vars['signup_button_copy'],
+    '#size' => 20,
+  );
   $form['actions'] = array(
     '#type' => 'actions',
     'submit' => array(
@@ -61,15 +68,19 @@ function dosomething_helpers_variable_form_submit(&$form, &$form_state) {
   foreach ($values as $name => $value) {
     // Save to the variable table.
     dosomething_helpers_set_variable($node, $name, $value);
-
   }
+  drupal_set_message("Updated.");
 }
 
-function dosomething_helpers_get_default_variables() {
+/**
+ * Returns array of all variable names.
+ */
+function dosomething_helpers_get_variable_names() {
   return array(
-    'alt_bg_fid' => NULL,
-    'alt_color' => NULL,
-    'alt_image_campaign_cover_nid' => NULL,
+    'alt_bg_fid',
+    'alt_color',
+    'alt_image_campaign_cover_nid',
+    'signup_button_copy',
   );
 }
 
@@ -80,7 +91,10 @@ function dosomething_helpers_get_default_variables() {
  *   Keyed by the variable name.
  */
 function dosomething_helpers_get_variables($nid) {
-  $vars = array();
+  // Initialize array with NULL defaults.
+  foreach (dosomething_helpers_get_variable_names() as $name) {
+    $vars[$name] = NULL;
+  }
   // Query for variable records for given $node.
   $result = db_select('dosomething_helpers_variable', 'v')
     ->fields('v')
@@ -91,7 +105,7 @@ function dosomething_helpers_get_variables($nid) {
   foreach ($result as $record) {
     $vars[$record->name] = $record->value;
   }
-  return array_merge(dosomething_helpers_get_default_variables(), $vars);
+  return $vars;
 }
 
 /**