Merge pull request #5491 from angaither/global

dev -> global

Author: angaither

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

@@ -169,8 +169,9 @@ function dosomething_campaign_preprocess_common_vars(&$vars, &$wrapper) {
 function dosomething_campaign_preprocess_win_module(&$vars, $wrapper) {
   $node = node_load($vars['nid']);
   $rb_progress = dosomething_reportback_get_reportback_total_plus_override($node->nid);
-  $copy_token_replaced = token_replace(t(variable_get('dosomething_campaign_win_copy'), array('node' => $node)));
-
+  $copy = t(variable_get('dosomething_campaign_win_copy'));
+  $copy_token_replaced = token_replace($copy, array('node' => $node));
+  
   // Get random promoted reportback image
   $parameters = array(
     'nid' => $vars['nid'],

lib/modules/dosomething/dosomething_global/dosomething_global.module

@@ -183,9 +183,13 @@ function dosomething_global_menu_alter(&$items) {
   $items['node/%node/translate']['access callback'] = 'user_access';
   $items['node/%node/translate']['access arguments'] = array('translate any entity');
 
-  // // Make sure all admins can see this
+  // Make sure all admins can see this
   $items['admin/content/search']['access callback'] = 'user_access';
   $items['admin/content/search']['access arguments'] = array('access administration menu');
+
+  // Remove regional admin access
+  $items['admin/config/regional/translate']['access callback'] = 'user_access';
+  $items['admin/config/regional/translate']['access arguments'] = array('translate any entity');
 }
 
 /**

lib/modules/dosomething/dosomething_shipment/dosomething_shipment.module

@@ -40,7 +40,7 @@ function dosomething_shipment_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('dosomething_shipment_admin_config_form'),
     'access callback' => 'user_access',
-    'access arguments' => array('administer modules'),
+    'access arguments' => array('edit campaign overrides'), // All US admins & editors have this, but regional admins do not
     'file' => 'dosomething_shipment.admin.inc',
   );
   return $items;

lib/modules/dosomething/dosomething_signup/dosomething_signup.module

@@ -575,7 +575,7 @@ function dosomething_signup_get_mbp_params($account, $node, $opt_in) {
     'mobile' => dosomething_user_get_field('field_mobile', $account),
     'event_id' => $node->nid,
     'campaign_title' => $wrapper->language($language)->title_field->value(),
-    'campaign_link' => $campaign_link,
+    'campaign_link' => url('node/' . $node->nid, $url_options),
     'user_language' => $language,
   );
 

lib/modules/dosomething/dosomething_user/dosomething_user.module

@@ -15,11 +15,6 @@ include_once 'dosomething_user.theme.inc';
  */
 function dosomething_user_preprocess_page(&$vars) {
   $school_api_endpoint = variable_get('dosomething_user_school_api_endpoint', 'http://lofischools.herokuapp.com/search');
-  if (isset($_SESSION['dosomething_user_log_login'])) {
-    dosomething_helpers_add_analytics_event("login", $_SESSION['dosomething_user_log_login']);
-    unset($_SESSION['dosomething_user_log_login']);
-  }
-
   $date_format = (dosomething_settings_get_geo_country_code() === 'US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY';
   drupal_add_js(
     array('dosomethingUser' =>
@@ -102,7 +97,7 @@ function dosomething_user_menu() {
   $items['admin/users/clean-slate'] = array(
     'title' => 'Clean Slate',
     'access callback' => 'user_access',
-    'access arguments' => array('access administration menu'),
+    'access arguments' => array('edit campaign overrides'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('dosomething_user_clean_slate_form'),
     'file' => 'dosomething_user.admin.inc',
@@ -223,8 +218,6 @@ function dosomething_user_is_staff($user = NULL) {
  * Implements hook_form_alter().
  */
 function dosomething_user_form_alter(&$form, $form_state, $form_id) {
-  global $user;
-  $account = $user;
   // If UPS is set to validate, and the user is from the US, validate address.
   $validate_address = (variable_get('dosomething_user_validate_address') && dosomething_settings_get_geo_country_code() === 'US');
 
@@ -237,7 +230,6 @@ function dosomething_user_form_alter(&$form, $form_state, $form_id) {
       // Helper text & additional data.
       _dosomething_user_add_signup_data($form);
       $form['#submit'][] = 'dosomething_user_login_submit';
-      $_SESSION['dosomething_user_log_login'] = "login";
     break;
 
     case 'user_profile_form':
@@ -447,16 +439,17 @@ function dosomething_user_user_pass_submit($form, &$form_state) {
     $account = user_load_by_mail($form_state['input']['name']);
     if (isset($account->mail)) {
       if (module_exists('dosomething_global')) {
-        $user_country_code = dosomething_global_convert_language_to_country($account->language);
+        $user_language = dosomething_global_get_user_language($account);
+        $user_country_code = dosomething_global_convert_language_to_country($user_language);
       }
       // Send external message request
       $params = array(
         'email' => $account->mail,
         'uid' => $account->uid,
         'first_name' => dosomething_user_get_field('field_first_name', $account),
         'reset_link' => user_pass_reset_url($account),
-        'user_language'     => $account->language,
-        'user_country'      => isset($user_country_code) ? $user_country_code : 'US'
+        'user_language'     => isset($user_language) ? $user_language : 'en',
+        'user_country'      => isset($user_country_code) ? $user_country_code : 'US',
       );
       if (module_exists('dosomething_mbp')) {
         dosomething_mbp_request('user_password', $params);
@@ -480,29 +473,49 @@ function dosomething_user_update_user($form, &$form_state) {
  * Does actions after a new user has registered via the web.
  * Sign user up for emails/texts.
  */
-function dosomething_user_new_user($form, &$form_state) {
-  $_SESSION['dosomething_user_log_login'] = "register";
+function dosomething_user_new_user($form, &$form_state)
+{
+  // Trigger an analytics event on registration
+  // @NOTE: The 'Authentication - Login' event will *also* be triggered here,
+  // since registered users are subsequently logged in to their new accounts.
+  dosomething_helpers_add_analytics_event('Authentication', 'Register');
+
+  // Sign the user up for transactional messaging
+  _dosomething_user_send_to_message_broker();
+}
+
+/**
+ * Sign the authenticated user up for transactional messaging through Message Broker
+ * if the required modules are enabled and the user meets relevant criteria.
+ *
+ * @see dosomething_user_new_user
+ */
+function _dosomething_user_send_to_message_broker() {
   if (!module_exists('dosomething_mbp') || !module_exists('dosomething_signup')) {
     return;
   }
 
-  global $user;
-  $account = $user;
-
   // Should we sign this kid up for messages?
   if (dosomething_user_is_under_thirteen()) {
     return;
   }
 
+  global $user;
+  $account = $user;
+  if (module_exists('dosomething_global')) {
+    $user_language = dosomething_global_get_user_language($account);
+    $user_country_code = dosomething_global_convert_language_to_country($user_language);
+  }
+
   // Send external message request.
   $params = array(
     'mailchimp_list_id' => dosomething_signup_get_mailchimp_list_id(),
     'email'             => $account->mail,
     'uid'               => $account->uid,
     'first_name'        => dosomething_user_get_field('field_first_name', $account),
     'birthdate'         => dosomething_user_get_field('field_birthdate', $account),
-    'user_language'     => $account->language,
-    'user_country'      => isset($user_country_code) ? $user_country_code : 'US'
+    'user_language'     => isset($user_language) ? $user_language : 'en',
+    'user_country'      => isset($user_country_code) ? $user_country_code : 'US',
   );
 
   // 26+ Club: Override Mobile Commons.
@@ -684,6 +697,16 @@ function dosomething_user_login_submit($form, &$form_state) {
   }
 }
 
+/**
+ * Implements hook_user_login().
+ */
+function dosomething_user_user_login(&$edit, $account) {
+  // Trigger an analytics event on login
+  // @NOTE: This will *also* be triggered on registration, since registered
+  // users are subsequently logged in to their new accounts.
+  dosomething_helpers_add_analytics_event('Authentication', 'Login');
+}
+
 /**
  * Implements hook_user_insert().
  */

lib/themes/dosomething/paraneue_dosomething/includes/preprocess.inc

@@ -73,13 +73,13 @@ function paraneue_dosomething_preprocess_page(&$vars) {
     'search_box'       => $vars['search_box'],
     'user_identifier'  => $vars['user_identifier'],
     'who_we_are'       => array(
-      'text' => theme_get_setting('header_who_we_are_text'),
-      'subtext' => theme_get_setting('header_who_we_are_subtext'),
-      'link' => theme_get_setting('header_who_we_are_link'),
+      'text' => t(theme_get_setting('header_who_we_are_text')),
+      'subtext' => t(theme_get_setting('header_who_we_are_subtext')),
+      'link' => t(theme_get_setting('header_who_we_are_link')),
     ),
     'explore_campaigns'=> array(
-      'text' => theme_get_setting('header_explore_campaigns_text'),
-      'subtext' => theme_get_setting('header_explore_campaigns_subtext'),
+      'text' => t(theme_get_setting('header_explore_campaigns_text')),
+      'subtext' => t(theme_get_setting('header_explore_campaigns_subtext')),
       // 'link' => theme_get_setting('header_explore_campaigns_link'),
     ),
   );
@@ -192,15 +192,15 @@ function paraneue_dosomething_preprocess_page(&$vars) {
     // Get new country code setting if it exists, if not fallback to old setting.
     // @TODO: Remove this after we've updated theme settings everywhere.
     $heading_setting = theme_get_setting($prefix . 'heading');
-    if(!$heading_setting === NULL) {
+    if($heading_setting === NULL) {
       $heading_setting = theme_get_setting('footer_links_' . $column . '_column_heading');
     }
     $footer_links[$column]['heading'] = $heading_setting;
 
     // Get new country code setting if it exists, if not fallback to old setting.
     // @TODO: Remove this after we've updated theme settings everywhere.
     $links_setting = theme_get_setting($prefix . 'links');
-    if(!$links_setting === NULL) {
+    if($links_setting === NULL) {
       $links_setting = theme_get_setting('footer_links_' . $column . '_column_links');
     }
     $links = explode("\n", trim($links_setting));

lib/themes/dosomething/paraneue_dosomething/theme-settings.php

@@ -7,14 +7,6 @@
 require_once PARANEUE_PATH . '/includes/helpers.inc';
 
 function paraneue_dosomething_form_system_theme_settings_alter(&$form, &$form_state) {
-  $form['theme_settings'] = array(
-      '#type'        => 'fieldset',
-      '#title'       => t('Theme Settings'),
-      '#collapsible' => FALSE,
-      '#collapsed'   => FALSE,
-      '#weight'      => -19
-  );
-
   $form['feature_flags'] = array(
       '#type'        => 'fieldset',
       '#title'       => t('Feature Flags'),
@@ -300,7 +292,7 @@ function _paraneue_dosomething_theme_settings_footer(&$form, $form_state) {
       // Get new country code setting if it exists, if not fallback to old setting.
       // @TODO: Remove this after we've updated theme settings everywhere.
       $heading_default = theme_get_setting('footer_links_' . $country . '_' . $column . '_column_heading');
-      if(!$heading_default === NULL) {
+      if($heading_default === NULL) {
         $heading_default = theme_get_setting('footer_links_' . $column . '_column_heading');
       }
 
@@ -313,7 +305,7 @@ function _paraneue_dosomething_theme_settings_footer(&$form, $form_state) {
       // Get new country code setting if it exists, if not fallback to old setting.
       // @TODO: Remove this after we've updated theme settings everywhere.
       $links_default = theme_get_setting('footer_links_' . $country . '_' . $column . '_column_links');
-      if(!$links_default === NULL) {
+      if($links_default === NULL) {
         $links_default = theme_get_setting('footer_links_' . $column . '_column_links');
       }
 

pots/paraneue_dosomething.pot

@@ -491,10 +491,6 @@ msgstr ""
 msgid "Confirm Password"
 msgstr ""
 
-#: (duplicate) includes/form.inc:93 ;97
-msgid "!title !required"
-msgstr ""
-
 #: includes/helpers.inc:40
 msgid "Facebook"
 msgstr ""