security update core+modules

sites/all/modules/ctools/plugins/contexts/string.inc

@@ -14,12 +14,15 @@ $plugin = array(
   'title' => t('String'),
   'description' => t('A context that is just a string.'),
   'context' => 'ctools_context_create_string',
+  'edit form' => 'ctools_context_string_settings_form',
+  'defaults' => '',
   'keyword' => 'string',
   'no ui' => FALSE,
   'context name' => 'string',
   'convert list' => array(
     'raw' => t('Raw string'),
     'html_safe' => t('HTML-safe string'),
+    'uppercase_words_html_safe' => t('Uppercase words HTML-safe string'),
   ),
   'convert' => 'ctools_context_string_convert',
   'placeholder form' => array(
@@ -44,7 +47,8 @@ function ctools_context_create_string($empty, $data = NULL, $conf = FALSE) {
   }
 
   if ($data !== FALSE ) {
-    $context->data = $data;
+    // Support the array storage from the settings form but also handle direct input from arguments.
+    $context->data = is_array($data) ? $data['string'] : $data;
     $context->title = ($conf) ? check_plain($data['identifier']) : check_plain($data);
     return $context;
   }
@@ -59,6 +63,28 @@ function ctools_context_string_convert($context, $type) {
       return $context->data;
     case 'html_safe':
       return check_plain($context->data);
+    case 'uppercase_words_html_safe':
+      return ucwords(str_replace('-', ' ', check_plain($context->data)));
   }
 }
 
+/**
+ * String settings form.
+ */
+function ctools_context_string_settings_form($form, &$form_state) {
+  $conf = &$form_state['conf'];
+
+  $form['string'] = array(
+    '#title' => t('Enter the string'),
+    '#type' => 'textfield',
+    '#maxlength' => 512,
+    '#weight' => -10,
+    '#default_value' => $conf['string'],
+  );
+
+  return $form;
+}
+
+function ctools_context_string_settings_form_submit($form, &$form_state) {
+  $form_state['conf']['string'] = $form_state['values']['string'];
+}