";
$output .= l(t('+') . ' ' . t('Add'), $_GET['q'], array('fragment' => $region, 'attributes' => array('class' => array('add-block'))));
$output .= $form[$region]['#title'];
- $output .= "
";
+ $output .= '';
$output .= theme('table', array('rows' => $rows, 'attributes' => $attr));
}
return $output;
@@ -100,14 +100,13 @@ function template_preprocess_context_block_browser(&$vars) {
//add help text to tell people how to use the block browser
$help_text = array(
'#prefix' => '',
- '#markup' => t('To add a block to the current region, simply click on the block. You may use the category filter to filter by
- block type or the search filter to find the block that you wish to add.'),
+ '#markup' => t('To add a block to the current region, simply click on the block. You may use the category filter to filter by block type or the search filter to find the block that you wish to add.'),
'#suffix' => '
',
);
$filter_label = array(
'#prefix' => '',
- '#markup' => t('Search Filter'),
+ '#markup' => t('Search filter'),
'#suffix' => '
',
);
diff --git a/sites/all/modules/contrib/admin/features/features.admin.inc b/sites/all/modules/contrib/admin/features/features.admin.inc
index c2cc508..2dea423 100644
--- a/sites/all/modules/contrib/admin/features/features.admin.inc
+++ b/sites/all/modules/contrib/admin/features/features.admin.inc
@@ -88,6 +88,12 @@ function features_settings_form($form, $form_state) {
'#default_value' => variable_get('features_rebuild_on_flush', TRUE),
'#description' => t('If you have a large site with many features, you may experience lag on full cache clear. If disabled, features will rebuild only when viewing the features list or saving the modules list.'),
);
+ $form['general']['features_rebuild_modules_page'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Rebuild features on accessing modules list page'),
+ '#default_value' => variable_get('features_rebuild_modules_page', FALSE),
+ '#description' => t('If you have a large site with many features, you may experience lag on accessing the modules administration page. If disabled, features will not rebuild when viewing the modules list.'),
+ );
return system_settings_form($form);
}
@@ -109,7 +115,7 @@ function features_export_form($form, $form_state, $feature = NULL) {
$feature_name = !empty($feature->name) ? $feature->name : '';
$form = array(
- '#attributes' => array('class' => array('features-export-form')),
+ '#attributes' => array('class' => array('features-export-form', 'clearfix')),
'#feature' => isset($feature) ? $feature : NULL,
);
$form['info'] = array(
@@ -203,7 +209,7 @@ function features_export_form($form, $form_state, $feature = NULL) {
$form['advanced']['generate'] = array(
'#type' => 'submit',
'#value' => t('Generate feature'),
- '#submit' => array('features_export_build_form_submit'),
+ '#submit' => array('features_export_build_form_submit', 'features_form_rebuild'),
);
}
// build the Component Listing panel on the right
@@ -239,7 +245,7 @@ function features_export_form($form, $form_state, $feature = NULL) {
'#type' => 'submit',
'#value' => t('Download feature'),
'#weight' => 10,
- '#submit' => array('features_export_build_form_submit'),
+ '#submit' => array('features_export_build_form_submit', 'features_form_rebuild'),
);
$form['#attached']['library'][] = array('system', 'ui.dialog');
@@ -597,6 +603,7 @@ function _features_export_build($feature, &$form_state) {
$component_export['selected'][$section] = array();
}
$options = features_invoke($component, 'features_export_options');
+ drupal_alter('features_export_options', $options, $component);
if (!empty($options)) {
$exported_components = !empty($exported_features_info[$component]) ? $exported_features_info[$component] : array();
$new_components = !empty($new_features_info[$component]) ? $new_features_info[$component] : array();
@@ -755,7 +762,7 @@ function features_export_form_rebuild($form, &$form_state) {
function features_export_components_json($feature_name) {
module_load_include('inc', 'features', 'features.export');
- $export = array();
+ $export = array('features' => array());
if (!empty($_POST['items'])) {
$excluded = (!empty($_POST['excluded'])) ? $_POST['excluded'] : array();
$stub = array();
@@ -843,7 +850,7 @@ function _features_export_generate($export, $form_state, $feature = NULL) {
}
// If either update status-related keys are provided, add a project key
// corresponding to the module name.
- if (!empty($form_state['values']['version']) || !empty($form_state['values']['project_status_url'])) {
+ if (!empty($form_state['values']['version']) && !empty($form_state['values']['project_status_url'])) {
$export['project'] = $form_state['values']['module_name'];
}
if (!empty($form_state['values']['version'])) {
@@ -864,7 +871,7 @@ function features_export_build_form_submit($form, &$form_state) {
$feature = $form['#feature'];
$export = _features_export_build($feature, $form_state);
$export = _features_export_generate($export, $form_state, $feature);
- $generate = ($form_state['values']['op'] == $form_state['values']['generate']);
+ $generate = isset($form_state['values']['generate']) && ($form_state['values']['op'] == $form_state['values']['generate']);
$module_name = $form_state['values']['module_name'];
if ($generate && !user_access('generate features')) {
@@ -900,6 +907,35 @@ function features_export_build_form_submit($form, &$form_state) {
$tar = array();
$filenames = array();
+ // Copy any files if _files key is there.
+ if (!empty($files['_files'])) {
+ foreach ($files['_files'] as $file_name => $file_info) {
+ if ($generate) {
+ // See if files are in a sub directory.
+ if (strpos($file_name, '/')) {
+ $file_directory = $directory . '/' . substr($file_name, 0, strrpos($file_name, '/'));
+ if (!is_dir($file_directory)) {
+ mkdir($file_directory);
+ }
+ }
+ if (!empty($file_info['file_path'])) {
+ file_unmanaged_copy($file_info['file_path'], "{$directory}/{$file_name}", FILE_EXISTS_REPLACE);
+ }
+ elseif ($file_info['file_content']) {
+ file_put_contents("{$directory}/{$file_name}", $file_info['file_content']);
+ }
+ }
+ else {
+ if (!empty($file_info['file_path'])) {
+ print features_tar_create("{$module_name}/{$file_name}", file_get_contents($file_info['file_path']));
+ }
+ elseif ($file_info['file_content']) {
+ features_tar_create("{$directory}/{$file_name}", $file_info['file_content']);
+ }
+ }
+ }
+ unset($files['_files']);
+ }
foreach ($files as $extension => $file_contents) {
if (!in_array($extension, array('module', 'info'))) {
$extension .= '.inc';
@@ -973,28 +1009,14 @@ function features_filter_hidden($module) {
* Form constructor for the features configuration form.
*/
function features_admin_form($form, $form_state) {
+ $features = _features_get_features_list();
+ $modules = array_filter(features_get_modules(), 'features_filter_hidden');
+ $conflicts = features_get_conflicts();
+
// Load export functions to use in comparison.
module_load_include('inc', 'features', 'features.export');
- // Clear & rebuild key caches
- features_get_info(NULL, NULL, TRUE);
- features_rebuild();
-
- $modules = array_filter(features_get_modules(), 'features_filter_hidden');
- $features = array_filter(features_get_features(), 'features_filter_hidden');
- $conflicts = features_get_conflicts();
-
- foreach ($modules as $key => $module) {
- if ($module->status && !empty($module->info['dependencies'])) {
- foreach ($module->info['dependencies'] as $dependent) {
- if (isset($features[$dependent])) {
- $features[$dependent]->dependents[$key] = $module->info['name'];
- }
- }
- }
- }
-
- if ( empty($features) ) {
+ if (empty($features) ) {
$form['no_features'] = array(
'#markup' => t('No Features were found. Please use the !create_link link to create
a new Feature module, or upload an existing Feature to your modules directory.',
@@ -1073,6 +1095,7 @@ function features_admin_form($form, $form_state) {
}
$href = "admin/structure/features/{$name}";
+ $href_overridden = module_exists('diff') ? $href . '/diff' : $href;
$module_name = (user_access('administer features')) ? l($module->info['name'], $href) : $module->info['name'];
$form[$package]['status'][$name] = array(
'#type' => 'checkbox',
@@ -1102,7 +1125,7 @@ function features_admin_form($form, $form_state) {
$state .= l(t('Check'), "admin/structure/features/{$name}/status", array('attributes' => array('class' => array('admin-check'))));
$state .= theme('features_storage_link', array('storage' => FEATURES_REBUILDING, 'path' => $href));
$state .= theme('features_storage_link', array('storage' => FEATURES_NEEDS_REVIEW, 'path' => $href));
- $state .= theme('features_storage_link', array('storage' => FEATURES_OVERRIDDEN, 'path' => $href));
+ $state .= theme('features_storage_link', array('storage' => FEATURES_OVERRIDDEN, 'path' => $href_overridden));
$state .= theme('features_storage_link', array('storage' => FEATURES_DEFAULT, 'path' => $href));
}
elseif (!empty($conflicts[$name])) {
@@ -1126,7 +1149,7 @@ function features_admin_form($form, $form_state) {
// As of 7.0 beta 2 it matters where the "vertical_tabs" element lives on the
// the array. We add it late, but at the beginning of the array because that
// keeps us away from trouble.
- $form = array('packages' => array('#type' => 'vertical_tabs')) + $form;
+ $form = array_merge(array('packages' => array('#type' => 'vertical_tabs')), $form);
$form['buttons'] = array(
'#theme' => 'features_form_buttons',
@@ -1311,7 +1334,7 @@ function features_form_submit(&$form, &$form_state) {
// page callback rather than as part of the submit handler as some modules
// have includes/other directives of importance in hooks that have already
// been called in this page load.
- $form_state['redirect'] = 'admin/structure/features/cleanup/clear';
+ $form_state['redirect'] = array('admin/structure/features/cleanup', array('query' => array('token' => drupal_get_token())));
$features = $form['#features'];
if (!empty($features)) {
@@ -1328,21 +1351,26 @@ function features_form_submit(&$form, &$form_state) {
}
/**
- * Form for clearing cache after enabling a feature.
+ * Submit handler for the 'manage features' form rebuild button.
*/
-function features_cleanup_form($form, $form_state, $cache_clear = FALSE) {
- // Clear caches if we're getting a post-submit redirect that requests it.
- if ($cache_clear) {
- drupal_flush_all_caches();
+function features_form_rebuild() {
+ cache_clear_all('features:features_list', 'cache');
+}
+/**
+ * Callback for clearing cache after enabling a feature.
+ */
+function features_cleanup() {
+ if (!empty($_GET['token']) && drupal_valid_token($_GET['token'])) {
+ drupal_flush_all_caches();
// The following functions need to be run because drupal_flush_all_caches()
// runs rebuilds in the wrong order. The node type cache is rebuilt *after*
// the menu is rebuilt, meaning that the menu tree is stale in certain
// circumstances after drupal_flush_all_caches(). We rebuild again.
menu_rebuild();
- }
-
drupal_goto('admin/structure/features');
+ }
+ return MENU_NOT_FOUND;
}
/**
@@ -1587,3 +1615,42 @@ function _features_get_used($module_name = NULL) {
$features_ignore_conflicts = $old_value;
return $conflicts;
}
+
+/**
+ * Retrieves the array of features as expected on the Manage Features form.
+ * Uses caching for performance reasons if caching is enabled.
+ *
+ * @internal - This function might return cached result with outdated data,
+ * use with caution.
+ */
+function _features_get_features_list() {
+ $features = array();
+
+ $cache = cache_get('features:features_list');
+ if ($cache) {
+ $features = $cache->data;
+ }
+
+ if (empty($features)) {
+ // Clear & rebuild key caches
+ features_get_info(NULL, NULL, TRUE);
+ features_rebuild();
+
+ $modules = array_filter(features_get_modules(), 'features_filter_hidden');
+ $features = array_filter(features_get_features(), 'features_filter_hidden');
+
+ foreach ($modules as $key => $module) {
+ if ($module->status && !empty($module->info['dependencies'])) {
+ foreach ($module->info['dependencies'] as $dependent) {
+ if (isset($features[$dependent])) {
+ $features[$dependent]->dependents[$key] = $module->info['name'];
+ }
+ }
+ }
+ }
+
+ cache_set('features:features_list', $features);
+ }
+
+ return $features;
+}
diff --git a/sites/all/modules/contrib/admin/features/features.api.php b/sites/all/modules/contrib/admin/features/features.api.php
index f5984e0..d7c7ede 100644
--- a/sites/all/modules/contrib/admin/features/features.api.php
+++ b/sites/all/modules/contrib/admin/features/features.api.php
@@ -42,7 +42,7 @@
* are declared "dynamically" or are part of a family of components.
*
* 'alter_type': What type of alter hook this hook uses. 'normal' is called
- * after the main hook is called. 'inline' is embeded within the default hook
+ * after the main hook is called. 'inline' is embedded within the default hook
* and may not be implemented by some default hooks.
* 'none' is no alter hook exists. Defaults to 'normal'
*
@@ -157,7 +157,8 @@ function hook_features_export_options() {
* of the module, e.g. the key for `hook_example` should simply be `example`
* The values in the array can also be in the form of an associative array
* with the required key of 'code' and optional key of 'args', if 'args' need
- * to be added to the hook.
+ * to be added to the hook. Alternate it can be an associative array in the
+ * same style as hook_features_export_files() to add additional files.
*/
function hook_features_export_render($module_name, $data, $export = NULL) {
$code = array();
@@ -309,11 +310,31 @@ function hook_features_pipe_COMPONENT_alter(&$pipe, $data, $export) {
* The module being exported contained in $export['module_name'].
*/
function hook_features_pipe_alter(&$pipe, $data, $export) {
- if ($export['component'] == 'node' && in_array($data, 'my-node-type')) {
+ if ($export['component'] == 'node' && in_array('my-node-type', $data)) {
$pipe['dependencies'][] = 'mymodule';
}
}
+
+/**
+ * Add extra files to the exported file.
+ *
+ * @return array
+ * An array of files, keyed by file name that will appear in feature and
+ * with either file_path key to indicate where to copy the file from or
+ * file_content key to indicate the contents of the file.
+ */
+function hook_features_export_files($module_name, $export) {
+ return array('css/main.css' => array('file_content' => 'body {background-color:blue;}'));
+}
+
+/**
+ * Alter the extra files added to the export.
+ */
+function hook_features_export_files_alter(&$files, $module_name, $export) {
+ $files['css/main.css']['file_content'] = 'body {background-color:black;}';
+}
+
/**
* @defgroup features_component_alter_hooks Feature's component alter hooks
* @{
diff --git a/sites/all/modules/contrib/admin/features/features.drush.inc b/sites/all/modules/contrib/admin/features/features.drush.inc
index c1a15ac..4be5d98 100644
--- a/sites/all/modules/contrib/admin/features/features.drush.inc
+++ b/sites/all/modules/contrib/admin/features/features.drush.inc
@@ -32,6 +32,12 @@ function features_drush_command() {
),
'drupal dependencies' => array('features'),
'aliases' => array('fl', 'features'),
+ 'outputformat' => array(
+ 'default' => 'table',
+ 'pipe-format' => 'list',
+ 'field-labels' => array('name' => 'Name', 'feature' => 'Feature', 'status' => 'Status', 'version' => 'Version', 'state' => 'State'),
+ 'output-data-type' => 'format-table',
+ ),
);
$items['features-export'] = array(
'description' => "Export a feature from your site into a module.",
@@ -43,6 +49,7 @@ function features_drush_command() {
'destination' => "Destination path (from Drupal root) of the exported feature. Defaults to '" . $path . "'.",
'version-set' => "Specify a version number for the feature.",
'version-increment' => "Increment the feature's version number.",
+ 'ignore-conflicts' => "Ignore conflicts and export all components.",
),
'drupal dependencies' => array('features'),
'aliases' => array('fe'),
@@ -72,6 +79,9 @@ function features_drush_command() {
'not-exported' => array(
'description' => 'Show only components that have not been exported.',
),
+ 'info-style' => array(
+ 'description' => 'Export components in format suitable for using in an info file.',
+ ),
),
'aliases' => array('fc'),
);
@@ -134,6 +144,18 @@ function features_drush_command() {
'aliases' => array('fd'),
);
+ $items['features-diff-all'] = array(
+ 'description' => "Show the code difference for all enabled features not in their default state.",
+ 'arguments' => array(
+ 'feature_exclude' => 'A space-delimited list of features to exclude from being reverted.',
+ ),
+ 'options' => array(
+ 'force' => "Bypass the confirmations. This is useful if you want to output all of the diffs to a log file.",
+ ),
+ 'drupal dependencies' => array('features', 'diff'),
+ 'aliases' => array('fda'),
+ );
+
return $items;
}
@@ -191,12 +213,12 @@ function drush_features_list() {
}
module_load_include('inc', 'features', 'features.export');
- $rows = array(array(dt('Name'), dt('Feature'), dt('Status'), dt('Version'), dt('State')));
// Sort the Features list before compiling the output.
$features = features_get_features(NULL, TRUE);
ksort($features);
+ $rows = array();
foreach ($features as $k => $m) {
switch (features_get_storage($m->name)) {
case FEATURES_DEFAULT:
@@ -214,16 +236,19 @@ function drush_features_list() {
($m->status == 0 && ($status == 'all' || $status == 'disabled')) ||
($m->status == 1 && ($status == 'all' || $status == 'enabled'))
) {
- $rows[] = array(
- $m->info['name'],
- $m->name,
- $m->status ? dt('Enabled') : dt('Disabled'),
- $m->info['version'],
- $storage
+ $rows[$k] = array(
+ 'name' => $m->info['name'],
+ 'feature' => $m->name,
+ 'status' => $m->status ? dt('Enabled') : dt('Disabled'),
+ 'version' => $m->info['version'],
+ 'state' => $storage
);
}
}
- drush_print_table($rows, TRUE);
+ if (version_compare(DRUSH_VERSION, '6.0', '<')) {
+ drush_print_table($rows, TRUE);
+ }
+ return $rows;
}
/**
@@ -253,10 +278,13 @@ function drush_features_components() {
elseif (drush_get_option(array('not-exported', 'o'), NULL)) {
$options['exported'] = FALSE;
}
+ if (drush_get_option(array('info-style', 'is'), NULL)) {
+ $options['info style'] = TRUE;
+ }
$filtered_components = _drush_features_component_filter($components, $args, $options);
if ($filtered_components){
- _drush_features_component_print($filtered_components);
+ _drush_features_component_print($filtered_components, $options);
}
}
@@ -290,7 +318,7 @@ function _drush_features_component_filter($all_components, $patterns = array(),
// First filter on exported state.
foreach ($all_components as $source => $components) {
foreach ($components as $name => $title) {
- $exported = sizeof($components_map[$source][$name]) > 0;
+ $exported = !empty($components_map[$source][$name]);
if ($exported) {
if ($options['exported']) {
$pool[$source][$name] = $title;
@@ -318,7 +346,13 @@ function _drush_features_component_filter($all_components, $patterns = array(),
// Rewrite * to %. Let users use both as wildcard.
$pattern = strtr($pattern, array('*' => '%'));
$sources = array();
- list($source_pattern, $component_pattern) = explode(':', $pattern, 2);
+ if (strpos($pattern, ':') !== FALSE) {
+ list($source_pattern, $component_pattern) = explode(':', $pattern, 2);
+ }
+ else {
+ $source_pattern = $pattern;
+ $component_pattern = '';
+ }
// If source is empty, use a pattern.
if ($source_pattern == '') {
$source_pattern = '%';
@@ -383,7 +417,7 @@ function _drush_features_component_filter($all_components, $patterns = array(),
return drush_set_error('', dt('Ambiguous component "!component", matches !matches', array('!component' => $component_pattern, '!matches' => join(', ', $matches))));
}
}
- if (!is_array($selected[$source])) {
+ if (empty($selected[$source])) {
$selected[$source] = array();
}
$selected[$source] += array_intersect_key($pool[$source], array_flip($matches));
@@ -404,7 +438,7 @@ function _drush_features_component_filter($all_components, $patterns = array(),
if ($options['provided by'] && $options['exported'] ) {
foreach ($selected as $source => $components) {
foreach ($components as $name => $title) {
- $exported = sizeof($components_map[$source][$name]) > 0;
+ $exported = !empty($components_map[$source][$name]);
if ($exported) {
$provided_by[$source . ':' . $name] = join(', ', $components_map[$source][$name]);
}
@@ -421,11 +455,17 @@ function _drush_features_component_filter($all_components, $patterns = array(),
/**
* Prints a list of filtered components.
*/
-function _drush_features_component_print($filtered_components) {
+function _drush_features_component_print($filtered_components, $options = array()) {
$rows = array(array(dt('Available sources')));
foreach ($filtered_components['components'] as $source => $components) {
foreach ($components as $name => $value) {
- $row = array($source .':'. $name);
+ if (!empty($options['info style'])) {
+ // Output as .info file style.
+ $row = array('features[' . $source . '][] = "' . $name . '"');
+ }
+ else {
+ $row = array($source .':'. $name);
+ }
if (isset($filtered_components['sources'][$source .':'. $name])) {
$row[] = dt('Provided by') . ': ' . $filtered_components['sources'][$source .':'. $name];
}
@@ -447,9 +487,11 @@ function drush_features_export() {
return drush_set_error('', 'No components supplied.');
}
$components = _drush_features_component_list();
- $options = array(
- 'exported' => FALSE,
- );
+ $options = array();
+
+ if (!drush_get_option('ignore-conflicts', FALSE)) {
+ $options['exported'] = FALSE;
+ }
$filtered_components = _drush_features_component_filter($components, $args, $options);
$items = $filtered_components['components'];
@@ -477,7 +519,7 @@ function drush_features_export() {
drush_die('Aborting.');
}
$export = _drush_features_generate_export($items, $module);
- _features_populate($items, $export[info], $export[name]);
+ _features_populate($items, $export['info'], $export['name']);
_drush_features_export($export['info'], $module, $directory);
}
}
@@ -579,9 +621,40 @@ function _drush_features_export($info, $module_name = NULL, $directory = NULL) {
drush_op('mkdir', $directory);
}
if (is_dir($directory)) {
+ // Ensure that the export will be created in the English language.
+ // The export language must be set before flushing caches as that can
+ // result into translatables being statically cached.
+ $language = _features_export_language();
+
drupal_flush_all_caches();
$export = _drush_features_generate_export($info, $module_name);
$files = features_export_render($export, $module_name, TRUE);
+
+ // Restore the language
+ _features_export_language($language);
+
+ // Copy any files if _files key is there.
+ if (!empty($files['_files'])) {
+ foreach ($files['_files'] as $file_name => $file_info) {
+ // See if files are in a sub directory.
+ if (strpos($file_name, '/')) {
+ $file_directory = $directory . '/' . substr($file_name, 0, strrpos($file_name, '/'));
+ if (!is_dir($file_directory)) {
+ drush_op('mkdir', $file_directory);
+ }
+ }
+ if (!empty($file_info['file_path'])) {
+ drush_op('file_unmanaged_copy', $file_info['file_path'], "{$directory}/{$file_name}", FILE_EXISTS_REPLACE);
+ }
+ elseif (!empty($file_info['file_content'])) {
+ drush_op('file_put_contents', "{$directory}/{$file_name}", $file_info['file_content']);
+ }
+ else {
+ drush_log(dt("Entry for @file_name.in !module is invalid. ", array('!module' => $module_name, '@file_name' => $file_name)), 'ok');
+ }
+ }
+ unset($files['_files']);
+ }
foreach ($files as $extension => $file_contents) {
if (!in_array($extension, array('module', 'info'))) {
$extension .= '.inc';
@@ -635,7 +708,7 @@ function _drush_features_generate_export(&$info, &$module_name) {
}
else {
// Split version number parts.
- $pattern = '/([0-9]-[a-z]+([0-9])+)/';
+ $pattern = '/([0-9]-[a-z]+([0-9]+))/';
$matches = array();
preg_match($pattern, $version_minor, $matches);
$number = array_pop($matches);
@@ -747,7 +820,7 @@ function drush_features_revert() {
}
}
else {
- drush_features_list();
+ drush_print_table(drush_features_list());
return;
}
}
@@ -801,7 +874,7 @@ function drush_features_revert_all() {
*/
function drush_features_diff() {
if (!$args = func_get_args()) {
- drush_features_list();
+ drush_print_table(drush_features_list());
return;
}
$module = $args[0];
@@ -886,6 +959,62 @@ function drush_features_diff() {
}
}
+/**
+ * Diff all enabled features that are not in their default state.
+ *
+ * @param ...
+ * (Optional) A list of features to exclude from being reverted.
+ */
+function drush_features_diff_all() {
+ module_load_include('inc', 'features', 'features.export');
+ $features_to_exclude = func_get_args();
+
+ $features_to_revert = array();
+ foreach (features_get_features(NULL, TRUE) as $module) {
+ if ($module->status && !in_array($module->name, $features_to_exclude)) {
+ switch (features_get_storage($module->name)) {
+ case FEATURES_OVERRIDDEN:
+ case FEATURES_NEEDS_REVIEW:
+ case FEATURES_REBUILDABLE:
+ $features_to_diff[] = $module->name;
+ break;
+ }
+ }
+ }
+
+ if ($features_to_diff) {
+
+ // Check if the user wants to apply the force option.
+ $force = drush_get_option('force');
+
+ if($force) {
+ foreach ($features_to_diff as $module) {
+
+ drush_print(dt('Diff for !module:', array('!module' => $module)));
+
+ drush_invoke_process(drush_sitealias_get_record('@self'), 'features-diff', array($module));
+ }
+ }
+ else {
+
+ drush_print(dt('A diff will be performed for the following modules: !modules',
+ array('!modules' => implode(', ', $features_to_diff))
+ ));
+
+ if (drush_confirm(dt('Do you want to continue?'))) {
+ foreach ($features_to_diff as $module) {
+ if (drush_confirm(dt('Diff !module?', array('!module' => $module)))) {
+ drush_invoke_process(drush_sitealias_get_record('@self'), 'features-diff', array($module));
+ }
+ }
+ }
+ else {
+ return drush_user_abort('Aborting.');
+ }
+ }
+ }
+}
+
/**
* Helper function to call drush_set_error().
*
diff --git a/sites/all/modules/contrib/admin/features/features.export.inc b/sites/all/modules/contrib/admin/features/features.export.inc
index 154b26b..340818b 100644
--- a/sites/all/modules/contrib/admin/features/features.export.inc
+++ b/sites/all/modules/contrib/admin/features/features.export.inc
@@ -45,6 +45,9 @@ function features_populate($info, $module_name) {
* @return fully populated $export array.
*/
function _features_populate($pipe, &$export, $module_name = '', $reset = FALSE) {
+ // Ensure that the export will be created in the english language.
+ $language = _features_export_language();
+
if ($reset) {
drupal_static_reset(__FUNCTION__);
}
@@ -89,6 +92,7 @@ function _features_populate($pipe, &$export, $module_name = '', $reset = FALSE)
}
}
}
+ _features_export_language($language);
return $export;
}
@@ -295,6 +299,11 @@ function features_export_render($export, $module_name, $reset = FALSE) {
}
foreach ($hooks as $hook_name => $hook_info) {
+ // These are purely files that will be copied over.
+ if (is_array($hook_info) && (!empty($hook_info['file_path']) || !empty($hook_info['file_content']))) {
+ $code['_files'][$hook_name] = $hook_info;
+ continue;
+ }
$hook_code = is_array($hook_info) ? $hook_info['code'] : $hook_info;
$hook_args = is_array($hook_info) && !empty($hook_info['args']) ? $hook_info['args'] : '';
$hook_file = is_array($hook_info) && !empty($hook_info['file']) ? $hook_info['file'] : $file['name'];
@@ -305,7 +314,17 @@ function features_export_render($export, $module_name, $reset = FALSE) {
// Finalize strings to be written to files
$code = array_filter($code);
foreach ($code as $filename => $contents) {
- $code[$filename] = "info);
- _features_sanitize($export);
+ features_sanitize($module->info);
+ features_sanitize($export);
$compare = array('normal' => features_export_info($export), 'default' => features_export_info($module->info));
if ($compare['normal'] !== $compare['default']) {
@@ -408,8 +427,8 @@ function features_detect_overrides($module) {
if ($state != FEATURES_DEFAULT) {
$normal = features_get_normal($component, $module->name);
$default = features_get_default($component, $module->name);
- _features_sanitize($normal);
- _features_sanitize($default);
+ features_sanitize($normal, $component);
+ features_sanitize($default, $component);
$compare = array('normal' => features_var_export($normal), 'default' => features_var_export($default));
if (_features_linetrim($compare['normal']) !== _features_linetrim($compare['default'])) {
@@ -663,8 +682,7 @@ function features_get_signature($state = 'default', $module_name, $component, $r
break;
}
if (!empty($objects)) {
- $objects = (array) $objects;
- _features_sanitize($objects);
+ features_sanitize($objects, $component);
return md5(_features_linetrim(features_var_export($objects)));
}
return FALSE;
@@ -721,7 +739,7 @@ function features_get_normal($component, $module_name, $reset = FALSE) {
// Special handling for dependencies component.
if ($component === 'dependencies') {
- $cache[$module_name][$component] = isset($module->info['dependencies']) ? array_filter($module->info['dependencies'], 'module_exists') : array();
+ $cache[$module_name][$component] = isset($module->info['dependencies']) ? array_filter($module->info['dependencies'], '_features_module_exists') : array();
}
// All other components.
else {
@@ -739,6 +757,17 @@ function features_get_normal($component, $module_name, $reset = FALSE) {
return isset($cache[$module_name][$component]) ? $cache[$module_name][$component] : FALSE;
}
+/**
+ * Helper function to determine if a module is enabled
+ * @param $module
+ * This module name comes from the .info file and can have version info in it.
+ */
+function _features_module_exists($module) {
+ $parsed_dependency = drupal_parse_dependency($module);
+ $name = $parsed_dependency['name'];
+ return module_exists($name);
+}
+
/**
* Get defaults for a given module/component pair.
*/
@@ -815,6 +844,13 @@ function features_get_default($component, $module_name = NULL, $alter = TRUE, $r
/**
* Get a map of components to their providing modules.
+ *
+ * @param string $component
+ * @param string $attribute
+ * @param callable $callback
+ * @param bool $reset
+ *
+ * @return array|bool
*/
function features_get_default_map($component, $attribute = NULL, $callback = NULL, $reset = FALSE) {
$map = &drupal_static(__FUNCTION__, array());
@@ -863,6 +899,9 @@ function features_get_default_map($component, $attribute = NULL, $callback = NUL
* Retrieve an array of features/components and their current states.
*/
function features_get_component_states($features = array(), $rebuild_only = TRUE, $reset = FALSE) {
+ // Ensure that the export will be created in the English language.
+ $language = _features_export_language();
+
if ($reset) {
drupal_static_reset(__FUNCTION__);
}
@@ -873,7 +912,7 @@ function features_get_component_states($features = array(), $rebuild_only = TRUE
// Retrieve only rebuildable components if requested.
features_include();
- $components = array_keys(features_get_components());
+ $components = array_keys(features_get_components(NULL, NULL, $reset));
if ($rebuild_only) {
foreach ($components as $k => $component) {
if (!features_hook($component, 'features_rebuild')) {
@@ -956,6 +995,9 @@ function features_get_component_states($features = array(), $rebuild_only = TRUE
foreach ($return as $k => $v) {
$return[$k] = array_intersect_key($return[$k], array_flip($components));
}
+
+ _features_export_language($language);
+
return $return;
}
@@ -970,25 +1012,49 @@ function _features_linetrim($code) {
return implode("\n", $code);
}
+/**
+ * Helper function to "sanitize" an array or object.
+ * Converts everything to an array, sorts the keys, removes recursion.
+ * @param $array
+ * @param $component string name of component
+ * @param bool $remove_empty if set, remove null or empty values for assoc arrays.
+ */
+function features_sanitize(&$array, $component = NULL, $remove_empty = TRUE) {
+ $array = features_remove_recursion($array);
+ if (isset($component)) {
+ $ignore_keys = _features_get_ignore_keys($component);
+ // remove keys to be ignored
+ if (count($ignore_keys)) {
+ _features_remove_ignores($array, $ignore_keys);
+ }
+ }
+ _features_sanitize($array, $remove_empty);
+}
+
/**
* "Sanitizes" an array recursively, performing two key operations:
* - Sort an array by its keys (assoc) or values (non-assoc)
- * - Remove any null or empty values for associative arrays (array_filter()).
+ * @param bool $remove_empty if set, remove null or empty values for assoc arrays.
*/
-function _features_sanitize(&$array) {
+function _features_sanitize(&$array, $remove_empty = TRUE) {
+ if (is_object($array)) {
+ $array = get_object_vars($array);
+ }
if (is_array($array)) {
$is_assoc = _features_is_assoc($array);
if ($is_assoc) {
ksort($array, SORT_STRING);
- $array = array_filter($array);
+ if ($remove_empty) {
+ $array = array_filter($array);
+ }
}
else {
sort($array);
}
foreach ($array as $k => $v) {
- if (is_array($v)) {
+ if (is_array($v) or is_object($v)) {
_features_sanitize($array[$k]);
- if ($is_assoc && empty($array[$k])) {
+ if ($remove_empty && $is_assoc && empty($array[$k])) {
unset($array[$k]);
}
}
@@ -1010,3 +1076,93 @@ function _features_sanitize(&$array) {
function _features_is_assoc($array) {
return (is_array($array) && (0 !== count(array_diff_key($array, array_keys(array_keys($array)))) || count($array)==0));
}
+
+/**
+ * Removes recursion from an object or array.
+ *
+ * Taken from https://code.google.com/p/formaldehyde/source/browse/trunk/formaldehyde.php
+ * Also used in node_export module
+ *
+ * @param $o mixed
+ * @return mixed
+ * returns a copy of the object or array with recursion removed
+ */
+function features_remove_recursion($o) {
+ if (is_array($o) || is_object($o)) {
+ $re = '#(r|R):([0-9]+);#';
+ $serialize = serialize($o);
+ if (preg_match($re, $serialize)) {
+ $last = $pos = 0;
+ while (false !== ($pos = strpos($serialize, 's:', $pos))) {
+ $chunk = substr($serialize, $last, $pos - $last);
+ if (preg_match($re, $chunk)) {
+ $length = strlen($chunk);
+ $chunk = preg_replace_callback($re, '_features_remove_recursion', $chunk);
+ $serialize = substr($serialize, 0, $last) . $chunk . substr($serialize, $last + ($pos - $last));
+ $pos += strlen($chunk) - $length;
+ }
+ $pos += 2;
+ $last = strpos($serialize, ':', $pos);
+ $length = substr($serialize, $pos, $last - $pos);
+ $last += 4 + $length;
+ $pos = $last;
+ }
+ $serialize = substr($serialize, 0, $last) . preg_replace_callback($re, '_features_remove_recursion', substr($serialize, $last));
+ $o = unserialize($serialize);
+ }
+ }
+ return $o;
+}
+
+/**
+ * Callback function for preg_replace_callback() to remove recursion.
+ */
+function _features_remove_recursion($m) {
+ $r = "\x00{$m[1]}ecursion_features";
+ return 's:' . strlen($r . $m[2]) . ':"' . $r . $m[2] . '";';
+}
+
+/**
+ * Helper to removes a set of keys an object/array.
+ *
+ * @param $item
+ * An object or array passed by reference.
+ * @param $ignore_keys
+ * Array of keys to be ignored. Values are the level of the key.
+ * @param $level
+ * Level of key to remove. Up to 2 levels deep because $item can still be
+ * recursive
+ */
+function _features_remove_ignores(&$item, $ignore_keys, $level = -1) {
+ $is_object = is_object($item);
+ if (!is_array($item) && !is_object($item)) {
+ return;
+ }
+ foreach ($item as $key => &$value) {
+ if (isset($ignore_keys[$key]) && ($ignore_keys[$key] == $level)) {
+ if ($is_object) {
+ unset($item->$key);
+ }
+ else {
+ unset($item[$key]);
+ }
+ }
+ elseif (($level < 2) && (is_array($value) || is_object($value))) {
+ _features_remove_ignores($value, $ignore_keys, $level+1);
+ }
+ }
+ unset($value);
+}
+
+/**
+ * Returns an array of keys to be ignored for various exportables
+ * @param $component
+ * The component to retrieve ignore_keys from.
+ */
+function _features_get_ignore_keys($component) {
+ static $cache;
+ if (!isset($cache[$component])) {
+ $cache[$component] = module_invoke_all('features_ignore', $component);
+ }
+ return $cache[$component];
+}
diff --git a/sites/all/modules/contrib/admin/features/features.info b/sites/all/modules/contrib/admin/features/features.info
index dfadcf0..366a862 100644
--- a/sites/all/modules/contrib/admin/features/features.info
+++ b/sites/all/modules/contrib/admin/features/features.info
@@ -3,12 +3,15 @@ description = "Provides feature management for Drupal."
core = 7.x
package = "Features"
files[] = tests/features.test
+test_dependencies[] = image
+test_dependencies[] = strongarm
+test_dependencies[] = taxonomy
+test_dependencies[] = views
configure = admin/structure/features/settings
-; Information added by Drupal.org packaging script on 2015-01-05
-version = "7.x-2.3"
+; Information added by Drupal.org packaging script on 2018-11-01
+version = "7.x-2.11"
core = "7.x"
project = "features"
-datestamp = "1420492083"
-
+datestamp = "1541050686"
diff --git a/sites/all/modules/contrib/admin/features/features.install b/sites/all/modules/contrib/admin/features/features.install
index aafdcc6..008f41b 100644
--- a/sites/all/modules/contrib/admin/features/features.install
+++ b/sites/all/modules/contrib/admin/features/features.install
@@ -5,6 +5,15 @@
* Install, update and uninstall functions for the features module.
*/
+/**
+ * Implements hook_schema().
+ */
+function features_schema() {
+ $schema['cache_features'] = drupal_get_schema_unprocessed('system', 'cache');
+ $schema['cache_features']['description'] = 'Cache table for features to store module info.';
+ return $schema;
+}
+
/**
* Implements hook_install().
*/
@@ -27,10 +36,14 @@ function features_uninstall() {
variable_del('features_ignored_orphans');
variable_del('features_feature_locked');
variable_del('features_lock_mode');
- foreach (array_keys(features_get_components()) as $component) {
- variable_del('features_admin_show_component_' . $component);
- variable_del('features_component_locked_' . $component);
- }
+
+ db_delete('variable')
+ ->condition('name', 'features_admin_show_component_%', 'LIKE')
+ ->execute();
+ db_delete('variable')
+ ->condition('name', 'features_component_locked_%', 'LIKE')
+ ->execute();
+
if (db_table_exists('menu_custom')) {
db_delete('menu_custom')
->condition('menu_name', 'features')
@@ -126,3 +139,13 @@ function features_update_6101() {
}
return array();
}
+
+/**
+ * Add {cache_features} table.
+ */
+function features_update_7200() {
+ if (!db_table_exists('cache_features')) {
+ $schema = drupal_get_schema_unprocessed('system', 'cache');
+ db_create_table('cache_features', $schema);
+ }
+}
diff --git a/sites/all/modules/contrib/admin/features/features.js b/sites/all/modules/contrib/admin/features/features.js
index 023247a..0a4a130 100644
--- a/sites/all/modules/contrib/admin/features/features.js
+++ b/sites/all/modules/contrib/admin/features/features.js
@@ -128,10 +128,12 @@ jQuery.fn.sortElements = (function(){
if (!$(this).hasClass('features-checkall')) {
var key = $(this).attr('name');
var matches = key.match(/^([^\[]+)(\[.+\])?\[(.+)\]\[(.+)\]$/);
- var component = matches[1];
- var item = matches[4];
- if ((component in moduleConflicts) && (moduleConflicts[component].indexOf(item) != -1)) {
- $(this).parent().addClass('features-conflict');
+ if (matches != null) {
+ var component = matches[1];
+ var item = matches[4];
+ if ((component in moduleConflicts) && (moduleConflicts[component].indexOf(item) != -1)) {
+ $(this).parent().addClass('features-conflict');
+ }
}
}
});
@@ -290,7 +292,7 @@ jQuery.fn.sortElements = (function(){
}
// Handle component selection UI
- $('#features-export-wrapper input[type=checkbox]', context).click(function() {
+ $('#features-export-wrapper input[type=checkbox]:not(.processed)', context).addClass('processed').click(function() {
_resetTimeout();
if ($(this).hasClass('component-select')) {
moveCheckbox(this, 'added', true);
diff --git a/sites/all/modules/contrib/admin/features/features.module b/sites/all/modules/contrib/admin/features/features.module
index 5a42eb5..14fc3f9 100644
--- a/sites/all/modules/contrib/admin/features/features.module
+++ b/sites/all/modules/contrib/admin/features/features.module
@@ -84,8 +84,7 @@ function features_menu() {
$items['admin/structure/features/cleanup'] = array(
'title' => 'Cleanup',
'description' => 'Clear cache after enabling/disabling a feature.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('features_cleanup_form', 4),
+ 'page callback' => 'features_cleanup',
'type' => MENU_CALLBACK,
'file' => 'features.admin.inc',
'weight' => 1,
@@ -128,7 +127,7 @@ function features_menu() {
'description' => 'Display components of a feature.',
'page callback' => 'drupal_get_form',
'page arguments' => array('features_admin_components', 3),
- 'load arguments' => array(3, TRUE),
+ 'load arguments' => array(TRUE),
'access callback' => 'user_access',
'access arguments' => array('administer features'),
'type' => MENU_CALLBACK,
@@ -147,7 +146,7 @@ function features_menu() {
'description' => 'Recreate an existing feature.',
'page callback' => 'drupal_get_form',
'page arguments' => array('features_export_form', 3),
- 'load arguments' => array(3, TRUE),
+ 'load arguments' => array(TRUE),
'access callback' => 'user_access',
'access arguments' => array('administer features'),
'type' => MENU_LOCAL_TASK,
@@ -160,7 +159,7 @@ function features_menu() {
'description' => 'Compare default and current feature.',
'page callback' => 'features_feature_diff',
'page arguments' => array(3, 5),
- 'load arguments' => array(3, TRUE),
+ 'load arguments' => array(TRUE),
'access callback' => 'features_access_override_actions',
'access arguments' => array(3),
'type' => MENU_LOCAL_TASK,
@@ -173,7 +172,7 @@ function features_menu() {
'description' => 'Lock a feature or components.',
'page callback' => 'features_admin_lock',
'page arguments' => array(3, 5, 6),
- 'load arguments' => array(3, TRUE, TRUE),
+ 'load arguments' => array(TRUE),
'access arguments' => array('administer features'),
'type' => MENU_CALLBACK,
'file' => 'features.admin.inc',
@@ -183,7 +182,7 @@ function features_menu() {
'description' => 'Javascript status call back.',
'page callback' => 'features_feature_status',
'page arguments' => array(3),
- 'load arguments' => array(3, TRUE),
+ 'load arguments' => array(TRUE),
'access callback' => 'user_access',
'access arguments' => array('administer features'),
'type' => MENU_CALLBACK,
@@ -268,13 +267,20 @@ function features_theme() {
* Implements hook_flush_caches().
*/
function features_flush_caches() {
- if (variable_get('features_rebuild_on_flush', TRUE)) {
+ if (($modules_changed = variable_get('features_modules_changed', FALSE)) || variable_get('features_rebuild_on_flush', TRUE)) {
+ if ($modules_changed) {
+ variable_set('features_modules_changed', FALSE);
+ }
features_rebuild();
// Don't flush the modules cache during installation, for performance reasons.
if (variable_get('install_task') == 'done') {
features_get_modules(NULL, TRUE);
}
}
+
+ if (db_table_exists('cache_features')) {
+ return array('cache_features');
+ }
return array();
}
@@ -349,6 +355,15 @@ function features_modules_disabled($modules) {
* Implements hook_modules_enabled().
*/
function features_modules_enabled($modules) {
+ // Allow distributions to disable this behavior and rebuild the features
+ // manually inside a batch.
+ if (!variable_get('features_rebuild_on_module_install', TRUE)) {
+ return;
+ }
+
+ // mark modules as being changed for test in features_flush_caches
+ variable_set('features_modules_changed', TRUE);
+
// Go through all modules and gather features that can be enabled.
$items = array();
foreach ($modules as $module) {
@@ -385,7 +400,7 @@ function features_include($reset = FALSE) {
// Features provides integration on behalf of these modules.
// The features include provides handling for the feature dependencies.
// Note that ctools is placed last because it implements hooks "dynamically" for other modules.
- $modules = array('features', 'block', 'context', 'field', 'filter', 'image', 'locale', 'menu', 'node', 'taxonomy', 'user', 'views', 'ctools');
+ $modules = array('features', 'block', 'contact', 'context', 'field', 'filter', 'image', 'locale', 'menu', 'node', 'taxonomy', 'user', 'views', 'ctools');
foreach (array_filter($modules, 'module_exists') as $module) {
module_load_include('inc', 'features', "includes/features.$module");
@@ -488,6 +503,7 @@ function features_load_feature($name, $reset = FALSE) {
$features[$name]->name = $name;
$features[$name]->filename = drupal_get_path('module', $name) . '/' . $name . '.module';
$features[$name]->type = 'module';
+ $features[$name]->status = module_exists($name);
$features[$name]->info = $info + $defaults;
}
}
@@ -503,7 +519,7 @@ function features_load_feature($name, $reset = FALSE) {
* Return a module 'object' including .info information.
*
* @param $name
- * The name of the module to retrieve information for. If ommitted,
+ * The name of the module to retrieve information for. If omitted,
* an array of all available modules will be returned.
* @param $reset
* Whether to reset the cache.
@@ -535,13 +551,13 @@ function features_get_components($component = NULL, $key = NULL, $reset = FALSE)
if ($reset || !isset($components) || !isset($component_by_key)) {
$components = $component_by_key = array();
- if (!$reset && ($cache = cache_get('features_api'))) {
+ if (!$reset && ($cache = cache_get('features_api', 'cache_features'))) {
$components = $cache->data;
}
else {
$components = module_invoke_all('features_api');
drupal_alter('features_api', $components);
- cache_set('features_api', $components);
+ cache_set('features_api', $components, 'cache_features');
}
foreach ($components as $component_type => $component_information) {
@@ -607,6 +623,8 @@ function features_hook($component, $hook, $reset = FALSE) {
* Clear the module info cache.
*/
function features_install_modules($modules) {
+ variable_set('features_modules_changed', TRUE);
+
module_load_include('inc', 'features', 'features.export');
$files = system_rebuild_module_data();
@@ -650,7 +668,7 @@ function features_get_features($name = NULL, $reset = FALSE) {
function features_get_info($type = 'module', $name = NULL, $reset = FALSE) {
static $cache;
if (!isset($cache)) {
- $cache = cache_get('features_module_info');
+ $cache = cache_get('features_module_info', 'cache_features');
}
if (empty($cache) || $reset) {
$data = array(
@@ -738,14 +756,14 @@ function features_get_info($type = 'module', $name = NULL, $reset = FALSE) {
$data['feature'] = $sorted;
variable_set('features_ignored_orphans', $ignored);
- cache_set("features_module_info", $data);
+ cache_set('features_module_info', $data, 'cache_features');
$cache = new stdClass();
$cache->data = $data;
}
if (!empty($name)) {
- return !empty($cache->data[$type][$name]) ? clone $cache->data[$type][$name] : array();
+ return !empty($cache->data[$type][$name]) ? clone $cache->data[$type][$name] : FALSE;
}
- return !empty($cache->data[$type]) ? $cache->data[$type] : array();
+ return !empty($cache->data[$type]) ? $cache->data[$type] : FALSE;
}
/**
@@ -892,7 +910,7 @@ function features_access_override_actions($feature) {
features_include();
module_load_include('inc', 'features', 'features.export');
- $access[$feature->name] = in_array(features_get_storage($feature->name), array(FEATURES_OVERRIDDEN, FEATURES_NEEDS_REVIEW)) && user_access('administer features');
+ $access[$feature->name] = in_array(features_get_storage($feature->name), array(FEATURES_DEFAULT, FEATURES_OVERRIDDEN, FEATURES_NEEDS_REVIEW));
}
return $access[$feature->name];
}
@@ -903,7 +921,9 @@ function features_access_override_actions($feature) {
* Implements hook_form_alter() for system_modules form().
*/
function features_form_system_modules_alter(&$form) {
- features_rebuild();
+ if (variable_get('features_rebuild_modules_page', FALSE)) {
+ features_rebuild();
+ }
}
/**
@@ -1067,6 +1087,7 @@ function features_hook_info() {
'features_api',
'features_pipe_alter',
'features_export_alter',
+ 'features_export_options_alter',
);
return array_fill_keys($hooks, array('group' => 'features'));
}
@@ -1075,6 +1096,9 @@ function features_hook_info() {
* Change vocabularies permission, from vocab id to machine name and vice versa.
*/
function _user_features_change_term_permission(&$perm, $type = 'vid') {
+ if (!module_exists('taxonomy')) {
+ return;
+ }
// Export vocabulary permissions using the machine name, instead of vocabulary
// id.
if (strpos($perm, 'edit terms in ') !== FALSE || strpos($perm, 'delete terms in ') !== FALSE) {
@@ -1186,7 +1210,6 @@ function features_feature_lock($feature, $component = NULL) {
variable_set('features_feature_locked', $locked);
}
-
/**
* Unlocks a feature or it's component.
*/
@@ -1200,3 +1223,73 @@ function features_feature_unlock($feature, $component = NULL) {
}
variable_set('features_feature_locked', $locked);
}
+
+/**
+ * Sets/Returns the current language to english to ensure a proper export.
+ */
+function _features_export_language($language = NULL) {
+ $current = $GLOBALS['language'];
+ if (isset($language)) {
+ $GLOBALS['language'] = $language;
+ }
+ elseif ($GLOBALS['language']->language != 'en') {
+ // Create the language object as language_default() does.
+ $GLOBALS['language'] = (object) array(
+ 'language' => 'en',
+ 'name' => 'English',
+ 'native' => 'English',
+ 'direction' => 0,
+ 'enabled' => 1,
+ 'plurals' => 0,
+ 'formula' => '',
+ 'domain' => '',
+ 'prefix' => '',
+ 'weight' => 0,
+ 'javascript' => '',
+ );
+ }
+ return $current;
+}
+
+/**
+ * Implements hook_features_ignore().
+ */
+function features_features_ignore($component) {
+ // Determine which keys need to be ignored for override diff for various components.
+ // Value is how many levels deep the key is.
+ $ignores = array();
+ switch ($component) {
+ case 'views_view':
+ $ignores['current_display'] = 0;
+ $ignores['display_handler'] = 0;
+ $ignores['handler'] = 2;
+ $ignores['query'] = 0;
+ $ignores['localization_plugin'] = 0;
+ // Views automatically adds these two on export to set values.
+ $ignores['api_version'] = 0;
+ $ignores['disabled'] = 0;
+ break;
+ case 'image':
+ $ignores['module'] = 0;
+ $ignores['name'] = 0;
+ $ignores['storage'] = 0;
+ // Various properties are loaded into the effect in image_styles.
+ $ignores['summary theme'] = 2;
+ $ignores['module'] = 2;
+ $ignores['label'] = 2;
+ $ignores['help'] = 2;
+ $ignores['form callback'] = 2;
+ $ignores['effect callback'] = 2;
+ $ignores['dimensions callback'] = 2;
+ break;
+ case 'field':
+ $ignores['locked'] = 1;
+ break;
+ case 'field_base':
+ $ignores['indexes'] = 0;
+ break;
+ case 'taxonomy':
+ $ignores['hierarchy'] = 0;
+ }
+ return $ignores;
+}
diff --git a/sites/all/modules/contrib/admin/features/includes/features.contact.inc b/sites/all/modules/contrib/admin/features/includes/features.contact.inc
new file mode 100644
index 0000000..af9b919
--- /dev/null
+++ b/sites/all/modules/contrib/admin/features/includes/features.contact.inc
@@ -0,0 +1,115 @@
+ array(
+ 'name' => t('Contact categories'),
+ 'feature_source' => TRUE,
+ 'default_hook' => 'contact_categories_defaults',
+ 'default_file' => FEATURES_DEFAULTS_INCLUDED,
+ ),
+ );
+}
+
+/**
+ * Implements hook_features_export_options().
+ */
+function contact_categories_features_export_options() {
+ $options = array();
+ $categories = db_select('contact', 'c')->fields('c')->execute()->fetchAll();
+ foreach ($categories as $category) {
+ $options["$category->category"] = "$category->category";
+ }
+ return $options;
+}
+
+/**
+ * Implements hook_features_export().
+ */
+function contact_categories_features_export($data, &$export, $module_name = '') {
+ $export['dependencies']['features'] = 'features';
+ $export['dependencies']['contact'] = 'contact';
+
+ foreach ($data as $name) {
+ $export['features']['contact_categories'][$name] = $name;
+ }
+
+ return array();
+}
+
+/**
+ * Implements hook_features_export_render().
+ */
+function contact_categories_features_export_render($module, $data, $export = NULL) {
+ $render = array();
+ foreach ($data as $name) {
+ $export_category = db_select('contact', 'c')
+ ->fields('c', array('cid', 'category'))
+ ->condition('category', $name, 'LIKE')
+ ->execute()
+ ->fetchAll();
+ if (isset($export_category[0]->cid) && ($category = contact_load($export_category[0]->cid))) {
+ unset($category['cid']);
+ $render[$name] = $category;
+ }
+ }
+ return array('contact_categories_defaults' => ' return ' . features_var_export($render, ' ') . ';');
+}
+
+/**
+ * Implements hook_features_revert().
+ */
+function contact_categories_features_revert($module) {
+ return contact_categories_features_rebuild($module);
+}
+
+/**
+ * Implements hook_features_rebuild().
+ */
+function contact_categories_features_rebuild($module) {
+ if ($defaults = features_get_default('contact_categories', $module)) {
+ foreach ($defaults as $default_category) {
+ $existing_categories = db_select('contact', 'c')
+ ->fields('c', array('cid', 'category'))
+ ->execute()
+ ->fetchAll();
+ if ($existing_categories) {
+ foreach ($existing_categories as $existing_category) {
+ if ($default_category['category'] == $existing_category->category) {
+ db_update('contact')
+ ->fields(
+ array(
+ 'recipients' => $default_category['recipients'],
+ 'reply' => $default_category['reply'],
+ 'weight' => $default_category['weight'],
+ 'selected' => $default_category['selected'],
+ )
+ )
+ ->condition('category', $existing_category->category, '=')
+ ->execute();
+ }
+ else {
+ db_merge('contact')
+ ->key(array('category' => $default_category['category']))
+ ->fields($default_category)
+ ->execute();
+ }
+ }
+ }
+ else {
+ db_merge('contact')
+ ->key(array('category' => $default_category['category']))
+ ->fields($default_category)
+ ->execute();
+ }
+ }
+ }
+}
diff --git a/sites/all/modules/contrib/admin/features/includes/features.field.inc b/sites/all/modules/contrib/admin/features/includes/features.field.inc
index 09104a3..ca305ae 100644
--- a/sites/all/modules/contrib/admin/features/includes/features.field.inc
+++ b/sites/all/modules/contrib/admin/features/includes/features.field.inc
@@ -151,14 +151,14 @@ function field_base_features_export_render($module, $data, $export = NULL) {
foreach ($data as $identifier) {
if ($field = features_field_base_load($identifier)) {
unset($field['columns']);
- // unset($field['locked']);
+ unset($field['foreign keys']);
// Only remove the 'storage' declaration if the field is using the default
// storage type.
if ($field['storage']['type'] == variable_get('field_storage_default', 'field_sql_storage')) {
unset($field['storage']);
}
// If we still have a storage declaration here it means that a non-default
- // storage type was altered into to the field definition. And noone would
+ // storage type was altered into to the field definition. And no one would
// never need to change the 'details' key, so don't render it.
if (isset($field['storage']['details'])) {
unset($field['storage']['details']);
@@ -166,8 +166,15 @@ function field_base_features_export_render($module, $data, $export = NULL) {
_field_instance_features_export_sort($field);
$field_export = features_var_export($field, ' ');
+ $field_prefix = ' // Exported field_base: ';
$field_identifier = features_var_export($identifier);
- $code[] = " // Exported field_base: {$field_identifier}";
+ if (features_field_export_needs_wrap($field_prefix, $field_identifier)) {
+ $code[] = rtrim($field_prefix);
+ $code[] = " // {$field_identifier}.";
+ }
+ else {
+ $code[] = $field_prefix . $field_identifier . '.';
+ }
$code[] = " \$field_bases[{$field_identifier}] = {$field_export};";
$code[] = "";
}
@@ -190,8 +197,15 @@ function field_instance_features_export_render($module, $data, $export = NULL) {
if ($instance = features_field_instance_load($identifier)) {
_field_instance_features_export_sort($instance);
$field_export = features_var_export($instance, ' ');
+ $instance_prefix = ' // Exported field_instance: ';
$instance_identifier = features_var_export($identifier);
- $code[] = " // Exported field_instance: {$instance_identifier}";
+ if (features_field_export_needs_wrap($instance_prefix, $instance_identifier)) {
+ $code[] = rtrim($instance_prefix);
+ $code[] = " // {$instance_identifier}.";
+ }
+ else {
+ $code[] = $instance_prefix . $instance_identifier . '.';
+ }
$code[] = " \$field_instances[{$instance_identifier}] = {$field_export};";
$code[] = "";
@@ -260,12 +274,23 @@ function field_base_features_rebuild($module) {
// Create or update field.
if (isset($existing_fields[$field['field_name']])) {
$existing_field = $existing_fields[$field['field_name']];
- if ($field + $existing_field !== $existing_field) {
- field_update_field($field);
+ $array_diff_result = features_array_diff_assoc_recursive($field + $existing_field, $existing_field);
+ if (!empty($array_diff_result)) {
+ try {
+ field_update_field($field);
+ }
+ catch (FieldException $e) {
+ watchdog('features', 'Attempt to update field %label failed: %message', array('%label' => $field['field_name'], '%message' => $e->getMessage()), WATCHDOG_ERROR);
+ }
}
}
else {
- field_create_field($field);
+ try {
+ field_create_field($field);
+ }
+ catch (FieldException $e) {
+ watchdog('features', 'Attempt to create field %label failed: %message', array('%label' => $field['field_name'], '%message' => $e->getMessage()), WATCHDOG_ERROR);
+ }
$existing_fields[$field['field_name']] = $field;
}
variable_set('menu_rebuild_needed', TRUE);
@@ -294,7 +319,7 @@ function field_instance_features_rebuild($module) {
// Create or update field instance.
if (isset($existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']])) {
$existing_instance = $existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']];
- if ($field_instance + $existing_instance !== $existing_instance) {
+ if ($field_instance + $existing_instance != $existing_instance) {
try {
field_update_instance($field_instance);
}
@@ -395,7 +420,7 @@ function field_features_export_render($module, $data, $export = NULL) {
unset($field['field_config']['storage']);
}
// If we still have a storage declaration here it means that a non-default
- // storage type was altered into to the field definition. And noone would
+ // storage type was altered into to the field definition. And no one would
// never need to change the 'details' key, so don't render it.
if (isset($field['field_config']['storage']['details'])) {
unset($field['field_config']['storage']['details']);
@@ -469,7 +494,8 @@ function field_features_rebuild($module) {
$field_config = $field['field_config'];
if (isset($existing_fields[$field_config['field_name']])) {
$existing_field = $existing_fields[$field_config['field_name']];
- if ($field_config + $existing_field !== $existing_field) {
+ $array_diff_result = features_array_diff_assoc_recursive($field_config + $existing_field, $existing_field);
+ if (!empty($array_diff_result)) {
try {
field_update_field($field_config);
}
@@ -492,7 +518,7 @@ function field_features_rebuild($module) {
$field_instance = $field['field_instance'];
if (isset($existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']])) {
$existing_instance = $existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']];
- if ($field_instance + $existing_instance !== $existing_instance) {
+ if ($field_instance + $existing_instance != $existing_instance) {
field_update_instance($field_instance);
}
}
@@ -528,3 +554,24 @@ function features_field_load($identifier) {
}
return FALSE;
}
+
+/**
+ * Determine if a field export line needs to be wrapped.
+ *
+ * Drupal code standards specify that comments should wrap at 80 characters or
+ * less.
+ *
+ * @param string $prefix
+ * The prefix to be exported before the field identifier.
+ * @param string $identifier
+ * The field identifier.
+ *
+ * @return BOOL
+ * TRUE if the line should be wrapped after the prefix, else FALSE.
+ *
+ * @see https://www.drupal.org/node/1354
+ */
+function features_field_export_needs_wrap($prefix, $identifier) {
+ // Check for 79 characters, since the comment ends with a full stop.
+ return (strlen($prefix) + strlen($identifier) > 79);
+}
diff --git a/sites/all/modules/contrib/admin/features/includes/features.image.inc b/sites/all/modules/contrib/admin/features/includes/features.image.inc
index 2b5eb27..bf89191 100644
--- a/sites/all/modules/contrib/admin/features/includes/features.image.inc
+++ b/sites/all/modules/contrib/admin/features/includes/features.image.inc
@@ -73,11 +73,17 @@ function image_features_export_render($module_name, $data, $export = NULL) {
*/
function image_features_revert($module) {
if ($default_styles = features_get_default('image', $module)) {
- foreach (array_keys($default_styles) as $default_style) {
- if ($style = image_style_load($default_style)) {
+ foreach ($default_styles as $default_style_name => $default_style) {
+ if ($style = image_style_load($default_style_name)) {
if ($style['storage'] != IMAGE_STORAGE_DEFAULT) {
image_default_style_revert($style);
}
+ else {
+ // Verify that the loaded style still matches what's in code.
+ if ($default_style['effects'] !== $style['effects']) {
+ image_default_style_revert($style);
+ }
+ }
}
}
}
@@ -86,16 +92,25 @@ function image_features_revert($module) {
/**
* Remove unnecessary keys for export.
*/
-function _image_features_style_sanitize(&$style, $child = FALSE) {
- $omit = $child ? array('isid', 'ieid', 'storage') : array('isid', 'ieid', 'storage', 'module');
- if (is_array($style)) {
- foreach ($style as $k => $v) {
- if (in_array($k, $omit, TRUE)) {
- unset($style[$k]);
- }
- else if (is_array($v)) {
- _image_features_style_sanitize($style[$k], TRUE);
- }
- }
+function _image_features_style_sanitize(array &$style) {
+ // Sanitize style: Don't export numeric IDs and things which get overwritten
+ // in image_styles() or are code/storage specific. The name property will be
+ // the key of the exported $style array.
+ $style = array_diff_key($style, array_flip(array(
+ 'isid',
+ 'name',
+ 'module',
+ 'storage',
+ )));
+
+ // Sanitize effects: all that needs to be kept is name, weight and data,
+ // which holds all the style-specific configuration. Other keys are assumed
+ // to belong to the definition of the effect itself, so not configuration.
+ foreach ($style['effects'] as $id => $effect) {
+ $style['effects'][$id] = array_intersect_key($effect, array_flip(array(
+ 'name',
+ 'data',
+ 'weight',
+ )));
}
}
diff --git a/sites/all/modules/contrib/admin/features/includes/features.locale.inc b/sites/all/modules/contrib/admin/features/includes/features.locale.inc
index fc27174..258d541 100644
--- a/sites/all/modules/contrib/admin/features/includes/features.locale.inc
+++ b/sites/all/modules/contrib/admin/features/includes/features.locale.inc
@@ -134,14 +134,15 @@ function _features_language_save($language) {
->fields(array(
'plurals' => empty($language->plurals) ? 0 : $language->plurals,
'formula' => empty($language->formula) ? '' : $language->formula,
+ 'weight' => empty($language->weight) ? 0 : $language->weight,
))
->condition('language', $language->language)
->execute();
}
// Update Existing language.
else {
- // @TODO: get properties from schema.
- $properties = array('language', 'name', 'native', 'direction', 'enabled', 'plurals', 'formula', 'domain', 'prefix', 'weight', 'javascript');
+ // Get field list from table schema.
+ $properties = drupal_schema_fields_sql('languages');
// The javascript hash is not in the imported data but should be empty
if (!isset($language->javascript)) {
$language->javascript = '';
diff --git a/sites/all/modules/contrib/admin/features/includes/features.menu.inc b/sites/all/modules/contrib/admin/features/includes/features.menu.inc
index c883e6a..84af623 100644
--- a/sites/all/modules/contrib/admin/features/includes/features.menu.inc
+++ b/sites/all/modules/contrib/admin/features/includes/features.menu.inc
@@ -103,7 +103,6 @@ function menu_custom_features_export_render($module, $data) {
$code[] = features_translatables_export($translatables, ' ');
}
- $code[] = '';
$code[] = ' return $menus;';
$code = implode("\n", $code);
return array('menu_default_menu_custom' => $code);
@@ -248,16 +247,16 @@ function menu_links_features_export_render($module, $data, $export = NULL) {
unset($link['plid']);
unset($link['mlid']);
- $code[] = " // Exported menu link: {$new_identifier}";
+ $code[] = " // Exported menu link: {$new_identifier}.";
$code[] = " \$menu_links['{$new_identifier}'] = ". features_var_export($link, ' ') .";";
$translatables[] = $link['link_title'];
}
}
+ $code[] = '';
if (!empty($translatables)) {
$code[] = features_translatables_export($translatables, ' ');
}
- $code[] = '';
$code[] = ' return $menu_links;';
$code = implode("\n", $code);
return array('menu_default_menu_links' => $code);
@@ -316,6 +315,7 @@ function menu_links_features_rebuild_ordered($menu_links, $reset = FALSE) {
foreach ($unordered as $link) {
$identifier = menu_links_features_identifier($link);
$ordered[$identifier] = 0;
+ $all_links[$identifier] = $link;
}
asort($ordered);
}
@@ -420,8 +420,12 @@ function features_menu_link_load($identifier) {
* Returns a lowercase clean string with only letters, numbers and dashes
*/
function features_clean_title($str) {
- return strtolower(preg_replace_callback('/(\s)|([^a-zA-Z\-0-9])/i', create_function(
- '$matches',
- 'return $matches[1]?"-":"";'
- ), $str));
+ return strtolower(preg_replace_callback('/(\s)|([^a-zA-Z\-0-9])/i', '_features_clean_title', $str));
+}
+
+/**
+ * Callback function for preg_replace_callback() to clean a string.
+ */
+function _features_clean_title($matches) {
+ return $matches[1] ? '-' : '';
}
diff --git a/sites/all/modules/contrib/admin/features/includes/features.node.inc b/sites/all/modules/contrib/admin/features/includes/features.node.inc
index 9461778..25a2c1c 100644
--- a/sites/all/modules/contrib/admin/features/includes/features.node.inc
+++ b/sites/all/modules/contrib/admin/features/includes/features.node.inc
@@ -117,7 +117,7 @@ function node_features_revert($module = NULL) {
}
/**
- * Implements hook_features_disable().
+ * Implements hook_features_disable_feature().
*
* When a features module is disabled, modify any node types it provides so
* they can be deleted manually through the content types UI.
@@ -125,7 +125,7 @@ function node_features_revert($module = NULL) {
* @param $module
* Name of module that has been disabled.
*/
-function node_features_disable($module) {
+function node_features_disable_feature($module) {
if ($default_types = features_get_default('node', $module)) {
foreach ($default_types as $type_name => $type_info) {
$type_info = node_type_load($type_name);
@@ -133,22 +133,26 @@ function node_features_disable($module) {
$type_info->custom = 1;
$type_info->modified = 1;
$type_info->locked = 0;
+ $type_info->disabled = 0;
node_type_save($type_info);
}
}
}
/**
- * Implements hook_features_enable().
+ * Implements hook_features_enable_feature().
*
* When a features module is enabled, modify any node types it provides so
* they can no longer be deleted manually through the content types UI.
*
+ * Update the database cache of node types if needed.
+ *
* @param $module
* Name of module that has been enabled.
*/
-function node_features_enable($module) {
+function node_features_enable_feature($module) {
if ($default_types = features_get_default('node', $module)) {
+ $rebuild = FALSE;
foreach ($default_types as $type_name => $type_info) {
// Ensure the type exists.
if ($type_info = node_type_load($type_name)) {
@@ -156,8 +160,15 @@ function node_features_enable($module) {
$type_info->custom = 0;
$type_info->modified = 0;
$type_info->locked = 1;
+ $type_info->disabled = 0;
node_type_save($type_info);
}
+ else {
+ $rebuild = TRUE;
+ }
+ }
+ if ($rebuild) {
+ node_types_rebuild();
}
}
}
diff --git a/sites/all/modules/contrib/admin/features/tests/features.test b/sites/all/modules/contrib/admin/features/tests/features.test
index 1fa51ac..743cc1b 100644
--- a/sites/all/modules/contrib/admin/features/tests/features.test
+++ b/sites/all/modules/contrib/admin/features/tests/features.test
@@ -14,6 +14,7 @@ class FeaturesUserTestCase extends DrupalWebTestCase {
'name' => t('Component tests'),
'description' => t('Run tests for components of Features.') ,
'group' => t('Features'),
+ 'dependencies' => array('views', 'strongarm'),
);
}
@@ -182,6 +183,7 @@ class FeaturesEnableTestCase extends DrupalWebTestCase {
'name' => t('Features enable tests'),
'description' => t('Run tests for enabling of features.') ,
'group' => t('Features'),
+ 'dependencies' => array('views', 'strongarm'),
);
}
@@ -218,7 +220,7 @@ class FeaturesEnableTestCase extends DrupalWebTestCase {
/**
- * Tests intergration of ctools for features.
+ * Tests integration of ctools for features.
*/
class FeaturesCtoolsIntegrationTest extends DrupalWebTestCase {
protected $profile = 'testing';
@@ -231,6 +233,7 @@ class FeaturesCtoolsIntegrationTest extends DrupalWebTestCase {
'name' => t('Features Chaos Tools integration'),
'description' => t('Run tests for ctool integration of features.') ,
'group' => t('Features'),
+ 'dependencies' => array('views', 'strongarm'),
);
}
@@ -287,3 +290,43 @@ class FeaturesCtoolsIntegrationTest extends DrupalWebTestCase {
}
}
}
+
+
+/**
+ * Test detecting modules as features.
+ */
+class FeaturesDetectionTestCase extends DrupalWebTestCase {
+ protected $profile = 'testing';
+
+ /**
+ * Test info.
+ */
+ public static function getInfo() {
+ return array(
+ 'name' => t('Feature Detection tests'),
+ 'description' => t('Run tests for detecting items as features.') ,
+ 'group' => t('Features'),
+ );
+ }
+
+ /**
+ * Set up test.
+ */
+ public function setUp() {
+ parent::setUp(array(
+ 'features',
+ ));
+ }
+
+ /**
+ * Run test.
+ */
+ public function test() {
+ module_load_include('inc', 'features', 'features.export');
+ // First test that features_populate inserts the features api key.
+ $export = features_populate(array(), array(), 'features_test_empty_fake');
+ $this->assertTrue(!empty($export['features']['features_api']) && key($export['features']['features_api']) == 'api:' . FEATURES_API, 'Features API key added to new export.');
+ $this->assertTrue((bool)features_get_features('features_test'), 'Features test recognized as a feature.');
+ $this->assertFalse((bool)features_get_features('features'), 'Features module not recognized as a feature.');
+ }
+}
diff --git a/sites/all/modules/contrib/admin/features/tests/features_test/features_test.features.inc b/sites/all/modules/contrib/admin/features/tests/features_test/features_test.features.inc
index 38aaa4d..8d0646f 100644
--- a/sites/all/modules/contrib/admin/features/tests/features_test/features_test.features.inc
+++ b/sites/all/modules/contrib/admin/features/tests/features_test/features_test.features.inc
@@ -29,16 +29,8 @@ function features_test_image_default_styles() {
// Exported image style: features_test.
$styles['features_test'] = array(
- 'name' => 'features_test',
'effects' => array(
2 => array(
- 'label' => 'Scale',
- 'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
- 'effect callback' => 'image_scale_effect',
- 'dimensions callback' => 'image_scale_dimensions',
- 'form callback' => 'image_scale_form',
- 'summary theme' => 'image_scale_summary',
- 'module' => 'image',
'name' => 'image_scale',
'data' => array(
'width' => 100,
diff --git a/sites/all/modules/contrib/admin/features/tests/features_test/features_test.info b/sites/all/modules/contrib/admin/features/tests/features_test/features_test.info
index 2148161..cd414ec 100644
--- a/sites/all/modules/contrib/admin/features/tests/features_test/features_test.info
+++ b/sites/all/modules/contrib/admin/features/tests/features_test/features_test.info
@@ -21,9 +21,8 @@ features[user_permission][] = create features_test content
features[views_view][] = features_test
hidden = 1
-; Information added by Drupal.org packaging script on 2015-01-05
-version = "7.x-2.3"
+; Information added by Drupal.org packaging script on 2018-11-01
+version = "7.x-2.11"
core = "7.x"
project = "features"
-datestamp = "1420492083"
-
+datestamp = "1541050686"
diff --git a/sites/all/modules/contrib/admin/google_analytics/README.txt b/sites/all/modules/contrib/admin/google_analytics/README.txt
index fab2f2e..8ef9818 100644
--- a/sites/all/modules/contrib/admin/google_analytics/README.txt
+++ b/sites/all/modules/contrib/admin/google_analytics/README.txt
@@ -1,6 +1,6 @@
Module: Google Analytics
-Author: Alexander Hass -
+
- Mailto +
- Download file +
- Open colorbox +
- External link +
- Go link +
';
+ $colorbox_dependencies .= t('Requires: !module-list', array('!module-list' => (module_exists('colorbox') ? t('@module (enabled)', array('@module' => 'Colorbox')) : t('@module (disabled)', array('@module' => 'Colorbox')))));
+ $colorbox_dependencies .= '
';
+
+ $form['tracking']['linktracking']['googleanalytics_trackcolorbox'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Track content in colorbox modal dialogs'),
+ '#default_value' => variable_get('googleanalytics_trackcolorbox', 1),
+ '#description' => t('Enable to track the content shown in colorbox modal windows.') . $colorbox_dependencies,
+ '#disabled' => (module_exists('colorbox') ? FALSE : TRUE),
+ );
$form['tracking']['linktracking']['googleanalytics_tracklinkid'] = array(
'#type' => 'checkbox',
'#title' => t('Track enhanced link attribution'),
@@ -246,7 +265,7 @@ function googleanalytics_admin_settings_form($form_state) {
'#type' => 'checkboxes',
'#title' => t('Track messages of type'),
'#default_value' => variable_get('googleanalytics_trackmessages', array()),
- '#description' => t('This will track the selected message types shown to users. Tracking of form validation errors may help you identifying usability issues in your site. For each visit (user session), a maximum of approximately 500 combined GATC requests (both events and page views) can be tracked. Every message is tracked as one individual event. Note that - as the number of events in a session approaches the limit - additional events might not be tracked. Messages from excluded pages cannot tracked.'),
+ '#description' => t('This will track the selected message types shown to users. Tracking of form validation errors may help you identifying usability issues in your site. For each visit (user session), a maximum of approximately 500 combined GATC requests (both events and page views) can be tracked. Every message is tracked as one individual event. Note that - as the number of events in a session approaches the limit - additional events might not be tracked. Messages from excluded pages cannot be tracked.'),
'#options' => array(
'status' => t('Status message'),
'warning' => t('Warning message'),
@@ -297,7 +316,7 @@ function googleanalytics_admin_settings_form($form_state) {
$form['tracking']['privacy']['googleanalytics_privacy_donottrack'] = array(
'#type' => 'checkbox',
'#title' => t('Universal web tracking opt-out'),
- '#description' => t('If enabled and your server receives the Do-Not-Track header from the client browser, the Google Analytics module will not embed any tracking code into your site. Compliance with Do Not Track could be purely voluntary, enforced by industry self-regulation, or mandated by state or federal law. Please accept your visitors privacy. If they have opt-out from tracking and advertising, you should accept their personal decision. This feature is currently limited to logged in users and disabled page caching.', array('@donottrack' => 'http://donottrack.us/')),
+ '#description' => t('If enabled and your server receives the Do-Not-Track header from the client browser, the Google Analytics module will not embed any tracking code into your site. Compliance with Do Not Track could be purely voluntary, enforced by industry self-regulation, or mandated by state or federal law. Please accept your visitors privacy. If they have opt-out from tracking and advertising, you should accept their personal decision. This feature is currently limited to logged in users and disabled page caching.', array('@donottrack' => 'https://www.eff.org/issues/do-not-track')),
'#default_value' => variable_get('googleanalytics_privacy_donottrack', 1),
);
@@ -305,7 +324,7 @@ function googleanalytics_admin_settings_form($form_state) {
$form['googleanalytics_custom_dimension'] = array(
'#collapsed' => TRUE,
'#collapsible' => TRUE,
- '#description' => t('You can set values for Google Analytics Custom Dimensions here. You must have already configured your custom dimensions in the Google Analytics Management Interface. You may use tokens. Global and user tokens are always available; on node pages, node tokens are also available. A dimension value is allowed to have a maximum lenght of 150 bytes. Expect longer values to get trimmed.', array('@custom_var_documentation' => 'https://developers.google.com/analytics/devguides/collection/analyticsjs/custom-dims-mets', '@setup_documentation' => 'https://support.google.com/analytics/answer/2709829')),
+ '#description' => t('You can set values for Google Analytics Custom Dimensions here. You must have already configured your custom dimensions in the Google Analytics Management Interface. You may use tokens. Global and user tokens are always available; on node pages, node tokens are also available. A dimension value is allowed to have a maximum length of 150 bytes. Expect longer values to get trimmed.', array('@custom_var_documentation' => 'https://developers.google.com/analytics/devguides/collection/analyticsjs/custom-dims-mets', '@setup_documentation' => 'https://support.google.com/analytics/answer/2709829')),
'#theme' => 'googleanalytics_admin_custom_var_table',
'#title' => t('Custom dimensions'),
'#tree' => TRUE,
@@ -314,8 +333,10 @@ function googleanalytics_admin_settings_form($form_state) {
$googleanalytics_custom_dimension = variable_get('googleanalytics_custom_dimension', array());
- // Google Analytics supports up to 20 custom dimensions.
- for ($i = 1; $i <= 20; $i++) {
+ // Standard Google Analytics accounts support up to 20 custom dimensions,
+ // premium accounts support up to 200 custom dimensions.
+ $limit = (variable_get('googleanalytics_premium', FALSE)) ? 200 : 20;
+ for ($i = 1; $i <= $limit; $i++) {
$form['googleanalytics_custom_dimension']['indexes'][$i]['index'] = array(
'#default_value' => $i,
'#description' => t('Index number'),
@@ -342,7 +363,7 @@ function googleanalytics_admin_settings_form($form_state) {
$form['googleanalytics_custom_dimension']['googleanalytics_description'] = array(
'#type' => 'item',
- '#description' => t('You can supplement Google Analytics\' basic IP address tracking of visitors by segmenting users based on custom dimensions. Section 7 of the Google Analytics terms of service requires that You will not (and will not allow any third party to) use the Service to track, collect or upload any data that personally identifies an individual (such as a name, userid, email address or billing information), or other data which can be reasonably linked to such information by Google. You will have and abide by an appropriate Privacy Policy and will comply with all applicable laws and regulations relating to the collection of information from Visitors. You must post a Privacy Policy and that Privacy Policy must provide notice of Your use of cookies that are used to collect traffic data, and You must not circumvent any privacy features (e.g., an opt-out) that are part of the Service.', array('@ga_tos' => 'http://www.google.com/analytics/terms/gb.html')),
+ '#description' => t('You can supplement Google Analytics\' basic IP address tracking of visitors by segmenting users based on custom dimensions. Section 7 of the Google Analytics terms of service requires that You will not (and will not allow any third party to) use the Service to track, collect or upload any data that personally identifies an individual (such as a name, userid, email address or billing information), or other data which can be reasonably linked to such information by Google. You will have and abide by an appropriate Privacy Policy and will comply with all applicable laws and regulations relating to the collection of information from Visitors. You must post a Privacy Policy and that Privacy Policy must provide notice of Your use of cookies that are used to collect traffic data, and You must not circumvent any privacy features (e.g., an opt-out) that are part of the Service.', array('@ga_tos' => 'https://www.google.com/analytics/terms/gb.html')),
);
if (module_exists('token')) {
$form['googleanalytics_custom_dimension']['googleanalytics_token_tree'] = array(
@@ -365,8 +386,9 @@ function googleanalytics_admin_settings_form($form_state) {
$googleanalytics_custom_metric = variable_get('googleanalytics_custom_metric', array());
- // Google Analytics supports up to 20 custom metrics.
- for ($i = 1; $i <= 20; $i++) {
+ // Standard Google Analytics accounts support up to 20 custom metrics,
+ // premium accounts support up to 200 custom metrics.
+ for ($i = 1; $i <= $limit; $i++) {
$form['googleanalytics_custom_metric']['indexes'][$i]['index'] = array(
'#default_value' => $i,
'#description' => t('Index number'),
@@ -393,7 +415,7 @@ function googleanalytics_admin_settings_form($form_state) {
$form['googleanalytics_custom_metric']['googleanalytics_description'] = array(
'#type' => 'item',
- '#description' => t('You can supplement Google Analytics\' basic IP address tracking of visitors by segmenting users based on custom metrics. Section 7 of the Google Analytics terms of service requires that You will not (and will not allow any third party to) use the Service to track, collect or upload any data that personally identifies an individual (such as a name, userid, email address or billing information), or other data which can be reasonably linked to such information by Google. You will have and abide by an appropriate Privacy Policy and will comply with all applicable laws and regulations relating to the collection of information from Visitors. You must post a Privacy Policy and that Privacy Policy must provide notice of Your use of cookies that are used to collect traffic data, and You must not circumvent any privacy features (e.g., an opt-out) that are part of the Service.', array('@ga_tos' => 'http://www.google.com/analytics/terms/gb.html')),
+ '#description' => t('You can supplement Google Analytics\' basic IP address tracking of visitors by segmenting users based on custom metrics. Section 7 of the Google Analytics terms of service requires that You will not (and will not allow any third party to) use the Service to track, collect or upload any data that personally identifies an individual (such as a name, userid, email address or billing information), or other data which can be reasonably linked to such information by Google. You will have and abide by an appropriate Privacy Policy and will comply with all applicable laws and regulations relating to the collection of information from Visitors. You must post a Privacy Policy and that Privacy Policy must provide notice of Your use of cookies that are used to collect traffic data, and You must not circumvent any privacy features (e.g., an opt-out) that are part of the Service.', array('@ga_tos' => 'https://www.google.com/analytics/terms/gb.html')),
);
if (module_exists('token')) {
$form['googleanalytics_custom_metric']['googleanalytics_token_tree'] = array(
@@ -428,12 +450,14 @@ function googleanalytics_admin_settings_form($form_state) {
);
}
+ $user_access_add_js_snippets = !user_access('add JS snippets for google analytics');
+ $user_access_add_js_snippets_permission_warning = $user_access_add_js_snippets ? ' ' . t('This field has been disabled because you do not have sufficient permissions to edit it.') . '' : '';
$form['advanced']['codesnippet'] = array(
'#type' => 'fieldset',
'#title' => t('Custom JavaScript code'),
'#collapsible' => TRUE,
'#collapsed' => TRUE,
- '#description' => t('You can add custom Google Analytics code snippets here. These will be added every time tracking is in effect. Before you add your custom code, you should read the Google Analytics Tracking Code - Functional Overview and the Google Analytics Tracking API documentation. Do not include the <script> tags, and always end your code with a semicolon (;).', array('@snippets' => 'http://drupal.org/node/248699', '@ga_concepts_overview' => 'https://developers.google.com/analytics/resources/concepts/gaConceptsTrackingOverview', '@ga_js_api' => 'https://developers.google.com/analytics/devguides/collection/analyticsjs/method-reference')),
+ '#description' => t('You can add custom Google Analytics code snippets here. These will be added every time tracking is in effect. Before you add your custom code, you should read the Google Analytics Tracking Code - Functional Overview and the Google Analytics Tracking API documentation. Do not include the <script> tags, and always end your code with a semicolon (;).', array('@snippets' => 'https://drupal.org/node/248699', '@ga_concepts_overview' => 'https://developers.google.com/analytics/resources/concepts/gaConceptsTrackingOverview', '@ga_js_api' => 'https://developers.google.com/analytics/devguides/collection/analyticsjs/method-reference')),
);
$form['advanced']['codesnippet']['googleanalytics_codesnippet_create'] = array(
'#type' => 'textarea',
@@ -447,15 +471,17 @@ function googleanalytics_admin_settings_form($form_state) {
'#type' => 'textarea',
'#title' => t('Code snippet (before)'),
'#default_value' => variable_get('googleanalytics_codesnippet_before', ''),
+ '#disabled' => $user_access_add_js_snippets,
'#rows' => 5,
- '#description' => t('Code in this textarea will be added before ga("send", "pageview");.'),
+ '#description' => t('Code in this textarea will be added before ga("send", "pageview");.') . $user_access_add_js_snippets_permission_warning,
);
$form['advanced']['codesnippet']['googleanalytics_codesnippet_after'] = array(
'#type' => 'textarea',
'#title' => t('Code snippet (after)'),
'#default_value' => variable_get('googleanalytics_codesnippet_after', ''),
+ '#disabled' => $user_access_add_js_snippets,
'#rows' => 5,
- '#description' => t('Code in this textarea will be added after ga("send", "pageview");. This is useful if you\'d like to track a site in two accounts.'),
+ '#description' => t('Code in this textarea will be added after ga("send", "pageview");. This is useful if you\'d like to track a site in two accounts.') . $user_access_add_js_snippets_permission_warning,
);
$form['advanced']['googleanalytics_debug'] = array(
@@ -541,6 +567,12 @@ function googleanalytics_admin_settings_form_validate($form, &$form_state) {
/**
* Layout for the custom variables table in the admin settings form.
+ *
+ * @param array $variables
+ * An array contains the form elements.
+ *
+ * @return string
+ * The rendered output.
*/
function theme_googleanalytics_admin_custom_var_table($variables) {
$form = $variables['form'];
@@ -551,7 +583,7 @@ function theme_googleanalytics_admin_custom_var_table($variables) {
);
$rows = array();
- foreach (element_children($form['indexes']) as $key => $id) {
+ foreach (element_children($form['indexes']) as $id) {
$rows[] = array(
'data' => array(
drupal_render($form['indexes'][$id]['index']),
@@ -600,11 +632,18 @@ function googleanalytics_token_element_validate(&$element, &$form_state) {
return $element;
}
+/**
+ * @param array $value
+ * An array of token values.
+ *
+ * @return array
+ * A unique array of invalid tokens.
+ */
function _googleanalytics_get_forbidden_tokens($value) {
$invalid_tokens = array();
$value_tokens = is_string($value) ? token_scan($value) : $value;
- foreach ($value_tokens as $type => $tokens) {
+ foreach ($value_tokens as $tokens) {
if (array_filter($tokens, '_googleanalytics_contains_forbidden_token')) {
$invalid_tokens = array_merge($invalid_tokens, array_values($tokens));
}
@@ -617,8 +656,9 @@ function _googleanalytics_get_forbidden_tokens($value) {
/**
* Validate if a string contains forbidden tokens not allowed by privacy rules.
*
- * @param $token_string
+ * @param string $token_string
* A string with one or more tokens to be validated.
+ *
* @return boolean
* TRUE if blacklisted token has been found, otherwise FALSE.
*/
@@ -724,7 +764,7 @@ function _googleanalytics_extract_create_field_values($string) {
$list = array_map('trim', $list);
$list = array_filter($list, 'strlen');
- foreach ($list as $position => $text) {
+ foreach ($list as $text) {
// Check for an explicit key.
$matches = array();
if (preg_match('/(.*)\|(.*)/', $text, $matches)) {
@@ -755,16 +795,18 @@ function _googleanalytics_validate_create_field_name($name) {
// List of supported field names:
// https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference#create
$create_only_fields = array(
- 'clientId',
- 'userId',
- 'sampleRate',
- 'siteSpeedSampleRate',
- 'alwaysSendReferrer',
'allowAnchor',
+ 'alwaysSendReferrer',
+ 'clientId',
'cookieName',
'cookieDomain',
'cookieExpires',
'legacyCookieDomain',
+ 'legacyHistoryImport',
+ 'sampleRate',
+ 'siteSpeedSampleRate',
+ 'storage',
+ 'useAmpClientId',
);
if ($name == 'name') {
@@ -773,6 +815,9 @@ function _googleanalytics_validate_create_field_name($name) {
if ($name == 'allowLinker') {
return t('Create only field name %name is a disallowed field name. Please select Multiple top-level domains under What are you tracking to enable cross domain tracking.', array('%name' => $name));
}
+ if ($name == 'userId') {
+ return t('Create only field name %name is a disallowed field name. Please enable Track User ID under Tracking scope > Users.', array('%name' => $name));
+ }
if (!in_array($name, $create_only_fields)) {
return t('Create only field name %name is an unknown field name. Field names are case sensitive. Please see create only fields documentation for supported field names.', array('%name' => $name, '@url' => 'https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference#create'));
}
diff --git a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.admin.js b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.admin.js
index 083eeaa..c81470d 100644
--- a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.admin.js
+++ b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.admin.js
@@ -65,6 +65,15 @@ Drupal.behaviors.trackingSettingsSummary = {
if ($('input#edit-googleanalytics-trackfiles', context).is(':checked')) {
vals.push(Drupal.t('Downloads'));
}
+ if ($('input#edit-googleanalytics-trackcolorbox', context).is(':checked')) {
+ vals.push(Drupal.t('Colorbox'));
+ }
+ if ($('input#edit-googleanalytics-tracklinkid', context).is(':checked')) {
+ vals.push(Drupal.t('Link attribution'));
+ }
+ if ($('input#edit-googleanalytics-trackurlfragments', context).is(':checked')) {
+ vals.push(Drupal.t('URL fragments'));
+ }
if (!vals.length) {
return Drupal.t('Not tracked');
}
diff --git a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.debug.js b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.debug.js
index 861f7fd..7186230 100644
--- a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.debug.js
+++ b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.debug.js
@@ -8,16 +8,16 @@ $(document).ready(function() {
// clicks on all elements.
$(document.body).bind("mousedown keyup touchstart", function(event) {
console.group("Running Google Analytics for Drupal.");
- console.info(event);
+ console.info("Event '%s' has been detected.", event.type);
// Catch the closest surrounding link of a clicked element.
$(event.target).closest("a,area").each(function() {
- console.info("Element '%o' has been detected. Link '%s' found.", this, this.href);
+ console.info("Closest element '%o' has been found. URL '%s' extracted.", this, this.href);
// Is the clicked URL internal?
if (Drupal.googleanalytics.isInternal(this.href)) {
// Skip 'click' tracking, if custom tracking events are bound.
- if ($(this).is('.colorbox')) {
+ if ($(this).is('.colorbox') && (Drupal.settings.googleanalytics.trackColorbox)) {
// Do nothing here. The custom event will handle all tracking.
console.info("Click on .colorbox item has been detected.");
}
@@ -25,12 +25,22 @@ $(document).ready(function() {
else if (Drupal.settings.googleanalytics.trackDownload && Drupal.googleanalytics.isDownload(this.href)) {
// Download link clicked.
console.info("Download url '%s' has been found. Tracked download as extension '%s'.", Drupal.googleanalytics.getPageUrl(this.href), Drupal.googleanalytics.getDownloadExtension(this.href).toUpperCase());
- ga("send", "event", "Downloads", Drupal.googleanalytics.getDownloadExtension(this.href).toUpperCase(), Drupal.googleanalytics.getPageUrl(this.href));
+ ga("send", {
+ "hitType": "event",
+ "eventCategory": "Downloads",
+ "eventAction": Drupal.googleanalytics.getDownloadExtension(this.href).toUpperCase(),
+ "eventLabel": Drupal.googleanalytics.getPageUrl(this.href),
+ "transport": "beacon"
+ });
}
else if (Drupal.googleanalytics.isInternalSpecial(this.href)) {
// Keep the internal URL for Google Analytics website overlay intact.
console.info("Click on internal special link '%s' has been tracked.", Drupal.googleanalytics.getPageUrl(this.href));
- ga("send", "pageview", { "page": Drupal.googleanalytics.getPageUrl(this.href) });
+ ga("send", {
+ "hitType": "pageview",
+ "page": Drupal.googleanalytics.getPageUrl(this.href),
+ "transport": "beacon"
+ });
}
else {
// e.g. anchor in same page or other internal page link
@@ -41,13 +51,25 @@ $(document).ready(function() {
if (Drupal.settings.googleanalytics.trackMailto && $(this).is("a[href^='mailto:'],area[href^='mailto:']")) {
// Mailto link clicked.
console.info("Click on e-mail '%s' has been tracked.", this.href.substring(7));
- ga("send", "event", "Mails", "Click", this.href.substring(7));
+ ga("send", {
+ "hitType": "event",
+ "eventCategory": "Mails",
+ "eventAction": "Click",
+ "eventLabel": this.href.substring(7),
+ "transport": "beacon"
+ });
}
else if (Drupal.settings.googleanalytics.trackOutbound && this.href.match(/^\w+:\/\//i)) {
- if (Drupal.settings.googleanalytics.trackDomainMode != 2 || (Drupal.settings.googleanalytics.trackDomainMode == 2 && !Drupal.googleanalytics.isCrossDomain(this.hostname, Drupal.settings.googleanalytics.trackCrossDomains))) {
+ if (Drupal.settings.googleanalytics.trackDomainMode !== 2 || (Drupal.settings.googleanalytics.trackDomainMode === 2 && !Drupal.googleanalytics.isCrossDomain(this.hostname, Drupal.settings.googleanalytics.trackCrossDomains))) {
// External link clicked / No top-level cross domain clicked.
console.info("Outbound link '%s' has been tracked.", this.href);
- ga("send", "event", "Outbound links", "Click", this.href);
+ ga("send", {
+ "hitType": "event",
+ "eventCategory": "Outbound links",
+ "eventAction": "Click",
+ "eventLabel": this.href,
+ "transport": "beacon"
+ });
}
else {
console.info("Internal link '%s' clicked, not tracked.", this.href);
@@ -63,19 +85,27 @@ $(document).ready(function() {
if (Drupal.settings.googleanalytics.trackUrlFragments) {
window.onhashchange = function() {
console.info("Track URL '%s' as pageview. Hash '%s' has changed.", location.pathname + location.search + location.hash, location.hash);
- ga('send', 'pageview', location.pathname + location.search + location.hash);
- }
+ ga("send", {
+ "hitType": "pageview",
+ "page": location.pathname + location.search + location.hash
+ });
+ };
}
// Colorbox: This event triggers when the transition has completed and the
// newly loaded content has been revealed.
- $(document).bind("cbox_complete", function () {
- var href = $.colorbox.element().attr("href");
- if (href) {
- console.info("Colorbox transition to url '%s' has been tracked.", Drupal.googleanalytics.getPageUrl(href));
- ga("send", "pageview", { "page": Drupal.googleanalytics.getPageUrl(href) });
- }
- });
+ if (Drupal.settings.googleanalytics.trackColorbox) {
+ $(document).bind("cbox_complete", function () {
+ var href = $.colorbox.element().attr("href");
+ if (href) {
+ console.info("Colorbox transition to url '%s' has been tracked.", Drupal.googleanalytics.getPageUrl(href));
+ ga("send", {
+ "hitType": "pageview",
+ "page": Drupal.googleanalytics.getPageUrl(href)
+ });
+ }
+ });
+ }
});
@@ -92,7 +122,7 @@ $(document).ready(function() {
Drupal.googleanalytics.isCrossDomain = function (hostname, crossDomains) {
/**
* jQuery < 1.6.3 bug: $.inArray crushes IE6 and Chrome if second argument is
- * `null` or `undefined`, http://bugs.jquery.com/ticket/10076,
+ * `null` or `undefined`, https://bugs.jquery.com/ticket/10076,
* https://github.com/jquery/jquery/commit/a839af034db2bd934e4d4fa6758a3fed8de74174
*
* @todo: Remove/Refactor in D8
@@ -151,8 +181,8 @@ Drupal.googleanalytics.isInternalSpecial = function (url) {
* Extract the relative internal URL from an absolute internal URL.
*
* Examples:
- * - http://mydomain.com/node/1 -> /node/1
- * - http://example.com/foo/bar -> http://example.com/foo/bar
+ * - https://mydomain.com/node/1 -> /node/1
+ * - https://example.com/foo/bar -> https://example.com/foo/bar
*
* @param string url
* The web url to check.
diff --git a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.info b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.info
index adbf134..591816a 100644
--- a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.info
+++ b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.info
@@ -5,9 +5,8 @@ package = Statistics
configure = admin/config/system/googleanalytics
files[] = googleanalytics.test
test_dependencies[] = token
-; Information added by Drupal.org packaging script on 2014-11-29
-version = "7.x-2.1"
+; Information added by Drupal.org packaging script on 2019-01-31
+version = "7.x-2.6"
core = "7.x"
project = "google_analytics"
-datestamp = "1417276982"
-
+datestamp = "1548968597"
diff --git a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.install b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.install
index d7b2edf..08b4e05 100644
--- a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.install
+++ b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.install
@@ -10,6 +10,7 @@
*/
function googleanalytics_uninstall() {
variable_del('googleanalytics_account');
+ variable_del('googleanalytics_premium');
variable_del('googleanalytics_cache');
variable_del('googleanalytics_codesnippet_create');
variable_del('googleanalytics_codesnippet_before');
@@ -25,6 +26,7 @@ function googleanalytics_uninstall() {
variable_del('googleanalytics_roles');
variable_del('googleanalytics_site_search');
variable_del('googleanalytics_trackadsense');
+ variable_del('googleanalytics_trackcolorbox');
variable_del('googleanalytics_trackdoubleclick');
variable_del('googleanalytics_tracker_anonymizeip');
variable_del('googleanalytics_trackfiles');
@@ -40,7 +42,7 @@ function googleanalytics_uninstall() {
variable_del('googleanalytics_visibility_roles');
variable_del('googleanalytics_privacy_donottrack');
- // Remove backup variables if exist. Remove this code in D8.
+ // Remove backup variables if they exist. Remove this code in D8.
variable_del('googleanalytics_codesnippet_after_backup_7200');
variable_del('googleanalytics_codesnippet_before_backup_7200');
}
@@ -87,7 +89,8 @@ function googleanalytics_requirements($phase) {
}
/**
- * Upgrade old extension variable to new and use old name as enabled/disabled flag.
+ * Upgrade old extension variable to new and use old name as enabled/disabled
+ * flag.
*/
function googleanalytics_update_6000() {
variable_set('googleanalytics_trackfiles_extensions', variable_get('googleanalytics_trackfiles', '7z|aac|avi|csv|doc|exe|flv|gif|gz|jpe?g|js|mp(3|4|e?g)|mov|pdf|phps|png|ppt|rar|sit|tar|torrent|txt|wma|wmv|xls|xml|zip'));
@@ -100,7 +103,8 @@ function googleanalytics_update_6000() {
function googleanalytics_update_6001() {
variable_set('googleanalytics_visibility', 0);
- // Remove tracking from all administrative pages, see http://drupal.org/node/34970.
+ // Remove tracking from all administrative pages, see:
+ // https://drupal.org/node/34970.
$pages = array(
'admin*',
'user*',
@@ -113,11 +117,12 @@ function googleanalytics_update_6001() {
}
/**
- * Upgrade role settings and per user tracking settings
- * of "User 1" and remove outdated tracking variables.
+ * Upgrade role settings and per user tracking settings of "User 1" and remove
+ * outdated tracking variables.
*/
function googleanalytics_update_6002() {
- // Upgrade enabled/disabled roles to new logic (correct for upgrades from 5.x-1.4 and 6.x-1.0).
+ // Upgrade enabled/disabled roles to new logic (correct for upgrades from
+ // 5.x-1.4 and 6.x-1.0).
$roles = array();
$messages = array();
foreach (user_roles() as $rid => $name) {
@@ -136,7 +141,7 @@ function googleanalytics_update_6002() {
if (!$track_user1 = variable_get('googleanalytics_track__user1', 1)) {
variable_set('googleanalytics_custom', 1);
- // Load user 1 object, set appropriate value and save new user settings back.
+ // Load user 1 object, set appropriate value and save new user settings.
$account = user_load(1);
$account = user_save($account, array('data' => array('googleanalytics' => array('custom' => 0))), 'account');
$messages[] = t('Disabled user specific page tracking for site administrator.');
@@ -151,11 +156,11 @@ function googleanalytics_update_6002() {
}
/**
- * #262468: Clear menu cache to solve stale menu data in 5.x-1.5 and 6.x-1.1
+ * #262468: Clear menu cache to solve stale menu data in 5.x-1.5 and 6.x-1.1.
*/
function googleanalytics_update_6003() {
menu_rebuild();
- return t('Menu has been rebuild.');
+ return t('Menu has been rebuilt.');
}
/**
@@ -230,8 +235,9 @@ function googleanalytics_update_6006() {
/**
* Remove "User identifier" and "User name" from segmentation fields.
*
- * This is a data protection and privacy law change. For more information see Google Analytics
- * terms of use section 8.1 (http://www.google.com/analytics/en-GB/tos.html).
+ * This is a data protection and privacy law change. For more information see
+ * Google Analytics terms of use section 8.1:
+ * https://www.google.com/analytics/en-GB/tos.html
*/
function googleanalytics_update_6007() {
$profile_fields = variable_get('googleanalytics_segmentation', array());
@@ -292,15 +298,15 @@ function googleanalytics_update_6300() {
$messages[] = t('Upgraded custom "before" code snippet.');
}
- // Upgrade of AFTER code snippet.
- // We cannot update this code snippet automatically. Show message that the upgrade has been skipped.
+ // Upgrade of AFTER code snippet. We cannot update this code snippet
+ // automatically. Show message that the upgrade has been skipped.
$code_after = variable_get('googleanalytics_codesnippet_after', '');
if (!empty($code_after)) {
drupal_set_message(Database::getConnection()->prefixTables("Automatic upgrade of Google Analytics custom 'after' code snippet has been skipped. Backup of previous code snippet has been saved in database table '{variable}' as 'googleanalytics_codesnippet_after_backup_6300'. You need to manually upgrade the custom 'after' code snippet."), 'error');
$messages[] = t('Skipped custom "after" code snippet.');
}
- return empty($messages) ? t('No custom code snipped found. Nothing to do.') : implode(' ', $messages);
+ return empty($messages) ? t('No custom code snippet found. Nothing to do.') : implode(' ', $messages);
}
/**
@@ -355,18 +361,20 @@ function googleanalytics_update_7002() {
$googleanalytics_custom_vars['slots'][1]['slot'] = 1;
$googleanalytics_custom_vars['slots'][1]['name'] = 'User roles';
$googleanalytics_custom_vars['slots'][1]['value'] = '[current-user:role-names]';
- $googleanalytics_custom_vars['slots'][1]['scope'] = 1; // Sets the scope to visitor-level.
+ // Sets the scope to visitor-level.
+ $googleanalytics_custom_vars['slots'][1]['scope'] = 1;
variable_set('googleanalytics_custom_var', $googleanalytics_custom_vars);
- return t('The deprecated profile segmentation setting for "User roles" has been added to custom variables. You need to deselect all selected profile fields in Google Analytics settings and upgrade other profile fields manually or you may loose tracking data in future! See Google Analytics Custom Variables for more information.', array('@customvar' => 'https://developers.google.com/analytics/devguides/collection/gajs/gaTrackingCustomVariables', '@admin' => url('admin/config/system/googleanalytics')));
+ return t('The deprecated profile segmentation setting for "User roles" has been added to custom variables. You need to deselect all selected profile fields in Google Analytics settings and upgrade other profile fields manually or you may lose tracking data in future! See Google Analytics Custom Variables for more information.', array('@customvar' => 'https://developers.google.com/analytics/devguides/collection/gajs/gaTrackingCustomVariables', '@admin' => url('admin/config/system/googleanalytics')));
}
else {
- return t('You need to deselect all selected profile fields in Google Analytics settings and upgrade other profile fields manually or you may loose tracking data in future! See Google Analytics Custom Variables for more information.', array('@customvar' => 'https://developers.google.com/analytics/devguides/collection/gajs/gaTrackingCustomVariables', '@admin' => url('admin/config/system/googleanalytics')));
+ return t('You need to deselect all selected profile fields in Google Analytics settings and upgrade other profile fields manually or you may lose tracking data in future! See Google Analytics Custom Variables for more information.', array('@customvar' => 'https://developers.google.com/analytics/devguides/collection/gajs/gaTrackingCustomVariables', '@admin' => url('admin/config/system/googleanalytics')));
}
}
/**
- * Rename googleanalytics_trackoutgoing variable to googleanalytics_trackoutbound.
+ * Rename googleanalytics_trackoutgoing variable to
+ * googleanalytics_trackoutbound.
*/
function googleanalytics_update_7003() {
variable_set('googleanalytics_trackoutbound', variable_get('googleanalytics_trackoutgoing', 1));
@@ -376,7 +384,8 @@ function googleanalytics_update_7003() {
}
/**
- * Rename googleanalytics_visibility variable to googleanalytics_visibility_pages for consistency.
+ * Rename googleanalytics_visibility variable to
+ * googleanalytics_visibility_pages for consistency.
*/
function googleanalytics_update_7004() {
variable_set('googleanalytics_visibility_pages', variable_get('googleanalytics_visibility', 1));
@@ -400,7 +409,7 @@ function googleanalytics_update_7005() {
$diff = array_diff($pages, preg_split('/(\r\n?|\n)/', variable_get('googleanalytics_pages', implode("\n", $pages))));
if (empty($diff)) {
- // No diff to previous settings found. Update with new settings.
+ // No difference to previous settings found. Update with new settings.
$pages = array(
'admin',
'admin/*',
@@ -436,7 +445,8 @@ function googleanalytics_update_7007() {
}
/**
- * Delete custom ga.js code snipptes to prevent malfunctions in new Universal Analytics tracker. A backup of your snippets will be created.
+ * Delete custom ga.js code snippets to prevent malfunctions in new Universal
+ * Analytics tracker. A backup of your snippets will be created.
*/
function googleanalytics_update_7200() {
$messages = array();
@@ -446,23 +456,24 @@ function googleanalytics_update_7200() {
if (!empty($googleanalytics_codesnippet_before) && stristr($googleanalytics_codesnippet_before, '_gaq.push(')) {
variable_set('googleanalytics_codesnippet_before_backup_7200', $googleanalytics_codesnippet_before);
variable_del('googleanalytics_codesnippet_before');
- drupal_set_message(Database::getConnection()->prefixTables("A backup of your previous Google Analytics code snippet has been saved in database table '{variable}' as 'googleanalytics_codesnippet_before_backup_7200'. You need to manually upgrade the custom 'before' code snippet."), 'warning');
- $messages[] = t('Manual upgrade of custom "before" code snippet is required.');
+ drupal_set_message(Database::getConnection()->prefixTables("A backup of your previous Google Analytics code snippet (ga.js) has been saved in database table '{variable}' as 'googleanalytics_codesnippet_before_backup_7200'. You need to manually upgrade the custom 'before' code snippet to analytics.js API."), 'warning');
+ $messages[] = t('Manual upgrade of custom "before" code snippet from ja.js to analytics.js API is required.');
}
$googleanalytics_codesnippet_after = variable_get('googleanalytics_codesnippet_after', '');
if (!empty($googleanalytics_codesnippet_after) && stristr($googleanalytics_codesnippet_after, '_gaq.push(')) {
variable_set('googleanalytics_codesnippet_after_backup_7200', $googleanalytics_codesnippet_after);
variable_del('googleanalytics_codesnippet_after');
- drupal_set_message(Database::getConnection()->prefixTables("A backup of your previous Google Analytics code snippet has been saved in database table '{variable}' as 'googleanalytics_codesnippet_before_backup_7200'. You need to manually upgrade the custom 'before' code snippet."), 'warning');
- $messages[] = t('Manual upgrade of custom "after" code snippet is required.');
+ drupal_set_message(Database::getConnection()->prefixTables("A backup of your previous Google Analytics code snippet (ga.js) has been saved in database table '{variable}' as 'googleanalytics_codesnippet_after_backup_7200'. You need to manually upgrade the custom 'after' code snippet to analytics.js API."), 'warning');
+ $messages[] = t('Manual upgrade of custom "after" code snippet from ja.js to analytics.js API is required.');
}
- return empty($messages) ? t('No custom code snipped found. Nothing to do.') : implode(' ', $messages);
+ return empty($messages) ? t('No custom code snippet found. Nothing to do.') : implode(' ', $messages);
}
/**
- * Delete obsolete custom variables. Custom variables are now custom dimensions and metrics.
+ * Delete obsolete custom variables. Custom variables are now custom dimensions
+ * and metrics.
*/
function googleanalytics_update_7201() {
variable_del('googleanalytics_custom_var');
@@ -474,7 +485,7 @@ function googleanalytics_update_7201() {
* Delete obsolete JavaScript scope variable.
*/
function googleanalytics_update_7202() {
- // Remove obsolete scope variable
+ // Remove obsolete scope variable.
variable_del('googleanalytics_js_scope');
return t('Removed obsolete JavaScript scope variable.');
diff --git a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.js b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.js
index 1eed3c3..5ba42ca 100644
--- a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.js
+++ b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.js
@@ -14,29 +14,51 @@ $(document).ready(function() {
// Is the clicked URL internal?
if (Drupal.googleanalytics.isInternal(this.href)) {
// Skip 'click' tracking, if custom tracking events are bound.
- if ($(this).is('.colorbox')) {
+ if ($(this).is('.colorbox') && (Drupal.settings.googleanalytics.trackColorbox)) {
// Do nothing here. The custom event will handle all tracking.
//console.info("Click on .colorbox item has been detected.");
}
// Is download tracking activated and the file extension configured for download tracking?
else if (Drupal.settings.googleanalytics.trackDownload && Drupal.googleanalytics.isDownload(this.href)) {
// Download link clicked.
- ga("send", "event", "Downloads", Drupal.googleanalytics.getDownloadExtension(this.href).toUpperCase(), Drupal.googleanalytics.getPageUrl(this.href));
+ ga("send", {
+ "hitType": "event",
+ "eventCategory": "Downloads",
+ "eventAction": Drupal.googleanalytics.getDownloadExtension(this.href).toUpperCase(),
+ "eventLabel": Drupal.googleanalytics.getPageUrl(this.href),
+ "transport": "beacon"
+ });
}
else if (Drupal.googleanalytics.isInternalSpecial(this.href)) {
// Keep the internal URL for Google Analytics website overlay intact.
- ga("send", "pageview", { "page": Drupal.googleanalytics.getPageUrl(this.href) });
+ ga("send", {
+ "hitType": "pageview",
+ "page": Drupal.googleanalytics.getPageUrl(this.href),
+ "transport": "beacon"
+ });
}
}
else {
if (Drupal.settings.googleanalytics.trackMailto && $(this).is("a[href^='mailto:'],area[href^='mailto:']")) {
// Mailto link clicked.
- ga("send", "event", "Mails", "Click", this.href.substring(7));
+ ga("send", {
+ "hitType": "event",
+ "eventCategory": "Mails",
+ "eventAction": "Click",
+ "eventLabel": this.href.substring(7),
+ "transport": "beacon"
+ });
}
else if (Drupal.settings.googleanalytics.trackOutbound && this.href.match(/^\w+:\/\//i)) {
- if (Drupal.settings.googleanalytics.trackDomainMode != 2 || (Drupal.settings.googleanalytics.trackDomainMode == 2 && !Drupal.googleanalytics.isCrossDomain(this.hostname, Drupal.settings.googleanalytics.trackCrossDomains))) {
+ if (Drupal.settings.googleanalytics.trackDomainMode !== 2 || (Drupal.settings.googleanalytics.trackDomainMode === 2 && !Drupal.googleanalytics.isCrossDomain(this.hostname, Drupal.settings.googleanalytics.trackCrossDomains))) {
// External link clicked / No top-level cross domain clicked.
- ga("send", "event", "Outbound links", "Click", this.href);
+ ga("send", {
+ "hitType": "event",
+ "eventCategory": "Outbound links",
+ "eventAction": "Click",
+ "eventLabel": this.href,
+ "transport": "beacon"
+ });
}
}
}
@@ -46,18 +68,26 @@ $(document).ready(function() {
// Track hash changes as unique pageviews, if this option has been enabled.
if (Drupal.settings.googleanalytics.trackUrlFragments) {
window.onhashchange = function() {
- ga('send', 'pageview', location.pathname + location.search + location.hash);
- }
+ ga("send", {
+ "hitType": "pageview",
+ "page": location.pathname + location.search + location.hash
+ });
+ };
}
// Colorbox: This event triggers when the transition has completed and the
// newly loaded content has been revealed.
- $(document).bind("cbox_complete", function () {
- var href = $.colorbox.element().attr("href");
- if (href) {
- ga("send", "pageview", { "page": Drupal.googleanalytics.getPageUrl(href) });
- }
- });
+ if (Drupal.settings.googleanalytics.trackColorbox) {
+ $(document).bind("cbox_complete", function () {
+ var href = $.colorbox.element().attr("href");
+ if (href) {
+ ga("send", {
+ "hitType": "pageview",
+ "page": Drupal.googleanalytics.getPageUrl(href)
+ });
+ }
+ });
+ }
});
@@ -74,7 +104,7 @@ $(document).ready(function() {
Drupal.googleanalytics.isCrossDomain = function (hostname, crossDomains) {
/**
* jQuery < 1.6.3 bug: $.inArray crushes IE6 and Chrome if second argument is
- * `null` or `undefined`, http://bugs.jquery.com/ticket/10076,
+ * `null` or `undefined`, https://bugs.jquery.com/ticket/10076,
* https://github.com/jquery/jquery/commit/a839af034db2bd934e4d4fa6758a3fed8de74174
*
* @todo: Remove/Refactor in D8
@@ -133,8 +163,8 @@ Drupal.googleanalytics.isInternalSpecial = function (url) {
* Extract the relative internal URL from an absolute internal URL.
*
* Examples:
- * - http://mydomain.com/node/1 -> /node/1
- * - http://example.com/foo/bar -> http://example.com/foo/bar
+ * - https://mydomain.com/node/1 -> /node/1
+ * - https://example.com/foo/bar -> https://example.com/foo/bar
*
* @param string url
* The web url to check.
diff --git a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.module b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.module
index 4051b1b..0026703 100644
--- a/sites/all/modules/contrib/admin/google_analytics/googleanalytics.module
+++ b/sites/all/modules/contrib/admin/google_analytics/googleanalytics.module
@@ -7,7 +7,7 @@
* Adds the required Javascript to all your Drupal pages to allow tracking by
* the Google Analytics statistics package.
*
- * @author: Alexander Hass - ';
+ for (var i in Drupal.settings.moduleFilter.packageIDs) {
+ var id = Drupal.checkPlain(Drupal.settings.moduleFilter.packageIDs[i]);
+
+ var name = id;
+ var tabClass = 'project-tab';
+ var title = null;
+ var summary = (Drupal.settings.moduleFilter.countEnabled) ? '' + Drupal.ModuleFilter.countSummary(id) + '' : '';
+
+ switch (id) {
+ case 'all':
+ name = Drupal.t('All');
+ break;
+ case 'new':
+ name = Drupal.t('New');
+ title = Drupal.t('Modules installed within the last week.');
+ if (Drupal.settings.moduleFilter.enabledCounts['new'].total == 0) {
+ tabClass += ' disabled';
+ summary += '' + Drupal.t('No modules added within the last week.') + '';
}
- Drupal.ModuleFilter.timeout = setTimeout('Drupal.ModuleFilter.filter("' + Drupal.ModuleFilter.textFilter + '")', 500);
- }
- break;
- }
- });
- $('input[name="module_filter[name]"]').keypress(function(e) {
- if (e.which == 13) e.preventDefault();
- });
-
- Drupal.ModuleFilter.showEnabled = $('#edit-module-filter-show-enabled').is(':checked');
- $('#edit-module-filter-show-enabled').change(function() {
- Drupal.ModuleFilter.showEnabled = $(this).is(':checked');
- Drupal.ModuleFilter.filter($('input[name="module_filter[name]"]').val());
- });
- Drupal.ModuleFilter.showDisabled = $('#edit-module-filter-show-disabled').is(':checked');
- $('#edit-module-filter-show-disabled').change(function() {
- Drupal.ModuleFilter.showDisabled = $(this).is(':checked');
- Drupal.ModuleFilter.filter($('input[name="module_filter[name]"]').val());
- });
- Drupal.ModuleFilter.showRequired = $('#edit-module-filter-show-required').is(':checked');
- $('#edit-module-filter-show-required').change(function() {
- Drupal.ModuleFilter.showRequired = $(this).is(':checked');
- Drupal.ModuleFilter.filter($('input[name="module_filter[name]"]').val());
- });
- Drupal.ModuleFilter.showUnavailable = $('#edit-module-filter-show-unavailable').is(':checked');
- $('#edit-module-filter-show-unavailable').change(function() {
- Drupal.ModuleFilter.showUnavailable = $(this).is(':checked');
- Drupal.ModuleFilter.filter($('input[name="module_filter[name]"]').val());
- });
-
- if (Drupal.settings.moduleFilter.visualAid == 1) {
- $('table.package tbody td.checkbox input').change(function() {
- if ($(this).is(':checked')) {
- Drupal.ModuleFilter.updateVisualAid('enable', $(this).parents('tr'));
+ break;
+ case 'recent':
+ name = Drupal.t('Recent');
+ title = Drupal.t('Modules enabled/disabled within the last week.');
+ if (Drupal.settings.moduleFilter.enabledCounts['recent'].total == 0) {
+ tabClass += ' disabled';
+ summary += '' + Drupal.t('No modules were enabled or disabled within the last week.') + '';
+ }
+ break;
+ default:
+ var $row = $('#' + id + '-package', this);
+ name = Drupal.checkPlain($.trim($row.text()));
+ $row.remove();
+ break;
}
- else {
- Drupal.ModuleFilter.updateVisualAid('disable', $(this).parents('tr'));
+
+ tabs += '
- ' + name + '' + summary + ' '; + } + tabs += '
'; } - if (Drupal.ModuleFilter.showDisabled) { - if (!$(checkbox).is(':checked') && !$(checkbox).is(':disabled')) { - return true; - } - } - if (Drupal.ModuleFilter.showRequired) { - if ($(checkbox).is(':checked') && $(checkbox).is(':disabled')) { - return true; - } - } - } - if (Drupal.ModuleFilter.showUnavailable) { - if (checkbox.length == 0 || (!$(checkbox).is(':checked') && $(checkbox).is(':disabled'))) { - return true; + visualAid += '-' + disabling.join(', ') + ''; + } + } + + if (this.visualAid == undefined) { + $('a span.summary', this.element).append(''); + this.visualAid = $('span.visual-aid', this.element); + } + + this.visualAid.empty().append(visualAid); +}; + +Drupal.ModuleFilter.getTabID = function($row) { + var id = $row.data('moduleFilterTabID'); + if (!id) { + // Find the tab ID. + var classes = $row.attr('class').split(' '); + for (var i in classes) { + if (Drupal.ModuleFilter.tabs[classes[i]] != undefined) { + id = classes[i]; + break; } } + $row.data('moduleFilterTabID', id); + } + return id; +}; + +Drupal.ModuleFilter.updateVisualAid = function(type, $row) { + var id = Drupal.ModuleFilter.getTabID($row); + + if (!id) { return false; } - Drupal.ModuleFilter.filter = function(string) { - var stringLowerCase = string.toLowerCase(); - var flip = 'odd'; - - if (Drupal.ModuleFilter.activeTab.id == 'all-tab') { - var selector = 'table.package tbody tr td label > strong'; - } - else { - var selector = 'table.package tbody tr.' + Drupal.ModuleFilter.activeTab.id + '-content td label strong'; - } - - $(selector).each(function(i) { - var $row = $(this).parents('tr'); - var module = $(this).text(); - var moduleLowerCase = module.toLowerCase(); - - if (moduleLowerCase.match(stringLowerCase)) { - if (Drupal.ModuleFilter.visible($('td.checkbox :checkbox', $row))) { - $row.removeClass('odd even'); - $row.addClass(flip); - $row.show(); - flip = (flip == 'odd') ? 'even' : 'odd'; - } - else { - $row.hide(); - } + var tab = Drupal.ModuleFilter.tabs[id]; + var name = Drupal.checkPlain($('td:nth(1) strong', $row).text()); + switch (type) { + case 'enable': + if (Drupal.ModuleFilter.disabling[id + name] != undefined) { + delete Drupal.ModuleFilter.disabling[id + name]; + tab.updateDisabling(name, true); + $row.removeClass('disabling'); } else { - $row.hide(); + Drupal.ModuleFilter.enabling[id + name] = name; + tab.updateEnabling(name); + $row.addClass('enabling'); } - }); - } - - Drupal.ModuleFilter.Tab = function(element) { - this.id = $(element).attr('id'); - this.element = element; - - $(this.element).click(function() { - Drupal.ModuleFilter.tabs[$(this).attr('id')].setActive(); - }); - } - - Drupal.ModuleFilter.Tab.prototype.setActive = function() { - if (Drupal.ModuleFilter.activeTab) { - $(Drupal.ModuleFilter.activeTab.element).parent().removeClass('active'); - } - // Assume the default active tab is #all-tab. Remove its active class. - else { - $('#all-tab').parent().removeClass('active'); - } - - Drupal.ModuleFilter.activeTab = this; - $(Drupal.ModuleFilter.activeTab.element).parent().addClass('active'); - Drupal.ModuleFilter.activeTab.displayRows(); - - // Clear filter textfield and refocus on it. - $('input[name="module_filter[name]"]').val(''); - $('input[name="module_filter[name]"]').focus(); - } - - Drupal.ModuleFilter.Tab.prototype.displayRows = function() { - var flip = 'odd'; - var selector = (Drupal.ModuleFilter.activeTab.id == 'all-tab') ? 'table.package tbody tr' : 'table.package tbody tr.' + this.id + '-content'; - $('table.package tbody tr').hide(); - $('table.package tbody tr').removeClass('odd even'); - $(selector).each(function(i) { - if (Drupal.ModuleFilter.visible($('td.checkbox input', $(this)))) { - $(this).addClass(flip); - flip = (flip == 'odd') ? 'even' : 'odd'; - $(this).show(); + break; + case 'disable': + if (Drupal.ModuleFilter.enabling[id + name] != undefined) { + delete Drupal.ModuleFilter.enabling[id + name]; + tab.updateEnabling(name, true); + $row.removeClass('enabling'); } - }); - } - - Drupal.ModuleFilter.Tab.prototype.updateEnabling = function(amount) { - this.enabling = this.enabling || 0; - this.enabling += amount; - if (this.enabling == 0) { - delete(this.enabling); - } - } - - Drupal.ModuleFilter.Tab.prototype.updateDisabling = function(amount) { - this.disabling = this.disabling || 0; - this.disabling += amount; - if (this.disabling == 0) { - delete(this.disabling); - } - } - - Drupal.ModuleFilter.Tab.prototype.updateVisualAid = function() { - var visualAid = ''; - if (this.enabling != undefined) { - visualAid += '' + Drupal.t('+@count', { '@count': this.enabling }) + ''; - } - if (this.disabling != undefined) { - visualAid += '' + Drupal.t('-@count', { '@count': this.disabling }) + ''; - } - - if (!$('span.visual-aid', $(this.element)).size() && visualAid != '') { - $(this.element).prepend(''); - } - - $('span.visual-aid', $(this.element)).empty().append(visualAid); - } - - Drupal.ModuleFilter.updateVisualAid = function(type, row) { - // Find row class. - var classes = row.attr('class').split(' '); - for (var i in classes) { - // Remove '-content' so we can use as id. - var id = classes[i].substring(0, classes[i].length - 8); - if (Drupal.ModuleFilter.tabs[id] != undefined) { - break; + else { + Drupal.ModuleFilter.disabling[id + name] = name; + tab.updateDisabling(name); + $row.addClass('disabling'); } - } - - if (Drupal.ModuleFilter.activeTab.id == 'all-tab') { - var allTab = Drupal.ModuleFilter.activeTab; - var projectTab = Drupal.ModuleFilter.tabs[id]; - } - else { - var allTab = Drupal.ModuleFilter.tabs['all-tab']; - var projectTab = Drupal.ModuleFilter.activeTab; - } - - var name = $('td label strong', row).text(); - switch (type) { - case 'enable': - if (Drupal.ModuleFilter.disabling[id + name] != undefined) { - delete(Drupal.ModuleFilter.disabling[id + name]); - allTab.updateDisabling(-1); - projectTab.updateDisabling(-1); - row.removeClass('disabling'); - } - else { - Drupal.ModuleFilter.enabling[id + name] = name; - allTab.updateEnabling(1); - projectTab.updateEnabling(1); - row.addClass('enabling'); - } - break; - case 'disable': - if (Drupal.ModuleFilter.enabling[id + name] != undefined) { - delete(Drupal.ModuleFilter.enabling[id + name]); - allTab.updateEnabling(-1); - projectTab.updateEnabling(-1); - row.removeClass('enabling'); - } - else { - Drupal.ModuleFilter.disabling[id + name] = name; - allTab.updateDisabling(1); - projectTab.updateDisabling(1); - row.addClass('disabling'); - } - break; - } - - allTab.updateVisualAid(); - projectTab.updateVisualAid(); + break; } + + tab.updateVisualAid(); +}; + +Drupal.ModuleFilter.Filter.prototype.adjustHeight = function() { + // Hack for adjusting the height of the modules section. + var minHeight = $('#module-filter-tabs ul').height() + 10; + minHeight += $('#module-filter-tabs #module-filter-submit').height(); + $('#module-filter-modules').css('min-height', minHeight); + this.element.trigger('moduleFilter:adjustHeight'); +} + })(jQuery); diff --git a/sites/all/modules/contrib/admin/module_filter/js/modules.js b/sites/all/modules/contrib/admin/module_filter/js/modules.js new file mode 100644 index 0000000..b0b4939 --- /dev/null +++ b/sites/all/modules/contrib/admin/module_filter/js/modules.js @@ -0,0 +1,181 @@ +(function($) { + +Drupal.behaviors.moduleFilter = { + attach: function(context) { + $('#system-modules td.description').once('description', function() { + $(this).click(function() { + $('.inner.expand', $(this)).toggleClass('expanded'); + }); + $('.inner.expand', $(this)).children().click(function(e) { + if ($(this).parent().hasClass('expanded')) { + e.stopPropagation(); + } + }); + }); + + $('.module-filter-inputs-wrapper', context).once('module-filter', function() { + var filterInput = $('input[name="module_filter[name]"]', context); + var selector = '#system-modules table tbody tr'; + if (Drupal.settings.moduleFilter.tabs) { + selector += '.module'; + } + + filterInput.moduleFilter(selector, { + wrapper: $('#module-filter-modules'), + delay: 500, + striping: true, + childSelector: 'td:nth(1)', + rules: [ + function(moduleFilter, item) { + if (!item.unavailable) { + if (moduleFilter.options.showEnabled) { + if (item.status && !item.disabled) { + return true; + } + } + if (moduleFilter.options.showDisabled) { + if (!item.status && !item.disabled) { + return true; + } + } + if (moduleFilter.options.showRequired) { + if (item.status && item.disabled) { + return true; + } + } + } + if (moduleFilter.options.showUnavailable) { + if (item.unavailable || (!item.status && item.disabled)) { + return true; + } + } + return false; + } + ], + buildIndex: [ + function(moduleFilter, item) { + var $checkbox = $('td.checkbox :checkbox', item.element); + if ($checkbox.size() > 0) { + item.status = $checkbox.is(':checked'); + item.disabled = $checkbox.is(':disabled'); + } + else { + item.status = false; + item.disabled = true; + item.unavailable = true; + } + return item; + } + ], + showEnabled: $('#edit-module-filter-show-enabled').is(':checked'), + showDisabled: $('#edit-module-filter-show-disabled').is(':checked'), + showRequired: $('#edit-module-filter-show-required').is(':checked'), + showUnavailable: $('#edit-module-filter-show-unavailable').is(':checked') + }); + + var moduleFilter = filterInput.data('moduleFilter'); + + moduleFilter.operators = { + description: function(string, moduleFilter, item) { + if (item.description == undefined) { + var description = $('.description', item.element).clone(); + $('.admin-requirements', description).remove(); + $('.admin-operations', description).remove(); + item.description = description.text().toLowerCase(); + } + + if (item.description.indexOf(string) >= 0) { + return true; + } + }, + requiredBy: function(string, moduleFilter, item) { + if (item.requiredBy == undefined) { + var requirements = Drupal.ModuleFilter.getRequirements(item.element); + item.requires = requirements.requires; + item.requiredBy = requirements.requiredBy; + } + + for (var i in item.requiredBy) { + if (item.requiredBy[i].indexOf(string) >= 0) { + return true; + } + } + }, + requires: function(string, moduleFilter, item) { + if (item.requires == undefined) { + var requirements = Drupal.ModuleFilter.getRequirements(item.element); + item.requires = requirements.requires; + item.requiredBy = requirements.requiredBy; + } + + for (var i in item.requires) { + if (item.requires[i].indexOf(string) >= 0) { + return true; + } + } + } + }; + + $('#edit-module-filter-show-enabled', context).change(function() { + moduleFilter.options.showEnabled = $(this).is(':checked'); + moduleFilter.applyFilter(); + }); + $('#edit-module-filter-show-disabled', context).change(function() { + moduleFilter.options.showDisabled = $(this).is(':checked'); + moduleFilter.applyFilter(); + }); + $('#edit-module-filter-show-required', context).change(function() { + moduleFilter.options.showRequired = $(this).is(':checked'); + moduleFilter.applyFilter(); + }); + $('#edit-module-filter-show-unavailable', context).change(function() { + moduleFilter.options.showUnavailable = $(this).is(':checked'); + moduleFilter.applyFilter(); + }); + + if (!Drupal.settings.moduleFilter.tabs) { + moduleFilter.element.bind('moduleFilter:start', function() { + $('#system-modules fieldset').show(); + }); + + moduleFilter.element.bind('moduleFilter:finish', function(e, data) { + $('#system-modules fieldset').each(function(i) { + $fieldset = $(this); + if ($('tbody tr', $fieldset).filter(':visible').length == 0) { + $fieldset.hide(); + } + }); + }); + + moduleFilter.applyFilter(); + } + }); + } +}; + +Drupal.ModuleFilter.getRequirements = function(element) { + var requires = new Array(); + var requiredBy = new Array(); + $('.admin-requirements', element).each(function() { + var text = $(this).text(); + if (text.substr(0, 9) == 'Requires:') { + // Requires element. + requiresString = text.substr(9); + requires = requiresString.replace(/\([a-z]*\)/g, '').split(','); + } + else if (text.substr(0, 12) == 'Required by:') { + // Required by element. + requiredByString = text.substr(12); + requiredBy = requiredByString.replace(/\([a-z]*\)/g, '').split(','); + } + }); + for (var i in requires) { + requires[i] = $.trim(requires[i].toLowerCase()); + } + for (var i in requiredBy) { + requiredBy[i] = $.trim(requiredBy[i].toLowerCase()); + } + return { requires: requires, requiredBy: requiredBy }; +}; + +})(jQuery); diff --git a/sites/all/modules/contrib/admin/module_filter/js/permissions.js b/sites/all/modules/contrib/admin/module_filter/js/permissions.js new file mode 100644 index 0000000..8340389 --- /dev/null +++ b/sites/all/modules/contrib/admin/module_filter/js/permissions.js @@ -0,0 +1,67 @@ +(function($) { + +var lastModuleItem; + +Drupal.behaviors.moduleFilterPermissions = { + attach: function(context) { + $('.module-filter-inputs-wrapper', context).once('module-filter', function() { + var filterInput = $('input[name="module_filter[name]"]', context); + var selector = '#permissions tbody tr'; + + // Move location of filter input. + $('#permissions').parent().prepend(filterInput.parent().parent()); + + filterInput.moduleFilter(selector, { + wrapper: $('#permissions').parent(), + childSelector: 'td.module', + buildIndex: [ + function(moduleFilter, item) { + item.isModule = (item.text != '') ? true : false; + if (item.isModule) { + item.children = new Array(); + lastModuleItem = item; + } + else { + item.parent = lastModuleItem; + lastModuleItem.children.push(item); + } + return item; + } + ] + }); + + var moduleFilter = filterInput.data('moduleFilter'); + + moduleFilter.operators = { + perm: function(string, moduleFilter, item) { + if (!item.isModule) { + if (item.name == undefined) { + var $name = $('td.permission', item.element).clone(); + $('.description', $name).remove(); + item.name = $name.text().trim().toLowerCase(); + } + + if (item.name.indexOf(string) >= 0) { + return true; + } + } + } + }; + + moduleFilter.element.bind('moduleFilter:finish', function(e, data) { + for (var i in moduleFilter.results) { + if (moduleFilter.results[i].isModule) { + for (var k in moduleFilter.results[i].children) { + moduleFilter.results[i].children[k].element.removeClass('js-hide'); + } + } + else { + moduleFilter.results[i].parent.element.removeClass('js-hide'); + } + } + }); + }); + } +}; + +})(jQuery); \ No newline at end of file diff --git a/sites/all/modules/contrib/admin/module_filter/js/update_status.js b/sites/all/modules/contrib/admin/module_filter/js/update_status.js new file mode 100644 index 0000000..fcd3610 --- /dev/null +++ b/sites/all/modules/contrib/admin/module_filter/js/update_status.js @@ -0,0 +1,117 @@ +(function($) { + +Drupal.behaviors.moduleFilterUpdateStatus = { + attach: function(context) { + $('#module-filter-update-status-form').once('update-status', function() { + var filterInput = $('input[name="module_filter[name]"]', context); + filterInput.moduleFilter('table.update > tbody > tr', { + wrapper: $('table.update:first').parent(), + delay: 300, + childSelector: 'div.project a', + rules: [ + function(moduleFilter, item) { + switch (moduleFilter.options.show) { + case 'all': + return true; + case 'updates': + if (item.state == 'warning' || item.state == 'error') { + return true; + } + break; + case 'security': + if (item.state == 'error') { + return true; + } + break; + case 'ignore': + if (item.state == 'ignored') { + return true; + } + break; + case 'unknown': + if (item.state == 'unknown') { + return true; + } + break; + } + return false; + } + ], + buildIndex: [ + function(moduleFilter, item) { + if ($('.version-status', item.element).text() == Drupal.t('Ignored from settings')) { + item.state = 'ignored'; + return item; + } + if (item.element.is('.ok')) { + item.state = 'ok'; + } + else if (item.element.is('.warning')) { + item.state = 'warning'; + } + else if (item.element.is('.error')) { + item.state = 'error'; + } + else if (item.element.is('.unknown')) { + item.state = 'unknown'; + } + return item; + } + ], + show: $('#edit-module-filter-show input[name="module_filter[show]"]', context).val() + }); + + var moduleFilter = filterInput.data('moduleFilter'); + + if (Drupal.settings.moduleFilter.rememberUpdateState) { + var updateShow = Drupal.ModuleFilter.getState('updateShow'); + if (updateShow) { + moduleFilter.options.show = updateShow; + $('#edit-module-filter-show input[name="module_filter[show]"][value="' + updateShow + '"]', context).click(); + } + } + + $('#edit-module-filter-show input[name="module_filter[show]"]', context).change(function() { + moduleFilter.options.show = $(this).val(); + Drupal.ModuleFilter.setState('updateShow', moduleFilter.options.show); + moduleFilter.applyFilter(); + }); + + moduleFilter.element.bind('moduleFilter:start', function() { + $('table.update').each(function() { + $(this).show().prev('h3').show(); + }); + }); + + moduleFilter.element.bind('moduleFilter:finish', function(e, data) { + $('table.update').each(function() { + var $table = $(this); + if ($('tbody tr', $(this)).filter(':visible').length == 0) { + $table.hide().prev('h3').hide(); + } + }); + }); + + moduleFilter.element.bind('moduleFilter:keyup', function() { + if (moduleFilter.clearOffset == undefined) { + moduleFilter.inputWidth = filterInput.width(); + moduleFilter.clearOffset = moduleFilter.element.parent().find('.module-filter-clear a').width(); + } + if (moduleFilter.text) { + filterInput.width(moduleFilter.inputWidth - moduleFilter.clearOffset - 5).parent().css('margin-right', moduleFilter.clearOffset + 5); + } + else { + filterInput.width(moduleFilter.inputWidth).parent().css('margin-right', 0); + } + }); + + moduleFilter.element.parent().find('.module-filter-clear a').click(function() { + filterInput.width(moduleFilter.inputWidth).parent().css('margin-right', 0); + }); + + moduleFilter.applyFilter(); + }); + } +}; + +})(jQuery); diff --git a/sites/all/modules/contrib/admin/module_filter/module_filter.admin.inc b/sites/all/modules/contrib/admin/module_filter/module_filter.admin.inc old mode 100755 new mode 100644 index 0763c9c..cdb3f49 --- a/sites/all/modules/contrib/admin/module_filter/module_filter.admin.inc +++ b/sites/all/modules/contrib/admin/module_filter/module_filter.admin.inc @@ -14,36 +14,103 @@ * Settings form for module filter. */ function module_filter_settings() { + $form['module_filter_set_focus'] = array( + '#type' => 'checkbox', + '#title' => t('Set focus to filter field on page load'), + '#description' => t('Currently has no effect when using Overlay module.'), + '#default_value' => variable_get('module_filter_set_focus', 1), + ); + $form['module_filter_tabs'] = array( '#type' => 'checkbox', - '#title' => t('Tabs'), - '#description' => t('Divide module groups into tabbed list.'), - '#default_value' => variable_get('module_filter_tabs', 1) + '#title' => t('Enhance the modules page with tabs'), + '#description' => t('Alternate tabbed theme that restructures packages into tabs.'), + '#default_value' => variable_get('module_filter_tabs', 1), ); $form['tabs'] = array( '#type' => 'fieldset', '#title' => t('Tabs'), '#description' => t('Settings used with the tabs view of the modules page.'), '#collapsible' => TRUE, - '#collapsed' => FALSE + '#collapsed' => FALSE, ); $form['tabs']['module_filter_count_enabled'] = array( '#type' => 'checkbox', '#title' => t('Number of enabled modules'), '#description' => t('Display the number of enabled modules in the active tab along with the total number of modules.'), - '#default_value' => variable_get('module_filter_count_enabled', 1) + '#default_value' => variable_get('module_filter_count_enabled', 1), ); $form['tabs']['module_filter_visual_aid'] = array( '#type' => 'checkbox', - '#title' => t('Visuals for newly enabled and disabled modules'), - '#description' => t("Adds a basic count to tabs of modules being enabled/disabled and colors the module row pending it's being enabled or disabled"), - '#default_value' => variable_get('module_filter_visual_aid', 1) + '#title' => t('Visual aids'), + '#description' => t('When enabling/disabling modules, the module name will display in the tab summary.
When filtering, a count of results for each tab will be presented.'), + '#default_value' => variable_get('module_filter_visual_aid', 1), + ); + $form['tabs']['module_filter_hide_empty_tabs'] = array( + '#type' => 'checkbox', + '#title' => t('Hide tabs with no results'), + '#description' => t('When a filter returns no results for a tab, the tab is hidden. This is dependent on visual aids being enabled.'), + '#default_value' => variable_get('module_filter_hide_empty_tabs', 0), ); $form['tabs']['module_filter_dynamic_save_position'] = array( '#type' => 'checkbox', - '#title' => t('Dynamically position save button'), - '#description' => t("DEVELOPMENTAL: For sites with lots of tabs, enable to help keep the 'Save configuration' button more accessible."), - '#default_value' => variable_get('module_filter_dynamic_save_position', 0) + '#title' => t('Dynamically position Save button'), + '#description' => t("For sites with lots of tabs, enable to help keep the 'Save configuration' button more accessible."), + '#default_value' => variable_get('module_filter_dynamic_save_position', 1), ); + $form['tabs']['module_filter_use_url_fragment'] = array( + '#type' => 'checkbox', + '#title' => t('Use URL fragment'), + '#description' => t('Use URL fragment when navigating between tabs. This lets you use the browsers back/forward buttons to navigate through the tabs you selected.') . '
' . t('When the Overlay module is enabled this functionality will not be used since overlay relies on the URL fragment.'), + '#default_value' => variable_get('module_filter_use_url_fragment', 1), + ); + $form['tabs']['module_filter_use_switch'] = array( + '#type' => 'checkbox', + '#title' => t('Use switch instead of checkbox'), + '#description' => t('This is purely cosmetic (at least for now). Displays a ON/OFF switch rather than a checkbox to enable/disable modules.
Modules will not actually be enabled/disabled until the form is saved.'), + '#default_value' => variable_get('module_filter_use_switch', 1), + ); + $form['tabs']['module_filter_track_recent_modules'] = array( + '#type' => 'checkbox', + '#title' => t('Track recently enabled/disabled modules'), + '#description' => t('Adds a "Recent" tab that displays modules that have been enabled or disabled with the last week.'), + '#default_value' => variable_get('module_filter_track_recent_modules', 1), + ); + $form['tabs']['module_filter_remember_active_tab'] = array( + '#type' => 'checkbox', + '#title' => t('Remember active tab.'), + '#description' => t('When enabled, the active tab will be remembered.'), + '#default_value' => variable_get('module_filter_remember_active_tab', 1), + ); + $form['tabs']['module_filter_version_column'] = array( + '#type' => 'checkbox', + '#title' => t('Place version in own column'), + '#description' => t("Moves the version out of the description and into it's own column"), + '#default_value' => variable_get('module_filter_version_column', 0), + ); + $form['tabs']['module_filter_expanded_description'] = array( + '#type' => 'checkbox', + '#title' => t('Expand description by default'), + '#description' => t('When enabled, the description will be expanded by default.'), + '#default_value' => variable_get('module_filter_expanded_description', 0), + ); + + $form['update'] = array( + '#type' => 'fieldset', + '#title' => t('Update status'), + '#collapsible' => TRUE, + '#collapsed' => (module_exists('update')) ? FALSE : TRUE, + ); + $form['update']['module_filter_remember_update_state'] = array( + '#type' => 'checkbox', + '#title' => t('Remember the last selected filter.'), + '#description' => t('When enabled, the last state (All, Update available, Security update, Unknown) will be remembered.'), + '#default_value' => variable_get('module_filter_remember_update_state', 0), + ); + + if (module_exists('page_actions')) { + $form['tabs']['module_filter_dynamic_save_position']['#description'] .= '
' . t('The module %name is enabled and thus this setting will have no affect.', array('%name' => t('Page actions'))); + } + return system_settings_form($form); } diff --git a/sites/all/modules/contrib/admin/module_filter/module_filter.info b/sites/all/modules/contrib/admin/module_filter/module_filter.info old mode 100755 new mode 100644 index 89fe45d..e21267d --- a/sites/all/modules/contrib/admin/module_filter/module_filter.info +++ b/sites/all/modules/contrib/admin/module_filter/module_filter.info @@ -1,9 +1,9 @@ name = Module filter description = "Filter the modules list." core = 7.x +package = Administration files[] = module_filter.install -files[] = module_filter.js files[] = module_filter.module files[] = module_filter.admin.inc files[] = module_filter.theme.inc @@ -16,9 +16,8 @@ files[] = js/module_filter_tab.js configure = admin/config/user-interface/modulefilter -; Information added by drupal.org packaging script on 2013-08-08 -version = "7.x-1.8" +; Information added by Drupal.org packaging script on 2019-03-27 +version = "7.x-2.2" core = "7.x" project = "module_filter" -datestamp = "1375995220" - +datestamp = "1553698385" diff --git a/sites/all/modules/contrib/admin/module_filter/module_filter.install b/sites/all/modules/contrib/admin/module_filter/module_filter.install old mode 100755 new mode 100644 index c06cfd8..529d836 --- a/sites/all/modules/contrib/admin/module_filter/module_filter.install +++ b/sites/all/modules/contrib/admin/module_filter/module_filter.install @@ -5,13 +5,22 @@ */ /** - * Implementation of hook_uninstall(). + * Implements hook_uninstall(). */ function module_filter_uninstall() { + variable_del('module_filter_set_focus'); variable_del('module_filter_tabs'); variable_del('module_filter_count_enabled'); variable_del('module_filter_visual_aid'); + variable_del('module_filter_hide_empty_tabs'); variable_del('module_filter_dynamic_save_position'); + variable_del('module_filter_use_url_fragment'); + variable_del('module_filter_use_switch'); + variable_del('module_filter_track_recent_modules'); + variable_del('module_filter_remember_active_tab'); + variable_del('module_filter_remember_update_state'); + variable_del('module_filter_version_column'); + variable_del('module_filter_expanded_description'); } /** @@ -20,3 +29,21 @@ function module_filter_uninstall() { function module_filter_update_7100() { variable_del('module_filter_autocomplete'); } + +/** + * Rebuild the menu and theme registry. + */ +function module_filter_update_7200() { + menu_rebuild(); + system_rebuild_theme_data(); + drupal_theme_rebuild(); +} + +/** + * Old update that use to remove the module_filter_dynamic_save_position variable. + */ +function module_filter_update_7201() { + // We don't want to remove this update hook but at the same time we no + // longer want to lose the variable setting, so we just comment it out. + // variable_del('module_filter_dynamic_save_position'); +} diff --git a/sites/all/modules/contrib/admin/module_filter/module_filter.module b/sites/all/modules/contrib/admin/module_filter/module_filter.module old mode 100755 new mode 100644 index 09b7542..17059ec --- a/sites/all/modules/contrib/admin/module_filter/module_filter.module +++ b/sites/all/modules/contrib/admin/module_filter/module_filter.module @@ -12,34 +12,46 @@ */ /** - * Implementation of hook_perm(). + * Implements hook_perm(). */ function module_filter_permission() { return array( 'administer module filter' => array( 'title' => t('Administer Module Filter'), - 'description' => t('Configure how Module Filter performs.') - ) + 'description' => t('Configure how Module Filter performs.'), + ), ); } /** - * Implementation of hook_menu(). + * Implements hook_menu(). */ function module_filter_menu() { $items['admin/config/user-interface/modulefilter'] = array( 'title' => 'Module filter', - 'description' => 'Configure settings for Module Filter.', + 'description' => 'Configure how the modules page looks and acts.', 'access arguments' => array('administer module filter'), 'page callback' => 'drupal_get_form', 'page arguments' => array('module_filter_settings'), - 'file' => 'module_filter.admin.inc' + 'file' => 'module_filter.admin.inc', ); return $items; } /** - * Implementation of hook_form_FORM_ID_alter(). + * Implements hook_menu_alter(). + */ +function module_filter_menu_alter(&$items) { + if (isset($items['admin/reports/updates'])) { + // We route the updates report page through us. + $items['admin/reports/updates']['page callback'] = 'module_filter_update_status'; + $items['admin/reports/updates']['file'] = 'module_filter.pages.inc'; + $items['admin/reports/updates']['module'] = 'module_filter'; + } +} + +/** + * Implements hook_form_FORM_ID_alter(). */ function module_filter_form_system_modules_alter(&$form, &$form_state, $form_id) { // Don't alter the form when confirming. @@ -48,121 +60,237 @@ function module_filter_form_system_modules_alter(&$form, &$form_state, $form_id) } $form['module_filter'] = array( - '#tree' => TRUE, - '#weight' => -1, + '#type' => 'module_filter', '#attached' => array( - 'css' => array( - drupal_get_path('module', 'module_filter') .'/css/module_filter.css', + 'js' => array( + drupal_get_path('module', 'module_filter') . '/js/modules.js' => array('weight' => 1), ), ), ); - $form['module_filter']['name'] = array( - '#type' => 'textfield', - '#title' => t('Filter list') + $checkbox_defaults = array( + ((isset($_GET['enabled'])) ? $_GET['enabled'] : 1) ? 'enabled' : '', + ((isset($_GET['disabled'])) ? $_GET['disabled'] : 1) ? 'disabled' : '', + ((isset($_GET['required'])) ? $_GET['required'] : 1) ? 'required' : '', + ((isset($_GET['unavailable'])) ? $_GET['unavailable'] : 1) ? 'unavailable' : '', ); - $form['module_filter']['show'] = array( '#type' => 'checkboxes', - '#default_value' => array('enabled', 'disabled', 'required', 'unavailable'), + '#default_value' => array_filter($checkbox_defaults), '#options' => array('enabled' => t('Enabled'), 'disabled' => t('Disabled'), 'required' => t('Required'), 'unavailable' => t('Unavailable')), '#prefix' => '
',
- '#suffix' => '
'
+ '#suffix' => '',
);
if (variable_get('module_filter_tabs', 1)) {
- $form['module_filter']['#attached']['css'][] = drupal_get_path('module', 'module_filter') .'/css/module_filter_tab.css';
- $form['module_filter']['#attached']['js'][] = drupal_get_path('module', 'module_filter') .'/js/module_filter_tab.js';
- $form['module_filter']['#attached']['js'][] = array(
- 'data' => array('moduleFilter' => array('visualAid' => variable_get('module_filter_visual_aid', 1))),
- 'type' => 'setting',
- );
+ $form['module_filter']['#attached']['css'][] = drupal_get_path('module', 'module_filter') . '/css/module_filter_tab.css';
+ $form['module_filter']['#attached']['library'][] = array('system', 'jquery.bbq');
+ $form['module_filter']['#attached']['js'][drupal_get_path('module', 'module_filter') . '/js/module_filter_tab.js'] = array('weight' => 2);
- if (variable_get('module_filter_dynamic_save_position', 0)) {
- $form['module_filter']['#attached']['js'][] = drupal_get_path('module', 'module_filter') .'/js/dynamic_position.js';
+ if (!module_exists('page_actions') && variable_get('module_filter_dynamic_save_position', 1)) {
+ $form['module_filter']['#attached']['css'][] = drupal_get_path('module', 'module_filter') . '/css/dynamic_position.css';
+ $form['module_filter']['#attached']['js'][drupal_get_path('module', 'module_filter') . '/js/dynamic_position.js'] = array('weight' => 3);
}
- $form['module_filter']['#size'] = 45;
-
- // Remove the fieldsets for each package since we will be using tabs
- // instead. Put all modules into one array.
- $modules = array(
- '#theme' => 'module_filter_modules_table',
- '#header' => array(
- array('data' => t('Enabled'), 'class' => 'checkbox'),
- t('Name'),
- t('Version'),
- t('Description'),
- array('data' => t('Operations'), 'colspan' => 3)
- )
- );
-
- $all = t('All');
- $tab_counts = array($all => array('id' => 'all', 'enabled' => 0, 'total' => 0));
- $form['#packages'] = array();
- foreach (element_children($form['modules']) as $package) {
- // Add the package to $form['#packages']. Tabs are built from this.
- $form['#packages'][$package] = $package;
-
- if (!isset($tab_counts[$package])) {
- $tab_counts[$package] = array('enabled' => 0, 'total' => 0);
- }
-
- foreach (element_children($form['modules'][$package]) as $module) {
- $tab_counts[$all]['total']++;
- $tab_counts[$package]['total']++;
- if (!empty($form['modules'][$package][$module]['enable']['#default_value'])) {
- $tab_counts[$all]['enabled']++;
- $tab_counts[$package]['enabled']++;
- }
-
- $modules[$module] = $form['modules'][$package][$module];
- $modules[$module]['#package'] = $package;
- $modules[$module]['#parents'] = array('modules', $package, $module);
- }
- }
-
- // Sort the array of modules alphabetically.
- uasort($modules, 'module_filter_sort_modules_by_display_name');
-
- // Replace the $form['modules'] with our $modules array.
- $form['modules'] = $modules;
-
- // Add our $tab_counts array to the form.
- $form['#tab_counts'] = $tab_counts;
+ $form['#attached']['css'][] = drupal_get_path('module', 'module_filter') . '/css/modules.css';
$form['#theme'] = 'module_filter_system_modules_tabs';
}
- else {
- $form['module_filter']['#attached']['js'][] = drupal_get_path('module', 'module_filter') .'/js/module_filter.js';
- $form['module_filter']['#prefix'] = '';
+
+ $form['#submit'][] = 'module_filter_system_modules_submit_redirect';
+
+ if (variable_get('module_filter_track_recent_modules', 1)) {
+ $form['#submit'][] = 'module_filter_system_modules_submit_recent';
}
}
/**
- * Implementation of hook_theme().
+ * Implements hook_form_FORM_ID_alter().
+ */
+function module_filter_form_user_admin_permissions_alter(&$form, &$form_state) {
+ $form['module_filter'] = array(
+ '#type' => 'module_filter',
+ '#description' => t('Filter list by module. Use the query operator "perm" to filter by permission, e.g., perm:access.'),
+ '#attached' => array(
+ 'js' => array(
+ drupal_get_path('module', 'module_filter') . '/js/permissions.js',
+ ),
+ ),
+ '#weight' => -100,
+ );
+}
+
+/**
+ * Implements hook_element_info().
+ */
+function module_filter_element_info() {
+ $types['module_filter'] = array(
+ '#input' => TRUE,
+ '#process' => array('form_process_module_filter', 'ajax_process_form'),
+ '#weight' => -1,
+ '#tree' => TRUE,
+ '#theme' => 'module_filter',
+ );
+ return $types;
+}
+
+/**
+ * Implements hook_theme().
*/
function module_filter_theme() {
return array(
- 'module_filter_modules_table' => array(
- 'render element' => 'form',
+ 'module_filter' => array(
+ 'render element' => 'element',
'file' => 'module_filter.theme.inc',
),
'module_filter_system_modules_tabs' => array(
'render element' => 'form',
- 'file' => 'module_filter.theme.inc'
- )
+ 'file' => 'module_filter.theme.inc',
+ ),
+ 'module_filter_operations' => array(
+ 'variables' => array('links' => array(), 'dropbutton' => FALSE),
+ 'file' => 'module_filter.theme.inc',
+ ),
);
}
-function module_filter_sort_modules_by_display_name($a, $b) {
- if (is_array($a) && is_array($b) && isset($a['#package'], $b['#package'])) {
- return strcasecmp($a['name']['#markup'], $b['name']['#markup']);
+/**
+ * Create and add new textfield element.
+ *
+ * @param $element
+ * An associative array containing the properties and children of the
+ * form actions container.
+ * @param $form_state
+ * The $form_state array for the form this element belongs to.
+ *
+ * @return
+ * The processed element.
+ */
+function form_process_module_filter($element, &$form_state) {
+ $element['name'] = array(
+ '#type' => 'textfield',
+ '#title' => (isset($element['#title'])) ? $element['#title'] : t('Filter list'),
+ '#default_value' => (isset($element['#default_value'])) ? $element['#default_value'] : ((isset($_GET['filter'])) ? $_GET['filter'] : ''),
+ '#size' => (isset($element['#size'])) ? $element['#size'] : 45,
+ '#weight' => (isset($element['#weight'])) ? $element['#weight'] : -10,
+ '#attributes' => ((isset($element['#attributes'])) ? $element['#attributes'] : array()) + array('autocomplete' => 'off'),
+ '#attached' => array(
+ 'css' => array(
+ drupal_get_path('module', 'module_filter') . '/css/module_filter.css',
+ ),
+ 'js' => array(
+ 'misc/jquery.cookie.js',
+ drupal_get_path('module', 'module_filter') . '/js/module_filter.js',
+ array(
+ 'data' => array(
+ 'moduleFilter' => array(
+ 'setFocus' => variable_get('module_filter_set_focus', 1),
+ 'tabs' => variable_get('module_filter_tabs', 1),
+ 'countEnabled' => variable_get('module_filter_count_enabled', 1),
+ 'visualAid' => variable_get('module_filter_visual_aid', 1),
+ 'hideEmptyTabs' => variable_get('module_filter_hide_empty_tabs', 0),
+ 'dynamicPosition' => (!module_exists('page_actions')) ? variable_get('module_filter_dynamic_save_position', 1) : FALSE,
+ 'useURLFragment' => variable_get('module_filter_use_url_fragment', 1),
+ 'useSwitch' => variable_get('module_filter_use_switch', 1),
+ 'trackRecent' => variable_get('module_filter_track_recent_modules', 1),
+ 'rememberActiveTab' => variable_get('module_filter_remember_active_tab', 1),
+ 'rememberUpdateState' => variable_get('module_filter_remember_update_state', 0),
+ 'expandedDescription' => variable_get('module_filter_expanded_description', 0),
+ ),
+ ),
+ 'type' => 'setting',
+ ),
+ ),
+ ),
+ );
+ if (isset($element['#description'])) {
+ $element['name']['#description'] = $element['#description'];
}
- return 0;
+ return $element;
}
+/**
+ * Form submission handler to filters module list.
+ */
+function module_filter_system_modules_submit_redirect($form, &$form_state) {
+ $query = array();
+ if (!empty($form_state['values']['module_filter']['name'])) {
+ $query['filter'] = $form_state['values']['module_filter']['name'];
+ }
+ $query['enabled'] = (int) (!empty($form_state['values']['module_filter']['show']['enabled']));
+ $query['disabled'] = (int) (!empty($form_state['values']['module_filter']['show']['disabled']));
+ $query['required'] = (int) (!empty($form_state['values']['module_filter']['show']['required']));
+ $query['unavailable'] = (int) (!empty($form_state['values']['module_filter']['show']['unavailable']));
+
+ $form_state['redirect'] = array(
+ 'admin/modules',
+ array('query' => $query),
+ );
+}
+
+/**
+ * Form submission handler to track recently enabled/disabled modules
+ */
+function module_filter_system_modules_submit_recent($form, &$form_state) {
+ $recent_modules = variable_get('module_filter_recent_modules', array());
+
+ foreach ($form_state['values']['modules'] as $package => $modules) {
+ foreach ($modules as $key => $module) {
+ if ($form['modules'][$package][$key]['enable']['#default_value'] != $module['enable']) {
+ $recent_modules[$key] = REQUEST_TIME;
+ }
+ }
+ }
+
+ variable_set('module_filter_recent_modules', $recent_modules);
+}
+
+/**
+ * Create list of newly added modules (within a week)
+ * @return
+ * An array of newly added modules.
+ */
+function module_filter_new_modules() {
+ // Get current list of modules.
+ $files = system_rebuild_module_data();
+
+ // Remove hidden modules from display list.
+ $visible_files = $files;
+ foreach ($visible_files as $filename => $file) {
+ if (!empty($file->info['hidden'])) {
+ unset($visible_files[$filename]);
+ }
+ }
+
+ uasort($visible_files, 'system_sort_modules_by_info_name');
+
+ $new_modules = array();
+ foreach ($visible_files as $filename => $module) {
+ $ctime = filectime(dirname($module->uri) . '/' . $module->name . '.info');
+ if (($ctime - strtotime('-1 week')) > 0) {
+ $new_modules[$filename] = module_filter_get_id($filename);
+ }
+ }
+ return $new_modules;
+}
+
+/**
+ * Function to replace special characters with hyphen.
+ * @param string $text
+ * @return
+ * String
+ */
function module_filter_get_id($text) {
$id = strtolower($text);
- return preg_replace('/([^a-z])([\/( )])*/', '-', $id);
+ $id = preg_replace('/([^a-z0-9]+)/', '-', $id);
+ return trim($id, '-');
+}
+
+/**
+ * Function to return true/false depending on module changed time and a week timestamp
+ * @param integer $var
+ * @return
+ * Boolean indicating
+ */
+function module_filter_recent_filter($var) {
+ return (!($var < REQUEST_TIME - 60 * 60 * 24 * 7));
}
diff --git a/sites/all/modules/contrib/admin/module_filter/module_filter.pages.inc b/sites/all/modules/contrib/admin/module_filter/module_filter.pages.inc
new file mode 100644
index 0000000..a18fbc5
--- /dev/null
+++ b/sites/all/modules/contrib/admin/module_filter/module_filter.pages.inc
@@ -0,0 +1,53 @@
+ drupal_get_form('module_filter_update_status_form'),
+ 'update_report' => array(
+ '#markup' => $update_report,
+ ),
+ );
+}
+
+/**
+ * Form builder for the module filter form.
+ */
+function module_filter_update_status_form($form, &$form_state) {
+ $form['module_filter'] = array(
+ '#type' => 'module_filter',
+ '#attached' => array(
+ 'css' => array(
+ drupal_get_path('module', 'module_filter') . '/css/update_status.css',
+ ),
+ 'js' => array(
+ drupal_get_path('module', 'module_filter') . '/js/update_status.js',
+ ),
+ ),
+ );
+ $form['module_filter']['show'] = array(
+ '#type' => 'radios',
+ '#default_value' => (isset($_GET['show']) && in_array($_GET['show'], array('all', 'updates', 'security', 'unknown'))) ? $_GET['show'] : 'all',
+ '#options' => array('all' => t('All'), 'updates' => t('Update available'), 'security' => t('Security update'), 'unknown' => t('Unknown')),
+ '#prefix' => '',
+ '#suffix' => '
',
+ );
+ if (module_exists('update_advanced')) {
+ $options = $form['module_filter']['show']['#options'];
+ $form['module_filter']['show']['#options'] = array_slice($options, 0, 2);
+ $form['module_filter']['show']['#options']['ignore'] = t('Ignored from settings');
+ $form['module_filter']['show']['#options'] = array_merge($form['module_filter']['show']['#options'], array_slice($options, 2));
+ }
+ return $form;
+}
diff --git a/sites/all/modules/contrib/admin/module_filter/module_filter.theme.inc b/sites/all/modules/contrib/admin/module_filter/module_filter.theme.inc
old mode 100755
new mode 100644
index 59cce42..2d00ab7
--- a/sites/all/modules/contrib/admin/module_filter/module_filter.theme.inc
+++ b/sites/all/modules/contrib/admin/module_filter/module_filter.theme.inc
@@ -6,76 +6,209 @@
* @author greenSkin
*/
-function theme_module_filter_modules_table($variables) {
- $form = $variables['form'];
-
- // Individual table headers.
- $rows = array();
- // Iterate through all the modules, which are
- // children of this fieldset.
- foreach (element_children($form) as $key) {
- // Stick it into $module for easier accessing.
- $module = $form[$key];
- $row = array();
- unset($module['enable']['#title']);
- $row[] = array('class' => array('checkbox'), 'data' => drupal_render($module['enable']));
- $label = '' . t('Requires: !module-list', array('!module-list' => implode(', ', $module['#requires']))) . '
';
- }
- if ($module['#required_by']) {
- $description .= '' . t('Required by: !module-list', array('!module-list' => implode(', ', $module['#required_by']))) . '
';
- }
- $row[] = array('data' => $description, 'class' => array('description'));
- // Display links (such as help or permissions) in their own columns.
- foreach (array('help', 'permissions', 'configure') as $key) {
- $row[] = array('data' => drupal_render($module['links'][$key]), 'class' => array($key));
- }
-
- $id = module_filter_get_id($module['#package']);
- $rows[] = array(
- 'data' => $row,
- 'class' => array($id .'-tab-content')
- );
- }
-
- return theme('table', array('header' => $form['#header'], 'rows' => $rows, 'attributes' => array('class' => array('package'))));
+function theme_module_filter($variables) {
+ $element = $variables['element'];
+ return '' . drupal_render_children($element) . '
';
}
/**
* Theme callback for the modules tabbed form.
*/
function theme_module_filter_system_modules_tabs($variables) {
- $form = $variables['form'];
-
- $count_enabled = variable_get('module_filter_count_enabled', 1);
-
- // Display packages.
- $all = t('All');
- $all_count = ($count_enabled) ? '' . t('!enabled of !total', array('!enabled' => $form['#tab_counts'][$all]['enabled'], '!total' => $form['#tab_counts'][$all]['total'])) . '' : '';
- $tabs = array('all' => '';
+ $form['actions']['#suffix'] = '
';
+ }
+
+ $header = array(
+ array('data' => '', 'class' => array('checkbox')),
+ array('data' => t('Name'), 'class' => array('name')),
+ array('data' => t('Description'), 'class' => array('description')),
+ array('data' => t('Links'), 'class' => array('links')),
+ );
+ if (variable_get('module_filter_version_column', 0)) {
+ array_splice($header, 2, 0, array(array('data' => t('Version'), 'class' => array('version'))));
+ }
+ $package_ids = array('all');
+ $enabled['all'] = array();
+
+ if (variable_get('module_filter_track_recent_modules', 1)) {
+ $recent_modules = array_filter(variable_get('module_filter_recent_modules', array()), 'module_filter_recent_filter');
+ // Save the filtered results.
+ variable_set('module_filter_recent_modules', $recent_modules);
+
+ $package_ids[] = 'recent';
+ $enabled['recent'] = array();
+ }
+
+ // Determine what modules are new (within a week).
+ $new_modules = module_filter_new_modules();
+ $package_ids[] = 'new';
+ $enabled['new'] = array();
+
+ $rows = array();
+ $flip = array('even' => 'odd', 'odd' => 'even');
+ foreach (element_children($form['modules']) as $package) {
+ $package_id = module_filter_get_id($package);
+ $package_ids[] = $package_id;
+
+ // Package title and header.
+ $rows[] = array('data' => array(array('data' => '' . $form['modules'][$package]['#title'] . '
', 'colspan' => 4)), 'id' => $package_id . '-package', 'class' => array('admin-package-title')); + $rows[] = array('data' => $header, 'class' => array('admin-package-header')); + + $stripe = 'odd'; + $enabled[$package_id] = array(); + foreach (element_children($form['modules'][$package]) as $key) { + $module = &$form['modules'][$package][$key]; + + $is_enabled = isset($module['enable']['#default_value']) ? $module['enable']['#default_value'] : ''; + $enabled['all'][] = $enabled[$package_id][] = $is_enabled; + if (isset($recent_modules[$key])) { + $enabled['recent'][] = $is_enabled; + } + if (isset($new_modules[$key])) { + $enabled['new'][] = $is_enabled; + } + + $row = array(); + + $version = !empty($module['version']['#markup']); + $requires = !empty($module['#requires']); + $required_by = !empty($module['#required_by']); + + $toggle_enable = ''; + if (isset($module['enable']['#type']) && $module['enable']['#type'] == 'checkbox') { + unset($module['enable']['#title']); + $class = ($is_enabled ? 'enabled' : 'off'); + if (!empty($module['enable']['#disabled'])) { + $class .= ' disabled'; + } + $toggle_enable = '';
+ if (!variable_get('module_filter_version_column', 0) && $version) {
+ $description .= '
';
+ }
+ $row[] = array('data' => '', 'class' => array('description'));
+
+ $operations = (module_exists('ctools')) ? theme('module_filter_operations', array('links' => $module['links'], 'dropbutton' => TRUE)) : theme('module_filter_operations', array('links' => $module['links']));
+ $row[] = array('data' => '' . t('Version: !module-version', array('!module-version' => drupal_render($module['version']))) . '
';
+ }
+ if ($requires) {
+ $description .= '' . t('Requires: !module-list', array('!module-list' => implode(', ', $module['#requires']))) . '
';
+ }
+ if ($required_by) {
+ $description .= '' . t('Required by: !module-list', array('!module-list' => implode(', ', $module['#required_by']))) . '
';
+ }
+ $description .= '' . $operations . '
', 'class' => array('links'));
+
+ $class = array(module_filter_get_id($package) . '-tab', 'module', $stripe);
+ if (isset($recent_modules[$key])) {
+ $class[] = 'recent-module';
+ }
+ if (isset($new_modules[$key])) {
+ $class[] = 'new-module';
+ }
+ $rows[] = array('data' => $row, 'no_striping' => TRUE, 'class' => $class);
+ $stripe = $flip[$stripe];
+ }
+
+ // Set the package as printed.
+ $form['modules'][$package]['#printed'] = TRUE;
+ }
+
+ //Get packages and count number of modules
+ $enabled_counts = array();
+ foreach ($enabled as $package_id => $value) {
+ $enabled_counts[$package_id] = array(
+ 'enabled' => count(array_filter($value)),
+ 'total' => count($value),
+ );
+ }
+ drupal_add_js(array(
+ 'moduleFilter' => array(
+ 'packageIDs' => $package_ids,
+ 'enabledCounts' => $enabled_counts,
+ )
+ ), 'setting');
+
+ // Add first and last class to rows.
+ $rows[0]['class'][] = 'first';
+ $rows[count($rows) - 1]['class'][] = 'last';
+
$output = '';
- $output .= '';
- $output .= '';
- $output .= '
';
+ $output .= '';
- $output .= '';
- $output .= '
';
- $output .= '- '. implode($tabs) . '
' . drupal_render($form['actions']) . '
' . drupal_render($form['module_filter']);
- $output .= drupal_render($form['modules']) . '
' . drupal_render($form['module_filter']);
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
$output .= drupal_render_children($form);
+ $output .= '
';
+ $output .= '';
return $output;
}
+
+/**
+ * Theme function for module filter operations.
+ * @param $variables
+ * @return
+ * HTML for admin status operations.
+ */
+function theme_module_filter_operations(&$vars) {
+ $links = &$vars['links'];
+ $dropbutton = $vars['dropbutton'];
+
+ $operations = array();
+ foreach (element_children($links) as $key) {
+ if ($dropbutton) {
+ hide($links[$key]);
+ if (!empty($links[$key]['#href'])) {
+ $operations[$key] = array(
+ 'title' => $links[$key]['#title'],
+ 'href' => $links[$key]['#href'],
+ );
+ if (isset($links[$key]['#options'])) {
+ $operations[$key] += $links[$key]['#options'];
+ }
+ }
+ }
+ else {
+ $data = drupal_render($links[$key]);
+ if (!empty($data)) {
+ $operations[$key] = array('data' => $data);
+ }
+ }
+ }
+ if (!empty($operations)) {
+ if ($dropbutton) {
+ return '' . theme('links__ctools_dropbutton', array('title' => t('Operations'), 'links' => $operations, 'attributes' => array('class' => array('links')))) . '
';
+ }
+ return '' . theme('item_list', array('items' => $operations, 'attributes' => array('class' => array('links', 'inline')))) . '
';
+ }
+}
diff --git a/sites/all/modules/contrib/dev/ctools/CHANGELOG.txt b/sites/all/modules/contrib/dev/ctools/CHANGELOG.txt
deleted file mode 100644
index c5bd5e6..0000000
--- a/sites/all/modules/contrib/dev/ctools/CHANGELOG.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-Current API VERSION: 2.0. See API.txt for more information.
-
-ctools 7.x-1.x-dev
-==================
-#1008120: "New custom content" shows empty form if custom content panes module is not enabled.
-#999302 by troky: Fix jump menu. Apparently this wasn't actually committed the last time it was committed.
-#1065976 by tekante and David_Rothstein: Reset plugin static cache during module enable to prevent stale data from harming export ui.
-#1016510 by EclipseGC: Make the taxonomy system page functional.
-
-ctools 7.x-1.x-alpha2 (05-Jan-2011)
-===================================
-
-#911396 by alex_b: Prevent notices in export UI.
-#919768 by mikey_p: Allow url options to be sent to ctools_ajax_command_url().
-#358953 by cedarm: Allow term context to return lowercase, spaces to dashes versions of terms.
-#931434 by EclipseGc: Argument plugin for node revision ID.
-#910656: CTools AJAX sample wizard demo "domesticated" checkbox value not stored.
-#922442 by EugenMayer, neclimdul and voxpelli: Make sure ctools_include can handle '' or NULL directory.
-#919956 by traviss359: Correct example in wizard advanced help.
-#942968: Fix taxonomy term access rule with tag term vocabs.
-#840344: node add argument had crufty code causing notices.
-#944462 by longhairedgit: Invalid character in regex causes rare notice.
-#938778 by dereine: Fix profile content type for D7 updates.
-Add detach event to modal close so that wysiwyg can detach the editor.
-Variant titles showing up as blank if more than one variant on a page.
-#940016: token support was not yet updated for D7.
-#940446: Skip validation on back and cancel buttons in all wizards.
-#954492: Redirect not always working in wizard.inc
-#955348: Lack of redirect on "Update" button in Page Manager causing data loss sometimes.
-#941778: Update and save button should not appear in the "Add variant" path.
-#955070 by EclipseGc: Update ctools internal page tokens to work properly on content all content.
-#956890 by EclipseGc: Update views_content to not use views dependency since that is gone.
-#954728 by EclipseGc: Update node template page function name to not collide with new hook_node_view().
-#946534 by EclipseGc: Add support for field content on all entitities.
-#952586 by EclipseGc: Fix node_author content type.
-#959206: If a context is not set when rendering content, attempt to guess the context (fixes Views panes where "From context" was added but pane was never edited.)
-#961654 by benshell: drupal_alter() only supports 4 arguments.
-#911362 by alex_b: Facilitate plugin cache resets for tests.
-#945360 by naxoc: node_tag_new() not updated to D7.
-#953804 by EclipseGc: Fix node comment rendering.
-#953542 by EclipseGc: Fix node rendering.
-#953776 by EclipseGc: Fix node link rendering.
-#954772 by EclipseGc: Fix node build mode selection in node content type.
-#954762 by EclipseGc: Fix comment forbidden theme call.
-#954894 by EclipseGc: Fix breadcrumb content type.
-#955180 by EclipseGc: Fix page primary navigation type.
-#957190 by EclipseGc: Fix page secondary navigation type.
-#957194 by EclipseGc: Remove mission content type, since D7 no longer has a site mission.
-#957348 by EclipseGc: Fix search form URL path.
-#952586 by andypost: Use format_username for displaying unlinked usernames.
-#963800 by benshell: Fix query to fetch custom block title.
-#983496 by Amitaibu: Fix term argument to use proper load function.
-#989484 by Amitaibu: Fix notice in views plugin.
-#982496: Fix token context.
-#995026: Fix export UI during enable/disable which would throw notices and not properly set/unset menu items.
-#998870 by Amitaibu: Fix notice when content has no icon by using function already designed for that.
-#983576 by Amitaibu: Node view fallback task showed white screen.
-#1004644 by pillarsdotnet: Update a missed theme() call to D7.
-#1006162 by aspilicious: .info file cleanup.
-#998312 by dereine: Support the expanded/hidden options that Views did for dependent.js
-#955030: Remove no longer supported footer message content type.
-Fix broken query in term context config.
-#992022 by pcambra: Fix node autocomplete.
-#946302 by BerdArt and arywyr: Fix PHP 5.3 reference error.
-#980528 by das-peter: Notice fix with entity settings.
-#999302 by troky: ctools_jump_menu() needed updating to new form parameters.
-#964174: stylizer plugin theme delegation was in the wrong place, causing errors.
-#991658 by burlap: Fully load the "user" context for the logged in user because not all fields are in $user.
-#1014866 by das-peter: Smarter title panes, notice fix on access plugin descriptions.
-#1015662 by troky: plugin .info files were not using correct filepaths.
-#941780 by EclipseGc: Restore the "No blocks" functionality.
-#951048 by EclipseGc: Tighter entity integration so that new entities are automatic contexts and relationships.
-#941800 by me and aspilicious: Use Drupal 7 #machine_name automation on page manager pages and all export_ui defaults.
-Disabled exportables and pages not properly greyed out.
-#969208 by me and benshell: Get user_view and user profile working.
-#941796: Recategorize blocks
-
-ctools 7.x-1.x-alpha1
-=====================
-
-Changelog reset for 7.x
-Basic conversion done during sprint.
diff --git a/sites/all/modules/contrib/dev/ctools/UPGRADE.txt b/sites/all/modules/contrib/dev/ctools/UPGRADE.txt
index 844ecce..2fbfa4f 100644
--- a/sites/all/modules/contrib/dev/ctools/UPGRADE.txt
+++ b/sites/all/modules/contrib/dev/ctools/UPGRADE.txt
@@ -60,4 +60,4 @@ Upgrading from ctools-6.x-1.x to ctools-7.x-2.x:
For all of these forms, the separate settings #trees in the form are now
gone, so form ids may be adjusted. Also, these are now all real forms
- using CTools form wizard instead of fake subforms as previously.
\ No newline at end of file
+ using CTools form wizard instead of fake subforms as previously.
diff --git a/sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.info b/sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.info
index 1e9031d..9bb3394 100644
--- a/sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.info
+++ b/sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.info
@@ -3,12 +3,9 @@ description = Performs bulk exporting of data objects known about by Chaos tools
core = 7.x
dependencies[] = ctools
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
-
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.module b/sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.module
index afb15b9..1050caa 100644
--- a/sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.module
+++ b/sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.module
@@ -137,7 +137,7 @@ function bulk_export_export($cli = FALSE, $options = array()) {
// Add hook_ctools_plugin_api at the top of the module code, if there is any.
if ($api_code) {
foreach ($api_code as $api_hook => $text) {
- $api = "\n/**\n";
+ $api = "\n/**\n";
$api .= " * Implements hook_$api_hook().\n";
$api .= " */\n";
$api .= "function {$module_name}_$api_hook(\$module, \$api) {\n";
@@ -148,7 +148,7 @@ function bulk_export_export($cli = FALSE, $options = array()) {
}
if ($module_code) {
- $module = "conf['css_id'] = 'my-id';
+}
+
/**
* @} End of "addtogroup hooks".
*/
diff --git a/sites/all/modules/contrib/dev/ctools/ctools.info b/sites/all/modules/contrib/dev/ctools/ctools.info
index bd2e3c1..188b55d 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools.info
+++ b/sites/all/modules/contrib/dev/ctools/ctools.info
@@ -2,16 +2,25 @@ name = Chaos tools
description = A library of helpful tools by Merlin of Chaos.
core = 7.x
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
files[] = includes/context.inc
files[] = includes/css-cache.inc
files[] = includes/math-expr.inc
files[] = includes/stylizer.inc
-files[] = tests/css_cache.test
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Tests.
+files[] = tests/context.test
+files[] = tests/css.test
+files[] = tests/css_cache.test
+files[] = tests/ctools.plugins.test
+files[] = tests/ctools.test
+files[] = tests/math_expression.test
+files[] = tests/math_expression_stack.test
+files[] = tests/object_cache.test
+files[] = tests/object_cache_unit.test
+files[] = tests/page_tokens.test
+
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/ctools.install b/sites/all/modules/contrib/dev/ctools/ctools.install
index e96c743..d50bc9f 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools.install
+++ b/sites/all/modules/contrib/dev/ctools/ctools.install
@@ -12,24 +12,25 @@
function ctools_requirements($phase) {
$requirements = array();
if ($phase == 'runtime') {
+ $t = get_t();
$requirements['ctools_css_cache'] = array(
- 'title' => t('CTools CSS Cache'),
+ 'title' => $t('CTools CSS Cache'),
'severity' => REQUIREMENT_OK,
- 'value' => t('Exists'),
+ 'value' => $t('Exists'),
);
$path = 'public://ctools/css';
if (!file_prepare_directory($path, FILE_CREATE_DIRECTORY)) {
- $requirements['ctools_css_cache']['description'] = t('The CTools CSS cache directory, %path could not be created due to a misconfigured files directory. Please ensure that the files directory is correctly configured and that the webserver has permission to create directories.', array('%path' => file_uri_target($path)));
+ $requirements['ctools_css_cache']['description'] = $t('The CTools CSS cache directory, %path could not be created due to a misconfigured files directory. Please ensure that the files directory is correctly configured and that the webserver has permission to create directories.', array('%path' => file_uri_target($path)));
$requirements['ctools_css_cache']['severity'] = REQUIREMENT_ERROR;
- $requirements['ctools_css_cache']['value'] = t('Unable to create');
+ $requirements['ctools_css_cache']['value'] = $t('Unable to create');
}
if (!function_exists('error_get_last')) {
- $requirements['ctools_php_52']['title'] = t('CTools PHP requirements');
- $requirements['ctools_php_52']['description'] = t('CTools requires certain features only available in PHP 5.2.0 or higher.');
+ $requirements['ctools_php_52']['title'] = $t('CTools PHP requirements');
+ $requirements['ctools_php_52']['description'] = $t('CTools requires certain features only available in PHP 5.2.0 or higher.');
$requirements['ctools_php_52']['severity'] = REQUIREMENT_WARNING;
- $requirements['ctools_php_52']['value'] = t('PHP !version', array('!version' => phpversion()));
+ $requirements['ctools_php_52']['value'] = $t('PHP !version', array('!version' => phpversion()));
}
}
@@ -40,7 +41,19 @@ function ctools_requirements($phase) {
* Implements hook_schema().
*/
function ctools_schema() {
- return ctools_schema_3();
+ return ctools_schema_4();
+}
+
+/**
+ * Version 4 of the CTools schema.
+ */
+function ctools_schema_4() {
+ $schema = ctools_schema_3();
+
+ // Removed due to alternative database configuration issues.
+ // @see https://www.drupal.org/project/ctools/issues/2941920
+
+ return $schema;
}
/**
@@ -49,7 +62,7 @@ function ctools_schema() {
function ctools_schema_3() {
$schema = ctools_schema_2();
- // update the 'obj' field to be 128 bytes long:
+ // Update the 'obj' field to be 128 bytes long:
$schema['ctools_object_cache']['fields']['obj']['length'] = 128;
return $schema;
@@ -61,7 +74,7 @@ function ctools_schema_3() {
function ctools_schema_2() {
$schema = ctools_schema_1();
- // update the 'name' field to be 128 bytes long:
+ // Update the 'name' field to be 128 bytes long:
$schema['ctools_object_cache']['fields']['name']['length'] = 128;
// Update the 'data' field to be type 'blob'.
@@ -95,10 +108,10 @@ function ctools_schema_2() {
'serialize' => TRUE,
),
'filter' => array(
- 'type' => 'int',
- 'size' => 'tiny',
- 'description' => 'Whether or not this CSS needs to be filtered.',
- ),
+ 'type' => 'int',
+ 'size' => 'tiny',
+ 'description' => 'Whether or not this CSS needs to be filtered.',
+ ),
),
'primary key' => array('cid'),
);
@@ -197,7 +210,7 @@ function ctools_update_6003() {
if ($result) {
db_delete('system')->condition('name', 'panels_views')->execute();
module_enable(array('views_content'), TRUE);
- }
+ }
}
/**
@@ -216,7 +229,7 @@ function ctools_update_6005() {
}
/**
- * ctools_custom_content table was originally here, but is now moved to
+ * The ctools_custom_content table was originally here, but is now moved to
* its own module.
*/
function ctools_update_6007() {
@@ -230,18 +243,18 @@ function ctools_update_6007() {
}
/**
- * ctools_object_cache needs to be defined as a blob.
+ * The ctools_object_cache needs to be defined as a blob.
*/
function ctools_update_6008() {
db_delete('ctools_object_cache')
->execute();
db_change_field('ctools_object_cache', 'data', 'data', array(
- 'type' => 'blob',
- 'size' => 'big',
- 'description' => 'Serialized data being stored.',
- 'serialize' => TRUE,
- )
+ 'type' => 'blob',
+ 'size' => 'big',
+ 'description' => 'Serialized data being stored.',
+ 'serialize' => TRUE,
+ )
);
}
@@ -263,3 +276,24 @@ function ctools_update_7001() {
'description' => 'The type of the object this cache is attached to; this essentially represents the owner so that several sub-systems can use this cache.',
));
}
+
+/**
+ * Increase the length of the ctools_object_cache.name column to 255.
+ */
+function ctools_update_7002() {
+ // Removed due to alternative database configuration issues.
+ // @see https://www.drupal.org/project/ctools/issues/2941920
+}
+
+/**
+ * Revert the length of the ctools_object_cache.name column back to 128.
+ */
+function ctools_update_7003() {
+ db_delete('ctools_object_cache')->execute();
+ db_change_field('ctools_object_cache', 'name', 'name', array(
+ 'type' => 'varchar',
+ 'length' => '128',
+ 'not null' => TRUE,
+ 'description' => 'The name of the object this cache is attached to.',
+ ));
+}
diff --git a/sites/all/modules/contrib/dev/ctools/ctools.module b/sites/all/modules/contrib/dev/ctools/ctools.module
index c37b96f..62f2919 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools.module
+++ b/sites/all/modules/contrib/dev/ctools/ctools.module
@@ -9,7 +9,7 @@
* must be implemented in the module file.
*/
-define('CTOOLS_API_VERSION', '2.0.8');
+define('CTOOLS_API_VERSION', '2.0.9');
/**
* The current working ctools version.
@@ -22,8 +22,11 @@ define('CTOOLS_API_VERSION', '2.0.8');
* simply include a dependency line in that module's info file, e.g.:
* ; Requires CTools v7.x-1.4 or newer.
* dependencies[] = ctools (>=1.4)
+ *
+ * @deprecated in CTools 1.15 and will be removed before CTools 2.0.0.
+ * Use the version provided by the drupal.org packaging system.
*/
-define('CTOOLS_MODULE_VERSION', '7.x-1.6');
+define('CTOOLS_MODULE_VERSION', '7.x-1.13');
/**
* Test the CTools API version.
@@ -75,6 +78,9 @@ define('CTOOLS_MODULE_VERSION', '7.x-1.6');
* The minimum version of CTools necessary for your software to run with it.
* @param $maximum
* The maximum version of CTools allowed for your software to run with it.
+ *
+ * @return bool
+ * TRUE if the running ctools is usable, FALSE otherwise.
*/
function ctools_api_version($minimum, $maximum = NULL) {
if (version_compare(CTOOLS_API_VERSION, $minimum, '<')) {
@@ -89,8 +95,7 @@ function ctools_api_version($minimum, $maximum = NULL) {
}
// -----------------------------------------------------------------------
-// General utility functions
-
+// General utility functions.
/**
* Include .inc files as necessary.
*
@@ -118,6 +123,7 @@ function ctools_api_version($minimum, $maximum = NULL) {
* @param $dir
* Optional subdirectory containing the include file.
*/
+
function ctools_include($file, $module = 'ctools', $dir = 'includes') {
static $used = array();
@@ -147,8 +153,8 @@ function ctools_form_include(&$form_state, $file, $module = 'ctools', $dir = 'in
/**
* Add an arbitrary path to the $form_state so it can work with form cache.
*
- * module_load_include uses an unfortunately annoying syntax to work, making it
- * difficult to translate the more simple $path + $file syntax.
+ * The module_load_include() function uses an unfortunately annoying syntax to
+ * work, making it difficult to translate the more simple $path + $file syntax.
*/
function ctools_form_include_file(&$form_state, $filename) {
if (!isset($form_state['build_info']['args'])) {
@@ -172,6 +178,9 @@ function ctools_form_include_file(&$form_state, $filename) {
* Optional module containing the include.
* @param $dir
* Optional subdirectory containing the include file.
+ *
+ * @return string
+ * A string containing the appropriate path from drupal root.
*/
function ctools_image_path($image, $module = 'ctools', $dir = 'images') {
return drupal_get_path('module', $module) . "/$dir/" . $image;
@@ -211,6 +220,9 @@ function ctools_add_css($file, $module = 'ctools', $dir = 'css') {
* Optional module containing the include.
* @param $dir
* Optional subdirectory containing the include file.
+ *
+ * @return string
+ * A string containing the appropriate path from drupal root.
*/
function ctools_attach_css($file, $module = 'ctools', $dir = 'css') {
return drupal_get_path('module', $module) . "/$dir/$file.css";
@@ -249,6 +261,9 @@ function ctools_add_js($file, $module = 'ctools', $dir = 'js') {
* Optional module containing the include.
* @param $dir
* Optional subdirectory containing the include file.
+ *
+ * @return string
+ * A string containing the appropriate path from drupal root.
*/
function ctools_attach_js($file, $module = 'ctools', $dir = 'js') {
return drupal_get_path('module', $module) . "/$dir/$file.js";
@@ -267,16 +282,29 @@ function ctools_get_roles() {
return user_roles();
}
-/*
- * Break x,y,z and x+y+z into an array. Numeric only.
+/**
+ * Parse integer sequences of the form "x,y,z" or "x+y+z" into separate values.
+ *
+ * A string with integers separated by comma (,) is reported as an 'and' set;
+ * separation by a plus sign (+) or a space ( ) is an 'or' set. The meaning
+ * of this is up to the caller. Negative or fractional numbers are not
+ * recognised.
+ *
+ * Additional space characters within or around the sequence are not allowed.
*
* @param $str
* The string to parse.
*
- * @return $object
- * An object containing
- * - operator: Either 'and' or 'or'
- * - value: An array of numeric values.
+ * @return object
+ * An object containing the properties:
+ *
+ * - operator: Either 'and' or 'or' when there are multiple matched values.
+ * Absent when invalid_input is TRUE or there is only one value.
+ * - value: An array of integers (never strings) from $str. An empty array is
+ * returned if the input is empty. A single integer input is returned
+ * as a single value, but no 'operator' is defined.
+ * - invalid_input: TRUE if input could not be parsed and the values array
+ * will contain just -1. This property is otherwise absent.
*/
function ctools_break_phrase($str) {
$object = new stdClass();
@@ -286,7 +314,7 @@ function ctools_break_phrase($str) {
$object->operator = 'or';
$object->value = preg_split('/[+ ]/', $str);
}
- else if (preg_match('/^([0-9]+,)*[0-9]+$/', $str)) {
+ elseif (preg_match('/^([0-9]+,)*[0-9]+$/', $str)) {
$object->operator = 'and';
$object->value = explode(',', $str);
}
@@ -304,7 +332,7 @@ function ctools_break_phrase($str) {
// Doubly ensure that all values are numeric only.
foreach ($object->value as $id => $value) {
- $object->value[$id] = intval($value);
+ $object->value[$id] = (int) $value;
}
return $object;
@@ -314,23 +342,29 @@ function ctools_break_phrase($str) {
* Set a token/value pair to be replaced later in the request, specifically in
* ctools_page_token_processing().
*
- * @param $token
+ * @param string $token
* The token to be replaced later, during page rendering. This should
- * ideally be a string inside of an HTML comment, so that if there is
- * no replacement, the token will not render on the page.
- * @param $type
+ * ideally be a string inside of an HTML comment, so that if there is
+ * no replacement, the token will not render on the page.
+ * If $token is NULL, the token set is not changed, but is still
+ * returned.
+ * @param string $type
* The type of the token. Can be either 'variable', which will pull data
- * directly from the page variables
- * @param $argument
- * If $type == 'variable' then argument should be the key to fetch from
- * the $variables. If $type == 'callback' then it should either be the
- * callback, or an array that will be sent to call_user_func_array().
+ * directly from the page variables, or 'callback', which causes a function
+ * to be called to calculate the value. No other values are supported.
+ * @param string|array $argument
+ * For $type of:
+ * - 'variable': argument should be the key to fetch from the $variables.
+ * - 'callback': then it should either be the callback function name as a
+ * string, or an array that will be sent to call_user_func_array(). Argument
+ * arrays must not use array keys (i.e. $a[0] is the first and $a[1] the
+ * second element, etc.)
*
- * @return
+ * @return array
* A array of token/variable names to be replaced.
*/
function ctools_set_page_token($token = NULL, $type = NULL, $argument = NULL) {
- static $tokens = array();
+ $tokens = &drupal_static('ctools_set_page_token', array());
if (isset($token)) {
$tokens[$token] = array($type, $argument);
@@ -339,13 +373,32 @@ function ctools_set_page_token($token = NULL, $type = NULL, $argument = NULL) {
}
/**
- * Easily set a token from the page variables.
+ * Reset the defined page tokens within this request.
+ *
+ * Introduced for simpletest purposes. Normally not needed.
+ */
+function ctools_reset_page_tokens() {
+ drupal_static_reset('ctools_set_page_token');
+}
+
+/**
+ * Set a replacement token from the containing element's children during #post_render.
*
* This function can be used like this:
- * $token = ctools_set_variable_token('tabs');
+ * $token = ctools_set_variable_token('tabs');
*
- * $token will then be a simple replacement for the 'tabs' about of the
- * variables available in the page template.
+ * The token "" would then be replaced by the value of
+ * this element's (sibling) render array key 'tabs' during post-render (or be
+ * deleted if there was no such key by that point).
+ *
+ * @param string $token
+ * The token string for the page callback, e.g. 'title'.
+ *
+ * @return string
+ * The constructed token.
+ *
+ * @see ctools_set_callback_token()
+ * @see ctools_page_token_processing()
*/
function ctools_set_variable_token($token) {
$string = '';
@@ -354,10 +407,45 @@ function ctools_set_variable_token($token) {
}
/**
- * Easily set a token from the page variables.
+ * Set a replacement token from the value of a function during #post_render.
*
* This function can be used like this:
- * $token = ctools_set_variable_token('id', 'mymodule_myfunction');
+ * $token = ctools_set_callback_token('id', 'mymodule_myfunction');
+ *
+ * Or this (from its use in ctools_page_title_content_type_render):
+ * $token = ctools_set_callback_token('title', array(
+ * 'ctools_page_title_content_type_token', $conf['markup'], $conf['id'], $conf['class']
+ * )
+ * );
+ *
+ * The token (e.g: "")
+ * would then be replaced during post-render by the return value of:
+ *
+ * ctools_page_title_content_type_token($value_markup, $value_id, $value_class);
+ *
+ * @param string $token
+ * The token string for the page callback, e.g. 'title'.
+ *
+ * @param string|array $callback
+ * For callback functions that require no args, the name of the function as a
+ * string; otherwise an array of two or more elements: the function name
+ * followed by one or more function arguments.
+ *
+ * NB: the value of $callback must be a procedural (non-class) function that
+ * passes the php function_exists() check.
+ *
+ * The callback function itself will be called with args dependent
+ * on $callback. If:
+ * - $callback is a string, the function is called with a reference to the
+ * render array;
+ * - $callback is an array, the function is called with $callback merged
+ * with an array containing a reference to the render array.
+ *
+ * @return string
+ * The constructed token.
+ *
+ * @see ctools_set_variable_token()
+ * @see ctools_page_token_processing()
*/
function ctools_set_callback_token($token, $callback) {
// If the callback uses arguments they are considered in the token.
@@ -384,9 +472,9 @@ function ctools_set_no_blocks($blocks = FALSE) {
/**
* Wrapper function to create UUIDs via ctools, falls back on UUID module
* if it is enabled. This code is a copy of uuid.inc from the uuid module.
+ *
* @see http://php.net/uniqid#65879
*/
-
function ctools_uuid_generate() {
if (!module_exists('uuid')) {
ctools_include('uuid');
@@ -413,6 +501,7 @@ function ctools_uuid_generate() {
/**
* Check that a string appears to be in the format of a UUID.
+ *
* @see http://drupal.org/project/uuid
*
* @param $uuid
@@ -468,6 +557,8 @@ function ctools_class_add($classes, $hook = 'html') {
*/
function ctools_class_remove($classes, $hook = 'html') {
if (!is_array($classes)) {
+ // @todo Consider using explode(' ', $classes);
+ // @todo Consider checking that $classes is a string before adding.
$classes = array($classes);
}
@@ -480,12 +571,35 @@ function ctools_class_remove($classes, $hook = 'html') {
}
}
-// -----------------------------------------------------------------------
-// Drupal core hooks
+/**
+ * Reset the storage used for ctools_class_add and ctools_class_remove.
+ *
+ * @see ctools_class_add()
+ * @see ctools_class_remove()
+ */
+function ctools_class_reset() {
+ drupal_static_reset('ctools_process_classes');
+}
+/**
+ * Return the classes for the body (added by ctools_class_add).
+ *
+ * @return array
+ * A copy of the array of classes to add to the body tag. If none have been
+ * added, this will be an empty array.
+ *
+ * @see ctools_class_add()
+ */
+function ctools_get_classes() {
+ return drupal_static('ctools_process_classes', array());
+}
+
+// -----------------------------------------------------------------------
+// Drupal core hooks.
/**
* Implement hook_init to keep our global CSS at the ready.
*/
+
function ctools_init() {
ctools_add_css('ctools');
// If we are sure that CTools' AJAX is in use, change the error handling.
@@ -504,7 +618,7 @@ function ctools_init() {
* Shutdown handler used during ajax operations to help catch fatal errors.
*/
function ctools_shutdown_handler() {
- if (function_exists('error_get_last') AND ($error = error_get_last())) {
+ if (function_exists('error_get_last') && ($error = error_get_last())) {
switch ($error['type']) {
case E_ERROR:
case E_CORE_ERROR:
@@ -583,7 +697,6 @@ function ctools_flush_caches() {
/**
* Implements hook_element_info_alter().
- *
*/
function ctools_element_info_alter(&$type) {
ctools_include('dependent');
@@ -618,12 +731,33 @@ function ctools_registry_files_alter(&$files, $indexed_modules) {
}
// -----------------------------------------------------------------------
-// CTools hook implementations.
+// FAPI hooks that must be in the .module file.
+/**
+ * Alter the comment form to get a little more control over it.
+ */
+function ctools_form_comment_form_alter(&$form, &$form_state) {
+ if (!empty($form_state['ctools comment alter'])) {
+ // Force the form to post back to wherever we are.
+ $form['#action'] = url($_GET['q'], array('fragment' => 'comment-form'));
+ if (empty($form['#submit'])) {
+ $form['#submit'] = array('comment_form_submit');
+ }
+ $form['#submit'][] = 'ctools_node_comment_form_submit';
+ }
+}
+
+function ctools_node_comment_form_submit(&$form, &$form_state) {
+ $form_state['redirect'][0] = $_GET['q'];
+}
+
+// -----------------------------------------------------------------------
+// CTools hook implementations.
/**
* Implementation of hook_ctools_plugin_directory() to let the system know
* where all our own plugins are.
*/
+
function ctools_ctools_plugin_directory($owner, $plugin_type) {
if ($owner == 'ctools') {
return 'plugins/' . $plugin_type;
@@ -644,11 +778,11 @@ function ctools_ctools_plugin_type() {
// -----------------------------------------------------------------------
// Drupal theme preprocess hooks that must be in the .module file.
-
/**
* A theme preprocess function to automatically allow panels-based node
* templates based upon input when the panel was configured.
*/
+
function ctools_preprocess_node(&$vars) {
// The 'ctools_template_identifier' attribute of the node is added when the pane is
// rendered.
@@ -658,14 +792,13 @@ function ctools_preprocess_node(&$vars) {
}
}
-
/**
* Implements hook_page_alter().
*
* Last ditch attempt to remove sidebar regions if the "no blocks"
* functionality has been activated.
*
- * @see ctools_block_list_alter().
+ * @see ctools_block_list_alter()
*/
function ctools_page_alter(&$page) {
$check = drupal_static('ctools_set_no_blocks', TRUE);
@@ -695,6 +828,7 @@ function ctools_page_token_processing($children, $elements) {
case 'variable':
$tokens[$token] = isset($elements[$argument]) ? $elements[$argument] : '';
break;
+
case 'callback':
if (is_string($argument) && function_exists($argument)) {
$tokens[$token] = $argument($elements);
@@ -723,7 +857,7 @@ function ctools_process(&$variables, $hook) {
return;
}
- $classes = drupal_static('ctools_process_classes', array());
+ $classes = ctools_get_classes();
// Process the classses to add.
if (!empty($classes[$hook]['add'])) {
@@ -744,7 +878,6 @@ function ctools_process(&$variables, $hook) {
// -----------------------------------------------------------------------
// Menu callbacks that must be in the .module file.
-
/**
* Determine if the current user has access via a plugin.
*
@@ -768,6 +901,7 @@ function ctools_process(&$variables, $hook) {
* @return
* TRUE if access is granted, false if otherwise.
*/
+
function ctools_access_menu($access) {
// Short circuit everything if there are no access tests.
if (empty($access['plugins'])) {
@@ -796,7 +930,7 @@ function ctools_access_menu($access) {
* An indexed array of zero or more permission strings to be checked by
* user_access().
*
- * @return
+ * @return bool
* Iff all checks pass will this function return TRUE. If an invalid argument
* is passed (e.g., not a string), this function errs on the safe said and
* returns FALSE.
@@ -858,7 +992,6 @@ function ctools_export_ui_load($item_name, $plugin_name) {
// -----------------------------------------------------------------------
// Caching callbacks on behalf of export-ui.
-
/**
* Menu access callback for various tasks of export-ui.
*/
@@ -902,7 +1035,7 @@ function ctools_export_ui_ctools_access_get($argument) {
}
/**
- * Callback for access control ajax form on behalf of export ui
+ * Callback for access control ajax form on behalf of export ui.
*
* Returns the cached access config and contexts used.
* Note that this is assuming that access will be in $item->access -- if it
@@ -935,8 +1068,9 @@ function ctools_menu_local_tasks_alter(&$data, $router_item, $root_path) {
}
/**
- * Implement hook_block_list_alter() to potentially remove blocks.
+ * Implements hook_block_list_alter().
*
+ * Used to potentially remove blocks.
* This exists in order to replicate Drupal 6's "no blocks" functionality.
*/
function ctools_block_list_alter(&$blocks) {
@@ -999,6 +1133,7 @@ function ctools_ctools_entity_context_alter(&$plugin, &$entity, $plugin_id) {
case 'entity_id:taxonomy_term':
$plugin['no ui'] = TRUE;
break;
+
case 'entity:user':
$plugin = ctools_get_context('user');
unset($plugin['no ui']);
@@ -1018,3 +1153,53 @@ function ctools_ctools_entity_context_alter(&$plugin, &$entity, $plugin_id) {
}
}
}
+
+/**
+ * Implements hook_field_create_field().
+ */
+function ctools_field_create_field($field) {
+ ctools_flush_field_caches();
+}
+
+/**
+ * Implements hook_field_create_instance().
+ */
+function ctools_field_create_instance($instance) {
+ ctools_flush_field_caches();
+}
+
+/**
+ * Implements hook_field_delete_field().
+ */
+function ctools_field_delete_field($field) {
+ ctools_flush_field_caches();
+}
+
+/**
+ * Implements hook_field_delete_instance().
+ */
+function ctools_field_delete_instance($instance) {
+ ctools_flush_field_caches();
+}
+
+/**
+ * Implements hook_field_update_field().
+ */
+function ctools_field_update_field($field, $prior_field, $has_data) {
+ ctools_flush_field_caches();
+}
+
+/**
+ * Implements hook_field_update_instance().
+ */
+function ctools_field_update_instance($instance, $prior_instance) {
+ ctools_flush_field_caches();
+}
+
+/**
+ * Clear field related caches.
+ */
+function ctools_flush_field_caches() {
+ // Clear caches of 'Entity field' content type plugin.
+ cache_clear_all('ctools_entity_field_content_type_content_types', 'cache');
+}
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.info b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.info
index 2180cec..3fc3556 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.info
+++ b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.info
@@ -2,12 +2,10 @@ name = Custom rulesets
description = Create custom, exportable, reusable access rulesets for applications like Panels.
core = 7.x
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.install b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.install
index 3f00877..70afb3c 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.install
+++ b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.install
@@ -1,5 +1,9 @@
t('Custom rulesets are combinations of access plugins you can use for access control, selection criteria and pane visibility.'),
);
- // Load all mini panels and their displays.
+ // Load all mini panels and their displays.
ctools_include('export');
$items = ctools_export_crud_load_all('ctools_access_ruleset');
$count = 0;
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/access/ruleset.inc b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/access/ruleset.inc
index f8abea6..95f32c3 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/access/ruleset.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/access/ruleset.inc
@@ -35,7 +35,7 @@ function ctools_ruleset_ctools_access_merge_plugin($plugin, $parent, $item) {
$plugin['required context'] = array();
foreach ($item->requiredcontexts as $context) {
$info = ctools_get_context($context['name']);
- // TODO: allow an optional setting
+ // TODO: allow an optional setting.
$plugin['required context'][] = new ctools_context_required($context['identifier'], $info['context name']);
}
}
@@ -72,7 +72,7 @@ function ctools_ruleset_ctools_access_get_children($plugin, $parent) {
}
/**
- * Settings form for the 'by ruleset' access plugin
+ * Settings form for the 'by ruleset' access plugin.
*/
function ctools_ruleset_ctools_access_settings(&$form, &$form_state, $conf) {
if (!empty($form_state['plugin']['ruleset']->admin_description)) {
@@ -106,4 +106,3 @@ function ctools_ruleset_ctools_access_summary($conf, $context, $plugin) {
return check_plain($plugin['ruleset']->admin_title);
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/export_ui/ctools_access_ruleset.inc b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/export_ui/ctools_access_ruleset.inc
index d2a1c60..2589ac3 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/export_ui/ctools_access_ruleset.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/export_ui/ctools_access_ruleset.inc
@@ -1,5 +1,9 @@
'ctools_access_ruleset',
'access' => 'administer ctools access ruleset',
@@ -26,4 +30,3 @@ $plugin = array(
),
),
);
-
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/export_ui/ctools_access_ruleset_ui.class.php b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/export_ui/ctools_access_ruleset_ui.class.php
index b181464..c9f8c20 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/export_ui/ctools_access_ruleset_ui.class.php
+++ b/sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/plugins/export_ui/ctools_access_ruleset_ui.class.php
@@ -2,7 +2,7 @@
class ctools_access_ruleset_ui extends ctools_export_ui {
- function edit_form_context(&$form, &$form_state) {
+ public function edit_form_context(&$form, &$form_state) {
ctools_include('context-admin');
ctools_context_admin_includes();
ctools_add_css('ruleset');
@@ -27,7 +27,7 @@ class ctools_access_ruleset_ui extends ctools_export_ui {
ctools_context_add_relationship_form($module, $form, $form_state, $form['right']['relationships_table'], $form_state['item'], $name);
}
- function edit_form_rules(&$form, &$form_state) {
+ public function edit_form_rules(&$form, &$form_state) {
// The 'access' UI passes everything via $form_state, unlike the 'context' UI.
// The main difference is that one is about 3 years newer than the other.
ctools_include('context');
@@ -43,11 +43,12 @@ class ctools_access_ruleset_ui extends ctools_export_ui {
$form = ctools_access_admin_form($form, $form_state);
}
- function edit_form_rules_submit(&$form, &$form_state) {
+ public function edit_form_rules_submit(&$form, &$form_state) {
$form_state['item']->access['logic'] = $form_state['values']['logic'];
}
- function edit_form_submit(&$form, &$form_state) {
+ public function edit_form_submit(&$form, &$form_state) {
parent::edit_form_submit($form, $form_state);
}
+
}
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/css/ctools-ajax-sample.css b/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/css/ctools-ajax-sample.css
index 8df17de..c312e99 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/css/ctools-ajax-sample.css
+++ b/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/css/ctools-ajax-sample.css
@@ -1,52 +1,52 @@
div.ctools-sample-modal-content {
- background:none;
- border:0;
- color:#000000;
- margin:0;
- padding:0;
- text-align:left;
+ background: none;
+ border: 0;
+ color: #000;
+ margin: 0;
+ padding: 0;
+ text-align: left;
}
-div.ctools-sample-modal-content .modal-scroll{
- overflow:hidden;
- overflow-y:auto;
+div.ctools-sample-modal-content .modal-scroll {
+ overflow: hidden;
+ overflow-y: auto;
}
div.ctools-sample-modal-content #popups-overlay {
- background-color:transparent;
+ background-color: transparent;
}
div.ctools-sample-modal-content #popups-loading {
- width:248px;
- position:absolute;
- display:none;
- opacity:1;
+ width: 248px;
+ position: absolute;
+ display: none;
+ opacity: 1;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
- z-index:99;
+ z-index: 99;
}
div.ctools-sample-modal-content #popups-loading span.popups-loading-message {
- background:#FFF url(../images/loading-large.gif) no-repeat 8px center;
- display:block;
- color:#444444;
- font-family:Arial;
- font-size:22px;
- font-weight:bold;
- height:36px;
- line-height:36px;
- padding:0 40px;
+ background: #fff url(../images/loading-large.gif) no-repeat 8px center;
+ display: block;
+ color: #444;
+ font-family: Arial, serif;
+ font-size: 22px;
+ font-weight: bold;
+ height: 36px;
+ line-height: 36px;
+ padding: 0 40px;
}
div.ctools-sample-modal-content #popups-loading table,
div.ctools-sample-modal-content .popups-box table {
- margin:0px;
+ margin: 0;
}
div.ctools-sample-modal-content #popups-loading tbody,
div.ctools-sample-modal-content .popups-box tbody {
- border:none;
+ border: none;
}
div.ctools-sample-modal-content .popups-box tr {
- background-color:transparent;
+ background-color: transparent;
}
div.ctools-sample-modal-content td.popups-border {
background: url(../images/popups-border.png);
- background-color:transparent;
+ background-color: transparent;
border: none;
}
div.ctools-sample-modal-content td.popups-tl,
@@ -54,79 +54,94 @@ div.ctools-sample-modal-content td.popups-tr,
div.ctools-sample-modal-content td.popups-bl,
div.ctools-sample-modal-content td.popups-br {
background-repeat: no-repeat;
- height:10px;
- padding:0px;
+ height: 10px;
+ padding: 0;
+}
+div.ctools-sample-modal-content td.popups-tl {
+ background-position: 0 0;
}
-div.ctools-sample-modal-content td.popups-tl { background-position: 0px 0px; }
div.ctools-sample-modal-content td.popups-t,
div.ctools-sample-modal-content td.popups-b {
- background-position: 0px -40px;
+ background-position: 0 -40px;
background-repeat: repeat-x;
}
-div.ctools-sample-modal-content td.popups-tr { background-position: 0px -10px; width: 10px; }
+div.ctools-sample-modal-content td.popups-tr {
+ background-position: 0 -10px;
+ width: 10px;
+}
div.ctools-sample-modal-content td.popups-cl,
div.ctools-sample-modal-content td.popups-cr {
background-position: -10px 0;
background-repeat: repeat-y;
- width:10px;
+ width: 10px;
}
div.ctools-sample-modal-content td.popups-cl,
div.ctools-sample-modal-content td.popups-cr,
-div.ctools-sample-modal-content td.popups-c { padding:0; border: none; }
-div.ctools-sample-modal-content td.popups-c { background:#fff; }
-div.ctools-sample-modal-content td.popups-bl { background-position: 0px -20px; }
-div.ctools-sample-modal-content td.popups-br { background-position: 0px -30px; width: 10px; }
+div.ctools-sample-modal-content td.popups-c {
+ padding: 0;
+ border: none;
+}
+div.ctools-sample-modal-content td.popups-c {
+ background: #fff;
+}
+div.ctools-sample-modal-content td.popups-bl {
+ background-position: 0 -20px;
+}
+div.ctools-sample-modal-content td.popups-br {
+ background-position: 0 -30px;
+ width: 10px;
+}
div.ctools-sample-modal-content .popups-box,
div.ctools-sample-modal-content #popups-loading {
- border: 0px solid #454545;
- opacity:1;
- overflow:hidden;
- padding:0;
- background-color:transparent;
+ border: 0 solid #454545;
+ opacity: 1;
+ overflow: hidden;
+ padding: 0;
+ background-color: transparent;
}
div.ctools-sample-modal-content .popups-container {
- overflow:hidden;
- height:100%;
- background-color:#fff;
+ overflow: hidden;
+ height: 100%;
+ background-color: #fff;
}
div.ctools-sample-modal-content div.popups-title {
- -moz-border-radius-topleft: 0px;
- -webkit-border-radius-topleft: 0px;
- margin-bottom:0px;
- background-color:#ff7200;
- border:1px solid #ce5c00;
- padding:4px 10px 5px;
- color:white;
- font-size:1em;
- font-weight:bold;
+ -moz-border-radius-topleft: 0;
+ -webkit-border-radius-topleft: 0;
+ margin-bottom: 0;
+ background-color: #ff7200;
+ border: 1px solid #ce5c00;
+ padding: 4px 10px 5px;
+ color: white;
+ font-size: 1em;
+ font-weight: bold;
}
div.ctools-sample-modal-content .popups-body {
- background-color:#fff;
- padding:8px;
+ background-color: #fff;
+ padding: 8px;
}
div.ctools-sample-modal-content .popups-box .popups-buttons,
div.ctools-sample-modal-content .popups-box .popups-footer {
- background-color:#fff;
+ background-color: #fff;
}
div.ctools-sample-modal-content .popups-title a.close {
color: #fff;
- text-decoration:none;
+ text-decoration: none;
}
div.ctools-sample-modal-content .popups-close {
- font-size:120%;
- float:right;
- text-align:right;
+ font-size: 120%;
+ float: right;
+ text-align: right;
}
div.ctools-sample-modal-content .modal-loading-wrapper {
- width:220px;
- height:19px;
- margin:0 auto;
- margin-top:2%;
+ width: 220px;
+ height: 19px;
+ margin: 0 auto;
+ margin-top: 2%;
}
-div.ctools-sample-modal-content tbody{
- border:none;
+div.ctools-sample-modal-content tbody {
+ border: none;
}
div.ctools-sample-modal-content .modal-content .modal-throbber-wrapper img {
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.info b/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.info
index 009662f..c2a52df 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.info
+++ b/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.info
@@ -1,13 +1,11 @@
name = Chaos Tools (CTools) AJAX Example
description = Shows how to use the power of Chaos AJAX.
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
core = 7.x
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.install b/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.install
index 04325db..e0fdfc6 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.install
+++ b/sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.install
@@ -1,18 +1,18 @@
'Chaos Tools AJAX Demo',
- 'page callback' => 'ctools_ajax_sample_page',
- 'access callback' => TRUE,
- 'type' => MENU_NORMAL_ITEM,
+ 'title' => 'Chaos Tools AJAX Demo',
+ 'page callback' => 'ctools_ajax_sample_page',
+ 'access callback' => TRUE,
+ 'type' => MENU_NORMAL_ITEM,
);
$items['ctools_ajax_sample/simple_form'] = array(
'title' => 'Simple Form',
@@ -26,39 +26,39 @@ function ctools_ajax_sample_menu() {
'type' => MENU_CALLBACK,
);
$items['ctools_ajax_sample/%ctools_js/hello'] = array(
- 'title' => 'Hello World',
- 'page callback' => 'ctools_ajax_sample_hello',
- 'page arguments' => array(1),
- 'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
+ 'title' => 'Hello World',
+ 'page callback' => 'ctools_ajax_sample_hello',
+ 'page arguments' => array(1),
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
);
$items['ctools_ajax_sample/%ctools_js/tablenix/%'] = array(
- 'title' => 'Hello World',
- 'page callback' => 'ctools_ajax_sample_tablenix',
- 'page arguments' => array(1, 3),
- 'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
+ 'title' => 'Hello World',
+ 'page callback' => 'ctools_ajax_sample_tablenix',
+ 'page arguments' => array(1, 3),
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
);
$items['ctools_ajax_sample/%ctools_js/login'] = array(
- 'title' => 'Login',
- 'page callback' => 'ctools_ajax_sample_login',
- 'page arguments' => array(1),
- 'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
+ 'title' => 'Login',
+ 'page callback' => 'ctools_ajax_sample_login',
+ 'page arguments' => array(1),
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
);
$items['ctools_ajax_sample/%ctools_js/animal'] = array(
- 'title' => 'Animal',
- 'page callback' => 'ctools_ajax_sample_animal',
- 'page arguments' => array(1),
- 'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
+ 'title' => 'Animal',
+ 'page callback' => 'ctools_ajax_sample_animal',
+ 'page arguments' => array(1),
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
);
$items['ctools_ajax_sample/%ctools_js/login/%'] = array(
- 'title' => 'Post-Login Action',
- 'page callback' => 'ctools_ajax_sample_login_success',
- 'page arguments' => array(1, 3),
- 'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
+ 'title' => 'Post-Login Action',
+ 'page callback' => 'ctools_ajax_sample_login_success',
+ 'page arguments' => array(1, 3),
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
);
$items['ctools_ajax_sample/jumped'] = array(
'title' => 'Successful Jumping',
@@ -104,11 +104,11 @@ function ctools_ajax_sample_theme() {
}
// ---------------------------------------------------------------------------
-// Page callbacks
-
+// Page callbacks.
/**
* Page callback to display links and render a container for AJAX stuff.
*/
+
function ctools_ajax_sample_page() {
global $user;
@@ -156,14 +156,14 @@ function ctools_ajax_sample_page() {
// The extra class points to the info in ctools-sample-style which we added
// to the settings, prefixed with 'ctools-modal'.
- $links[] = ctools_modal_text_button(t('Modal Login (custom style)'), 'ctools_ajax_sample/nojs/login', t('Login via modal'), 'ctools-modal-ctools-sample-style');
+ $links[] = ctools_modal_text_button(t('Modal Login (custom style)'), 'ctools_ajax_sample/nojs/login', t('Login via modal'), 'ctools-modal-ctools-sample-style');
}
// Four ways to do our animal picking wizard.
$button_form = ctools_ajax_sample_ajax_button_form();
$links[] = l(t('Wizard (no modal)'), 'ctools_ajax_sample/nojs/animal');
$links[] = ctools_modal_text_button(t('Wizard (default modal)'), 'ctools_ajax_sample/nojs/animal', t('Pick an animal'));
- $links[] = ctools_modal_text_button(t('Wizard (custom modal)'), 'ctools_ajax_sample/nojs/animal', t('Pick an animal'), 'ctools-modal-ctools-sample-style');
+ $links[] = ctools_modal_text_button(t('Wizard (custom modal)'), 'ctools_ajax_sample/nojs/animal', t('Pick an animal'), 'ctools-modal-ctools-sample-style');
$links[] = drupal_render($button_form);
$links[] = ctools_ajax_text_button(t('Hello world!'), "ctools_ajax_sample/nojs/hello", t('Replace text with "hello world"'));
@@ -176,9 +176,9 @@ function ctools_ajax_sample_page() {
// Create a table that we can have data removed from via AJAX.
$header = array(t('Row'), t('Content'), t('Actions'));
$rows = array();
- for($i = 1; $i < 11; $i++) {
+ for ($i = 1; $i < 11; $i++) {
$rows[] = array(
- 'class' => array('ajax-sample-row-'. $i),
+ 'class' => array('ajax-sample-row-' . $i),
'data' => array(
$i,
md5($i),
@@ -189,10 +189,10 @@ function ctools_ajax_sample_page() {
$output .= theme('table', array('header' => $header, 'rows' => $rows, array('class' => array('ajax-sample-table'))));
- // Show examples of ctools javascript widgets
- $output .= ''. t('CTools Javascript Widgets') .'
'; + // Show examples of ctools javascript widgets. + $output .= '' . t('CTools Javascript Widgets') . '
'; - // Create a drop down menu + // Create a drop down menu. $links = array(); $links[] = array('title' => t('Link 1'), 'href' => $_GET['q']); $links[] = array('title' => t('Link 2'), 'href' => $_GET['q']); @@ -201,16 +201,16 @@ function ctools_ajax_sample_page() { $output .= '' . t('Drop Down Menu') . '
'; $output .= theme('ctools_dropdown', array('title' => t('Click to Drop Down'), 'links' => $links)); - // Create a collapsible div + // Create a collapsible div. $handle = t('Click to Collapse'); $content = 'Nulla ligula ante, aliquam at adipiscing egestas, varius vel arcu. Etiam laoreet elementum mi vel consequat. Etiam scelerisque lorem vel neque consequat quis bibendum libero congue. Nulla facilisi. Mauris a elit a leo feugiat porta. Phasellus placerat cursus est vitae elementum.'; - $output .= ''. t('Collapsible Div') .'
'; + $output .= '' . t('Collapsible Div') . '
'; $output .= theme('ctools_collapsible', array('handle' => $handle, 'content' => $content, 'collapsed' => FALSE)); - // Create a jump menu + // Create a jump menu. ctools_include('jump-menu'); $form = drupal_get_form('ctools_ajax_sample_jump_menu_form'); - $output .= ''. t('Jump Menu') .'
'; + $output .= '' . t('Jump Menu') . '
'; $output .= drupal_render($form); return array('markup' => array('#markup' => $output)); @@ -225,7 +225,8 @@ function ctools_ajax_sample_hello($js = NULL) { ctools_include('ajax'); $commands = array(); $commands[] = ajax_command_html('#ctools-sample', $output); - print ajax_render($commands); // this function exits. + // This function exits. + print ajax_render($commands); exit; } else { @@ -234,7 +235,7 @@ function ctools_ajax_sample_hello($js = NULL) { } /** - * Nix a row from a table and restripe. + * Nix a row from a table and restripe. */ function ctools_ajax_sample_tablenix($js, $row) { if (!$js) { @@ -272,7 +273,7 @@ function ctools_ajax_sample_login($js = NULL) { $output = array(); $inplace = ctools_ajax_text_button(t('remain here'), 'ctools_ajax_sample/nojs/login/inplace', t('Go to your account')); $account = ctools_ajax_text_button(t('your account'), 'ctools_ajax_sample/nojs/login/user', t('Go to your account')); - $output[] = ctools_modal_command_display(t('Login Success'), ''); + $output[] = ctools_modal_command_display(t('Login Success'), ''); } print ajax_render($output); exit; @@ -283,7 +284,7 @@ function ctools_ajax_sample_login($js = NULL) { */ function ctools_ajax_sample_login_success($js, $action) { if (!$js) { - // we should never be here out of ajax context + // We should never be here out of ajax context. return MENU_NOT_FOUND; } @@ -291,11 +292,11 @@ function ctools_ajax_sample_login_success($js, $action) { ctools_add_js('ajax-responder'); $commands = array(); if ($action == 'inplace') { - // stay here + // Stay here. $commands[] = ctools_ajax_command_reload(); } else { - // bounce bounce + // Bounce bounce. $commands[] = ctools_ajax_command_redirect('user'); } print ajax_render($commands); @@ -318,18 +319,18 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { 'show back' => TRUE, 'show cancel' => TRUE, 'show return' => FALSE, - 'next callback' => 'ctools_ajax_sample_wizard_next', + 'next callback' => 'ctools_ajax_sample_wizard_next', 'finish callback' => 'ctools_ajax_sample_wizard_finish', 'cancel callback' => 'ctools_ajax_sample_wizard_cancel', - // this controls order, as well as form labels + // This controls order, as well as form labels. 'order' => array( 'start' => t('Choose animal'), ), - // here we map a step to a form id. + // Here we map a step to a form id. 'forms' => array( - // e.g. this for the step at wombat/create + // e.g. this for the step at wombat/create. 'start' => array( - 'form id' => 'ctools_ajax_sample_start' + 'form id' => 'ctools_ajax_sample_start', ), ), ); @@ -341,7 +342,6 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { // in creation. // // We skip all this here by just using an id of 1. - $object_id = 1; if (empty($step)) { @@ -406,7 +406,7 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { $commands[] = ajax_command_html('#ctools-sample', $animal); $commands[] = ctools_modal_command_dismiss(); } - else if (!empty($form_state['cancel'])) { + elseif (!empty($form_state['cancel'])) { // If cancelling, return to the activity. $commands[] = ctools_modal_command_dismiss(); } @@ -420,7 +420,7 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { if ($output === FALSE || !empty($form_state['complete'])) { return $animal; } - else if (!empty($form_state['cancel'])) { + elseif (!empty($form_state['cancel'])) { drupal_goto('ctools_ajax_sample'); } else { @@ -430,11 +430,11 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { } // --------------------------------------------------------------------------- -// Themes - +// Themes. /** * Theme function for main rendered output. */ + function theme_ctools_ajax_sample_container($vars) { $output = '';
$output .= $vars['content'];
@@ -445,7 +445,6 @@ function theme_ctools_ajax_sample_container($vars) {
// ---------------------------------------------------------------------------
// Stuff needed for our little wizard.
-
/**
* Get a list of our animals and associated forms.
*
@@ -453,6 +452,7 @@ function theme_ctools_ajax_sample_container($vars) {
* which is often how it will work in the real world. If using CTools, what
* you would probably really have, here, is a set of plugins for each animal.
*/
+
function ctools_ajax_sample_animals() {
return array(
'sheep' => array(
@@ -478,10 +478,10 @@ function ctools_ajax_sample_animals() {
// ---------------------------------------------------------------------------
// Wizard caching helpers.
-
/**
* Store our little cache so that we can retain data from form to form.
*/
+
function ctools_ajax_sample_cache_set($id, $object) {
ctools_include('object-cache');
ctools_object_cache_set('ctools_ajax_sample', $id, $object);
@@ -495,7 +495,7 @@ function ctools_ajax_sample_cache_get($id) {
$object = ctools_object_cache_get('ctools_ajax_sample', $id);
if (!$object) {
// Create a default object.
- $object = new stdClass;
+ $object = new stdClass();
$object->type = 'unknown';
$object->name = '';
}
@@ -513,18 +513,18 @@ function ctools_ajax_sample_cache_clear($id) {
// ---------------------------------------------------------------------------
// Wizard in-between helpers; what to do between or after forms.
-
/**
* Handle the 'next' click on the add/edit pane form wizard.
*
* All we need to do is store the updated pane in the cache.
*/
+
function ctools_ajax_sample_wizard_next(&$form_state) {
ctools_ajax_sample_cache_set($form_state['object_id'], $form_state['object']);
}
/**
- * Handle the 'finish' click on teh add/edit pane form wizard.
+ * Handle the 'finish' click on the add/edit pane form wizard.
*
* All we need to do is set a flag so the return can handle adding
* the pane.
@@ -542,10 +542,10 @@ function ctools_ajax_sample_wizard_cancel(&$form_state) {
// ---------------------------------------------------------------------------
// Wizard forms for our simple info collection wizard.
-
/**
* Wizard start form. Choose an animal.
*/
+
function ctools_ajax_sample_start($form, &$form_state) {
$form_state['title'] = t('Choose animal');
@@ -713,7 +713,7 @@ function ctools_ajax_sample_show_raptor($object) {
}
/**
- * Helper function to provide a sample jump menu form
+ * Helper function to provide a sample jump menu form.
*/
function ctools_ajax_sample_jump_menu_form() {
$url = url('ctools_ajax_sample/jumped');
@@ -723,7 +723,7 @@ function ctools_ajax_sample_jump_menu_form() {
}
/**
- * Provide a message to the user that the jump menu worked
+ * Provide a message to the user that the jump menu worked.
*/
function ctools_ajax_sample_jump_menu_page() {
$return_link = l(t('Return to the examples page.'), 'ctools_ajax_sample');
@@ -732,7 +732,7 @@ function ctools_ajax_sample_jump_menu_page() {
}
/**
- * Provide a form for an example ajax modal button
+ * Provide a form for an example ajax modal button.
*/
function ctools_ajax_sample_ajax_button_form() {
$form = array();
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.info b/sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.info
index b991d61..2bc7348 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.info
+++ b/sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.info
@@ -2,12 +2,10 @@ name = Custom content panes
description = Create custom, exportable, reusable content panes for applications like Panels.
core = 7.x
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.install b/sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.install
index b4512f2..dcf87e7 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.install
+++ b/sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.install
@@ -1,5 +1,9 @@
type == 'custom') {
- if(!isset($pane->configuration['name'])) {
+ if (!isset($pane->configuration['name'])) {
$name_of_pane = $pane->subtype;
}
else {
@@ -80,7 +80,7 @@ function ctools_custom_content_panels_dashboard_blocks(&$vars) {
'description' => t('Custom content panes are basic HTML you enter that can be reused in all of your panels.'),
);
- // Load all mini panels and their displays.
+ // Load all mini panels and their displays.
ctools_include('export');
$items = ctools_export_crud_load_all('ctools_custom_content');
$count = 0;
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content.inc b/sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content.inc
index 467dc58..c7933bc 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content.inc
@@ -1,5 +1,9 @@
'ctools_custom_content',
'access' => 'administer custom content',
@@ -17,4 +21,3 @@ $plugin = array(
'handler' => 'ctools_custom_content_ui',
);
-
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php b/sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php
index 56fe4b2..e56f7a7 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php
+++ b/sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php
@@ -2,7 +2,7 @@
class ctools_custom_content_ui extends ctools_export_ui {
- function edit_form(&$form, &$form_state) {
+ public function edit_form(&$form, &$form_state) {
// Correct for an error that came in because filter format changed.
if (is_array($form_state['item']->settings['body'])) {
$form_state['item']->settings['format'] = $form_state['item']->settings['body']['format'];
@@ -23,6 +23,22 @@ class ctools_custom_content_ui extends ctools_export_ui {
'#title' => t('Title'),
);
+ $form['title_heading'] = array(
+ '#title' => t('Title heading'),
+ '#type' => 'select',
+ '#default_value' => isset($form_state['item']->settings['title_heading']) ? $form_state['item']->settings['title_heading'] : 'h2',
+ '#options' => array(
+ 'h1' => t('h1'),
+ 'h2' => t('h2'),
+ 'h3' => t('h3'),
+ 'h4' => t('h4'),
+ 'h5' => t('h5'),
+ 'h6' => t('h6'),
+ 'div' => t('div'),
+ 'span' => t('span'),
+ ),
+ );
+
$form['body'] = array(
'#type' => 'text_format',
'#title' => t('Body'),
@@ -38,17 +54,18 @@ class ctools_custom_content_ui extends ctools_export_ui {
);
}
- function edit_form_submit(&$form, &$form_state) {
+ public function edit_form_submit(&$form, &$form_state) {
parent::edit_form_submit($form, $form_state);
// Since items in our settings are not in the schema, we have to do these manually:
$form_state['item']->settings['title'] = $form_state['values']['title'];
+ $form_state['item']->settings['title_heading'] = $form_state['values']['title_heading'];
$form_state['item']->settings['body'] = $form_state['values']['body']['value'];
$form_state['item']->settings['format'] = $form_state['values']['body']['format'];
$form_state['item']->settings['substitute'] = $form_state['values']['substitute'];
}
- function list_form(&$form, &$form_state) {
+ public function list_form(&$form, &$form_state) {
parent::list_form($form, $form_state);
$options = array('all' => t('- All -'));
@@ -65,7 +82,7 @@ class ctools_custom_content_ui extends ctools_export_ui {
);
}
- function list_filter($form_state, $item) {
+ public function list_filter($form_state, $item) {
if ($form_state['values']['category'] != 'all' && $form_state['values']['category'] != $item->category) {
return TRUE;
}
@@ -73,7 +90,7 @@ class ctools_custom_content_ui extends ctools_export_ui {
return parent::list_filter($form_state, $item);
}
- function list_sort_options() {
+ public function list_sort_options() {
return array(
'disabled' => t('Enabled, title'),
'title' => t('Title'),
@@ -83,21 +100,25 @@ class ctools_custom_content_ui extends ctools_export_ui {
);
}
- function list_build_row($item, &$form_state, $operations) {
- // Set up sorting
+ public function list_build_row($item, &$form_state, $operations) {
+ // Set up sorting.
switch ($form_state['values']['order']) {
case 'disabled':
$this->sorts[$item->name] = empty($item->disabled) . $item->admin_title;
break;
+
case 'title':
$this->sorts[$item->name] = $item->admin_title;
break;
+
case 'name':
$this->sorts[$item->name] = $item->name;
break;
+
case 'category':
$this->sorts[$item->name] = $item->category;
break;
+
case 'storage':
$this->sorts[$item->name] = $item->type . $item->admin_title;
break;
@@ -117,7 +138,7 @@ class ctools_custom_content_ui extends ctools_export_ui {
);
}
- function list_table_header() {
+ public function list_table_header() {
return array(
array('data' => t('Name'), 'class' => array('ctools-export-ui-name')),
array('data' => t('Title'), 'class' => array('ctools-export-ui-title')),
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/README.txt b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/README.txt
index 42edcdc..2f9b0ff 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/README.txt
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/README.txt
@@ -11,4 +11,4 @@ There are a number of ways to profit from this:
2. There is a sample panel. You can access it at /ctools_plugin_example/xxxx
to see how it works.
-3. There is Advanced Help at admin/advanced_help/ctools_plugin_example.
\ No newline at end of file
+3. There is Advanced Help at admin/advanced_help/ctools_plugin_example.
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.info b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.info
index f526be6..3f268db 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.info
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.info
@@ -1,16 +1,14 @@
name = Chaos Tools (CTools) Plugin Example
description = Shows how an external module can provide ctools plugins (for Panels, etc.).
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
dependencies[] = panels
dependencies[] = page_manager
dependencies[] = advanced_help
core = 7.x
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.module b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.module
index 01d5338..a9a6080 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.module
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.module
@@ -1,9 +1,8 @@
.pages_default.inc
+ * .pages_default.inc.
*/
function ctools_plugin_example_ctools_plugin_api($module, $api) {
// @todo -- this example should explain how to put it in a different file.
@@ -71,7 +70,8 @@ function ctools_plugin_example_ctools_plugin_api($module, $api) {
}
/**
- * Just provide an explanation page for the admin section
+ * Just provide an explanation page for the admin section.
+ *
* @return unknown_type
*/
function ctools_plugin_example_explanation_page() {
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.pages_default.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.pages_default.inc
index 10a7619..ed3ffd7 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.pages_default.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.pages_default.inc
@@ -6,7 +6,7 @@
*/
/**
- * Default panels pages for CTools Plugin Example
+ * Default panels pages for CTools Plugin Example.
*
* To pick up this file, your module needs to implement
* hook_ctools_plugin_api() - See ctools_plugin_example_ctools_plugin_api() in
@@ -23,12 +23,10 @@
* @return
* Array of pages, normally exported from Panels.
*/
-
function ctools_plugin_example_default_page_manager_pages() {
- // begin exported panel.
-
- $page = new stdClass;
+ // Begin exported panel.
+ $page = new stdClass();
$page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
$page->api_version = 1;
$page->name = 'ctools_plugin_example';
@@ -37,31 +35,31 @@ function ctools_plugin_example_default_page_manager_pages() {
$page->admin_description = 'This panel provides no functionality to a working Drupal system. It\'s intended to display the various sample plugins provided by the CTools Plugin Example module. ';
$page->path = 'ctools_plugin_example/%sc';
$page->access = array(
- 'logic' => 'and',
+ 'logic' => 'and',
);
$page->menu = array(
- 'type' => 'normal',
- 'title' => 'CTools plugin example',
- 'name' => 'navigation',
- 'weight' => '0',
- 'parent' => array(
- 'type' => 'none',
- 'title' => '',
+ 'type' => 'normal',
+ 'title' => 'CTools plugin example',
'name' => 'navigation',
'weight' => '0',
- ),
+ 'parent' => array(
+ 'type' => 'none',
+ 'title' => '',
+ 'name' => 'navigation',
+ 'weight' => '0',
+ ),
);
$page->arguments = array(
- 'sc' => array(
- 'id' => 2,
- 'identifier' => 'simplecontext-arg',
- 'name' => 'simplecontext_arg',
- 'settings' => array(),
- ),
+ 'sc' => array(
+ 'id' => 2,
+ 'identifier' => 'simplecontext-arg',
+ 'name' => 'simplecontext_arg',
+ 'settings' => array(),
+ ),
);
$page->conf = array();
$page->default_handlers = array();
- $handler = new stdClass;
+ $handler = new stdClass();
$handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
$handler->api_version = 1;
$handler->name = 'page_ctools_panel_context';
@@ -70,44 +68,45 @@ function ctools_plugin_example_default_page_manager_pages() {
$handler->handler = 'panel_context';
$handler->weight = 0;
$handler->conf = array(
- 'title' => 'Panel',
- 'no_blocks' => FALSE,
- 'css_id' => '',
- 'css' => '',
- 'contexts' => array(
- '0' => array(
- 'name' => 'simplecontext',
- 'id' => 1,
- 'identifier' => 'Configured simplecontext (not from argument)',
- 'keyword' => 'configured_simplecontext',
- 'context_settings' => array(
- 'sample_simplecontext_setting' => 'default simplecontext setting',
- ),
- ),
- ),
- 'relationships' => array(
- '0' => array(
- 'context' => 'argument_simplecontext_arg_2',
- 'name' => 'relcontext_from_simplecontext',
- 'id' => 1,
- 'identifier' => 'Relcontext from simplecontext (from relationship)',
- 'keyword' => 'relcontext',
- ),
- ),
- 'access' => array(
- 'logic' => 'and',
- ),
+ 'title' => 'Panel',
+ 'no_blocks' => FALSE,
+ 'css_id' => '',
+ 'css' => '',
+ 'contexts' => array(
+ '0' => array(
+ 'name' => 'simplecontext',
+ 'id' => 1,
+ 'identifier' => 'Configured simplecontext (not from argument)',
+ 'keyword' => 'configured_simplecontext',
+ 'context_settings' => array(
+ 'sample_simplecontext_setting' => 'default simplecontext setting',
+ ),
+ ),
+ ),
+ 'relationships' => array(
+ '0' => array(
+ 'context' => 'argument_simplecontext_arg_2',
+ 'name' => 'relcontext_from_simplecontext',
+ 'id' => 1,
+ 'identifier' => 'Relcontext from simplecontext (from relationship)',
+ 'keyword' => 'relcontext',
+ ),
+ ),
+ 'access' => array(
+ 'logic' => 'and',
+ ),
+ 'pipeline' => 'standard',
);
- $display = new panels_display;
+ $display = new panels_display();
$display->layout = 'threecol_33_34_33_stacked';
$display->layout_settings = array();
$display->panel_settings = array(
- 'style' => 'rounded_corners',
- 'style_settings' => array(
- 'default' => array(
- 'corner_location' => 'pane',
- ),
- ),
+ 'style' => 'rounded_corners',
+ 'style_settings' => array(
+ 'default' => array(
+ 'corner_location' => 'pane',
+ ),
+ ),
);
$display->cache = array();
$display->title = 'CTools plugin example panel';
@@ -115,7 +114,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$display->title_pane = 1;
$display->content = array();
$display->panels = array();
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-1';
$pane->panel = 'left';
$pane->type = 'no_context_content_type';
@@ -135,7 +134,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 0;
$display->content['new-1'] = $pane;
$display->panels['left'][0] = 'new-1';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-2';
$pane->panel = 'left';
$pane->type = 'custom';
@@ -148,15 +147,15 @@ function ctools_plugin_example_default_page_manager_pages() {
'settings' => array(
'greater_than' => '1',
'arg_length' => '4',
- ),
+ ),
'context' => 'argument_simplecontext_arg_2',
- ),
- ),
+ ),
+ ),
);
$pane->configuration = array(
'title' => 'Long Arg Visibility Block',
'body' => 'This block will be here when the argument is longer than configured arg length. It uses the \'arg_length\' access plugin to test against the length of the argument used for Simplecontext.',
- 'format' => '1',
+ 'format' => 'filtered_html',
'substitute' => 1,
);
$pane->cache = array();
@@ -166,7 +165,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 1;
$display->content['new-2'] = $pane;
$display->panels['left'][1] = 'new-2';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-3';
$pane->panel = 'left';
$pane->type = 'custom';
@@ -179,15 +178,15 @@ function ctools_plugin_example_default_page_manager_pages() {
'settings' => array(
'greater_than' => '0',
'arg_length' => '4',
- ),
+ ),
'context' => 'argument_simplecontext_arg_2',
- ),
- ),
+ ),
+ ),
);
$pane->configuration = array(
'title' => 'Short Arg Visibility',
'body' => 'This block appears when the simplecontext argument is less than the configured length.',
- 'format' => '1',
+ 'format' => 'filtered_html',
'substitute' => 1,
);
$pane->cache = array();
@@ -197,7 +196,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 2;
$display->content['new-3'] = $pane;
$display->panels['left'][2] = 'new-3';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-4';
$pane->panel = 'middle';
$pane->type = 'simplecontext_content_type';
@@ -241,7 +240,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 0;
$display->content['new-4'] = $pane;
$display->panels['middle'][0] = 'new-4';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-5';
$pane->panel = 'middle';
$pane->type = 'simplecontext_content_type';
@@ -285,7 +284,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 1;
$display->content['new-5'] = $pane;
$display->panels['middle'][1] = 'new-5';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-6';
$pane->panel = 'middle';
$pane->type = 'custom';
@@ -299,7 +298,7 @@ function ctools_plugin_example_default_page_manager_pages() {
item1 is %sc:item1
item2 is %sc:item2
description is %sc:description',
- 'format' => '1',
+ 'format' => 'filtered_html',
'substitute' => 1,
);
$pane->cache = array();
@@ -309,7 +308,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 2;
$display->content['new-6'] = $pane;
$display->panels['middle'][2] = 'new-6';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-7';
$pane->panel = 'right';
$pane->type = 'relcontext_content_type';
@@ -353,7 +352,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 0;
$display->content['new-7'] = $pane;
$display->panels['right'][0] = 'new-7';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-8';
$pane->panel = 'top';
$pane->type = 'custom';
@@ -365,7 +364,7 @@ function ctools_plugin_example_default_page_manager_pages() {
'body' => 'The CTools Plugin Example module (and this panel page) are just here to demonstrate how to build CTools plugins.
',
- 'format' => '2',
+ 'format' => 'full_html',
'substitute' => 1,
);
$pane->cache = array();
@@ -378,12 +377,11 @@ function ctools_plugin_example_default_page_manager_pages() {
$handler->conf['display'] = $display;
$page->default_handlers[$handler->name] = $handler;
- // end of exported panel.
+ // End of exported panel.
$pages['ctools_plugin_example_demo_page'] = $page;
- // begin exported panel
-
- $page = new stdClass;
+ // Begin exported panel.
+ $page = new stdClass();
$page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
$page->api_version = 1;
$page->name = 'ctools_plugin_example_base';
@@ -396,7 +394,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$page->arguments = array();
$page->conf = array();
$page->default_handlers = array();
- $handler = new stdClass;
+ $handler = new stdClass();
$handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
$handler->api_version = 1;
$handler->name = 'page_ctools_plugin_example_base_panel_context';
@@ -405,14 +403,15 @@ function ctools_plugin_example_default_page_manager_pages() {
$handler->handler = 'panel_context';
$handler->weight = 0;
$handler->conf = array(
- 'title' => 'Panel',
- 'no_blocks' => FALSE,
- 'css_id' => '',
- 'css' => '',
- 'contexts' => array(),
- 'relationships' => array(),
+ 'title' => 'Panel',
+ 'no_blocks' => FALSE,
+ 'css_id' => '',
+ 'css' => '',
+ 'contexts' => array(),
+ 'relationships' => array(),
+ 'pipeline' => 'standard',
);
- $display = new panels_display;
+ $display = new panels_display();
$display->layout = 'onecol';
$display->layout_settings = array();
$display->panel_settings = array();
@@ -421,7 +420,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$display->hide_title = FALSE;
$display->content = array();
$display->panels = array();
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-1';
$pane->panel = 'middle';
$pane->type = 'custom';
@@ -431,7 +430,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->configuration = array(
'title' => 'Use this page with an argument',
'body' => 'This demo page works if you use an argument, like ctools_plugin_example/xxxxx.',
- 'format' => '1',
+ 'format' => 'filtered_html',
'substitute' => NULL,
);
$pane->cache = array();
@@ -443,9 +442,8 @@ function ctools_plugin_example_default_page_manager_pages() {
$display->panels['middle'][0] = 'new-1';
$handler->conf['display'] = $display;
$page->default_handlers[$handler->name] = $handler;
- // end exported panel.
-
+ // End exported panel.
$pages['base_page'] = $page;
return $pages;
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/access/arg_length.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/access/arg_length.inc
index 2a09eea..3b5d863 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/access/arg_length.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/access/arg_length.inc
@@ -59,7 +59,8 @@ function ctools_plugin_example_arg_length_ctools_access_check($conf, $context) {
*/
function ctools_plugin_example_arg_length_ctools_access_summary($conf, $context) {
return t('Simpletext argument must be !comp @length characters',
- array('!comp' => $conf['greater_than'] ? 'greater than' : 'less than or equal to',
- '@length' => $conf['arg_length']));
+ array(
+ '!comp' => $conf['greater_than'] ? 'greater than' : 'less than or equal to',
+ '@length' => $conf['arg_length'],
+ ));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/access/example_role.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/access/example_role.inc
index bbe364c..75721e8 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/access/example_role.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/access/example_role.inc
@@ -4,7 +4,7 @@
* @file
* Plugin to provide access control based upon role membership.
* This is directly from the ctools module, but serves as a good
- * example of an access plugin
+ * example of an access plugin.
*/
/**
@@ -73,4 +73,3 @@ function ctools_plugin_example_example_role_ctools_access_summary($conf, $contex
}
return format_plural(count($names), '@identifier must have role "@roles"', '@identifier can be one of "@roles"', array('@roles' => implode(', ', $names), '@identifier' => $context->identifier));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/arguments/simplecontext_arg.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/arguments/simplecontext_arg.inc
index 51c7c60..7fb732c 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/arguments/simplecontext_arg.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/arguments/simplecontext_arg.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Sample plugin to provide an argument handler for a simplecontext.
*
* Given any argument to the page, simplecontext will get it
@@ -18,14 +17,12 @@
*/
$plugin = array(
'title' => t("Simplecontext arg"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'simplecontext',
'description' => t('Creates a "simplecontext" from the arg.'),
'context' => 'simplecontext_arg_context',
- // 'settings form' => 'simplecontext_arg_settings_form',
-
// placeholder_form is used in panels preview, for example, so we can
- // preview without getting the arg from a URL
+ // preview without getting the arg from a URL.
'placeholder form' => array(
'#type' => 'textfield',
'#description' => t('Enter the simplecontext arg'),
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/no_context_content_type.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/no_context_content_type.inc
index 3c02ab8..48ce0f5 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/no_context_content_type.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/no_context_content_type.inc
@@ -5,7 +5,6 @@
* "No context" sample content type. It operates with no context at all. It would
* be basically the same as a 'custom content' block, but it's not even that
* sophisticated.
- *
*/
/**
@@ -33,7 +32,7 @@ $plugin = array(
'icon' => 'icon_example.png',
'category' => array(t('CTools Examples'), -9),
- // this example does not provide 'admin info', which would populate the
+ // This example does not provide 'admin info', which would populate the
// panels builder page preview.
);
@@ -56,7 +55,7 @@ function no_context_content_type_render($subtype, $conf, $args, $context) {
$ctools_help = theme('advanced_help_topic', array('module' => 'ctools', 'topic' => 'plugins', 'type' => 'title'));
$ctools_plugin_example_help = theme('advanced_help_topic', array('module' => 'ctools_plugin_example', 'topic' => 'Chaos-Tools--CTools--Plugin-Examples', 'type' => 'title'));
- // The title actually used in rendering
+ // The title actually used in rendering.
$block->title = check_plain("No-context content type");
$block->content = t("
Welcome to the CTools Plugin Example demonstration content type.
@@ -84,7 +83,6 @@ function no_context_content_type_render($subtype, $conf, $args, $context) {
* Note that if we had not provided an entry for this in hook_content_types,
* this could have had the default name
* ctools_plugin_example_no_context_content_type_edit_form.
- *
*/
function no_context_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/relcontext_content_type.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/relcontext_content_type.inc
index bf54dce..ced6411 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/relcontext_content_type.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/relcontext_content_type.inc
@@ -1,6 +1,5 @@
array(t('CTools Examples'), -9),
'edit form' => 'relcontext_edit_form',
- // this example does not provide 'admin info', which would populate the
+ // This example does not provide 'admin info', which would populate the
// panels builder page preview.
-
);
/**
@@ -60,7 +58,7 @@ function relcontext_content_type_render($subtype, $conf, $args, $context) {
In our case, the configuration form (\$conf) has just one field, 'config_item_1;
and it's configured with:
");
- if (!empty($conf)) {
+ if (!empty($conf)) {
$block->content .= 'displays = array();
$pages['ctools_plugin_example'] = $page;
-
return $pages;
}
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/relationships/relcontext_from_simplecontext.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/relationships/relcontext_from_simplecontext.inc
index 6224621..087d5ec 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/relationships/relcontext_from_simplecontext.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/relationships/relcontext_from_simplecontext.inc
@@ -1,9 +1,7 @@
'Space separated list of exportables you want to view.',
),
'options' => array(
- 'indent' => 'The string to use for indentation when dispalying the exportable export code. Defaults to \'\'.',
+ 'indent' => 'The string to use for indentation when displaying the exportable export code. Defaults to \'\'.',
'no-colour' => 'Remove any colour formatting from export string output. Ideal if you are sending the output of this command to a file.',
'module' => $module_text,
'all' => $all_text,
@@ -140,13 +140,14 @@ function ctools_drush_help($section) {
switch ($section) {
case 'meta:ctools:title':
return dt('CTools commands');
+
case 'meta:entity:summary':
return dt('CTools drush commands.');
}
}
/**
- * Drush callback: export
+ * Drush callback: export.
*/
function ctools_drush_export($module = 'foo') {
$error = FALSE;
@@ -338,7 +339,7 @@ function _ctools_drush_selection_screen(array $tables = array()) {
$build[$table_choice]['count'] = count($multi_select);
$selections[$table_choice] = array();
foreach ($multi_select as $key) {
- $selections[$table_choice][$key] = $key;
+ $selections[$table_choice][$key] = $key;
}
}
}
@@ -445,11 +446,13 @@ function ctools_drush_export_info() {
}
}
}
+
/**
* Drush callback: Acts as the hub for all op commands to keep
* all arg handling etc in one place.
*/
function ctools_drush_export_op_command() {
+ $args = func_get_args();
// Get all info for the current drush command.
$command = drush_get_command();
$op = '';
@@ -457,17 +460,20 @@ function ctools_drush_export_op_command() {
switch ($command['command']) {
case 'ctools-export-view':
$op = 'view';
- break;
+ break;
+
case 'ctools-export-revert':
// Revert is same as deleting. As any objects in the db are deleted.
$op = 'delete';
- break;
+ break;
+
case 'ctools-export-enable':
$op = 'enable';
- break;
+ break;
+
case 'ctools-export-disable':
$op = 'disable';
- break;
+ break;
}
if (!$op) {
@@ -475,7 +481,7 @@ function ctools_drush_export_op_command() {
}
if (drush_get_option('all', FALSE)) {
- $info = _ctools_drush_export_info('', TRUE);
+ $info = _ctools_drush_export_info(array(), TRUE);
$exportable_info = $info['exportables'];
$all = drush_confirm(dt('Are you sure you would like to !op all exportables on the system?',
@@ -490,7 +496,6 @@ function ctools_drush_export_op_command() {
}
}
else {
- $args = func_get_args();
// Table name should always be first arg...
$table_name = array_shift($args);
// Any additional args are assumed to be exportable names.
@@ -512,7 +517,6 @@ function ctools_drush_export_op_command() {
* @param $op
* @param $table_name
* @param $exportables
- *
*/
function ctools_drush_export_op($op = '', $table_name = '', $exportables = NULL) {
$objects = ctools_export_crud_load_multiple($table_name, array_keys($exportables));
@@ -538,7 +542,7 @@ function ctools_drush_export_op($op = '', $table_name = '', $exportables = NULL)
* @param $object_names
*
* @return
- * Array of exportable objects (filtered if necessary, by name etc..) or FALSE if not.
+ * Array of exportable objects (filtered if necessary, by name etc..) or FALSE if not.
*/
function _ctools_drush_export_op_command_logic($op = '', $table_name = NULL, array $object_names = array()) {
if (!$table_name) {
@@ -644,7 +648,7 @@ function _ctools_drush_export_info(array $table_names = array(), $load = FALSE)
return array('exportables' => $exportables, 'schemas' => $schemas);
}
-/*
+/**
* View a single object.
*
* @param $table_name
@@ -662,7 +666,7 @@ function _ctools_drush_export_view($table_name, $object) {
}
}
-/*
+/**
* Revert a single object.
*
* @param $table_name
@@ -681,7 +685,7 @@ function _ctools_drush_export_delete($table_name, $object) {
}
}
-/*
+/**
* Enable a single object.
*
* @param $table_name
@@ -701,7 +705,7 @@ function _ctools_drush_export_enable($table_name, $object) {
}
}
-/*
+/**
* Disable a single object.
*
* @param $table_name
@@ -723,9 +727,9 @@ function _ctools_drush_export_disable($table_name, $object) {
/**
* Filter a nested array of exportables by export module.
*
- * @param $exportables array
+ * @param array $exportables
* Passed by reference. A nested array of exportables, keyed by table name.
- * @param $export_module string
+ * @param string $export_module
* The name of the export module providing the exportable.
*/
function _ctools_drush_export_module_filter($exportables, $export_module) {
@@ -778,7 +782,7 @@ function _ctools_drush_object_is_disabled($object) {
/**
* Determine if an object is enabled.
*
- * @see _ctools_drush_object_is_disabled.
+ * @see _ctools_drush_object_is_disabled()
*/
function _ctools_drush_object_is_enabled($object) {
return (empty($object->disabled)) ? TRUE : FALSE;
@@ -835,7 +839,7 @@ function _ctools_drush_object_is_not_code_only($object) {
* Array of exportables to count.
*
* @return
- * Array of count data containing the following:
+ * Array of count data containing the following:
* 'total' - A total count of all exportables.
* 'exportables' - An array of exportable counts per table.
*/
@@ -867,26 +871,32 @@ function _ctools_drush_filter_exportables($exportables, $filter) {
// Show enabled exportables only.
case 'enabled':
$eval = '_ctools_drush_object_is_disabled';
- break;
+ break;
+
// Show disabled exportables only.
case 'disabled':
$eval = '_ctools_drush_object_is_enabled';
- break;
+ break;
+
// Show overridden exportables only.
case 'overridden':
$eval = '_ctools_drush_object_is_not_overridden';
- break;
+ break;
+
// Show database only exportables.
case 'database':
$eval = '_ctools_drush_object_is_not_db_only';
- break;
+ break;
+
// Show code only exportables.
case 'code':
$eval = '_ctools_drush_object_is_not_code_only';
- break;
+ break;
+
// Do nothing.
case 'all':
break;
+
default:
drush_log(dt('Invalid filter option. Available options are: enabled, disabled, overridden, database, and code.'), 'error');
return;
@@ -983,33 +993,42 @@ class shellColours {
'light_gray' => '47',
);
+ /**
+ * shellColours constructor.
+ */
private function __construct() {}
- // Returns coloured string
+ /**
+ * Returns coloured string.
+ */
public static function getColouredOutput($string, $foreground_colour = NULL, $background_colour = NULL) {
$coloured_string = "";
- // Check if given foreground colour found
+ // Check if given foreground colour found.
if ($foreground_colour) {
$coloured_string .= "\033[" . self::$foreground_colours[$foreground_colour] . "m";
}
- // Check if given background colour found
+ // Check if given background colour found.
if ($background_colour) {
$coloured_string .= "\033[" . self::$background_colours[$background_colour] . "m";
}
- // Add string and end colouring
- $coloured_string .= $string . "\033[0m";
+ // Add string and end colouring.
+ $coloured_string .= $string . "\033[0m";
return $coloured_string;
}
- // Returns all foreground colour names
+ /**
+ * Returns all foreground colour names.
+ */
public static function getForegroundColours() {
return array_keys(self::$foreground_colours);
}
- // Returns all background colour names
+ /**
+ * Returns all background colour names.
+ */
public static function getBackgroundColours() {
return array_keys(self::$background_colours);
}
diff --git a/sites/all/modules/contrib/dev/ctools/help/export.html b/sites/all/modules/contrib/dev/ctools/help/export.html
index ce24cad..573c98a 100644
--- a/sites/all/modules/contrib/dev/ctools/help/export.html
+++ b/sites/all/modules/contrib/dev/ctools/help/export.html
@@ -154,7 +154,7 @@ function mymodule_schema() {
Bulk export callback to provide a list of exportable objects to be chosen for bulk exporting. Defaults to $module . '_' . $table . '_list' if the function exists. If it is not, a default listing function will be provided that will make a best effort to list the titles. See ctools_export_default_list().
to hook code callback
-Function used to generate an export for the bulk export process. This is only necessary if the export is more complicated than simply listing the fields. Defaults to $module . '_' . $table . '_to_hook_code'.
+Function used to generate an export for the bulk export process. This is only necessary if the export is more complicated than simply listing the fields. Defaults to $module . '_' . $table . '_to_hook_code'.
boolean
Explicitly indicate if a table field contains a boolean or not. The Schema API does not model the
diff --git a/sites/all/modules/contrib/dev/ctools/help/modal.html b/sites/all/modules/contrib/dev/ctools/help/modal.html
index ea823a0..761fd2e 100644
--- a/sites/all/modules/contrib/dev/ctools/help/modal.html
+++ b/sites/all/modules/contrib/dev/ctools/help/modal.html
@@ -82,7 +82,7 @@ function ctools_modal_text_button($text, $dest, $alt, $class = '') {
modalSize: an array of data to control the sizing of the modal. It can contain:
If 'cache' is TRUE, then this value specifies the cache table where the cached plugin information will be stored.
classes
Defaults to: array()
-An array of class identifiers(i.e. plugin array keys) which a plugin of this type uses to provide classes to the CTools autoloader. For example, if classes is set to array('class'), then CTools will search each $plugin['class'] for a class to autoload. Depending of the plugin structure, a class identifier may be either:
+An array of class identifiers(i.e. plugin array keys) which a plugin of this type uses to provide classes to the CTools autoloader. For example, if classes is set to array('class'), then CTools will search each $plugin['class'] for a class to autoload. Depending of the plugin structure, a class identifier may be either:
defaults
Defaults to: array()
An array of defaults that should be added to each plugin; this can be used to ensure that every plugin has the basic data necessary. These defaults will not ovewrite data supplied by the plugin. This could also be a function name, in which case the callback will be used to provide defaults. NOTE, however, that the callback-based approach is deprecated as it is redundant with the 'process' callback, and as such will be removed in later versions. Consequently, you should only use the array form for maximum cross-version compatibility.
diff --git a/sites/all/modules/contrib/dev/ctools/includes/action-links.theme.inc b/sites/all/modules/contrib/dev/ctools/includes/action-links.theme.inc
index 3a2398a..f53f59c 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/action-links.theme.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/action-links.theme.inc
@@ -1,4 +1,5 @@
' . $links . '';
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/ajax.inc b/sites/all/modules/contrib/dev/ctools/includes/ajax.inc
index 96f5068..4d72d0c 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/ajax.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/ajax.inc
@@ -1,6 +1,10 @@
'attr',
- 'selector' => $selector,
- 'name' => $name,
- 'value' => $value,
- );
- }
+ 'command' => 'attr',
+ 'selector' => $selector,
+ 'name' => $name,
+ 'value' => $value,
+ );
+}
/**
* Force a client-side redirect.
@@ -154,4 +158,3 @@ function ctools_ajax_render_error($error = '') {
print ajax_render($commands);
exit;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/includes/cache.inc b/sites/all/modules/contrib/dev/ctools/includes/cache.inc
index 3918683..cace800 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/cache.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/cache.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Plugins to handle cache-indirection.
*
* Simple plugin management to allow clients to more tightly control where
@@ -52,7 +51,6 @@
* @param string $mechanism
* A string containing the plugin name, and an optional data element to
* send to the plugin separated by two colons.
- *
* @param string $key
* The key used to identify the cache.
*
@@ -70,7 +68,6 @@ function ctools_cache_get($mechanism, $key) {
* @param string $mechanism
* A string containing the plugin name, and an optional data element to
* send to the plugin separated by two colons.
- *
* @param string $key
* The key used to identify the cache.
*
@@ -88,7 +85,6 @@ function ctools_cache_set($mechanism, $key, $object) {
* @param string $mechanism
* A string containing the plugin name, and an optional data element to
* send to the plugin separated by two colons.
- *
* @param string $key
* The key used to identify the cache.
*/
@@ -108,13 +104,10 @@ function ctools_cache_clear($mechanism, $key) {
* @param string $mechanism
* A string containing the plugin name, and an optional data element to
* send to the plugin separated by two colons.
- *
* @param string $key
* The key used to identify the cache.
- *
* @param string $op
* The operation to call, such as 'break' or 'finalize'.
- *
* @param mixed $object
* The cache data being operated on, in case it is necessary. This is
* optional so no references should be used.
@@ -150,7 +143,7 @@ function ctools_cache_operation($mechanism, $key, $op, $object = NULL) {
*/
function ctools_cache_find_plugin($mechanism) {
if (strpos($mechanism, '::') !== FALSE) {
- // use explode(2) to ensure that the data can contain double
+ // Use explode(2) to ensure that the data can contain double
// colons, just in case.
list($name, $data) = explode('::', $mechanism, 2);
}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/cleanstring.inc b/sites/all/modules/contrib/dev/ctools/includes/cleanstring.inc
index 56b3e36..11ffcef 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/cleanstring.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/cleanstring.inc
@@ -1,5 +1,4 @@
$length) {
- $string = drupal_substr($string, 0, $length + 1); // leave one more character
- if ($last_break = strrpos($string, $separator)) { // space exists AND is not on position 0
+ // Leave one more character.
+ $string = drupal_substr($string, 0, $length + 1);
+ // Space exists AND is not on position 0.
+ if ($last_break = strrpos($string, $separator)) {
$string = substr($string, 0, $last_break);
}
else {
diff --git a/sites/all/modules/contrib/dev/ctools/includes/collapsible.theme.inc b/sites/all/modules/contrib/dev/ctools/includes/collapsible.theme.inc
index f7bbbb3..81df4bc 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/collapsible.theme.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/collapsible.theme.inc
@@ -30,8 +30,8 @@ function ctools_collapsible_theme(&$items) {
* Text to put in the handle/title area of the div.
* @param $content
* Text to put in the content area of the div, this is what will get
- * collapsed
- * @param $collapsed = FALSE
+ * collapsed.
+ * @param $collapsed
* If true, this div will start out collapsed.
*/
function theme_ctools_collapsible($vars) {
@@ -56,8 +56,8 @@ function theme_ctools_collapsible($vars) {
* Text to put in the handle/title area of the div.
* @param $content
* Text to put in the content area of the div, this is what will get
- * collapsed
- * @param $collapsed = FALSE
+ * collapsed.
+ * @param $collapsed
* If true, this div will start out collapsed.
*/
function theme_ctools_collapsible_remembered($vars) {
@@ -76,4 +76,3 @@ function theme_ctools_collapsible_remembered($vars) {
return $output;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/includes/content.inc b/sites/all/modules/contrib/dev/ctools/includes/content.inc
index b4660b4..49c3565 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/content.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/content.inc
@@ -86,7 +86,7 @@ function ctools_content_process(&$plugin, $info) {
/**
* Fetch metadata on a specific content_type plugin.
*
- * @param $content type
+ * @param mixed $content
* Name of a panel content type.
*
* @return
@@ -146,7 +146,7 @@ function ctools_content_get_subtypes($type) {
if (is_array($function)) {
$subtypes = $function;
}
- else if (function_exists($function)) {
+ elseif (function_exists($function)) {
// Cast to array to prevent errors from non-array returns.
$subtypes = (array) $function($plugin);
}
@@ -155,6 +155,11 @@ function ctools_content_get_subtypes($type) {
// Walk through the subtypes and ensure minimal settings are
// retained.
foreach ($subtypes as $id => $subtype) {
+ // Ensure that the 'subtype_id' value exists.
+ if (!isset($subtype['subtype_id'])) {
+ $subtypes[$id]['subtype_id'] = $id;
+ }
+
// Use exact name since this is a modify by reference.
ctools_content_prepare_subtype($subtypes[$id], $plugin);
}
@@ -202,6 +207,13 @@ function ctools_content_get_subtype($type, $subtype_id) {
}
if ($subtype) {
+ // Ensure that the 'subtype_id' value exists. This is also done in
+ // ctools_content_get_subtypes(), but it wouldn't be called if the plugin
+ // provides the subtype through its own function.
+ if (!isset($subtype['subtype_id'])) {
+ $subtype['subtype_id'] = $subtype_id;
+ }
+
ctools_content_prepare_subtype($subtype, $plugin);
}
return $subtype;
@@ -217,6 +229,7 @@ function ctools_content_prepare_subtype(&$subtype, $plugin) {
}
}
+ // Trigger hook_ctools_content_subtype_alter().
drupal_alter('ctools_content_subtype', $subtype, $plugin);
}
@@ -241,8 +254,8 @@ function ctools_content_prepare_subtype(&$subtype, $plugin) {
* Any incoming content, if this display is a wrapper.
*
* @return
- * The content as rendered by the plugin. This content should be an array
- * with the following possible keys:
+ * The content as rendered by the plugin, or NULL.
+ * This content should be an object with the following possible properties:
* - title: The safe to render title of the content.
* - title_heading: The title heading.
* - content: The safe to render HTML content.
@@ -294,7 +307,7 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
$content->subtype = $subtype;
}
- // Override the title if configured to
+ // Override the title if configured to.
if (!empty($conf['override_title'])) {
// Give previous title as an available substitution here.
$keywords['%title'] = empty($content->title) ? '' : $content->title;
@@ -304,12 +317,12 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
}
if (!empty($content->title)) {
- // Perform substitutions
+ // Perform substitutions.
if (!empty($keywords) || !empty($context)) {
$content->title = ctools_context_keyword_substitute($content->title, $keywords, $context);
}
- // Sterilize the title
+ // Sterilize the title.
$content->title = filter_xss_admin($content->title);
// If a link is specified, populate.
@@ -320,7 +333,7 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
else {
$url = $content->title_link;
}
- // set defaults so we don't bring up notices
+ // Set defaults so we don't bring up notices.
$url += array('href' => '', 'attributes' => array(), 'query' => array(), 'fragment' => '', 'absolute' => NULL, 'html' => TRUE);
$content->title = l($content->title, $url['href'], $url);
}
@@ -341,7 +354,16 @@ function ctools_content_editable($type, $subtype, $conf) {
return FALSE;
}
- if ($function = ctools_plugin_get_function($subtype, 'check editable')) {
+ $function = FALSE;
+
+ if (!empty($subtype['check editable'])) {
+ $function = ctools_plugin_get_function($subtype, 'check editable');
+ }
+ elseif (!empty($type['check editable'])) {
+ $function = ctools_plugin_get_function($type, 'check editable');
+ }
+
+ if ($function) {
return $function($type, $subtype, $conf);
}
@@ -364,7 +386,7 @@ function ctools_content_admin_title($type, $subtype, $conf, $context = NULL) {
if (is_array($type)) {
$plugin = $type;
}
- else if (is_string($type)) {
+ elseif (is_string($type)) {
$plugin = ctools_get_content_type($type);
}
else {
@@ -382,10 +404,10 @@ function ctools_content_admin_title($type, $subtype, $conf, $context = NULL) {
return $function($subtype, $conf, $pane_context);
}
- else if (isset($plugin['admin title'])) {
+ elseif (isset($plugin['admin title'])) {
return $plugin['admin title'];
}
- else if (isset($plugin['title'])) {
+ elseif (isset($plugin['title'])) {
return $plugin['title'];
}
}
@@ -420,7 +442,7 @@ function ctools_content_get_defaults($plugin, $subtype) {
if (isset($plugin['defaults'])) {
$defaults = $plugin['defaults'];
}
- else if (isset($subtype['defaults'])) {
+ elseif (isset($subtype['defaults'])) {
$defaults = $subtype['defaults'];
}
if (isset($defaults)) {
@@ -429,7 +451,7 @@ function ctools_content_get_defaults($plugin, $subtype) {
return $return;
}
}
- else if (is_array($defaults)) {
+ elseif (is_array($defaults)) {
return $defaults;
}
}
@@ -463,7 +485,7 @@ function ctools_content_admin_info($type, $subtype, $conf, $context = NULL) {
if (empty($output) || !is_object($output)) {
$output = new stdClass();
- // replace the _ with " " for a better output
+ // Replace the _ with " " for a better output.
$subtype = check_plain(str_replace("_", " ", $subtype));
$output->title = $subtype;
$output->content = t('No info available.');
@@ -472,7 +494,7 @@ function ctools_content_admin_info($type, $subtype, $conf, $context = NULL) {
}
/**
- * Add the default FAPI elements to the content type configuration form
+ * Add the default FAPI elements to the content type configuration form.
*/
function ctools_content_configure_form_defaults($form, &$form_state) {
$plugin = $form_state['plugin'];
@@ -589,7 +611,7 @@ function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype_na
if (!empty($subtype['add form'])) {
_ctools_content_create_form_info($form_info, $subtype['add form'], $subtype, $subtype, $op);
}
- else if (!empty($plugin['add form'])) {
+ elseif (!empty($plugin['add form'])) {
_ctools_content_create_form_info($form_info, $plugin['add form'], $plugin, $subtype, $op);
}
}
@@ -599,7 +621,7 @@ function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype_na
if (!empty($subtype['edit form'])) {
_ctools_content_create_form_info($form_info, $subtype['edit form'], $subtype, $subtype, $op);
}
- else if (!empty($plugin['edit form'])) {
+ elseif (!empty($plugin['edit form'])) {
_ctools_content_create_form_info($form_info, $plugin['edit form'], $plugin, $subtype, $op);
}
}
@@ -618,7 +640,7 @@ function _ctools_content_create_form_info(&$form_info, $info, $plugin, $subtype,
if (empty($subtype['title'])) {
$title = t('Configure');
}
- else if ($op == 'add') {
+ elseif ($op == 'add') {
$title = t('Configure new !subtype_title', array('!subtype_title' => $subtype['title']));
}
else {
@@ -633,7 +655,7 @@ function _ctools_content_create_form_info(&$form_info, $info, $plugin, $subtype,
),
);
}
- else if (is_array($info)) {
+ elseif (is_array($info)) {
$form_info['order'] = array();
$form_info['forms'] = array();
$count = 0;
@@ -684,7 +706,7 @@ function ctools_content_get_available_types($contexts = NULL, $has_content = FAL
foreach ($plugins as $id => $plugin) {
foreach (ctools_content_get_subtypes($plugin) as $subtype_id => $subtype) {
- // exclude items that require content if we're saying we don't
+ // Exclude items that require content if we're saying we don't
// provide it.
if (!empty($subtype['requires content']) && !$has_content) {
continue;
@@ -724,7 +746,6 @@ function ctools_content_get_available_types($contexts = NULL, $has_content = FAL
* Get an array of all content types that can be fed into the
* display editor for the add content list, regardless of
* availability.
- *
*/
function ctools_content_get_all_types() {
$plugins = ctools_get_content_types();
diff --git a/sites/all/modules/contrib/dev/ctools/includes/content.menu.inc b/sites/all/modules/contrib/dev/ctools/includes/content.menu.inc
index ba32cb5..64d44b0 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/content.menu.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/content.menu.inc
@@ -23,12 +23,13 @@ function ctools_content_menu(&$items) {
/**
* Helper function for autocompletion of entity titles.
*/
-function ctools_content_autocomplete_entity($type, $string = '') {
+function ctools_content_autocomplete_entity($entity_type, $string = '') {
if ($string != '') {
- global $user;
- $entity_info = entity_get_info($type);
- if ($type == 'node') {
- $entity_info['entity keys']['bundle field'] = 'type';
+ $entity_info = entity_get_info($entity_type);
+
+ if (!module_exists('entity')) {
+ module_load_include('inc', 'ctools', 'includes/entity-access');
+ _ctools_entity_access($entity_info, $entity_type);
}
// We must query all ids, because if every one of the 10 don't have access
@@ -42,84 +43,77 @@ function ctools_content_autocomplete_entity($type, $string = '') {
// If an ID match was found, use that ID rather than the whole string.
if ($match) {
$entity_id = $preg_matches[1];
- $entity = entity_load($type, array($entity_id));
-
- // Format results in an array so later we could add attributes to the
- // autocomplete text that is returned.
- $results = array($entity_id => array(
- 'label' => $entity[$entity_id]->$entity_info['entity keys']['label'],
- ));
+ $results = _ctools_getReferencableEntities($entity_type, $entity_info, $entity_id, '=', 1);
}
else {
- $results = _ctools_getReferencableEntities($type, $entity_info, $string, 'LIKE', 10);
+ // We cannot find results if the entity doesn't have a label to search.
+ if (!isset($entity_info['entity keys']['label'])) {
+ drupal_json_output(array("[id: NULL]" => '' . t('Entity Type !entity_type does not support autocomplete search.', array('!entity_type' => $entity_type)) . ''));
+ return;
+ }
+ $results = _ctools_getReferencableEntities($entity_type, $entity_info, $string, 'LIKE', 10);
}
- foreach($results as $entity_id => $result) {
- if (!$entity_info['entity keys']['label']) {
- $matches["[id: $entity_id]"] = '' . $entity_id . '';
- }
- else {
- $matches[$result['label'] . " [id: $entity_id]"] = '' . check_plain($result['label']) . '';
- $matches[$result['label'] . " [id: $entity_id]"] .= isset($result['bundle field']) ? ' (' . check_plain($result['bundle field']) . ')' : '';
- }
+ foreach ($results as $entity_id => $result) {
+ $matches[$result['label'] . " [id: $entity_id]"] = '' . check_plain($result['label']) . '';
+ $matches[$result['label'] . " [id: $entity_id]"] .= isset($result['bundle']) ? ' (' . check_plain($result['bundle']) . ')' : '';
}
drupal_json_output($matches);
}
}
-/*
- * Use well known/tested entity reference code to build our search query
- * From EntityReference_SelectionHandler_Generic class
+/**
+ * Use EntityReference_SelectionHandler_Generic class to build our search query.
*/
function _ctools_buildQuery($entity_type, $entity_info, $match = NULL, $match_operator = 'CONTAINS') {
$base_table = $entity_info['base table'];
- $query = db_select($base_table)
- ->fields($base_table, array($entity_info['entity keys']['id']));
+ $label_key = $entity_info['entity keys']['label'];
+ $query = db_select($base_table)
+ ->fields($base_table, array($entity_info['entity keys']['id']));
- if (isset($match)) {
- if (isset($entity_info['entity keys']['label'])) {
- $query->condition($base_table .'.'. $entity_info['entity keys']['label'], '%' . $match . '%' , $match_operator);
- }
- }
-
- // Add a label to the query, if the label exists
- if (isset($entity_info['entity keys']['label'])) {
- $query->fields($base_table, array($entity_info['entity keys']['label']));
- }
-
- // Add bundle field to the query, if it exists.
- if (isset($entity_info['entity keys']['bundle field'])) {
- $query->fields($base_table, array($entity_info['entity keys']['bundle field']));
- }
-
- // Add a generic entity access tag to the query.
- $query->addTag('ctools');
-
- if($entity_type == 'comment') {
- // Adding the 'comment_access' tag is sadly insufficient for comments: core
- // requires us to also know about the concept of 'published' and
- // 'unpublished'.
- if (!user_access('administer comments')) {
- $query->condition('comment.status', COMMENT_PUBLISHED);
- }
- // Join to a node if the user does not have node access bypass permissions
- // to obey node published permissions
- if (!user_access('bypass node access') && !count(module_implements('node_grants'))) {
- $node_alias = $query->innerJoin('node', 'n', '%alias.nid = comment.nid');
- $query->condition($node_alias . '.status', NODE_PUBLISHED);
- }
- $query->addTag('node_access');
+ if (isset($match)) {
+ if (isset($label_key)) {
+ $query->condition($base_table . '.' . $label_key, '%' . $match . '%', $match_operator);
}
+ // This should never happen, but double check just in case.
else {
- $query->addTag($entity_type . '_access');
+ return array();
+ }
+ }
+ // Add a generic entity access tag to the query.
+ $query->addTag('ctools');
+
+ // We have to perform two checks. First check is a query alter (with tags)
+ // in an attempt to only return results that have access. However, this is
+ // not full-proof since entities many not implement hook_access query tag.
+ // This is why we have a second check after entity load, before we display
+ // the label of an entity.
+ if ($entity_type == 'comment') {
+ // Adding the 'comment_access' tag is sadly insufficient for comments: core
+ // requires us to also know about the concept of 'published' and
+ // 'unpublished'.
+ if (!user_access('administer comments')) {
+ $query->condition('comment.status', COMMENT_PUBLISHED);
}
- // Add the sort option.
- if(isset($entity_info['entity keys']['label'])) {
- $query->orderBy($base_table .'.'. $entity_info['entity keys']['label'], 'ASC');
+ // Join to a node if the user does not have node access bypass permissions
+ // to obey node published permissions.
+ if (!user_access('bypass node access')) {
+ $node_alias = $query->innerJoin('node', 'n', '%alias.nid = comment.nid');
+ $query->condition($node_alias . '.status', NODE_PUBLISHED);
}
+ $query->addTag('node_access');
+ }
+ else {
+ $query->addTag($entity_type . '_access');
+ }
- return $query;
+ // Add the sort option.
+ if (isset($label_key)) {
+ $query->orderBy($base_table . '.' . $label_key, 'ASC');
+ }
+
+ return $query;
}
/**
@@ -127,23 +121,58 @@ function _ctools_buildQuery($entity_type, $entity_info, $match = NULL, $match_op
* Entity Reference module.
*/
function _ctools_getReferencableEntities($entity_type, $entity_info, $match = NULL, $match_operator = 'LIKE', $limit = 0) {
+ global $user;
+ $account = $user;
$options = array();
-
- $query = _ctools_buildQuery($entity_type, $entity_info, $match, $match_operator);
- if ($limit > 0) {
- $query->range(0, $limit);
- }
-
- $results = $query->execute();
-
- if (!empty($results)) {
- foreach ($results as $record) {
- $options[$record->{$entity_info['entity keys']['id']}] = array(
- 'label' => isset($entity_info['entity keys']['label']) ? check_plain($record->{$entity_info['entity keys']['label']}) : $record->{$entity_info['entity keys']['id']},
- 'bundle field' => isset($entity_info['entity keys']['bundle field']) ? check_plain($record->{$entity_info['entity keys']['bundle field']}) : '',
- );
+ // We're an entity ID, return the id.
+ if (is_numeric($match) && $match_operator == '=') {
+ if ($entity = array_shift(entity_load($entity_type, array($match)))) {
+ if (isset($entity_info['access callback']) && function_exists($entity_info['access callback'])) {
+ if ($entity_info['access callback']('view', $entity, $account, $entity_type)) {
+ $label = entity_label($entity_type, $entity);
+ return array(
+ $match => array(
+ 'label' => !empty($label) ? $label : $entity->{$entity_info['entity keys']['id']},
+ 'bundle' => !empty($entity_info['entity keys']['bundle']) ? check_plain($entity->{$entity_info['entity keys']['bundle']}) : NULL,
+ ),
+ );
+ }
+ }
}
+ // If you don't have access, or an access callback or a valid entity, just
+ // Return back the Entity ID.
+ return array(
+ $match => array(
+ 'label' => $match,
+ 'bundle' => NULL,
+ ),
+ );
}
- return $options;
-}
\ No newline at end of file
+ // We have matches, build a query to fetch the result.
+ if ($query = _ctools_buildQuery($entity_type, $entity_info, $match, $match_operator)) {
+ if ($limit > 0) {
+ $query->range(0, $limit);
+ }
+
+ $results = $query->execute();
+
+ if (!empty($results)) {
+ foreach ($results as $record) {
+ $entities = entity_load($entity_type, array($record->{$entity_info['entity keys']['id']}));
+ $entity = array_shift($entities);
+ if (isset($entity_info['access callback']) && function_exists($entity_info['access callback'])) {
+ if ($entity_info['access callback']('view', $entity, $account, $entity_type)) {
+ $label = entity_label($entity_type, $entity);
+ $options[$record->{$entity_info['entity keys']['id']}] = array(
+ 'label' => !empty($label) ? $label : $entity->{$entity_info['entity keys']['id']},
+ 'bundle' => !empty($entity_info['entity keys']['bundle']) ? check_plain($entity->{$entity_info['entity keys']['bundle']}) : NULL,
+ );
+ }
+ }
+ }
+ }
+ return $options;
+ }
+ return array();
+}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/content.plugin-type.inc b/sites/all/modules/contrib/dev/ctools/includes/content.plugin-type.inc
index a0debc3..0364a92 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/content.plugin-type.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/content.plugin-type.inc
@@ -14,4 +14,4 @@ function ctools_content_plugin_type(&$items) {
'path' => drupal_get_path('module', 'ctools') . '/includes',
),
);
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/context-access-admin.inc b/sites/all/modules/contrib/dev/ctools/includes/context-access-admin.inc
index 76643cf..d8c4f3b 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/context-access-admin.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/context-access-admin.inc
@@ -245,10 +245,10 @@ function ctools_access_admin_form_submit($form, &$form_state) {
// --------------------------------------------------------------------------
// AJAX menu entry points.
-
/**
* AJAX callback to add a new access test to the list.
*/
+
function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
ctools_include('ajax');
ctools_include('modal');
@@ -263,7 +263,7 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
ctools_ajax_render_error();
}
- // Separate the fragment into 'module' and 'argument'
+ // Separate the fragment into 'module' and 'argument'.
if (strpos($fragment, '-') === FALSE) {
$module = $fragment;
$argument = NULL;
@@ -279,7 +279,7 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
list($access, $contexts) = $function($argument);
- // Make sure we have the logged in user context
+ // Make sure we have the logged in user context.
if (!isset($contexts['logged-in-user'])) {
$contexts['logged-in-user'] = ctools_access_get_loggedin_context();
}
@@ -306,6 +306,9 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
);
$output = ctools_modal_form_wrapper('ctools_access_ajax_edit_item', $form_state);
+ $access = $form_state['access'];
+ $access['plugins'][$id] = $form_state['test'];
+
if (!isset($output[0])) {
$function = $module . '_ctools_access_set';
if (function_exists($function)) {
@@ -333,7 +336,7 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
ctools_ajax_render_error();
}
- // Separate the fragment into 'module' and 'argument'
+ // Separate the fragment into 'module' and 'argument'.
if (strpos($fragment, '-') === FALSE) {
$module = $fragment;
$argument = NULL;
@@ -353,7 +356,7 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
ctools_ajax_render_error();
}
- // Make sure we have the logged in user context
+ // Make sure we have the logged in user context.
if (!isset($contexts['logged-in-user'])) {
$contexts['logged-in-user'] = ctools_access_get_loggedin_context();
}
@@ -367,12 +370,14 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
'contexts' => $contexts,
'title' => t('Edit criteria'),
'ajax' => TRUE,
- 'ajax' => TRUE,
'modal' => TRUE,
'modal return' => TRUE,
);
$output = ctools_modal_form_wrapper('ctools_access_ajax_edit_item', $form_state);
+ $access = $form_state['access'];
+ $access['plugins'][$id] = $form_state['test'];
+
if (!isset($output[0])) {
$function = $module . '_ctools_access_set';
if (function_exists($function)) {
@@ -452,7 +457,7 @@ function ctools_access_ajax_delete($fragment = NULL, $id = NULL) {
ajax_render_error();
}
- // Separate the fragment into 'module' and 'argument'
+ // Separate the fragment into 'module' and 'argument'.
if (strpos($fragment, '-') === FALSE) {
$module = $fragment;
$argument = NULL;
@@ -472,7 +477,7 @@ function ctools_access_ajax_delete($fragment = NULL, $id = NULL) {
unset($access['plugins'][$id]);
}
- // re-cache
+ // re-cache.
$function = $module . '_ctools_access_set';
if (function_exists($function)) {
$function($argument, $access);
diff --git a/sites/all/modules/contrib/dev/ctools/includes/context-admin.inc b/sites/all/modules/contrib/dev/ctools/includes/context-admin.inc
index 2d8c8f9..533c89f 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/context-admin.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/context-admin.inc
@@ -376,11 +376,11 @@ function ctools_context_ajax_item_add($mechanism = NULL, $type = NULL, $cache_ke
'path' => "ctools/context/ajax/add/$mechanism/$type/$cache_key/$name/%step",
'show cancel' => TRUE,
'default form' => 'ctools_edit_context_form_defaults',
- 'auto caching' => TRUE,
+ 'auto cache' => TRUE,
'cache mechanism' => $mechanism,
'cache key' => $cache_key,
// This is stating what the cache will be referred to in $form_state
- 'cache storage' => 'object',
+ 'cache location' => 'object',
);
if ($type == 'requiredcontext') {
@@ -395,7 +395,7 @@ function ctools_context_ajax_item_add($mechanism = NULL, $type = NULL, $cache_ke
if (!empty($form_state['cancel'])) {
$output = array(ctools_modal_command_dismiss());
}
- else if (!empty($form_state['complete'])) {
+ elseif (!empty($form_state['complete'])) {
// Successful submit -- move temporary data to location.
// Create a reference to the place our context lives. Since this is fairly
@@ -561,11 +561,11 @@ function ctools_context_ajax_item_edit($mechanism = NULL, $type = NULL, $cache_k
'path' => "ctools/context/ajax/configure/$mechanism/$type/$cache_key/$position/%step",
'show cancel' => TRUE,
'default form' => 'ctools_edit_context_form_defaults',
- 'auto caching' => TRUE,
+ 'auto cache' => TRUE,
'cache mechanism' => $mechanism,
'cache key' => $cache_key,
// This is stating what the cache will be referred to in $form_state
- 'cache storage' => 'object',
+ 'cache location' => 'object',
);
if ($type == 'requiredcontext') {
@@ -580,7 +580,7 @@ function ctools_context_ajax_item_edit($mechanism = NULL, $type = NULL, $cache_k
if (!empty($form_state['cancel'])) {
$output = array(ctools_modal_command_dismiss());
}
- else if (!empty($form_state['complete'])) {
+ elseif (!empty($form_state['complete'])) {
// successful submit
$ref[$position] = $conf;
if (isset($object->temporary)) {
@@ -657,7 +657,7 @@ function ctools_context_get_defaults($plugin_definition, $object, $type) {
if (isset($plugin_definition['defaults'])) {
$defaults = $plugin_definition['defaults'];
}
- else if (isset($subtype['defaults'])) {
+ elseif (isset($subtype['defaults'])) {
$defaults = $subtype['defaults'];
}
@@ -667,7 +667,7 @@ function ctools_context_get_defaults($plugin_definition, $object, $type) {
$conf += $settings;
}
}
- else if (is_array($defaults)) {
+ elseif (is_array($defaults)) {
$conf += $defaults;
}
}
@@ -736,6 +736,15 @@ function ctools_edit_context_form_defaults($form, &$form_state) {
'#default_value' => $conf['keyword'],
);
+ if ($type_info['key'] == 'requiredcontexts') {
+ $form['optional'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Context is optional'),
+ '#default_value' => !empty($form_state['conf']['optional']),
+ '#description' => t('This context need not be present for the component to function.'),
+ );
+ }
+
$form['#submit'][] = 'ctools_edit_context_form_defaults_submit';
return $form;
@@ -752,6 +761,9 @@ function ctools_edit_context_form_defaults_submit(&$form, &$form_state) {
$form_state['conf']['default'] = $form_state['values']['default'];
$form_state['conf']['title'] = $form_state['values']['title'];
}
+ if ($form_state['type info']['key'] == 'requiredcontexts') {
+ $form_state['conf']['optional'] = $form_state['values']['optional'];
+ }
$form_state['conf']['identifier'] = $form_state['values']['identifier'];
$form_state['conf']['keyword'] = $form_state['values']['keyword'];
diff --git a/sites/all/modules/contrib/dev/ctools/includes/context-task-handler.inc b/sites/all/modules/contrib/dev/ctools/includes/context-task-handler.inc
index 21ceea5..ed4acad 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/context-task-handler.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/context-task-handler.inc
@@ -4,9 +4,9 @@
* @file
* Support for creating 'context' type task handlers.
*
- * Context task handlers expect the task to provide 0 or more contexts. The
- * task handler should use those contexts as selection rules, as well as
- * rendering with them.
+ * Context task handlers expect the task to provide 0 or more contexts. The task
+ * handler should use those contexts as selection rules, as well as rendering
+ * with them.
*
* The functions and forms in this file should be common to every context type
* task handler made.
@@ -31,6 +31,7 @@
* If TRUE then this renderer owns the page and can use theme('page')
* for no blocks; if false, output is returned regardless of any no
* blocks settings.
+ *
* @return
* Either the output or NULL if there was output, FALSE if no handler
* accepted the task. If $page is FALSE then the $info block is returned instead.
@@ -84,7 +85,7 @@ function ctools_context_handler_get_render_handler($task, $subtask, $handlers, $
*/
function ctools_context_handler_default_test($handler, $base_contexts, $args) {
ctools_include('context');
- // Add my contexts
+ // Add my contexts.
$contexts = ctools_context_handler_get_handler_contexts($base_contexts, $handler);
// Test.
@@ -128,7 +129,7 @@ function ctools_context_handler_render_handler($task, $subtask, $handler, $conte
'contexts' => $contexts,
'task' => $task,
'subtask' => $subtask,
- 'handler' => $handler
+ 'handler' => $handler,
);
drupal_alter('ctools_render', $info, $page, $context);
@@ -141,12 +142,15 @@ function ctools_context_handler_render_handler($task, $subtask, $handler, $conte
switch ($info['response code']) {
case 403:
return MENU_ACCESS_DENIED;
+
case 404:
return MENU_NOT_FOUND;
+
case 410:
drupal_add_http_header('Status', '410 Gone');
drupal_exit();
break;
+
case 301:
case 302:
case 303:
@@ -162,7 +166,7 @@ function ctools_context_handler_render_handler($task, $subtask, $handler, $conte
'fragment' => $info['fragment'],
);
drupal_goto($info['destination'], $options, $info['response code']);
- // @todo -- should other response codes be supported here?
+ // @todo -- should other response codes be supported here?
}
}
@@ -222,7 +226,7 @@ function ctools_context_handler_render_handler($task, $subtask, $handler, $conte
}
/**
- * Default function to provide contextual link for a task as defined by the handler.
+ * Provides contextual link for a task as defined by the handler.
*
* This provides a simple link to th main content operation and is suitable
* for most normal handlers. Setting 'contextual link' to a function overrides
@@ -241,7 +245,7 @@ function ctools_task_handler_default_contextual_link($handler, $plugin, $context
if (is_array($plugin['tab operation'])) {
$trail = $plugin['tab operation'];
}
- else if (function_exists($plugin['tab operation'])) {
+ elseif (function_exists($plugin['tab operation'])) {
$trail = $plugin['tab operation']($handler, $contexts, $args);
}
}
@@ -251,7 +255,8 @@ function ctools_task_handler_default_contextual_link($handler, $plugin, $context
'href' => $path,
'title' => $title,
'query' => drupal_get_destination(),
- ));
+ ),
+ );
return $links;
}
@@ -259,17 +264,22 @@ function ctools_task_handler_default_contextual_link($handler, $plugin, $context
/**
* Called to execute actions that should happen before a handler is rendered.
*/
-function ctools_context_handler_pre_render($handler, $contexts, $args) { }
+function ctools_context_handler_pre_render($handler, $contexts, $args) {
+ foreach (module_implements('ctools_context_handler_pre_render') as $module) {
+ $function = $module . '_ctools_context_handler_pre_render';
+ $function($handler, $contexts, $args);
+ }
+}
/**
* Compare arguments to contexts for selection purposes.
*
- * @param $handler
+ * @param object $handler
* The handler in question.
- * @param $contexts
+ * @param object $contexts
* The context objects provided by the task.
*
- * @return
+ * @return bool
* TRUE if these contexts match the selection rules. NULL or FALSE
* otherwise.
*/
@@ -288,12 +298,15 @@ function ctools_context_handler_select($handler, $contexts) {
* These summary strings are used to communicate to the user what
* arguments the task handlers are selecting.
*
- * @param $task
+ * @param object $task
* The loaded task plugin.
- * @param $subtask
+ * @param object $subtask
* The subtask id.
- * @param $handler
+ * @param object $handler
* The handler to be checked.
+ *
+ * @return array
+ * Returns array of summary strings for arguments selected by task handlers.
*/
function ctools_context_handler_summary($task, $subtask, $handler) {
if (empty($handler->conf['access']['plugins'])) {
@@ -320,7 +333,6 @@ function ctools_context_handler_summary($task, $subtask, $handler) {
// the task handler, for example) but sometimes we need them separately
// (when a task has contexts loaded and is trying out the task handlers,
// for example). Therefore there are two paths we can take to getting contexts.
-
/**
* Load the contexts for a task, using arguments.
*
@@ -368,7 +380,7 @@ function ctools_context_handler_get_all_contexts($task, $subtask, $handler) {
* expects things in a certain, kind of clunky format.
*/
function ctools_context_handler_get_handler_object($handler) {
- $object = new stdClass;
+ $object = new stdClass();
$object->name = $handler->name;
$object->contexts = isset($handler->conf['contexts']) ? $handler->conf['contexts'] : array();
$object->relationships = isset($handler->conf['relationships']) ? $handler->conf['relationships'] : array();
@@ -382,7 +394,7 @@ function ctools_context_handler_get_handler_object($handler) {
* arguments from the task.
*/
function ctools_context_handler_get_task_object($task, $subtask, $handler) {
- $object = new stdClass;
+ $object = new stdClass();
$object->name = !empty($handler->name) ? $handler->name : 'temp';
$object->base_contexts = ctools_context_handler_get_base_contexts($task, $subtask, TRUE);
$object->arguments = ctools_context_handler_get_task_arguments($task, $subtask);
@@ -456,7 +468,7 @@ function ctools_context_handler_edit_criteria($form, &$form_state) {
ctools_modal_add_plugin_js(ctools_get_access_plugins());
ctools_include('context-access-admin');
$form_state['module'] = (isset($form_state['module'])) ? $form_state['module'] : 'page_manager_task_handler';
- // Encode a bunch of info into the argument so we can get our cache later
+ // Encode a bunch of info into the argument so we can get our cache later.
$form_state['callback argument'] = $form_state['task_name'] . '*' . $form_state['handler']->name;
$form_state['access'] = $form_state['handler']->conf['access'];
$form_state['no buttons'] = TRUE;
@@ -472,7 +484,7 @@ function ctools_context_handler_edit_criteria($form, &$form_state) {
}
/**
- * Submit handler for rules selection
+ * Submit handler for rules selection.
*/
function ctools_context_handler_edit_criteria_submit(&$form, &$form_state) {
$form_state['handler']->conf['access']['logic'] = $form_state['values']['logic'];
@@ -537,4 +549,3 @@ function ctools_context_handler_edit_context_submit(&$form, &$form_state) {
unset($form_state['page']->context_cache[$cache_name]);
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/includes/context.inc b/sites/all/modules/contrib/dev/ctools/includes/context.inc
index 6628b5f..0fc6208 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/context.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/context.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Contains code related to the ctools system of 'context'.
*
* Context, originally from Panels, is a method of packaging objects into
@@ -28,28 +27,104 @@
* of the context is important.
*/
class ctools_context {
- var $type = NULL;
- var $data = NULL;
- // The title of this object.
- var $title = '';
- // The title of the page if this object exists
- var $page_title = '';
- // The identifier (in the UI) of this object
- var $identifier = '';
- var $argument = NULL;
- var $keyword = '';
- var $original_argument = NULL;
- var $restrictions = array();
- var $empty = FALSE;
+ /**
+ * @var string|array
+ * A string naming this specific context type. The values 'any' and 'none'
+ * are special:
+ * - 'any': used in is_type() to match any other type.
+ * - 'none': used to signal the type is not defined.
+ */
+ public $type;
- function ctools_context($type = 'none', $data = NULL) {
- $this->type = $type;
- $this->data = $data;
+ /**
+ * @var mixed
+ * The data payload for this context object.
+ */
+ public $data;
+
+ /**
+ * @var string
+ * The title of this object.
+ */
+ public $title;
+
+ /**
+ * @var string
+ * The title of the page if this object exists
+ */
+ public $page_title;
+
+ /**
+ * @var string
+ * The identifier (in the UI) of this object.
+ */
+ public $identifier;
+
+ /**
+ * @var
+ */
+ public $argument;
+
+ /**
+ * @var string
+ */
+ public $keyword;
+
+ /**
+ * @var
+ */
+ public $original_argument;
+
+ /**
+ * @var array
+ */
+ public $restrictions;
+
+ /**
+ * @var bool
+ */
+ public $empty;
+
+ /**
+ * The ctools_context constructor.
+ *
+ * @param string $type
+ * The type name of this context. Should be unique. Use the machine_name
+ * conventions: lowercase, short, underscores and no spaces.
+ * @param mixed $data
+ * The data payload, if required for this context.
+ */
+ public function __construct($type = 'none', $data = NULL) {
+ $this->type = $type;
+ $this->data = $data;
$this->title = t('Unknown context');
+ $this->page_title = '';
+ $this->identifier = '';
+ $this->keyword = '';
+ $this->restrictions = array();
+ $this->empty = FALSE;
+ // Other vars are NULL.
}
- function is_type($type) {
- if ($type == 'any' || $this->type == 'any') {
+ /**
+ * Determine whether this object is of type @var $type .
+ *
+ * Both the internal value ($this->type) and the supplied value ($type) can
+ * be a string or an array of strings, and if one or both are arrays the match
+ * succeeds if at least one common element is found.
+ *
+ * Type names
+ *
+ * @param string|array $type
+ * 'type' can be:
+ * - 'any' to match all types (this is true of the internal value too).
+ * - an array of type name strings, when more than one type is acceptable.
+ *
+ * @return bool
+ * True if the type matches, False otherwise.
+ */
+ public function is_type($type) {
+ if ($type === 'any' || $this->type === 'any') {
return TRUE;
}
@@ -58,32 +133,71 @@ class ctools_context {
return (bool) array_intersect($a, $b);
}
- function get_argument() {
+ /**
+ * Return the argument.
+ *
+ * @return mixed
+ * The value of $argument.
+ */
+ public function get_argument() {
return $this->argument;
}
- function get_original_argument() {
+ /**
+ * Return the value of argument (or arg) variable as it was passed in.
+ *
+ * For example see ctools_plugin_load_function() and ctools_terms_context().
+ *
+ * @return mixed
+ * The original arg value.
+ */
+ public function get_original_argument() {
if (!is_null($this->original_argument)) {
return $this->original_argument;
}
return $this->argument;
}
- function get_keyword() {
+ /**
+ * Return the keyword.
+ *
+ * @return mixed
+ * The value of $keyword.
+ */
+ public function get_keyword() {
return $this->keyword;
}
- function get_identifier() {
+ /**
+ * Return the identifier.
+ *
+ * @return mixed
+ * The value of $identifier.
+ */
+ public function get_identifier() {
return $this->identifier;
}
- function get_title() {
+ /**
+ * Return the title.
+ *
+ * @return mixed
+ * The value of $title.
+ */
+ public function get_title() {
return $this->title;
}
- function get_page_title() {
+ /**
+ * Return the page title.
+ *
+ * @return mixed
+ * The value of $page_title.
+ */
+ public function get_page_title() {
return $this->page_title;
}
+
}
/**
@@ -91,39 +205,57 @@ class ctools_context {
* match a required context type.
*/
class ctools_context_required {
- var $keywords = '';
+ /**
+ * @var array
+ * Keyword strings associated with the context.
+ */
+ public $keywords;
/**
* If set, the title will be used in the selector to identify
* the context. This is very useful when multiple contexts
* are required to inform the user will be used for what.
*/
- var $title = NULL;
+ public $title;
/**
* Test to see if this context is required.
*/
- var $required = TRUE;
+ public $required = TRUE;
/**
* If TRUE, skip the check in ctools_context_required::select()
* for contexts whose names may have changed.
*/
- var $skip_name_check = FALSE;
+ public $skip_name_check = FALSE;
/**
+ * The ctools_context_required constructor.
*
- * @param $title
- * The first parameter should be the 'title' of the context for use
- * in UYI selectors when multiple contexts qualify.
- * @param ...
+ * Note: Constructor accepts a variable number of arguments, with optional
+ * type-dependent args at the end of the list and one required argument,
+ * the title. Note in particular that skip_name_check MUST be passed in as
+ * a boolean (and not, for example, as an integer).
+ *
+ * @param string $title
+ * The title of the context for use in UI selectors when multiple contexts
+ * qualify.
+ * @param string $keywords
* One or more keywords to use for matching which contexts are allowed.
+ * @param array $restrictions
+ * Array of context restrictions.
+ * @param bool $skip_name_check
+ * If True, skip the check in select() for contexts whose names may have
+ * changed.
*/
- function ctools_context_required($title) {
+ public function __construct($title) {
+ // If it was possible, using variadic syntax this should be:
+ // __construct($title, string ...$keywords, array $restrictions = NULL, bool $skip = NULL)
+ // but that form isn't allowed.
$args = func_get_args();
$this->title = array_shift($args);
- // If we have a boolean value at the end for $skip_name_check, store it
+ // If we have a boolean value at the end for $skip_name_check, store it.
if (is_bool(end($args))) {
$this->skip_name_check = array_pop($args);
}
@@ -133,20 +265,44 @@ class ctools_context_required {
$this->restrictions = array_pop($args);
}
- if (count($args) == 1) {
+ if (count($args) === 1) {
$args = array_shift($args);
}
$this->keywords = $args;
}
- function filter($contexts) {
+ /**
+ * Filter the contexts to determine which apply in the current environment.
+ *
+ * A context passes the filter if:
+ * - the context matches 'type' of the required keywords (uses
+ * ctools_context::is_type(), so includes 'any' matches, etc).
+ * - AND if restrictions are present, there are some common elements between
+ * the requirement and the context.
+ *
+ * @param array $contexts
+ * An array of ctools_context objects (or something which will cast to an
+ * array of them). The contexts to apply the filter on.
+ *
+ * @return array
+ * An array of context objects, keyed with the same keys used for $contexts,
+ * which pass the filter.
+ *
+ * @see ctools_context::is_type()
+ */
+ public function filter($contexts) {
$result = array();
- // See which of these contexts are valid
+ /**
+ * See which of these contexts are valid.
+ * @var ctools_context $context
+ */
foreach ((array) $contexts as $cid => $context) {
if ($context->is_type($this->keywords)) {
+
// Compare to see if our contexts were met.
if (!empty($this->restrictions) && !empty($context->restrictions)) {
+
foreach ($this->restrictions as $key => $values) {
// If we have a restriction, the context must either not have that
// restriction listed, which means we simply don't know what it is,
@@ -155,11 +311,16 @@ class ctools_context_required {
if (!is_array($values)) {
$values = array($values);
}
- if (!empty($context->restrictions[$key]) && !array_intersect($values, $context->restrictions[$key])) {
+
+ if (!empty($context->restrictions[$key])
+ && !array_intersect($values, $context->restrictions[$key])
+ ) {
+ // Break out to check next context; this one fails the filter.
continue 2;
}
}
}
+ // This context passes the filter.
$result[$cid] = $context;
}
}
@@ -167,7 +328,28 @@ class ctools_context_required {
return $result;
}
- function select($contexts, $context) {
+ /**
+ * Select one context from the list of contexts, accounting for changed IDs.
+ *
+ * Fundamentally, this returns $contexts[$context] or FALSE if that does not
+ * exist. Additional logic accounts for changes in context names and dealing
+ * with a $contexts parameter that is not an array.
+ *
+ * If we had requested a $context but that $context doesn't exist in our
+ * context list, there is a good chance that what happened is the context
+ * IDs changed. Look for another context that satisfies our requirements,
+ * unless $skip_name_check is set.
+ *
+ * @param ctools_context|array $contexts
+ * A context, or an array of ctools_context.
+ * @param string $context
+ * A context ID.
+ *
+ * @return bool|ctools_context
+ * The matching ctools_context, or False if no such context was found.
+ */
+ public function select($contexts, $context) {
+ // Easier to deal with a standalone object as a 1-element array of objects.
if (!is_array($contexts)) {
if (is_object($contexts) && $contexts instanceof ctools_context) {
$contexts = array($contexts->id => $contexts);
@@ -177,11 +359,12 @@ class ctools_context_required {
}
}
- // If we had requested a $context but that $context doesn't exist
- // in our context list, there is a good chance that what happened
- // is our context IDs changed. See if there's another context
- // that satisfies our requirements.
- if (!$this->skip_name_check && !empty($context) && !isset($contexts[$context])) {
+ // If we had requested a $context but that $context doesn't exist in our
+ // context list, there is a good chance that what happened is the context
+ // IDs changed. Check for another context that satisfies our requirements.
+ if (!$this->skip_name_check
+ && !empty($context) && !isset($contexts[$context])
+ ) {
$choices = $this->filter($contexts);
// If we got a hit, take the first one that matches.
@@ -196,6 +379,7 @@ class ctools_context_required {
}
return $contexts[$context];
}
+
}
/**
@@ -203,28 +387,73 @@ class ctools_context_required {
* can produce empty contexts to use as placeholders.
*/
class ctools_context_optional extends ctools_context_required {
- var $required = FALSE;
- function ctools_context_optional() {
- $args = func_get_args();
- call_user_func_array(array($this, 'ctools_context_required'), $args);
+
+ /**
+ * {@inheritdoc}
+ */
+ public $required = FALSE;
+
+ /**
+ * Add the 'empty' context to the existing set.
+ *
+ * @param array &$contexts
+ * An array of ctools_context objects.
+ */
+ public function add_empty(&$contexts) {
+ $context = new ctools_context('any');
+ $context->title = t('No context');
+ $context->identifier = t('No context');
+ $contexts['empty'] = $context;
}
/**
- * Add the 'empty' context which is possible for optional
+ * Filter the contexts to determine which apply in the current environment.
+ *
+ * As for ctools_context_required, but we add the empty context to those
+ * passed in so the check is optional (i.e. if nothing else matches, the
+ * empty context will, and so there will always be at least one matched).
+ *
+ * @param array $contexts
+ * An array of ctools_context objects (or something which will cast to an
+ * array of them). The contexts to apply the filter on.
+ *
+ * @return array
+ * An array of context objects, keyed with the same keys used for $contexts,
+ * which pass the filter.
+ *
+ * @see ctools_context::is_type()
*/
- function add_empty(&$contexts) {
- $context = new ctools_context('any');
- $context->title = t('No context');
- $context->identifier = t('No context');
- $contexts = array_merge(array('empty' => $context), $contexts);
- }
-
- function filter($contexts) {
+ public function filter($contexts) {
+ /**
+ * @todo We are assuming here that $contexts is actually an array, whereas
+ * ctools_context_required::filter only requires $contexts is convertible
+ * to an array.
+ */
$this->add_empty($contexts);
return parent::filter($contexts);
}
- function select($contexts, $context) {
+ /**
+ * Select and return one context from the list of applicable contexts.
+ *
+ * Fundamentally, this returns $contexts[$context] or the empty context if
+ * that does not exist.
+ *
+ * @param array $contexts
+ * The applicable contexts to check.
+ * @param string $context
+ * The context id to check for.
+ *
+ * @return bool|ctools_context
+ * The matching ctools_context, or False if no such context was found.
+ *
+ * @see ctools_context_required::select()
+ */
+ public function select($contexts, $context) {
+ /**
+ * @todo We are assuming here that $contexts is actually an array, whereas
+ * ctools_context_required::select permits ctools_context objects as well.
+ */
$this->add_empty($contexts);
if (empty($context)) {
return $contexts['empty'];
@@ -234,11 +463,12 @@ class ctools_context_optional extends ctools_context_required {
// Don't flip out if it can't find the context; this is optional, put
// in an empty.
- if ($result == FALSE) {
+ if ($result === FALSE) {
$result = $contexts['empty'];
}
return $result;
}
+
}
/**
@@ -253,20 +483,20 @@ class ctools_context_optional extends ctools_context_required {
* Since multiple contexts can be required, this function will accept either
* an array of all required contexts, or just a single required context object.
*
- * @param $contexts
+ * @param array $contexts
* A keyed array of all available contexts.
- * @param $required
- * A ctools_context_required or ctools_context_optional object, or an array
- * of such objects.
+ * @param array|ctools_context_required|ctools_context_optional $required
+ * A *_required or *_optional object, or an array of such objects, which
+ * define the selection condition.
*
- * @return
+ * @return array
* A keyed array of contexts that match the filter.
*/
function ctools_context_filter($contexts, $required) {
if (is_array($required)) {
$result = array();
- foreach ($required as $r) {
- $result = array_merge($result, _ctools_context_filter($contexts, $r));
+ foreach ($required as $item) {
+ $result = array_merge($result, _ctools_context_filter($contexts, $item));
}
return $result;
}
@@ -274,6 +504,21 @@ function ctools_context_filter($contexts, $required) {
return _ctools_context_filter($contexts, $required);
}
+/**
+ * Helper function for ctools_context_filter().
+ *
+ * Used to transform the required context during the merge into the final array.
+ *
+ * @internal This function DOES NOT form part of the CTools API.
+ *
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param ctools_context_required|ctools_context_optional $required
+ * A ctools_context_required or ctools_context_optional object, although if
+ * given something else will return an empty array.
+ *
+ * @return array
+ */
function _ctools_context_filter($contexts, $required) {
$result = array();
@@ -293,12 +538,17 @@ function _ctools_context_filter($contexts, $required) {
* If an array of required contexts is provided, one selector will be
* provided for each context.
*
- * @param $contexts
+ * @param array $contexts
* A keyed array of all available contexts.
- * @param $required
+ * @param array|ctools_context_required|ctools_context_optional $required
* The required context object or array of objects.
+ * @param array|string $default
+ * The default value for the select object, suitable for a #default_value
+ * render key. Where $required is an array, this is an array keyed by the
+ * same key values as $required for all keys where an empty string is not a
+ * suitable default. Otherwise it is just the default value.
*
- * @return
+ * @return array
* A form element, or NULL if there are no contexts that satisfy the
* requirements.
*/
@@ -306,8 +556,10 @@ function ctools_context_selector($contexts, $required, $default) {
if (is_array($required)) {
$result = array('#tree' => TRUE);
$count = 1;
- foreach ($required as $id => $r) {
- $result[] = _ctools_context_selector($contexts, $r, isset($default[$id]) ? $default[$id] : '', $count++);
+ foreach ($required as $id => $item) {
+ $result[] = _ctools_context_selector(
+ $contexts, $item, isset($default[$id]) ? $default[$id] : '', $count++
+ );
}
return $result;
}
@@ -315,6 +567,27 @@ function ctools_context_selector($contexts, $required, $default) {
return _ctools_context_selector($contexts, $required, $default);
}
+/**
+ * Helper function for ctools_context_selector().
+ *
+ * @internal This function DOES NOT form part of the CTools API. Use the API
+ * function ctools_context_selector() instead.
+ *
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param ctools_context_required|ctools_context_optional $required
+ * The required context object.
+ * @param $default
+ * The default value for the select object, suitable for a #default_value
+ * render key.
+ * @param int $num
+ * If supplied and non-zero, the title of the select form element will be
+ * "Context $num", otherwise it will be "Context".
+ *
+ * @return array
+ * A form element, or NULL if there are no contexts that satisfy the
+ * requirements.
+ */
function _ctools_context_selector($contexts, $required, $default, $num = 0) {
$filtered = ctools_context_filter($contexts, $required);
$count = count($filtered);
@@ -358,8 +631,8 @@ function _ctools_context_selector($contexts, $required, $default, $num = 0) {
* @param $required
* The required context object or array of objects.
*
- * @return
- * TRUE if there are enough contexts, FALSE if there are not.
+ * @return bool
+ * True if there are enough contexts, otherwise False.
*/
function ctools_context_match_requirements($contexts, $required) {
if (!is_array($required)) {
@@ -392,8 +665,13 @@ function ctools_context_match_requirements($contexts, $required) {
* A keyed array of all available contexts.
* @param $required
* The required context object or array of objects.
+ * @param array|string $default
+ * The default value for the select object, suitable for a #default_value
+ * render key. Where $required is an array, this is an array keyed by the
+ * same key values as $required for all keys where an empty string is not a
+ * suitable default. Otherwise it is just the default value.
*
- * @return
+ * @return array
* A form element, or NULL if there are no contexts that satisfy the
* requirements.
*/
@@ -401,8 +679,11 @@ function ctools_context_converter_selector($contexts, $required, $default) {
if (is_array($required)) {
$result = array('#tree' => TRUE);
$count = 1;
- foreach ($required as $id => $r) {
- $result[] = _ctools_context_converter_selector($contexts, $r, isset($default[$id]) ? $default[$id] : '', $count++);
+ foreach ($required as $id => $dependency) {
+ $default_id = isset($default[$id]) ? $default[$id] : '';
+ $result[] = _ctools_context_converter_selector(
+ $contexts, $dependency, $default_id, $count++
+ );
}
return $result;
}
@@ -410,17 +691,36 @@ function ctools_context_converter_selector($contexts, $required, $default) {
return _ctools_context_converter_selector($contexts, $required, $default);
}
+/**
+ * Helper function for ctools_context_converter_selector().
+ *
+ * @internal This function DOES NOT form part of the CTools API. Use the API
+ * function ctools_context_converter_selector() instead.
+ *
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param ctools_context $required
+ * The required context object.
+ * @param $default
+ * The default value for the select object, suitable for a #default_value
+ * render key.
+ * @param int $num
+ * If supplied and non-zero, the title of the select form element will be
+ * "Context $num", otherwise it will be "Context".
+ *
+ * @return array|null
+ * A form element, or NULL if there are no contexts that satisfy the
+ * requirements.
+ */
function _ctools_context_converter_selector($contexts, $required, $default, $num = 0) {
$filtered = ctools_context_filter($contexts, $required);
$count = count($filtered);
- $form = array();
-
if ($count > 1) {
// If there's more than one to choose from, create a select widget.
$options = array();
foreach ($filtered as $cid => $context) {
- if ($context->type == 'any') {
+ if ($context->type === 'any') {
$options[''] = t('No context');
continue;
}
@@ -450,10 +750,22 @@ function _ctools_context_converter_selector($contexts, $required, $default, $num
'#default_value' => $default,
);
}
+ else {
+ // Not enough choices to need a selector, so don't make one.
+ return NULL;
+ }
}
/**
* Get a list of converters available for a given context.
+ *
+ * @param string $cid
+ * A context ID.
+ * @param ctools_context $context
+ * The context for which converters are needed.
+ *
+ * @return array
+ * A list of context converters.
*/
function ctools_context_get_converters($cid, $context) {
if (empty($context->plugin)) {
@@ -465,6 +777,17 @@ function ctools_context_get_converters($cid, $context) {
/**
* Get a list of converters available for a given context.
+ *
+ * @internal This function DOES NOT form part of the CTools API. Use the API
+ * function ctools_context_get_converters() instead.
+ *
+ * @param string $id
+ * A context ID.
+ * @param string $plugin_name
+ * The name of the context plugin.
+ *
+ * @return array
+ * A list of context converters.
*/
function _ctools_context_get_converters($id, $plugin_name) {
$plugin = ctools_get_context($plugin_name);
@@ -476,7 +799,7 @@ function _ctools_context_get_converters($id, $plugin_name) {
if (is_array($plugin['convert list'])) {
$converters = $plugin['convert list'];
}
- else if ($function = ctools_plugin_get_function($plugin, 'convert list')) {
+ elseif ($function = ctools_plugin_get_function($plugin, 'convert list')) {
$converters = (array) $function($plugin);
}
@@ -496,7 +819,13 @@ function _ctools_context_get_converters($id, $plugin_name) {
}
/**
- * Get a list of all contexts + converters available.
+ * Get a list of all contexts converters available.
+ *
+ * For all contexts returned by ctools_get_contexts(), return the converter
+ * for all contexts that have one.
+ *
+ * @return array
+ * A list of context converters, keyed by the title of the converter.
*/
function ctools_context_get_all_converters() {
$contexts = ctools_get_contexts();
@@ -516,21 +845,24 @@ function ctools_context_get_all_converters() {
/**
* Let the context convert an argument based upon the converter that was given.
*
- * @param $context
- * The context object
- * @param $converter
- * The converter to use, which should be a string provided by the converter list.
- * @param $converter_options
- * A n array of options to pass on to the generation function. For contexts
+ * @param ctools_context $context
+ * The context object.
+ * @param string $converter
+ * The type of converter to use, which should be a string provided by the
+ * converter list function.
+ * @param array $converter_options
+ * An array of options to pass on to the generation function. For contexts
* that use token module, of particular use is 'sanitize' => FALSE which can
* get raw tokens. This should ONLY be used in values that will later be
* treated as unsafe user input since these values are by themselves unsafe.
* It is particularly useful to get raw values from Field API.
+ *
+ * @return string|null
*/
function ctools_context_convert_context($context, $converter, $converter_options = array()) {
// Contexts without plugins might be optional placeholders.
if (empty($context->plugin)) {
- return;
+ return NULL;
}
$value = $context->argument;
@@ -551,22 +883,35 @@ function ctools_context_convert_context($context, $converter, $converter_options
* Choose a context or contexts based upon the selection made via
* ctools_context_filter.
*
- * @param $contexts
- * A keyed array of all available contexts
- * @param $required
- * The required context object provided by the plugin
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param array|ctools_context_required $required
+ * The required context object(s) provided by the plugin.
* @param $context
- * The selection made using ctools_context_selector
+ * The selection made using ctools_context_selector().
+ *
+ * @return ctools_context|array|false
+ * Returns FALSE if $required is not an object, or array of objects, or
+ * the value of $required->select() for the context, or an array of those (if
+ * passed an array in $required).
*/
function ctools_context_select($contexts, $required, $context) {
if (is_array($required)) {
+
+ /**
+ * @var array $required
+ * Array of required context objects.
+ * @var ctools_context_required $item
+ * A required context object.
+ */
$result = array();
- foreach ($required as $id => $r) {
+ foreach ($required as $id => $item) {
+ // @todo What's the difference between the following and "empty($item)" ?
if (empty($required[$id])) {
continue;
}
- if (($result[] = _ctools_context_select($contexts, $r, $context[$id])) === FALSE) {
+ if (($result[] = _ctools_context_select($contexts, $item, $context[$id])) === FALSE) {
return FALSE;
}
}
@@ -576,6 +921,22 @@ function ctools_context_select($contexts, $required, $context) {
return _ctools_context_select($contexts, $required, $context);
}
+/**
+ * Helper function for calling the required context object's selection function.
+ *
+ * This function DOES NOT form part of the CTools API.
+ *
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param ctools_context_required $required
+ * The required context object provided by the plugin.
+ * @param $context
+ * The selection made using ctools_context_selector().
+ *
+ * @return ctools_context|bool
+ * FALSE if the $required is not an object. A ctools_context object if one
+ * matched.
+ */
function _ctools_context_select($contexts, $required, $context) {
if (!is_object($required)) {
return FALSE;
@@ -587,16 +948,14 @@ function _ctools_context_select($contexts, $required, $context) {
/**
* Create a new context object.
*
- * @param $type
+ * @param string $type
* The type of context to create; this loads a plugin.
- * @param $data
+ * @param mixed $data
* The data to put into the context.
- * @param $empty
- * Whether or not this context is specifically empty.
* @param $conf
* A configuration structure if this context was created via UI.
*
- * @return
+ * @return ctools_context
* A $context or NULL if one could not be created.
*/
function ctools_context_create($type, $data = NULL, $conf = FALSE) {
@@ -619,7 +978,7 @@ function ctools_context_create($type, $data = NULL, $conf = FALSE) {
* @param $type
* The type of context to create; this loads a plugin.
*
- * @return
+ * @return ctools_context
* A $context or NULL if one could not be created.
*/
function ctools_context_create_empty($type) {
@@ -636,8 +995,21 @@ function ctools_context_create_empty($type) {
/**
* Perform keyword and context substitutions.
+ *
+ * @param string $string
+ * The string in which to replace keywords.
+ * @param array $keywords
+ * Array of keyword-replacement pairs.
+ * @param array $contexts
+ *
+ * @param array $converter_options
+ * Options to pass on to ctools_context_convert_context(), defaults to an
+ * empty array.
+ *
+ * @return string
+ * The returned string, with substitutions performed.
*/
-function ctools_context_keyword_substitute($string, $keywords, $contexts, $converter_options = array()) {
+function ctools_context_keyword_substitute($string, $keywords, $contexts, array $converter_options = array()) {
// Ensure a default keyword exists:
$keywords['%%'] = '%';
@@ -660,7 +1032,7 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts, $conve
// If the keyword is already set by something passed in, don't try to
// overwrite it.
- if (!empty($keywords['%' . $keyword])) {
+ if (array_key_exists('%' . $keyword, $keywords)) {
continue;
}
@@ -680,14 +1052,21 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts, $conve
}
}
- if (empty($context_keywords[$context]) || !empty($context_keywords[$context]->empty)) {
- $keywords['%' . $keyword] = '';
- }
- else if (!empty($converter)) {
- $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter, $converter_options);
+ if (!isset($context_keywords[$context])) {
+ $keywords['%' . $keyword] = '%' . $keyword;
}
else {
- $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
+ if (empty($context_keywords[$context]) || !empty($context_keywords[$context]->empty)) {
+ $keywords['%' . $keyword] = '';
+ }
+ else {
+ if (!empty($converter)) {
+ $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter, $converter_options);
+ }
+ else {
+ $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
+ }
+ }
}
}
}
@@ -695,18 +1074,22 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts, $conve
}
/**
- * Determine a unique context ID for a context
+ * Determine a unique context ID for a context.
*
* Often contexts of many different types will be placed into a list. This
* ensures that even though contexts of multiple types may share IDs, they
* are unique in the final list.
*/
function ctools_context_id($context, $type = 'context') {
- if (!$context['id']) {
+ // If not set, FALSE or empty.
+ if (!isset($context['id']) || !$context['id']) {
$context['id'] = 1;
}
- return $type . '_' . $context['name'] . '_' . $context['id'];
+ // @todo is '' the appropriate default value?
+ $name = isset($context['name']) ? $context['name'] : '';
+
+ return $type . '_' . $name . '_' . $context['id'];
}
/**
@@ -714,42 +1097,46 @@ function ctools_context_id($context, $type = 'context') {
*
* This finds the next id available for the named object.
*
- * @param $objects
- * A list of context descriptor objects, i.e, arguments, relationships, contexts, etc.
- * @param $name
+ * @param array $objects
+ * A list of context descriptor objects, i.e, arguments, relationships,
+ * contexts, etc.
+ * @param string $name
* The name being used.
+ *
+ * @return int
+ * The next integer id available.
*/
function ctools_context_next_id($objects, $name) {
$id = 0;
- // Figure out which instance of this argument we're creating
+ // Figure out which instance of this argument we're creating.
if (!$objects) {
return $id + 1;
}
foreach ($objects as $object) {
- if (isset($object['name']) && $object['name'] == $name) {
- if ($object['id'] > $id) {
+ if (isset($object['name']) && $object['name'] === $name) {
+ if (isset($object['id']) && $object['id'] > $id) {
$id = $object['id'];
}
+ // @todo If obj has no 'id', should we increment local id? $id = $id + 1;
}
}
return $id + 1;
}
-
// ---------------------------------------------------------------------------
// Functions related to contexts from arguments.
-
/**
- * Fetch metadata on a specific argument plugin.
+ * Fetch metadata for a specific argument plugin.
*
* @param $argument
* Name of an argument plugin.
*
- * @return
+ * @return array
* An array with information about the requested argument plugin.
*/
+
function ctools_get_argument($argument) {
ctools_include('plugins');
return ctools_get_plugins('ctools', 'arguments', $argument);
@@ -758,7 +1145,7 @@ function ctools_get_argument($argument) {
/**
* Fetch metadata for all argument plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available argument plugins.
*/
function ctools_get_arguments() {
@@ -778,22 +1165,23 @@ function ctools_get_arguments() {
* - keyword: The keyword used for this argument for substitutions.
*
* @param $arg
- * The actual argument received. This is expected to be a string from a URL but
- * this does not have to be the only source of arguments.
+ * The actual argument received. This is expected to be a string from a URL
+ * but this does not have to be the only source of arguments.
* @param $empty
* If true, the $arg will not be used to load the context. Instead, an empty
* placeholder context will be loaded.
*
- * @return
+ * @return ctools_context
* A context object if one can be loaded.
*/
function ctools_context_get_context_from_argument($argument, $arg, $empty = FALSE) {
ctools_include('plugins');
if (empty($argument['name'])) {
- return;
+ return NULL;
}
- if ($function = ctools_plugin_load_function('ctools', 'arguments', $argument['name'], 'context')) {
+ $function = ctools_plugin_load_function('ctools', 'arguments', $argument['name'], 'context');
+ if ($function) {
// Backward compatibility: Merge old style settings into new style:
if (!empty($argument['settings'])) {
$argument += $argument['settings'];
@@ -805,8 +1193,8 @@ function ctools_context_get_context_from_argument($argument, $arg, $empty = FALS
if (is_object($context)) {
$context->identifier = $argument['identifier'];
$context->page_title = isset($argument['title']) ? $argument['title'] : '';
- $context->keyword = $argument['keyword'];
- $context->id = ctools_context_id($argument, 'argument');
+ $context->keyword = $argument['keyword'];
+ $context->id = ctools_context_id($argument, 'argument');
$context->original_argument = $arg;
if (!empty($context->empty)) {
@@ -822,6 +1210,12 @@ function ctools_context_get_context_from_argument($argument, $arg, $empty = FALS
/**
* Retrieve a list of empty contexts for all arguments.
+ *
+ * @param array $arguments
+ *
+ * @return array
+ *
+ * @see ctools_context_get_context_from_arguments()
*/
function ctools_context_get_placeholders_from_argument($arguments) {
$contexts = array();
@@ -837,19 +1231,21 @@ function ctools_context_get_placeholders_from_argument($arguments) {
/**
* Load the contexts for a given list of arguments.
*
- * @param $arguments
+ * @param array $arguments
* The array of argument definitions.
- * @param &$contexts
+ * @param array &$contexts
* The array of existing contexts. New contexts will be added to this array.
- * @param $args
+ * @param array $args
* The arguments to load.
*
- * @return
- * FALSE if an argument wants to 404.
+ * @return bool
+ * TRUE if all is well, FALSE if an argument wants to 404.
+ *
+ * @see ctools_context_get_context_from_argument()
*/
function ctools_context_get_context_from_arguments($arguments, &$contexts, $args) {
foreach ($arguments as $argument) {
- // pull the argument off the list.
+ // Pull the argument off the list.
$arg = array_shift($args);
$id = ctools_context_id($argument, 'argument');
@@ -864,7 +1260,10 @@ function ctools_context_get_context_from_arguments($arguments, &$contexts, $args
$context = $contexts[$id];
}
- if ((empty($context) || empty($context->data)) && !empty($argument['default']) && $argument['default'] == '404') {
+ if ((empty($context) || empty($context->data))
+ && !empty($argument['default'])
+ && $argument['default'] === '404'
+ ) {
return FALSE;
}
}
@@ -873,16 +1272,18 @@ function ctools_context_get_context_from_arguments($arguments, &$contexts, $args
// ---------------------------------------------------------------------------
// Functions related to contexts from relationships.
-
/**
- * Fetch metadata on a specific relationship plugin.
+ * Fetch plugin metadata for a specific relationship plugin.
*
- * @param $content type
+ * @param $relationship
* Name of a panel content type.
*
- * @return
+ * @return array
* An array with information about the requested relationship.
+ *
+ * @see ctools_get_relationships()
*/
+
function ctools_get_relationship($relationship) {
ctools_include('plugins');
return ctools_get_plugins('ctools', 'relationships', $relationship);
@@ -891,8 +1292,10 @@ function ctools_get_relationship($relationship) {
/**
* Fetch metadata for all relationship plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available relationships.
+ *
+ * @see ctools_get_relationship()
*/
function ctools_get_relationships() {
ctools_include('plugins');
@@ -900,8 +1303,9 @@ function ctools_get_relationships() {
}
/**
+ * Return a context from a relationship.
*
- * @param $relationship
+ * @param array $relationship
* The configuration of a relationship. It must contain the following data:
* - name: The name of the relationship plugin being used.
* - relationship_settings: The configuration based upon the plugin forms.
@@ -909,18 +1313,21 @@ function ctools_get_relationships() {
* defined by the UI.
* - keyword: The keyword used for this relationship for substitutions.
*
- * @param $source_context
+ * @param ctools_context $source_context
* The context this relationship is based upon.
- *
- * @param $placeholders
+ * @param bool $placeholders
* If TRUE, placeholders are acceptable.
*
- * @return
- * A context object if one can be loaded.
+ * @return ctools_context|null
+ * A context object if one can be loaded, otherwise NULL.
+ *
+ * @see ctools_context_get_relevant_relationships()
+ * @see ctools_context_get_context_from_relationships()
*/
function ctools_context_get_context_from_relationship($relationship, $source_context, $placeholders = FALSE) {
ctools_include('plugins');
- if ($function = ctools_plugin_load_function('ctools', 'relationships', $relationship['name'], 'context')) {
+ $function = ctools_plugin_load_function('ctools', 'relationships', $relationship['name'], 'context');
+ if ($function) {
// Backward compatibility: Merge old style settings into new style:
if (!empty($relationship['relationship_settings'])) {
$relationship += $relationship['relationship_settings'];
@@ -931,7 +1338,7 @@ function ctools_context_get_context_from_relationship($relationship, $source_con
if ($context) {
$context->identifier = $relationship['identifier'];
$context->page_title = isset($relationship['title']) ? $relationship['title'] : '';
- $context->keyword = $relationship['keyword'];
+ $context->keyword = $relationship['keyword'];
if (!empty($context->empty)) {
$context->placeholder = array(
'type' => 'relationship',
@@ -941,6 +1348,7 @@ function ctools_context_get_context_from_relationship($relationship, $source_con
return $context;
}
}
+ return NULL;
}
/**
@@ -954,18 +1362,24 @@ function ctools_context_get_context_from_relationship($relationship, $source_con
* @param $contexts
* An array of contexts used to figure out which relationships are relevant.
*
- * @return
+ * @return array
* An array of relationship keys that are relevant for the given set of
* contexts.
+ *
+ * @see ctools_context_filter()
+ * @see ctools_context_get_context_from_relationship()
+ * @see ctools_context_get_context_from_relationships()
*/
function ctools_context_get_relevant_relationships($contexts) {
$relevant = array();
$relationships = ctools_get_relationships();
- // Go through each relationship
+ // Go through each relationship.
foreach ($relationships as $rid => $relationship) {
// For each relationship, see if there is a context that satisfies it.
- if (empty($relationship['no ui']) && ctools_context_filter($contexts, $relationship['required context'])) {
+ if (empty($relationship['no ui'])
+ && ctools_context_filter($contexts, $relationship['required context'])
+ ) {
$relevant[$rid] = $relationship['title'];
}
}
@@ -974,7 +1388,7 @@ function ctools_context_get_relevant_relationships($contexts) {
}
/**
- * Fetch all active relationships
+ * Fetch all active relationships.
*
* @param $relationships
* An keyed array of relationship data including:
@@ -989,10 +1403,11 @@ function ctools_context_get_relevant_relationships($contexts) {
*
* @param $placeholders
* If TRUE, placeholders are acceptable.
+ *
+ * @see ctools_context_get_context_from_relationship()
+ * @see ctools_context_get_relevant_relationships()
*/
function ctools_context_get_context_from_relationships($relationships, &$contexts, $placeholders = FALSE) {
- $return = array();
-
foreach ($relationships as $rdata) {
if (!isset($rdata['context'])) {
continue;
@@ -1023,16 +1438,16 @@ function ctools_context_get_context_from_relationships($relationships, &$context
// ---------------------------------------------------------------------------
// Functions related to loading contexts from simple context definitions.
-
/**
* Fetch metadata on a specific context plugin.
*
- * @param $context
+ * @param string $context
* Name of a context.
*
- * @return
+ * @return array
* An array with information about the requested panel context.
*/
+
function ctools_get_context($context) {
static $gate = array();
ctools_include('plugins');
@@ -1056,7 +1471,7 @@ function ctools_get_context($context) {
/**
* Fetch metadata for all context plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available panel contexts.
*/
function ctools_get_contexts() {
@@ -1065,27 +1480,38 @@ function ctools_get_contexts() {
}
/**
+ * Return a context object from a context definition array.
*
- * @param $context
+ * The input $context contains the information needed to identify and invoke
+ * the context plugin and create the plugin context from that.
+ *
+ * @param array $context
* The configuration of a context. It must contain the following data:
* - name: The name of the context plugin being used.
* - context_settings: The configuration based upon the plugin forms.
* - identifier: The human readable identifier for this context, usually
* defined by the UI.
* - keyword: The keyword used for this context for substitutions.
- * @param $type
+ * @param string $type
* This is either 'context' which indicates the context will be loaded
- * from data in the settings, or 'required_context' which means the
+ * from data in the settings, or 'requiredcontext' which means the
* context must be acquired from an external source. This is the method
* used to pass pure contexts from one system to another.
+ * @param mixed $argument
+ * Optional information passed to the plugin context via the arg defined in
+ * the plugin's "placeholder name" field.
*
- * @return
+ * @return ctools_context|null
* A context object if one can be loaded.
+ *
+ * @see ctools_get_context()
+ * @see ctools_plugin_get_function()
*/
function ctools_context_get_context_from_context($context, $type = 'context', $argument = NULL) {
ctools_include('plugins');
$plugin = ctools_get_context($context['name']);
- if ($function = ctools_plugin_get_function($plugin, 'context')) {
+ $function = ctools_plugin_get_function($plugin, 'context');
+ if ($function) {
// Backward compatibility: Merge old style settings into new style:
if (!empty($context['context_settings'])) {
$context += $context['context_settings'];
@@ -1100,7 +1526,7 @@ function ctools_context_get_context_from_context($context, $type = 'context', $a
if ($return) {
$return->identifier = $context['identifier'];
$return->page_title = isset($context['title']) ? $context['title'] : '';
- $return->keyword = $context['keyword'];
+ $return->keyword = $context['keyword'];
if (!empty($context->empty)) {
$context->placeholder = array(
@@ -1112,6 +1538,8 @@ function ctools_context_get_context_from_context($context, $type = 'context', $a
return $return;
}
}
+
+ return NULL;
}
/**
@@ -1125,7 +1553,10 @@ function ctools_context_get_context_from_context($context, $type = 'context', $a
* Either 'context' or 'requiredcontext', which indicates whether the contexts
* are loaded from internal data or copied from an external source.
* @param $placeholders
- * If true, placeholders are acceptable.
+ * If True, placeholders are acceptable.
+ *
+ * @return array
+ * Array of contexts, keyed by context ID.
*/
function ctools_context_get_context_from_contexts($contexts, $type = 'context', $placeholders = FALSE) {
$return = array();
@@ -1144,17 +1575,20 @@ function ctools_context_get_context_from_contexts($contexts, $type = 'context',
/**
* Match up external contexts to our required contexts.
*
- * This function is used to create a list of contexts with proper
- * IDs based upon a list of required contexts.
+ * This function is used to create a list of contexts with proper IDs based
+ * upon a list of required contexts.
*
- * These contexts passed in should match the numeric positions of the
- * required contexts. The caller must ensure this has already happened
- * correctly as this function will not detect errors here.
+ * These contexts passed in should match the numeric positions of the required
+ * contexts. The caller must ensure this has already happened correctly as this
+ * function will not detect errors here.
*
* @param $required
* A list of required contexts as defined by the UI.
* @param $contexts
* A list of matching contexts as passed in from the calling system.
+ *
+ * @return array
+ * Array of contexts, keyed by context ID.
*/
function ctools_context_match_required_contexts($required, $contexts) {
$return = array();
@@ -1163,10 +1597,10 @@ function ctools_context_match_required_contexts($required, $contexts) {
}
foreach ($required as $r) {
- $context = clone(array_shift($contexts));
+ $context = clone array_shift($contexts);
$context->identifier = $r['identifier'];
$context->page_title = isset($r['title']) ? $r['title'] : '';
- $context->keyword = $r['keyword'];
+ $context->keyword = $r['keyword'];
$return[ctools_context_id($r, 'requiredcontext')] = $context;
}
@@ -1178,31 +1612,35 @@ function ctools_context_match_required_contexts($required, $contexts) {
*
* Not all of the types need to be supported by this object.
*
- * This function is not used to load contexts from external data, but may
- * be used to load internal contexts and relationships. Otherwise it can also
- * be used to generate a full set of placeholders for UI purposes.
+ * This function is not used to load contexts from external data, but may be
+ * used to load internal contexts and relationships. Otherwise it can also be
+ * used to generate a full set of placeholders for UI purposes.
*
- * @param $object
+ * @param object $object
* An object that contains some or all of the following variables:
*
- * - requiredcontexts: A list of UI configured contexts that are required
- * from an external source. Since these require external data, they will
- * only be added if $placeholders is set to TRUE, and empty contexts will
- * be created.
- * - arguments: A list of UI configured arguments that will create contexts.
- * Since these require external data, they will only be added if $placeholders
- * is set to TRUE.
- * - contexts: A list of UI configured contexts that have no external source,
- * and are essentially hardcoded. For example, these might configure a
- * particular node or a particular taxonomy term.
- * - relationships: A list of UI configured contexts to be derived from other
- * contexts that already exist from other sources. For example, these might
- * be used to get a user object from a node via the node author relationship.
- * @param $placeholders
- * If TRUE, this will generate placeholder objects for types this function
+ * - requiredcontexts: A list of UI configured contexts that are required
+ * from an external source. Since these require external data, they will
+ * only be added if $placeholders is set to TRUE, and empty contexts will
+ * be created.
+ * - arguments: A list of UI configured arguments that will create contexts.
+ * As these require external data, they will only be added if $placeholders
+ * is set to TRUE.
+ * - contexts: A list of UI configured contexts that have no external source,
+ * and are essentially hardcoded. For example, these might configure a
+ * particular node or a particular taxonomy term.
+ * - relationships: A list of UI configured contexts to be derived from other
+ * contexts that already exist from other sources. For example, these might
+ * be used to get a user object from a node via the node author
+ * relationship.
+ * @param bool $placeholders
+ * If True, this will generate placeholder objects for any types this function
* cannot load.
- * @param $contexts
+ * @param array $contexts
* An array of pre-existing contexts that will be part of the return value.
+ *
+ * @return array
+ * Merged output of all results of ctools_context_get_context_from_contexts().
*/
function ctools_context_load_contexts($object, $placeholders = TRUE, $contexts = array()) {
if (!empty($object->base_contexts)) {
@@ -1226,7 +1664,7 @@ function ctools_context_load_contexts($object, $placeholders = TRUE, $contexts =
$contexts += ctools_context_get_context_from_contexts($object->contexts, 'context', $placeholders);
}
- // add contexts from relationships
+ // Add contexts from relationships.
if (!empty($object->relationships) && is_array($object->relationships)) {
ctools_context_get_context_from_relationships($object->relationships, $contexts, $placeholders);
}
@@ -1245,7 +1683,7 @@ function ctools_context_load_contexts($object, $placeholders = TRUE, $contexts =
function ctools_context_get_form($contexts) {
if (!empty($contexts)) {
foreach ($contexts as $id => $context) {
- // if a form shows its id as being a 'required context' that means the
+ // If a form shows its id as being a 'required context' that means the
// the context is external to this display and does not count.
if (!empty($context->form_id) && substr($id, 0, 15) != 'requiredcontext') {
return $context;
@@ -1264,7 +1702,7 @@ function ctools_context_get_form($contexts) {
* The arguments. These will be acquired from $form_state['values'] and the
* keys must match the context IDs.
*
- * @return
+ * @return array
* A new $contexts array containing the replaced contexts. Not all contexts
* may be replaced if, for example, an argument was unable to be converted
* into a context.
@@ -1283,12 +1721,14 @@ function ctools_context_replace_placeholders($contexts, $arguments) {
$new_context = ctools_context_get_context_from_relationship($relationship, $contexts[$relationship['context']]);
}
break;
+
case 'argument':
if (isset($arguments[$cid]) && $arguments[$cid] !== '') {
$argument = $context->placeholder['conf'];
$new_context = ctools_context_get_context_from_argument($argument, $arguments[$cid]);
}
break;
+
case 'context':
if (!empty($arguments[$cid])) {
$context_info = $context->placeholder['conf'];
@@ -1337,32 +1777,37 @@ function ctools_context_replace_form(&$form, $contexts) {
if (is_array($plugin['placeholder form'])) {
$form[$cid] = $plugin['placeholder form'];
}
- else if (function_exists($plugin['placeholder form'])) {
- $widget = $plugin['placeholder form']($info);
- if ($widget) {
- $form[$cid] = $widget;
+ else {
+ if (function_exists($plugin['placeholder form'])) {
+ $widget = $plugin['placeholder form']($info);
+ if ($widget) {
+ $form[$cid] = $widget;
+ }
}
}
if (!empty($form[$cid])) {
- $form[$cid]['#title'] = t('@identifier (@keyword)', array('@keyword' => '%' . $context->keyword, '@identifier' => $context->identifier));
+ $form[$cid]['#title'] = t('@identifier (@keyword)', array(
+ '@keyword' => '%' . $context->keyword,
+ '@identifier' => $context->identifier,
+ ));
}
}
}
}
// ---------------------------------------------------------------------------
-// Functions related to loading access control plugins
-
+// Functions related to loading access control plugins.
/**
* Fetch metadata on a specific access control plugin.
*
* @param $name
* Name of a plugin.
*
- * @return
+ * @return array
* An array with information about the requested access control plugin.
*/
+
function ctools_get_access_plugin($name) {
ctools_include('plugins');
return ctools_get_plugins('ctools', 'access', $name);
@@ -1371,7 +1816,7 @@ function ctools_get_access_plugin($name) {
/**
* Fetch metadata for all access control plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available access control plugins.
*/
function ctools_get_access_plugins() {
@@ -1383,8 +1828,14 @@ function ctools_get_access_plugins() {
* Fetch a list of access plugins that are available for a given list of
* contexts.
*
- * if 'logged-in-user' is not in the list of contexts, it will be added as
+ * If 'logged-in-user' is not in the list of contexts, it will be added as
* this is required.
+ *
+ * @param array $contexts
+ * Array of ctools_context objects with which to select access plugins.
+ *
+ * @return array
+ * Array of applicable access plugins. Can be empty.
*/
function ctools_get_relevant_access_plugins($contexts) {
if (!isset($contexts['logged-in-user'])) {
@@ -1394,7 +1845,9 @@ function ctools_get_relevant_access_plugins($contexts) {
$all_plugins = ctools_get_access_plugins();
$plugins = array();
foreach ($all_plugins as $id => $plugin) {
- if (!empty($plugin['required context']) && !ctools_context_match_requirements($contexts, $plugin['required context'])) {
+ if (!empty($plugin['required context'])
+ && !ctools_context_match_requirements($contexts, $plugin['required context'])
+ ) {
continue;
}
$plugins[$id] = $plugin;
@@ -1409,14 +1862,17 @@ function ctools_get_relevant_access_plugins($contexts) {
function ctools_access_get_loggedin_context() {
$context = ctools_context_create('entity:user', array('type' => 'current'), TRUE);
$context->identifier = t('Logged in user');
- $context->keyword = 'viewer';
- $context->id = 0;
+ $context->keyword = 'viewer';
+ $context->id = 0;
return $context;
}
/**
* Get a summary of an access plugin's settings.
+ *
+ * @return string
+ * The summary text.
*/
function ctools_access_summary($plugin, $contexts, $test) {
if (!isset($contexts['logged-in-user'])) {
@@ -1426,8 +1882,9 @@ function ctools_access_summary($plugin, $contexts, $test) {
$description = '';
if ($function = ctools_plugin_get_function($plugin, 'summary')) {
$required_context = isset($plugin['required context']) ? $plugin['required context'] : array();
- $context = isset($test['context']) ? $test['context'] : array();
- $description = $function($test['settings'], ctools_context_select($contexts, $required_context, $context), $plugin);
+ $context = isset($test['context']) ? $test['context'] : array();
+ $selected_context = ctools_context_select($contexts, $required_context, $context);
+ $description = $function($test['settings'], $selected_context, $plugin);
}
if (!empty($test['not'])) {
@@ -1439,10 +1896,23 @@ function ctools_access_summary($plugin, $contexts, $test) {
/**
* Get a summary of a group of access plugin's settings.
+ *
+ * @param $access
+ * An array of settings theoretically set by the user, including the array
+ * of plugins to check:
+ * - 'plugins': the array of plugin metadata info to check
+ * - 'logic': (optional) either 'and' or 'or', indicating how to combine
+ * restrictions. Defaults to 'or'.
+ * @param array $contexts
+ * An array of zero or more contexts that may be used to determine if
+ * the user has access.
+ *
+ * @return string
+ * The summary text. Can be NULL if there are no plugins defined.
*/
function ctools_access_group_summary($access, $contexts) {
- if (empty($access['plugins'])) {
- return;
+ if (empty($access['plugins']) || !is_array($access['plugins'])) {
+ return NULL;
}
$descriptions = array();
@@ -1451,21 +1921,29 @@ function ctools_access_group_summary($access, $contexts) {
$descriptions[] = ctools_access_summary($plugin, $contexts, $test);
}
- $separator = (isset($access['logic']) && $access['logic'] == 'and') ? t(', and ') : t(', or ');
+ $separator =
+ (isset($access['logic']) && $access['logic'] === 'and')
+ ? t(', and ') : t(', or ');
return implode($separator, $descriptions);
}
/**
- * Determine if the current user has access via plugin.
+ * Determine if the current user has access via a plugin.
*
- * @param $settings
- * An array of settings theoretically set by the user.
- * @param $contexts
+ * @param array $settings
+ * An array of settings theoretically set by the user, including the array
+ * of plugins to check:
+ * - 'plugins': the array of plugin metadata info to check
+ * - 'logic': (optional) either 'and' or 'or', indicating how to combine
+ * restrictions. The 'or' case is not fully implemented and returns the
+ * input contexts unchanged.
+ *
+ * @param array $contexts
* An array of zero or more contexts that may be used to determine if
* the user has access.
*
- * @return
- * TRUE if access is granted, false if otherwise.
+ * @return bool
+ * TRUE if access is granted, FALSE if otherwise.
*/
function ctools_access($settings, $contexts = array()) {
if (empty($settings['plugins'])) {
@@ -1504,15 +1982,15 @@ function ctools_access($settings, $contexts = array()) {
// Pass if 'or' and this rule passed.
return TRUE;
}
- else if (!$pass && $settings['logic'] == 'and') {
- // Fail if 'and' and htis rule failed.
+ elseif (!$pass && $settings['logic'] == 'and') {
+ // Fail if 'and' and this rule failed.
return FALSE;
}
}
// Return TRUE if logic was and, meaning all rules passed.
// Return FALSE if logic was or, meaning no rule passed.
- return $settings['logic'] == 'and';
+ return ($settings['logic'] === 'and');
}
/**
@@ -1521,7 +1999,7 @@ function ctools_access($settings, $contexts = array()) {
* @param $plugin
* The access plugin being used.
*
- * @return
+ * @return array
* A default configured test that should be placed in $access['plugins'];
*/
function ctools_access_new_test($plugin) {
@@ -1543,7 +2021,6 @@ function ctools_access_new_test($plugin) {
}
}
-
$default = NULL;
if (isset($plugin['default'])) {
$default = $plugin['default'];
@@ -1557,7 +2034,7 @@ function ctools_access_new_test($plugin) {
if (is_array($default)) {
$test['settings'] = $default;
}
- else if (function_exists($default)) {
+ elseif (function_exists($default)) {
$test['settings'] = $default();
}
else {
@@ -1571,11 +2048,23 @@ function ctools_access_new_test($plugin) {
/**
* Apply restrictions to contexts based upon the access control configured.
*
- * These restrictions allow the UI to not show content that may not
- * be relevant to all types of a particular context.
+ * These restrictions allow the UI to not show content that may not be relevant
+ * to all types of a particular context.
+ *
+ * @param array $settings
+ * Array of keys specifying the settings:
+ * - 'plugins': the array of plugin metadata info to check. If not set, or
+ * not an array, the function returns with no action.
+ * - 'logic': (optional) either 'and' or 'or', indicating how to combine
+ * restrictions. Defaults to 'and'.
+ * The 'or' case is not fully implemented and returns with no action if
+ * there is more than one plugin.
+ *
+ * @param array $contexts
+ * Array of available contexts.
*/
function ctools_access_add_restrictions($settings, $contexts) {
- if (empty($settings['plugins'])) {
+ if (empty($settings['plugins']) || !is_array($settings['plugins'])) {
return;
}
@@ -1584,16 +2073,20 @@ function ctools_access_add_restrictions($settings, $contexts) {
}
// We're not going to try to figure out restrictions on the or.
- if ($settings['logic'] == 'or' && count($settings['plugins']) > 1) {
+ if ($settings['logic'] === 'or' && count($settings['plugins']) > 1) {
return;
}
foreach ($settings['plugins'] as $test) {
$plugin = ctools_get_access_plugin($test['name']);
- if ($plugin && $function = ctools_plugin_get_function($plugin, 'restrictions')) {
+ // $plugin is 'array()' on error.
+ if ($plugin
+ && $function = ctools_plugin_get_function($plugin, 'restrictions')
+ ) {
$required_context = isset($plugin['required context']) ? $plugin['required context'] : array();
$context = isset($test['context']) ? $test['context'] : array();
$contexts = ctools_context_select($contexts, $required_context, $context);
+
if ($contexts !== FALSE) {
$function($test['settings'], $contexts);
}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/context.menu.inc b/sites/all/modules/contrib/dev/ctools/includes/context.menu.inc
index ee227cb..798d167 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/context.menu.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/context.menu.inc
@@ -25,7 +25,7 @@ function ctools_context_menu(&$items) {
'page callback' => 'ctools_context_ajax_item_delete',
) + $base;
- // For the access system
+ // For the access system.
$base['file'] = 'includes/context-access-admin.inc';
$items['ctools/context/ajax/access/add'] = array(
'page callback' => 'ctools_access_ajax_add',
diff --git a/sites/all/modules/contrib/dev/ctools/includes/context.theme.inc b/sites/all/modules/contrib/dev/ctools/includes/context.theme.inc
index 8f660b8..d0d866f 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/context.theme.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/context.theme.inc
@@ -19,7 +19,6 @@ function ctools_context_theme(&$theme) {
);
$theme['ctools_context_item_form'] = array(
'render element' => 'form',
-// 'variables' => array('form' => NULL),
'file' => 'includes/context.theme.inc',
);
$theme['ctools_context_item_row'] = array(
@@ -27,7 +26,7 @@ function ctools_context_theme(&$theme) {
'file' => 'includes/context.theme.inc',
);
- // For the access plugin
+ // For the access plugin.
$theme['ctools_access_admin_add'] = array(
'render element' => 'form',
'file' => 'includes/context-access-admin.inc',
@@ -62,10 +61,10 @@ function theme_ctools_context_item_row($vars) {
function theme_ctools_context_item_form($vars) {
$form = $vars['form'];
- $output = '';
- $type = $form['#ctools_context_type'];
- $module = $form['#ctools_context_module'];
- $cache_key = $form['#cache_key'];
+ $output = '';
+ $type = $form['#ctools_context_type'];
+ $module = $form['#ctools_context_module'];
+ $cache_key = $form['#cache_key'];
$type_info = ctools_context_info($type);
@@ -104,17 +103,17 @@ function theme_ctools_context_item_form($vars) {
if (!empty($form['buttons'])) {
// Display the add context item.
- $row = array();
- $row[] = array('data' => render($form['buttons'][$type]['item']), 'class' => array('title'));
- $row[] = array('data' => render($form['buttons'][$type]['add']), 'class' => array('add'), 'width' => "60%");
- $output .= '';
}
if (!empty($form['description'])) {
$output .= render($form['description']);
@@ -139,7 +138,7 @@ function theme_ctools_context_list($vars) {
$description = (!empty($vars['description'])) ? $vars['description'] : NULL;
$titles = array();
$output = '';
- $count = 1;
+ $count = 1;
$contexts = ctools_context_load_contexts($object);
@@ -209,7 +208,7 @@ function theme_ctools_context_list($vars) {
}
}
- // And relationships
+ // And relationships.
if (!empty($object->relationships)) {
foreach ($object->relationships as $relationship) {
$output .= '';
@@ -253,15 +252,15 @@ function theme_ctools_context_list($vars) {
}
/**
- * ctools_context_list() but not in a table format because tabledrag
- * won't let us have tables within tables and still drag.
+ * The ctools_context_list() function but not in a table format because
+ * tabledrag won't let us have tables within tables and still drag.
*/
function theme_ctools_context_list_no_table($vars) {
$object = $vars['object'];
ctools_add_css('context');
$titles = array();
$output = '';
- $count = 1;
+ $count = 1;
// Describe 'built in' contexts.
if (!empty($object->base_contexts)) {
foreach ($object->base_contexts as $id => $context) {
@@ -312,7 +311,7 @@ function theme_ctools_context_list_no_table($vars) {
$count++;
}
}
- // And relationships
+ // And relationships.
if (!empty($object->relationships)) {
foreach ($object->relationships as $relationship) {
$output .= '
' . var_export($conf['config_item_1'], TRUE) . '
';
}
if (!empty($context)) {
@@ -77,7 +75,6 @@ function relcontext_content_type_render($subtype, $conf, $args, $context) {
/**
* 'Edit' callback for the content type.
* This example just returns a form.
- *
*/
function relcontext_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/simplecontext_content_type.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/simplecontext_content_type.inc
index a308683..e34fa18 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/simplecontext_content_type.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/content_types/simplecontext_content_type.inc
@@ -1,6 +1,5 @@
'simplecontext_content_type_edit_form',
'admin title' => 'ctools_plugin_example_simplecontext_content_type_admin_title',
- // presents a block which is used in the preview of the data.
+ // Presents a block which is used in the preview of the data.
// Pn Panels this is the preview pane shown on the panels building page.
'admin info' => 'ctools_plugin_example_simplecontext_content_type_admin_info',
'category' => array(t('CTools Examples'), -9),
@@ -103,7 +101,6 @@ function simplecontext_content_type_render($subtype, $conf, $args, $context) {
/**
* 'Edit' callback for the content type.
* This example just returns a form.
- *
*/
function simplecontext_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/contexts/relcontext.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/contexts/relcontext.inc
index 0c7ef11..61e25db 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/contexts/relcontext.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/contexts/relcontext.inc
@@ -80,4 +80,3 @@ function relcontext_settings_form($conf, $external = FALSE) {
);
return $form;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/contexts/simplecontext.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/contexts/simplecontext.inc
index e19a842..0ee4658 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/contexts/simplecontext.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/contexts/simplecontext.inc
@@ -1,10 +1,8 @@
t("Simplecontext"),
'description' => t('A single "simplecontext" context, or data element.'),
- 'context' => 'ctools_plugin_example_context_create_simplecontext', // func to create context
+// Func to create context.
+ 'context' => 'ctools_plugin_example_context_create_simplecontext',
'context name' => 'simplecontext',
'settings form' => 'simplecontext_settings_form',
'keyword' => 'simplecontext',
@@ -69,7 +68,7 @@ function ctools_plugin_example_context_create_simplecontext($empty, $data = NULL
// This is used for keyword.
$context->title = $data;
$context->argument = $data;
- // Make up a bogus context
+ // Make up a bogus context.
$context->data = new stdClass();
$context->data->item1 = t("Item1");
$context->data->item2 = t("Item2");
@@ -102,8 +101,6 @@ function simplecontext_settings_form($conf, $external = FALSE) {
return $form;
}
-
-
/**
* Provide a list of sub-keywords.
*
@@ -125,10 +122,11 @@ function simplecontext_convert($context, $type) {
switch ($type) {
case 'item1':
return $context->data->item1;
+
case 'item2':
return $context->data->item2;
+
case 'description':
return $context->data->description;
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/panels.pages.inc b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/panels.pages.inc
index d3022af..25422cf 100644
--- a/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/panels.pages.inc
+++ b/sites/all/modules/contrib/dev/ctools/ctools_plugin_example/plugins/panels.pages.inc
@@ -19,24 +19,24 @@ function ctools_plugin_example_default_panel_pages() {
$page->load_flags = 1;
$page->css_id = '';
$page->arguments = array(
- 0 =>
+ 0 =>
array(
- 'name' => 'simplecontext_arg',
- 'id' => 1,
- 'default' => '404',
- 'title' => '',
- 'identifier' => 'Simplecontext arg',
- 'keyword' => 'simplecontext',
+ 'name' => 'simplecontext_arg',
+ 'id' => 1,
+ 'default' => '404',
+ 'title' => '',
+ 'identifier' => 'Simplecontext arg',
+ 'keyword' => 'simplecontext',
),
);
$page->relationships = array(
- 0 =>
+ 0 =>
array(
- 'context' => 'argument_simplecontext_arg_1',
- 'name' => 'relcontext_from_simplecontext',
- 'id' => 1,
- 'identifier' => 'Relcontext from Simplecontext',
- 'keyword' => 'relcontext',
+ 'context' => 'argument_simplecontext_arg_1',
+ 'name' => 'relcontext_from_simplecontext',
+ 'id' => 1,
+ 'identifier' => 'Relcontext from Simplecontext',
+ 'keyword' => 'relcontext',
),
);
$page->no_blocks = '0';
@@ -58,14 +58,14 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'custom';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'title' => '"No Context Item"',
- 'body' => 'The "no context item" content type is here to demonstrate that you can create a content_type that does not require a context. This is probably the same as just creating a custom php block on the fly, and might serve the same purpose.',
- 'format' => '1',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'title' => '"No Context Item"',
+ 'body' => 'The "no context item" content type is here to demonstrate that you can create a content_type that does not require a context. This is probably the same as just creating a custom php block on the fly, and might serve the same purpose.',
+ 'format' => '1',
);
$pane->cache = array();
$display->content['new-1'] = $pane;
@@ -78,14 +78,14 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'description';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'item1' => 'one',
- 'item2' => 'two',
- 'item3' => 'three',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'item1' => 'one',
+ 'item2' => 'two',
+ 'item3' => 'three',
);
$pane->cache = array();
$display->content['new-2'] = $pane;
@@ -98,16 +98,16 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'custom';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'title' => 'Simplecontext',
- 'body' => 'The "Simplecontext" content and content type demonstrate a very basic context and how to display it.
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'title' => 'Simplecontext',
+ 'body' => 'The "Simplecontext" content and content type demonstrate a very basic context and how to display it.
Simplecontext includes configuration, so it can get info from the config. It can also get its information to run from a simplecontext context, generated either from an arg to the panels page or via explicitly adding a context to the page.',
- 'format' => '1',
+ 'format' => '1',
);
$pane->cache = array();
$display->content['new-3'] = $pane;
@@ -119,17 +119,17 @@ function ctools_plugin_example_default_panel_pages() {
$pane->shown = '1';
$pane->subtype = 'description';
$pane->access = array(
- 0 => '2',
- 1 => '4',
+ 0 => '2',
+ 1 => '4',
);
$pane->configuration = array(
- 'context' => 'argument_simplecontext_arg_1',
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'config_item_1' => 'simplecontext called from arg',
+ 'context' => 'argument_simplecontext_arg_1',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'config_item_1' => 'simplecontext called from arg',
);
$pane->cache = array();
$display->content['new-4'] = $pane;
@@ -142,14 +142,14 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'custom';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'title' => 'Relcontext',
- 'body' => 'The relcontext content_type gets its data from a relcontext, which is an example of a relationship. This panel should be run with an argument like "/xxx", which allows the simplecontext to get its context, and then the relcontext is configured in this panel to get (create) its data from the simplecontext.',
- 'format' => '1',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'title' => 'Relcontext',
+ 'body' => 'The relcontext content_type gets its data from a relcontext, which is an example of a relationship. This panel should be run with an argument like "/xxx", which allows the simplecontext to get its context, and then the relcontext is configured in this panel to get (create) its data from the simplecontext.',
+ 'format' => '1',
);
$pane->cache = array();
$display->content['new-5'] = $pane;
@@ -162,13 +162,13 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'description';
$pane->access = array();
$pane->configuration = array(
- 'context' => 'relationship_relcontext_from_simplecontext_1',
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'config_item_1' => 'default1',
+ 'context' => 'relationship_relcontext_from_simplecontext_1',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'config_item_1' => 'default1',
);
$pane->cache = array();
$display->content['new-6'] = $pane;
@@ -181,13 +181,13 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'custom_php';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'title' => '',
- 'body' => '$arg = arg(1);
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'title' => '',
+ 'body' => '$arg = arg(1);
$arg0 = arg(0);
if (!$arg) {
$block->content = <<- type: Either fixed or scale. If fixed, the modal will always be a fixed size. If scale the modal will scale to a percentage of the browser window. Default: scale. -
- width: If fixed the width in pixels. If scale the percentage of the screen expressed as a number less than zero. (For 80 percent, use .8, for example). Default: .8 +
- width: If fixed the width in pixels. If scale the percentage of the screen expressed as a number less than zero. (For 80 percent, use .8, for example). Default: .8
- height: If fixed the height in pixels. If scale the percentage of the screen expressed as a number less than zero. (For 80 percent, use .8, for example). Default: .8
- addWidth: Any additional width to add to the modal in pixels. Only useful if the type is scale. Default: 0
- addHeight: Any additional height to add to the modal in pixels. Only useful if the type is scale. Default: 0 @@ -168,7 +168,7 @@ function ctools_ajax_sample_login($js) {
function ctools_ajax_hello_world($js) {
$title = t('Greetings');
- $output = '<p>' . t('Hello world') . ''</p>';
+ $output = '<p>' . t('Hello world') . '</p>';
if ($js) {
ctools_modal_render($title, $output);
}
diff --git a/sites/all/modules/contrib/dev/ctools/help/plugins-creating.html b/sites/all/modules/contrib/dev/ctools/help/plugins-creating.html
index 2323705..6d5b35f 100644
--- a/sites/all/modules/contrib/dev/ctools/help/plugins-creating.html
+++ b/sites/all/modules/contrib/dev/ctools/help/plugins-creating.html
@@ -26,7 +26,7 @@ The following information can be specified for each plugin type:
- - a file name:
- the file which holds the class with the name structure as: [filename].[class].php @@ -35,6 +35,7 @@ The following information can be specified for each plugin type:
- if the class is in the same file as the $plugin
- the plugin .inc file can have a different name than the class identifier
';
@@ -341,4 +340,3 @@ function theme_ctools_context_list_no_table($vars) {
return $output;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/includes/css.inc b/sites/all/modules/contrib/dev/ctools/includes/css.inc
index 9813a87..83fe1c3 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/css.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/css.inc
@@ -1,6 +1,6 @@
$declaration) {
foreach ($declaration as $property => $value) {
if (!in_array($property, $allowed_properties)) {
- // $filtered['properties'][$selector_str][$property] = $value;
+ // $filtered['properties'][$selector_str][$property] = $value;.
unset($css[$selector_str][$property]);
continue;
}
$value = str_replace('!important', '', $value);
if (preg_match($disallowed_values_regex, $value) || !(in_array($value, $allowed_values) || preg_match($allowed_values_regex, $value))) {
- // $filtered['values'][$selector_str][$property] = $value;
+ // $filtered['values'][$selector_str][$property] = $value;.
unset($css[$selector_str][$property]);
continue;
}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/dependent.inc b/sites/all/modules/contrib/dev/ctools/includes/dependent.inc
index 74de919..20c25de 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/dependent.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/dependent.inc
@@ -44,7 +44,7 @@
*
* A fuller example, that hides the menu title when no menu is selected:
* @code
- *function ctools_dependent_example() {
+ * function ctools_dependent_example() {
* $form = array();
* $form['menu'] = array(
* '#type' => 'fieldset',
@@ -72,12 +72,12 @@
* );
*
* return system_settings_form($form);
- *}
+ * }
* @endcode
*
* An example for hiding checkboxes using #prefix and #suffix:
* @code
- *function ctools_dependent_example_checkbox() {
+ * function ctools_dependent_example_checkbox() {
* $form = array();
* $form['object'] = array(
* '#type' => 'fieldset',
@@ -111,7 +111,7 @@
* );
*
* return system_settings_form($form);
- *}
+ * }
* @endcode
*
* Deprecated:
@@ -125,7 +125,6 @@
/**
* Process callback to add dependency to form items.
- *
*/
function ctools_dependent_process($element, &$form_state, &$form) {
return $element;
diff --git a/sites/all/modules/contrib/dev/ctools/includes/dropbutton.theme.inc b/sites/all/modules/contrib/dev/ctools/includes/dropbutton.theme.inc
index fcdd5a3..4b95ef0 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/dropbutton.theme.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/dropbutton.theme.inc
@@ -75,7 +75,7 @@ function theme_links__ctools_dropbutton($vars) {
if (!empty($vars['links'])) {
$is_drop_button = (count($vars['links']) > 1);
- // Add needed files
+ // Add needed files.
if ($is_drop_button) {
ctools_add_js('dropbutton');
ctools_add_css('dropbutton');
@@ -86,7 +86,7 @@ function theme_links__ctools_dropbutton($vars) {
static $id = 0;
$id++;
- // Wrapping div
+ // Wrapping div.
$class = 'ctools-no-js';
$class .= ($is_drop_button) ? ' ctools-dropbutton' : '';
$class .= ' ctools-button';
@@ -98,21 +98,22 @@ function theme_links__ctools_dropbutton($vars) {
$output .= '
'; // ctools-dropbutton
+ $output .= ''; // ctools-content.
+ $output .= ''; // ctools-dropbutton.
return $output;
}
else {
return '';
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/includes/dropdown.theme.inc b/sites/all/modules/contrib/dev/ctools/includes/dropdown.theme.inc
index 7e748f5..b763687 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/dropdown.theme.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/dropdown.theme.inc
@@ -44,20 +44,21 @@ function ctools_dropdown_theme(&$items) {
/**
* Create a dropdown menu.
*
- * @param $title
- * The text to place in the clickable area to activate the dropdown.
- * @param $links
- * A list of links to provide within the dropdown, suitable for use
- * in via Drupal's theme('links').
- * @param $image
- * If true, the dropdown link is an image and will not get extra decorations
- * that a text dropdown link will.
- * @param $class
- * An optional class to add to the dropdown's container div to allow you
- * to style a single dropdown however you like without interfering with
- * other dropdowns.
+ * @param array $variables
+ * An associative array containing:
+ * - title: The text to place in the clickable area to activate the dropdown.
+ * - links: A list of links to provide within the dropdown, suitable for use
+ * in via Drupal's theme('links').
+ * - image: If true, the dropdown link is an image and will not get extra
+ * decorations that a text dropdown link will.
+ * - class: An optional class to add to the dropdown's container div to allow
+ * you to style a single dropdown however you like without interfering with
+ * other dropdowns.
+ *
+ * @return string
+ * Returns HTML for a language configuration form.
*/
-function theme_ctools_dropdown($vars) {
+function theme_ctools_dropdown($vars) {
// Provide a unique identifier for every dropdown on the page.
static $id = 0;
$id++;
@@ -67,9 +68,7 @@ function theme_ctools_dropdown($vars) {
ctools_add_js('dropdown');
ctools_add_css('dropdown');
- $output = '';
-
- $output .= '';
- // Add a twisty if this is a dropbutton
+ // Add a twisty if this is a dropbutton.
if ($is_drop_button) {
$vars['title'] = ($vars['title'] ? check_plain($vars['title']) : t('open'));
$output .= '
';
}
- // The button content
+ // The button content.
$output .= '';
if ($vars['image']) {
- $output .= '' . $vars['title'] . '';
+ $output .= '' . $vars['title'] . '';
}
else {
- $output .= '' . $vars['title'] . '';
+ $output .= '' . $vars['title'] . '';
}
- $output .= '
'; // ctools-link
+ // ctools-link.
+ $output .= '';
// Check for attributes. theme_links expects an array().
@@ -132,12 +133,11 @@ function theme_links__ctools_dropbutton($vars) {
// Call theme_links to render the list of links.
$output .= theme_links(array('links' => $vars['links'], 'attributes' => $vars['attributes'], 'heading' => ''));
- $output .= '
'; // ctools-content
- $output .= '';
+ $output = '
'; // dropdown
+ $output .= '';
+ $output .= '';
+ $output .= '';
+
return $output;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/includes/entity-access.inc b/sites/all/modules/contrib/dev/ctools/includes/entity-access.inc
new file mode 100644
index 0000000..69f2c33
--- /dev/null
+++ b/sites/all/modules/contrib/dev/ctools/includes/entity-access.inc
@@ -0,0 +1,154 @@
+nid);
+ if ($node->vid !== $default_revision->vid) {
+ return _node_revision_access($node, $op, $account);
+ }
+ else {
+ return node_access($op, $node, $account);
+ }
+ }
+ // No node is provided. Check for access to all nodes.
+ if (user_access('bypass node access', $account)) {
+ return TRUE;
+ }
+ if (!user_access('access content', $account)) {
+ return FALSE;
+ }
+ if ($op == 'view' && node_access_view_all_nodes($account)) {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/**
+ * Access callback for the user entity.
+ */
+function ctools_metadata_user_access($op, $entity = NULL, $account = NULL, $entity_type) {
+ $account = isset($account) ? $account : $GLOBALS['user'];
+ // Grant access to the users own user account and to the anonymous one.
+ if (isset($entity) && $op != 'delete' && (($entity->uid == $account->uid && $entity->uid) || (!$entity->uid && $op == 'view'))) {
+ return TRUE;
+ }
+ if (user_access('administer users', $account) || user_access('access user profiles', $account) && $op == 'view' && $entity->status) {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/**
+ * Access callback for the comment entity.
+ */
+function ctools_metadata_comment_access($op, $entity = NULL, $account = NULL) {
+ // When determining access to a comment, if comment has an associated node,
+ // the user must be able to view the node in order to access the comment.
+ if (isset($entity->nid)) {
+ if (!node_access('view', node_load($entity->nid), $account)) {
+ return FALSE;
+ }
+ }
+
+ // Comment administrators are allowed to perform all operations on all
+ // comments.
+ if (user_access('administer comments', $account)) {
+ return TRUE;
+ }
+
+ // Unpublished comments can never be accessed by non-admins.
+ if (isset($entity->status) && $entity->status == COMMENT_NOT_PUBLISHED) {
+ return FALSE;
+ }
+
+ if (user_access('access comments', $account) && $op == 'view') {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/**
+ * Access callback for the taxonomy entities.
+ */
+function ctools_metadata_taxonomy_access($op, $entity = NULL, $account = NULL, $entity_type) {
+ if ($entity_type == 'taxonomy_vocabulary') {
+ return user_access('administer taxonomy', $account);
+ }
+ if (user_access('administer taxonomy', $account) || user_access('access content', $account) && $op == 'view') {
+ return TRUE;
+ }
+ return FALSE;
+}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/export-ui.inc b/sites/all/modules/contrib/dev/ctools/includes/export-ui.inc
index 16e57d6..72e5a2f 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/export-ui.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/export-ui.inc
@@ -81,7 +81,6 @@ function ctools_export_ui_process(&$plugin, $info) {
// Add some default fields that appear often in exports
// If these use different keys they can easily be specified in the
// $plugin.
-
if (empty($plugin['export']['admin_title']) && !empty($schema['fields']['admin_title'])) {
$plugin['export']['admin_title'] = 'admin_title';
}
@@ -297,7 +296,6 @@ function ctools_export_ui_process(&$plugin, $info) {
);
// Define strings.
-
// For all strings, %title may be filled in at a later time via str_replace
// since we do not know the title now.
$plugin['strings'] += array(
@@ -335,7 +333,7 @@ function ctools_export_ui_process(&$plugin, $info) {
$plugin['strings']['confirmation']['delete'] += array(
'question' => t('Are you sure you want to delete %title?'),
- 'information' => t('This action will permanently remove this item from your database..'),
+ 'information' => t('This action will permanently remove this item from your database.'),
'success' => t('The item has been deleted.'),
);
@@ -414,6 +412,7 @@ function ctools_export_ui_plugin_base_path($plugin) {
* The id in the menu items from the plugin.
* @param $export_key
* The export key of the item being edited, if it exists.
+ *
* @return
* The menu path to the plugin's list.
*/
@@ -429,12 +428,11 @@ function ctools_export_ui_plugin_menu_path($plugin, $item_id, $export_key = NULL
* Helper function to include CTools plugins and get an export-ui exportable.
*
* @param $plugin_name
- * The plugin that should be laoded.
+ * The plugin that should be loaded.
*/
function ctools_get_export_ui($plugin_name) {
ctools_include('plugins');
return ctools_get_plugins('ctools', 'export_ui', $plugin_name);
-
}
/**
@@ -456,14 +454,14 @@ function ctools_export_ui_switcher_page($plugin_name, $op) {
$args = func_get_args();
$js = !empty($_REQUEST['js']);
- // Load the $plugin information
+ // Load the $plugin information.
$plugin = ctools_get_export_ui($plugin_name);
$handler = ctools_export_ui_get_handler($plugin);
if ($handler) {
$method = $op . '_page';
if (method_exists($handler, $method)) {
- // replace the first two arguments:
+ // Replace the first two arguments:
$args[0] = $js;
$args[1] = $_POST;
return call_user_func_array(array($handler, $method), $args);
diff --git a/sites/all/modules/contrib/dev/ctools/includes/export-ui.menu.inc b/sites/all/modules/contrib/dev/ctools/includes/export-ui.menu.inc
index d27bf15..0fda8c2 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/export-ui.menu.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/export-ui.menu.inc
@@ -1,5 +1,9 @@
array('handler'),
);
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/export.inc b/sites/all/modules/contrib/dev/ctools/includes/export.inc
index 0b85c2e..d2fff2f 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/export.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/export.inc
@@ -4,7 +4,7 @@
* @file
* Contains code to make it easier to have exportable objects.
*
- * Documentation for exportable objects is contained in help/export.html
+ * Documentation for exportable objects is contained in help/export.html.
*/
/**
@@ -126,6 +126,7 @@ function ctools_export_crud_load_multiple($table, array $names) {
* If TRUE, the static cache of all objects will be flushed prior to
* loading all. This can be important on listing pages where items
* might have changed on the page load.
+ *
* @return
* An array of all loaded objects, keyed by the unique IDs of the export key.
*/
@@ -328,7 +329,6 @@ function ctools_export_crud_set_status($table, $object, $status) {
}
-
/**
* Enable a certain object.
*
@@ -426,7 +426,7 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
}
}
- // Build the query
+ // Build the query.
$query = db_select($table, 't__0')->fields('t__0');
$alias_count = 1;
if (!empty($schema['join'])) {
@@ -451,7 +451,7 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
if ($type == 'names') {
$query->condition($export['key'], $args, 'IN');
}
- else if ($type == 'conditions') {
+ elseif ($type == 'conditions') {
foreach ($args as $key => $value) {
if (isset($schema['fields'][$key])) {
$query->condition($key, $value);
@@ -499,7 +499,7 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
if ($defaults) {
foreach ($defaults as $object) {
if ($type == 'conditions') {
- // if this does not match all of our conditions, skip it.
+ // If this does not match all of our conditions, skip it.
foreach ($args as $key => $value) {
if (!isset($object->$key)) {
continue 2;
@@ -509,12 +509,12 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
continue 2;
}
}
- else if ($object->$key != $value) {
+ elseif ($object->$key != $value) {
continue 2;
}
}
}
- else if ($type == 'names') {
+ elseif ($type == 'names') {
if (!in_array($object->{$export['key']}, $args)) {
continue;
}
@@ -561,7 +561,6 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
}
}
- // For conditions,
return $return;
}
@@ -807,10 +806,10 @@ function _ctools_export_get_some_defaults($table, $export, $names) {
function _ctools_export_unpack_object($schema, $data, $object = 'stdClass') {
if (is_string($object)) {
if (class_exists($object)) {
- $object = new $object;
+ $object = new $object();
}
else {
- $object = new stdClass;
+ $object = new stdClass();
}
}
@@ -873,14 +872,14 @@ function ctools_var_export($var, $prefix = '') {
$output .= $prefix . ')';
}
}
- else if (is_object($var) && get_class($var) === 'stdClass') {
+ elseif (is_object($var) && get_class($var) === 'stdClass') {
// var_export() will export stdClass objects using an undefined
// magic method __set_state() leaving the export broken. This
// workaround avoids this by casting the object as an array for
// export and casting it back to an object when evaluated.
$output = '(object) ' . ctools_var_export((array) $var, $prefix);
}
- else if (is_bool($var)) {
+ elseif (is_bool($var)) {
$output = $var ? 'TRUE' : 'FALSE';
}
else {
@@ -902,7 +901,8 @@ function ctools_export_object($table, $object, $indent = '', $identifier = NULL,
$output = $indent . '$' . $identifier . ' = new ' . get_class($object) . "();\n";
if ($schema['export']['can disable']) {
- $output .= $indent . '$' . $identifier . '->disabled = FALSE; /* Edit this to true to make a default ' . $identifier . ' disabled initially */' . "\n";
+ $disabled = !isset($object->disabled) || $object->disabled != TRUE ? 'FALSE' : 'TRUE';
+ $output .= $indent . '$' . $identifier . '->disabled = ' . $disabled . '; /* Edit this to true to make a default ' . $identifier . ' disabled initially */' . "\n";
}
if (!empty($schema['export']['api']['current_version'])) {
$output .= $indent . '$' . $identifier . '->api_version = ' . $schema['export']['api']['current_version'] . ";\n";
@@ -958,7 +958,7 @@ function ctools_export_object($table, $object, $indent = '', $identifier = NULL,
}
}
- // And bottom additions here
+ // And bottom additions here.
foreach ($additions2 as $field => $value) {
$output .= $indent . '$' . $identifier . '->' . $field . ' = ' . ctools_var_export($value, $indent) . ";\n";
}
@@ -986,7 +986,7 @@ function ctools_export_get_schema($table) {
// simply hasn't been cached. If we've been asked, let's force the
// issue.
if (!$schema || empty($schema['export'])) {
- // force a schema reset:
+ // Force a schema reset:
$schema = drupal_get_schema($table, TRUE);
}
@@ -998,7 +998,7 @@ function ctools_export_get_schema($table) {
return array();
}
- // Add some defaults
+ // Add some defaults.
$schema['export'] += array(
'key' => 'name',
'key name' => 'Name',
@@ -1106,7 +1106,7 @@ function ctools_export_set_object_status($object, $new_status = TRUE) {
$export = $schema['export'];
$status = variable_get($export['status'], array());
- // Compare
+ // Compare.
if (!$new_status && $object->export_type & EXPORT_IN_DATABASE) {
unset($status[$object->{$export['key']}]);
}
@@ -1149,12 +1149,12 @@ function ctools_export_new_object($table, $set_defaults = TRUE) {
$schema = ctools_export_get_schema($table);
$export = $schema['export'];
- $object = new $export['object'];
+ $object = new $export['object']();
foreach ($schema['fields'] as $field => $info) {
if (isset($info['object default'])) {
$object->$field = $info['object default'];
}
- else if (isset($info['default'])) {
+ elseif (isset($info['default'])) {
$object->$field = $info['default'];
}
else {
@@ -1179,11 +1179,11 @@ function ctools_export_new_object($table, $set_defaults = TRUE) {
function ctools_export_to_hook_code(&$code, $table, $names = array(), $name = 'foo') {
$schema = ctools_export_get_schema($table);
$export = $schema['export'];
- // Use the schema-specified function for generating hook code, if one exists
+ // Use the schema-specified function for generating hook code, if one exists.
if (function_exists($export['to hook code callback'])) {
$output = $export['to hook code callback']($names, $name);
}
- // Otherwise, the following code generates basic hook code
+ // Otherwise, the following code generates basic hook code.
else {
$output = ctools_export_default_to_hook_code($schema, $table, $names, $name);
}
@@ -1227,7 +1227,7 @@ function ctools_export_default_to_hook_code($schema, $table, $names, $name) {
$output .= " \${$export['identifier']}s = array();\n\n";
foreach ($objects as $object) {
$output .= ctools_export_crud_export($table, $object, ' ');
- $output .= " \${$export['identifier']}s['" . check_plain($object->$export['key']) . "'] = \${$export['identifier']};\n\n";
+ $output .= " \${$export['identifier']}s['" . check_plain($object->{$export['key']}) . "'] = \${$export['identifier']};\n\n";
}
$output .= " return \${$export['identifier']}s;\n";
$output .= "}\n";
@@ -1235,6 +1235,7 @@ function ctools_export_default_to_hook_code($schema, $table, $names, $name) {
return $output;
}
+
/**
* Default function for listing bulk exportable objects.
*/
diff --git a/sites/all/modules/contrib/dev/ctools/includes/fields.inc b/sites/all/modules/contrib/dev/ctools/includes/fields.inc
index f379f5e..0d3256f 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/fields.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/fields.inc
@@ -5,7 +5,6 @@
* Extend core fields with some helper functions to reduce code complexity within views and ctools plugins.
*/
-
/**
* Fake an instance of a field.
*
@@ -75,27 +74,30 @@ function ctools_fields_get_field_formatter_settings_form($field, $formatter_type
$conf['formatter_settings'] += $formatter['settings'];
}
$function = $formatter['module'] . '_field_formatter_settings_form';
- if (function_exists($function)) {
- $instance = ctools_fields_fake_field_instance($field['field_name'], $view_mode, $formatter_type, $conf['formatter_settings']);
- $settings_form = $function($field, $instance, $view_mode, $form, $form_state);
- if ($settings_form) {
- // Allow other modules to alter the formatter settings form.
- $context = array(
- 'module' => $formatter['module'],
- 'formatter' => $formatter,
- 'field' => $field,
- 'instance' => $instance,
- 'view_mode' => $view_mode,
- 'form' => $form,
- 'form_state' => $form_state,
- );
- drupal_alter('field_formatter_settings_form', $settings_form, $context);
- $settings_form['#tree'] = TRUE;
- $form['ctools_field_list']['#value'][] = $field;
- $form += $settings_form;
- }
+ $instance = ctools_fields_fake_field_instance($field['field_name'], $view_mode, $formatter_type, $conf['formatter_settings']);
+ if (function_exists($function)) {
+ $settings_form = $function($field, $instance, $view_mode, $form, $form_state);
}
+ if (empty($settings_form)) {
+ $settings_form = array();
+ }
+
+ // Allow other modules to alter the formatter settings form.
+ $context = array(
+ 'module' => $formatter['module'],
+ 'formatter' => $formatter,
+ 'field' => $field,
+ 'instance' => $instance,
+ 'view_mode' => $view_mode,
+ 'form' => $form,
+ 'form_state' => $form_state,
+ );
+ drupal_alter('field_formatter_settings_form', $settings_form, $context);
+
+ $settings_form['#tree'] = TRUE;
+ $form['ctools_field_list']['#value'][] = $field;
+ $form += $settings_form;
if (isset($field['cardinality']) && $field['cardinality'] != 1) {
list($prefix, $suffix) = explode('@count', t('Skip the first @count item(s)'));
@@ -137,7 +139,7 @@ function ctools_fields_get_field_formatter_settings_form($field, $formatter_type
*/
function ctools_fields_get_field_formatter_info($fields) {
$info = array();
- $field_info = module_invoke_all('field_formatter_info');
+ $field_info = field_info_formatter_types();
foreach ($fields as $field) {
foreach ($field_info as $format_name => $formatter_info) {
if (in_array($field['type'], $formatter_info['field types'])) {
@@ -145,7 +147,6 @@ function ctools_fields_get_field_formatter_info($fields) {
}
}
}
- drupal_alter('field_formatter_info', $info);
return $info;
}
@@ -209,15 +210,15 @@ function ctools_field_label($field_name) {
* - Otherwise NULL.
* @param $options
* An associative array of additional options, with the following keys:
- * - 'field_name': The name of the field whose operation should be
+ * - 'field_name': The name of the field whose operation should be
* invoked. By default, the operation is invoked on all the fields
* in the entity's bundle. NOTE: This option is not compatible with
* the 'deleted' option; the 'field_id' option should be used
* instead.
- * - 'field_id': The id of the field whose operation should be
+ * - 'field_id': The id of the field whose operation should be
* invoked. By default, the operation is invoked on all the fields
* in the entity's' bundles.
- * - 'default': A boolean value, specifying which implementation of
+ * - 'default': A boolean value, specifying which implementation of
* the operation should be invoked.
* - if FALSE (default), the field types implementation of the operation
* will be invoked (hook_field_[op])
@@ -225,10 +226,10 @@ function ctools_field_label($field_name) {
* will be invoked (field_default_[op])
* Internal use only. Do not explicitely set to TRUE, but use
* _field_invoke_default() instead.
- * - 'deleted': If TRUE, the function will operate on deleted fields
+ * - 'deleted': If TRUE, the function will operate on deleted fields
* as well as non-deleted fields. If unset or FALSE, only
* non-deleted fields are operated on.
- * - 'language': A language code or an array of language codes keyed by field
+ * - 'language': A language code or an array of language codes keyed by field
* name. It will be used to narrow down to a single value the available
* languages to act on.
*
@@ -341,7 +342,7 @@ function ctools_field_foreign_keys($field_name) {
$foreign_keys[$field_name] = $field['foreign keys'];
}
else {
- // try to fetch foreign keys from schema, as not everything
+ // Try to fetch foreign keys from schema, as not everything
// stores foreign keys properly in the field info.
$module = $field['module'];
diff --git a/sites/all/modules/contrib/dev/ctools/includes/jump-menu.inc b/sites/all/modules/contrib/dev/ctools/includes/jump-menu.inc
index a5f99aa..e2ae1cf 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/jump-menu.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/jump-menu.inc
@@ -8,7 +8,6 @@
* if javascript is in use. Each item is keyed to the href that the button
* should go to. With javascript, the page is immediately redirected. Without
* javascript, the form is submitted and a drupal_goto() is given.
- *
*/
/**
@@ -51,7 +50,7 @@ function ctools_jump_menu($form, &$form_state, $select, $options = array()) {
'hide' => TRUE,
);
- ctools_add_js('jump-menu');
+ $form['#attached']['js'][] = ctools_attach_js('jump-menu');
if (!empty($options['choose'])) {
$select = array('' => $options['choose']) + $select;
@@ -127,7 +126,7 @@ function ctools_jump_menu_submit($form, &$form_state) {
// This allows duplicate paths to be used in jump menus for multiple options.
$redirect_array = explode("::", $form_state['values']['jump']);
- if(isset($redirect_array[1]) && !empty($redirect_array[1])){
+ if (isset($redirect_array[1]) && !empty($redirect_array[1])) {
$redirect = $redirect_array[1];
}
else {
diff --git a/sites/all/modules/contrib/dev/ctools/includes/language.inc b/sites/all/modules/contrib/dev/ctools/includes/language.inc
index 9a7850b..a850670 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/language.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/language.inc
@@ -1,5 +1,9 @@
t("Current user's language"),
@@ -41,4 +44,4 @@ function ctools_language_list_all() {
);
$languages = array_merge($languages, ctools_language_list());
return $languages;
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/math-expr.inc b/sites/all/modules/contrib/dev/ctools/includes/math-expr.inc
index beffb93..d82281e 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/math-expr.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/math-expr.inc
@@ -99,7 +99,10 @@ class ctools_math_expr {
'sqrt','abs','ln','log',
'time', 'ceil', 'floor', 'min', 'max', 'round');
- function ctools_math_expr() {
+ /**
+ * ctools_math_expr constructor.
+ */
+ function __construct() {
// make the variables a little more accurate
$this->v['pi'] = pi();
$this->v['e'] = exp(1);
@@ -271,7 +274,7 @@ class ctools_math_expr {
} elseif (in_array($op, $ops) and !$expecting_op) {
return $this->trigger("unexpected operator '$op'");
} else { // I don't even want to know what you did to get here
- return $this->trigger("an unexpected error occured");
+ return $this->trigger("an unexpected error occurred");
}
if ($index == strlen($expr)) {
if (in_array($op, $ops)) { // did we end with an operator? bad.
diff --git a/sites/all/modules/contrib/dev/ctools/includes/modal.inc b/sites/all/modules/contrib/dev/ctools/includes/modal.inc
index ee969ab..18b216f 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/modal.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/modal.inc
@@ -55,9 +55,9 @@ function ctools_modal_add_js() {
'alt' => t('Close window'),
)),
'throbber' => theme('image', array(
- 'path' => ctools_image_path('throbber.gif'),
- 'title' => t('Loading...'),
- 'alt' => t('Loading'),
+ 'path' => ctools_image_path('throbber.gif'),
+ 'title' => t('Loading...'),
+ 'alt' => t('Loading'),
)),
),
);
@@ -66,6 +66,7 @@ function ctools_modal_add_js() {
drupal_add_library('system', 'jquery.form');
drupal_add_library('system', 'drupal.progress');
drupal_add_library('system', 'drupal.ajax');
+ drupal_add_library('system', 'ui');
ctools_add_js('modal');
ctools_add_css('modal');
@@ -84,7 +85,7 @@ function ctools_modal_add_plugin_js($plugins) {
if (file_exists($file)) {
$js[$file] = TRUE;
}
- else if (file(exists($subtype['path'] . '/' . $file))) {
+ elseif (file(exists($subtype['path'] . '/' . $file))) {
$js[$subtype['path'] . '/' . $file] = TRUE;
}
}
@@ -94,7 +95,7 @@ function ctools_modal_add_plugin_js($plugins) {
if (file_exists($file)) {
$css[$file] = TRUE;
}
- else if (file(exists($subtype['path'] . '/' . $file))) {
+ elseif (file(exists($subtype['path'] . '/' . $file))) {
$css[$subtype['path'] . '/' . $file] = TRUE;
}
}
@@ -139,7 +140,7 @@ function ctools_modal_command_dismiss() {
}
/**
- * Display loading screen in the modal
+ * Display loading screen in the modal.
*/
function ctools_modal_command_loading() {
return array(
@@ -188,7 +189,7 @@ function ctools_modal_text_button($text, $dest, $alt, $class = '') {
* Wrap a form so that we can use it properly with AJAX. Essentially if the
* form wishes to render, it automatically does that, otherwise it returns
* the render array so we can see submission results.
-
+ *
* @param array $form
* An associative array containing the structure of the form.
* @param array $form_state
@@ -221,7 +222,7 @@ function ctools_modal_form_wrapper($form_id, &$form_state) {
$output = drupal_build_form($form_id, $form_state);
if (!empty($form_state['ajax']) && (!$form_state['executed'] || $form_state['rebuild'])) {
- return ctools_modal_form_render($form_state, $output);
+ return ctools_modal_form_render($form_state, $output);
}
return $output;
diff --git a/sites/all/modules/contrib/dev/ctools/includes/object-cache.inc b/sites/all/modules/contrib/dev/ctools/includes/object-cache.inc
index 29225b0..ef52f9a 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/object-cache.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/object-cache.inc
@@ -27,6 +27,7 @@
* defaults to session_id().
*
* @deprecated $skip_cache is deprecated in favor of drupal_static*
+ *
* @return
* The data that was cached.
*/
@@ -42,8 +43,11 @@ function ctools_object_cache_get($obj, $name, $skip_cache = FALSE, $sid = NULL)
}
if (!array_key_exists($key, $cache)) {
- $data = db_query('SELECT * FROM {ctools_object_cache} WHERE sid = :session_id AND obj = :object AND name = :name', array(':session_id' => $sid, ':object' => $obj, ':name' => $name))
- ->fetchObject();
+ $data = db_query('SELECT * FROM {ctools_object_cache} WHERE sid = :session_id AND obj = :object AND name = :name', array(
+ ':session_id' => $sid,
+ ':object' => $obj,
+ ':name' => md5($name),
+ ))->fetchObject();
if ($data) {
$cache[$key] = unserialize($data->data);
}
@@ -83,7 +87,7 @@ function ctools_object_cache_set($obj, $name, $cache, $sid = NULL) {
->fields(array(
'sid' => $sid,
'obj' => $obj,
- 'name' => $name,
+ 'name' => md5($name),
'data' => serialize($cache),
'updated' => REQUEST_TIME,
))
@@ -91,7 +95,7 @@ function ctools_object_cache_set($obj, $name, $cache, $sid = NULL) {
}
/**
- * Remove an object from the non-volatile ctools cache
+ * Remove an object from the non-volatile ctools cache.
*
* @param $obj
* A 128 character or less string to define what kind of object is being
@@ -103,7 +107,6 @@ function ctools_object_cache_set($obj, $name, $cache, $sid = NULL) {
* defaults to session_id().
*/
function ctools_object_cache_clear($obj, $name, $sid = NULL) {
-
if (!$sid) {
$sid = session_id();
}
@@ -111,13 +114,12 @@ function ctools_object_cache_clear($obj, $name, $sid = NULL) {
db_delete('ctools_object_cache')
->condition('sid', $sid)
->condition('obj', $obj)
- ->condition('name', $name)
+ ->condition('name', md5($name))
->execute();
// Ensure the static cache is emptied of this obj:name set.
drupal_static_reset('ctools_object_cache_get');
}
-
/**
* Determine if another user has a given object cached.
*
@@ -142,8 +144,11 @@ function ctools_object_cache_test($obj, $name, $sid = NULL) {
$sid = session_id();
}
- return db_query('SELECT s.uid, c.updated FROM {ctools_object_cache} c INNER JOIN {sessions} s ON c.sid = s.sid WHERE s.sid <> :session_id AND c.obj = :obj AND c.name = :name ORDER BY c.updated ASC', array(':session_id' => $sid, ':obj' => $obj, ':name' => $name))
- ->fetchObject();
+ return db_query('SELECT s.uid, c.updated FROM {ctools_object_cache} c INNER JOIN {sessions} s ON c.sid = s.sid WHERE s.sid <> :session_id AND c.obj = :obj AND c.name = :name ORDER BY c.updated ASC', array(
+ ':session_id' => $sid,
+ ':obj' => $obj,
+ ':name' => md5($name),
+ ))->fetchObject();
}
/**
@@ -162,6 +167,7 @@ function ctools_object_cache_test($obj, $name, $sid = NULL) {
* An array of objects containing the UID and updated date for each name found.
*/
function ctools_object_cache_test_objects($obj, $names) {
+ array_walk($names, 'md5');
return db_query("SELECT c.name, s.uid, c.updated FROM {ctools_object_cache} c INNER JOIN {sessions} s ON c.sid = s.sid WHERE c.obj = :obj AND c.name IN (:names) ORDER BY c.updated ASC", array(':obj' => $obj, ':names' => $names))
->fetchAllAssoc('name');
}
@@ -180,7 +186,7 @@ function ctools_object_cache_test_objects($obj, $names) {
function ctools_object_cache_clear_all($obj, $name) {
db_delete('ctools_object_cache')
->condition('obj', $obj)
- ->condition('name', $name)
+ ->condition('name', md5($name))
->execute();
// Ensure the static cache is emptied of this obj:name set.
$cache = &drupal_static('ctools_object_cache_get', array());
@@ -197,7 +203,8 @@ function ctools_object_cache_clear_all($obj, $name) {
*/
function ctools_object_cache_clean($age = NULL) {
if (empty($age)) {
- $age = 86400 * 7; // 7 days
+ // 7 days.
+ $age = 86400 * 7;
}
db_delete('ctools_object_cache')
->condition('updated', REQUEST_TIME - $age, '<')
diff --git a/sites/all/modules/contrib/dev/ctools/includes/page-wizard.inc b/sites/all/modules/contrib/dev/ctools/includes/page-wizard.inc
index a211361..9690aae 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/page-wizard.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/page-wizard.inc
@@ -1,5 +1,9 @@
plugin = $plugin;
if ($function = ctools_plugin_get_function($plugin, 'default cache')) {
$function($cache);
diff --git a/sites/all/modules/contrib/dev/ctools/includes/plugins-admin.inc b/sites/all/modules/contrib/dev/ctools/includes/plugins-admin.inc
index d4ead0a..c11fcfd 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/plugins-admin.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/plugins-admin.inc
@@ -10,6 +10,7 @@
*
* Implementing this
*/
+
/**
* Get a plugin configuration form.
*
@@ -100,7 +101,7 @@ function _ctools_plugin_configure_create_form_info(&$form_info, $plugin_definiti
if (empty($plugin_definition['title'])) {
$title = t('Configure');
}
- else if ($op == 'add') {
+ elseif ($op == 'add') {
$title = t('Configure new !plugin_title', array('!plugin_title' => $plugin_definition['title']));
}
else {
@@ -134,10 +135,10 @@ function _ctools_plugin_configure_create_form_info(&$form_info, $plugin_definiti
$form_info['forms']['form']['wrapper'] = 'ctools_plugins_default_form_wrapper';
}
}
- else if (is_array($info)) {
- if (empty($form_info['order'])) {
- $form_info['order'] = array();
- }
+ elseif (is_array($info)) {
+ if (empty($form_info['order'])) {
+ $form_info['order'] = array();
+ }
if (empty($form_info['forms'])) {
$form_info['forms'] = array();
}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/plugins.inc b/sites/all/modules/contrib/dev/ctools/includes/plugins.inc
index eadb68f..7b53ae1 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/plugins.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/plugins.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Contains routines to organize and load plugins. It allows a special
* variation of the hook system so that plugins can be kept in separate
* .inc files, and can be either loaded all at once or loaded only when
@@ -70,7 +69,7 @@ function ctools_plugin_api_info($owner, $api, $minimum_version, $current_version
if (isset($info['version'])) {
$version = $info['version'];
}
- else if (isset($info['api'])) {
+ elseif (isset($info['api'])) {
$version = $info['api'];
}
@@ -79,7 +78,9 @@ function ctools_plugin_api_info($owner, $api, $minimum_version, $current_version
}
// Only process if version is between minimum and current, inclusive.
- if (version_compare($version, $minimum_version, '>=') && version_compare($version, $current_version, '<=')) {
+ if (($version == $minimum_version) || ($version == $current_version)
+ || (version_compare($version, $minimum_version, '>=')
+ && version_compare($version, $current_version, '<='))) {
if (!isset($info['path'])) {
$info['path'] = drupal_get_path('module', $module);
}
@@ -97,7 +98,7 @@ function ctools_plugin_api_info($owner, $api, $minimum_version, $current_version
}
// Only process if version is between minimum and current, inclusive.
- if (version_compare($info['version'], $minimum_version, '>=') && version_compare($info['version'], $current_version, '<=')) {
+ if (version_compare($info['version'], $minimum_version, '>=') && version_compare($info['version'], $current_version, '<=')) {
if (!isset($info['path'])) {
$info['path'] = '';
}
@@ -110,7 +111,7 @@ function ctools_plugin_api_info($owner, $api, $minimum_version, $current_version
}
// Allow other modules to hook in.
- drupal_alter($hook, $cache[$owner][$api]);
+ drupal_alter($hook, $cache[$owner][$api], $owner, $api);
}
return $cache[$owner][$api];
@@ -149,7 +150,7 @@ function ctools_plugin_api_include($owner, $api, $minimum_version, $current_vers
if (isset($plugin_info["$api file"])) {
$file = $plugin_info["$api file"];
}
- else if (isset($plugin_info['file'])) {
+ elseif (isset($plugin_info['file'])) {
$file = $plugin_info['file'];
}
else {
@@ -159,7 +160,7 @@ function ctools_plugin_api_include($owner, $api, $minimum_version, $current_vers
if (file_exists(DRUPAL_ROOT . "/$plugin_info[path]/$file")) {
require_once DRUPAL_ROOT . "/$plugin_info[path]/$file";
}
- else if (file_exists(DRUPAL_ROOT . "/$file")) {
+ elseif (file_exists(DRUPAL_ROOT . "/$file")) {
require_once DRUPAL_ROOT . "/$file";
}
$already_done[$owner][$api][$module] = TRUE;
@@ -182,7 +183,7 @@ function ctools_plugin_api_get_hook($owner, $api) {
if (function_exists($function = $owner . '_' . $api . '_hook_name')) {
$hook = $function();
}
- else if (function_exists($function = $owner . '_ctools_plugin_api_hook_name')) {
+ elseif (function_exists($function = $owner . '_ctools_plugin_api_hook_name')) {
$hook = $function();
}
@@ -198,22 +199,22 @@ function ctools_plugin_api_get_hook($owner, $api) {
/**
* Fetch a group of plugins by name.
*
- * @param $module
- * The name of the module that utilizes this plugin system. It will be
- * used to call hook_ctools_plugin_$plugin() to get more data about the plugin.
- * @param $type
+ * @param string $module
+ * The name of the module that utilizes this plugin system. It will be used to
+ * get more data about the plugin as defined on hook_ctools_plugin_type().
+ * @param string $type
* The type identifier of the plugin.
- * @param $id
+ * @param string $id
* If specified, return only information about plugin with this identifier.
* The system will do its utmost to load only plugins with this id.
*
- * @return
- * An array of information arrays about the plugins received. The contents
- * of the array are specific to the plugin.
+ * @return array
+ * An array of information arrays about the plugins received. The contents of
+ * the array are specific to the plugin.
*/
function ctools_get_plugins($module, $type, $id = NULL) {
// Store local caches of plugins and plugin info so we don't have to do full
- // lookups everytime.
+ // lookups every time.
static $drupal_static_fast;
if (!isset($drupal_static_fast)) {
$drupal_static_fast['plugins'] = &drupal_static('ctools_plugins', array());
@@ -222,10 +223,14 @@ function ctools_get_plugins($module, $type, $id = NULL) {
$info = ctools_plugin_get_plugin_type_info();
- // Bail out noisily if an invalid module/type combination is requested.
if (!isset($info[$module][$type])) {
- watchdog('ctools', 'Invalid plugin module/type combination requested: module @module and type @type', array('@module' => $module, '@type' => $type), WATCHDOG_ERROR);
- return array();
+ // If we don't find the plugin we attempt a cache rebuild before bailing out.
+ $info = ctools_plugin_get_plugin_type_info(TRUE);
+ // Bail out noisily if an invalid module/type combination is requested.
+ if (!isset($info[$module][$type])) {
+ watchdog('ctools', 'Invalid plugin module/type combination requested: module @module and type @type', array('@module' => $module, '@type' => $type), WATCHDOG_ERROR);
+ return array();
+ }
}
// Make sure our plugins array is populated.
@@ -233,8 +238,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
$plugins[$module][$type] = array();
}
- // Attempt to shortcut this whole piece of code if we already have
- // the requested plugin:
+ // Attempt to shortcut this whole piece of code if we already have the
+ // requested plugin:
if ($id && array_key_exists($id, $plugins[$module][$type])) {
return $plugins[$module][$type][$id];
}
@@ -252,9 +257,9 @@ function ctools_get_plugins($module, $type, $id = NULL) {
if (!empty($cache->data)) {
// Cache load succeeded so use the cached plugin list.
- $plugins[$module][$type] = $cache->data;
+ $plugins[$module][$type] = $cache->data;
// Set $setup to true so we know things where loaded.
- $setup[$module][$type] = TRUE;
+ $setup[$module][$type] = TRUE;
}
else {
// Cache load failed so store that we need to build and write the cache.
@@ -269,8 +274,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
$plugins[$module][$type] = ctools_plugin_load_hooks($info[$module][$type]);
}
- // Then see if we should load all files. We only do this if we
- // want a list of all plugins or there was a cache miss.
+ // Then see if we should load all files. We only do this if we want a list of
+ // all plugins or there was a cache miss.
if (empty($setup[$module][$type]) && ($build_cache || !$id)) {
$setup[$module][$type] = TRUE;
$plugins[$module][$type] = array_merge($plugins[$module][$type], ctools_plugin_load_includes($info[$module][$type]));
@@ -293,9 +298,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
}
}
-
- // If we were told earlier that this is cacheable and the cache was
- // empty, give something back.
+ // If we were told earlier that this is cacheable and the cache was empty,
+ // give something back.
if ($build_cache) {
cache_set("plugins:$module:$type", $plugins[$module][$type], $info[$module][$type]['cache table']);
}
@@ -307,7 +311,7 @@ function ctools_get_plugins($module, $type, $id = NULL) {
return array_filter($plugins[$module][$type]);
}
- // Check to see if we need to look for the file
+ // Check to see if we need to look for the file.
if (!array_key_exists($id, $plugins[$module][$type])) {
// If we can have child plugins, check to see if the plugin name is in the
// format of parent:child and break it up if it is.
@@ -413,19 +417,20 @@ function ctools_get_plugins_reset() {
/**
* Load plugins from a directory.
*
- * @param $info
+ * @param array $info
* The plugin info as returned by ctools_plugin_get_info()
- * @param $file
+ * @param string $filename
* The file to load if we're looking for just one particular plugin.
*
- * @return
- * An array of information created for this plugin.
+ * @return array
+ * A (possibly empty) array of information created for this plugin.
*/
function ctools_plugin_load_includes($info, $filename = NULL) {
// Keep a static array so we don't hit file_scan_directory more than necessary.
$all_files = &drupal_static(__FUNCTION__, array());
- // store static of plugin arrays for reference because they can't be reincluded.
+ // Store static of plugin arrays for reference because they can't be
+ // reincluded, so there is no point in using drupal_static().
static $plugin_arrays = array();
if (!isset($all_files[$info['module']][$info['type']])) {
@@ -460,24 +465,23 @@ function ctools_plugin_load_includes($info, $filename = NULL) {
}
foreach ($files as $file) {
if (!empty($info['info file'])) {
- // Parse a .info file
+ // Parse a .info file.
$result = ctools_plugin_process_info($info, $module, $file);
}
else {
// Parse a hook.
- $plugin = NULL; // ensure that we don't have something leftover from earlier.
+ // Ensure that we don't have something leftover from earlier.
+ $plugin = NULL;
if (isset($plugin_arrays[$file->uri])) {
$identifier = $plugin_arrays[$file->uri];
}
else {
-
- require_once DRUPAL_ROOT . '/' . $file->uri;
+ include_once DRUPAL_ROOT . '/' . $file->uri;
// .inc files have a special format for the hook identifier.
// For example, 'foo.inc' in the module 'mogul' using the plugin
- // whose hook is named 'borg_type' should have a function named (deep breath)
- // mogul_foo_borg_type()
-
+ // whose hook is named 'borg_type' should have a function named
+ // (deep breath) mogul_foo_borg_type().
// If, however, the .inc file set the quasi-global $plugin array, we
// can use that and not even call a function. Set the $identifier
// appropriately and ctools_plugin_process() will handle it.
@@ -490,7 +494,8 @@ function ctools_plugin_load_includes($info, $filename = NULL) {
}
}
- $result = ctools_plugin_process($info, $module, $identifier, dirname($file->uri), basename($file->uri), $file->name);
+ $result = ctools_plugin_process($info, $module, $identifier,
+ dirname($file->uri), basename($file->uri), $file->name);
}
if (is_array($result)) {
$plugins = array_merge($plugins, $result);
@@ -510,7 +515,7 @@ function ctools_plugin_load_includes($info, $filename = NULL) {
* @param $info
* The $info array for the plugin as returned by ctools_plugin_get_info().
*
- * @return array $directories
+ * @return array
* An array of directories to search.
*/
function ctools_plugin_get_directories($info) {
@@ -536,10 +541,9 @@ function ctools_plugin_get_directories($info) {
}
/**
- * Helper function to build a ctools-friendly list of themes capable of
- * providing plugins.
+ * Helper to build a ctools-friendly list of themes capable of providing plugins.
*
- * @return array $themes
+ * @return array
* A list of themes that can act as plugin providers, sorted parent-first with
* the active theme placed last.
*/
@@ -550,7 +554,7 @@ function _ctools_list_themes() {
$themes = $active = array();
$all_themes = list_themes();
foreach ($all_themes as $name => $theme) {
- // Only search from active themes
+ // Only search from active themes.
if (empty($theme->status) && $theme->name != $current) {
continue;
}
@@ -561,19 +565,19 @@ function _ctools_list_themes() {
}
}
- // Construct a parent-first list of all themes
+ // Construct a parent-first list of all themes.
foreach ($active as $name => $theme) {
$base_themes = isset($theme->base_themes) ? $theme->base_themes : array();
$themes = array_merge($themes, $base_themes, array($name => $theme->info['name']));
}
- // Put the actual theme info objects into the array
+ // Put the actual theme info objects into the array.
foreach (array_keys($themes) as $name) {
if (isset($all_themes[$name])) {
$themes[$name] = $all_themes[$name];
}
}
- // Make sure the current default theme always gets the last word
+ // Make sure the current default theme always gets the last word.
if ($current_key = array_search($current, array_keys($themes))) {
$themes += array_splice($themes, $current_key, 1);
}
@@ -581,7 +585,6 @@ function _ctools_list_themes() {
return $themes;
}
-
/**
* Find all the base themes for the specified theme.
*
@@ -597,9 +600,10 @@ function _ctools_list_themes() {
* The name of the theme whose base we are looking for.
* @param $used_keys
* A recursion parameter preventing endless loops.
- * @return
+ *
+ * @return array
* Returns an array of all of the theme's ancestors; the first element's value
- * will be NULL if an error occurred.
+ * will be NULL if an error occurred. (Note: this is NOT $arr[0]).
*/
function ctools_find_base_themes($themes, $key, $used_keys = array()) {
$base_key = $themes[$key]->info['base theme'];
@@ -627,7 +631,6 @@ function ctools_find_base_themes($themes, $key, $used_keys = array()) {
return $current_base_theme;
}
-
/**
* Load plugin info for the provided hook; this is handled separately from
* plugins from files.
@@ -652,22 +655,28 @@ function ctools_plugin_load_hooks($info) {
/**
* Process a single hook implementation of a ctools plugin.
*
- * @param $info
+ * @param array $info
* The $info array about the plugin as returned by ctools_plugin_get_info()
- * @param $module
+ * @param string $module
* The module that implements the plugin being processed.
- * @param $identifier
- * The plugin identifier, which is used to create the name of the hook
- * function being called.
- * @param $path
+ * @param string|array $identifier
+ * Used to create the base setting of return value. If:
+ * - $identifier is a string, a hook name is created from this and the 'hook'
+ * key of the $info array, and the return value of that hook function is
+ * used. The hook is called like this: $identifier_$hook($info);
+ * - $identifier is an array, this array is used directly.
+ * @param string $path
* The path where files utilized by this plugin will be found.
- * @param $file
+ * @param string $file
* The file that was loaded for this plugin, if it exists.
- * @param $base
+ * @param string $base
* The base plugin name to use. If a file was loaded for the plugin, this
* is the plugin to assume must be present. This is used to automatically
* translate the array to make the syntax more friendly to plugin
* implementors.
+ *
+ * @return null|array
+ * NULL on failure, otherwise an array containing the results keyed by name.
*/
function ctools_plugin_process($info, $module, $identifier, $path, $file = NULL, $base = NULL) {
if (is_array($identifier)) {
@@ -735,9 +744,19 @@ function _ctools_process_data($result, $plugin_type_info, $module, $path, $file)
return $result;
}
-
/**
* Process an info file for plugin information, rather than a hook.
+ *
+ * @param array $info
+ * The $info array about the plugin as returned by ctools_plugin_get_info()
+ * @param string $module
+ * The module that implements the plugin being processed.
+ * @param object $file
+ * An object containing 'uri' and 'name' properties. 'uri' is the name of the
+ * 'info' file to process. 'name' is the plugin key-name.
+ *
+ * @return null|array
+ * NULL on failure, otherwise an array containing the results keyed by name.
*/
function ctools_plugin_process_info($info, $module, $file) {
$result = drupal_parse_info_file($file->uri);
@@ -764,7 +783,7 @@ function ctools_plugin_get_info($module, $type) {
* @param $function_name
* The identifier of the function. For example, 'settings form'.
*
- * @return
+ * @return string
* The actual name of the function to call, or NULL if the function
* does not exist.
*/
@@ -781,7 +800,7 @@ function ctools_plugin_get_function($plugin_definition, $function_name) {
}
if (!isset($plugin_definition[$function_name])) {
- return;
+ return NULL;
}
if (is_array($plugin_definition[$function_name]) && isset($plugin_definition[$function_name]['function'])) {
@@ -816,7 +835,7 @@ function ctools_plugin_get_function($plugin_definition, $function_name) {
* @param $function_name
* The identifier of the function. For example, 'settings form'.
*
- * @return
+ * @return string
* The actual name of the function to call, or NULL if the function
* does not exist.
*/
@@ -834,7 +853,7 @@ function ctools_plugin_load_function($module, $type, $id, $function_name) {
* @param $class_name
* The identifier of the class. For example, 'handler'.
*
- * @return
+ * @return string
* The actual name of the class to call, or NULL if the class does not exist.
*/
function ctools_plugin_get_class($plugin_definition, $class_name) {
@@ -853,11 +872,11 @@ function ctools_plugin_get_class($plugin_definition, $class_name) {
if (!isset($plugin_definition[$class_name])) {
return;
}
- else if (is_string($plugin_definition[$class_name])) {
+ elseif (is_string($plugin_definition[$class_name])) {
// Plugin uses the string form shorthand.
$return = $plugin_definition[$class_name];
}
- else if (isset($plugin_definition[$class_name]['class'])) {
+ elseif (isset($plugin_definition[$class_name]['class'])) {
// Plugin uses the verbose array form.
$return = $plugin_definition[$class_name]['class'];
}
@@ -879,7 +898,7 @@ function ctools_plugin_get_class($plugin_definition, $class_name) {
* @param $class_name
* The identifier of the class. For example, 'handler'.
*
- * @return
+ * @return string
* The actual name of the class to call, or NULL if the class does not exist.
*/
function ctools_plugin_load_class($module, $type, $id, $class_name) {
diff --git a/sites/all/modules/contrib/dev/ctools/includes/registry.inc b/sites/all/modules/contrib/dev/ctools/includes/registry.inc
index 9d4328e..7e517bb 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/registry.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/registry.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Registry magic. In a separate file to minimize unnecessary code loading.
*/
diff --git a/sites/all/modules/contrib/dev/ctools/includes/stylizer.inc b/sites/all/modules/contrib/dev/ctools/includes/stylizer.inc
index 9fdc81d..488a7f3 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/stylizer.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/stylizer.inc
@@ -202,7 +202,7 @@ function ctools_stylizer_get_settings_name($settings) {
}
/**
- * Get the path where images will be stored for a given style plugin and settings.
+ * Get the path where images will be stored for a style plugin and settings.
*
* This function will make sure the path exists.
*/
@@ -249,7 +249,7 @@ class ctools_stylizer_image_processor {
if (is_string($plugin['actions']) && function_exists($plugin['actions'])) {
$actions = $plugin['actions']($plugin, $settings);
}
- else if (is_array($plugin['actions'])) {
+ elseif (is_array($plugin['actions'])) {
$actions = $plugin['actions'];
}
@@ -318,7 +318,7 @@ class ctools_stylizer_image_processor {
function command_load($name, $file) {
$this->log("New workspace: $name (from $file)");
if (!file_exists($file)) {
- // Try it relative to the plugin
+ // Try it relative to the plugin.
$file = $this->plugin['path'] . '/' . $file;
if (!file_exists($file)) {
$this->log("Unable to open $file");
@@ -336,7 +336,7 @@ class ctools_stylizer_image_processor {
}
/**
- * Create a new workspace using the properties of an existing workspace
+ * Create a new workspace using the properties of an existing workspace.
*/
function command_new_from($name, $workspace) {
$this->log("New workspace: $name from existing $workspace");
@@ -372,7 +372,7 @@ class ctools_stylizer_image_processor {
function command_merge_from($workspace, $x = 0, $y = 0) {
$this->log("Merge from: $workspace ($x, $y)");
if (empty($this->workspaces[$workspace])) {
- $this->log("Workspace $name does not exist.", 'error');
+ $this->log("Workspace $workspace does not exist.", 'error');
return;
}
@@ -382,7 +382,7 @@ class ctools_stylizer_image_processor {
function command_merge_to($workspace, $x = 0, $y = 0) {
$this->log("Merge to: $workspace ($x, $y)");
if (empty($this->workspaces[$workspace])) {
- $this->log("Workspace $name does not exist.", 'error');
+ $this->log("Workspace $workspace does not exist.", 'error');
return;
}
@@ -500,7 +500,7 @@ class ctools_stylizer_image_processor {
$palette[$luminosity_input]['green'] = $green;
$palette[$luminosity_input]['blue'] = $blue;
- // Now we complete the palette, first we'll do it tothe black, and then to
+ // Now we complete the palette, first we'll do it to the black, and then to
// the white.
// From input to black
@@ -822,7 +822,7 @@ function ctools_stylizer_add_plugin_forms(&$form_info, $plugin, $op) {
if ($op == 'add' && isset($plugin['add form'])) {
$id = $plugin['add form'];
}
- else if (isset($plugin['edit form'])) {
+ elseif (isset($plugin['edit form'])) {
$id = $plugin['edit form'];
}
else {
diff --git a/sites/all/modules/contrib/dev/ctools/includes/stylizer.theme.inc b/sites/all/modules/contrib/dev/ctools/includes/stylizer.theme.inc
index 85346c1..0ceedff 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/stylizer.theme.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/stylizer.theme.inc
@@ -25,4 +25,3 @@ function ctools_stylizer_theme(&$theme) {
'file' => 'includes/stylizer.inc',
);
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/includes/utility.inc b/sites/all/modules/contrib/dev/ctools/includes/utility.inc
index 82fc147..3c939a4 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/utility.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/utility.inc
@@ -23,7 +23,7 @@ function ctools_passthrough($module, $type, &$items) {
require_once DRUPAL_ROOT . '/' . $file->uri;
list($tool) = explode('.', $file->name, 2);
- $function = $module . '_' . str_replace ('-', '_', $tool) . '_' . str_replace('-', '_', $type);
+ $function = $module . '_' . str_replace('-', '_', $tool) . '_' . str_replace('-', '_', $type);
if (function_exists($function)) {
$function($items);
}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/uuid.inc b/sites/all/modules/contrib/dev/ctools/includes/uuid.inc
index b0567d3..f51838b 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/uuid.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/uuid.inc
@@ -9,7 +9,9 @@
/**
* Pattern for detecting a valid UUID.
*/
-define('UUID_PATTERN', '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}');
+if (!defined('UUID_PATTERN')) {
+ define('UUID_PATTERN', '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}');
+}
/**
* Generates a UUID using the Windows internal GUID generator.
@@ -25,7 +27,8 @@ function _ctools_uuid_generate_com() {
* Generates an universally unique identifier using the PECL extension.
*/
function _ctools_uuid_generate_pecl() {
- return uuid_create(UUID_TYPE_DEFAULT);
+ $uuid_type = UUID_TYPE_DEFAULT;
+ return uuid_create($uuid_type);
}
/**
@@ -64,4 +67,5 @@ if (!function_exists('uuid_is_valid')) {
function uuid_is_valid($uuid) {
return preg_match('/^' . UUID_PATTERN . '$/', $uuid);
}
+
}
diff --git a/sites/all/modules/contrib/dev/ctools/includes/views.inc b/sites/all/modules/contrib/dev/ctools/includes/views.inc
index 4ef6439..9c1ee6c 100644
--- a/sites/all/modules/contrib/dev/ctools/includes/views.inc
+++ b/sites/all/modules/contrib/dev/ctools/includes/views.inc
@@ -1,5 +1,9 @@
$params) {
$form_info['order'][$step_id] = $params['title'];
@@ -83,7 +83,7 @@ function ctools_wizard_multistep_form($form_info, $step, &$form_state) {
$form_info['cache location'] = 'storage';
}
- // If absolutely nothing was set for the cache area to work on
+ // If absolutely nothing was set for the cache area to work on.
if (!isset($form_state[$form_info['cache location']])) {
ctools_include('cache');
$form_state[$form_info['cache location']] = ctools_cache_get($form_info['cache mechanism'], $form_info['cache key']);
@@ -199,7 +199,7 @@ function ctools_wizard_multistep_form($form_info, $step, &$form_state) {
}
}
}
- else if (isset($form_state['ajax next'])) {
+ elseif (isset($form_state['ajax next'])) {
// Clear a few items off the form state so we don't double post:
$next = $form_state['ajax next'];
unset($form_state['ajax next']);
@@ -299,7 +299,7 @@ function ctools_wizard_wrapper($form, &$form_state) {
'#wizard type' => 'next',
'#weight' => -2000,
'#limit_validation_errors' => array(),
- // hardcode the submit so that it doesn't try to save data.
+ // Hardcode the submit so that it doesn't try to save data.
'#submit' => array('ctools_wizard_submit'),
'#attributes' => $button_attributes,
);
@@ -325,19 +325,18 @@ function ctools_wizard_wrapper($form, &$form_state) {
// end of the form list (i.e, there is a next) then it's "update and return"
// to be clear. If this is the end of the path and there is no next, we
// call it 'Finish'.
-
// Even if there is no direct return path (some forms may not want you
// leaving in the middle) the final button is always a Finish and it does
// whatever the return action is.
if (!empty($form_info['show return']) && !empty($form_state['next'])) {
$form['buttons']['return'] = array(
'#type' => 'submit',
- '#value' => $form_info['return text'],
+ '#value' => $form_info['return text'],
'#wizard type' => 'return',
'#attributes' => $button_attributes,
);
}
- else if (empty($form_state['next']) || !empty($form_info['free trail'])) {
+ elseif (empty($form_state['next']) || !empty($form_info['free trail'])) {
$form['buttons']['return'] = array(
'#type' => 'submit',
'#value' => $form_info['finish text'],
@@ -352,7 +351,7 @@ function ctools_wizard_wrapper($form, &$form_state) {
'#type' => 'submit',
'#value' => $form_info['cancel text'],
'#wizard type' => 'cancel',
- // hardcode the submit so that it doesn't try to save data.
+ // Hardcode the submit so that it doesn't try to save data.
'#limit_validation_errors' => array(),
'#submit' => array('ctools_wizard_submit'),
'#attributes' => $button_attributes,
@@ -370,7 +369,6 @@ function ctools_wizard_wrapper($form, &$form_state) {
// Set up our submit handler after theirs. Since putting something here will
// skip Drupal's autodetect, we autodetect for it.
-
// We make sure ours is after theirs so that they get to change #next if
// the want to.
$form['#submit'] = array();
@@ -398,7 +396,7 @@ function ctools_wizard_wrapper($form, &$form_state) {
$params = array($url, $options);
}
- $form['#action'] = call_user_func_array('url', $params);
+ $form['#action'] = call_user_func_array('url', $params);
}
if (isset($info['wrapper']) && function_exists($info['wrapper'])) {
@@ -418,7 +416,7 @@ function ctools_wizard_submit(&$form, &$form_state) {
if (isset($form_state['clicked_button']['#wizard type'])) {
$type = $form_state['clicked_button']['#wizard type'];
- // if AJAX enabled, we proceed slightly differently here.
+ // If AJAX enabled, we proceed slightly differently here.
if (!empty($form_state['ajax'])) {
if ($type == 'next') {
$form_state['ajax next'] = $form_state['clicked_button']['#next'];
@@ -428,7 +426,7 @@ function ctools_wizard_submit(&$form, &$form_state) {
if ($type == 'cancel' && isset($form_state['form_info']['cancel path'])) {
$form_state['redirect'] = $form_state['form_info']['cancel path'];
}
- else if ($type == 'next') {
+ elseif ($type == 'next') {
$form_state['redirect'] = ctools_wizard_get_path($form_state['form_info'], $form_state['clicked_button']['#next']);
if (!empty($_GET['destination'])) {
// We don't want drupal_goto redirect this request
@@ -437,10 +435,10 @@ function ctools_wizard_submit(&$form, &$form_state) {
unset($_GET['destination']);
}
}
- else if (isset($form_state['form_info']['return path'])) {
+ elseif (isset($form_state['form_info']['return path'])) {
$form_state['redirect'] = $form_state['form_info']['return path'];
}
- else if ($type == 'finish' && isset($form_state['form_info']['cancel path'])) {
+ elseif ($type == 'finish' && isset($form_state['form_info']['cancel path'])) {
$form_state['redirect'] = $form_state['form_info']['cancel path'];
}
}
@@ -469,10 +467,8 @@ function ctools_wizard_get_path($form_info, $step) {
if (!isset($path[1]) || !is_array($path[1])) {
$path[1] = array();
}
- // Ensure that the query part of options is an array.
- $path[1] += array('query' => array());
// Add the destination parameter, if not set already.
- $path[1]['query'] += drupal_get_destination();
+ $path[1] += drupal_get_destination();
}
return $path;
@@ -505,15 +501,15 @@ function ctools_wizard_defaults(&$form_info) {
}
$form_info = $form_info + $defaults;
- // set form callbacks if they aren't defined
+ // Set form callbacks if they aren't defined.
foreach ($form_info['forms'] as $step => $params) {
- if (!$params['form id']) {
- $form_callback = $hook . '_' . $step . '_form';
- $form_info['forms'][$step]['form id'] = $form_callback;
+ if (empty($params['form id'])) {
+ $form_callback = $hook . '_' . $step . '_form';
+ $form_info['forms'][$step]['form id'] = $form_callback;
}
}
- // set button callbacks
+ // Set button callbacks.
$callbacks = array(
'back callback' => '_back',
'next callback' => '_next',
@@ -523,10 +519,10 @@ function ctools_wizard_defaults(&$form_info) {
);
foreach ($callbacks as $key => $callback) {
- // never overwrite if explicity defined
+ // Never overwrite if explicity defined.
if (empty($form_info[$key])) {
$wizard_callback = $hook . $callback;
- if (function_exists($wizard_callback)) {
+ if (function_exists($wizard_callback)) {
$form_info[$key] = $wizard_callback;
}
}
diff --git a/sites/all/modules/contrib/dev/ctools/js/auto-submit.js b/sites/all/modules/contrib/dev/ctools/js/auto-submit.js
index a3e9aa4..b658577 100644
--- a/sites/all/modules/contrib/dev/ctools/js/auto-submit.js
+++ b/sites/all/modules/contrib/dev/ctools/js/auto-submit.js
@@ -36,9 +36,11 @@ Drupal.behaviors.CToolsAutoSubmit = {
attach: function(context) {
// 'this' references the form element
function triggerSubmit (e) {
- var $this = $(this);
- if (!$this.hasClass('ctools-ajaxing')) {
- $this.find('.ctools-auto-submit-click').click();
+ if ($.contains(document.body, this)) {
+ var $this = $(this);
+ if (!$this.hasClass('ctools-ajaxing')) {
+ $this.find('.ctools-auto-submit-click').click();
+ }
}
}
diff --git a/sites/all/modules/contrib/dev/ctools/js/dependent.js b/sites/all/modules/contrib/dev/ctools/js/dependent.js
index f74ec81..a60fc12 100644
--- a/sites/all/modules/contrib/dev/ctools/js/dependent.js
+++ b/sites/all/modules/contrib/dev/ctools/js/dependent.js
@@ -97,7 +97,13 @@
else {
switch ($(trigger).attr('type')) {
case 'checkbox':
- var val = $(trigger).attr('checked') ? true : false;
+ // **This check determines if using a jQuery version 1.7 or newer which requires the use of the prop function instead of the attr function when not called on an attribute
+ if ($().prop) {
+ var val = $(trigger).prop('checked') ? true : false;
+ }
+ else {
+ var val = $(trigger).attr('checked') ? true : false;
+ }
if (val) {
$(trigger).siblings('label').removeClass('hidden-options').addClass('expanded-options');
@@ -148,34 +154,41 @@
len++;
}
- var object = $('#' + id + '-wrapper');
- if (!object.size()) {
- // Some elements can't use the parent() method or they can
- // damage things. They are guaranteed to have wrappers but
- // only if dependent.inc provided them. This check prevents
- // problems when multiple AJAX calls cause settings to build
- // up.
- var $original = $('#' + id);
- if ($original.is('fieldset') || $original.is('textarea')) {
- continue;
- }
-
- object = $('#' + id).parent();
+ var $original = $('#' + id);
+ if ($original.is('fieldset') || $original.is('textarea')) {
+ continue;
}
+ var object = $original.parent();
+
if (Drupal.settings.CTools.dependent[id].type == 'disable') {
if (Drupal.settings.CTools.dependent[id].num <= len) {
// Show if the element if criteria is matched
- object.attr('disabled', false);
- object.addClass('dependent-options');
- object.children().attr('disabled', false);
+ // **This check determines if using a jQuery version 1.7 or newer which requires the use of the prop function instead of the attr function when not called on an attribute
+ if (typeof $().prop == 'function') {
+ object.prop('disabled', false);
+ object.addClass('dependent-options');
+ object.children().prop('disabled', false);
+ }
+ else {
+ object.attr('disabled', false);
+ object.addClass('dependent-options');
+ object.children().attr('disabled', false);
+ }
}
else {
// Otherwise hide. Use css rather than hide() because hide()
// does not work if the item is already hidden, for example,
// in a collapsed fieldset.
- object.attr('disabled', true);
- object.children().attr('disabled', true);
+ // **This check determines if using a jQuery version 1.7 or newer which requires the use of the prop function instead of the attr function when not called on an attribute
+ if (typeof $().prop == 'function') {
+ object.prop('disabled', true);
+ object.children().prop('disabled', true);
+ }
+ else {
+ object.attr('disabled', true);
+ object.children().attr('disabled', true);
+ }
}
}
else {
diff --git a/sites/all/modules/contrib/dev/ctools/js/modal.js b/sites/all/modules/contrib/dev/ctools/js/modal.js
index 37908cf..ec7b02a 100644
--- a/sites/all/modules/contrib/dev/ctools/js/modal.js
+++ b/sites/all/modules/contrib/dev/ctools/js/modal.js
@@ -48,7 +48,8 @@
modalOptions: {
opacity: .55,
background: '#fff'
- }
+ },
+ modalClass: 'default'
};
var settings = {};
@@ -97,8 +98,8 @@
resize();
$('span.modal-title', Drupal.CTools.Modal.modal).html(Drupal.CTools.Modal.currentSettings.loadingText);
- Drupal.CTools.Modal.modalContent(Drupal.CTools.Modal.modal, settings.modalOptions, settings.animation, settings.animationSpeed);
- $('#modalContent .modal-content').html(Drupal.theme(settings.throbberTheme));
+ Drupal.CTools.Modal.modalContent(Drupal.CTools.Modal.modal, settings.modalOptions, settings.animation, settings.animationSpeed, settings.modalClass);
+ $('#modalContent .modal-content').html(Drupal.theme(settings.throbberTheme)).addClass('ctools-modal-loading');
// Position autocomplete results based on the scroll position of the modal.
$('#modalContent .modal-content').delegate('input.form-autocomplete', 'keyup', function() {
@@ -120,18 +121,18 @@
*/
Drupal.theme.prototype.CToolsModalDialog = function () {
var html = ''
- html += ' ';
$output .= '
';
$output .= '';
if ($vars['image']) {
$output .= '' . $vars['title'] . '';
@@ -77,14 +76,13 @@ function theme_ctools_dropdown($vars) {
else {
$output .= '' . check_plain($vars['title']) . '';
}
-
- $output .= '
'; // wrapper
+ $output .= '';
$output .= '
'; // container wrapper
- $output .= '';
$output .= theme_links(array('links' => $vars['links'], 'attributes' => array(), 'heading' => ''));
- $output .= '
'; // container
- $output .= ''
- html += '
-
\ No newline at end of file
+
diff --git a/sites/all/modules/contrib/dev/ctools/page_manager/theme/page_manager.theme.inc b/sites/all/modules/contrib/dev/ctools/page_manager/theme/page_manager.theme.inc
index 6435d1c..3df55a8 100644
--- a/sites/all/modules/contrib/dev/ctools/page_manager/theme/page_manager.theme.inc
+++ b/sites/all/modules/contrib/dev/ctools/page_manager/theme/page_manager.theme.inc
@@ -27,10 +27,10 @@ function template_preprocess_page_manager_edit_page(&$vars) {
$vars['locked'] = theme('page_manager_lock', array('page' => $page));
$vars['changed'] = theme('page_manager_changed', array('text' => t('Locked'), 'description' => t('This page is being edited by another user and you cannot make changes to it.')));
}
- else if (!empty($page->new)) {
+ elseif (!empty($page->new)) {
$vars['changed'] = theme('page_manager_changed', array('text' => t('New'), 'description' => t('This page is newly created and has not yet been saved to the database. It will not be available until you save it.')));
}
- else if (!empty($page->changed)) {
+ elseif (!empty($page->changed)) {
$vars['changed'] = theme('page_manager_changed', array('text' => t('Changed'), 'description' => t('This page has been modified, but these modifications are not yet live. While modifying this page, it is locked from modification by other users.')));
}
@@ -49,9 +49,9 @@ function template_preprocess_page_manager_edit_page(&$vars) {
*/
function theme_page_manager_handler_rearrange($vars) {
$form = &$vars['form'];
- // Assemble the data for a table from everything in $form['handlers']
+ // Assemble the data for a table from everything in $form['handlers'].
foreach (element_children($form['handlers']) as $id) {
- // provide a reference shortcut.
+ // Provide a reference shortcut.
$element = &$form['handlers'][$id];
if (isset($element['title'])) {
$row = array();
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/compare_users.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/compare_users.inc
index c271ff4..e0a7f1b 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/compare_users.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/compare_users.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Ctools access plugin to provide access/visiblity if two user contexts are equal.
+ * CTools access plugin to provide access/visiblity if two user contexts are equal.
*/
/**
@@ -20,12 +20,12 @@ $plugin = array(
'summary' => 'ctools_compare_users_ctools_access_summary',
'required context' => array(
new ctools_context_required(t('First User'), 'user'),
- new ctools_context_required(t("Second User"), 'user')
+ new ctools_context_required(t("Second User"), 'user'),
),
);
/**
- * Settings form for the 'by perm' access plugin
+ * Settings form for the 'by perm' access plugin.
*/
function ctools_compare_users_settings($form, &$form_state, $conf) {
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/context_exists.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/context_exists.inc
index aabc62d..e5d2b5e 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/context_exists.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/context_exists.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Plugin to provide access control/visibility based on existence of a specified context
+ * Plugin to provide access control/visibility based on existence of a specified context.
*/
$plugin = array(
@@ -16,7 +16,7 @@ $plugin = array(
);
/**
- * Settings form
+ * Settings form.
*/
function ctools_context_exists_ctools_access_settings($form, &$form_state, $conf) {
$form['settings']['exists'] = array(
@@ -29,17 +29,17 @@ function ctools_context_exists_ctools_access_settings($form, &$form_state, $conf
}
/**
- * Check for access
+ * Check for access.
*/
function ctools_context_exists_ctools_access_check($conf, $context) {
- // xor returns false if the two bools are the same, and true if they are not.
+ // Xor returns false if the two bools are the same, and true if they are not.
// i.e, if we asked for context_exists and it does, return true.
// If we asked for context does not exist and it does, return false.
return (empty($context->data) xor !empty($conf['exists']));
}
/**
- * Provide a summary description based upon the specified context
+ * Provide a summary description based upon the specified context.
*/
function ctools_context_exists_ctools_access_summary($conf, $context) {
if (!empty($conf['exists'])) {
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/entity_bundle.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/entity_bundle.inc
index e07a048..fce3419 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/entity_bundle.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/entity_bundle.inc
@@ -43,7 +43,7 @@ function ctools_entity_bundle_ctools_access_get_children($plugin, $parent) {
}
/**
- * Settings form for the 'by entity_bundle' access plugin
+ * Settings form for the 'by entity_bundle' access plugin.
*/
function ctools_entity_bundle_ctools_access_settings($form, &$form_state, $conf) {
$plugin = $form_state['plugin'];
@@ -133,4 +133,3 @@ function ctools_entity_bundle_ctools_access_summary($conf, $context, $plugin) {
return format_plural(count($names), '@identifier is bundle "@types"', '@identifier bundle is one of "@types"', array('@types' => implode(', ', $names), '@identifier' => $context->identifier));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/entity_field_value.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/entity_field_value.inc
index fa94a48..60d2c2e 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/entity_field_value.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/entity_field_value.inc
@@ -48,7 +48,7 @@ function ctools_entity_field_value_ctools_access_get_children($plugin, $parent)
}
function _ctools_entity_field_value_ctools_access_get_child($plugin, $parent, $entity_type, $bundle_type, $field_name, $entity = NULL, $bundle = NULL, $field = NULL) {
- // check that the entity, bundle and field arrays have a value.
+ // Check that the entity, bundle and field arrays have a value.
// If not, load theme using machine names.
if (empty($entity)) {
$entity = entity_get_info($entity_type);
@@ -68,14 +68,14 @@ function _ctools_entity_field_value_ctools_access_get_child($plugin, $parent, $e
$plugin['description'] = t('Control access by @entity entity bundle.', array('@entity' => $entity_type));
$plugin['name'] = $parent . ':' . $entity_type . ':' . $bundle_type . ':' . $field_name;
$plugin['required context'] = new ctools_context_required(t(ucfirst($entity_type)), $entity_type, array(
- 'type' => $bundle_type,
- ));
+ 'type' => $bundle_type,
+ ));
return $plugin;
}
/**
- * Settings form for the 'by entity_bundle' access plugin
+ * Settings form for the 'by entity_bundle' access plugin.
*/
function ctools_entity_field_value_ctools_access_settings($form, &$form_state, $conf) {
$plugin = $form_state['plugin'];
@@ -88,7 +88,7 @@ function ctools_entity_field_value_ctools_access_settings($form, &$form_state, $
$columns[$column] = _field_sql_storage_columnname($field_name, $column);
}
ctools_include('fields');
- $entity = (object)array(
+ $entity = (object) array(
$entity_info['entity keys']['bundle'] => $bundle_type,
);
@@ -115,7 +115,7 @@ function ctools_entity_field_value_ctools_access_settings($form, &$form_state, $
$form['#parents'] = array('settings');
$langcode = field_valid_language(NULL);
$form['settings'] += (array) ctools_field_invoke_field($instance, 'form', $entity_type, $entity, $form, $form_state, array('default' => TRUE, 'language' => $langcode));
- // weight is really not important once this is populated and will only interfere with the form layout.
+ // Weight is really not important once this is populated and will only interfere with the form layout.
foreach (element_children($form['settings']) as $element) {
unset($form['settings'][$element]['#weight']);
}
@@ -145,7 +145,8 @@ function ctools_entity_field_value_ctools_access_settings_submit($form, &$form_s
function _ctools_entity_field_value_get_proper_form_items($field, $form_items, $columns) {
$items = array();
- if (!is_array($form_items)) { // Single value item.
+ // Single value item.
+ if (!is_array($form_items)) {
foreach ($columns as $column) {
$items[0][$column] = $form_items;
}
@@ -175,7 +176,7 @@ function _ctools_entity_field_value_get_proper_form_items($field, $form_items, $
foreach ($columns as $column) {
if (isset($form_items[$column])) {
$has_columns = TRUE;
- $item[$column] = $form_items[$column];
+ $item[$column] = $form_items[$column];
}
else {
$item[$column] = '';
@@ -353,7 +354,7 @@ function ctools_entity_field_value_ctools_access_summary($conf, $context, $plugi
$display['type'] = 'entityreference_label';
break;
- default :
+ default:
// Use field instance formatter setting.
break;
}
@@ -381,7 +382,7 @@ function ctools_entity_field_value_ctools_access_summary($conf, $context, $plugi
if (is_array($elements)) {
foreach ($elements as $element_key => $element) {
if (is_numeric($element_key)) {
- $value_str= strip_tags(drupal_render($element));
+ $value_str = strip_tags(drupal_render($element));
if (strlen($value_str) > 0) {
$output[] = $value_str;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/front.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/front.inc
index 1bbc6e0..8718a14 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/front.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/front.inc
@@ -19,7 +19,7 @@ $plugin = array(
);
/**
- * Settings form for the 'by parent term' access plugin
+ * Settings form for the 'by parent term' access plugin.
*/
function ctools_front_ctools_access_settings($form, &$form_state, $conf) {
// No additional configuration necessary.
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/node_access.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/node_access.inc
index fcd275d..c153cc5 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/node_access.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/node_access.inc
@@ -24,7 +24,7 @@ $plugin = array(
);
/**
- * Settings form for the 'by node_access' access plugin
+ * Settings form for the 'by node_access' access plugin.
*/
function ctools_node_access_ctools_access_settings($form, &$form_state, $conf) {
$form['settings']['type'] = array(
@@ -86,4 +86,3 @@ function ctools_node_access_ctools_access_summary($conf, $context) {
return t('@user can create nodes of the same type as @node.', $replacement);
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/node_comment.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/node_comment.inc
index 915ee20..6cebdaf 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/node_comment.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/node_comment.inc
@@ -1,4 +1,5 @@
implode(', ', $names), '@identifier' => $context->identifier));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/node_status.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/node_status.inc
index ad5ba40..137f282 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/node_status.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/node_status.inc
@@ -30,4 +30,3 @@ function ctools_node_status_ctools_access_check($conf, $context) {
function ctools_node_status_ctools_access_summary($conf, $context) {
return t('Returns true if the nodes status is "published".');
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/node_type.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/node_type.inc
index 23a3845..d89532a 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/node_type.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/node_type.inc
@@ -22,7 +22,7 @@ $plugin = array(
);
/**
- * Settings form for the 'by node_type' access plugin
+ * Settings form for the 'by node_type' access plugin.
*/
function ctools_node_type_ctools_access_settings($form, &$form_state, $conf) {
$types = node_type_get_types();
@@ -114,4 +114,3 @@ function ctools_node_type_ctools_access_summary($conf, $context) {
return format_plural(count($names), '@identifier is type "@types"', '@identifier type is one of "@types"', array('@types' => implode(', ', $names), '@identifier' => $context->identifier));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/path_visibility.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/path_visibility.inc
index 60b8612..1612e1c 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/path_visibility.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/path_visibility.inc
@@ -11,12 +11,12 @@ $plugin = array(
'callback' => 'ctools_path_visibility_ctools_access_check',
'settings form' => 'ctools_path_visibility_ctools_access_settings',
'summary' => 'ctools_path_visibility_ctools_access_summary',
- 'required context' => new ctools_context_optional(t('Path'), 'string'),
+ 'required context' => new ctools_context_optional(t('Path'), 'string'),
'default' => array('visibility_setting' => 1, 'paths' => ''),
);
/**
- * Settings form
+ * Settings form.
*/
function ctools_path_visibility_ctools_access_settings($form, &$form_state, $conf) {
$form['settings']['note'] = array(
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/perm.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/perm.inc
index 67516fa..cb2bb81 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/perm.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/perm.inc
@@ -20,11 +20,11 @@ $plugin = array(
);
/**
- * Settings form for the 'by perm' access plugin
+ * Settings form for the 'by perm' access plugin.
*/
function ctools_perm_ctools_access_settings($form, &$form_state, $conf) {
$perms = array();
- // Get list of permissions
+ // Get list of permissions.
foreach (module_list(FALSE, FALSE, TRUE) as $module) {
// By keeping them keyed by module we can use optgroups with the
// 'select' type.
@@ -70,4 +70,3 @@ function ctools_perm_ctools_access_summary($conf, $context) {
$permissions = module_invoke_all('permission');
return t('@identifier has "@perm"', array('@identifier' => $context->identifier, '@perm' => $permissions[$conf['perm']]['title']));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/php.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/php.inc
index 35da86d..4e9d056 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/php.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/php.inc
@@ -20,7 +20,7 @@ $plugin = array(
);
/**
- * Settings form for the 'by perm' access plugin
+ * Settings form for the 'by perm' access plugin.
*
* @todo Need a way to provide a list of all available contexts to be used by
* the eval-ed PHP.
@@ -38,7 +38,7 @@ function ctools_php_ctools_access_settings($form, &$form_state, $conf) {
'#type' => 'textarea',
'#title' => t('PHP Code'),
'#default_value' => $conf['php'],
- '#description' => t('Access will be granted if the following PHP code returns TRUE. Do not include <?php ?>. Note that executing incorrect PHP-code can break your Drupal site. All contexts will be available in the $contexts variable.'),
+ '#description' => t('Access will be granted if the following PHP code returns TRUE. Do not include <?php ?>. Note that executing incorrect PHP-code can break your Drupal site. All contexts will be available in the $contexts variable.'),
);
if (!user_access('use PHP for settings')) {
$form['settings']['php']['#disabled'] = TRUE;
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/query_string_exists.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/query_string_exists.inc
new file mode 100644
index 0000000..fb3b433
--- /dev/null
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/query_string_exists.inc
@@ -0,0 +1,44 @@
+ t('Query string exists'),
+ 'description' => t('Control access by whether or not a query string exists.'),
+ 'callback' => 'ctools_query_string_exists_ctools_access_check',
+ 'settings form' => 'ctools_query_string_exists_ctools_access_settings',
+ 'summary' => 'ctools_query_string_exists_ctools_access_summary',
+ 'defaults' => array('key' => ''),
+);
+
+/**
+ * Settings form.
+ */
+function ctools_query_string_exists_ctools_access_settings($form, &$form_state, $config) {
+ $form['settings']['key'] = array(
+ '#title' => t('Query string key'),
+ '#description' => t('Enter the key of the query string.'),
+ '#type' => 'textfield',
+ '#required' => TRUE,
+ '#default_value' => $config['key'],
+ );
+
+ return $form;
+}
+
+/**
+ * Check for access.
+ */
+function ctools_query_string_exists_ctools_access_check($config, $context) {
+ return isset($_GET[$config['key']]);
+}
+
+/**
+ * Provide a summary description.
+ */
+function ctools_query_string_exists_ctools_access_summary($config, $context) {
+ return t('@identifier exists', array('@identifier' => $config['key']));
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/role.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/role.inc
index b633254..4d8cbae 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/role.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/role.inc
@@ -21,7 +21,7 @@ $plugin = array(
);
/**
- * Settings form for the 'by role' access plugin
+ * Settings form for the 'by role' access plugin.
*/
function ctools_role_ctools_access_settings($form, &$form_state, $conf) {
$form['settings']['rids'] = array(
@@ -76,4 +76,3 @@ function ctools_role_ctools_access_summary($conf, $context) {
return format_plural(count($names), '@identifier has role "@roles"', '@identifier has one of "@roles"', array('@roles' => implode(', ', $names), '@identifier' => $context->identifier));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/site_language.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/site_language.inc
index 9ff2f70..5b7b724 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/site_language.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/site_language.inc
@@ -22,7 +22,7 @@ if (module_exists('locale')) {
}
/**
- * Settings form for the 'by site_language' access plugin
+ * Settings form for the 'by site_language' access plugin.
*/
function ctools_site_language_ctools_access_settings($form, &$form_state, $conf) {
$options = array(
@@ -84,4 +84,3 @@ function ctools_site_language_ctools_access_summary($conf, $context) {
return format_plural(count($names), 'Site language is "@languages"', 'Site language is one of "@languages"', array('@languages' => implode(', ', $names)));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/string_equal.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/string_equal.inc
index ad1c88d..feb48e9 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/string_equal.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/string_equal.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Plugin to provide access control/visibility based on specified context string matching user-specified string
+ * Plugin to provide access control/visibility based on specified context string matching user-specified string.
*/
$plugin = array(
@@ -16,7 +16,7 @@ $plugin = array(
);
/**
- * Settings form
+ * Settings form.
*/
function ctools_string_equal_ctools_access_settings($form, &$form_state, $conf) {
$form['settings']['operator'] = array(
@@ -47,7 +47,7 @@ function ctools_string_equal_ctools_access_settings($form, &$form_state, $conf)
}
/**
- * Check for access
+ * Check for access.
*/
function ctools_string_equal_ctools_access_check($conf, $context) {
if (empty($context) || empty($context->data)) {
@@ -66,29 +66,34 @@ function ctools_string_equal_ctools_access_check($conf, $context) {
switch ($conf['operator']) {
case '=':
return $string === $value;
+
case '!=':
return $string !== $value;
+
case 'regex':
return preg_match($value, $string);
+
case '!regex':
return !preg_match($value, $string);
}
}
/**
- * Provide a summary description based upon the specified context
+ * Provide a summary description based upon the specified context.
*/
function ctools_string_equal_ctools_access_summary($conf, $context) {
$values = array('@identifier' => $context->identifier, '@value' => $conf['value']);
switch ($conf['operator']) {
case '=':
return t('@identifier is "@value"', $values);
+
case '!=':
return t('@identifier is not "@value"', $values);
+
case 'regex':
return t('@identifier matches "@value"', $values);
+
case '!regex':
return t('@identifier does not match "@value"', $values);
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/string_length.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/string_length.inc
index 91abf22..3af504b 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/string_length.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/string_length.inc
@@ -57,14 +57,19 @@ function ctools_string_length_ctools_access_check($conf, $context) {
switch ($conf['operator']) {
case '<':
return $length < $conf['length'];
+
case '<=':
return $length <= $conf['length'];
+
case '=':
return $length == $conf['length'];
+
case '!=':
return $length != $conf['length'];
+
case '>':
return $length > $conf['length'];
+
case '>=':
return $length >= $conf['length'];
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/term.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/term.inc
index 36e70de..50ec0d9 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/term.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/term.inc
@@ -22,7 +22,7 @@ $plugin = array(
);
/**
- * Settings form for the 'by term' access plugin
+ * Settings form for the 'by term' access plugin.
*/
function ctools_term_ctools_access_settings($form, &$form_state, $conf) {
// If no configuration was saved before, set some defaults.
@@ -51,7 +51,6 @@ function ctools_term_ctools_access_settings($form, &$form_state, $conf) {
// A note: Dependency works strangely on these forms as they have never been
// updated to a more modern system so they are not individual forms of their
// own like the content types.
-
$form['settings']['#tree'] = TRUE;
// Loop over each of the configured vocabularies.
@@ -124,6 +123,8 @@ function ctools_term_ctools_access_summary($conf, $context) {
return format_plural(count($terms),
'@term can be the term "@terms"',
'@term can be one of these terms: @terms',
- array('@terms' => implode(', ', $terms),
- '@term' => $context->identifier));
+ array(
+ '@terms' => implode(', ', $terms),
+ '@term' => $context->identifier,
+ ));
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/term_has_parent.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/term_has_parent.inc
index a079e92..16f4fbf 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/term_has_parent.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/term_has_parent.inc
@@ -1,4 +1,5 @@
!empty($conf['vid_' . $vid]) ? $conf['vid_' . $vid] : '',
'#size' => 10,
'#multiple' => TRUE,
- //@todo: Remove the following workaround when the following patch is in core. {@see:http://drupal.org/node/1117526}
+ // @todo: Remove the following workaround when the following patch is in core. {@see:http://drupal.org/node/1117526}
'#name' => sprintf("settings[%u][]", $vid),
'#attributes' => array('multiple' => 'multiple'),
);
@@ -71,7 +71,6 @@ function ctools_term_has_parent_ctools_access_settings($form, &$form_state, $con
foreach (taxonomy_get_tree($vocabulary->vid) as $term) {
$terms[$term->tid] = str_repeat('-', $term->depth) . ($term->depth ? ' ' : '') . $term->name;
}
- //$form['settings']['vid_' . $vid]['#type'] = 'select';
$form['settings']['vid_' . $vid]['#type'] = 'checkboxes';
$form['settings']['vid_' . $vid]['#options'] = $terms;
unset($terms);
@@ -116,37 +115,36 @@ function ctools_term_has_parent_ctools_access_check($conf, $context) {
// we'll start looking up the hierarchy from our context term id.
$current_term = $context->data->tid;
- $term='';
+ $term = '';
- // scan up the tree.
- while (true) {
- // select parent as term_parent to avoid PHP5 complications with the parent keyword
- //@todo: Find a way to reduce the number of queries required for really deep hierarchies.
- $term = db_query("SELECT parent AS term_parent, tid AS tid FROM {taxonomy_term_hierarchy} th WHERE th.tid = :tid", array(':tid'=>$current_term))->fetchObject();
+ // Scan up the tree.
+ while (TRUE) {
+ // Select parent as term_parent to avoid PHP5 complications with the parent keyword.
+ // @todo: Find a way to reduce the number of queries required for really deep hierarchies.
+ $term = db_query("SELECT parent AS term_parent, tid AS tid FROM {taxonomy_term_hierarchy} th WHERE th.tid = :tid", array(':tid' => $current_term))->fetchObject();
- // if no term is found, get out of the loop
+ // If no term is found, get out of the loop.
if (!$term || empty($term->tid)) {
break;
}
- // check the term selected, if the user asked it to.
+ // Check the term selected, if the user asked it to.
if (!empty($conf['include_self']) && isset($conf['vid_' . $vid][$term->tid])) {
return TRUE;
}
- // did we find the parent TID we were looking for?
+ // Did we find the parent TID we were looking for?
if (isset($conf['vid_' . $vid][$term->tid])) {
// YES, we're done!
return TRUE;
}
// Nope, we didn't find it.
-
// If this is the top of the hierarchy, stop scanning.
- if ($term->term_parent==0) {
+ if ($term->term_parent == 0) {
break;
}
- // update the parent, and keep scanning.
+ // Update the parent, and keep scanning.
$current_term = $term->term_parent;
}
@@ -157,7 +155,7 @@ function ctools_term_has_parent_ctools_access_check($conf, $context) {
* Provide a summary description based upon the checked terms.
*/
function ctools_term_has_parent_ctools_access_summary($conf, $context) {
- $vid = (int)$conf['vid'];
+ $vid = (int) $conf['vid'];
$terms = array();
foreach ($conf['vid_' . $vid] as $tid) {
$term = taxonomy_term_load($tid);
@@ -167,6 +165,8 @@ function ctools_term_has_parent_ctools_access_summary($conf, $context) {
return format_plural(count($terms),
'@term can have the parent "@terms"',
'@term can have one of these parents: @terms',
- array('@terms' => implode(', ', $terms),
- '@term' => $context->identifier));
+ array(
+ '@terms' => implode(', ', $terms),
+ '@term' => $context->identifier,
+ ));
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/term_parent.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/term_parent.inc
index acbaf87..27375df 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/term_parent.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/term_parent.inc
@@ -22,7 +22,7 @@ $plugin = array(
);
/**
- * Settings form for the 'by parent term' access plugin
+ * Settings form for the 'by parent term' access plugin.
*/
function ctools_term_parent_ctools_access_settings($form, &$form_state, $conf) {
// If no configuration was saved before, set some defaults.
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/term_vocabulary.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/term_vocabulary.inc
index b003138..8e9a0ca 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/term_vocabulary.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/term_vocabulary.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Plugin to provide access control based upon term vocabulary
+ * Plugin to provide access control based upon term vocabulary.
*/
/**
@@ -20,12 +20,12 @@ $plugin = array(
'required context' => new ctools_context_required(t('Vocabulary'), array(
'taxonomy_term',
'terms',
- 'taxonomy_vocabulary'
+ 'taxonomy_vocabulary',
)),
);
/**
- * Settings form for the 'by term_vocabulary' access plugin
+ * Settings form for the 'by term_vocabulary' access plugin.
*/
function ctools_term_vocabulary_ctools_access_settings($form, &$form_state, $conf) {
$options = array();
@@ -101,7 +101,7 @@ function ctools_term_vocabulary_ctools_access_summary($conf, $context) {
return format_plural(count($names), '@identifier vocabulary is "@machine_names"', '@identifier vocabulary is one of "@machine_names"', array(
'@machine_names' => implode(', ', $names),
- '@identifier' => $context->identifier
+ '@identifier' => $context->identifier,
));
}
@@ -123,5 +123,3 @@ function _ctools_term_vocabulary_ctools_access_map_vids(&$conf) {
}
}
}
-
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/access/theme.inc b/sites/all/modules/contrib/dev/ctools/plugins/access/theme.inc
index 4f4be6d..67e3e6f 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/access/theme.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/access/theme.inc
@@ -19,7 +19,7 @@ $plugin = array(
);
/**
- * Settings form for the 'by theme' access plugin
+ * Settings form for the 'by theme' access plugin.
*/
function ctools_theme_ctools_access_settings($form, &$form_state, $conf) {
$themes = array();
@@ -44,10 +44,10 @@ function ctools_theme_ctools_access_check($conf, $context) {
if (!empty($GLOBALS['theme'])) {
$theme = $GLOBALS['theme'];
}
- else if (!empty($GLOBALS['custom_theme'])) {
+ elseif (!empty($GLOBALS['custom_theme'])) {
$theme = $GLOBALS['custom_theme'];
}
- else if (!empty($GLOBALS['user']->theme)) {
+ elseif (!empty($GLOBALS['user']->theme)) {
$theme = $GLOBALS['user']->theme;
}
else {
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/entity_id.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/entity_id.inc
index 214dc55..73bfe1e 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/entity_id.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/entity_id.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for all entity ids
+ * Plugin to provide an argument handler for all entity ids.
*/
/**
@@ -17,7 +16,7 @@ $plugin = array(
'get child' => 'ctools_argument_entity_id_get_child',
'get children' => 'ctools_argument_entity_id_get_children',
'default' => array(
- 'entity_id' => ''
+ 'entity_id' => '',
),
'placeholder form' => 'ctools_argument_entity_id_ctools_argument_placeholder',
);
@@ -41,6 +40,7 @@ function ctools_argument_entity_id_get_children($original_plugin, $parent) {
$plugins[$plugin_id] = $plugin;
}
drupal_alter('ctools_entity_contexts', $plugins);
+
return $plugins;
}
@@ -60,9 +60,12 @@ function ctools_argument_entity_id_context($arg = NULL, $conf = NULL, $empty = F
return ctools_context_create('entity:' . $entity_type, $arg);
}
+ // Trim spaces and other garbage.
+ $arg = trim($arg);
+
if (!is_numeric($arg)) {
$preg_matches = array();
- $match = preg_match('/\[id: (\d+)\]/', $arg, $preg_matches);
+ $match = preg_match('/\[id: (\d+)\]/', $arg, $preg_matches);
if (!$match) {
$match = preg_match('/^id: (\d+)/', $arg, $preg_matches);
}
@@ -70,18 +73,18 @@ function ctools_argument_entity_id_context($arg = NULL, $conf = NULL, $empty = F
if ($match) {
$id = $preg_matches[1];
}
- if (is_numeric($id)) {
+ if (isset($id) && is_numeric($id)) {
return ctools_context_create('entity:' . $entity_type, $id);
}
return FALSE;
}
- $entity = entity_load($entity_type, array($arg));
- if (!$entity) {
+ $entities = entity_load($entity_type, array($arg));
+ if (empty($entities)) {
return FALSE;
}
- return ctools_context_create('entity:' . $entity_type, $entity[$arg]);
+ return ctools_context_create('entity:' . $entity_type, reset($entities));
}
function ctools_argument_entity_id_settings_form(&$form, &$form_state, $conf) {
@@ -119,7 +122,7 @@ function ctools_argument_entity_id_settings_form(&$form, &$form_state, $conf) {
$form['settings']['entity_id'] = array(
'#type' => 'value',
- '#value' => $conf['entity_id'],
+ '#value' => isset($conf['entity_id']) ? $conf['entity_id'] : '',
);
$form['settings']['entity_type'] = array(
@@ -132,11 +135,12 @@ function ctools_argument_entity_id_settings_form(&$form, &$form_state, $conf) {
function ctools_argument_entity_id_ctools_argument_placeholder($conf) {
$conf = array(
- '#title' => t('Enter the title or ID of a @entity entity', array('@entity' => $conf['keyword'])),
- '#type' => 'textfield',
- '#maxlength' => 512,
+ '#title' => t('Enter the title or ID of a @entity entity', array('@entity' => $conf['keyword'])),
+ '#type' => 'textfield',
+ '#maxlength' => 512,
'#autocomplete_path' => 'ctools/autocomplete/' . $conf['keyword'],
- '#weight' => -10,
+ '#weight' => -10,
);
+
return $conf;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/nid.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/nid.inc
index 9aaec0e..cbb56d3 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/nid.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/nid.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a node id
+ * Plugin to provide an argument handler for a node id.
*/
/**
@@ -47,4 +46,3 @@ function ctools_argument_nid_context($arg = NULL, $conf = NULL, $empty = FALSE)
return ctools_context_create('node', $node);
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/node_add.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/node_add.inc
index c811311..f249a94 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/node_add.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/node_add.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a Node add form
+ * Plugin to provide an argument handler for a Node add form.
*/
/**
@@ -12,7 +11,7 @@
*/
$plugin = array(
'title' => t("Node add form: node type"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'node_type',
'description' => t('Creates a node add form context from a node type argument.'),
'context' => 'ctools_node_add_context',
@@ -29,4 +28,3 @@ function ctools_node_add_context($arg = NULL, $conf = NULL, $empty = FALSE) {
return ctools_context_create('node_add_form', $arg);
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/node_edit.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/node_edit.inc
index c7cdf29..8bd0768 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/node_edit.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/node_edit.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a Node edit form
+ * Plugin to provide an argument handler for a Node edit form.
*/
/**
@@ -12,7 +11,7 @@
*/
$plugin = array(
'title' => t("Node edit form: node ID"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'node',
'description' => t('Creates a node edit form context from a node ID argument.'),
'context' => 'ctools_node_edit_context',
@@ -48,4 +47,3 @@ function ctools_node_edit_context($arg = NULL, $conf = NULL, $empty = FALSE) {
// This will perform a node_access check, so we don't have to.
return ctools_context_create('node_edit_form', $node);
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/rid.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/rid.inc
index 2661153..d0cc30c 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/rid.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/rid.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a node revision id
+ * Plugin to provide an argument handler for a node revision id.
*/
/**
@@ -47,4 +46,3 @@ function ctools_argument_rid_context($arg = NULL, $conf = NULL, $empty = FALSE)
return ctools_context_create('node', $node);
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/string.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/string.inc
index ed4ffbb..005e40e 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/string.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/string.inc
@@ -2,16 +2,16 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a raw string
+ * Plugin to provide an argument handler for a raw string.
*/
+
/**
* Plugins are described by creating a $plugin array which will be used
* by the system that includes this file.
*/
$plugin = array(
'title' => t("String"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'string',
'description' => t('A string is a minimal context that simply holds a string that can be used for some other purpose.'),
'settings form' => 'ctools_string_settings_form',
@@ -20,7 +20,8 @@ $plugin = array(
'#type' => 'textfield',
'#description' => t('Enter a value for this argument'),
),
- 'path placeholder' => 'ctools_string_path_placeholder', // This is in pagemanager.
+// This is in pagemanager.
+ 'path placeholder' => 'ctools_string_path_placeholder',
);
/**
@@ -39,7 +40,7 @@ function ctools_string_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
/**
- * Settings form for the argument
+ * Settings form for the argument.
*/
function ctools_string_settings_form(&$form, &$form_state, $conf) {
$form['settings']['use_tail'] = array(
@@ -48,7 +49,6 @@ function ctools_string_settings_form(&$form, &$form_state, $conf) {
'#default_value' => !empty($conf['use_tail']),
'#description' => t('If checked, this string will include all arguments. For example, if the path is "path/%" and the user visits "path/foo/bar", if this is not checked the string will be "foo". If it is checked the string will be "foo/bar".'),
);
-// return $form;
}
/**
@@ -61,4 +61,4 @@ function ctools_string_path_placeholder($argument) {
else {
return '%pm_arg_tail';
}
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/term.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/term.inc
index 868c8aa..f72e93d 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/term.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/term.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a Taxonomy term
+ * Plugin to provide an argument handler for a Taxonomy term.
*/
/**
@@ -12,12 +11,13 @@
*/
$plugin = array(
'title' => t("Taxonomy term: ID"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'term',
'description' => t('Creates a single taxonomy term from a taxonomy ID or taxonomy term name.'),
'context' => 'ctools_term_context',
'default' => array('input_form' => 'tid', 'breadcrumb' => TRUE, 'transform' => FALSE),
'settings form' => 'ctools_term_settings_form',
+ 'settings form validate' => 'ctools_term_settings_form_validate',
'placeholder form' => 'ctools_term_ctools_argument_placeholder',
'breadcrumb' => 'ctools_term_breadcrumb',
);
@@ -31,6 +31,16 @@ function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
return ctools_context_create_empty('entity:taxonomy_term');
}
+ if (isset($conf['vocabularies'])) {
+ $vocabularies = $conf['vocabularies'];
+ }
+ else {
+ $vids = isset($conf['vids']) ? $conf['vids'] : array();
+
+ // Convert legacy use of vids to machine names.
+ $vocabularies = _ctools_term_vocabulary_machine_name_convert($vids);
+ }
+
if (is_object($arg)) {
$term = $arg;
}
@@ -50,14 +60,13 @@ function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
$terms = taxonomy_get_term_by_name($arg);
-
- $conf['vids'] = is_array($conf['vids']) ? array_filter($conf['vids']) : NULL;
- if ((count($terms) > 1) && isset($conf['vids'])) {
+ // If only one term is found, fall through to vocabulary check below.
+ if ((count($terms) > 1) && $vocabularies) {
foreach ($terms as $potential) {
- foreach ($conf['vids'] as $vid => $active) {
- if ($active && $potential->vid == $vid) {
+ foreach ($vocabularies as $machine_name) {
+ if ($potential->vocabulary_machine_name == $machine_name) {
$term = $potential;
- // break out of the foreaches AND the case
+ // Break out of the foreaches AND the case.
break 3;
}
}
@@ -72,7 +81,7 @@ function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
}
- if (!empty($conf['vids']) && array_filter($conf['vids']) && empty($conf['vids'][$term->vid])) {
+ if ($vocabularies && !isset($vocabularies[$term->vocabulary_machine_name])) {
return NULL;
}
@@ -82,7 +91,7 @@ function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
/**
- * Settings form for the argument
+ * Settings form for the argument.
*/
function ctools_term_settings_form(&$form, &$form_state, $conf) {
// @todo allow synonym use like Views does.
@@ -98,13 +107,20 @@ function ctools_term_settings_form(&$form, &$form_state, $conf) {
$vocabularies = taxonomy_get_vocabularies();
$options = array();
foreach ($vocabularies as $vid => $vocab) {
- $options[$vid] = $vocab->name;
+ $options[$vocab->machine_name] = $vocab->name;
}
- $form['settings']['vids'] = array(
+
+ // Fallback on legacy 'vids', when no vocabularies are available.
+ if (empty($conf['vocabularies']) && !empty($conf['vids'])) {
+ $conf['vocabularies'] = _ctools_term_vocabulary_machine_name_convert(array_filter($conf['vids']));
+ unset($conf['vids']);
+ }
+
+ $form['settings']['vocabularies'] = array(
'#title' => t('Limit to these vocabularies'),
'#type' => 'checkboxes',
'#options' => $options,
- '#default_value' => !empty($conf['vids']) ? $conf['vids'] : array(),
+ '#default_value' => !empty($conf['vocabularies']) ? $conf['vocabularies'] : array(),
'#description' => t('If no vocabularies are checked, terms from all vocabularies will be accepted.'),
);
@@ -120,7 +136,12 @@ function ctools_term_settings_form(&$form, &$form_state, $conf) {
'#type' => 'checkbox',
'#default_value' => !empty($conf['transform']),
);
-// return $form;
+}
+
+function ctools_term_settings_form_validate(&$form, &$form_state) {
+ // Filter the selected vocabularies to avoid storing redundant data.
+ $vocabularies = array_filter($form_state['values']['settings']['vocabularies']);
+ form_set_value($form['settings']['vocabularies'], $vocabularies, $form_state);
}
/**
@@ -134,6 +155,7 @@ function ctools_term_ctools_argument_placeholder($conf) {
'#type' => 'textfield',
'#description' => t('Enter a taxonomy term ID.'),
);
+
case 'term':
return array(
'#type' => 'textfield',
@@ -161,3 +183,21 @@ function ctools_term_breadcrumb($conf, $context) {
$breadcrumb = array_merge(drupal_get_breadcrumb(), array_reverse($breadcrumb));
drupal_set_breadcrumb($breadcrumb);
}
+
+/**
+ * Helper function to convert convert legacy vocabulary ids into machine names.
+ *
+ * @param array $vids
+ * Array of either vids.
+ *
+ * @return array
+ * A keyed array of machine names.
+ */
+function _ctools_term_vocabulary_machine_name_convert($vids) {
+ $vocabularies = taxonomy_vocabulary_load_multiple($vids);
+ $return = array();
+ foreach ($vocabularies as $vocabulary) {
+ $return[$vocabulary->machine_name] = $vocabulary->machine_name;
+ }
+ return $return;
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/terms.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/terms.inc
index 4298ea9..b816e1c 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/terms.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/terms.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a Taxonomy term
+ * Plugin to provide an argument handler for a Taxonomy term.
*/
/**
@@ -12,7 +11,7 @@
*/
$plugin = array(
'title' => t("Taxonomy term (multiple): ID"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'term',
'description' => t('Creates a group of taxonomy terms from a list of tids separated by a comma or a plus sign. In general the first term of the list will be used for panes.'),
'context' => 'ctools_terms_context',
@@ -45,7 +44,7 @@ function ctools_terms_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
/**
- * Settings form for the argument
+ * Settings form for the argument.
*/
function ctools_terms_settings_form(&$form, &$form_state, $conf) {
$form['settings']['breadcrumb'] = array(
@@ -54,7 +53,6 @@ function ctools_terms_settings_form(&$form, &$form_state, $conf) {
'#default_value' => !empty($conf['breadcrumb']),
'#description' => t('If checked, taxonomy term parents will appear in the breadcrumb trail.'),
);
-// return $form;
}
/**
@@ -65,6 +63,7 @@ function ctools_terms_breadcrumb($conf, $context) {
return;
}
+ $current = new stdClass();
$current->tid = $context->tids[0];
$breadcrumb = array();
while ($parents = taxonomy_get_parents($current->tid)) {
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/uid.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/uid.inc
index f9d5315..c6ca3cc 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/uid.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/uid.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a user id
+ * Plugin to provide an argument handler for a user id.
*/
/**
@@ -12,7 +11,7 @@
*/
$plugin = array(
'title' => t("User: ID"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'user',
'description' => t('Creates a user context from a user ID argument.'),
'context' => 'ctools_argument_uid_context',
@@ -21,7 +20,8 @@ $plugin = array(
'#description' => t('Enter the user ID of a user for this argument'),
),
'default' => array('to_arg' => TRUE),
- 'path placeholder' => '%pm_uid_arg', // This is in pagemanager.
+// This is in pagemanager.
+ 'path placeholder' => '%pm_uid_arg',
'path placeholder to_arg' => TRUE,
'no ui' => TRUE,
);
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/user_edit.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/user_edit.inc
index 32b2b81..9c52b58 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/user_edit.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/user_edit.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a Taxonomy term
+ * Plugin to provide an argument handler for a Taxonomy term.
*/
/**
@@ -12,7 +11,7 @@
*/
$plugin = array(
'title' => t("User edit form: User ID"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'user',
'description' => t('Creates a user edit form context from a user ID argument.'),
'context' => 'ctools_user_edit_context',
@@ -30,18 +29,18 @@ function ctools_user_edit_context($arg = NULL, $conf = NULL, $empty = FALSE) {
if ($empty) {
return ctools_context_create_empty('user_edit_form');
}
- if(is_object($arg)){
+ if (is_object($arg)) {
return ctools_context_create('user_edit_form', $arg);
}
if (!is_numeric($arg)) {
return FALSE;
}
- $account= user_load($arg);
+ $account = user_load($arg);
if (!$account) {
return NULL;
}
// This will perform a node_access check, so we don't have to.
return ctools_context_create('user_edit_form', $account);
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/user_name.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/user_name.inc
index f6f3b46..ed74d9d 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/user_name.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/user_name.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a username
+ * Plugin to provide an argument handler for a username.
*/
/**
@@ -12,7 +11,7 @@
*/
$plugin = array(
'title' => t("User: name"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'user',
'description' => t('Creates a user context from a user name.'),
'context' => 'ctools_argument_user_name_context',
@@ -42,6 +41,3 @@ function ctools_argument_user_name_context($arg = NULL, $conf = NULL, $empty = F
}
return ctools_context_create('user', $account);
}
-
-
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/arguments/vid.inc b/sites/all/modules/contrib/dev/ctools/plugins/arguments/vid.inc
index 064b22d..db68acd 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/arguments/vid.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/arguments/vid.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide an argument handler for a vocabulary id
+ * Plugin to provide an argument handler for a vocabulary id.
*/
/**
@@ -12,7 +11,7 @@
*/
$plugin = array(
'title' => t("Vocabulary: ID"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'vocabulary',
'description' => t('Creates a vocabulary context from a vocabulary ID argument.'),
'context' => 'ctools_vid_context',
@@ -43,4 +42,3 @@ function ctools_vid_context($arg = NULL, $conf = NULL, $empty = FALSE) {
return ctools_context_create('vocabulary', $vocabulary);
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/cache/export_ui.inc b/sites/all/modules/contrib/dev/ctools/plugins/cache/export_ui.inc
index 53483a5..f21af10 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/cache/export_ui.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/cache/export_ui.inc
@@ -6,7 +6,7 @@
*/
$plugin = array(
- // cache plugins are the rare plugin types that have no real UI but
+ // Cache plugins are the rare plugin types that have no real UI but
// we're providing a title just in case.
'title' => t('Export UI wizard cache'),
'cache get' => 'ctools_cache_export_ui_cache_get',
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/cache/simple.inc b/sites/all/modules/contrib/dev/ctools/plugins/cache/simple.inc
index 570398b..c44d798 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/cache/simple.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/cache/simple.inc
@@ -6,7 +6,7 @@
*/
$plugin = array(
- // cache plugins are the rare plugin types that have no real UI but
+ // Cache plugins are the rare plugin types that have no real UI but
// we're providing a title just in case.
'title' => t('Simple'),
'cache get' => 'ctools_cache_simple_cache_get',
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/block/block.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/block/block.inc
index 4d4c31c..ff75c75 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/block/block.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/block/block.inc
@@ -51,7 +51,7 @@ function ctools_block_content_type_content_types() {
if ($module_blocks) {
foreach ($module_blocks as $delta => $block) {
$info = _ctools_block_content_type_content_type($module, $delta, $block);
- // this check means modules can remove their blocks; particularly useful
+ // This check means modules can remove their blocks; particularly useful
// if they offer the block some other way (like we do for views)
if ($info) {
$types["$module-$delta"] = $info;
@@ -168,7 +168,7 @@ function ctools_block_content_type_render($subtype, $conf) {
if ($module == 'block' && !empty($info) && isset($info->title)) {
$block->title = $info->title;
}
- else if (isset($block->subject)) {
+ elseif (isset($block->subject)) {
$block->title = $block->subject;
}
else {
@@ -208,70 +208,6 @@ function ctools_block_content_type_edit_form_submit($form, &$form_state) {
}
}
-/**
- * Returns an edit form for a block.
- */
-//function ctools_block_content_type_edit_form($id, $parents, $conf) {
-// if (user_access('administer advanced pane settings')) {
-// $form['block_visibility'] = array(
-// '#type' => 'checkbox',
-// '#title' => t('Use block visibility settings (see block config)'),
-// '#default_value' => !empty($conf['block_visibility']),
-// '#description' => t('If checked, the block visibility settings for this block will apply to this block.'),
-// );
-// // Module-specific block configurations.
-// if ($settings = module_invoke($module, 'block', 'configure', $delta)) {
-// // Specifically modify a couple of core block forms.
-// if ($module == 'block') {
-// unset($settings['submit']);
-// $settings['info']['#type'] = 'value';
-// $settings['info']['#value'] = $settings['info']['#default_value'];
-// }
-// ctools_admin_fix_block_tree($settings);
-// $form['block_settings'] = array(
-// '#type' => 'fieldset',
-// '#title' => t('Block settings'),
-// '#description' => t('Settings in this section are global and are for all blocks of this type, anywhere in the system.'),
-// '#tree' => FALSE,
-// );
-//
-//
-// $form['block_settings'] += $settings;
-// }
-// }
-//
-// return $form;
-//}
-
-//function ctools_admin_submit_block(&$form_values) {
-// if (!empty($form_values['block_settings'])) {
-// module_invoke($form_values['module'], 'block', 'save', $form_values['delta'], $form_values['block_settings']);
-// }
-//}
-//
-///**
-// * Because form api cannot collapse just part of a tree, and the block settings
-// * assume no tree, we have to collapse the tree ourselves.
-// */
-//function ctools_admin_fix_block_tree(&$form, $key = NULL) {
-// if ($key) {
-// if (!empty($form['#parents'])) {
-// $form['#parents'] = array_merge(array('configuration', 'block_settings'), $form['#parents']);
-// }
-// else if (empty($form['#tree'])) {
-// $form['#parents'] = array('configuration', 'block_settings', $key);
-// }
-// }
-//
-// if (isset($form['#type']) && $form['#type'] == 'textarea' && !empty($form['#rows']) && $form['#rows'] > 10) {
-// $form['#rows'] = 10;
-// }
-//
-// foreach (element_children($form) as $key) {
-// ctools_admin_fix_block_tree($form[$key], $key);
-// }
-//}
-
/**
* Returns the administrative title for a type.
*/
@@ -338,8 +274,10 @@ function ctools_default_block_info($module, $delta, &$info) {
}
}
-// These are all on behalf of modules that don't implement ctools but that
-// we care about.
+/**
+ * These are all on behalf of modules that don't implement ctools but that
+ * we care about.
+ */
function menu_ctools_block_info($module, $delta, &$info) {
$info['icon'] = 'icon_core_block_menu.png';
$info['category'] = t('Menus');
@@ -360,7 +298,7 @@ function forum_ctools_block_info($module, $delta, &$info) {
break;
default:
- // safety net
+ // Safety net.
ctools_default_block_info($module, $delta, $info);
}
}
@@ -372,9 +310,9 @@ function profile_ctools_block_info($module, $delta, &$info) {
}
function book_ctools_block_info($module, $delta, &$info) {
- // Hide the book navigation block which isn't as rich as what we can
- // do with context.
- $info = NULL;
+ $info['title'] = t('Book navigation menu');
+ $info['icon'] = 'icon_core_block_menu.png';
+ $info['category'] = t('Node');
}
function blog_ctools_block_info($module, $delta, &$info) {
@@ -455,7 +393,7 @@ function user_ctools_block_info($module, $delta, &$info) {
break;
default:
- // safety net
+ // Safety net.
ctools_default_block_info($module, $delta, $info);
}
}
@@ -508,7 +446,7 @@ function ctools_user_login_pane_render($subtype, $conf, $panel_args, $contexts)
return;
}
- $info = new stdClass;
+ $info = new stdClass();
$info->module = $module;
$info->delta = $delta;
@@ -537,7 +475,7 @@ function ctools_user_login_pane_render($subtype, $conf, $panel_args, $contexts)
if ($module == 'block') {
$block->title = $info->title;
}
- else if (isset($block->subject)) {
+ elseif (isset($block->subject)) {
$block->title = $block->subject;
}
else {
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_created.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_created.inc
new file mode 100644
index 0000000..b3f454a
--- /dev/null
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_created.inc
@@ -0,0 +1,76 @@
+ TRUE,
+ 'title' => t('Comment created date'),
+ 'icon' => 'icon_comment.png',
+ 'description' => t('The date the referenced comment was created.'),
+ 'required context' => new ctools_context_required(t('Comment'), 'entity:comment'),
+ 'category' => t('Comment'),
+ 'defaults' => array(
+ 'format' => 'small',
+ ),
+);
+
+/**
+ * Render the custom content type.
+ */
+function ctools_comment_created_content_type_render($subtype, $conf, $panel_args, $context) {
+ if (empty($context) || empty($context->data)) {
+ return;
+ }
+
+ // Get a shortcut to the comment.
+ $comment = $context->data;
+
+ // Build the content type block.
+ $block = new stdClass();
+ $block->module = 'comment_created';
+ $block->title = t('Created date');
+ $block->content = format_date($comment->created, $conf['format']);
+ $block->delta = $comment->cid;
+
+ return $block;
+}
+
+/**
+ * Returns an edit form for custom type settings.
+ */
+function ctools_comment_created_content_type_edit_form($form, &$form_state) {
+ $conf = $form_state['conf'];
+ $date_types = array();
+
+ foreach (system_get_date_types() as $date_type => $definition) {
+ $date_types[$date_type] = format_date(REQUEST_TIME, $date_type);
+ }
+ $form['format'] = array(
+ '#title' => t('Date format'),
+ '#type' => 'select',
+ '#options' => $date_types,
+ '#default_value' => $conf['format'],
+ );
+ return $form;
+}
+
+/**
+ * Submit handler for the custom type settings form.
+ */
+function ctools_comment_created_content_type_edit_form_submit($form, &$form_state) {
+ // Copy everything from our defaults.
+ foreach (array_keys($form_state['plugin']['defaults']) as $key) {
+ $form_state['conf'][$key] = $form_state['values'][$key];
+ }
+}
+
+/**
+ * Returns the administrative title for a type.
+ */
+function ctools_comment_created_content_type_admin_title($subtype, $conf, $context) {
+ return t('"@s" created date', array('@s' => $context->identifier));
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_links.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_links.inc
index c8fefcc..ed454f9 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_links.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_links.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Comment links'),
@@ -26,10 +28,10 @@ function ctools_comment_links_content_type_render($subtype, $conf, $panel_args,
return;
}
- $comment = isset($context->data) ? clone($context->data) : NULL;
+ $comment = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'comment';
- $block->delta = $comment->cid;
+ $block->delta = $comment->cid;
if (empty($comment)) {
$block->delta = 'placeholder';
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_reply_form.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_reply_form.inc
index c05effb..a18ece9 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_reply_form.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_reply_form.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Ctools content-type plugin to provide a comment-reply form (replying either
+ * CTools content-type plugin to provide a comment-reply form (replying either
* to a node or to another comment).
*/
@@ -14,21 +14,23 @@ if (module_exists('comment')) {
'icon' => 'icon_comment.png',
'description' => t('A form to add a new comment reply.'),
'required context' => array(
- new ctools_context_required(t('Node'), 'node'),
- new ctools_context_optional(t('Comment'), 'comment'),
- ),
+ new ctools_context_required(t('Node'), 'node'),
+ new ctools_context_optional(t('Comment'), 'comment'),
+ ),
'category' => t('Comment'),
'render callback' => 'ctools_comment_reply_form_content_type_render',
- 'defaults' => array('anon_links' => false),
+ 'defaults' => array('anon_links' => FALSE),
);
}
function ctools_comment_reply_form_content_type_render($subtype, $conf, $panel_args, $context) {
- $comment = ($context[1]->identifier == t('No context')) ? NULL : clone($context[1]->data);
+ $comment = ($context[1]->identifier == t('No context')) ? NULL : clone $context[1]->data;
$block = new stdClass();
$block->module = 'comments';
- if ($comment) $block->delta = $comment->cid;
+ if ($comment) {
+ $block->delta = $comment->cid;
+ }
$block->title = t('Add comment');
$node = $context[0]->data;
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/contact/contact.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/contact/contact.inc
index 63283f5..bac30c4 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/contact/contact.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/contact/contact.inc
@@ -1,5 +1,9 @@
module = 'contact';
- $block->delta = 'form';
- $block->title = t('Contact');
+ $block = new stdClass();
+ $block->module = 'contact';
+ $block->delta = 'form';
+ $block->title = t('Contact');
module_load_include('inc', 'contact', 'contact.pages');
$block->content = drupal_get_form('contact_site_form');
@@ -45,11 +49,6 @@ function ctools_contact_content_type_edit_form($form, &$form_state) {
*/
function ctools_contact_content_type_edit_form_submit($form, &$form_state) {
// Copy everything from our defaults.
-/*
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-*/
}
/**
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/contact/user_contact.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/contact/user_contact.inc
index 9b3726a..5bd3657 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/contact/user_contact.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/contact/user_contact.inc
@@ -1,5 +1,9 @@
module = 'contact';
- $block->delta = 'form';
- $block->title = t('Contact @name', array('@name' => $context->data->name));
+ $block = new stdClass();
+ $block->module = 'contact';
+ $block->delta = 'form';
+ $block->title = t('Contact @name', array('@name' => $context->data->name));
module_load_include('inc', 'contact', 'contact.pages');
$block->content = drupal_get_form('contact_personal_form', $context->data);
@@ -51,11 +55,6 @@ function ctools_user_contact_content_type_edit_form($form, &$form_state) {
*/
function ctools_user_contact_content_type_edit_form_submit(&$form, &$form_state) {
// Copy everything from our defaults.
-/*
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-*/
}
/**
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/custom/custom.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/custom/custom.inc
index ac2f2a3..84fe3c5 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/custom/custom.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/custom/custom.inc
@@ -16,7 +16,7 @@
$plugin = array(
'title' => t('Custom content'),
'no title override' => TRUE,
- 'defaults' => array('admin_title' => '', 'title' => '', 'body' => '', 'format' => filter_default_format(), 'substitute' => TRUE),
+ 'defaults' => array('admin_title' => '', 'title' => '', 'title_heading' => 'h2', 'body' => '', 'format' => filter_default_format(), 'substitute' => TRUE),
'js' => array('misc/autocomplete.js', 'misc/textarea.js', 'misc/collapse.js'),
// Make sure the edit form is only used for some subtypes.
'edit form' => '',
@@ -135,6 +135,7 @@ function ctools_custom_content_type_get_conf($subtype, $conf) {
$settings = array(
'admin_title' => t('Missing/deleted content'),
'title' => '',
+ 'title_heading' => '',
'body' => '',
'format' => filter_default_format(),
'substitute' => TRUE,
@@ -177,9 +178,10 @@ function ctools_custom_content_type_render($subtype, $conf, $args, $contexts) {
static $delta = 0;
- $block = new stdClass();
- $block->subtype = ++$delta;
- $block->title = filter_xss_admin($settings['title']);
+ $block = new stdClass();
+ $block->subtype = ++$delta;
+ $block->title = filter_xss_admin($settings['title']);
+ $block->title_heading = isset($settings['title_heading']) ? $settings['title_heading'] : 'h2';
// Add keyword substitutions if we were configured to do so.
$content = $settings['body'];
@@ -267,7 +269,8 @@ function ctools_custom_content_type_edit_form($form, &$form_state) {
$form_state['settings'] = $settings;
if ($settings['custom_type'] == 'fixed') {
- return $form; // no form for this case.
+ // No form for this case.
+ return $form;
}
$form['admin_title'] = array(
@@ -277,10 +280,36 @@ function ctools_custom_content_type_edit_form($form, &$form_state) {
'#description' => t('This title will be used administratively to identify this pane. If blank, the regular title will be used.'),
);
+ // Copy over the title override settings for a title heading.
+ $form['aligner_start'] = array(
+ '#markup' => '',
+ );
+
$form['title'] = array(
'#type' => 'textfield',
'#default_value' => $settings['title'],
'#title' => t('Title'),
+ '#id' => 'override-title-textfield',
+ );
+
+ $form['title_heading'] = array(
+ '#type' => 'select',
+ '#default_value' => isset($settings['title_heading']) ? $settings['title_heading'] : 'h2',
+ '#options' => array(
+ 'h1' => t('h1'),
+ 'h2' => t('h2'),
+ 'h3' => t('h3'),
+ 'h4' => t('h4'),
+ 'h5' => t('h5'),
+ 'h6' => t('h6'),
+ 'div' => t('div'),
+ 'span' => t('span'),
+ ),
+ '#id' => 'override-title-heading',
+ );
+
+ $form['aligner_stop'] = array(
+ '#markup' => '
',
);
$form['body'] = array(
@@ -291,7 +320,7 @@ function ctools_custom_content_type_edit_form($form, &$form_state) {
);
if (!empty($form_state['contexts'])) {
- // Set extended description if both CCK and Token modules are enabled, notifying of unlisted keywords
+ // Set extended description if both CCK and Token modules are enabled, notifying of unlisted keywords.
if (module_exists('content') && module_exists('token')) {
$description = t('If checked, context keywords will be substituted in this content. Note that CCK fields may be used as keywords using patterns like %node:field_name-formatted.');
}
@@ -388,7 +417,7 @@ function ctools_custom_content_type_edit_form_validate(&$form, &$form_state) {
form_error($form['name'], t('Name is required.'));
}
- // Check for string identifier sanity
+ // Check for string identifier sanity.
if (!preg_match('!^[a-z0-9_]+$!', $form_state['values']['name'])) {
form_error($form['name'], t('The name can only consist of lowercase letters, underscores, and numbers.'));
return;
@@ -398,7 +427,7 @@ function ctools_custom_content_type_edit_form_validate(&$form, &$form_state) {
return;
}
- // Check for name collision
+ // Check for name collision.
if ($form_state['values']['name'] == 'custom' || (ctools_export_crud_load('ctools_custom_content', $form_state['values']['name']))) {
form_error($form['name'], t('Content with this name already exists. Please choose another name or delete the existing item before creating a new one.'));
}
@@ -418,7 +447,7 @@ function ctools_custom_content_type_edit_form_submit($form, &$form_state) {
}
// If the 'reusable' checkbox was checked, we will create a new
// custom content and give it the proper values.
- else if (!empty($form_state['values']['reusable'])) {
+ elseif (!empty($form_state['values']['reusable'])) {
$content = ctools_export_crud_new('ctools_custom_content');
$content->name = $form_state['values']['name'];
_ctools_custom_content_type_edit_save($content, $form_state);
@@ -426,7 +455,6 @@ function ctools_custom_content_type_edit_form_submit($form, &$form_state) {
}
else {
// Otherwise, just save values into $conf normally.
-
foreach (array_keys($form_state['plugin']['defaults']) as $key) {
$form_state['conf'][$key] = isset($form_state['values'][$key]) ? $form_state['values'][$key] : $form_state['plugin']['defaults'][$key];
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field.inc
index 5861d1c..80d24ef 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field.inc
@@ -34,6 +34,14 @@ function ctools_entity_field_content_type_content_types() {
return $types;
}
+ $cache_key = 'ctools_entity_field_content_type_content_types';
+ if ($cache = cache_get($cache_key)) {
+ $types = $cache->data;
+ if (!empty($types)) {
+ return $types;
+ }
+ }
+
// This will hold all the individual field content types.
$context_types = array();
$entities = entity_get_info();
@@ -82,12 +90,14 @@ function ctools_entity_field_content_type_content_types() {
unset($context_types[$key]['types']);
}
+ cache_set($cache_key, $types);
+
return $types;
}
/**
-* Render the custom content type.
-*/
+ * Render the custom content type.
+ */
function ctools_entity_field_content_type_render($subtype, $conf, $panel_args, $context) {
if (empty($context) || empty($context->data)) {
return;
@@ -127,34 +137,37 @@ function ctools_entity_field_content_type_render($subtype, $conf, $panel_args, $
$field_settings['settings'] = $conf['formatter_settings'];
}
- $all_values = field_get_items($entity_type, $entity, $field_name, $language);
- if (!is_array($all_values)) {
- // Do not render if the field is empty.
- return;
- }
-
- // Reverse values.
- if (isset($conf['delta_reversed']) && $conf['delta_reversed']) {
- $all_values = array_reverse($all_values, TRUE);
- }
-
- if (isset($conf['delta_limit'])) {
- $offset = intval($conf['delta_offset']);
- $limit = !empty($conf['delta_limit']) ? $conf['delta_limit'] : NULL;
- $all_values = array_slice($all_values, $offset, $limit, TRUE);
- }
-
$clone = clone $entity;
- $clone->{$field_name}[$language] = $all_values;
+ $all_values = field_get_items($entity_type, $entity, $field_name, $language);
+
+ if (is_array($all_values)) {
+ // Reverse values.
+ if (isset($conf['delta_reversed']) && $conf['delta_reversed']) {
+ $all_values = array_reverse($all_values, TRUE);
+ }
+
+ if (isset($conf['delta_limit'])) {
+ $offset = intval($conf['delta_offset']);
+ $limit = !empty($conf['delta_limit']) ? $conf['delta_limit'] : NULL;
+ $all_values = array_slice($all_values, $offset, $limit, TRUE);
+ }
+
+ $clone->{$field_name}[$language] = $all_values;
+ }
+
$field_output = field_view_field($entity_type, $clone, $field_name, $field_settings, $language);
- if (!empty($field_output) && !empty($conf['override_title'])) {
- $field_output['#title'] = filter_xss_admin($conf['override_title_text']);
+ if (!empty($field_output)) {
+ if (!empty($conf['override_title'])) {
+ $field_output['#title'] = filter_xss_admin($conf['override_title_text']);
+ }
+ $field_output['#ctools_context'] = $context;
+ $field_output['#post_render'][] = 'ctools_entity_field_content_type_substitute_keywords';
}
// Build the content type block.
$block = new stdClass();
- $block->module = 'entity_field';
+ $block->module = 'entity_field';
if ($conf['label'] == 'title' && isset($field_output['#title'])) {
$block->title = $field_output['#title'];
}
@@ -166,8 +179,15 @@ function ctools_entity_field_content_type_render($subtype, $conf, $panel_args, $
}
/**
-* Returns an edit form for custom type settings.
-*/
+ * Replace context keywords.
+ */
+function ctools_entity_field_content_type_substitute_keywords($markup, array $element) {
+ return ctools_context_keyword_substitute($markup, array(), array($element['#ctools_context']));
+}
+
+/**
+ * Returns an edit form for custom type settings.
+ */
function ctools_entity_field_content_type_formatter_options($form, &$form_state) {
if (empty($form_state['conf']['formatter_settings'])) {
$form_state['conf']['formatter_settings'] = array();
@@ -221,6 +241,11 @@ function ctools_entity_field_content_type_formatter_styles($form, &$form_state)
ctools_form_include($form_state, 'field_ui.admin', 'field_ui', '');
ctools_form_include($form_state, 'fields');
+ $form['ctools_keywords'] = array(
+ '#type' => 'item',
+ '#description' => t('You may use keywords for substitutions.'),
+ );
+
$form['ctools_field_list'] = array(
'#type' => 'value',
'#value' => array(),
@@ -260,10 +285,7 @@ function ctools_entity_field_content_type_admin_title($subtype, $conf, $context)
$identifier = $context->identifier;
}
else {
- $type = 'ctools_entity_field_content_type_admin_title';
- $message = t('Context is missing for field: @name', array('@name' => $subtype));
- $variables = array($subtype, $conf, $context);
- watchdog($type, $message, $variables, $severity = WATCHDOG_NOTICE);
+ watchdog('ctools_entity_field_content_type_admin_title', 'Context is missing for field: @name', array('@name' => $subtype), WATCHDOG_NOTICE);
$identifier = t('Unknown');
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field_extra.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field_extra.inc
index 6a59ed4..efc7f4f 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field_extra.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field_extra.inc
@@ -1,5 +1,9 @@
t('Entity extra field'),
'defaults' => array('view_mode' => NULL),
@@ -119,7 +123,7 @@ function ctools_entity_field_extra_content_type_render($subtype, $conf, $panel_a
if (isset($entity->content[$field_name])) {
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'entity_field_extra';
$block->content = $entity->content[$field_name];
$block->delta = $id;
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/form/entity_form_field.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/form/entity_form_field.inc
index a030f69..b4d8338 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/form/entity_form_field.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/form/entity_form_field.inc
@@ -38,10 +38,13 @@ function ctools_entity_form_field_content_type_content_types() {
$types = array();
$content_types = array();
$entities = entity_get_info();
-
+ $field_instances = field_info_instances();
foreach ($entities as $entity_type => $entity) {
foreach ($entity['bundles'] as $type => $bundle) {
- foreach (field_info_instances($entity_type, $type) as $field_name => $field) {
+ if (!isset($field_instances[$entity_type][$type])) {
+ continue;
+ }
+ foreach ($field_instances[$entity_type][$type] as $field_name => $field) {
if (!isset($types[$entity_type . ':' . $field_name])) {
$types[$entity_type . ':' . $field_name] = array(
'category' => t('Form'),
@@ -57,6 +60,26 @@ function ctools_entity_form_field_content_type_content_types() {
}
}
+ if (module_exists('field_group')) {
+ foreach ($entities as $entity_type => $entity) {
+ foreach ($entity['bundles'] as $type => $bundle) {
+ if ($group_info = field_group_info_groups($entity_type, $type, "form")) {
+ foreach ($group_info as $group_name => $group) {
+ if (!isset($types[$entity_type . ':' . $group_name])) {
+ $types[$entity_type . ':' . $group_name] = array(
+ 'category' => t('Form'),
+ 'icon' => 'icon_field.png',
+ 'title' => t('Group form: @widget_label', array('@widget_label' => $group->label)),
+ 'description' => t('Field group on the referenced entity.'),
+ );
+ }
+ $content_types[$entity_type . ':' . $group_name]['types'][$type] = $bundle['label'];
+ }
+ }
+ }
+ }
+ }
+
// Create the required context for each field related to the bundle types.
foreach ($types as $key => $field_content_type) {
list($entity_type, $field_name) = explode(':', $key, 2);
@@ -70,8 +93,8 @@ function ctools_entity_form_field_content_type_content_types() {
}
/**
-* Render the custom content type.
-*/
+ * Render the custom content type.
+ */
function ctools_entity_form_field_content_type_render($subtype, $conf, $panel_args, $context) {
if (empty($context) || empty($context->data)) {
return;
@@ -85,16 +108,38 @@ function ctools_entity_form_field_content_type_render($subtype, $conf, $panel_ar
$ids = entity_extract_ids($entity_type, $entity);
$field = field_info_instance($entity_type, $field_name, $ids[2]);
- // Do not render if the entity type does not have this field.
- if (empty($field)) {
+ // Check for field groups.
+ if (empty($field) && module_exists('field_group')) {
+ $groups = field_group_info_groups($entity_type, $entity->type, "form");
+ $group = !empty($groups[$field_name]) ? $groups[$field_name] : NULL;
+ }
+
+ // Do not render if the entity type does not have this field or group.
+ if (empty($field) && empty($group)) {
return;
}
- $block = new stdClass();
+ $block = new stdClass();
if (isset($context->form)) {
$block->content = array();
- $block->content[$field_name] = $context->form[$field_name];
- unset($context->form[$field_name]);
+ if (!empty($field)) {
+ $block->content[$field_name] = $context->form[$field_name];
+ unset($context->form[$field_name]);
+ }
+ else {
+ // Pre-render the form to populate field groups.
+ if (isset($context->form['#pre_render'])) {
+ foreach ($context->form['#pre_render'] as $function) {
+ if (function_exists($function)) {
+ $context->form = $function($context->form);
+ }
+ }
+ unset($context->form['#pre_render']);
+ }
+
+ $block->content[$field_name] = $context->form[$field_name];
+ unset($context->form[$field_name]);
+ }
}
else {
$block->content = t('Entity info.');
@@ -104,8 +149,8 @@ function ctools_entity_form_field_content_type_render($subtype, $conf, $panel_ar
}
/**
-* Returns the administrative title for a type.
-*/
+ * Returns the administrative title for a type.
+ */
function ctools_entity_form_field_content_type_admin_title($subtype, $conf, $context) {
list($entity_type, $field_name) = explode(':', $subtype, 2);
@@ -120,6 +165,6 @@ function ctools_entity_form_field_content_type_admin_title($subtype, $conf, $con
}
function ctools_entity_form_field_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/form/form.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/form/form.inc
index 73f7c78..ef8cc65 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/form/form.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/form/form.inc
@@ -1,11 +1,13 @@
TRUE,
'render last' => TRUE,
'title' => t('General form'),
@@ -43,7 +45,7 @@ function ctools_form_content_type_render($subtype, $conf, $panel_args, &$context
$block->delta = $context->form_id;
}
else {
- $block->title = t('Form');
+ $block->title = t('Form');
$block->content = t('Form goes here.');
$block->delta = 'unknown';
}
@@ -56,7 +58,7 @@ function ctools_form_content_type_admin_title($subtype, $conf, $context) {
}
function ctools_form_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to override title
+ // Provide a blank form so we have a place to override title
// and stuff.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node/node.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node/node.inc
index 7e77194..a114120 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node/node.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node/node.inc
@@ -46,10 +46,10 @@ function ctools_node_content_type_render($subtype, $conf, $panel_args) {
}
}
- // Support node translation
+ // Support node translation.
if (module_exists('translation')) {
if ($translations = module_invoke('translation', 'node_get_translations', $nid)) {
- if (isset($translations[$GLOBALS['language']->language])) {
+ if (isset($translations[$GLOBALS['language']->language])) {
$nid = $translations[$GLOBALS['language']->language]->nid;
}
}
@@ -66,7 +66,7 @@ function ctools_node_content_type_render($subtype, $conf, $panel_args) {
// Don't store viewed node data on the node, this can mess up other
// views of the node.
- $node = clone($node);
+ $node = clone $node;
$block->module = 'node';
$block->delta = $node->nid;
@@ -121,7 +121,6 @@ function ctools_node_content_type_edit_form($form, &$form_state) {
'#description' => t('Check this box if you would like your pane title to link to the node.'),
);
-
if ($form_state['op'] == 'add') {
$form['nid'] = array(
'#prefix' => '',
@@ -179,7 +178,7 @@ function ctools_node_content_type_edit_form($form, &$form_state) {
/**
* Validate the node selection.
*/
-function ctools_node_content_type_edit_form_validate(&$form, &$form_state) {
+function ctools_node_content_type_edit_form_validate(&$form, &$form_state) {
if ($form_state['op'] != 'add') {
return;
}
@@ -205,7 +204,7 @@ function ctools_node_content_type_edit_form_validate(&$form, &$form_state) {
}
if (!($node || preg_match('/^[@%]\d+$/', $nid)) ||
- // Do not allow unpublished nodes to be selected by unprivileged users
+ // Do not allow unpublished nodes to be selected by unprivileged users.
(empty($node->status) && !user_access('administer nodes'))) {
form_error($form['nid'], t('Invalid node'));
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_attachments.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_attachments.inc
index 380e260..2878e16 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_attachments.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_attachments.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Attached files'),
@@ -14,7 +16,7 @@ $plugin = array(
);
function ctools_node_attachments_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'attachments';
@@ -38,7 +40,6 @@ function ctools_node_attachments_content_type_admin_title($subtype, $conf, $cont
}
function ctools_node_attachments_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_author.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_author.inc
index e98ce5a..04b387d 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_author.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_author.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node author'),
@@ -29,7 +31,7 @@ function ctools_node_author_content_type_render($subtype, $conf, $panel_args, $c
$user = user_load($node->uid);
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'node_author';
$block->title = t('Author');
$block->content = !empty($conf['link']) ? theme('username', array('account' => $user, 'link_path' => 'user/' . $node->uid)) : check_plain(format_username($node));
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_body.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_body.inc
index 3e69560..032bc8e 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_body.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_body.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node body'),
@@ -28,7 +30,7 @@ function ctools_node_body_content_type_render($subtype, $conf, $panel_args, $con
* Returns an edit form for custom type settings.
*/
function ctools_node_body_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_children.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_children.inc
index 5d017c5..21f6542 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_children.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_children.inc
@@ -1,5 +1,9 @@
data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'book_children';
@@ -38,6 +42,6 @@ function ctools_node_book_children_content_type_admin_title($subtype, $conf, $co
}
function ctools_node_book_children_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_menu.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_menu.inc
new file mode 100644
index 0000000..b687076
--- /dev/null
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_menu.inc
@@ -0,0 +1,105 @@
+ TRUE,
+ 'title' => t('Book navigation menu'),
+ 'icon' => drupal_get_path('module', 'ctools') . '/plugins/content_types/block/icon_core_block_menu.png',
+ 'description' => t('The book menu belonging to the current book node.'),
+ 'required context' => new ctools_context_required(t('Node'), 'node'),
+ 'category' => t('Node'),
+ );
+}
+
+function ctools_node_book_menu_content_type_render($subtype, $conf, $panel_args, $context) {
+ $node = isset($context->data) ? clone $context->data : NULL;
+ $block = new stdClass();
+ $block->module = 'book_menu';
+
+ if ($conf['override_title']) {
+ $block->title = t($conf['override_title_text']);
+ }
+ else {
+ $block->title = t('Book navigation menu');
+ }
+ if ($node) {
+ $block->delta = $node->nid;
+ // TODO: the value is not available somehow?!?
+ $book_block_mode = isset($conf['book_block_mode']) ? $conf['book_block_mode'] : 'book pages';
+
+ // Code below is taken from function book_block_view().
+ $current_bid = empty($node->book['bid']) ? 0 : $node->book['bid'];
+
+ if ($book_block_mode === 'all pages') {
+ $block->subject = t('Book navigation');
+ $book_menus = array();
+ $pseudo_tree = array(0 => array('below' => FALSE));
+ foreach (book_get_books() as $book_id => $book) {
+ if ($book['bid'] === $current_bid) {
+ // If the current page is a node associated with a book, the menu
+ // needs to be retrieved.
+ $book_menus[$book_id] = menu_tree_output(menu_tree_all_data($node->book['menu_name'], $node->book));
+ }
+ else {
+ // Since we know we will only display a link to the top node, there
+ // is no reason to run an additional menu tree query for each book.
+ $book['in_active_trail'] = FALSE;
+ // Check whether user can access the book link.
+ $book_node = node_load($book['nid']);
+ $book['access'] = node_access('view', $book_node);
+ $pseudo_tree[0]['link'] = $book;
+ $book_menus[$book_id] = menu_tree_output($pseudo_tree);
+ }
+ }
+ $book_menus['#theme'] = 'book_all_books_block';
+ $block->content = $book_menus;
+ }
+ elseif ($current_bid) {
+ // Only display this block when the user is browsing a book.
+ $select = db_select('node', 'n')
+ ->fields('n', array('title'))
+ ->condition('n.nid', $node->book['bid'])
+ ->addTag('node_access');
+ $title = $select->execute()->fetchField();
+ // Only show the block if the user has view access for the top-level node.
+ if ($title) {
+ $tree = menu_tree_all_data($node->book['menu_name'], $node->book);
+ // There should only be one element at the top level.
+ $data = array_shift($tree);
+ // TODO: subject is not rendered.
+ $block->subject = theme('book_title_link', array('link' => $data['link']));
+ $block->content = ($data['below']) ? menu_tree_output($data['below']) : '';
+ }
+ }
+ }
+ else {
+ $block->content = t('Book navigation pager goes here.');
+ $block->delta = 'unknown';
+ }
+
+ return $block;
+}
+
+function ctools_node_book_menu_content_type_admin_title($subtype, $conf, $context) {
+ return t('"@s" book navigation pager', array('@s' => $context->identifier));
+}
+
+function ctools_node_book_menu_content_type_edit_form($form, &$form_state) {
+ // Grab block form from the book module.
+ $block_form = book_block_configure($delta = '');
+ // TODO: this does not work yet.
+ // See TODO in: ctools_node_book_menu_content_type_render.
+ if (isset($form_state['input']['book_block_mode'])) {
+ $block_form['book_block_mode']['#default_value'] = $form_state['input']['book_block_mode'];
+ }
+ $form += $block_form;
+ return $form;
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_nav.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_nav.inc
index 6c0d50d..d7a284b 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_nav.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_nav.inc
@@ -1,5 +1,9 @@
TRUE,
- 'title' => t('Book navigation'),
- 'icon' => 'icon_node.png',
- 'description' => t('The navigation menu the book the node belongs to.'),
+ 'title' => t('Book navigation pager'),
+ 'icon' => drupal_get_path('module', 'ctools') . '/plugins/content_types/block/icon_core_booknavigation.png',
+ 'description' => t('The navigational pager and sub pages of the current book node.'),
'required context' => new ctools_context_required(t('Node'), 'node'),
'category' => t('Node'),
);
}
function ctools_node_book_nav_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'book_nav';
- $block->title = t('Book navigation');
+ $block->title = t('Book navigation pager');
if ($node) {
$block->content = isset($node->book) ? theme('book_navigation', array('book_link' => $node->book)) : '';
$block->delta = $node->nid;
}
else {
- $block->content = t('Book navigation goes here.');
+ $block->content = t('Book navigation pager goes here.');
$block->delta = 'unknown';
}
@@ -34,10 +38,10 @@ function ctools_node_book_nav_content_type_render($subtype, $conf, $panel_args,
}
function ctools_node_book_nav_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" book navigation', array('@s' => $context->identifier));
+ return t('"@s" book navigation pager', array('@s' => $context->identifier));
}
function ctools_node_book_nav_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_form.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_form.inc
index f77b66e..ff34e4b 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_form.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_form.inc
@@ -1,5 +1,9 @@
data) ? clone($context->data) : NULL;
+ if (empty($context->data->nid)) {
+ return;
+ }
+ $node = clone $context->data;
$block = new stdClass();
$block->module = 'comments';
- $block->delta = $node->nid;
-
+ $block->delta = $node->nid;
$block->title = t('Add comment');
- if (empty($node)) {
- $block->content = t('Comment form here.');
- }
- else if ($node->comment == COMMENT_NODE_OPEN) {
+ if ($node->comment == COMMENT_NODE_OPEN) {
if (user_access('post comments')) {
$comment = new stdClass();
$comment->nid = $node->nid;
@@ -43,7 +46,7 @@ function ctools_node_comment_form_content_type_render($subtype, $conf, $panel_ar
);
$block->content = drupal_build_form('comment_node_' . $node->type . '_form', $form_state);
}
- else if (!empty($conf['anon_links'])) {
+ elseif (!empty($conf['anon_links'])) {
$block->content = theme('comment_post_forbidden', array('node' => $node));
}
}
@@ -76,21 +79,3 @@ function ctools_node_comment_form_content_type_edit_form_submit($form, &$form_st
$form_state['conf'][$key] = $form_state['values'][$key];
}
}
-
-/**
- * Alter the comment form to get a little more control over it.
- */
-function ctools_form_comment_form_alter(&$form, &$form_state) {
- if (!empty($form_state['ctools comment alter'])) {
- // Force the form to post back to wherever we are.
- $form['#action'] = url($_GET['q'], array('fragment' => 'comment-form'));
- if (empty($form['#submit'])) {
- $form['#submit'] = array('comment_form_submit');
- }
- $form['#submit'][] = 'ctools_node_comment_form_submit';
- }
-}
-
-function ctools_node_comment_form_submit(&$form, &$form_state) {
- $form_state['redirect'][0] = $_GET['q'];
-}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_wrapper.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_wrapper.inc
index 8e25429..4bdb3fc 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_wrapper.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_wrapper.inc
@@ -1,5 +1,9 @@
data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'comments';
- $block->delta = $node->nid;
+ $block->delta = $node->nid;
$renderable = array(
'#theme' => 'comment_wrapper__node_' . $node->type,
@@ -65,7 +69,7 @@ function ctools_node_comment_wrapper_content_type_render($subtype, $conf, $panel
);
$renderable['comment_form'] = drupal_build_form('comment_node_' . $node->type . '_form', $form_state);
}
- else if (!empty($conf['anon_links'])) {
+ elseif (!empty($conf['anon_links'])) {
$renderable['comment_form'] = theme('comment_post_forbidden', array('node' => $node));
}
}
@@ -77,7 +81,7 @@ function ctools_node_comment_wrapper_content_type_render($subtype, $conf, $panel
/**
* Returns an edit form for the comment wrapper.
- */
+ */
function ctools_node_comment_wrapper_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
$form['mode'] = array(
@@ -90,7 +94,8 @@ function ctools_node_comment_wrapper_content_type_edit_form($form, &$form_state)
foreach (_comment_per_page() as $i) {
$options[$i] = t('!a comments per page', array('!a' => $i));
}
- $form['comments_per_page'] = array('#type' => 'select',
+ $form['comments_per_page'] = array(
+ '#type' => 'select',
'#title' => t('Pager'),
'#default_value' => $conf['comments_per_page'],
'#options' => $options,
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comments.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comments.inc
index 0f0033d..7453e79 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comments.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comments.inc
@@ -1,5 +1,9 @@
data) ? clone($context->data) : NULL;
+ if (empty($context->data->nid)) {
+ return;
+ }
+ $node = clone $context->data;
$block = new stdClass();
$block->module = 'comments';
- $block->delta = $node->nid;
-
+ $block->delta = $node->nid;
$block->title = t('Comments');
- if (empty($node)) {
- $block->content = t('Node comments go here.');
- }
- else if ($node->comment) {
+
+ if ($node->comment) {
$block->content = ctools_comment_render($node, $conf);
- // Update the history table, stating that this user viewed this node.
- node_tag_new($node);
}
return $block;
@@ -50,7 +52,8 @@ function ctools_node_comments_content_type_edit_form($form, &$form_state) {
foreach (_comment_per_page() as $i) {
$options[$i] = t('!a comments per page', array('!a' => $i));
}
- $form['comments_per_page'] = array('#type' => 'select',
+ $form['comments_per_page'] = array(
+ '#type' => 'select',
'#title' => t('Pager'),
'#default_value' => $conf['comments_per_page'],
'#options' => $options,
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_content.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_content.inc
index 38c5b57..ba873ed 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_content.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_content.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node content'),
@@ -27,18 +29,18 @@ $plugin = array(
* Render the node content.
*/
function ctools_node_content_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
+ if (!empty($context) && (empty($context->data) || empty($context->data->nid))) {
return;
}
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'node';
- $block->delta = $node->nid;
+ $block->delta = $node->nid;
if (empty($node)) {
$block->delta = 'placeholder';
- $block->title = t('Node title.');
+ $block->title = t('Node title.');
$block->content = t('Node content goes here.');
}
else {
@@ -86,7 +88,7 @@ function ctools_node_content_render_node($node, $conf) {
$links['node-readmore'] = array(
'title' => t('Read more'),
'href' => 'node/' . $node->nid,
- 'attributes' => array('rel' => 'tag', 'title' => strip_tags($node->title))
+ 'attributes' => array('rel' => 'tag', 'title' => strip_tags($node->title)),
);
}
@@ -201,4 +203,3 @@ function ctools_node_content_content_type_edit_form_submit($form, &$form_state)
function ctools_node_content_content_type_admin_title($subtype, $conf, $context) {
return t('"@s" content', array('@s' => $context->identifier));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_created.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_created.inc
index 06d1442..da3fbf8 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_created.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_created.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node created date'),
@@ -20,7 +22,7 @@ $plugin = array(
* Render the custom content type.
*/
function ctools_node_created_content_type_render($subtype, $conf, $panel_args, $context) {
- if (empty($context) || empty($context->data)) {
+ if (!empty($context) && (empty($context->data) || empty($context->data->nid))) {
return;
}
@@ -28,7 +30,7 @@ function ctools_node_created_content_type_render($subtype, $conf, $panel_args, $
$node = $context->data;
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'node_created';
$block->title = t('Created date');
$block->content = format_date($node->created, $conf['format']);
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_links.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_links.inc
index 6096a44..384fb63 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_links.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_links.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node links'),
@@ -29,10 +31,10 @@ function ctools_node_links_content_type_render($subtype, $conf, $panel_args, $co
return;
}
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'node';
- $block->delta = $node->nid;
+ $block->delta = $node->nid;
if (empty($node)) {
$block->delta = 'placeholder';
@@ -102,4 +104,3 @@ function ctools_node_links_content_type_edit_form_submit($form, &$form_state) {
function ctools_node_links_content_type_admin_title($subtype, $conf, $context) {
return t('"@s" links', array('@s' => $context->identifier));
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_terms.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_terms.inc
index f6e7aec..e910e4c 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_terms.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_terms.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node terms'),
@@ -30,7 +32,7 @@ function ctools_node_terms_content_type_render($subtype, $conf, $panel_args, $co
// Get a shortcut to the node.
$node = $context->data;
- // Load all terms for this node from all vocabularies
+ // Load all terms for this node from all vocabularies.
$query = db_select('taxonomy_index', 't');
$result = $query
->fields('t')
@@ -38,22 +40,22 @@ function ctools_node_terms_content_type_render($subtype, $conf, $panel_args, $co
->execute();
$tids = array();
- foreach ($result AS $term) {
+ foreach ($result as $term) {
$tids[] = $term->tid;
}
- // Get the real term objects
+ // Get the real term objects.
$term_objects = taxonomy_term_load_multiple($tids);
$terms = array();
if (empty($conf['vid'])) {
// All terms.
- foreach ($term_objects AS $term) {
+ foreach ($term_objects as $term) {
$terms['taxonomy_term_' . $term->tid] = array(
'title' => check_plain($term->name),
'href' => 'taxonomy/term/' . $term->tid,
- 'attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description))
+ 'attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description)),
);
}
}
@@ -106,7 +108,7 @@ function ctools_node_terms_content_type_render($subtype, $conf, $panel_args, $co
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'node_terms';
$block->delta = $node->nid;
$block->title = t('Terms');
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_title.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_title.inc
index bec8982..6956c2f 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_title.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_title.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node title'),
@@ -23,7 +25,7 @@ $plugin = array(
* Render the custom content type.
*/
function ctools_node_title_content_type_render($subtype, $conf, $panel_args, $context) {
- if (empty($context) || empty($context->data)) {
+ if (!empty($context) && (empty($context->data) || empty($context->data->nid))) {
return;
}
@@ -33,10 +35,10 @@ function ctools_node_title_content_type_render($subtype, $conf, $panel_args, $co
// Load information about the node type.
$type = node_type_get_type($node);
- // Generate the title
+ // Generate the title.
$content = !empty($conf['link']) ? l($node->title, 'node/' . $node->nid) : check_plain($node->title);
- // Build any surrounding markup if so configured
+ // Build any surrounding markup if so configured.
if (isset($conf['markup']) && $conf['markup'] != 'none') {
$markup = '<' . $conf['markup'];
if (!empty($conf['id'])) {
@@ -50,7 +52,7 @@ function ctools_node_title_content_type_render($subtype, $conf, $panel_args, $co
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'node_title';
$block->title = $type->title_label;
$block->content = $content;
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_type_desc.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_type_desc.inc
index f2005d0..0694c53 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_type_desc.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_type_desc.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node type description'),
@@ -18,18 +20,18 @@ $plugin = array(
* based on the module and delta supplied in the configuration.
*/
function ctools_node_type_desc_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'node_type';
if ($node) {
- $type = node_type_get_type($node);
- $block->title = $type->name;
+ $type = node_type_get_type($node);
+ $block->title = $type->name;
$block->content = filter_xss_admin($type->description);
$block->delta = $node->type;
}
else {
- $block->title = t('Node type description');
+ $block->title = t('Node type description');
$block->content = t('Node type description goes here.');
$block->delta = 'unknown';
}
@@ -42,6 +44,6 @@ function ctools_node_type_desc_content_type_admin_title($subtype, $conf, $contex
}
function ctools_node_type_desc_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_updated.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_updated.inc
index 60ac4b5..eb50669 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_updated.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_updated.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Node last updated date'),
@@ -28,7 +30,7 @@ function ctools_node_updated_content_type_render($subtype, $conf, $panel_args, $
$node = $context->data;
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'node_updated';
$block->title = t('Last updated date');
$block->content = format_date(!empty($node->changed) ? $node->changed : $node->created, $conf['format']);
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_attachments.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_attachments.inc
index 1e248f5..51c95a5 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_attachments.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_attachments.inc
@@ -1,5 +1,9 @@
module = t('node_form');
+ $block->module = 'node_form';
$block->title = t('Attach files');
$block->delta = 'url-path-options';
@@ -46,6 +50,6 @@ function ctools_node_form_attachments_content_type_admin_title($subtype, $conf,
}
function ctools_node_form_attachments_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_author.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_author.inc
index 350df40..86f3d73 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_author.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_author.inc
@@ -1,9 +1,11 @@
TRUE,
'icon' => 'icon_node_form.png',
@@ -15,7 +17,7 @@ $plugin = array(
function ctools_node_form_author_content_type_render($subtype, $conf, $panel_args, &$context) {
$block = new stdClass();
- $block->module = t('node_form');
+ $block->module = 'node_form';
$block->title = t('Authoring information');
$block->delta = 'author-options';
@@ -47,6 +49,6 @@ function ctools_node_form_author_content_type_admin_title($subtype, $conf, $cont
}
function ctools_node_form_author_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_book.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_book.inc
index ad19590..b7ad36b 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_book.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_book.inc
@@ -1,5 +1,9 @@
module = t('node_form');
+ $block->module = 'node_form';
$block->title = t('Book outline');
$block->delta = 'book-outline';
@@ -45,6 +49,6 @@ function ctools_node_form_book_content_type_admin_title($subtype, $conf, $contex
}
function ctools_node_form_book_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_buttons.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_buttons.inc
index b7ac984..ed553a6 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_buttons.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_buttons.inc
@@ -1,9 +1,11 @@
TRUE,
'icon' => 'icon_node_form.png',
@@ -15,7 +17,7 @@ $plugin = array(
function ctools_node_form_buttons_content_type_render($subtype, $conf, $panel_args, &$context) {
$block = new stdClass();
- $block->module = t('node_form');
+ $block->module = 'node_form';
$block->title = '';
$block->delta = 'buttons';
@@ -38,6 +40,6 @@ function ctools_node_form_buttons_content_type_admin_title($subtype, $conf, $con
}
function ctools_node_form_buttons_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_comment.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_comment.inc
index d0f137a..eaf5c95 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_comment.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_comment.inc
@@ -1,5 +1,9 @@
module = t('node_form');
+ $block->module = 'node_form';
$block->title = t('Comment options');
$block->delta = 'comment-options';
@@ -45,6 +49,6 @@ function ctools_node_form_comment_content_type_admin_title($subtype, $conf, $con
}
function ctools_node_form_comment_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_language.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_language.inc
index 2043c1c..dfef295 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_language.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_language.inc
@@ -1,9 +1,11 @@
TRUE,
'icon' => 'icon_node_form.png',
@@ -15,7 +17,7 @@ $plugin = array(
function ctools_node_form_language_content_type_render($subtype, $conf, $panel_args, &$context) {
$block = new stdClass();
- $block->module = t('node_form');
+ $block->module = 'node_form';
$block->delta = 'language-options';
@@ -36,6 +38,6 @@ function ctools_node_form_language_content_type_admin_title($subtype, $conf, $co
}
function ctools_node_form_language_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_log.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_log.inc
index 334ff54..aac42a6 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_log.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_log.inc
@@ -1,9 +1,11 @@
TRUE,
'icon' => 'icon_node_form.png',
@@ -15,7 +17,7 @@ $plugin = array(
function ctools_node_form_log_content_type_render($subtype, $conf, $panel_args, &$context) {
$block = new stdClass();
- $block->module = t('node_form');
+ $block->module = 'node_form';
$block->title = t('Revision information');
if (isset($context->form)) {
@@ -42,6 +44,6 @@ function ctools_node_form_log_content_type_admin_title($subtype, $conf, $context
}
function ctools_node_form_log_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_menu.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_menu.inc
index 906ade4..9b4df43 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_menu.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_menu.inc
@@ -1,5 +1,9 @@
module = t('node_form');
+ $block->module = 'node_form';
$block->title = t('Menu options');
$block->delta = 'menu-options';
@@ -45,6 +49,6 @@ function ctools_node_form_menu_content_type_admin_title($subtype, $conf, $contex
}
function ctools_node_form_menu_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_path.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_path.inc
index a1e3cba..262851f 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_path.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_path.inc
@@ -1,5 +1,9 @@
module = t('node_form');
+ $block->module = 'node_form';
$block->title = t('URL path options');
$block->delta = 'url-path-options';
@@ -46,6 +50,6 @@ function ctools_node_form_path_content_type_admin_title($subtype, $conf, $contex
}
function ctools_node_form_path_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_publishing.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_publishing.inc
index e73cff2..53b584f 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_publishing.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_publishing.inc
@@ -23,7 +23,7 @@ function ctools_node_form_publishing_content_type_render($subtype, $conf, $panel
$block = new stdClass();
$block->title = t('Publishing options');
- $block->module = t('node_form');
+ $block->module = 'node_form';
$block->delta = 'publishing-options';
if (isset($context->form)) {
@@ -49,6 +49,6 @@ function ctools_node_form_publishing_content_type_admin_title($subtype, $conf, $
}
function ctools_node_form_publishing_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_title.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_title.inc
index f40d274..14e79ab 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_title.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/node_form/node_form_title.inc
@@ -1,9 +1,11 @@
TRUE,
'icon' => 'icon_node_form.png',
@@ -15,7 +17,7 @@ $plugin = array(
function ctools_node_form_title_content_type_render($subtype, $conf, $panel_args, &$context) {
$block = new stdClass();
- $block->module = t('node_form');
+ $block->module = 'node_form';
$block->delta = 'title-options';
@@ -36,6 +38,6 @@ function ctools_node_form_title_content_type_admin_title($subtype, $conf, $conte
}
function ctools_node_form_title_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_help.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_help.inc
index da1abe6..dcba97d 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_help.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_help.inc
@@ -30,4 +30,3 @@ function ctools_page_help_content_type_render($subtype, $conf, $panel_args) {
return $block;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_logo.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_logo.inc
index c00ca5e..fa7cdae 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_logo.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_logo.inc
@@ -29,7 +29,7 @@ function ctools_page_logo_content_type_render($subtype, $conf, $panel_args) {
$block = new stdClass();
if (!empty($logo)) {
- $image = '
';
+ $image = theme('image', array('path' => $logo, 'alt' => t('Home')));
$block->content = l($image, '', array('html' => TRUE, 'attributes' => array('rel' => 'home', 'id' => 'logo', 'title' => t('Home'))));
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_messages.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_messages.inc
index e2fe37b..9a8bc74 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_messages.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_messages.inc
@@ -30,4 +30,3 @@ function ctools_page_messages_content_type_render($subtype, $conf, $panel_args)
return $block;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_site_name.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_site_name.inc
index 3053d45..cb83431 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_site_name.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_site_name.inc
@@ -61,7 +61,7 @@ function ctools_page_site_name_content_type_render($subtype, $conf, $panel_args)
// Optionally link the site name to the homepage.
if (!empty($conf['linked'])) {
- $block->content = l($block->content, '');
+ $block->content = l($block->content, '', array('html' => TRUE));
}
return $block;
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_tabs.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_tabs.inc
index e88acd5..6a2e9a7 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_tabs.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_tabs.inc
@@ -40,6 +40,7 @@ function ctools_page_tabs_content_type_render($subtype, $conf, $panel_args) {
case 'primary':
unset($menus['#secondary']);
break;
+
case 'secondary':
unset($menus['#primary']);
break;
@@ -54,7 +55,6 @@ function ctools_page_tabs_content_type_render($subtype, $conf, $panel_args) {
return $block;
}
-
function ctools_page_tabs_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_title.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_title.inc
index e3032df..c32ef7e 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_title.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/page/page_title.inc
@@ -29,6 +29,12 @@ $plugin = array(
* Outputs the page title of the current page.
*/
function ctools_page_title_content_type_render($subtype, $conf, $panel_args) {
+ // $conf['override_title'] can have one of these three values.
+ // 0 i.e. hide the title, 1 i.e. no title, and 2 i.e. pane title if it's a
+ // panels page.
+ if (!drupal_get_title() && isset($conf['override_title']) && $conf['override_title'] === 1) {
+ return;
+ }
// TODO: This should have a setting or something for the markup.
if (empty($conf['markup'])) {
$conf['markup'] = 'h1';
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/search/search_form.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/search/search_form.inc
index 2b6a322..0167100 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/search/search_form.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/search/search_form.inc
@@ -1,5 +1,9 @@
module = 'search';
- $block->delta = 'form';
- $block->title = '';
+ $block = new stdClass();
+ $block->module = 'search';
+ $block->delta = 'form';
+ $block->title = '';
switch ($conf['path_type']) {
default:
@@ -49,6 +53,7 @@ function ctools_search_form_content_type_render($subtype, $conf, $panel_args, $c
$path = $_GET['q'];
$path = str_replace($keys, '', $path);
break;
+
case 'custom':
$path = $conf['path'];
break;
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/search/search_result.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/search/search_result.inc
index 32037bd..fb88a0f 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/search/search_result.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/search/search_result.inc
@@ -1,5 +1,9 @@
data;
}
- $conditions = NULL;
+ $conditions = NULL;
if (isset($info['conditions_callback']) && function_exists($info['conditions_callback'])) {
// Build an optional array of more search conditions.
$conditions = $info['conditions_callback']($keys);
@@ -59,9 +63,9 @@ function ctools_search_result_content_type_render($subtype, $conf, $panel_args,
}
// Build the content type block.
- $block = new stdClass();
- $block->module = 'search';
- $block->delta = 'result';
+ $block = new stdClass();
+ $block->module = 'search';
+ $block->delta = 'result';
$results = '';
@@ -160,7 +164,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) {
'#title' => t('Display text if no search keywords were submitted'),
);
-
$form['no_key_title'] = array(
'#title' => t('Title'),
'#type' => 'textfield',
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_description.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_description.inc
index 2b953ed..6367075 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_description.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_description.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Term description'),
@@ -14,12 +16,12 @@ $plugin = array(
);
function ctools_term_description_content_type_render($subtype, $conf, $panel_args, $context) {
- $term = isset($context->data) ? clone($context->data) : NULL;
+ $term = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'node_type';
- $block->title = $term->name;
- if ($term) {
+ if (!empty($term)) {
+ $block->title = $term->name;
$block->content = check_markup($term->description, $term->format, '', TRUE);
$block->delta = $term->tid;
@@ -33,6 +35,7 @@ function ctools_term_description_content_type_render($subtype, $conf, $panel_arg
}
}
else {
+ $block->title = '';
$block->content = t('Term description goes here.');
$block->delta = 'unknown';
}
@@ -45,6 +48,6 @@ function ctools_term_description_content_type_admin_title($subtype, $conf, $cont
}
function ctools_term_description_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_list.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_list.inc
index 7c609fb..a533074 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_list.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_list.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('List of related terms'),
@@ -21,7 +23,7 @@ $plugin = array(
);
function ctools_term_list_content_type_render($subtype, $conf, $panel_args, $context) {
- $term = isset($context->data) ? clone($context->data) : NULL;
+ $term = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'term-list';
$path = empty($conf['path']) ? 'taxonomy/term/%tid' : $conf['path'];
@@ -40,7 +42,7 @@ function ctools_term_list_content_type_render($subtype, $conf, $panel_args, $con
$block->delta = $conf['type'];
switch ($conf['type']) {
case 'related':
- // FIXME this no longer exists, must be done with Field API
+ // @todo this no longer exists, must be done with Field API.
// $terms = taxonomy_get_related($term->tid);
break;
@@ -78,7 +80,7 @@ function ctools_term_list_content_type_render($subtype, $conf, $panel_args, $con
case 'synonyms':
// FIXME this no longer exists, must be done with Field API
-// $terms = taxonomy_get_synonyms($term->tid);
+ // $terms = taxonomy_get_synonyms($term->tid);.
break;
}
@@ -169,4 +171,3 @@ function ctools_term_list_content_type_edit_form_submit($form, &$form_state) {
$form_state['conf'][$key] = $form_state['values'][$key];
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_name.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_name.inc
index a9a8876..ec30be4 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_name.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_name.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('Term name'),
@@ -19,7 +21,6 @@ $plugin = array(
),
);
-
/**
* Render the custom content type.
*/
@@ -34,10 +35,10 @@ function ctools_term_name_content_type_render($subtype, $conf, $panel_args, $con
// Load the vocabulary.
$vocab = taxonomy_vocabulary_load($term->vid);
- // Generate the title
+ // Generate the title.
$content = !empty($conf['link']) ? l($term->name, 'taxonomy/term/' . $term->tid) : check_plain($term->name);
- // Build any surrounding markup if so configured
+ // Build any surrounding markup if so configured.
if (isset($conf['markup']) && $conf['markup'] != 'none') {
$markup = '<' . $conf['markup'];
if (!empty($conf['id'])) {
@@ -51,7 +52,7 @@ function ctools_term_name_content_type_render($subtype, $conf, $panel_args, $con
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'term_name';
$block->title = t('Name');
$block->content = $content;
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/token/token.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/token/token.inc
index 7b6f7fc..32026d8 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/token/token.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/token/token.inc
@@ -62,8 +62,8 @@ function ctools_token_content_type_content_types() {
}
/**
-* Render the custom content type.
-*/
+ * Render the custom content type.
+ */
function ctools_token_content_type_render($subtype, $conf, $panel_args, $context) {
if (empty($context) || empty($context->data)) {
return FALSE;
@@ -81,7 +81,7 @@ function ctools_token_content_type_render($subtype, $conf, $panel_args, $context
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'ctools';
$block->title = $info['tokens'][$entity_type][$name]['name'];
$block->content = $values[$name];
@@ -91,8 +91,8 @@ function ctools_token_content_type_render($subtype, $conf, $panel_args, $context
}
/**
-* Returns an edit form for custom type settings.
-*/
+ * Returns an edit form for custom type settings.
+ */
function ctools_token_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
@@ -113,10 +113,9 @@ function ctools_token_content_type_edit_form_submit($form, &$form_state) {
$form_state['conf']['sanitize'] = $form_state['values']['sanitize'];
}
-
/**
-* Returns the administrative title for a type.
-*/
+ * Returns the administrative title for a type.
+ */
function ctools_token_content_type_admin_title($subtype, $conf, $context) {
return t('"@s" @name', array('@s' => $context->identifier, '@name' => $subtype));
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields.inc
index 55d5593..019715f 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields.inc
@@ -1,5 +1,9 @@
data) ? clone($context->data) : NULL;
+ $account = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'profile fields';
if ($account) {
- // Get the category from the options
+ // Get the category from the options.
$category = str_replace("_", " ", $conf['category']);
- // Set the subject to the name of the category
+ // Set the subject to the name of the category.
$block->subject = $category;
- // Put all the fields in the category into an array
+ // Put all the fields in the category into an array.
profile_view_profile($account);
if (is_array($account->content[$category])) {
@@ -46,11 +50,11 @@ function ctools_profile_fields_content_type_render($subtype, $conf, $panel_args,
}
if (count($vars) == 0) {
- // Output the given empty text
+ // Output the given empty text.
$output = $conf['empty'];
}
else {
- // Call the theme function with the field vars
+ // Call the theme function with the field vars.
$output = theme('profile_fields_pane', $category, $vars);
}
@@ -65,6 +69,7 @@ function ctools_profile_fields_content_type_render($subtype, $conf, $panel_args,
return $block;
}
+
/**
* Helper function : build the list of categories for the 'edit' form.
*/
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields_pane.tpl.php b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields_pane.tpl.php
index 3736812..bac10ce 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields_pane.tpl.php
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields_pane.tpl.php
@@ -1,4 +1,5 @@
TRUE,
'title' => t('User links'),
@@ -29,7 +31,7 @@ function ctools_user_links_content_type_render($subtype, $conf, $panel_args, $co
$account = clone $context->data;
$block = new stdClass();
$block->module = 'user';
- $block->delta = $account->uid;
+ $block->delta = $account->uid;
if (empty($account)) {
$block->delta = 'placeholder';
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_picture.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_picture.inc
index 0934c20..2d4d31b 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_picture.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_picture.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('User picture'),
@@ -22,7 +24,7 @@ function ctools_user_picture_content_type_render($subtype, $conf, $panel_args, $
$account = clone $context->data;
- // Check if user has permissions to access the user
+ // Check if user has permissions to access the user.
if ($user->uid != $account->uid && (!user_access('access user profiles') && !user_access('administer users'))) {
return;
}
@@ -36,19 +38,18 @@ function ctools_user_picture_content_type_render($subtype, $conf, $panel_args, $
'#account' => $account,
);
-
$block->content = $element;
return $block;
}
/**
- * Display the administrative title for a panel pane in the drag & drop UI
+ * Display the administrative title for a panel pane in the drag & drop UI.
*/
function ctools_user_picture_content_type_admin_title($subtype, $conf, $context) {
return t('"@s" user picture', array('@s' => $context->identifier));
}
function ctools_user_picture_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_profile.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_profile.inc
index 6c41882..3a28ca3 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_profile.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_profile.inc
@@ -1,9 +1,11 @@
TRUE,
'title' => t('User profile'),
@@ -20,7 +22,7 @@ $plugin = array(
* Render the user profile content type.
*/
function ctools_user_profile_content_type_render($subtype, $conf, $panel_args, $context) {
- $account = isset($context->data) ? clone($context->data) : NULL;
+ $account = isset($context->data) ? clone $context->data : NULL;
if (!$account) {
return NULL;
}
@@ -84,4 +86,3 @@ function ctools_user_profile_content_type_edit_form($form, &$form_state) {
function ctools_user_profile_content_type_edit_form_submit($form, &$form_state) {
$form_state['conf']['view_mode'] = $form_state['values']['view_mode'];
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_signature.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_signature.inc
index ca7550b..6a8e7f6 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_signature.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_signature.inc
@@ -1,9 +1,11 @@
t('User signature'),
'icon' => 'icon_user.png',
@@ -13,7 +15,7 @@ $plugin = array(
);
function ctools_user_signature_content_type_render($subtype, $conf, $panel_args, $context) {
- $account = isset($context->data) ? clone($context->data) : NULL;
+ $account = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'user-signature';
@@ -31,13 +33,13 @@ function ctools_user_signature_content_type_render($subtype, $conf, $panel_args,
}
/**
- * Display the administrative title for a panel pane in the drag & drop UI
+ * Display the administrative title for a panel pane in the drag & drop UI.
*/
function ctools_user_signature_content_type_admin_title($subtype, $conf, $context) {
return t('"@s" user signature', array('@s' => $context->identifier));
}
function ctools_user_signature_content_type_edit_form($form, &$form_state) {
- // provide a blank form so we have a place to have context setting.
+ // Provide a blank form so we have a place to have context setting.
return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/content_types/vocabulary_context/vocabulary_terms.inc b/sites/all/modules/contrib/dev/ctools/plugins/content_types/vocabulary_context/vocabulary_terms.inc
index 5f33a03..6a7f8ef 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/content_types/vocabulary_context/vocabulary_terms.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/content_types/vocabulary_context/vocabulary_terms.inc
@@ -1,5 +1,9 @@
data) ? clone($context->data) : NULL;
- $max_depth = (!empty($conf['max_depth']) ? (int)$conf['max_depth'] : NULL);
+ $vocab = isset($context->data) ? clone $context->data : NULL;
+ $max_depth = (!empty($conf['max_depth']) ? (int) $conf['max_depth'] : NULL);
if ($conf['tree'] == FALSE) {
$terms = taxonomy_get_tree($vocab->vid, 0, $max_depth);
$items = array();
@@ -35,9 +39,9 @@ function ctools_vocabulary_terms_content_type_render($subtype, $conf, $panel_arg
$output = theme('item_list', array('items' => _ctools_content_vocabulary_terms($vocab->vid, $max_depth)));
}
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'node_type';
- $block->title = check_plain($vocab->name);
+ $block->title = check_plain($vocab->name);
$block->content = $output;
$block->delta = $vocab->vid;
@@ -97,4 +101,3 @@ function ctools_vocabulary_terms_content_type_edit_form_submit($form, &$form_sta
$form_state['conf'][$key] = $form_state['values'][$key];
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/entity.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/entity.inc
index b214aa0..7a2b024 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/entity.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/entity.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Plugin to provide a node context. A node context is a node wrapped in a
* context object that can be utilized by anything that accepts contexts.
*/
@@ -23,6 +22,8 @@ $plugin = array(
'#type' => 'textfield',
'#description' => t('Enter the ID of an entity for this context.'),
),
+ // Tell ctools_context_get_context_from_context() how to interpret its $argument.
+ 'placeholder name' => 'entity_id',
'get child' => 'ctools_context_entity_get_child',
'get children' => 'ctools_context_entity_get_children',
);
@@ -88,9 +89,9 @@ function ctools_context_create_entity($empty, $data = NULL, $conf = FALSE, $plug
}
if (!empty($data)) {
- $context->data = $data;
+ $context->data = $data;
if (!empty($entity['entity keys']['label'])) {
- $context->title = $data->{$entity['entity keys']['label']};
+ $context->title = $data->{$entity['entity keys']['label']};
}
$context->argument = $id;
@@ -159,7 +160,7 @@ function ctools_context_entity_settings_form($form, &$form_state) {
* Validate a node.
*/
function ctools_context_entity_settings_form_validate($form, &$form_state) {
- // Validate the autocomplete
+ // Validate the autocomplete.
if (empty($form_state['values']['entity_id']) && empty($form_state['values']['entity'])) {
form_error($form['entity'], t('You must select an entity.'));
return;
@@ -169,7 +170,7 @@ function ctools_context_entity_settings_form_validate($form, &$form_state) {
return;
}
- $id = $form_state['values']['entity'];
+ $id = $form_state['values']['entity'];
$preg_matches = array();
$match = preg_match('/\[id: (\d+)\]/', $id, $preg_matches);
if (!$match) {
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/language.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/language.inc
new file mode 100644
index 0000000..e66f02a
--- /dev/null
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/language.inc
@@ -0,0 +1,169 @@
+ t('Language'),
+ 'description' => t('Language object.'),
+ 'context' => 'ctools_context_language_create',
+ 'context name' => 'language',
+ 'keyword' => 'language',
+
+ // Provides a list of items which are exposed as keywords.
+ 'convert list' => 'ctools_language_context_convert_list',
+ // Convert keywords into data.
+ 'convert' => 'ctools_language_context_convert',
+
+ 'placeholder form' => array(
+ '#type' => 'textfield',
+ '#description' => t('Enter a valid langcode.'),
+ '#value' => $GLOBALS['language']->language,
+ ),
+
+ // Provide settings for the context.
+ 'edit form' => 'ctools_context_language_settings_form',
+ 'settings' => ctools_context_language_conf_defaults(),
+);
+
+/**
+ * Ensures a full populated settings array with sane defaults.
+ *
+ * @param mixed $conf
+ * Array with the user defined settings, or a string identifying a language.
+ *
+ * @return array
+ * Array with all available settings.
+ */
+function ctools_context_language_conf_defaults($conf = array()) {
+ if (!is_array($conf)) {
+ $conf = array(
+ 'preset_langcode' => (string) $conf,
+ );
+ }
+
+ return $conf + array(
+ 'enable_cache_argument' => TRUE,
+ 'language_type' => 'language',
+ 'preset_langcode' => $GLOBALS['language']->language,
+ );
+}
+
+/**
+ * Create a context, either from manual configuration or the current language.
+ */
+function ctools_context_language_create($empty, $data = NULL, $conf = FALSE) {
+ $context = new ctools_context('language');
+ $context->plugin = 'language';
+ if ($empty) {
+ return $context;
+ }
+ $context->title = t('Language');
+
+ $settings = ctools_context_language_conf_defaults($data);
+ if ($settings['language_type'] != 'preset') {
+ $language_object = $GLOBALS[$settings['language_type']];
+ }
+ else {
+ // Fetch the enabled language objects.
+ $languages = language_list('enabled');
+ $languages = $languages[1];
+
+ // Set the custom language, but fallback to the interface language.
+ $language_object = $GLOBALS['language'];
+ if (isset($languages[$settings['preset_langcode']])) {
+ $language_object = $languages[$settings['preset_langcode']];
+ }
+ }
+ // If enabled set the argument ot use in the cid.
+ if ($settings['enable_cache_argument']) {
+ $context->argument = $language_object->language;
+ }
+ $context->data = $language_object;
+ return $context;
+}
+
+/**
+ * Provide a list of sub-keywords.
+ *
+ * This is used to provide keywords from the context for use in a content type,
+ * pane, etc.
+ */
+function ctools_language_context_convert_list() {
+ $context = new stdClass();
+ $context->data = $GLOBALS['language'];
+ return array(
+ 'language' => t('Langcode. E.g. !example', array('!example' => ctools_language_context_convert($context, 'language'))),
+ 'name' => t('Name. E.g. !example', array('!example' => ctools_language_context_convert($context, 'name'))),
+ 'native' => t('Native name of the language. E.g. !example', array('!example' => ctools_language_context_convert($context, 'native'))),
+ 'direction' => t('Text direction 0=LRT, 1=RTL. E.g. !example', array('!example' => ctools_language_context_convert($context, 'direction'))),
+ 'enabled' => t('Status. E.g. !example', array('!example' => ctools_language_context_convert($context, 'enabled'))),
+ 'plurals' => t('Number of plural forms. E.g. !example', array('!example' => ctools_language_context_convert($context, 'plurals'))),
+ 'formula' => t('Plural formula. E.g. !example', array('!example' => ctools_language_context_convert($context, 'formula'))),
+ 'domain' => t('Domain prefix. E.g. !example', array('!example' => ctools_language_context_convert($context, 'domain'))),
+ 'prefix' => t('Url prefix . E.g. !example', array('!example' => ctools_language_context_convert($context, 'prefix'))),
+ 'weight' => t('The weight. E.g. !example', array('!example' => ctools_language_context_convert($context, 'weight'))),
+ 'javascript' => t('Key of the javascript file with the translations. E.g. !example', array('!example' => ctools_language_context_convert($context, 'javascript'))),
+ 'provider' => t('Negotiation method that defined the language. E.g. !example', array('!example' => ctools_language_context_convert($context, 'provider'))),
+ );
+}
+
+/**
+ * Convert a context property into a string to be used as a keyword.
+ */
+function ctools_language_context_convert($context, $type) {
+ if (isset($context->data->$type)) {
+ return $context->data->$type;
+ }
+}
+
+/**
+ * Settings form.
+ */
+function ctools_context_language_settings_form($form, &$form_state) {
+ $conf = ctools_context_language_conf_defaults($form_state['conf']);
+
+ $form['enable_cache_argument'] = array(
+ '#title' => t('Add language to cache id'),
+ '#description' => t('If enabled the langcode will be part of context aware caches.'),
+ '#type' => 'checkbox',
+ '#default_value' => $conf['enable_cache_argument'],
+ );
+
+ // Prepare language type options.
+ $language_type_options = drupal_map_assoc(language_types());
+ $language_type_options['preset'] = t('Custom');
+
+ $form['language_type'] = array(
+ '#title' => t('The language type to use'),
+ '#type' => 'radios',
+ '#required' => TRUE,
+ '#options' => $language_type_options,
+ '#default_value' => $conf['language_type'],
+ );
+
+ ctools_include('language');
+ $language_options = ctools_language_list();
+ $form['preset_langcode'] = array(
+ '#title' => t('Language'),
+ '#type' => 'select',
+ '#options' => $language_options,
+ '#default_value' => $conf['preset_langcode'],
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="language_type"]' => array('value' => 'preset'),
+ ),
+ ),
+ );
+
+ if (!empty($conf['preset_langcode']) && !isset($language_options[$conf['preset_langcode']])) {
+ drupal_set_message(t('The currently selected language %langcode is no longer available.', array('%langcode' => $conf['preset_langcode'])), 'error', FALSE);
+ }
+ return $form;
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/node.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/node.inc
index 997cd13..156f7f8 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/node.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/node.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Plugin to provide a node context. A node context is a node wrapped in a
* context object that can be utilized by anything that accepts contexts.
*/
@@ -106,7 +105,7 @@ function ctools_context_node_settings_form($form, &$form_state) {
* Validate a node.
*/
function ctools_context_node_settings_form_validate($form, &$form_state) {
- // Validate the autocomplete
+ // Validate the autocomplete.
if (empty($form_state['values']['nid']) && empty($form_state['values']['node'])) {
form_error($form['node'], t('You must select a node.'));
return;
@@ -133,7 +132,7 @@ function ctools_context_node_settings_form_validate($form, &$form_state) {
$node = db_query('SELECT nid, status FROM {node} WHERE LOWER(title) = LOWER(:title)', array(':title' => $nid))->fetchObject();
}
- // Do not allow unpublished nodes to be selected by unprivileged users
+ // Do not allow unpublished nodes to be selected by unprivileged users.
if (!$node || (empty($node->status) && !(user_access('administer nodes')))) {
form_error($form['node'], t('Invalid node selected.'));
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/node_add_form.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/node_add_form.inc
index f10944c..98640e2 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/node_add_form.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/node_add_form.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide a node_add_form context
+ * Plugin to provide a node_add_form context.
*/
/**
@@ -65,8 +64,8 @@ function ctools_context_create_node_add_form($empty, $data = NULL, $conf = FALSE
$form_state = array(
'want form' => TRUE,
'build_info' => array(
- 'args' => array($node)
- )
+ 'args' => array($node),
+ ),
);
// Use module_load_include so that caches and stuff can know to load this.
@@ -81,10 +80,10 @@ function ctools_context_create_node_add_form($empty, $data = NULL, $conf = FALSE
// These are specific pieces of data to this form.
// All forms should place the form here.
- $context->form = $form;
- $context->form_id = $form_id;
- $context->form_title = t('Submit @name', array('@name' => $types[$type]->name));
- $context->node_type = $type;
+ $context->form = $form;
+ $context->form_id = $form_id;
+ $context->form_title = t('Submit @name', array('@name' => $types[$type]->name));
+ $context->node_type = $type;
$context->restrictions['type'] = array($type);
$context->restrictions['form'] = array('form');
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/node_edit_form.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/node_edit_form.inc
index 7565f5c..5401ef6 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/node_edit_form.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/node_edit_form.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide a node_edit_form context
+ * Plugin to provide a node_edit_form context.
*/
/**
@@ -32,7 +31,7 @@ $plugin = array(
*/
function ctools_context_create_node_edit_form($empty, $node = NULL, $conf = FALSE) {
static $creating = FALSE;
- $context = new ctools_context(array('form', 'node_edit', 'node_form', 'node_edit_form', 'node', 'entity:node'));
+ $context = new ctools_context(array('form', 'node_edit', 'node_form', 'node_edit_form', 'node', 'entity:node'));
$context->plugin = 'node_edit_form';
if ($empty || ($creating)) {
@@ -69,7 +68,7 @@ function ctools_context_create_node_edit_form($empty, $node = NULL, $conf = FALS
$form = drupal_build_form($form_id, $form_state);
- // Fill in the 'node' portion of the context
+ // Fill in the 'node' portion of the context.
$context->data = $node;
$context->title = isset($node->title) ? $node->title : '';
$context->argument = isset($node->nid) ? $node->nid : $node->type;
@@ -126,7 +125,7 @@ function ctools_context_node_edit_form_settings_form($form, &$form_state) {
* Validate a node.
*/
function ctools_context_node_edit_form_settings_form_validate($form, &$form_state) {
- // Validate the autocomplete
+ // Validate the autocomplete.
if (empty($form_state['values']['nid']) && empty($form_state['values']['node'])) {
form_error($form['node'], t('You must select a node.'));
return;
@@ -153,7 +152,7 @@ function ctools_context_node_edit_form_settings_form_validate($form, &$form_stat
$node = db_query('SELECT nid, status FROM {node} WHERE LOWER(title) = LOWER(:title)', array(':title' => $nid))->fetchObject();
}
- // Do not allow unpublished nodes to be selected by unprivileged users
+ // Do not allow unpublished nodes to be selected by unprivileged users.
if (!$node || (empty($node->status) && !(user_access('administer nodes')))) {
form_error($form['node'], t('Invalid node selected.'));
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/query_string.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/query_string.inc
new file mode 100644
index 0000000..23ade91
--- /dev/null
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/query_string.inc
@@ -0,0 +1,90 @@
+ t('Query string value'),
+ 'description' => t('A context that extracts a value from the query string.'),
+ 'context' => 'ctools_context_query_string_create_query_string',
+ 'context name' => 'query_string',
+ 'keyword' => 'query_string',
+ 'edit form' => 'ctools_context_query_string_settings_form',
+ 'convert list' => array(
+ 'raw' => t('Raw string'),
+ 'html_safe' => t('HTML-safe string'),
+ ),
+ 'convert' => 'ctools_context_query_string_convert',
+);
+
+/**
+ * Create a context from manual configuration.
+ */
+function ctools_context_query_string_create_query_string($empty, $data = NULL, $conf = FALSE) {
+ $context = new ctools_context('query_string');
+ $context->plugin = 'query_string';
+
+ if ($empty) {
+ return $context;
+ }
+
+ if ($conf) {
+ if (!empty($_GET[$data['key']])) {
+ $context->data = $_GET[$data['key']];
+ }
+ else {
+ $context->data = $data['fallback_value'];
+ }
+ }
+ return $context;
+}
+
+/**
+ * Form builder; settings for the context.
+ */
+function ctools_context_query_string_settings_form($form, &$form_state) {
+ $form['key'] = array(
+ '#title' => t('Query string key'),
+ '#description' => t('Enter the key of the value that must be returned from the query string.'),
+ '#type' => 'textfield',
+ '#required' => TRUE,
+ );
+ if (isset($form_state['conf']['key'])) {
+ $form['key']['#default_value'] = $form_state['conf']['key'];
+ }
+ $form['fallback_value'] = array(
+ '#title' => t('Fallback value'),
+ '#description' => t('Enter a value that must be returned if the above specified key does not exist in the query string.'),
+ '#type' => 'textfield',
+ );
+ if (!empty($form_state['conf']['fallback_value'])) {
+ $form['fallback_value']['#default_value'] = $form_state['conf']['fallback_value'];
+ }
+ return $form;
+}
+
+/**
+ * Submit handler; settings form for the context.
+ */
+function ctools_context_query_string_settings_form_submit($form, &$form_state) {
+ $form_state['conf']['key'] = $form_state['values']['key'];
+ $form_state['conf']['fallback_value'] = $form_state['values']['fallback_value'];
+}
+
+/**
+ * Convert a context into a string.
+ */
+function ctools_context_query_string_convert($context, $type) {
+ switch ($type) {
+ case 'raw':
+ return $context->data;
+
+ case 'html_safe':
+ return check_plain($context->data);
+ }
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/string.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/string.inc
index e731ab7..981b9f7 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/string.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/string.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide a string context
+ * Plugin to provide a string context.
*/
/**
@@ -38,7 +37,6 @@ $plugin = array(
function ctools_context_create_string($empty, $data = NULL, $conf = FALSE) {
// The input is expected to be an object as created by ctools_break_phrase
// which contains a group of string.
-
$context = new ctools_context('string');
$context->plugin = 'string';
@@ -46,7 +44,7 @@ function ctools_context_create_string($empty, $data = NULL, $conf = FALSE) {
return $context;
}
- if ($data !== FALSE ) {
+ if ($data !== FALSE) {
// 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);
@@ -61,8 +59,10 @@ function ctools_context_string_convert($context, $type) {
switch ($type) {
case 'raw':
return $context->data;
+
case 'html_safe':
return check_plain($context->data);
+
case 'uppercase_words_html_safe':
return ucwords(str_replace('-', ' ', check_plain($context->data)));
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/term.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/term.inc
index 1d6d48e..56fe06c 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/term.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/term.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide a term context
+ * Plugin to provide a term context.
*/
/**
@@ -116,7 +115,7 @@ function ctools_context_term_settings_form($form, &$form_state) {
* Validate a term.
*/
function ctools_context_term_settings_form_validate($form, &$form_state) {
- // Validate the autocomplete
+ // Validate the autocomplete.
$vid = $form_state['values']['vid'];
if (empty($form_state['values']['tid']) && empty($form_state['values']['taxonomy'][$vid])) {
form_error($form['taxonomy'][$vid], t('You must select a term.'));
@@ -154,12 +153,16 @@ function ctools_context_term_convert($context, $type) {
switch ($type) {
case 'tid':
return $context->data->tid;
+
case 'name':
return $context->data->name;
+
case 'name_dashed':
return drupal_strtolower(str_replace(' ', '-', $context->data->name));
+
case 'vid':
return $context->data->vid;
+
case 'description':
return $context->data->description;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/terms.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/terms.inc
index 6c3ab36..1161ded 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/terms.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/terms.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide a terms context
+ * Plugin to provide a terms context.
*/
/**
@@ -37,7 +36,6 @@ $plugin = array(
function ctools_context_create_terms($empty, $data = NULL, $conf = FALSE) {
// The input is expected to be an object as created by ctools_break_phrase
// which contains a group of terms.
-
$context = new ctools_context(array('terms', 'entity:taxonomy_term'));
$context->plugin = 'terms';
@@ -49,7 +47,7 @@ function ctools_context_create_terms($empty, $data = NULL, $conf = FALSE) {
$context->operator = $data->operator;
$context->tids = $data->value;
if (!isset($data->term)) {
- // load the first term:
+ // Load the first term:
reset($context->tids);
$data->term = taxonomy_term_load(current($context->tids));
}
@@ -67,12 +65,16 @@ function ctools_context_terms_convert($context, $type) {
switch ($type) {
case 'tid':
return $context->data->tid;
+
case 'tids':
return $context->argument;
+
case 'name':
return $context->data->name;
+
case 'name_dashed':
return drupal_strtolower(str_replace(' ', '-', $context->data->name));
+
case 'names':
case 'names_dashed':
// We only run this query if this item was requested:
@@ -92,6 +94,7 @@ function ctools_context_terms_convert($context, $type) {
}
}
return $context->names;
+
case 'vid':
return $context->data->vid;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/token.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/token.inc
index 0445576..6286a69 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/token.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/token.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Provide a global context to allow for token support.
+ * Provide a global context to allow for token support.
*/
$plugin = array(
@@ -17,6 +17,16 @@ $plugin = array(
/**
* Create a context from manual configuration.
+ *
+ * @param $empty
+ * Unused.
+ * @param $data
+ * Unused.
+ * @param $conf
+ * Unused.
+ *
+ * @return ctools_context
+ * A context of type token, with the plugin set appropriately.
*/
function ctools_context_create_token($empty, $data = NULL, $conf = FALSE) {
$context = new ctools_context('token');
@@ -27,9 +37,14 @@ function ctools_context_create_token($empty, $data = NULL, $conf = FALSE) {
/**
* Implementation of hook_ctools_context_convert_list().
+ *
+ * @return array|null
+ * An array of token type information, keyed by 'type:id', or NULL if
+ * none found.
*/
function ctools_context_token_convert_list() {
$tokens = token_info();
+ // Initialise $list here?
foreach ($tokens['types'] as $type => $type_info) {
if (empty($type_info['needs-data'])) {
$real_type = isset($type_info['type']) ? $type_info['type'] : $type;
@@ -46,7 +61,17 @@ function ctools_context_token_convert_list() {
}
/**
- * Implementation of hook_ctools_context_converter_alter().
+ * Token conversion function: look up the token and return it's value.
+ *
+ * @param $context
+ * Unused.
+ * @param string $token
+ * The name of the token.
+ *
+ * @return array|null
+ * The token value, or NULL if not found.
+ *
+ * @see ctools_context_convert_context()
*/
function ctools_context_token_convert($context, $token) {
$tokens = token_info();
@@ -59,4 +84,5 @@ function ctools_context_token_convert($context, $token) {
return $values[$token];
}
}
+ return NULL;
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/user.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/user.inc
index 02bfe98..bbdbd1a 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/user.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/user.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide a user context
+ * Plugin to provide a user context.
*/
/**
@@ -43,7 +42,9 @@ function ctools_context_create_user($empty, $data = NULL, $conf = FALSE) {
if ($data['type'] == 'current') {
global $user;
$data = user_load($user->uid);
- $data->logged_in_user = TRUE;
+ if (user_is_logged_in()) {
+ $data->logged_in_user = TRUE;
+ }
}
else {
$data = user_load($data['uid']);
@@ -116,7 +117,7 @@ function ctools_context_user_settings_form_validate($form, &$form_state) {
return;
}
- // Validate the autocomplete
+ // Validate the autocomplete.
if (empty($form_state['values']['uid']) && empty($form_state['values']['user'])) {
form_error($form['user'], t('You must select a user.'));
return;
@@ -151,6 +152,7 @@ function ctools_context_user_settings_form_submit($form, &$form_state) {
*/
function ctools_context_user_convert_list() {
$tokens = token_info();
+ $list = array();
foreach ($tokens['tokens']['user'] as $id => $info) {
if (!isset($list[$id])) {
$list[$id] = $info['name'];
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/user_edit_form.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/user_edit_form.inc
index da0cca0..61f234a 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/user_edit_form.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/user_edit_form.inc
@@ -1,8 +1,8 @@
data = $user;
$context->title = isset($user->name) ? $user->name : '';
$context->argument = $user->uid;
@@ -107,7 +107,7 @@ function ctools_context_user_edit_form_settings_form($form, &$form_state) {
);
if (!empty($conf['uid'])) {
- $info = db_query('SELECT * FROM {user} WHERE uid = :uid', array(':uid' => $conf['uid']))->fetchObject();
+ $info = db_query('SELECT * FROM {users} WHERE uid = :uid', array(':uid' => $conf['uid']))->fetchObject();
if ($info) {
$link = l(t("'%name' [user id %uid]", array('%name' => $info->name, '%uid' => $info->uid)), "user/$info->uid", array('attributes' => array('target' => '_blank', 'title' => t('Open in new window')), 'html' => TRUE));
$form['user']['#description'] = t('Currently set to !link', array('!link' => $link));
@@ -133,7 +133,7 @@ function ctools_context_user_edit_form_settings_form($form, &$form_state) {
* Validate a node.
*/
function ctools_context_user_edit_form_settings_form_validate($form, &$form_state) {
- // Validate the autocomplete
+ // Validate the autocomplete.
if (empty($form_state['values']['uid']) && empty($form_state['values']['user'])) {
form_error($form['user'], t('You must select a user.'));
return;
@@ -154,14 +154,15 @@ function ctools_context_user_edit_form_settings_form_validate($form, &$form_stat
$uid = $preg_matches[1];
}
if (is_numeric($uid)) {
- $user = db_query('SELECT uid FROM {user} WHEREuid = :uid', array(':uid' => $uid))->fetchObject();
+ $user = db_query('SELECT uid FROM {users} WHERE uid = :uid', array(':uid' => $uid))->fetchObject();
}
else {
- $user = db_query('SELECT uid FROM {user} WHERE LOWER(name) = LOWER(:name)', array(':name' => $uid))->fetchObject();
+ $user = db_query('SELECT uid FROM {users} WHERE LOWER(name) = LOWER(:name)', array(':name' => $uid))->fetchObject();
}
form_set_value($form['uid'], $user->uid, $form_state);
}
+
function ctools_context_user_edit_form_settings_form_submit($form, &$form_state) {
if ($form_state['values']['set_identifier']) {
$user = user_load($form_state['values']['uid']);
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/contexts/vocabulary.inc b/sites/all/modules/contrib/dev/ctools/plugins/contexts/vocabulary.inc
index 9c5d4cf..e5b0b9c 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/contexts/vocabulary.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/contexts/vocabulary.inc
@@ -2,8 +2,7 @@
/**
* @file
- *
- * Plugin to provide a vocabulary context
+ * Plugin to provide a vocabulary context.
*/
/**
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/export_ui/ctools_export_ui.class.php b/sites/all/modules/contrib/dev/ctools/plugins/export_ui/ctools_export_ui.class.php
index 252cdb1..0c8145e 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/export_ui/ctools_export_ui.class.php
+++ b/sites/all/modules/contrib/dev/ctools/plugins/export_ui/ctools_export_ui.class.php
@@ -13,7 +13,7 @@ class ctools_export_ui {
* constructor because we are retaining PHP4 compatibility, which
* would require all child classes to implement their own constructor.
*/
- function init($plugin) {
+ public function init($plugin) {
ctools_include('export');
$this->plugin = $plugin;
@@ -22,7 +22,7 @@ class ctools_export_ui {
/**
* Get a page title for the current page from our plugin strings.
*/
- function get_page_title($op, $item = NULL) {
+ public function get_page_title($op, $item = NULL) {
if (empty($this->plugin['strings']['title'][$op])) {
return;
}
@@ -43,13 +43,13 @@ class ctools_export_ui {
* This can be overridden for modules that want to be able to export
* items currently being edited, for example.
*/
- function load_item($item_name) {
+ public function load_item($item_name) {
$item = ctools_export_crud_load($this->plugin['schema'], $item_name);
return empty($item) ? FALSE : $item;
}
// ------------------------------------------------------------------------
- // Menu item manipulation
+ // Menu item manipulation.
/**
* hook_menu() entry point.
@@ -57,7 +57,7 @@ class ctools_export_ui {
* Child implementations that need to add or modify menu items should
* probably call parent::hook_menu($items) and then modify as needed.
*/
- function hook_menu(&$items) {
+ public function hook_menu(&$items) {
// During upgrades, the schema can be empty as this is called prior to
// actual update functions being run. Ensure that we can cope with this
// situation.
@@ -99,7 +99,7 @@ class ctools_export_ui {
* @return
* TRUE if the current user has access, FALSE if not.
*/
- function access($op, $item) {
+ public function access($op, $item) {
if (!user_access($this->plugin['access'])) {
return FALSE;
}
@@ -122,14 +122,19 @@ class ctools_export_ui {
switch ($op) {
case 'import':
return user_access('use ctools import');
+
case 'revert':
return ($item->export_type & EXPORT_IN_DATABASE) && ($item->export_type & EXPORT_IN_CODE);
+
case 'delete':
return ($item->export_type & EXPORT_IN_DATABASE) && !($item->export_type & EXPORT_IN_CODE);
+
case 'disable':
return empty($item->disabled);
+
case 'enable':
return !empty($item->disabled);
+
default:
return TRUE;
}
@@ -144,7 +149,7 @@ class ctools_export_ui {
* It is unlikely that a child object will need to override this method,
* unless the listing mechanism is going to be highly specialized.
*/
- function list_page($js, $input) {
+ public function list_page($js, $input) {
$this->items = ctools_export_crud_load_all($this->plugin['schema'], $js);
// Respond to a reset command by clearing session and doing a drupal goto
@@ -154,7 +159,7 @@ class ctools_export_ui {
if (!$js) {
drupal_goto($_GET['q']);
}
- // clear everything but form id, form build id and form token:
+ // Clear everything but form id, form build id and form token.
$keys = array_keys($input);
foreach ($keys as $id) {
if (!in_array($id, array('form_id', 'form_build_id', 'form_token'))) {
@@ -224,7 +229,7 @@ class ctools_export_ui {
* get the base form and then modify it as necessary to add search
* gadgets for custom fields.
*/
- function list_form(&$form, &$form_state) {
+ public function list_form(&$form, &$form_state) {
// This forces the form to *always* treat as submitted which is
// necessary to make it work.
$form['#token'] = FALSE;
@@ -269,7 +274,7 @@ class ctools_export_ui {
'#title' => t('Enabled'),
'#options' => $all + array(
'0' => t('Enabled'),
- '1' => t('Disabled')
+ '1' => t('Disabled'),
),
'#default_value' => 'all',
);
@@ -324,7 +329,7 @@ class ctools_export_ui {
* It is very rare that a filter form needs validation, but if it is
* needed, override this.
*/
- function list_form_validate(&$form, &$form_state) { }
+ public function list_form_validate(&$form, &$form_state) { }
/**
* Submit the filter/sort form.
@@ -336,7 +341,7 @@ class ctools_export_ui {
* For the most part, you should not need to override this method, as the
* fiddly bits call through to other functions.
*/
- function list_form_submit(&$form, &$form_state) {
+ public function list_form_submit(&$form, &$form_state) {
// Filter and re-sort the pages.
$plugin = $this->plugin;
@@ -381,7 +386,7 @@ class ctools_export_ui {
* @return
* TRUE if the item should be excluded.
*/
- function list_filter($form_state, $item) {
+ public function list_filter($form_state, $item) {
$schema = ctools_export_get_schema($this->plugin['schema']);
if ($form_state['values']['storage'] != 'all' && $form_state['values']['storage'] != $item->{$schema['export']['export type string']}) {
return TRUE;
@@ -411,7 +416,7 @@ class ctools_export_ui {
* This widget will search against whatever fields are configured here. By
* default it will attempt to search against the name, title and description fields.
*/
- function list_search_fields() {
+ public function list_search_fields() {
$fields = array(
$this->plugin['export']['key'],
);
@@ -432,7 +437,7 @@ class ctools_export_ui {
* Override this if you wish to provide more or change how these work.
* The actual handling of the sorting will happen in build_row().
*/
- function list_sort_options() {
+ public function list_sort_options() {
if (!empty($this->plugin['export']['admin_title'])) {
$options = array(
'disabled' => t('Enabled, title'),
@@ -458,14 +463,14 @@ class ctools_export_ui {
*
* Override this if you need custom CSS for your list.
*/
- function list_css() {
+ public function list_css() {
ctools_add_css('export-ui-list');
}
/**
* Builds the operation links for a specific exportable item.
*/
- function build_operations($item) {
+ public function build_operations($item) {
$plugin = $this->plugin;
$schema = ctools_export_get_schema($plugin['schema']);
$operations = $plugin['allowed operations'];
@@ -515,7 +520,7 @@ class ctools_export_ui {
* method, so this is building up a row suitable for theme('table').
* This doesn't have to be true if you override both.
*/
- function list_build_row($item, &$form_state, $operations) {
+ public function list_build_row($item, &$form_state, $operations) {
// Set up sorting
$name = $item->{$this->plugin['export']['key']};
$schema = ctools_export_get_schema($this->plugin['schema']);
@@ -563,7 +568,7 @@ class ctools_export_ui {
* If you've added columns via list_build_row() but are still using a
* table, override this method to set up the table header.
*/
- function list_table_header() {
+ public function list_table_header() {
$header = array();
if (!empty($this->plugin['export']['admin_title'])) {
$header[] = array('data' => t('Title'), 'class' => array('ctools-export-ui-title'));
@@ -585,7 +590,7 @@ class ctools_export_ui {
* Whatever you do if this method is overridden, the ID is important for AJAX
* so be sure it exists.
*/
- function list_render(&$form_state) {
+ public function list_render(&$form_state) {
$table = array(
'header' => $this->list_table_header(),
'rows' => $this->rows,
@@ -600,14 +605,14 @@ class ctools_export_ui {
*
* This will appear after the filter/sort widgets.
*/
- function list_header($form_state) { }
+ public function list_header($form_state) { }
/**
* Render a footer to go after thie list.
*
* This is a good place to add additional links.
*/
- function list_footer($form_state) { }
+ public function list_footer($form_state) { }
// ------------------------------------------------------------------------
// These methods are the API for adding/editing exportable items
@@ -623,7 +628,7 @@ class ctools_export_ui {
* The item in use; this may be necessary as item IDs are often embedded in
* redirects.
*/
- function redirect($op, $item = NULL) {
+ public function redirect($op, $item = NULL) {
if (isset($this->plugin['redirect'][$op])) {
$destination = (array) $this->plugin['redirect'][$op];
if ($item) {
@@ -638,7 +643,8 @@ class ctools_export_ui {
}
}
- function add_page($js, $input, $step = NULL) {
+ public function add_page($js, $input, $step = NULL) {
+ $args = func_get_args();
drupal_set_title($this->get_page_title('add'), PASS_THROUGH);
// If a step not set, they are trying to create a new item. If a step
@@ -661,7 +667,7 @@ class ctools_export_ui {
'no_redirect' => TRUE,
'step' => $step,
// Store these in case additional args are needed.
- 'function args' => func_get_args(),
+ 'function args' => $args,
);
$output = $this->edit_execute_form($form_state);
@@ -675,7 +681,8 @@ class ctools_export_ui {
/**
* Main entry point to edit an item.
*/
- function edit_page($js, $input, $item, $step = NULL) {
+ public function edit_page($js, $input, $item, $step = NULL) {
+ $args = func_get_args();
drupal_set_title($this->get_page_title('edit', $item), PASS_THROUGH);
// Check to see if there is a cached item to get if we're using the wizard.
@@ -697,7 +704,7 @@ class ctools_export_ui {
'no_redirect' => TRUE,
'step' => $step,
// Store these in case additional args are needed.
- 'function args' => func_get_args(),
+ 'function args' => $args,
);
$output = $this->edit_execute_form($form_state);
@@ -711,7 +718,8 @@ class ctools_export_ui {
/**
* Main entry point to clone an item.
*/
- function clone_page($js, $input, $original, $step = NULL) {
+ public function clone_page($js, $input, $original, $step = NULL) {
+ $args = func_get_args();
drupal_set_title($this->get_page_title('clone', $original), PASS_THROUGH);
// If a step not set, they are trying to create a new clone. If a step
@@ -724,7 +732,13 @@ class ctools_export_ui {
// Export the handler, which is a fantastic way to clean database IDs out of it.
$export = ctools_export_crud_export($this->plugin['schema'], $original);
$item = ctools_export_crud_import($this->plugin['schema'], $export);
- $item->{$this->plugin['export']['key']} = 'clone_of_' . $item->{$this->plugin['export']['key']};
+
+ if (!empty($input[$this->plugin['export']['key']])) {
+ $item->{$this->plugin['export']['key']} = $input[$this->plugin['export']['key']];
+ }
+ else {
+ $item->{$this->plugin['export']['key']} = 'clone_of_' . $item->{$this->plugin['export']['key']};
+ }
}
// Tabs and breadcrumb disappearing, this helps alleviate through cheating.
@@ -745,7 +759,7 @@ class ctools_export_ui {
'no_redirect' => TRUE,
'step' => $step,
// Store these in case additional args are needed.
- 'function args' => func_get_args(),
+ 'function args' => $args,
);
$output = $this->edit_execute_form($form_state);
@@ -762,7 +776,7 @@ class ctools_export_ui {
* Add and Edit both funnel into this, but they have a few different
* settings.
*/
- function edit_execute_form(&$form_state) {
+ public function edit_execute_form(&$form_state) {
if (!empty($this->plugin['use wizard'])) {
return $this->edit_execute_form_wizard($form_state);
}
@@ -776,7 +790,7 @@ class ctools_export_ui {
*
* By default, export UI will provide a single form for editing an object.
*/
- function edit_execute_form_standard(&$form_state) {
+ public function edit_execute_form_standard(&$form_state) {
$output = drupal_build_form('ctools_export_ui_edit_item_form', $form_state);
if (!empty($form_state['executed']) && empty($form_state['rebuild'])) {
$this->edit_save_form($form_state);
@@ -797,7 +811,7 @@ class ctools_export_ui {
* @param array $form_state
* The already created form state.
*/
- function get_wizard_info(&$form_state) {
+ public function get_wizard_info(&$form_state) {
if (!isset($form_state['step'])) {
$form_state['step'] = NULL;
}
@@ -872,7 +886,7 @@ class ctools_export_ui {
* Using 'add order' or 'edit order' can be used to ensure that add/edit order
* is different.
*/
- function edit_execute_form_wizard(&$form_state) {
+ public function edit_execute_form_wizard(&$form_state) {
$form_info = $this->get_wizard_info($form_state);
// If there aren't any forms set, fail.
@@ -895,7 +909,7 @@ class ctools_export_ui {
if (!empty($form_state['complete'])) {
$this->edit_save_form($form_state);
}
- else if ($output && !empty($form_state['item']->export_ui_item_is_cached)) {
+ elseif ($output && !empty($form_state['item']->export_ui_item_is_cached)) {
// @todo this should be in the plugin strings
drupal_set_message(t('You have unsaved changes. These changes will not be made permanent until you click Save.'), 'warning');
}
@@ -913,7 +927,7 @@ class ctools_export_ui {
*
* The wizard callback delegates this back to the object.
*/
- function edit_wizard_back(&$form_state) {
+ public function edit_wizard_back(&$form_state) {
// This only exists so child implementations can use it.
}
@@ -922,7 +936,7 @@ class ctools_export_ui {
*
* The wizard callback delegates this back to the object.
*/
- function edit_wizard_next(&$form_state) {
+ public function edit_wizard_next(&$form_state) {
$this->edit_cache_set($form_state['item'], $form_state['form type']);
}
@@ -931,7 +945,7 @@ class ctools_export_ui {
*
* The wizard callback delegates this back to the object.
*/
- function edit_wizard_cancel(&$form_state) {
+ public function edit_wizard_cancel(&$form_state) {
$this->edit_cache_clear($form_state['item'], $form_state['form type']);
}
@@ -940,7 +954,7 @@ class ctools_export_ui {
*
* The wizard callback delegates this back to the object.
*/
- function edit_wizard_finish(&$form_state) {
+ public function edit_wizard_finish(&$form_state) {
$form_state['complete'] = TRUE;
// If we are importing, and overwrite was selected, delete the original so
@@ -955,7 +969,7 @@ class ctools_export_ui {
/**
* Retrieve the item currently being edited from the object cache.
*/
- function edit_cache_get($item, $op = 'edit') {
+ public function edit_cache_get($item, $op = 'edit') {
ctools_include('object-cache');
if (is_string($item)) {
$name = $item;
@@ -974,20 +988,20 @@ class ctools_export_ui {
/**
* Cache the item currently currently being edited.
*/
- function edit_cache_set($item, $op = 'edit') {
+ public function edit_cache_set($item, $op = 'edit') {
ctools_include('object-cache');
$name = $this->edit_cache_get_key($item, $op);
return $this->edit_cache_set_key($item, $name);
}
- function edit_cache_set_key($item, $name) {
+ public function edit_cache_set_key($item, $name) {
return ctools_object_cache_set('ctui_' . $this->plugin['name'], $name, $item);
}
/**
* Clear the object cache for the currently edited item.
*/
- function edit_cache_clear($item, $op = 'edit') {
+ public function edit_cache_clear($item, $op = 'edit') {
ctools_include('object-cache');
$name = $this->edit_cache_get_key($item, $op);
return ctools_object_cache_clear('ctui_' . $this->plugin['name'], $name);
@@ -996,7 +1010,7 @@ class ctools_export_ui {
/**
* Figure out what the cache key is for this object.
*/
- function edit_cache_get_key($item, $op) {
+ public function edit_cache_get_key($item, $op) {
$export_key = $this->plugin['export']['key'];
return $op == 'edit' ? $item->{$this->plugin['export']['key']} : "::$op";
}
@@ -1004,7 +1018,7 @@ class ctools_export_ui {
/**
* Called to save the final product from the edit form.
*/
- function edit_save_form($form_state) {
+ public function edit_save_form($form_state) {
$item = &$form_state['item'];
$export_key = $this->plugin['export']['key'];
@@ -1023,7 +1037,7 @@ class ctools_export_ui {
/**
* Provide the actual editing form.
*/
- function edit_form(&$form, &$form_state) {
+ public function edit_form(&$form, &$form_state) {
$export_key = $this->plugin['export']['key'];
$item = $form_state['item'];
$schema = ctools_export_get_schema($this->plugin['schema']);
@@ -1096,7 +1110,7 @@ class ctools_export_ui {
/**
* Validate callback for the edit form.
*/
- function edit_form_validate(&$form, &$form_state) {
+ public function edit_form_validate(&$form, &$form_state) {
if (!empty($this->plugin['form']['validate'])) {
// Pass $form by reference.
$this->plugin['form']['validate']($form, $form_state);
@@ -1107,7 +1121,7 @@ class ctools_export_ui {
* Perform a final validation check before allowing the form to be
* finished.
*/
- function edit_finish_validate(&$form, &$form_state) {
+ public function edit_finish_validate(&$form, &$form_state) {
if ($form_state['op'] != 'edit') {
// Validate the export key. Fake an element for form_error().
$export_key = $this->plugin['export']['key'];
@@ -1129,7 +1143,7 @@ class ctools_export_ui {
* If the keys all match up to the schema, this method will not need to be
* overridden.
*/
- function edit_form_submit(&$form, &$form_state) {
+ public function edit_form_submit(&$form, &$form_state) {
if (!empty($this->plugin['form']['submit'])) {
// Pass $form by reference.
$this->plugin['form']['submit']($form, $form_state);
@@ -1151,14 +1165,14 @@ class ctools_export_ui {
/**
* Callback to enable a page.
*/
- function enable_page($js, $input, $item) {
+ public function enable_page($js, $input, $item) {
return $this->set_item_state(FALSE, $js, $input, $item);
}
/**
* Callback to disable a page.
*/
- function disable_page($js, $input, $item) {
+ public function disable_page($js, $input, $item) {
return $this->set_item_state(TRUE, $js, $input, $item);
}
@@ -1168,7 +1182,7 @@ class ctools_export_ui {
* If javascript is in use, this will rebuild the list and send that back
* as though the filter form had been executed.
*/
- function set_item_state($state, $js, $input, $item) {
+ public function set_item_state($state, $js, $input, $item) {
ctools_export_crud_set_status($this->plugin['schema'], $item, $state);
if (!$js) {
@@ -1182,7 +1196,7 @@ class ctools_export_ui {
/**
* Page callback to delete an exportable item.
*/
- function delete_page($js, $input, $item) {
+ public function delete_page($js, $input, $item) {
$form_state = array(
'plugin' => $this->plugin,
'object' => &$this,
@@ -1205,7 +1219,7 @@ class ctools_export_ui {
/**
* Deletes exportable items from the database.
*/
- function delete_form_submit(&$form_state) {
+ public function delete_form_submit(&$form_state) {
$item = $form_state['item'];
ctools_export_crud_delete($this->plugin['schema'], $item);
@@ -1217,7 +1231,7 @@ class ctools_export_ui {
/**
* Page callback to display export information for an exportable item.
*/
- function export_page($js, $input, $item) {
+ public function export_page($js, $input, $item) {
drupal_set_title($this->get_page_title('export', $item), PASS_THROUGH);
return drupal_get_form('ctools_export_form', ctools_export_crud_export($this->plugin['schema'], $item), t('Export'));
}
@@ -1225,7 +1239,8 @@ class ctools_export_ui {
/**
* Page callback to import information for an exportable item.
*/
- function import_page($js, $input, $step = NULL) {
+ public function import_page($js, $input, $step = NULL) {
+ $args = func_get_args();
drupal_set_title($this->get_page_title('import'), PASS_THROUGH);
// Import is basically a multi step wizard form, so let's go ahead and
// use CTools' wizard.inc for it.
@@ -1250,7 +1265,7 @@ class ctools_export_ui {
'no_redirect' => TRUE,
'step' => $step,
// Store these in case additional args are needed.
- 'function args' => func_get_args(),
+ 'function args' => $args,
);
// import always uses the wizard.
@@ -1266,7 +1281,7 @@ class ctools_export_ui {
* Import form. Provides simple helptext instructions and textarea for
* pasting a export definition.
*/
- function edit_form_import(&$form, &$form_state) {
+ public function edit_form_import(&$form, &$form_state) {
$form['help'] = array(
'#type' => 'item',
'#value' => $this->plugin['strings']['help']['import'],
@@ -1292,7 +1307,7 @@ class ctools_export_ui {
*
* Evaluates code and make sure it creates an object before we continue.
*/
- function edit_form_import_validate($form, &$form_state) {
+ public function edit_form_import_validate($form, &$form_state) {
$item = ctools_export_crud_import($this->plugin['schema'], $form_state['values']['import']);
if (is_string($item)) {
form_error($form['import'], t('Unable to get an import from the code. Errors reported: @errors', array('@errors' => $item)));
@@ -1309,7 +1324,7 @@ class ctools_export_ui {
*
* Stores the item in the session.
*/
- function edit_form_import_submit($form, &$form_state) {
+ public function edit_form_import_submit($form, &$form_state) {
// The validate function already imported and stored the item. This
// function exists simply to prevent it from going to the default
// edit_form_submit() method.
@@ -1441,7 +1456,7 @@ function ctools_export_ui_delete_confirm_form($form, &$form_state) {
$export_key = $plugin['export']['key'];
$question = str_replace('%title', check_plain($item->{$export_key}), $plugin['strings']['confirmation'][$form_state['op']]['question']);
- $path = empty($_REQUEST['cancel_path']) ? ctools_export_ui_plugin_base_path($plugin) : $_REQUEST['cancel_path'];
+ $path = (!empty($_REQUEST['cancel_path']) && !url_is_external($_REQUEST['cancel_path'])) ? $_REQUEST['cancel_path'] : ctools_export_ui_plugin_base_path($plugin);
$form = confirm_form($form,
$question,
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/export_ui/ctools_export_ui.inc b/sites/all/modules/contrib/dev/ctools/plugins/export_ui/ctools_export_ui.inc
index 4e0a849..3087cca 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/export_ui/ctools_export_ui.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/export_ui/ctools_export_ui.inc
@@ -1,6 +1,7 @@
FALSE,
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_field.inc b/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_field.inc
index d4880c6..2589efd 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_field.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_field.inc
@@ -140,7 +140,7 @@ function ctools_entity_from_field_get_children($parent_plugin, $parent) {
$plugin_entities = array(
'to' => array($to_entity => $to_entity_info),
- 'from' => array($from_entity => $from_entity_info)
+ 'from' => array($from_entity => $from_entity_info),
);
drupal_alter('ctools_entity_context', $plugins[$key], $plugin_entities, $key);
}
@@ -185,7 +185,7 @@ function ctools_entity_from_field_context($context, $conf) {
$loaded_to_entity = array_shift($loaded_to_entity);
// Pass current user account and entity type to access callback.
- if (function_exists($to_entity_info['access callback']) && !call_user_func($to_entity_info['access callback'], 'view', $loaded_to_entity, $account, $to_entity)) {
+ if (isset($to_entity_info['access callback']) && function_exists($to_entity_info['access callback']) && !call_user_func($to_entity_info['access callback'], 'view', $loaded_to_entity, $account, $to_entity)) {
return ctools_context_create_empty('entity:' . $to_entity, NULL);
}
else {
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_query_string.inc b/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_query_string.inc
new file mode 100644
index 0000000..80c40fc
--- /dev/null
+++ b/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_query_string.inc
@@ -0,0 +1,70 @@
+ t('Entity from query string'),
+ 'keyword' => 'query_string_entity',
+ 'description' => t('Entity from query string.'),
+ 'required context' => new ctools_context_required(t('Query string'), 'query_string'),
+ 'context' => 'ctools_entity_from_query_string_context',
+ 'edit form' => 'ctools_entity_from_query_string_settings_form',
+);
+
+/**
+ * Return a new context based on an existing context.
+ */
+function ctools_entity_from_query_string_context($context, $conf) {
+ $entity_type = $conf['entity_type'];
+
+ // If unset it wants a generic, unfilled context, which is just NULL.
+ if (empty($context->data) || !isset($context->data) || !is_numeric($context->data)) {
+ return ctools_context_create_empty('entity:' . $entity_type, NULL);
+ }
+
+ if (!empty($context->data) && is_numeric($context->data)) {
+ // Load the entity from the query string value.
+ $entity_id = $context->data;
+ $entity = entity_load_single($entity_type, $entity_id);
+
+ // Send it to ctools.
+ return ctools_context_create('entity:' . $entity_type, $entity);
+ }
+}
+
+/**
+ * Settings form for the relationship.
+ */
+function ctools_entity_from_query_string_settings_form($form, &$form_state) {
+
+ // Get all avalible enity types.
+ foreach (entity_get_info() as $key => $value) {
+ $entity_types[$key] = $value['label'];
+ }
+
+ $form['entity_type'] = array(
+ '#title' => t('Entity type'),
+ '#description' => t('Choose entity type to load from query value'),
+ '#type' => 'select',
+ '#options' => $entity_types,
+ );
+ if (isset($form_state['conf']['entity_type'])) {
+ $form['entity_type']['#default_value'] = $form_state['conf']['entity_type'];
+ }
+
+ return $form;
+}
+
+/**
+ * Submit handler; settings form for the context.
+ */
+function ctools_entity_from_query_string_settings_form_submit($form, &$form_state) {
+ $form_state['conf']['entity_type'] = $form_state['values']['entity_type'];
+}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_schema.inc b/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_schema.inc
index 809473e..edf6abe 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_schema.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_schema.inc
@@ -88,7 +88,7 @@ function ctools_entity_from_schema_get_children($parent_plugin, $parent) {
$plugin_entities = array('to' => $from_entity_info, 'from' => $to_entity_info);
$plugin_entities = array('to' => array($from_entity => $from_entity_info), 'from' => array($to_entity => $to_entity_info));
drupal_alter('ctools_entity_context', $plugin, $plugin_entities, $plugin_id);
- $plugins[$plugin_id] = $plugin;
+ $plugins[$plugin_id] = $plugin;
}
}
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/relationships/term_parent.inc b/sites/all/modules/contrib/dev/ctools/plugins/relationships/term_parent.inc
index f084cca..c884e0a 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/relationships/term_parent.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/relationships/term_parent.inc
@@ -1,7 +1,7 @@
data;
$terms = array();
-
+
$fields = field_info_instances('node', $node->type);
foreach ($fields as $name => $info) {
$field_info = field_info_field($name);
@@ -43,8 +43,24 @@ function ctools_terms_from_node_context($context, $conf) {
}
}
}
+ elseif ($field_info['type'] == 'entityreference' && $field_info['settings']['target_type'] == 'taxonomy_term') {
+ $items = field_get_items('node', $node, $name);
+ if (is_array($items)) {
+ $tids = array();
+ foreach ($items as $item) {
+ $tids[] = $item['target_id'];
+ }
+
+ $term_objects = taxonomy_term_load_multiple($tids);
+ foreach ($term_objects as $term) {
+ if (empty($conf['vocabulary']) || in_array($term->vocabulary_machine_name, $conf['vocabulary'])) {
+ $terms[] = $term->tid;
+ }
+ }
+ }
+ }
}
-
+
if (!empty($terms)) {
$all_terms = ctools_break_phrase(implode($conf['concatenator'], $terms));
return ctools_context_create('terms', $all_terms);
diff --git a/sites/all/modules/contrib/dev/ctools/plugins/relationships/user_category_edit_form_from_user.inc b/sites/all/modules/contrib/dev/ctools/plugins/relationships/user_category_edit_form_from_user.inc
index 28dac72..07eb382 100644
--- a/sites/all/modules/contrib/dev/ctools/plugins/relationships/user_category_edit_form_from_user.inc
+++ b/sites/all/modules/contrib/dev/ctools/plugins/relationships/user_category_edit_form_from_user.inc
@@ -15,6 +15,8 @@ $plugin = array(
'description' => t('Adds user category edit form from a user context.'),
'required context' => new ctools_context_required(t('User'), 'user'),
'context' => 'ctools_user_category_edit_form_from_user_context',
+ 'edit form' => 'ctools_user_category_edit_form_from_user_settings_form',
+ 'defaults' => array('category' => NULL),
);
/**
@@ -25,7 +27,35 @@ function ctools_user_category_edit_form_from_user_context($context, $conf) {
return ctools_context_create_empty('user_edit_form', NULL);
}
+ if (!empty($conf['category'])) {
+ return ctools_context_create('user_edit_form', $context->data, array('category' => $conf['category']));
+ }
+
if (isset($context->data->user_category)) {
return ctools_context_create('user_edit_form', $context->data, array('category' => $context->data->user_category));
}
+
+ return ctools_context_create('user_edit_form', $context->data);
+}
+
+/**
+ * Settings form for the relationship.
+ */
+function ctools_user_category_edit_form_from_user_settings_form($form, &$form_state) {
+ $conf = $form_state['conf'];
+
+ $categories = _user_categories();
+ $options = array();
+ foreach ($categories as $category) {
+ $options[$category['name']] = $category['title'];
+ }
+ $form['category'] = array(
+ '#type' => 'select',
+ '#title' => t('Category'),
+ '#options' => $options,
+ '#default_value' => isset($conf['category']) ? $conf['category'] : NULL,
+ '#empty_option' => 'Default',
+ );
+
+ return $form;
}
diff --git a/sites/all/modules/contrib/dev/ctools/stylizer/plugins/export_ui/stylizer.inc b/sites/all/modules/contrib/dev/ctools/stylizer/plugins/export_ui/stylizer.inc
index a1fc1d8..8192efe 100644
--- a/sites/all/modules/contrib/dev/ctools/stylizer/plugins/export_ui/stylizer.inc
+++ b/sites/all/modules/contrib/dev/ctools/stylizer/plugins/export_ui/stylizer.inc
@@ -1,5 +1,9 @@
'stylizer',
'access' => 'administer stylizer',
@@ -42,4 +46,3 @@ $plugin = array(
),
),
);
-
diff --git a/sites/all/modules/contrib/dev/ctools/stylizer/plugins/export_ui/stylizer_ui.class.php b/sites/all/modules/contrib/dev/ctools/stylizer/plugins/export_ui/stylizer_ui.class.php
index 14d6293..d4db36c 100644
--- a/sites/all/modules/contrib/dev/ctools/stylizer/plugins/export_ui/stylizer_ui.class.php
+++ b/sites/all/modules/contrib/dev/ctools/stylizer/plugins/export_ui/stylizer_ui.class.php
@@ -5,16 +5,18 @@
*/
class stylizer_ui extends ctools_export_ui {
- function access($op, $item) {
+
+ public function access($op, $item) {
$access = parent::access($op, $item);
if ($op == 'add' && $access && empty($this->base_types)) {
- // Make sure there are base styles defined.
- $access = FALSE;
+ // Make sure there are base styles defined.
+ $access = FALSE;
}
return $access;
}
- function list_form(&$form, &$form_state) {
+
+ public function list_form(&$form, &$form_state) {
ctools_include('stylizer');
parent::list_form($form, $form_state);
@@ -60,7 +62,8 @@ class stylizer_ui extends ctools_export_ui {
);
}
- function list_sort_options() {
+
+ public function list_sort_options() {
return array(
'disabled' => t('Enabled, title'),
'title' => t('Title'),
@@ -71,7 +74,8 @@ class stylizer_ui extends ctools_export_ui {
);
}
- function list_filter($form_state, $item) {
+
+ public function list_filter($form_state, $item) {
if (empty($form_state['style_plugins'][$item->settings['style_base']])) {
$this->style_plugin = array(
'name' => 'broken',
@@ -102,30 +106,37 @@ class stylizer_ui extends ctools_export_ui {
return parent::list_filter($form_state, $item);
}
- function list_search_fields() {
+
+ public function list_search_fields() {
$fields = parent::list_search_fields();
$fields[] = 'plugin_title';
return $fields;
}
- function list_build_row($item, &$form_state, $operations) {
- // Set up sorting
+
+ public function list_build_row($item, &$form_state, $operations) {
+ // Set up sorting.
switch ($form_state['values']['order']) {
case 'disabled':
$this->sorts[$item->name] = empty($item->disabled) . $item->admin_title;
break;
+
case 'title':
$this->sorts[$item->name] = $item->admin_title;
break;
+
case 'name':
$this->sorts[$item->name] = $item->name;
break;
+
case 'type':
$this->sorts[$item->name] = $this->style_plugin['type'] . $item->admin_title;
break;
+
case 'base':
$this->sorts[$item->name] = $this->style_plugin['title'] . $item->admin_title;
break;
+
case 'storage':
$this->sorts[$item->name] = $item->type . $item->admin_title;
break;
@@ -154,7 +165,8 @@ class stylizer_ui extends ctools_export_ui {
);
}
- function list_table_header() {
+
+ public function list_table_header() {
return array(
array('data' => t('Type'), 'class' => array('ctools-export-ui-type')),
array('data' => t('Name'), 'class' => array('ctools-export-ui-name')),
@@ -165,14 +177,16 @@ class stylizer_ui extends ctools_export_ui {
);
}
- function init($plugin) {
+
+ public function init($plugin) {
ctools_include('stylizer');
$this->base_types = ctools_get_style_base_types();
parent::init($plugin);
}
- function get_wizard_info(&$form_state) {
+
+ public function get_wizard_info(&$form_state) {
$form_info = parent::get_wizard_info($form_state);
ctools_include('stylizer');
@@ -219,7 +233,7 @@ class stylizer_ui extends ctools_export_ui {
* The stylizer wizard stores its stuff in slightly different places, so
* we have to find it and move it to the right place.
*/
- function store_stylizer_info(&$form_state) {
+ public function store_stylizer_info(&$form_state) {
/*
foreach (array('name', 'admin_title', 'admin_description') as $key) {
if (!empty($form_state['values'][$key])) {
@@ -235,12 +249,14 @@ class stylizer_ui extends ctools_export_ui {
$form_state['item']->settings['name'] = $form_state['item']->name;
}
- function edit_wizard_next(&$form_state) {
+
+ public function edit_wizard_next(&$form_state) {
$this->store_stylizer_info($form_state);
parent::edit_wizard_next($form_state);
}
- function edit_wizard_finish(&$form_state) {
+
+ public function edit_wizard_finish(&$form_state) {
// These might be stored by the stylizer wizard, so we should clear them.
if (isset($form_state['settings']['old_settings'])) {
unset($form_state['settings']['old_settings']);
@@ -249,7 +265,8 @@ class stylizer_ui extends ctools_export_ui {
parent::edit_wizard_finish($form_state);
}
- function edit_form_type(&$form, &$form_state) {
+
+ public function edit_form_type(&$form, &$form_state) {
foreach ($this->base_types as $module => $info) {
foreach ($info as $key => $base_type) {
$types[$module . '-' . $key] = $base_type['title'];
@@ -266,7 +283,9 @@ class stylizer_ui extends ctools_export_ui {
);
}
- function edit_form_type_submit(&$form, &$form_state) {
+
+ public function edit_form_type_submit(&$form, &$form_state) {
list($form_state['item']->style_module, $form_state['item']->style_type) = explode('-', $form_state['values']['type']);
}
+
}
diff --git a/sites/all/modules/contrib/dev/ctools/stylizer/stylizer.info b/sites/all/modules/contrib/dev/ctools/stylizer/stylizer.info
index d73a641..90204a3 100644
--- a/sites/all/modules/contrib/dev/ctools/stylizer/stylizer.info
+++ b/sites/all/modules/contrib/dev/ctools/stylizer/stylizer.info
@@ -2,13 +2,11 @@ name = Stylizer
description = Create custom styles for applications such as Panels.
core = 7.x
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
dependencies[] = color
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/stylizer/stylizer.install b/sites/all/modules/contrib/dev/ctools/stylizer/stylizer.install
index 5cefb0d..321ba8e 100644
--- a/sites/all/modules/contrib/dev/ctools/stylizer/stylizer.install
+++ b/sites/all/modules/contrib/dev/ctools/stylizer/stylizer.install
@@ -1,5 +1,9 @@
t('Custom styles can be applied to Panel regions and Panel panes.'),
);
- // Load all mini panels and their displays.
+ // Load all mini panels and their displays.
ctools_include('export');
ctools_include('stylizer');
$items = ctools_export_crud_load_all('stylizer');
@@ -122,14 +122,14 @@ function stylizer_theme() {
'path' => $plugin['path'],
);
- // if no theme function exists, assume template.
+ // If no theme function exists, assume template.
if (!function_exists("theme_$plugin[theme]")) {
$theme[$plugin['theme']]['template'] = str_replace('_', '-', $plugin['theme']);
- $theme[$plugin['theme']]['file'] = $plugin['file']; // for preprocess.
+ // For preprocess.
+ $theme[$plugin['theme']]['file'] = $plugin['file'];
}
}
}
return $theme;
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/term_depth/plugins/access/term_depth.inc b/sites/all/modules/contrib/dev/ctools/term_depth/plugins/access/term_depth.inc
index ab05b60..d63183f 100644
--- a/sites/all/modules/contrib/dev/ctools/term_depth/plugins/access/term_depth.inc
+++ b/sites/all/modules/contrib/dev/ctools/term_depth/plugins/access/term_depth.inc
@@ -25,28 +25,22 @@ $plugin = array(
* Settings form for the 'term depth' access plugin.
*/
function term_depth_term_depth_ctools_access_settings($form, &$form_state, $conf) {
- // If no configuration was saved before, set some defaults.
- if (empty($conf)) {
- $conf = array(
- 'vid' => 0,
- );
- }
- if (!isset($conf['vid'])) {
- $conf['vid'] = 0;
- }
-
+ $vocabularies = taxonomy_get_vocabularies();
+ $options = array();
// Loop over each of the configured vocabularies.
- foreach (taxonomy_get_vocabularies() as $vid => $vocabulary) {
- $options[$vid] = $vocabulary->name;
+ foreach ($vocabularies as $vid => $vocab) {
+ $options[$vocab->machine_name] = $vocab->name;
}
- $form['settings']['vid'] = array(
+ _term_depth_convert_config_vid_to_vocabulary_name($conf);
+
+ $form['settings']['vocabulary'] = array(
'#title' => t('Vocabulary'),
'#type' => 'select',
'#options' => $options,
'#description' => t('Select the vocabulary for this form. If there exists a parent term in that vocabulary, this access check will succeed.'),
- '#id' => 'ctools-select-vid',
- '#default_value' => $conf['vid'],
+ '#id' => 'ctools-select-vocabulary',
+ '#default_value' => !empty($conf['vocabulary']) ? $conf['vocabulary'] : array(),
'#required' => TRUE,
);
@@ -61,15 +55,24 @@ function term_depth_term_depth_ctools_access_settings($form, &$form_state, $conf
return $form;
}
+/**
+ * @param $conf
+ */
+function _term_depth_convert_config_vid_to_vocabulary_name(&$conf) {
+ // Fallback on legacy 'vid', when no vocabularies are available.
+ if (empty($conf['vocabulary']) && !empty($conf['vid'])) {
+ $vocabulary = _ctools_term_vocabulary_machine_name_convert(array($conf['vid']));
+ $conf['vocabulary'] = reset($vocabulary);
+ unset($conf['vid'], $vocabulary);
+ }
+}
+
/**
* Submit function for the access plugins settings.
- *
- * We cast all settings to numbers to ensure they can be safely handled.
*/
function term_depth_term_depth_ctools_access_settings_submit($form, $form_state) {
- foreach (array('depth', 'vid') as $key) {
- $form_state['conf'][$key] = (integer) $form_state['values']['settings'][$key];
- }
+ $form_state['conf']['depth'] = (integer) $form_state['values']['settings']['depth'];
+ $form_state['conf']['vocabulary'] = array_filter($form_state['conf']['vocabulary']);
}
/**
@@ -82,10 +85,17 @@ function term_depth_term_depth_ctools_access_check($conf, $context) {
return FALSE;
}
- // Get the $vid.
- if (!isset($conf['vid'])) {
+ _term_depth_convert_config_vid_to_vocabulary_name($conf);
+
+ // Get the $vocabulary.
+ if (!isset($conf['vocabulary'])) {
return FALSE;
}
+ $vocab = taxonomy_vocabulary_machine_name_load($conf['vocabulary']);
+ if ($vocab->vid != $context->data->vid) {
+ return FALSE;
+ }
+
$depth = _term_depth($context->data->tid);
return ($depth == $conf['depth']);
@@ -95,9 +105,9 @@ function term_depth_term_depth_ctools_access_check($conf, $context) {
* Provide a summary description based upon the checked terms.
*/
function term_depth_term_depth_ctools_access_summary($conf, $context) {
- $vocab = taxonomy_vocabulary_load($conf['vid']);
-
- return t('"@term" has parent in vocabulary "@vocab" at @depth', array(
+ _term_depth_convert_config_vid_to_vocabulary_name($conf);
+ $vocab = taxonomy_vocabulary_machine_name_load($conf['vocabulary']);
+ return t('"@term" is in vocabulary "@vocab" at depth @depth', array(
'@term' => $context->identifier,
'@vocab' => $vocab->name,
'@depth' => $conf['depth'],
diff --git a/sites/all/modules/contrib/dev/ctools/term_depth/term_depth.info b/sites/all/modules/contrib/dev/ctools/term_depth/term_depth.info
index 5f4ef70..4baee51 100644
--- a/sites/all/modules/contrib/dev/ctools/term_depth/term_depth.info
+++ b/sites/all/modules/contrib/dev/ctools/term_depth/term_depth.info
@@ -3,11 +3,9 @@ description = Controls access to context based upon term depth
core = 7.x
dependencies[] = ctools
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/term_depth/term_depth.module b/sites/all/modules/contrib/dev/ctools/term_depth/term_depth.module
index 10f9e31..f9f4ce7 100644
--- a/sites/all/modules/contrib/dev/ctools/term_depth/term_depth.module
+++ b/sites/all/modules/contrib/dev/ctools/term_depth/term_depth.module
@@ -1,5 +1,9 @@
'Context IDs',
+ 'description' => 'Verify that Context IDs work properly.',
+ 'group' => 'ctools',
+ 'dependencies' => array('ctools'),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(array $modules = array()) {
+ $modules[] = 'ctools';
+ parent::setUp($modules);
+ ctools_include('context');
+ }
+
+ private function getTestContexts() {
+ $test_objects = array(
+ array(),
+ array(
+ 'name' => 'foo_bar',
+ ),
+ array(
+ 'id' => 25,
+ ),
+ array(
+ 'id' => 5,
+ 'name' => NULL,
+ ),
+ array(
+ 'id' => 'a',
+ 'name' => 'foo_bar',
+ ),
+ array(
+ 'id' => 'z',
+ 'name' => 'baz',
+ ),
+ array(
+ 'id' => 15,
+ 'name' => 'baz',
+ ),
+ array(
+ 'id' => 'z',
+ 'name' => 'foo',
+ ),
+ array(
+ 'id' => 1,
+ 'name' => 'foo',
+ ),
+ array(
+ 'id' => 47,
+ 'name' => 'bar',
+ ),
+ array(
+ 'id' => 99,
+ 'name' => 'bar',
+ ),
+ );
+ return $test_objects;
+ }
+
+ /**
+ * Test ctools_context_id where the context only has an id.
+ */
+ public function testContextId() {
+ $context = array();
+ $expected = 'context__1';
+ $actual = ctools_context_id($context);
+ $this->assertEqual($actual, $expected, 'Empty context has id ' . $expected);
+
+ $context = array('id' => 4);
+ $expected = 'context__4';
+ $actual = ctools_context_id($context);
+ $this->assertEqual($actual, $expected, 'Context 4 has id ' . $expected);
+
+ $context = array('id' => 'a');
+ $expected = 'context__a';
+ $actual = ctools_context_id($context);
+ $this->assertEqual($actual, $expected, 'Context "a" has id ' . $expected);
+ }
+
+ /**
+ * Test ctools_context_id where the context has an id and a name.
+ */
+ public function testContextIdName() {
+ $context = array('id' => '512', 'name' => 'foo');
+ $expected = 'context_foo_512';
+ $this->assertEqual(ctools_context_id($context), $expected, 'Context "512"/"foo" has id ' . $expected);
+
+ $context = array('id' => '512', 'name' => 'foo_bar');
+ $expected = 'context_foo_bar_512';
+ $this->assertEqual(ctools_context_id($context), $expected, 'Context "512"/"foo_bar" has id ' . $expected);
+ }
+
+ /**
+ * Test ctools_context_id where the context has an id & name, and a type is specified.
+ */
+ public function testContextIdNameType() {
+ $type = 'sort';
+ $context = array('id' => '512', 'name' => 'foo');
+ $expected = 'sort_foo_512';
+ $this->assertEqual(ctools_context_id($context, $type), $expected, 'Context "512" has id ' . $expected);
+
+ $type = NULL;
+ $context = array('id' => '512', 'name' => 'foo');
+ $expected = '_foo_512';
+ $this->assertEqual(ctools_context_id($context, $type), $expected, 'Context "512" has id ' . $expected);
+ }
+
+ /**
+ * Test ctools_context_next_id in various scenarios.
+ */
+ public function testNextContextId() {
+ $test_objects = $this->getTestContexts();
+
+ // If no object list or name is given?
+ $value = ctools_context_next_id(NULL, NULL);
+ $expected = 1;
+ $this->assertEqual($value, $expected, 'NULL objects have next id ' . $expected);
+
+ // If no object list is given?
+ $value = ctools_context_next_id(NULL, 'bar');
+ $expected = 1;
+ $this->assertEqual($value, $expected, 'NULL objects have next id ' . $expected);
+
+ // If no object list is given (another way)?
+ $value = ctools_context_next_id(array(), 'bar');
+ $expected = 1;
+ $this->assertEqual($value, $expected, 'Empty objects have next id ' . $expected);
+
+ // The name is empty... which is just another name.
+ $value = ctools_context_next_id($test_objects, '');
+ $expected = 1;
+ $this->assertEqual($value, $expected, 'Unnamed objects have next id ' . $expected . ' (got ' . $value . ')');
+
+ // The value of the id key is not a number.
+ $value = ctools_context_next_id($test_objects, 'foo_bar');
+ $expected = 1;
+ $this->assertEqual($value, $expected, 'Objects with non-integer ids are ignored ' . $expected);
+
+ // One object's id is not a number (ignore) but another is valid.
+ $value = ctools_context_next_id($test_objects, 'baz');
+ $expected = 16;
+ $this->assertEqual($value, $expected, 'Baz\'s objects have next id ' . $expected);
+
+ // An expected case: there is one match and the id is numeric.
+ $value = ctools_context_next_id($test_objects, 'foo');
+ $expected = 2;
+ $this->assertEqual($value, $expected, 'Foo\'s objects have next id ' . $expected);
+
+ // Another expected case: there are multiple numeric IDs.
+ $value = ctools_context_next_id($test_objects, 'bar');
+ $expected = 100;
+ $this->assertEqual($value, $expected, 'Bar\'s objects have next id ' . $expected);
+ }
+
+}
+
+
+/**
+ * Test the keyword substitution functionality.
+ */
class CtoolsContextKeywordsSubstitutionTestCase extends DrupalWebTestCase {
+
+ /**
+ * {@inheritdoc}
+ */
public static function getInfo() {
return array(
'name' => 'Keywords substitution',
'description' => 'Verify that keywords are properly replaced with data.',
- 'group' => 'Chaos Tools Suite',
+ 'group' => 'ctools',
+ 'dependencies' => array('ctools'),
);
}
- public function setUp() {
- parent::setUp('ctools');
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(array $modules = array()) {
+ $modules[] = 'ctools';
+ parent::setUp($modules);
ctools_include('context');
}
+ /**
+ * Test the keyword substitution.
+ */
public function testKeywordsSubstitution() {
// Create node context for substitution.
$node = $this->drupalCreateNode();
@@ -23,40 +209,164 @@ class CtoolsContextKeywordsSubstitutionTestCase extends DrupalWebTestCase {
// Run tests on some edge cases.
$checks = array(
- '%node:changed:raw:' => array(
+ array(
+ '%node:changed:raw:',
+ array('%title' => ''),
"{$node->changed}:",
t('Multi-level token has been replaced. Colon left untouched.'),
),
- '%node:title' => array(
+ array(
+ '%node:title',
+ array('%title' => ''),
"{$node->title}",
t('Keyword and converter have been replaced.'),
),
- '%%node:title' => array(
+ array(
+ '%%node:title',
+ array('%title' => ''),
"%node:title",
t('Keyword after escaped percent sign left untouched.'),
),
- '%node:title%node:nid' => array(
+ array(
+ '%node:title%node:nid',
+ array('%title' => ''),
"{$node->title}{$node->nid}",
t('Multiple substitutions have been replaced.'),
),
- '%node:title:' => array(
+ array(
+ '%node:title:',
+ array('%title' => ''),
"{$node->title}:",
t('Colon after keyword and converter left untouched.'),
),
- '%node:title%%' => array(
+ array(
+ '%node:title%%',
+ array('%title' => ''),
"{$node->title}%",
t('Escaped percent sign after keyword and converter left untouched.'),
),
- '%%%node:title' => array(
+ array(
+ '%%%node:title',
+ array('%title' => ''),
"%{$node->title}",
t('Keyword after escaped and unescaped percent sign has been replaced.'),
),
+ array(
+ '%%foo:bar',
+ array('%title' => ''),
+ "%foo:bar",
+ t('Non-existant context ignored.'),
+ ),
+ array(
+ 'There was about 20%-30% difference in price.',
+ array('%title' => ''),
+ 'There was about 20%-30% difference in price.',
+ t('Non-keyword percent sign left untouched.'),
+ ),
+ array(
+ 'href="my%20file%2dname.pdf"',
+ array('%title' => ''),
+ 'href="my%20file%2dname.pdf"',
+ t('HTTP URL escape left untouched.'),
+ ),
+ array(
+ 'href="my%a0file%fdname.pdf"',
+ array('%title' => ''),
+ 'href="my%a0file%fdname.pdf"',
+ t('HTTP URL escape (high-chars) left untouched.'),
+ ),
+ array(
+ 'Click here!',
+ array('%title' => ''),
+ 'Click here!',
+ t('HTTP URL escape percent sign left untouched in HTML.'),
+ ),
+ array(
+ 'SELECT * FROM {table} WHERE field = "%s"',
+ array('%title' => ''),
+ 'SELECT * FROM {table} WHERE field = "%s"',
+ t('SQL percent sign left untouched.'),
+ ),
+ array(
+ '%title',
+ array('%title' => 'foobar'),
+ 'foobar',
+ t('String value in $keywords array is returned.'),
+ ),
+ array(
+ '%title',
+ array('%title' => ''),
+ '',
+ t('Empty string value in $keywords array returns empty string.'),
+ ),
+ array(
+ '%title',
+ array('%title' => NULL),
+ '',
+ t('NULL value in $keywords array returns empty string.'),
+ ),
+ array(
+ '%title',
+ array('%title' => FALSE),
+ '',
+ t('FALSE value in $keywords array returns empty string.'),
+ ),
+ array(
+ '%title',
+ array('%title' => 11),
+ '11',
+ t('Integer value in $keywords array returns string representation of the integer.'),
+ ),
+ array(
+ '%title',
+ array('%title' => 'substring %title'),
+ 'substring %title',
+ t('Input value as substring in $keywords array left untouched.'),
+ ),
);
- foreach ($checks as $string => $expectations) {
- list($expected_result, $message) = $expectations;
- $actual_result = ctools_context_keyword_substitute($string, array(), $contexts);
+ foreach ($checks as $check) {
+ list($string, $keywords, $expected_result, $message) = $check;
+ $actual_result = ctools_context_keyword_substitute($string, $keywords, $contexts);
$this->assertEqual($actual_result, $expected_result, $message);
}
}
}
+
+/**
+ * Test the context classes.
+ */
+class CtoolsContextUnitTestCase extends DrupalUnitTestCase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function getInfo() {
+ return array(
+ 'name' => 'Context unit tests',
+ 'description' => 'Verifies that context classes behave correctly',
+ 'group' => 'ctools',
+ 'dependencies' => array('ctools'),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ require_once __DIR__ . '/../includes/context.inc';
+ }
+
+ /**
+ * Tests that contexts have the correct required property value.
+ */
+ public function testOptionalRequiredContext() {
+ $required_context = new ctools_context_required('test1');
+ $this->assertTrue($required_context->required);
+
+ $optional_context = new ctools_context_optional('test2');
+ $this->assertFalse($optional_context->required);
+ }
+
+}
diff --git a/sites/all/modules/contrib/dev/ctools/tests/css.test b/sites/all/modules/contrib/dev/ctools/tests/css.test
index 4a5200c..6c03730 100644
--- a/sites/all/modules/contrib/dev/ctools/tests/css.test
+++ b/sites/all/modules/contrib/dev/ctools/tests/css.test
@@ -1,65 +1,98 @@
'CSS Tools tests',
- 'description' => '...',
- 'group' => 'Chaos Tools Suite',
+ 'description' => 'Confirm the custom CSS handling works.',
+ 'group' => 'ctools',
+ 'dependencies' => array('ctools'),
);
}
- function setUp() {
- // Additionally enable contact module.
- parent::setUp('ctools');
+ /**
+ * {@inheritdoc}
+ */
+ public function setUp(array $modules = array()) {
+ $modules[] = 'ctools';
+ parent::setUp($modules);
+ ctools_include('css');
}
/**
- * Test that cached plugins are loaded correctly.
+ * Test that Stored CSS snippets can be retrieved, filtered or otherwise.
*/
- function testCssStuff() {
+ public function testCssStoreFilterRetrieve() {
$css = "#some-id .some-class {\n color: black;\n illegal-key: foo;\n}";
$filtered_css = '#some-id .some-class{color:black;}';
- ctools_include('css');
+ $this->assertNull(ctools_css_retrieve('missing-css-test'), 'Missing css snippet is not found');
+
$filename1 = ctools_css_store('unfiltered-css-test', $css, FALSE);
$filename2 = ctools_css_store('filtered-css-test', $css, TRUE);
+ $file_contents = file_get_contents($filename1);
+ $this->assertEqual($css, $file_contents, 'Unfiltered css file contents are correct');
+
$this->assertEqual($filename1, ctools_css_retrieve('unfiltered-css-test'), 'Unfiltered css file successfully fetched');
$file_contents = file_get_contents($filename1);
$this->assertEqual($css, $file_contents, 'Unfiltered css file contents are correct');
-// $match = $filename1 == ctools_css_retrieve('unfiltered-css-test') ? 'Match' : 'No match';
-// $output .= ''), 'Variable Token Markup should contain h2 element');
+ $this->assertFalse(strstr($new_markup, 'ctools-page-title'), 'Variable Token Markup should not contain comment element');
+ }
+
+ /**
+ * Test that we can set page tokens.
+ */
+ public function testReplaceCallbackToken() {
+ $string = ctools_set_callback_token('title', 'test_ctools_page_callback_token');
+ $this->assertEqual($string, '', 'Expected form of token was found');
+
+ $elements = array(
+ '#type' => 'container',
+ '#attributes' => array('class' => array('test')),
+ 'content' => array(
+ '#type' => 'markup',
+ '#markup' => t('This is my test markup'),
+ '#prefix' => $string,
+ ),
+ 'link' => array(
+ '#type' => 'link',
+ '#title' => t('My link'),
+ '#href' => 'node/1',
+ ),
+ );
+ $markup = '
' . t('Argument @arg using context @context converted into @converter', array(
- '@arg' => $argument->ui_name(), '@context' => $contexts[$cid]->get_identifier(),
- '@converter' => $converter)) . ' ';
+ '@arg' => $argument->ui_name(),
+ '@context' => $contexts[$cid]->get_identifier(),
+ '@converter' => $converter,
+ )) . '';
}
$argument = next($arguments);
}
@@ -494,6 +495,7 @@ function views_content_views_content_type_admin_info($subtype, $conf, $contexts)
* versions it was the view name with a dash and the display ID.
* If this is the case, we can use it to correct the 'display' setting
* in the $conf.
+ *
* @return
* The $view with the initialized display. If the $view could not be
* loaded, the name attempted will be loaded for use in errors.
@@ -534,7 +536,6 @@ function _views_content_views_update_conf(&$conf, $subtype) {
$view->set_display($display);
// $view->current_display will now reflect this value.
-
// If set NOT to override, go ahead and refresh from the view.
if (empty($conf['override_pager_settings'])) {
if (method_exists($view, 'init_pager')) {
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_attachments.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_attachments.inc
index e938f53..f399fea 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_attachments.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_attachments.inc
@@ -25,7 +25,7 @@ function views_content_views_attachments_content_type_render($subtype, $conf, $p
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_attachments';
$block->delta = $context->argument;
$block->title = '';
@@ -41,7 +41,6 @@ function views_content_views_attachments_content_type_render($subtype, $conf, $p
return $block;
}
-
function views_content_views_attachments_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_empty.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_empty.inc
index 4664d65..01e95c3 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_empty.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_empty.inc
@@ -22,7 +22,7 @@ function views_content_views_empty_content_type_render($subtype, $conf, $panel_a
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_empty';
$block->delta = $context->argument;
$block->title = '';
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_exposed.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_exposed.inc
index 93371e2..f6d019f 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_exposed.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_exposed.inc
@@ -22,7 +22,7 @@ function views_content_views_exposed_content_type_render($subtype, $conf, $panel
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_exposed';
$block->delta = $context->argument;
$block->title = '';
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_feed.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_feed.inc
index f2fdb8a..774d593 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_feed.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_feed.inc
@@ -22,7 +22,7 @@ function views_content_views_feed_content_type_render($subtype, $conf, $panel_ar
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_feed';
$block->delta = $context->argument;
$block->title = '';
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_footer.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_footer.inc
index 81c87a3..fc3d01b 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_footer.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_footer.inc
@@ -22,7 +22,7 @@ function views_content_views_footer_content_type_render($subtype, $conf, $panel_
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_footer';
$block->delta = $context->argument;
$block->title = '';
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_header.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_header.inc
index f144d29..b42806f 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_header.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_header.inc
@@ -22,7 +22,7 @@ function views_content_views_header_content_type_render($subtype, $conf, $panel_
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_header';
$block->delta = $context->argument;
$block->title = '';
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_pager.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_pager.inc
index faa6569..f5b380e 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_pager.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_pager.inc
@@ -22,7 +22,7 @@ function views_content_views_pager_content_type_render($subtype, $conf, $panel_a
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_pager';
$block->delta = $context->argument;
$block->title = '';
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_panes.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_panes.inc
index dc61bca..07e93f7 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_panes.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_panes.inc
@@ -179,21 +179,21 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a
$args[] = (isset($conf['arguments'][$id]) && $conf['arguments'][$id] !== '') ? ctools_context_keyword_substitute($conf['arguments'][$id], array(), $contexts) : NULL;
break;
- case 'wildcard':
+ case 'wildcard':
// Put in the wildcard.
- $args[] = isset($arguments[$id]['wildcard']) ? $arguments[$id]['wildcard'] : '*';
- break;
+ $args[] = isset($arguments[$id]['wildcard']) ? $arguments[$id]['wildcard'] : '*';
+ break;
- case 'none':
- default:
- // Put in NULL.
- // views.module knows what to do with NULL (or missing) arguments
- $args[] = NULL;
- break;
+ case 'none':
+ default:
+ // Put in NULL.
+ // views.module knows what to do with NULL (or missing) arguments.
+ $args[] = NULL;
+ break;
}
}
- // remove any trailing NULL arguments as these are non-args:
+ // Remove any trailing NULL arguments as these are non-args:
while (count($args) && end($args) === NULL) {
array_pop($args);
}
@@ -208,27 +208,32 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a
if ($allow['path_override'] && !empty($conf['path'])) {
$view->override_path = $conf['path'];
}
- else if ($path = $view->display_handler->get_option('inherit_panels_path')) {
- $view->override_path = $_GET['q'];
+ elseif ($path = $view->display_handler->get_option('inherit_panels_path')) {
+ if (drupal_is_front_page()) {
+ $view->override_path = '';
+ }
+ else {
+ $view->override_path = $_GET['q'];
+ }
}
$block = new stdClass();
$block->module = 'views';
- $block->delta = $view->name . '-' . $display;
+ $block->delta = $view->name . '-' . $display;
if (($allow['link_to_view'] && !empty($conf['link_to_view'])) ||
(!$allow['link_to_view'] && $view->display_handler->get_option('link_to_view'))) {
$block->title_link = $view->get_url();
}
- // more link
+ // More link.
if ($allow['more_link']) {
if (empty($conf['more_link'])) {
$view->display_handler->set_option('use_more', FALSE);
}
else {
$view->display_handler->set_option('use_more', TRUE);
- // make sure the view runs the count query so we know whether or not the
+ // Make sure the view runs the count query so we know whether or not the
// more link applies.
$view->get_total_rows = TRUE;
}
@@ -265,7 +270,7 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a
if ($allow['fields_override']) {
if ($conf['fields_override']) {
$fields = $view->get_items('field');
- foreach ($fields as $field => $display) {
+ foreach ($fields as $field => $field_display) {
$fields[$field]['exclude'] = empty($conf['fields_override'][$field]);
}
$view->display_handler->set_option('fields', $fields);
@@ -321,6 +326,10 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a
function views_content_views_panes_add_defaults(&$conf, $view) {
$pager = $view->display_handler->get_option('pager');
+ if (empty($conf)) {
+ $conf = array();
+ }
+
$conf += array(
'link_to_view' => $view->display_handler->get_option('link_to_view'),
'more_link' => $view->display_handler->get_option('use_more'),
@@ -377,7 +386,7 @@ function views_content_views_panes_content_type_edit_form($form, &$form_state) {
);
}
}
- if ($allow['link_to_view'] ) {
+ if ($allow['link_to_view']) {
$form['link_to_view'] = array(
'#type' => 'checkbox',
'#default_value' => isset($conf['link_to_view']) ? $conf['link_to_view'] : $view->display_handler->get_option('link_to_view'),
@@ -428,7 +437,7 @@ function views_content_views_panes_content_type_edit_form($form, &$form_state) {
$form['use_pager'] = array(
'#type' => 'checkbox',
'#title' => t('Use pager'),
- '#default_value' => $conf['use_pager'],
+ '#default_value' => $conf['use_pager'],
'#id' => 'use-pager-checkbox',
'#prefix' => '
Unfiltered: ' . $filename1 . ' ' . $match . ''; -// $output .= '
' . file_get_contents($filename1) . ''; $this->assertEqual($filename2, ctools_css_retrieve('filtered-css-test'), 'Filtered css file succcesfully fetched'); $file_contents = file_get_contents($filename2); $this->assertEqual($filtered_css, $file_contents, 'Filtered css file contents are correct'); - // $match = $filename2 == ctools_css_retrieve('filtered-css-test') ? 'Match' : 'No match'; -// $output .= '
Filtered: ' . $filename2 . ' ' . $match . ''; -// $output .= '
' . file_get_contents($filename2) . ''; -// -// drupal_add_css($filename2, array('type' => 'file')); -// return array('#markup' => $output); + } + /** + * Test that Stored CSS snippets can be correctly overwritten. + */ + public function testCssStoreOverwrite() { + $css1 = "#some-id .some-class {\n color: black;\n illegal-key: foo;\n}"; - // Test that in case that url can be used, the value surives when a colon is in it. + $css2 = "#other-id .other-class {\n color: blue;\n illegal-key: foo;\n}"; + $filtered_css2 = '#other-id .other-class{color:blue;}'; + + ctools_css_store('unfiltered-css-test', $css1, FALSE); + ctools_css_store('filtered-css-test', $css1, TRUE); + + // Now overwrite the first css with the second version. + $filename3 = ctools_css_store('unfiltered-css-test', $css2, FALSE); + $filename4 = ctools_css_store('filtered-css-test', $css2, TRUE); + + $file_contents3 = file_get_contents($filename3); + $file_contents4 = file_get_contents($filename4); + + $this->assertEqual($css2, $file_contents3, 'Unfiltered CSS has overwritten earlier contents.'); + $this->assertEqual($filtered_css2, $file_contents4, 'Filtered CSS has overwritten earlier contents.'); + } + + /** + * Test that in case that url is used, the colons survives filtering. + */ + public function testCssFilterURLHandling() { $css = "#some-id {\n background-image: url(http://example.com/example.gif);\n}"; $css_data = ctools_css_disassemble($css); $empty_array = array(); $disallowed_values_regex = '/(expression)/'; - $filtered = ctools_css_assemble(ctools_css_filter_css_data($css_data, $empty_array, $empty_array, '', $disallowed_values_regex)); + + $intermediate = ctools_css_filter_css_data($css_data, $empty_array, $empty_array, '', $disallowed_values_regex); + $filtered = ctools_css_assemble($intermediate); + $url = (strpos($filtered, 'http://example.com/example.gif') !== FALSE); $this->assertTrue($url, 'CSS with multiple colons can survive.'); + } - // Test that in case the CSS has two properties defined are merged. + /** + * Test that when the CSS has two properties defined they are merged. + */ + public function testCssFilterMergeProperties() { $css = "#some-id {\n font-size: 12px;\n}\n#some-id {\n color: blue;\n}"; $filtered = ctools_css_filter($css); $font_size = (strpos($filtered, 'font-size:12px;') !== FALSE); @@ -78,4 +111,5 @@ class CtoolsCssTestCase extends DrupalWebTestCase { $color = (strpos($filtered, 'color:red') !== FALSE); $this->assertTrue($font_size && $color, 'Multiple properties are retained.'); } + } diff --git a/sites/all/modules/contrib/dev/ctools/tests/css_cache.test b/sites/all/modules/contrib/dev/ctools/tests/css_cache.test index e289b42..2aaa304 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/css_cache.test +++ b/sites/all/modules/contrib/dev/ctools/tests/css_cache.test @@ -1,30 +1,28 @@ 'Ctools CSS cache', + 'name' => 'CSS cache', 'description' => 'Tests the custom CSS cache handler.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } /** * {@inheritdoc} */ - public function setUp() { - parent::setUp('ctools'); + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); } /** diff --git a/sites/all/modules/contrib/dev/ctools/tests/ctools.plugins.test b/sites/all/modules/contrib/dev/ctools/tests/ctools.plugins.test index fe1829c..a12d06a 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/ctools.plugins.test +++ b/sites/all/modules/contrib/dev/ctools/tests/ctools.plugins.test @@ -1,26 +1,43 @@ 'Get plugin info', 'description' => 'Verify that plugin type definitions can properly set and overide values.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } - function setUp() { - // Additionally enable contact module. - parent::setUp('ctools', 'ctools_plugin_test'); + /** + * {@inheritdoc} + */ + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + $modules[] = 'ctools_plugin_test'; + parent::setUp($modules); } + /** + * Assert helper to check that a specific plugin function exists. + * + * @param $module + * The module that owns the plugin. + * @param $type + * The type of plugin. + * @param $id + * The id of the specific plugin to load. + * @param $function + * The identifier of the function. For example, 'settings form'. + */ protected function assertPluginFunction($module, $type, $id, $function = 'function') { $func = ctools_plugin_load_function($module, $type, $id, $function); $this->assertTrue(function_exists($func), t('Plugin @plugin of plugin type @module:@type successfully retrieved @retrieved for @function.', array( @@ -32,6 +49,18 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { ))); } + /** + * Assert helper to check that a specific plugin function does NOT exist. + * + * @param $module + * The module that owns the plugin. + * @param $type + * The type of plugin. + * @param $id + * The id of the specific plugin to load. + * @param $function + * The identifier of the function. For example, 'settings form'. + */ protected function assertPluginMissingFunction($module, $type, $id, $function = 'function') { $func = ctools_plugin_load_function($module, $type, $id, $function); $this->assertEqual($func, NULL, t('Plugin @plugin of plugin type @module:@type for @function with missing function successfully failed.', array( @@ -42,6 +71,18 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { ))); } + /** + * Assert helper to check that a plugin can be loaded using a named class. + * + * @param $module + * The module that owns the plugin. + * @param $type + * The type of plugin. + * @param $id + * The id of the specific plugin to load. + * @param string $class + * The name of the PHP class to load. + */ protected function assertPluginClass($module, $type, $id, $class = 'handler') { $class_name = ctools_plugin_load_class($module, $type, $id, $class); $this->assertTrue(class_exists($class_name), t('Plugin @plugin of plugin type @module:@type successfully retrieved @retrieved for @class.', array( @@ -53,6 +94,18 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { ))); } + /** + * Assert helper to check that a plugin DOES NOT contain the named class. + * + * @param $module + * The module that owns the plugin. + * @param $type + * The type of plugin. + * @param $id + * The id of the specific plugin to load. + * @param string $class + * The name of the PHP class to load. + */ protected function assertPluginMissingClass($module, $type, $id, $class = 'handler') { $class_name = ctools_plugin_load_class($module, $type, $id, $class); $this->assertEqual($class_name, NULL, t('Plugin @plugin of plugin type @module:@type for @class with missing class successfully failed.', array( @@ -66,7 +119,7 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { /** * Test that plugins are loaded correctly. */ - function testPluginLoading() { + public function testPluginLoading() { ctools_include('plugins'); $module = 'ctools_plugin_test'; $type = 'not_cached'; @@ -81,7 +134,7 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { $this->assertPluginClass($module, $type, 'plugin_array', 'handler'); $this->assertPluginClass($module, $type, 'plugin_array2', 'handler'); $this->assertPluginMissingClass($module, $type, 'plugin_array_dne', 'handler'); - // TODO Test big hook plugins. + // @todo Test big hook plugins. $type = 'cached'; @@ -95,6 +148,7 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { $this->assertPluginClass($module, $type, 'plugin_array', 'handler'); $this->assertPluginClass($module, $type, 'plugin_array2', 'handler'); $this->assertPluginMissingClass($module, $type, 'plugin_array_dne', 'handler'); - // TODO Test big hook plugins. + // @todo Test big hook plugins. } + } diff --git a/sites/all/modules/contrib/dev/ctools/tests/ctools.test b/sites/all/modules/contrib/dev/ctools/tests/ctools.test new file mode 100644 index 0000000..4d748c0 --- /dev/null +++ b/sites/all/modules/contrib/dev/ctools/tests/ctools.test @@ -0,0 +1,239 @@ + 'Ctools module functions tests', + 'description' => 'Check functions in the ctools.module not otherwise tested.', + 'group' => 'ctools', + 'dependencies' => array('ctools'), + ); + } + + /** + * {@inheritdoc} + */ + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); + } + + /** + * Test that the break phrase function behaves as expected. + */ + public function testBreakPhrase() { + $tests = array( + NULL => array('value' => array()), + '' => array('value' => array()), + '1' => array('operator' => 'and', 'value' => array(1)), + '99' => array('operator' => 'and', 'value' => array(99)), + '+1' => array('invalid_input' => TRUE, 'value' => array(-1)), + ' 1' => array('invalid_input' => TRUE, 'value' => array(-1)), + '1 ' => array('invalid_input' => TRUE, 'value' => array(-1)), + '-1' => array('invalid_input' => TRUE, 'value' => array(-1)), + '-99' => array('invalid_input' => TRUE, 'value' => array(-1)), + '1,2' => array('operator' => 'and', 'value' => array(1, 2)), + '1 2' => array('operator' => 'or', 'value' => array(1, 2)), + '1+2' => array('operator' => 'or', 'value' => array(1, 2)), + '1,2,3' => array('operator' => 'and', 'value' => array(1, 2, 3)), + '1 2 3' => array('operator' => 'or', 'value' => array(1, 2, 3)), + '1+2+3' => array('operator' => 'or', 'value' => array(1, 2, 3)), + '1 , 2 , 3' => array('invalid_input' => TRUE, 'value' => array(-1)), + '1 + 2 + 3' => array('invalid_input' => TRUE, 'value' => array(-1)), + '1,2,3,4,5,6,7,8,9' => array( + 'operator' => 'and', + 'value' => array(1, 2, 3, 4, 5, 6, 7, 8, 9), + ), + '1 2,3,4 5 6 7 8 9' => array('invalid_input' => TRUE, 'value' => array(-1)), + ); + + foreach ($tests as $string => $expected) { + $result = ctools_break_phrase($string); + $expected = (object) $expected; + $this->assertEqual($result, $expected, 'Break Phrase test patterns: ' . $string); + } + } + + /** + * Test that the (deprecated) getuserroles returns expected array. + */ + public function testGetUserRoles() { + $result = ctools_get_roles(); + $this->assertTrue(is_array($result), 'get_roles returns an array'); + + // A key-value array of integers. + foreach ($result as $k => $v) { + $this->assertTrue(is_numeric($k), 'Role key is numeric; ' . $k); + $this->assertTrue(is_string($v), 'Role id is string; ' . $v); + } + } + + /** + * Test the ctools_attach_js function returns the expected paths. + */ + public function testAttachJs() { + $taxonomy_path = drupal_get_path('module', 'taxonomy'); + $ctools_path = drupal_get_path('module', 'ctools'); + + // Func should probably do a different thing but this is current behaviour. + $path = ctools_attach_js(''); + $this->assertEqual($path, $ctools_path . '/js/.js', 'Attach an empty string'); + + $path = ctools_attach_js('foo'); + $this->assertEqual($path, $ctools_path . '/js/foo.js', 'Attach simple string'); + + $path = ctools_attach_js('foo', 'ctools', ''); + $this->assertEqual($path, $ctools_path . '//foo.js', 'Attach string with empty subdir'); + + $path = ctools_attach_js('foo', 'ctools', 'javascript'); + $this->assertEqual($path, $ctools_path . '/javascript/foo.js', 'Attach string with alternate subdir'); + + $path = ctools_attach_js('foo', 'taxonomy', 'javascript'); + $this->assertEqual($path, $taxonomy_path . '/javascript/foo.js', 'Attach string from different module'); + } + + /** + * Test the ctools_attach_css function returns the expected paths. + */ + public function testAttachCss() { + $taxonomy_path = drupal_get_path('module', 'taxonomy'); + $ctools_path = drupal_get_path('module', 'ctools'); + + // Func should probably do a different thing but this is current behaviour. + $path = ctools_attach_css(''); + $this->assertEqual($path, $ctools_path . '/css/.css', 'Attach empty string'); + + $path = ctools_attach_css('foo'); + $this->assertEqual($path, $ctools_path . '/css/foo.css', 'Attach simple string'); + + $path = ctools_attach_css('foo', 'ctools', ''); + $this->assertEqual($path, $ctools_path . '//foo.css', 'Attach string with empty subdir'); + + $path = ctools_attach_css('foo', 'ctools', 'theme'); + $this->assertEqual($path, $ctools_path . '/theme/foo.css', 'Attach string with alternate subdir'); + + $path = ctools_attach_css('foo', 'taxonomy', 'theme'); + $this->assertEqual($path, $taxonomy_path . '/theme/foo.css', 'Attach string from different module'); + } + + /** + * Test the ctools version compare function. + */ + public function testApiVersionCompare() { + // We're beyond version 1. + $ok = ctools_api_version('1.0'); + $this->assertTrue($ok, 'Check API version 1.0 is ok'); + + // We're beyond version 1.0.1 too. + $ok = ctools_api_version('1.0.1'); + $this->assertTrue($ok, 'Check API version 1.0.1 is ok'); + + // Not (yet) on api version 10. + $ok = ctools_api_version('10.0'); + $this->assertFalse($ok, 'Check API version 10.0 is not ok'); + + // We are (currently) between version 1.1 and version 4.0. + $ok = ctools_api_version('1.1', '4.0'); + $this->assertTrue($ok, 'Check API is between 1 and 4'); + } + + /** + * Test that the ctools_classs_add works. + */ + public function testClassesAdd() { + ctools_class_reset(); + + ctools_class_add('testclass'); + + $classes = ctools_get_classes(); + $this->assertEqual(is_array($classes), 1, 'Classes should be an array'); + $this->assertEqual(count($classes), 1, 'Classes array has one element'); + $this->assertEqual(count($classes['html']), 1, 'Classes array has element: html'); + $this->assertTrue(isset($classes['html']['add']), 'Classes array has element: html/add'); + $this->assertEqual($classes['html']['add'], array('testclass'), 'Classes array has expected value'); + + ctools_class_add('class2 class3'); + + $classes = ctools_get_classes(); + $this->assertEqual(is_array($classes), 1, 'Classes should be an array'); + $this->assertEqual(count($classes['html']), 1, 'Classes array has element: html'); + // TODO: An undesirable result: array('testclass', 'class2', 'class3') is better. + $this->assertEqual($classes['html']['add'], array( + 'testclass', + 'class2 class3', + ), 'Classes array has expected value'); + } + + /** + * Test that the ctools_classs_remove works. + */ + public function testClassesRemove() { + ctools_class_reset(); + + ctools_class_remove('testclass'); + + $classes = ctools_get_classes(); + $this->assertEqual(is_array($classes), 1, 'Classes should be an array'); + $this->assertEqual(count($classes), 1, 'Classes array has one element'); + $this->assertEqual(count($classes['html']), 1, 'Classes array has element: html'); + $this->assertTrue(isset($classes['html']['remove']), 'Classes array has element: html/remove'); + $this->assertEqual($classes['html']['remove'], array('testclass'), 'Classes array has expected value'); + + ctools_class_remove('class2 class3'); + + $classes = ctools_get_classes(); + $this->assertEqual(count($classes), 1, 'Classes array has one element'); + $this->assertEqual(count($classes['html']), 1, 'Classes array has element: html'); + // This is an undesirable result, is array('testclass', 'class2', 'class3') better. + $this->assertEqual($classes['html']['remove'], array( + 'testclass', + 'class2 class3', + ), 'Classes array has expected value'); + } + + /** + * Test that the ctools_classs_add and ctools_classs_remove interact well. + */ + public function testClassesAddRemove() { + ctools_class_reset(); + + ctools_class_add('testclass'); + ctools_class_remove('testclass'); + + $classes = ctools_get_classes(); + $this->assertTrue(isset($classes['html']['add']), 'Classes array has an add set'); + $this->assertEqual($classes['html']['add'], array('testclass'), 'testclass is in the add set'); + $this->assertTrue(isset($classes['html']['remove']), 'Classes array has a remove set'); + // TODO: Is it really good to let this happen? + $this->assertEqual($classes['html']['remove'], array('testclass'), 'testclass is in the remove set'); + } + + /** + * Test that the ctools_classs_add and ctools_classs_remove interact well .. 2. + */ + public function testClassesAddRemove2() { + ctools_class_reset(); + + ctools_class_add('class2 class3'); + ctools_class_remove('class3'); + + $classes = ctools_get_classes(); + $this->assertTrue(isset($classes['html']['add']), 'Classes array has an add set'); + $this->assertEqual($classes['html']['add'], array('class2 class3'), 'Added class2 class3 is in add set'); + $this->assertTrue(isset($classes['html']['remove']), 'Classes array has a remove set'); + // TODO: Is it really good to let this happen? + $this->assertEqual($classes['html']['remove'], array('class3'), 'class3 in remove set'); + } + +} diff --git a/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export.test b/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export.test index 1accfd7..ebeee49 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export.test +++ b/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export.test @@ -1,32 +1,34 @@ 'CTools export CRUD tests', + 'name' => 'Export CRUD', 'description' => 'Test the CRUD functionality for the ctools export system.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', ); } - protected function setUp() { - parent::setUp('ctools_export_test'); - $this->resetAll(); + /** + * {@inheritdoc} + */ + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + $modules[] = 'ctools_export_test'; + parent::setUp($modules); } /** * Tests CRUD operation: Load. */ - function testCrudExportLoad() { + public function testCrudExportLoad() { $loaded_export = ctools_export_crud_load('ctools_export_test', 'database_test'); $expected_export = new stdClass(); @@ -47,7 +49,7 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { /** * Tests CRUD operation: Load multiple. */ - function testCrudExportLoadMultiple() { + public function testCrudExportLoadMultiple() { $exportable_names = array('database_test', 'overridden_test', 'default_test'); $loaded_exports = ctools_export_crud_load_multiple('ctools_export_test', $exportable_names); @@ -57,7 +59,7 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { /** * Tests CRUD operation: Load all. */ - function testCrudExportLoadAll() { + public function testCrudExportLoadAll() { $loaded_exports = ctools_export_crud_load_all('ctools_export_test'); $this->assertEqual(count($loaded_exports), 3, 'All exportables have been loaded.'); @@ -66,10 +68,10 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { /** * Tests CRUD operation: Save. */ - function testCrudExportSave() { + public function testCrudExportSave() { $default_export = ctools_export_crud_load('ctools_export_test', 'default_test'); - $this->assertTrue($default_export->in_code_only,'The loaded exportable is in code only.'); + $this->assertTrue($default_export->in_code_only, 'The loaded exportable is in code only.'); ctools_export_crud_save('ctools_export_test', $default_export); @@ -84,7 +86,7 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { /** * Tests CRUD operation: New. */ - function testCrudExportNew() { + public function testCrudExportNew() { // Default exportable with defualt values. $new_export = ctools_export_crud_new('ctools_export_test'); @@ -113,7 +115,7 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { /** * Tests CRUD operation: Revert. */ - function testCrudExportRevert() { + public function testCrudExportRevert() { // Load exportable, will come from database. $original_export = ctools_export_crud_load('ctools_export_test', 'overridden_test'); @@ -135,14 +137,15 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { // Check the exportable is now in_code_only. $this->assertTrue($default_export->in_code_only, 'The loaded exportable is in the database only.'); - // Make sure the default object loaded matches the same overridden one in the database. + // Make sure the default object loaded matches the same overridden one in + // the database. $this->assertEqual($original_export->machine, $default_export->machine, 'The default exportable has been loaded and matches the overridden exportable.'); } /** * Tests CRUD operation: Delete. */ - function testCrudExportDelete() { + public function testCrudExportDelete() { // Create a stub entry save it and delete it from the database. $new_export = ctools_export_crud_new('ctools_export_test'); ctools_export_crud_save('ctools_export_test', $new_export); @@ -158,6 +161,7 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { $machine = $database_export->machine; ctools_export_crud_delete('ctools_export_test', $database_export); + // Clear the exportable caches as it's been loaded above. ctools_export_load_object_reset('ctools_export_test'); $result = ctools_export_crud_load('ctools_export_test', $machine); @@ -168,7 +172,7 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { /** * Tests CRUD operation: Set status. */ - function testCrudExportSetStatus() { + public function testCrudExportSetStatus() { // Database only object. $database_export = ctools_export_crud_load('ctools_export_test', 'database_test'); ctools_export_crud_disable('ctools_export_test', $database_export); diff --git a/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.default_ctools_export_tests.inc b/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.default_ctools_export_tests.inc index 9f2dd6c..2f5ca58 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.default_ctools_export_tests.inc +++ b/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.default_ctools_export_tests.inc @@ -1,5 +1,9 @@ 'CTools export test data table', - 'export' => array( + 'description' => 'CTools export test data table', + 'export' => array( 'key' => 'machine', 'identifier' => 'ctools_export_test', 'default hook' => 'default_ctools_export_tests', @@ -53,7 +57,7 @@ function ctools_export_test_schema() { } /** - * Implments hook_install(); + * Implements hook_install(). */ function ctools_export_test_install() { $ctools_export_tests = array(); diff --git a/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.module b/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.module index 80f1adb..9cd803c 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.module +++ b/sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.module @@ -1,5 +1,9 @@ array( 'defaults' => array( - 'bool' => true, + 'bool' => TRUE, 'string' => 'string', 'array' => array('some value'), ), @@ -50,6 +55,11 @@ function ctools_plugin_test_ctools_plugin_type() { ); } +/** + * Plugin callback. + * + * @see ctools_plugin_test_ctools_plugin_type() + */ function ctools_plugin_test_ctools_plugin_test_big_hook_cached() { return array( 'test1' => array( @@ -59,6 +69,11 @@ function ctools_plugin_test_ctools_plugin_test_big_hook_cached() { ); } +/** + * Plugin callback. + * + * @see ctools_plugin_test_ctools_plugin_type() + */ function ctools_plugin_test_ctools_plugin_test_big_hook_not_cached() { return array( 'test1' => array( @@ -68,5 +83,18 @@ function ctools_plugin_test_ctools_plugin_test_big_hook_not_cached() { ); } -function ctools_plugin_test_hook_cached_test() {} -function ctools_plugin_test_hook_not_cached_test() {} +/** + * Callback for the big_hook_cached plugin. + * + * @see ctools_plugin_test_ctools_plugin_test_big_hook_cached + */ +function ctools_plugin_test_hook_cached_test() { +} + +/** + * Callback for the big_hook_not_cached plugin. + * + * @see ctools_plugin_test_ctools_plugin_test_big_hook_not_cached() + */ +function ctools_plugin_test_hook_not_cached_test() { +} diff --git a/sites/all/modules/contrib/dev/ctools/tests/math_expression.test b/sites/all/modules/contrib/dev/ctools/tests/math_expression.test index 730e079..b34fafb 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/math_expression.test +++ b/sites/all/modules/contrib/dev/ctools/tests/math_expression.test @@ -1,24 +1,29 @@ 'CTools math expression tests', + 'name' => 'Math expressions', 'description' => 'Test the math expression library of ctools.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } - public function setUp() { - parent::setUp('ctools', 'ctools_plugin_test'); + /** + * {@inheritdoc} + */ + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + $modules[] = 'ctools_plugin_test'; + parent::setUp($modules); } /** @@ -35,6 +40,9 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { return $this->assert(abs($first - $second) <= $delta, $message ? $message : t('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group); } + /** + * Test some arithmetic handling. + */ public function testArithmetic() { $math_expression = new ctools_math_expr(); @@ -66,10 +74,13 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { $this->assertEqual(pow($random_number_a, $random_number_b), $math_expression->e("$random_number_a ^ $random_number_b")); } + /** + * Test the basic built-in functions in the math expression library. + */ public function testBuildInFunctions() { $math_expression = new ctools_math_expr(); - // @todo: maybe run this code multiple times to test different values. + // @todo Maybe run this code multiple times to test different values. $random_double = $this->rand01(); $random_int = rand(5, 10); $this->assertFloat(sin($random_double), $math_expression->e("sin($random_double)")); @@ -94,6 +105,9 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { // $this->assertFloat(min($random_double_a, $random_double_b), $math_expression->e("min($random_double_a, $random_double_b)")); } + /** + * Test variable handling. + */ public function testVariables() { $math_expression = new ctools_math_expr(); @@ -108,6 +122,9 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { $this->assertEqual($random_number_a / $random_number_b, $math_expression->e("var / $random_number_b")); } + /** + * Test custom function handling. + */ public function testCustomFunctions() { $math_expression = new ctools_math_expr(); @@ -126,4 +143,5 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { // Use a custom function in another function. $this->assertEqual(($random_number_a * 2 + $random_number_b) * 2, $math_expression->e("f(g($random_number_a, $random_number_b))")); } + } diff --git a/sites/all/modules/contrib/dev/ctools/tests/math_expression_stack.test b/sites/all/modules/contrib/dev/ctools/tests/math_expression_stack.test index 8143a55..e1e587a 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/math_expression_stack.test +++ b/sites/all/modules/contrib/dev/ctools/tests/math_expression_stack.test @@ -1,26 +1,34 @@ 'CTools math expression stack tests', + 'name' => 'Math expressions stack', 'description' => 'Test the stack class of the math expression library.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } - public function setUp() { - parent::setUp('ctools', 'ctools_plugin_test'); + /** + * {@inheritdoc} + */ + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + $modules[] = 'ctools_plugin_test'; + parent::setUp($modules); } + /** + * Test the math expression stack system. + */ public function testStack() { $stack = new ctools_math_expr_stack(); @@ -35,13 +43,15 @@ class CtoolsMathExpressionStackTestCase extends DrupalWebTestCase { $this->assertIdentical($value, $stack->pop()); $this->assertNull($stack->pop()); - // Add multiple elements and see whether they are returned in the right order. + // Add multiple elements and see whether they are returned in the right + // order. $values = array($this->randomName(), $this->randomName(), $this->randomName()); foreach ($values as $value) { $stack->push($value); } - // Test the different elements at different positions with the last() method. + // Test the different elements at different positions with the last() + // method. $count = count($values); foreach ($values as $key => $value) { $this->assertEqual($value, $stack->last($count - $key)); @@ -58,6 +68,6 @@ class CtoolsMathExpressionStackTestCase extends DrupalWebTestCase { $this->assertEqual($stack->pop(), $value); } $this->assertNull($stack->pop()); - } + } diff --git a/sites/all/modules/contrib/dev/ctools/tests/object_cache.test b/sites/all/modules/contrib/dev/ctools/tests/object_cache.test index 8791d7e..87fa415 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/object_cache.test +++ b/sites/all/modules/contrib/dev/ctools/tests/object_cache.test @@ -1,27 +1,34 @@ 'Ctools object cache storage', + 'name' => 'Object cache storage (UI tests)', 'description' => 'Verify that objects are written, readable and lockable.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } - public function setUp() { - // Additionally enable ctools module. - parent::setUp('ctools'); + /** + * {@inheritdoc} + */ + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); } + public function testObjectStorage() { + ctools_include('cache'); + $account1 = $this->drupalCreateUser(array()); $this->drupalLogin($account1); @@ -36,11 +43,11 @@ class CtoolsObjectCache extends DrupalWebTestCase { // TODO Test object locking somehow. // Object locking/testing works on session_id but simpletest uses // $this->session_id so can't be tested ATM. - ctools_object_cache_clear('testdata', 'one'); $this->assertFalse(ctools_object_cache_get('testdata', 'one'), 'Object cache data successfully cleared'); // TODO Test ctools_object_cache_clear_all somehow... // ctools_object_cache_clear_all requires session_id funtionality as well. } + } diff --git a/sites/all/modules/contrib/dev/ctools/tests/object_cache_unit.test b/sites/all/modules/contrib/dev/ctools/tests/object_cache_unit.test new file mode 100644 index 0000000..68b7350 --- /dev/null +++ b/sites/all/modules/contrib/dev/ctools/tests/object_cache_unit.test @@ -0,0 +1,141 @@ + 'Object cache storage (unit tests)', + 'description' => 'Verify that objects are written, readable and lockable.', + 'group' => 'ctools', + 'dependencies' => array('ctools'), + ); + } + + /** + * {@inheritdoc} + */ + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); + } + + /** + * Check that the supplied array looks like a ctools cache plugin. + * + * @param mixed $p + * The value to check. + * @param string $msg + * Prefix of the assertion message. + */ + public function assertValidCachePlugin($p, $msg) { + $this->assertTrue(is_array($p), $msg . ': plugin is an array'); + + $this->assertEqual($p['plugin type'], 'cache', $msg . ': type is cache'); + + $this->assertTrue(array_key_exists('title', $p), $msg . ': title element exists'); + $this->assertTrue(!empty($p['title']) && is_string($p['title']), $msg . ': title is a string'); + + $this->assertTrue(array_key_exists('cache get', $p), $msg . ': has a get function'); + $this->assertTrue(!empty($p['cache get']) && is_callable($p['cache get']), $msg . ': get is executable'); + + $this->assertTrue(array_key_exists('cache set', $p), $msg . ': has a set function'); + $this->assertTrue(!empty($p['cache set']) && is_callable($p['cache set']), $msg . ': set is executable'); + + // @todo Clear is required by the spec (cache.inc:40..48): but export_ui + // cache doesn't implement it. Enable the assertions when that problem is + // solved. + // $this->assertTrue(array_key_exists('cache clear', $p), $msg . ': has a clear function'); + // $this->assertTrue(is_callable($p['cache clear']), $msg . ': clear is executable'); + // @todo Break is optional acc'd to spec but does anything implement it? + $this->assertTrue(!array_key_exists('cache break', $p) || is_callable($p['cache break']), $msg . ': break is executable'); + + // @todo Finalize is optional so don't fail if not there?? + $this->assertTrue(!array_key_exists('cache finalize', $p) || is_callable($p['cache finalize']), $msg . ': finalize is executable'); + } + + /** + * Check the return value of the ctools_cache_find_plugin function. + * + * @param mixed $p + * The value to check. + * @param string $msg + * Prefix of the assertion message. + */ + public function assertPluginNotFound($p, $msg) { + $this->assertTrue(is_array($p), $msg . ': is an array'); + $plugin = array_shift($p); + $this->assertNull($plugin, $msg . ': no plugin info'); + $data = array_shift($p); + $this->assertTrue(empty($data) || is_string($data), $msg . ': data string-like'); + $this->assertTrue(empty($p), $msg . ': just two elements'); + } + + /** + * Check the return value of the ctools_cache_find_plugin function. + * + * @param mixed $p + * The value to check. + * @param string $msg + * Prefix of the assertion message. + */ + public function assertPluginFound($p, $msg) { + $this->assertTrue(is_array($p), $msg . ': is an array'); + $plugin = array_shift($p); + $this->assertTrue(is_array($plugin), $msg . ': has plugin data'); + $data = array_shift($p); + $this->assertTrue(empty($data) || is_string($data), $msg . ': data is string-like'); + $this->assertTrue(empty($p), $msg . ': just two elements'); + } + + /** + * Test to see that we can find the standard simple plugin. + */ + public function testFindSimpleCachePlugin() { + ctools_include('cache'); + + // The simple plugin. + $plugin = ctools_cache_find_plugin('simple'); + $this->assertPluginFound($plugin, 'The Simple Cache plugin is present'); + $this->assertValidCachePlugin($plugin[0], 'The Simple Cache plugin'); + + // The simple plugin, with ::. + $plugin = ctools_cache_find_plugin('simple::data'); + $this->assertPluginFound($plugin, 'The Simple Cache plugin is present, with data'); + } + + /** + * Test to see that we can find the standard export_ui plugin. + */ + public function testFindExportUICachePlugin() { + ctools_include('cache'); + + // The export plugin. + $plugin = ctools_cache_find_plugin('export_ui'); + $this->assertPluginFound($plugin, 'The Export UI Cache plugin is present'); + $this->assertValidCachePlugin($plugin[0], 'The Export Cache plugin'); + + // The export plugin, with ::. + $plugin = ctools_cache_find_plugin('export_ui::data'); + $this->assertTrue(is_array($plugin), 'The Export UI Cache plugin is present, with data'); + } + + /** + * Test to see that we don't find plugins that aren't there. + */ + public function testFindFoobarbazCachePlugin() { + ctools_include('cache'); + + // An imaginary foobarbaz plugin. + $plugin = ctools_cache_find_plugin('foobarbaz'); + $this->assertPluginNotFound($plugin, 'The Foobarbaz Cache plugin is absent'); + $plugin = ctools_cache_find_plugin('foobarbaz::data'); + $this->assertPluginNotFound($plugin, 'The Foobarbaz Cache plugin is absent, with data'); + } + +} diff --git a/sites/all/modules/contrib/dev/ctools/tests/page_tokens.test b/sites/all/modules/contrib/dev/ctools/tests/page_tokens.test new file mode 100644 index 0000000..7d95d9a --- /dev/null +++ b/sites/all/modules/contrib/dev/ctools/tests/page_tokens.test @@ -0,0 +1,136 @@ + 'Page token processing', + 'description' => 'Verify that page tokens can be set and read.', + 'group' => 'ctools', + 'dependencies' => array('ctools'), + ); + } + + /** + * {@inheritdoc} + */ + public function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); + + // Start each test anew. + ctools_reset_page_tokens(); + } + + /** + * Test that we can set page tokens. + */ + public function testSetPageToken() { + ctools_set_page_token('id', 'variable', 'test'); + + $tokens = ctools_set_page_token(); + $this->assertTrue(is_array($tokens) && count($tokens) === 1, 'Page tokens no longer empty.'); + $this->assertEqual($tokens['id'], array('variable', 'test'), 'Page token has correct value.'); + } + + /** + * Test that we can set page tokens. + */ + public function testSetVariableToken() { + $string = ctools_set_variable_token('title'); + $tokens = ctools_set_page_token(); + + $this->assertTrue(is_array($tokens) && count($tokens) === 1, 'Page tokens no longer empty'); + $this->assertEqual($tokens[$string], array('variable', 'title'), 'Page tokens no longer empty'); + } + + /** + * Test that we can set page tokens. + */ + public function testReplaceVariableToken() { + $string = ctools_set_variable_token('title'); + $this->assertEqual($string, '', 'Expected form of token was found'); + + $elements = array( + '#type' => 'container', + '#attributes' => array('class' => array('test')), + 'title' => '
Title
', + 'content' => array( + '#type' => 'markup', + '#markup' => t('This is my test markup'), + '#prefix' => $string, + ), + 'link' => array( + '#type' => 'link', + '#title' => t('My link'), + '#href' => 'node/1', + ), + ); + $markup = 'This is my test markupMy link
';
+
+ $new_markup = ctools_page_token_processing($markup, $elements);
+
+ $this->assertTrue(is_string($new_markup) && strlen($new_markup) > 1, 'Should return string');
+
+ $this->assertTrue(strstr($new_markup, ''), 'Variable Token Markup should contain h2 element');
+ $this->assertFalse(strstr($new_markup, 'ctools-page-title'), 'Variable Token Markup should not contain comment element');
+ }
+
+ /**
+ * Test that we can set page tokens.
+ */
+ public function testReplaceCallbackToken() {
+ $string = ctools_set_callback_token('title', 'test_ctools_page_callback_token');
+ $this->assertEqual($string, '', 'Expected form of token was found');
+
+ $elements = array(
+ '#type' => 'container',
+ '#attributes' => array('class' => array('test')),
+ 'content' => array(
+ '#type' => 'markup',
+ '#markup' => t('This is my test markup'),
+ '#prefix' => $string,
+ ),
+ 'link' => array(
+ '#type' => 'link',
+ '#title' => t('My link'),
+ '#href' => 'node/1',
+ ),
+ );
+ $markup = 'This is my test markupMy link';
+
+ $new_markup = ctools_page_token_processing($markup, $elements);
+
+ $this->assertTrue(is_string($new_markup) && strlen($new_markup) > 1, 'Should return a non-empty string');
+
+ $this->assertTrue(strstr($new_markup, ''), 'Callback Token Markup should contain h2 element');
+ $this->assertFalse(strstr($new_markup, 'ctools-page-title'), 'Callback Token Markup should not contain comment element');
+ }
+
+}
+
+/**
+ *
+ * @param $elements
+ *
+ * @return string
+ */
+function test_ctools_page_callback_token($elements) {
+ // Check that 'elements' array looks good.
+ if (isset($elements['content'])) {
+ return 'Title
';
+ }
+ else {
+ return '';
+ }
+}
diff --git a/sites/all/modules/contrib/dev/ctools/tests/plugins/cached/ctoolsCachedPluginArray.class.php b/sites/all/modules/contrib/dev/ctools/tests/plugins/cached/ctoolsCachedPluginArray.class.php
index 3037daa..c6753ad 100644
--- a/sites/all/modules/contrib/dev/ctools/tests/plugins/cached/ctoolsCachedPluginArray.class.php
+++ b/sites/all/modules/contrib/dev/ctools/tests/plugins/cached/ctoolsCachedPluginArray.class.php
@@ -1,7 +1,8 @@
$context_info) {
if (!strpos($context_info, '.')) {
- // old skool: support pre-converter contexts as well.
+ // Old skool: support pre-converter contexts as well.
$cid = $context_info;
$converter = '';
}
@@ -150,7 +150,7 @@ function views_content_views_content_type_render($subtype, $conf, $panel_args, $
$block = new stdClass();
$block->module = 'views';
- $block->delta = $view->name . '-' . $view->current_display;
+ $block->delta = $view->name . '-' . $view->current_display;
if (!empty($conf['link_to_view'])) {
$block->title_link = $view->get_url();
@@ -165,7 +165,7 @@ function views_content_views_content_type_render($subtype, $conf, $panel_args, $
// pager type that Views uses.
if ($conf['override_pager_settings']) {
if (method_exists($view, 'init_pager')) {
- // Views 3 version
+ // Views 3 version.
$view->set_items_per_page($conf['nodes_per_page']);
$view->set_offset($conf['offset']);
@@ -237,7 +237,7 @@ function views_content_views_select_display($form, &$form_state) {
'#type' => 'select',
'#title' => t('Display'),
'#options' => $displays,
- '#description' => t('Choose which display of this view you wish to use.')
+ '#description' => t('Choose which display of this view you wish to use.'),
);
return $form;
@@ -271,7 +271,6 @@ function views_content_views_content_type_edit_form($form, &$form_state) {
// and check for that and forcibly set them to the right converter so that
// it doesn't get changed to some whacky default. Oooor just let it get changed
// to 'no context', I suppose.
-
$required = array();
if (isset($view->display_handler) && $arguments = $view->display_handler->get_handlers('argument')) {
foreach ($arguments as $arg) {
@@ -434,7 +433,7 @@ function views_content_views_content_type_admin_info($subtype, $conf, $contexts)
}
if (!strpos($context_info, '.')) {
- // old skool: support pre-converter contexts as well.
+ // Old skool: support pre-converter contexts as well.
$cid = $context_info;
$converter = '';
}
@@ -446,8 +445,10 @@ function views_content_views_content_type_admin_info($subtype, $conf, $contexts)
$converters = ctools_context_get_converters($cid . '.', $contexts[$cid]);
$converter = !empty($converters[$context_info]) ? $converters[$context_info] : t('Default');
$block->content .= '
Title
'; + } + else { + return ''; + } +} diff --git a/sites/all/modules/contrib/dev/ctools/tests/plugins/cached/ctoolsCachedPluginArray.class.php b/sites/all/modules/contrib/dev/ctools/tests/plugins/cached/ctoolsCachedPluginArray.class.php index 3037daa..c6753ad 100644 --- a/sites/all/modules/contrib/dev/ctools/tests/plugins/cached/ctoolsCachedPluginArray.class.php +++ b/sites/all/modules/contrib/dev/ctools/tests/plugins/cached/ctoolsCachedPluginArray.class.php @@ -1,7 +1,8 @@ $context_info) { if (!strpos($context_info, '.')) { - // old skool: support pre-converter contexts as well. + // Old skool: support pre-converter contexts as well. $cid = $context_info; $converter = ''; } @@ -150,7 +150,7 @@ function views_content_views_content_type_render($subtype, $conf, $panel_args, $ $block = new stdClass(); $block->module = 'views'; - $block->delta = $view->name . '-' . $view->current_display; + $block->delta = $view->name . '-' . $view->current_display; if (!empty($conf['link_to_view'])) { $block->title_link = $view->get_url(); @@ -165,7 +165,7 @@ function views_content_views_content_type_render($subtype, $conf, $panel_args, $ // pager type that Views uses. if ($conf['override_pager_settings']) { if (method_exists($view, 'init_pager')) { - // Views 3 version + // Views 3 version. $view->set_items_per_page($conf['nodes_per_page']); $view->set_offset($conf['offset']); @@ -237,7 +237,7 @@ function views_content_views_select_display($form, &$form_state) { '#type' => 'select', '#title' => t('Display'), '#options' => $displays, - '#description' => t('Choose which display of this view you wish to use.') + '#description' => t('Choose which display of this view you wish to use.'), ); return $form; @@ -271,7 +271,6 @@ function views_content_views_content_type_edit_form($form, &$form_state) { // and check for that and forcibly set them to the right converter so that // it doesn't get changed to some whacky default. Oooor just let it get changed // to 'no context', I suppose. - $required = array(); if (isset($view->display_handler) && $arguments = $view->display_handler->get_handlers('argument')) { foreach ($arguments as $arg) { @@ -434,7 +433,7 @@ function views_content_views_content_type_admin_info($subtype, $conf, $contexts) } if (!strpos($context_info, '.')) { - // old skool: support pre-converter contexts as well. + // Old skool: support pre-converter contexts as well. $cid = $context_info; $converter = ''; } @@ -446,8 +445,10 @@ function views_content_views_content_type_admin_info($subtype, $conf, $contexts) $converters = ctools_context_get_converters($cid . '.', $contexts[$cid]); $converter = !empty($converters[$context_info]) ? $converters[$context_info] : t('Default'); $block->content .= '',
);
@@ -549,7 +558,7 @@ function views_content_views_panes_content_type_edit_form($form, &$form_state) {
$form['exposed']['sort_order'] = $exposed_form['sort_order'];
}
- // Add the view object to the form to allow additional customization
+ // Add the view object to the form to allow additional customization.
$form_state['view'] = $view;
return $form;
@@ -561,7 +570,8 @@ function views_content_views_panes_content_type_edit_form($form, &$form_state) {
function views_content_views_panes_content_type_edit_form_submit(&$form, &$form_state) {
// Copy everything from our defaults.
$keys = array('link_to_view', 'more_link', 'feed_icons', 'use_pager',
- 'pager_id', 'items_per_page', 'offset', 'path_override', 'path', 'arguments', 'fields_override', 'exposed');
+ 'pager_id', 'items_per_page', 'offset', 'path_override', 'path', 'arguments', 'fields_override', 'exposed',
+ );
foreach ($keys as $key) {
if (isset($form_state['values'][$key])) {
@@ -570,7 +580,6 @@ function views_content_views_panes_content_type_edit_form_submit(&$form, &$form_
}
}
-
/**
* Returns the administrative title for a type.
*/
@@ -605,21 +614,21 @@ function views_content_views_panes_content_type_admin_info($subtype, $conf, $con
$view->set_display($display_name);
views_content_views_panes_add_defaults($conf, $view);
- // Add arguments first
+ // Add arguments first.
if (!empty($conf['arguments'])) {
$keys = array_keys($conf['arguments']);
$values = array_values($conf['arguments']);
$argument_input = $view->display_handler->get_option('argument_input');
foreach ($conf['arguments'] as $key => $value) {
- if (!empty($value)){
+ if (!empty($value)) {
$label = $argument_input[$key]['label'];
$info[] = $label . ': ' . $value;
}
}
}
- $block = new stdClass;
+ $block = new stdClass();
if ($info) {
$block->title = array_shift($info);
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_row.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_row.inc
index 9672d02..16b97dc 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_row.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_row.inc
@@ -35,7 +35,7 @@ function views_content_views_row_content_type_render($subtype, $conf, $panel_arg
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_row';
$block->delta = $context->argument;
$block->title = '';
@@ -91,7 +91,7 @@ function views_content_views_row_content_type_render($subtype, $conf, $panel_arg
'view' => $view,
'options' => $plugin->options,
'rows' => $rows,
- 'title' => $title
+ 'title' => $title,
)
);
}
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_view.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_view.inc
index dfb1175..54eec08 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_view.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_view.inc
@@ -22,7 +22,7 @@ function views_content_views_view_content_type_render($subtype, $conf, $panel_ar
}
// Build the content type block.
- $block = new stdClass();
+ $block = new stdClass();
$block->module = 'views_view';
$block->delta = $context->argument;
$block->title = '';
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/contexts/view.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/contexts/view.inc
index 1e926e4..6380478 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/contexts/view.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/contexts/view.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Plugin to provide a node context. A node context is a node wrapped in a
* context object that can be utilized by anything that accepts contexts.
*/
@@ -88,7 +87,7 @@ function views_content_context_view_create($empty, $data = NULL, $conf = FALSE,
$data->set_display($display_id);
}
}
- else if (!empty($plugin['view name'])) {
+ elseif (!empty($plugin['view name'])) {
$data = views_get_view($plugin['view name']);
$data->set_display($plugin['view display id']);
}
@@ -101,7 +100,7 @@ function views_content_context_view_create($empty, $data = NULL, $conf = FALSE,
// $output = views_content_context_get_output($context);
// $view = $output['view'];
// @endcode
- $context->data = array(
+ $context->data = array(
'name' => $data->name,
'display' => $data->current_display,
'args' => $data->args,
@@ -158,8 +157,7 @@ function views_content_context_view_settings_form_validate($form, &$form_state)
* Provide a list of ways that this context can be converted to a string.
*/
function views_content_context_view_convert_list() {
- $list = array(
- );
+ $list = array();
return $list;
}
@@ -171,4 +169,3 @@ function views_content_context_view_convert($context, $type) {
switch ($type) {
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/relationships/node_from_view.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/relationships/node_from_view.inc
index 0f3fa8e..f54cbc6 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/relationships/node_from_view.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/relationships/node_from_view.inc
@@ -33,7 +33,7 @@ function views_content_node_from_view_context($context, $conf, $placeholder = FA
views_content_context_get_output($context);
$row = intval($conf['row']) - 1;
- if (isset($view->result[$row])) {
+ if (isset($view->result[$row]) && isset($view->base_field) && isset($view->result[$row]->{$view->base_field})) {
$nid = $view->result[$row]->{$view->base_field};
if ($nid) {
$node = node_load($nid);
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/relationships/view_from_argument.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/relationships/view_from_argument.inc
index cefc6db..cabd329 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/relationships/view_from_argument.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/relationships/view_from_argument.inc
@@ -73,7 +73,7 @@ function views_content_view_from_argument_context($contexts, $conf) {
foreach ($data->display_handler->get_argument_input() as $id => $argument) {
if ($argument['type'] == 'context') {
$key = array_shift($context_keys);
- if (isset($contexts [$key])) {
+ if (isset($contexts[$key])) {
if (strpos($argument['context'], '.')) {
list($context, $converter) = explode('.', $argument['context'], 2);
$args[] = ctools_context_convert_context($contexts[$key], $converter, array('sanitize' => FALSE));
@@ -84,7 +84,7 @@ function views_content_view_from_argument_context($contexts, $conf) {
}
}
}
- // remove any trailing NULL arguments as these are non-args:
+ // Remove any trailing NULL arguments as these are non-args:
while (count($args) && end($args) === NULL) {
array_pop($args);
}
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content.views.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content.views.inc
index 644ac54..20b65a2 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content.views.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content.views.inc
@@ -6,7 +6,7 @@
*/
/**
- * Implements hook_views_plugins
+ * Implements hook_views_plugins().
*/
function views_content_views_plugins() {
return array(
@@ -25,7 +25,7 @@ function views_content_views_plugins() {
'use more' => TRUE,
'accept attachments' => TRUE,
'help topic' => 'display-pane',
- 'contextual links locations' => array('panel_pane'),
+ 'contextual links locations' => array('panel_pane', 'view'),
),
'ctools_context' => array(
'title' => t('Context'),
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_ctools_context.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_ctools_context.inc
index 967f2fa..87ee291 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_ctools_context.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_ctools_context.inc
@@ -1,4 +1,5 @@
'', 'translatable' => TRUE);
@@ -47,12 +53,13 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
/**
* The display block handler returns the structure necessary for a block.
*/
- function execute() {
+ public function execute() {
$this->executing = TRUE;
return $this->view->render();
}
- function preview() {
+
+ public function preview() {
$this->previewing = TRUE;
return $this->view->render();
}
@@ -60,7 +67,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
/**
* Render this display.
*/
- function render() {
+ public function render() {
if (!empty($this->previewing)) {
return theme($this->theme_functions(), array('view' => $this->view));
}
@@ -71,7 +78,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
$hooks = theme_get_registry();
$info = $hooks[$this->definition['theme']];
if (!empty($info['file'])) {
- @include_once('./' . $info['path'] . '/' . $info['file']);
+ @include_once './' . $info['path'] . '/' . $info['file'];
}
$this->variables = array('view' => &$this->view);
@@ -92,7 +99,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
*
* This output is returned as an array.
*/
- function options_summary(&$categories, &$options) {
+ public function options_summary(&$categories, &$options) {
// It is very important to call the parent function here:
parent::options_summary($categories, $options);
@@ -135,7 +142,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_form($form, $form_state);
switch ($form_state['section']) {
@@ -143,6 +150,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
// This just overwrites the existing row_plugin which is using the wrong options.
$form['row_plugin']['#options'] = views_fetch_plugin_names('row', 'normal', array($this->view->base_table));
break;
+
case 'admin_title':
$form['#title'] .= t('Administrative title');
@@ -152,6 +160,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
'#description' => t('This is the title that will appear for this view context in the configure context dialog. If left blank, the view name will be used.'),
);
break;
+
case 'inherit_panels_path':
$form['#title'] .= t('Inherit path from panel display');
@@ -162,6 +171,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
'#description' => t('If yes, all links generated by Views, such as more links, summary links, and exposed input links will go to the panels display path, not the view, if the display has a path.'),
);
break;
+
case 'argument_input':
$form['#title'] .= t('Choose the data source for view arguments');
$argument_input = $this->get_argument_input();
@@ -216,7 +226,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ public function options_submit(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
@@ -234,7 +244,7 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
* the arguments doesn't cause the argument input field to just
* break.
*/
- function get_argument_input() {
+ public function get_argument_input() {
$arguments = $this->get_option('argument_input');
$handlers = $this->get_handlers('argument');
@@ -260,7 +270,8 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
return $output;
}
- function get_path() {
+
+ public function get_path() {
if ($this->get_option('link_display') == 'custom_url' && $override_path = $this->get_option('link_url')) {
return $override_path;
}
@@ -269,4 +280,5 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
}
return parent::get_path();
}
+
}
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_panel_pane.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
index e02f896..05d3478 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
@@ -8,10 +8,11 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
* If this variable is true, this display counts as a panel pane. We use
* this variable so that other modules can create alternate pane displays.
*/
- var $panel_pane_display = TRUE;
- var $has_pane_conf = NULL;
+ public $panel_pane_display = TRUE;
+ public $has_pane_conf = NULL;
- function option_definition() {
+
+ public function option_definition() {
$options = parent::option_definition();
$options['pane_title'] = array('default' => '', 'translatable' => TRUE);
@@ -34,7 +35,7 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
'title_override' => array('default' => FALSE),
'exposed_form' => array('default' => FALSE),
'fields_override' => array('default' => FALSE),
- ),
+ ),
);
$options['argument_input'] = array('default' => array());
@@ -44,11 +45,13 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
return $options;
}
- function has_pane_conf() {
+
+ public function has_pane_conf() {
return isset($this->has_pane_conf);
}
- function set_pane_conf($conf = array()) {
+
+ public function set_pane_conf($conf = array()) {
$this->set_option('pane_conf', $conf);
$this->has_pane_conf = TRUE;
}
@@ -58,7 +61,7 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
*
* This output is returned as an array.
*/
- function options_summary(&$categories, &$options) {
+ public function options_summary(&$categories, &$options) {
// It is very important to call the parent function here:
parent::options_summary($categories, $options);
@@ -147,7 +150,7 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_form($form, $form_state);
@@ -177,6 +180,7 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
'#options' => $options,
);
break;
+
case 'pane_title':
$form['#title'] .= t('Administrative title');
@@ -318,7 +322,7 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ public function options_submit(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
@@ -340,7 +344,7 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
* the arguments doesn't cause the argument input field to just
* break.
*/
- function get_argument_input() {
+ public function get_argument_input() {
$arguments = $this->get_option('argument_input');
$handlers = $this->get_handlers('argument');
@@ -368,7 +372,8 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
return $output;
}
- function use_more() {
+
+ public function use_more() {
$allow = $this->get_option('allow');
if (!$allow['more_link'] || !$this->has_pane_conf()) {
return parent::use_more();
@@ -377,21 +382,24 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
return (bool) $conf['more_link'];
}
- function get_path() {
+
+ public function get_path() {
if (empty($this->view->override_path)) {
return parent::get_path();
}
return $this->view->override_path;
}
- function get_url() {
+
+ public function get_url() {
if ($this->get_option('inherit_panels_path')) {
return $this->get_path();
}
return parent::get_url();
}
- function uses_exposed_form_in_block() {
+
+ public function uses_exposed_form_in_block() {
// We'll always allow the exposed form in a block, regardless of path.
return TRUE;
}
@@ -405,7 +413,7 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
* returns, exposed filters will not be used nor
* displayed unless uses_exposed() returns TRUE.
*/
- function displays_exposed() {
+ public function displays_exposed() {
$conf = $this->get_option('allow');
// If this is set, the exposed form is part of pane configuration, not
// rendered normally.
@@ -413,4 +421,3 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
}
}
-
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_style_ctools_context.inc b/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_style_ctools_context.inc
index aafbebc..ea5323c 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_style_ctools_context.inc
+++ b/sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_style_ctools_context.inc
@@ -1,4 +1,5 @@
view->display_handler->previewing)) {
return parent::render();
}
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/views_content.info b/sites/all/modules/contrib/dev/ctools/views_content/views_content.info
index be82084..68f4d87 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/views_content.info
+++ b/sites/all/modules/contrib/dev/ctools/views_content/views_content.info
@@ -5,14 +5,12 @@ dependencies[] = ctools
dependencies[] = views
core = 7.x
package = Chaos tool suite
-version = CTOOLS_MODULE_VERSION
files[] = plugins/views/views_content_plugin_display_ctools_context.inc
files[] = plugins/views/views_content_plugin_display_panel_pane.inc
files[] = plugins/views/views_content_plugin_style_ctools_context.inc
-; Information added by Drupal.org packaging script on 2015-01-28
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2019-02-08
+version = "7.x-1.15"
core = "7.x"
project = "ctools"
-datestamp = "1422471484"
-
+datestamp = "1549603691"
diff --git a/sites/all/modules/contrib/dev/ctools/views_content/views_content.module b/sites/all/modules/contrib/dev/ctools/views_content/views_content.module
index 27a666a..264408a 100644
--- a/sites/all/modules/contrib/dev/ctools/views_content/views_content.module
+++ b/sites/all/modules/contrib/dev/ctools/views_content/views_content.module
@@ -1,8 +1,7 @@
t('Entity property or field (via Entity Metadata Wrapper)'),
+ 'description' => t('Creates any kind of context for entity properties and fields.'),
+ 'context' => 'entity_entity_property_context',
+ 'required context' => new ctools_context_required(t('Entity'), 'entity'),
+ 'edit form' => 'entity_entity_property_edit_form',
+ 'edit form validate' => 'entity_entity_property_edit_form_validate',
+ 'defaults' => array(
+ 'selector' => '',
+ 'target_context' => 'entity',
+ 'concatenator' => ','
+ ),
+);
+
+/**
+ * Return a new context based on an existing context.
+ */
+function entity_entity_property_context($context, $conf) {
+ $plugin = $conf['name'];
+
+ // If unset it wants a generic, unfilled context, which is just NULL.
+ if (empty($context->data)) {
+ return ctools_context_create_empty(isset($conf['target_context']) ? $conf['target_context'] : 'entity', NULL);
+ }
+
+ list($part1, $entity_type) = explode(':', $context->plugin);
+
+ if (isset($context->data) && $entity = $context->data) {
+ // Apply the selector.
+ $wrapper = entity_metadata_wrapper($entity_type, $entity);
+ $parts = explode(':', $conf['selector']);
+
+ try {
+ foreach ($parts as $part) {
+ if (!($wrapper instanceof EntityStructureWrapper || $wrapper instanceof EntityListWrapper)) {
+ $wrapper = NULL;
+ $value = NULL;
+ continue;
+ }
+ $wrapper = $wrapper->get($part);
+ }
+ }
+ catch (EntityMetadataWrapperException $e) {
+ $wrapper = NULL;
+ $value = NULL;
+ }
+
+ if (isset($wrapper)) {
+ $value = $wrapper->value();
+ }
+
+ // Massage list values.
+ if ($wrapper instanceof EntityListWrapper) {
+ $value = $wrapper[0]->value();
+ $argument = implode($conf['concatenator'], $wrapper->value(array('identifier' => TRUE)));
+ }
+ elseif ($wrapper instanceof EntityDrupalWrapper) {
+ $argument = $wrapper->getIdentifier();
+ }
+
+ // Bail out if we were unable to retrieve the value.
+ if (!isset($value)) {
+ return ctools_context_create_empty(isset($conf['target_context']) ? $conf['target_context'] : 'entity', NULL);
+ }
+
+ $context = ctools_context_create($conf['target_context'], $value);
+ // Provide a suiting argument if context is used as argument.
+ if (isset($argument)) {
+ $context->argument = $argument;
+ }
+ return $context;
+ }
+}
+
+function entity_entity_property_edit_form($form, &$form_state) {
+ $conf = $form_state['conf'];
+
+ $form['selector'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Data selector'),
+ '#description' => t('Any valid data selector, e.g. "title" to select a node\'s title, or "field_tags:1" to select the second tag.'),
+ '#default_value' => $conf['selector'],
+ '#required' => TRUE,
+ );
+ $form['concatenator'] = array(
+ '#title' => t('Concatenator (if multiple)'),
+ '#type' => 'select',
+ '#options' => array(',' => ', (AND)', '+' => '+ (OR)'),
+ '#default_value' => $conf['concatenator'],
+ '#prefix' => '';
+ }
}
diff --git a/sites/all/modules/contrib/dev/entity/tests/entity_feature.info b/sites/all/modules/contrib/dev/entity/tests/entity_feature.info
index 051ff00..524fdfa 100644
--- a/sites/all/modules/contrib/dev/entity/tests/entity_feature.info
+++ b/sites/all/modules/contrib/dev/entity/tests/entity_feature.info
@@ -6,9 +6,9 @@ files[] = entity_feature.module
dependencies[] = entity_test
hidden = TRUE
-; Information added by Drupal.org packaging script on 2014-04-08
-version = "7.x-1.5"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1396975454"
+datestamp = "1518620551"
diff --git a/sites/all/modules/contrib/dev/entity/tests/entity_test.info b/sites/all/modules/contrib/dev/entity/tests/entity_test.info
index c807506..b7cceab 100644
--- a/sites/all/modules/contrib/dev/entity/tests/entity_test.info
+++ b/sites/all/modules/contrib/dev/entity/tests/entity_test.info
@@ -7,9 +7,9 @@ files[] = entity_test.install
dependencies[] = entity
hidden = TRUE
-; Information added by Drupal.org packaging script on 2014-04-08
-version = "7.x-1.5"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1396975454"
+datestamp = "1518620551"
diff --git a/sites/all/modules/contrib/dev/entity/tests/entity_test.install b/sites/all/modules/contrib/dev/entity/tests/entity_test.install
index 42ba4b6..a969323 100644
--- a/sites/all/modules/contrib/dev/entity/tests/entity_test.install
+++ b/sites/all/modules/contrib/dev/entity/tests/entity_test.install
@@ -51,8 +51,14 @@ function entity_test_schema() {
'uid' => array('uid'),
),
'foreign keys' => array(
- 'uid' => array('users' => 'uid'),
- 'name' => array('entity_test_types' => 'name'),
+ 'uid' => array(
+ 'table' => 'users',
+ 'columns' => array('uid' => 'uid')
+ ),
+ 'name' => array(
+ 'table' => 'entity_test_types',
+ 'columns' => array('name' => 'name')
+ ),
),
'primary key' => array('pid'),
);
diff --git a/sites/all/modules/contrib/dev/entity/tests/entity_test.module b/sites/all/modules/contrib/dev/entity/tests/entity_test.module
index 5585568..727797a 100644
--- a/sites/all/modules/contrib/dev/entity/tests/entity_test.module
+++ b/sites/all/modules/contrib/dev/entity/tests/entity_test.module
@@ -2,7 +2,7 @@
/**
* @file
- * Test moduel for the entity API.
+ * Test module for the entity API.
*/
/**
diff --git a/sites/all/modules/contrib/dev/entity/tests/entity_test_i18n.info b/sites/all/modules/contrib/dev/entity/tests/entity_test_i18n.info
index af304d5..4ca048a 100644
--- a/sites/all/modules/contrib/dev/entity/tests/entity_test_i18n.info
+++ b/sites/all/modules/contrib/dev/entity/tests/entity_test_i18n.info
@@ -5,9 +5,9 @@ dependencies[] = i18n_string
package = Multilingual - Internationalization
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2014-04-08
-version = "7.x-1.5"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1396975454"
+datestamp = "1518620551"
diff --git a/sites/all/modules/contrib/dev/entity/theme/entity.theme.inc b/sites/all/modules/contrib/dev/entity/theme/entity.theme.inc
index d365996..fc0ba7c 100644
--- a/sites/all/modules/contrib/dev/entity/theme/entity.theme.inc
+++ b/sites/all/modules/contrib/dev/entity/theme/entity.theme.inc
@@ -80,9 +80,12 @@ function template_preprocess_entity_property(&$variables, $hook) {
);
// Populate the content with sensible defaults.
- if (!isset($variables['content'])) {
+ if (!isset($element['#content'])) {
$variables['content'] = entity_property_default_render_value_by_type($element['#entity_wrapped']->{$element['#property_name']});
}
+ else {
+ $variables['content'] = $element['#content'];
+ }
}
/**
@@ -169,7 +172,7 @@ function template_preprocess_entity(&$variables) {
$variables['title'] = check_plain(entity_label($entity_type, $entity));
$uri = entity_uri($entity_type, $entity);
- $variables['url'] = $uri ? url($uri['path'], $uri['options']) : FALSE;
+ $variables['url'] = $uri && !empty($uri['path']) ? url($uri['path'], $uri['options']) : FALSE;
if (isset($variables['elements']['#page'])) {
// If set by the caller, respect the page property.
@@ -177,7 +180,7 @@ function template_preprocess_entity(&$variables) {
}
else {
// Else, try to automatically detect it.
- $variables['page'] = $uri && $uri['path'] == $_GET['q'];
+ $variables['page'] = $uri && !empty($uri['path']) && $uri['path'] == $_GET['q'];
}
// Helpful $content variable for templates.
diff --git a/sites/all/modules/contrib/dev/entity/views/entity.views.inc b/sites/all/modules/contrib/dev/entity/views/entity.views.inc
index 59ebaa4..a0179c0 100644
--- a/sites/all/modules/contrib/dev/entity/views/entity.views.inc
+++ b/sites/all/modules/contrib/dev/entity/views/entity.views.inc
@@ -605,6 +605,28 @@ class EntityDefaultViewsController {
);
break;
+ case 'duration':
+ $return += $description + array(
+ 'field' => array(
+ 'real field' => $views_field_name,
+ 'handler' => 'entity_views_handler_field_duration',
+ 'click sortable' => TRUE,
+ ),
+ 'sort' => array(
+ 'real field' => $views_field_name,
+ 'handler' => 'views_handler_sort',
+ ),
+ 'filter' => array(
+ 'real field' => $views_field_name,
+ 'handler' => 'views_handler_filter_numeric',
+ ),
+ 'argument' => array(
+ 'real field' => $views_field_name,
+ 'handler' => 'views_handler_argument_numeric',
+ ),
+ );
+ break;
+
case 'uri':
$return += $description + array(
'field' => array(
diff --git a/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_field_handler_helper.inc b/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_field_handler_helper.inc
index 0077f4a..6bb4fbf 100644
--- a/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_field_handler_helper.inc
+++ b/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_field_handler_helper.inc
@@ -18,7 +18,7 @@ class EntityFieldHandlerHelper {
* Provide appropriate default options for a handler.
*/
public static function option_definition($handler) {
- if (entity_property_list_extract_type($handler->definition['type'])) {
+ if (isset($handler->definition['type']) && entity_property_list_extract_type($handler->definition['type'])) {
$options['list']['contains']['mode'] = array('default' => 'collapse');
$options['list']['contains']['separator'] = array('default' => ', ');
$options['list']['contains']['type'] = array('default' => 'ul');
@@ -32,7 +32,7 @@ class EntityFieldHandlerHelper {
* Provide an appropriate default option form for a handler.
*/
public static function options_form($handler, &$form, &$form_state) {
- if (entity_property_list_extract_type($handler->definition['type'])) {
+ if (isset($handler->definition['type']) && entity_property_list_extract_type($handler->definition['type'])) {
$form['list']['mode'] = array(
'#type' => 'select',
'#title' => t('List handling'),
diff --git a/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_handler_area_entity.inc b/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_handler_area_entity.inc
index f374694..0c5b714 100644
--- a/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_handler_area_entity.inc
+++ b/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_handler_area_entity.inc
@@ -40,7 +40,7 @@ class entity_views_handler_area_entity extends views_handler_area {
$form['entity_id'] = array(
'#type' => 'textfield',
'#title' => t('Entity id'),
- '#description' => t('Choose the entity you want to display in the area.'),
+ '#description' => t('Choose the entity you want to display in the area. To render an entity given by a contextual filter use "%1" for the first argument, "%2" for the second, etc.'),
'#default_value' => $this->options['entity_id'],
);
@@ -105,6 +105,9 @@ class entity_views_handler_area_entity extends views_handler_area {
* Render an entity using the view mode.
*/
public function render_entity($entity_type, $entity_id, $view_mode) {
+ $tokens = $this->get_render_tokens();
+ // Replace argument tokens in entity id.
+ $entity_id = strtr($entity_id, $tokens);
if (!empty($entity_type) && !empty($entity_id) && !empty($view_mode)) {
$entity = entity_load_single($entity_type, $entity_id);
if (!empty($this->options['bypass_access']) || entity_access('view', $entity_type, $entity)) {
@@ -117,4 +120,31 @@ class entity_views_handler_area_entity extends views_handler_area {
return '';
}
}
+
+ /**
+ * Get the 'render' tokens to use for advanced rendering.
+ *
+ * This runs through all of the fields and arguments that
+ * are available and gets their values. This will then be
+ * used in one giant str_replace().
+ */
+ function get_render_tokens() {
+ $tokens = array();
+ if (!empty($this->view->build_info['substitutions'])) {
+ $tokens = $this->view->build_info['substitutions'];
+ }
+ $count = 0;
+ foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+ $token = '%' . ++$count;
+ if (!isset($tokens[$token])) {
+ $tokens[$token] = '';
+ }
+ // Use strip tags as there should never be HTML in the path.
+ // However, we need to preserve special characters like " that
+ // were removed by check_plain().
+ $tokens['%' . $count] = $handler->argument;
+ }
+
+ return $tokens;
+ }
}
diff --git a/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_handler_relationship_by_bundle.inc b/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_handler_relationship_by_bundle.inc
index 55b0fc2..a4d09d3 100644
--- a/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_handler_relationship_by_bundle.inc
+++ b/sites/all/modules/contrib/dev/entity/views/handlers/entity_views_handler_relationship_by_bundle.inc
@@ -93,7 +93,7 @@ class entity_views_handler_relationship_by_bundle extends views_handler_relation
$def['extra'] = array(
array(
// The table and the IN operator are implicit.
- 'field' => $entity_info['bundle keys']['bundle'],
+ 'field' => $entity_info['entity keys']['bundle'],
'value' => $this->options['bundle_types'],
),
);
diff --git a/sites/all/modules/contrib/dev/entity/views/plugins/entity_views_plugin_row_entity_view.inc b/sites/all/modules/contrib/dev/entity/views/plugins/entity_views_plugin_row_entity_view.inc
index db72b5f..5e738a8 100644
--- a/sites/all/modules/contrib/dev/entity/views/plugins/entity_views_plugin_row_entity_view.inc
+++ b/sites/all/modules/contrib/dev/entity/views/plugins/entity_views_plugin_row_entity_view.inc
@@ -88,6 +88,9 @@ class entity_views_plugin_row_entity_view extends views_plugin_row {
public function render($values) {
if ($entity = $this->get_value($values)) {
+ // Add the view object as views_plugin_row_node_view::render() would.
+ // Otherwise the views theme suggestions won't work properly.
+ $entity->view = $this->view;
$render = $this->rendered_content[entity_id($this->entity_type, $entity)];
return drupal_render($render);
}
diff --git a/sites/all/modules/contrib/fields/entityreference/LICENSE.txt b/sites/all/modules/contrib/fields/entityreference/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/sites/all/modules/contrib/fields/entityreference/entityreference.devel_generate.inc b/sites/all/modules/contrib/fields/entityreference/entityreference.devel_generate.inc
index f6ab014..fab46dd 100644
--- a/sites/all/modules/contrib/fields/entityreference/entityreference.devel_generate.inc
+++ b/sites/all/modules/contrib/fields/entityreference/entityreference.devel_generate.inc
@@ -19,9 +19,13 @@ function _entityreference_devel_generate($object, $field, $instance, $bundle) {
// Get all the entity that are referencable here.
$referencable_entity = entityreference_get_selection_handler($field, $instance)->getReferencableEntities();
if (is_array($referencable_entity) && !empty($referencable_entity)) {
- // Get a random key.
- foreach ($referencable_entity as $type => $eids) {
- $object_field['target_id'] = array_rand($eids);
+ // $referencable_entity is keyed by bundle type.
+ $random_bundle = array_rand($referencable_entity);
+ if (!empty($random_bundle)) {
+ $target_id = array_rand($referencable_entity[$random_bundle]);
+ if (!empty($referencable_entity[$random_bundle][$target_id])) {
+ $object_field['target_id'] = $target_id;
+ }
}
}
return $object_field;
diff --git a/sites/all/modules/contrib/fields/entityreference/entityreference.feeds.inc b/sites/all/modules/contrib/fields/entityreference/entityreference.feeds.inc
index 3f64141..3da1479 100644
--- a/sites/all/modules/contrib/fields/entityreference/entityreference.feeds.inc
+++ b/sites/all/modules/contrib/fields/entityreference/entityreference.feeds.inc
@@ -125,10 +125,15 @@ function entityreference_feeds_set_target($source, $entity, $target, $value) {
break;
case 'label':
$options = $handler->getReferencableEntities($value, '=');
- $options = reset($options);
- $etids = array_keys($options);
- // Use the first matching entity.
- $entity_id = reset($etids);
+ if ($options) {
+ $options = reset($options);
+ $etids = array_keys($options);
+ // Use the first matching entity.
+ $entity_id = reset($etids);
+ }
+ else {
+ $entity_id = NULL;
+ }
break;
}
/*
diff --git a/sites/all/modules/contrib/fields/entityreference/entityreference.info b/sites/all/modules/contrib/fields/entityreference/entityreference.info
index d6348ef..5b2a0f7 100644
--- a/sites/all/modules/contrib/fields/entityreference/entityreference.info
+++ b/sites/all/modules/contrib/fields/entityreference/entityreference.info
@@ -1,18 +1,23 @@
name = Entity Reference
description = Provides a field that can reference other entities.
-core = 7.x
package = Fields
+core = 7.x
+
dependencies[] = entity
dependencies[] = ctools
+test_dependencies[] = feeds
+test_dependencies[] = views
+
; Migrate handler.
files[] = entityreference.migrate.inc
-; Our plugins interfaces and abstract implementations.
+; Plugins interfaces and abstract implementations.
files[] = plugins/selection/abstract.inc
files[] = plugins/selection/views.inc
files[] = plugins/behavior/abstract.inc
+; Views integration.
files[] = views/entityreference_plugin_display.inc
files[] = views/entityreference_plugin_style.inc
files[] = views/entityreference_plugin_row_fields.inc
@@ -22,10 +27,11 @@ files[] = tests/entityreference.handlers.test
files[] = tests/entityreference.taxonomy.test
files[] = tests/entityreference.admin.test
files[] = tests/entityreference.feeds.test
+files[] = tests/entityreference.entity_translation.test
-; Information added by packaging script on 2013-11-20
-version = "7.x-1.1"
+; Information added by Drupal.org packaging script on 2017-08-16
+version = "7.x-1.5"
core = "7.x"
project = "entityreference"
-datestamp = "1384973110"
+datestamp = "1502895850"
diff --git a/sites/all/modules/contrib/fields/entityreference/entityreference.install b/sites/all/modules/contrib/fields/entityreference/entityreference.install
index 4e248ef..ce61018 100644
--- a/sites/all/modules/contrib/fields/entityreference/entityreference.install
+++ b/sites/all/modules/contrib/fields/entityreference/entityreference.install
@@ -41,6 +41,7 @@ function entityreference_field_schema($field) {
}
// Invoke the behaviors to allow them to change the schema.
+ module_load_include('module', 'entityreference');
foreach (entityreference_get_behavior_handlers($field) as $handler) {
$handler->schema_alter($schema, $field);
}
@@ -161,4 +162,29 @@ function entityreference_update_7002() {
'not null' => TRUE,
));
}
-}
\ No newline at end of file
+}
+
+/**
+ * Implements hook_update_N().
+ *
+ * Remove duplicate rows in the taxonomy_index table.
+ */
+function entityreference_update_7100() {
+ if (db_table_exists('taxonomy_index')) {
+ if (db_table_exists('taxonomy_index_tmp')) {
+ db_drop_table('taxonomy_index_tmp');
+ }
+
+ $tx_schema = drupal_get_schema('taxonomy_index');
+ db_create_table('taxonomy_index_tmp', $tx_schema);
+ $select = db_select('taxonomy_index', 'tx');
+ $select->fields('tx', array('nid', 'tid'));
+ $select->groupBy('tx.nid');
+ $select->groupBy('tx.tid');
+ $select->addExpression('MAX(sticky)', 'sticky');
+ $select->addExpression('MAX(created)', 'created');
+ db_insert('taxonomy_index_tmp')->from($select)->execute();
+ db_drop_table('taxonomy_index');
+ db_rename_table('taxonomy_index_tmp', 'taxonomy_index');
+ }
+}
diff --git a/sites/all/modules/contrib/fields/entityreference/entityreference.migrate.inc b/sites/all/modules/contrib/fields/entityreference/entityreference.migrate.inc
index 0e95bf0..35737b5 100644
--- a/sites/all/modules/contrib/fields/entityreference/entityreference.migrate.inc
+++ b/sites/all/modules/contrib/fields/entityreference/entityreference.migrate.inc
@@ -1,12 +1,11 @@
'target_id',
diff --git a/sites/all/modules/contrib/fields/entityreference/entityreference.module b/sites/all/modules/contrib/fields/entityreference/entityreference.module
index bdcb562..c0c9f58 100644
--- a/sites/all/modules/contrib/fields/entityreference/entityreference.module
+++ b/sites/all/modules/contrib/fields/entityreference/entityreference.module
@@ -1,5 +1,12 @@
array(
+ 'variables' => array('label' => NULL, 'item' => NULL, 'settings' => NULL, 'uri' => NULL),
+ ),
+ 'entityreference_entity_id' => array(
+ 'variables' => array('item' => NULL, 'settings' => NULL),
+ ),
+ );
+}
+
/**
* Implements hook_menu().
*/
@@ -163,7 +184,7 @@ function entityreference_get_behavior_handlers($field, $instance = NULL) {
/**
* Get the behavior handler for a given entityreference field and instance.
*
- * @param $handler
+ * @param $behavior
* The behavior handler name.
*/
function _entityreference_get_behavior_handler($behavior) {
@@ -220,13 +241,15 @@ function entityreference_field_validate($entity_type, $entity, $field, $instance
if ($ids) {
$valid_ids = entityreference_get_selection_handler($field, $instance, $entity_type, $entity)->validateReferencableEntities(array_keys($ids));
- $invalid_entities = array_diff_key($ids, array_flip($valid_ids));
- if ($invalid_entities) {
- foreach ($invalid_entities as $id => $delta) {
- $errors[$field['field_name']][$langcode][$delta][] = array(
- 'error' => 'entityreference_invalid_entity',
- 'message' => t('The referenced entity (@type: @id) is invalid.', array('@type' => $field['settings']['target_type'], '@id' => $id)),
- );
+ if (!empty($valid_ids)) {
+ $invalid_entities = array_diff_key($ids, array_flip($valid_ids));
+ if ($invalid_entities) {
+ foreach ($invalid_entities as $id => $delta) {
+ $errors[$field['field_name']][$langcode][$delta][] = array(
+ 'error' => 'entityreference_invalid_entity',
+ 'message' => t('The referenced entity (@type: @id) is invalid.', array('@type' => $field['settings']['target_type'], '@id' => $id)),
+ );
+ }
}
}
}
@@ -398,6 +421,9 @@ function entityreference_field_settings_form($field, $instance, $has_data) {
return $form;
}
+/**
+ * Callback for custom element processing.
+ */
function _entityreference_field_settings_process($form, $form_state) {
$field = isset($form_state['entityreference']['field']) ? $form_state['entityreference']['field'] : $form['#field'];
$instance = isset($form_state['entityreference']['instance']) ? $form_state['entityreference']['instance'] : $form['#instance'];
@@ -479,11 +505,17 @@ function _entityreference_field_settings_process($form, $form_state) {
return $form;
}
+/**
+ * Custom callback for ajax processing.
+ */
function _entityreference_field_settings_ajax_process($form, $form_state) {
_entityreference_field_settings_ajax_process_element($form, $form);
return $form;
}
+/**
+ * Helper function for custom ajax processing.
+ */
function _entityreference_field_settings_ajax_process_element(&$element, $main_form) {
if (isset($element['#ajax']) && $element['#ajax'] === TRUE) {
$element['#ajax'] = array(
@@ -498,6 +530,9 @@ function _entityreference_field_settings_ajax_process_element(&$element, $main_f
}
}
+/**
+ * Custom callback for element processing.
+ */
function _entityreference_form_process_merge_parent($element) {
$parents = $element['#parents'];
array_pop($parents);
@@ -505,11 +540,17 @@ function _entityreference_form_process_merge_parent($element) {
return $element;
}
+/**
+ * Helper function to remove blank elements.
+ */
function _entityreference_element_validate_filter(&$element, &$form_state) {
$element['#value'] = array_filter($element['#value']);
form_set_value($element, $element['#value'], $form_state);
}
+/**
+ * Implements hook_validate().
+ */
function _entityreference_field_settings_validate($form, &$form_state) {
// Store the new values in the form state.
$field = $form['#field'];
@@ -545,6 +586,9 @@ function entityreference_field_instance_settings_form($field, $instance) {
return $form;
}
+/**
+ * Implements hook_field_settings_form().
+ */
function _entityreference_field_instance_settings_form($form, $form_state) {
$field = isset($form_state['entityreference']['field']) ? $form_state['entityreference']['field'] : $form['#field'];
$instance = isset($form_state['entityreference']['instance']) ? $form_state['entityreference']['instance'] : $form['#instance'];
@@ -562,6 +606,9 @@ function _entityreference_field_instance_settings_form($form, $form_state) {
return $form;
}
+/**
+ * Implements hook_validate().
+ */
function _entityreference_field_instance_settings_validate($form, &$form_state) {
// Store the new values in the form state.
$instance = $form['#instance'];
@@ -793,7 +840,7 @@ function entityreference_query_entityreference_alter(QueryAlterableInterface $qu
function entityreference_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
// Ensure that the entity target type exists before displaying the widget.
$entity_info = entity_get_info($field['settings']['target_type']);
- if (empty($entity_info)){
+ if (empty($entity_info)) {
return;
}
$entity_type = $instance['entity_type'];
@@ -818,7 +865,9 @@ function entityreference_field_widget_form(&$form, &$form_state, $field, $instan
// Build an array of entities ID.
foreach ($items as $item) {
- $entity_ids[] = $item['target_id'];
+ if (isset($item['target_id'])) {
+ $entity_ids[] = $item['target_id'];
+ }
}
// Load those entities and loop through them to extract their labels.
@@ -879,6 +928,9 @@ function entityreference_field_widget_form(&$form, &$form_state, $field, $instan
}
}
+/**
+ * Implements hook_validate().
+ */
function _entityreference_autocomplete_validate($element, &$form_state, $form) {
// If a value was entered into the autocomplete...
$value = '';
@@ -903,6 +955,9 @@ function _entityreference_autocomplete_validate($element, &$form_state, $form) {
form_set_value($element, $value, $form_state);
}
+/**
+ * Implements hook_validate().
+ */
function _entityreference_autocomplete_tags_validate($element, &$form_state, $form) {
$value = array();
// If a value was entered into the autocomplete...
@@ -949,7 +1004,8 @@ function entityreference_field_widget_error($element, $error) {
* The entity type.
* @param $bundle_name
* The bundle name.
- * @return
+ *
+ * @return bool
* True if user can access this menu item.
*/
function entityreference_autocomplete_access_callback($type, $field_name, $entity_type, $bundle_name) {
@@ -981,10 +1037,11 @@ function entityreference_autocomplete_access_callback($type, $field_name, $entit
*/
function entityreference_autocomplete_callback($type, $field_name, $entity_type, $bundle_name, $entity_id = '', $string = '') {
// If the request has a '/' in the search text, then the menu system will have
- // split it into multiple arguments and $string will only be a partial. We want
- // to make sure we recover the intended $string.
+ // split it into multiple arguments and $string will only be a partial.
+ // We want to make sure we recover the intended $string.
$args = func_get_args();
- // Shift off the $type, $field_name, $entity_type, $bundle_name, and $entity_id args.
+ // Shift off the $type, $field_name, $entity_type,
+ // $bundle_name, and $entity_id args.
array_shift($args);
array_shift($args);
array_shift($args);
@@ -1020,6 +1077,7 @@ function entityreference_autocomplete_callback($type, $field_name, $entity_type,
*/
function entityreference_autocomplete_callback_get_matches($type, $field, $instance, $entity_type, $entity_id = '', $string = '') {
$matches = array();
+ $prefix = '';
$entity = NULL;
if ($entity_id !== 'NULL') {
@@ -1034,7 +1092,8 @@ function entityreference_autocomplete_callback_get_matches($type, $field, $insta
$handler = entityreference_get_selection_handler($field, $instance, $entity_type, $entity);
if ($type == 'tags') {
- // The user enters a comma-separated list of tags. We only autocomplete the last tag.
+ // The user enters a comma-separated list of tags.
+ // We only autocomplete the last tag.
$tags_typed = drupal_explode_tags($string);
$tag_last = drupal_strtolower(array_pop($tags_typed));
if (!empty($tag_last)) {
@@ -1043,19 +1102,22 @@ function entityreference_autocomplete_callback_get_matches($type, $field, $insta
}
else {
// The user enters a single tag.
- $prefix = '';
$tag_last = $string;
}
if (isset($tag_last)) {
// Get an array of matching entities.
$entity_labels = $handler->getReferencableEntities($tag_last, $instance['widget']['settings']['match_operator'], 10);
-
+ $denied_label = t(ENTITYREFERENCE_DENIED);
// Loop through the products and convert them into autocomplete output.
foreach ($entity_labels as $values) {
foreach ($values as $entity_id => $label) {
+ // Never autocomplete entities that aren't accessible.
+ if ($label == $denied_label) {
+ continue;
+ }
$key = "$label ($entity_id)";
- // Strip things like starting/trailing white spaces, line breaks and tags.
+ // Strip starting/trailing white spaces, line breaks and tags.
$key = preg_replace('/\s\s+/', ' ', str_replace("\n", '', trim(decode_entities(strip_tags($key)))));
// Names containing commas or quotes must be wrapped in quotes.
if (strpos($key, ',') !== FALSE || strpos($key, '"') !== FALSE) {
@@ -1069,6 +1131,32 @@ function entityreference_autocomplete_callback_get_matches($type, $field, $insta
drupal_json_output($matches);
}
+ /**
+ * Introspects field and instance settings, and determines the correct settings
+ * for the functioning of the formatter.
+ *
+ * Settings:
+ * - entity_type - The entity_type being loaded.
+ * - column - The name of the ref. field column that stores the entity id.
+ */
+function entityreference_field_type_settings($field) {
+ $settings = array(
+ 'entity_type' => NULL,
+ 'column' => NULL,
+ );
+
+ if ($field['type'] == 'entityreference') {
+ $settings['entity_type'] = $field['settings']['target_type'];
+ $settings['column'] = 'target_id';
+ }
+ elseif ($field['type'] == 'taxonomy_term_reference') {
+ $settings['entity_type'] = 'taxonomy_term';
+ $settings['column'] = 'tid';
+ }
+
+ return $settings;
+}
+
/**
* Implements hook_field_formatter_info().
*/
@@ -1080,6 +1168,7 @@ function entityreference_field_formatter_info() {
'field types' => array('entityreference'),
'settings' => array(
'link' => FALSE,
+ 'bypass_access' => FALSE,
),
),
'entityreference_entity_id' => array(
@@ -1090,10 +1179,11 @@ function entityreference_field_formatter_info() {
'entityreference_entity_view' => array(
'label' => t('Rendered entity'),
'description' => t('Display the referenced entities rendered by entity_view().'),
- 'field types' => array('entityreference'),
+ 'field types' => array('entityreference', 'taxonomy_term_reference'),
'settings' => array(
'view_mode' => 'default',
'links' => TRUE,
+ 'use_content_language' => TRUE,
),
),
);
@@ -1105,8 +1195,17 @@ function entityreference_field_formatter_info() {
function entityreference_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
$display = $instance['display'][$view_mode];
$settings = $display['settings'];
+ $field_type_settings = entityreference_field_type_settings($field);
+ $element = array();
if ($display['type'] == 'entityreference_label') {
+ $element['bypass_access'] = array(
+ '#title' => t('Show entity labels regardless of user access'),
+ '#description' => t("All entities in the field will be shown, without checking them for access. If the 'Link' setting is also enabled, an entity which the user does not have access to view will show without a link."),
+ '#type' => 'checkbox',
+ '#default_value' => $settings['bypass_access'],
+ );
+
$element['link'] = array(
'#title' => t('Link label to the referenced entity'),
'#type' => 'checkbox',
@@ -1115,7 +1214,7 @@ function entityreference_field_formatter_settings_form($field, $instance, $view_
}
if ($display['type'] == 'entityreference_entity_view') {
- $entity_info = entity_get_info($field['settings']['target_type']);
+ $entity_info = entity_get_info($field_type_settings['entity_type']);
$options = array('default' => t('Default'));
if (!empty($entity_info['view modes'])) {
foreach ($entity_info['view modes'] as $view_mode => $view_mode_settings) {
@@ -1136,6 +1235,12 @@ function entityreference_field_formatter_settings_form($field, $instance, $view_
'#title' => t('Show links'),
'#default_value' => $settings['links'],
);
+
+ $element['use_content_language'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use current content language'),
+ '#default_value' => $settings['use_content_language'],
+ );
}
return $element;
@@ -1147,21 +1252,24 @@ function entityreference_field_formatter_settings_form($field, $instance, $view_
function entityreference_field_formatter_settings_summary($field, $instance, $view_mode) {
$display = $instance['display'][$view_mode];
$settings = $display['settings'];
+ $field_type_settings = entityreference_field_type_settings($field);
$summary = array();
if ($display['type'] == 'entityreference_label') {
$summary[] = $settings['link'] ? t('Link to the referenced entity') : t('No link');
+ $summary[] = $settings['bypass_access'] ? t('Show labels regardless of access') : t('Respect entity access for label visibility');
}
if ($display['type'] == 'entityreference_entity_view') {
- $entity_info = entity_get_info($field['settings']['target_type']);
+ $entity_info = entity_get_info($field_type_settings['entity_type']);
$view_mode_label = $settings['view_mode'] == 'default' ? t('Default') : $settings['view_mode'];
if (isset($entity_info['view modes'][$settings['view_mode']]['label'])) {
$view_mode_label = $entity_info['view modes'][$settings['view_mode']]['label'];
}
$summary[] = t('Rendered as @mode', array('@mode' => $view_mode_label));
$summary[] = !empty($settings['links']) ? t('Display links') : t('Do not display links');
+ $summary[] = !empty($settings['use_content_language']) ? t('Use current content language') : t('Use field language');
}
return implode('
', $summary); @@ -1171,19 +1279,22 @@ function entityreference_field_formatter_settings_summary($field, $instance, $vi * Implements hook_field_formatter_prepare_view(). */ function entityreference_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) { + $field_type_settings = entityreference_field_type_settings($field); + $target_type = $field_type_settings['entity_type']; + $column = $field_type_settings['column']; $target_ids = array(); // Collect every possible entity attached to any of the entities. foreach ($entities as $id => $entity) { foreach ($items[$id] as $delta => $item) { - if (isset($item['target_id'])) { - $target_ids[] = $item['target_id']; + if (isset($item[$column])) { + $target_ids[] = $item[$column]; } } } if ($target_ids) { - $target_entities = entity_load($field['settings']['target_type'], $target_ids); + $target_entities = entity_load($target_type, $target_ids); } else { $target_entities = array(); @@ -1195,12 +1306,12 @@ function entityreference_field_formatter_prepare_view($entity_type, $entities, $ foreach ($items[$id] as $delta => $item) { // Check whether the referenced entity could be loaded. - if (isset($target_entities[$item['target_id']])) { + if (isset($target_entities[$item[$column]]) && isset($target_entities[$item[$column]])) { // Replace the instance value with the term data. - $items[$id][$delta]['entity'] = $target_entities[$item['target_id']]; + $items[$id][$delta]['entity'] = $target_entities[$item[$column]]; // Check whether the user has access to the referenced entity. - $has_view_access = (entity_access('view', $field['settings']['target_type'], $target_entities[$item['target_id']]) !== FALSE); - $has_update_access = (entity_access('update', $field['settings']['target_type'], $target_entities[$item['target_id']]) !== FALSE); + $has_view_access = (entity_access('view', $target_type, $target_entities[$item[$column]]) !== FALSE); + $has_update_access = (entity_access('update', $target_type, $target_entities[$item[$column]]) !== FALSE); $items[$id][$delta]['access'] = ($has_view_access || $has_update_access); } // Otherwise, unset the instance value, since the entity does not exist. @@ -1223,52 +1334,91 @@ function entityreference_field_formatter_prepare_view($entity_type, $entities, $ function entityreference_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { $result = array(); $settings = $display['settings']; - - // Rebuild the items list to contain only those with access. - foreach ($items as $key => $item) { - if (empty($item['access'])) { - unset($items[$key]); - } - } + $field_type_settings = entityreference_field_type_settings($field); + $target_type = $field_type_settings['entity_type']; + $column = $field_type_settings['column']; switch ($display['type']) { case 'entityreference_label': $handler = entityreference_get_selection_handler($field, $instance, $entity_type, $entity); foreach ($items as $delta => $item) { - $label = $handler->getLabel($item['entity']); - // If the link is to be displayed and the entity has a uri, display a link. - // Note the assignment ($url = ) here is intended to be an assignment. - if ($display['settings']['link'] && ($uri = entity_uri($field['settings']['target_type'], $item['entity']))) { - $result[$delta] = array('#markup' => l($label, $uri['path'], $uri['options'])); + // Skip an item that is not accessible, unless we're allowing output of + // entity labels without considering access. + if (empty($item['access']) && !$display['settings']['bypass_access']) { + continue; } - else { - $result[$delta] = array('#markup' => check_plain($label)); + + // Calling EntityReferenceHandler::getLabel() would make a repeated, + // wasteful call to entity_access(). + $label = entity_label($field['settings']['target_type'], $item['entity']); + + // Check if the settings and access allow a link to be displayed. + $display_link = $display['settings']['link'] && $item['access']; + + $uri = NULL; + + // If the link is allowed and the entity has a uri, display a link. + if ($display_link) { + $uri = entity_uri($target_type, $item['entity']); } + + $result[$delta] = array( + '#theme' => 'entityreference_label', + '#label' => $label, + '#item' => $item, + '#uri' => $uri, + '#settings' => array( + 'display' => $display['settings'], + 'field' => $field['settings'], + ), + ); } break; case 'entityreference_entity_id': foreach ($items as $delta => $item) { - $result[$delta] = array('#markup' => check_plain($item['target_id'])); + // Skip an item that is not accessible. + if (empty($item['access'])) { + continue; + } + + $result[$delta] = array( + '#theme' => 'entityreference_entity_id', + '#item' => $item, + '#settings' => array( + 'display' => $display['settings'], + 'field' => $field['settings'], + ), + ); } break; case 'entityreference_entity_view': + $target_langcode = $langcode; + if (!empty($settings['use_content_language']) && !empty($GLOBALS['language_content']->language)) { + $target_langcode = $GLOBALS['language_content']->language; + } + foreach ($items as $delta => $item) { + // Skip an item that is not accessible. + if (empty($item['access'])) { + continue; + } + // Protect ourselves from recursive rendering. static $depth = 0; $depth++; if ($depth > 20) { - throw new EntityReferenceRecursiveRenderingException(t('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $entity_type, '@entity_id' => $item['target_id']))); + throw new EntityReferenceRecursiveRenderingException(t('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $target_type, '@entity_id' => $item[$column]))); } - $entity = clone $item['entity']; - unset($entity->content); - $result[$delta] = entity_view($field['settings']['target_type'], array($item['target_id'] => $entity), $settings['view_mode'], $langcode, FALSE); + $target_entity = clone $item['entity']; + unset($target_entity->content); + $result[$delta] = entity_view($target_type, array($item[$column] => $target_entity), $settings['view_mode'], $target_langcode, FALSE); - if (empty($settings['links']) && isset($result[$delta][$field['settings']['target_type']][$item['target_id']]['links'])) { - $result[$delta][$field['settings']['target_type']][$item['target_id']]['links']['#access'] = FALSE; + if (empty($settings['links']) && isset($result[$delta][$target_type][$column]['links'])) { + $result[$delta][$target_type][$item[$column]]['links']['#access'] = FALSE; } $depth = 0; } @@ -1292,3 +1442,44 @@ function entityreference_views_api() { 'path' => drupal_get_path('module', 'entityreference') . '/views', ); } + +/** + * Theme label. + * + * @ingroup themeable. + */ +function theme_entityreference_label($vars) { + $label = $vars['label']; + $settings = $vars['settings']; + $item = $vars['item']; + $uri = $vars['uri']; + + $output = ''; + + // If the link is to be displayed and the entity has a uri, display a link. + // Note the assignment ($url = ) here is intended to be an assignment. + if ($settings['display']['link'] && isset($uri['path'])) { + $output .= l($label, $uri['path'], $uri['options']); + } + else { + $output .= check_plain($label); + } + + return $output; +} + +/** + * Theme entity_id + * + * @ingroup themeable. + */ +function theme_entityreference_entity_id($vars) { + $settings = $vars['settings']; + $item = $vars['item']; + + $output = ''; + + $output = check_plain($item['target_id']); + + return $output; +} diff --git a/sites/all/modules/contrib/fields/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info b/sites/all/modules/contrib/fields/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info index 88ad7b5..70bcc4f 100644 --- a/sites/all/modules/contrib/fields/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info +++ b/sites/all/modules/contrib/fields/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info @@ -4,9 +4,9 @@ core = 7.x package = Fields dependencies[] = entityreference -; Information added by packaging script on 2013-11-20 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-08-16 +version = "7.x-1.5" core = "7.x" project = "entityreference" -datestamp = "1384973110" +datestamp = "1502895850" diff --git a/sites/all/modules/contrib/fields/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php b/sites/all/modules/contrib/fields/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php index 43ac693..075b54d 100644 --- a/sites/all/modules/contrib/fields/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php +++ b/sites/all/modules/contrib/fields/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php @@ -144,18 +144,20 @@ class EntityReferenceBehavior_TaxonomyIndex extends EntityReference_BehaviorHand // already inserted in taxonomy_build_node_index(). $tid_all = array_diff($tid_all, $original_tid_all); - // Insert index entries for all the node's terms. + // Insert index entries for all the node's terms, preventing duplicates. if (!empty($tid_all)) { - $query = db_insert('taxonomy_index')->fields(array('nid', 'tid', 'sticky', 'created')); foreach ($tid_all as $tid) { - $query->values(array( + $row = array( 'nid' => $node->nid, 'tid' => $tid, 'sticky' => $sticky, 'created' => $node->created, - )); + ); + $query = db_merge('taxonomy_index') + ->key($row) + ->fields($row); + $query->execute(); } - $query->execute(); } } } diff --git a/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php index 444a74c..6ec28a4 100644 --- a/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php +++ b/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php @@ -208,7 +208,11 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select * Implements EntityReferenceHandler::validateAutocompleteInput(). */ public function validateAutocompleteInput($input, &$element, &$form_state, $form) { - $entities = $this->getReferencableEntities($input, '=', 6); + $bundled_entities = $this->getReferencableEntities($input, '=', 6); + $entities = array(); + foreach($bundled_entities as $entities_list) { + $entities += $entities_list; + } if (empty($entities)) { // Error if there are no entities available for a required field. form_error($element, t('There are no entities matching "%value"', array('%value' => $input))); @@ -305,7 +309,7 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select */ public function getLabel($entity) { $target_type = $this->field['settings']['target_type']; - return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -'); + return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t(ENTITYREFERENCE_DENIED); } /** @@ -339,9 +343,11 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select // Join the known base-table. $target_type = $this->field['settings']['target_type']; $entity_info = entity_get_info($target_type); + $target_type_base_table = $entity_info['base table']; $id = $entity_info['entity keys']['id']; + // Return the alias of the table. - return $query->innerJoin($target_type, NULL, "%alias.$id = $alias.entity_id"); + return $query->innerJoin($target_type_base_table, NULL, "%alias.$id = $alias.entity_id"); } } @@ -543,7 +549,7 @@ class EntityReference_SelectionHandler_Generic_taxonomy_term extends EntityRefer if ($vocabulary = taxonomy_vocabulary_machine_name_load($bundle)) { if ($terms = taxonomy_get_tree($vocabulary->vid, 0, NULL, TRUE)) { foreach ($terms as $term) { - $options[$vocabulary->machine_name][$term->tid] = str_repeat('-', $term->depth) . check_plain($term->name); + $options[$vocabulary->machine_name][$term->tid] = str_repeat('-', $term->depth) . check_plain(entity_label('taxonomy_term', $term)); } } } diff --git a/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php b/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php index 1b036a7..cbed33b 100644 --- a/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php +++ b/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php @@ -9,12 +9,13 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio * Implements EntityReferenceHandler::getInstance(). */ public static function getInstance($field, $instance = NULL, $entity_type = NULL, $entity = NULL) { - return new EntityReference_SelectionHandler_Views($field, $instance); + return new EntityReference_SelectionHandler_Views($field, $instance, $entity); } - protected function __construct($field, $instance) { + protected function __construct($field, $instance, $entity) { $this->field = $field; $this->instance = $instance; + $this->entity = $entity; } /** @@ -52,13 +53,32 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio ); $default = !empty($view_settings['args']) ? implode(', ', $view_settings['args']) : ''; + $description = t('Provide a comma separated list of arguments to pass to the view.') . '
' . t('This field supports tokens.'); + + if (!module_exists('token')) { + $description .= '
' . t('Install the token module to get more tokens and display available once.', array('@url' => 'http://drupal.org/project/token')); + } + $form['view']['args'] = array( '#type' => 'textfield', '#title' => t('View arguments'), '#default_value' => $default, '#required' => FALSE, - '#description' => t('Provide a comma separated list of arguments to pass to the view.'), + '#description' => $description, + '#maxlength' => '512', ); + if (module_exists('token')) { + // Get the token type for the entity type our field is in (a type 'taxonomy_term' has a 'term' type token). + $info = entity_get_info($instance['entity_type']); + + $form['view']['tokens'] = array( + '#theme' => 'token_tree', + '#token_types' => array($info['token type']), + '#global_types' => TRUE, + '#click_insert' => TRUE, + '#dialog' => TRUE, + ); + } } else { $form['view']['no_view_help'] = array( @@ -84,6 +104,7 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio return FALSE; } $this->view->set_display($display_name); + $this->view->pre_execute(); // Make sure the query is not cached. $this->view->is_cacheable = FALSE; @@ -104,7 +125,7 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio */ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) { $display_name = $this->field['settings']['handler_settings']['view']['display_name']; - $args = $this->field['settings']['handler_settings']['view']['args']; + $args = $this->handleArgs($this->field['settings']['handler_settings']['view']['args']); $result = array(); if ($this->initializeView($match, $match_operator, $limit)) { // Get the results. @@ -133,12 +154,14 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio function validateReferencableEntities(array $ids) { $display_name = $this->field['settings']['handler_settings']['view']['display_name']; - $args = $this->field['settings']['handler_settings']['view']['args']; + $args = $this->handleArgs($this->field['settings']['handler_settings']['view']['args']); $result = array(); if ($this->initializeView(NULL, 'CONTAINS', 0, $ids)) { // Get the results. $entities = $this->view->execute_display($display_name, $args); - $result = array_keys($entities); + if (!empty($entities)) { + $result = array_keys($entities); + } } return $result; } @@ -164,6 +187,49 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio } + /** + * Handles arguments for views. + * + * Replaces tokens using token_replace(). + * + * @param array $args + * Usually $this->field['settings']['handler_settings']['view']['args']. + * + * @return array + * The arguments to be send to the View. + */ + protected function handleArgs($args) { + if (!module_exists('token')) { + return $args; + } + + // Parameters for token_replace(). + $data = array(); + $options = array('clear' => TRUE); + + if ($entity = $this->entity) { + // D7 HACK: For new entities, entity and revision id are not set. This leads to + // * token replacement emitting PHP warnings + // * views choking on empty arguments + // We workaround this by filling in '0' for these IDs + // and use a clone to leave no traces of our unholy doings. + $info = entity_get_info($this->instance['entity_type']); + if (!isset($entity->{$info['entity keys']['id']})) { + $entity = clone $entity; + $entity->{$info['entity keys']['id']} = '0'; + if (!empty($info['entity keys']['revision'])) { + $entity->{$info['entity keys']['revision']} = '0'; + } + } + + $data[$info['token type']] = $entity; + } + // Replace tokens for each argument. + foreach ($args as $key => $arg) { + $args[$key] = token_replace($arg, $data, $options); + } + return $args; + } } function entityreference_view_settings_validate($element, &$form_state, $form) { diff --git a/sites/all/modules/contrib/fields/entityreference/plugins/selection/abstract.inc b/sites/all/modules/contrib/fields/entityreference/plugins/selection/abstract.inc index 1d2ea0d..a4805b1 100644 --- a/sites/all/modules/contrib/fields/entityreference/plugins/selection/abstract.inc +++ b/sites/all/modules/contrib/fields/entityreference/plugins/selection/abstract.inc @@ -21,8 +21,9 @@ interface EntityReference_SelectionHandler { * Return a list of referencable entities. * * @return - * An array of referencable entities, which keys are entity ids and - * values (safe HTML) labels to be displayed to the user. + * A nested array of entities, the first level is keyed by the + * entity bundle, which contains an array of entity labels (safe HTML), + * keyed by the entity ID. */ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0); diff --git a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.admin.test b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.admin.test index 9a12119..ec78e7b 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.admin.test +++ b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.admin.test @@ -21,7 +21,7 @@ class EntityReferenceAdminTestCase extends DrupalWebTestCase { parent::setUp(array('field_ui', 'entity', 'ctools', 'entityreference')); // Create test user. - $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types')); + $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer fields')); $this->drupalLogin($this->admin_user); // Create content type, with underscores. diff --git a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.feeds.test b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.feeds.test index 4dc1901..32248cc 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.feeds.test +++ b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.feeds.test @@ -17,6 +17,7 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ 'name' => 'Feeds integration (field mapper)', 'description' => 'Test Feeds Mapper support for fields.', 'group' => 'Entity Reference', + 'dependencies' => array('feeds'), ); } @@ -28,10 +29,6 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ module_enable(array('entityreference_feeds_test'), TRUE); $this->resetAll(); - if (!module_exists('feeds')) { - return; - } - $permissions[] = 'access content'; $permissions[] = 'administer site configuration'; $permissions[] = 'administer content types'; @@ -157,10 +154,6 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ * Basic test loading a double entry CSV file. */ public function test() { - if (!module_exists('feeds')) { - return; - } - $this->drupalLogin($this->admin_user); $this->drupalGet('admin/structure/types/manage/article/fields'); $this->assertText('Ref - entity ID', t('Found Entity reference field %field.', array('%field' => 'field_er_id'))); diff --git a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.handlers.test b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.handlers.test index b88e106..1367b44 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.handlers.test +++ b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.handlers.test @@ -194,6 +194,21 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase { ), ); $this->assertReferencable($field, $referencable_tests, 'Node handler (admin)'); + + // Verify autocomplete input validation. + $handler = entityreference_get_selection_handler($field); + $element = array( + '#parents' => array('element_name'), + ); + $form_state = array(); + $form = array(); + $value = $handler->validateAutocompleteInput($nodes['published1']->title, $element, $form_state, $form); + $this->assertEqual($value, $nodes['published1']->nid); + + $invalid_input = $this->randomName(); + $value = $handler->validateAutocompleteInput($invalid_input, $element, $form_state, $form); + $this->assertNull($value); + $this->assertEqual(form_get_error($element), t('There are no entities matching "%value"', array('%value' => $invalid_input))); } /** @@ -256,7 +271,7 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase { ), 'result' => array( 'user' => array( - $users['admin']->uid => '- Restricted access -', + $users['admin']->uid => ENTITYREFERENCE_DENIED, $users['non_admin']->uid => $user_labels['non_admin'], ), ), diff --git a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.taxonomy.test b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.taxonomy.test index 6e4afb7..94b3f56 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.taxonomy.test +++ b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.taxonomy.test @@ -112,4 +112,52 @@ class EntityReferenceTaxonomyTestCase extends DrupalWebTestCase { $this->assertFalse(taxonomy_select_nodes(1)); } + /** + * Add a second ER field from node/article to taxonomy. + * + * This should not cause {taxonomy_index} to receive duplicate entries. + */ + protected function setupForIndexDuplicates() { + // Create an entity reference field. + $field = array( + 'entity_types' => array('node'), + 'settings' => array( + 'handler' => 'base', + 'target_type' => 'taxonomy_term', + 'handler_settings' => array( + 'target_bundles' => array(), + ), + ), + 'field_name' => 'field_entityreference_term2', + 'type' => 'entityreference', + ); + $field = field_create_field($field); + $instance = array( + 'field_name' => 'field_entityreference_term2', + 'bundle' => 'article', + 'entity_type' => 'node', + ); + + // Enable the taxonomy-index behavior. + $instance['settings']['behaviors']['taxonomy-index']['status'] = TRUE; + field_create_instance($instance); + } + + /** + * Make sure the index only contains one entry for a given node->term + * reference, even when multiple ER fields link from the node bundle to terms. + */ + public function testIndexDuplicates() { + // Extra setup for this test: add another ER field on this content type. + $this->setupForIndexDuplicates(); + + // Assert node insert with reference to term in first field. + $tid = 1; + $settings = array(); + $settings['type'] = 'article'; + $settings['field_entityreference_term'][LANGUAGE_NONE][0]['target_id'] = $tid; + $node = $this->drupalCreateNode($settings); + + $this->assertEqual(taxonomy_select_nodes($tid), array($node->nid)); + } } diff --git a/sites/all/modules/contrib/fields/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info b/sites/all/modules/contrib/fields/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info index 311ae3f..5bbf9b6 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info +++ b/sites/all/modules/contrib/fields/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info @@ -8,9 +8,9 @@ dependencies[] = feeds dependencies[] = feeds_ui dependencies[] = entityreference -; Information added by packaging script on 2013-11-20 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-08-16 +version = "7.x-1.5" core = "7.x" project = "entityreference" -datestamp = "1384973110" +datestamp = "1502895850" diff --git a/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_display.inc b/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_display.inc index f13e88a..cca3650 100644 --- a/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_display.inc +++ b/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_display.inc @@ -81,8 +81,9 @@ class entityreference_plugin_display extends views_plugin_display { $field = $this->view->query->fields[$this->view->field[$field_alias]->field_alias]; } else { - $this->view->query->add_field($this->view->field[$field_alias]->options['table'], $this->view->field[$field_alias]->real_field, $this->view->field[$field_alias]->options['field'], array()); - $field = $this->view->query->fields[$this->view->field[$field_alias]->options['field']]; + $field_table = $this->view->query->ensure_table($this->view->field[$field_alias]->table, $this->view->field[$field_alias]->relationship); + $this->view->query->add_field($field_table, $this->view->field[$field_alias]->real_field, $this->view->field[$field_alias]->field, array()); + $field = $this->view->query->fields[$this->view->field[$field_alias]->field]; } // Add an OR condition for the field $conditions->condition($field['table'] . '.' . $field['field'], $value, 'LIKE'); diff --git a/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_style.inc b/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_style.inc index fadaa9e..b72a235 100644 --- a/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_style.inc +++ b/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_style.inc @@ -26,7 +26,7 @@ class entityreference_plugin_style extends views_plugin_style { '#title' => t('Search fields'), '#options' => $options, '#required' => TRUE, - '#default_value' => $this->options['search_fields'], + '#default_value' => isset($this->options['search_fields']) ? $this->options['search_fields'] : array(), '#description' => t('Select the field(s) that will be searched when using the autocomplete widget.'), '#weight' => -3, ); diff --git a/sites/all/modules/contrib/fields/field_group/CHANGELOG.txt b/sites/all/modules/contrib/fields/field_group/CHANGELOG.txt index 5e3ea36..5798162 100644 --- a/sites/all/modules/contrib/fields/field_group/CHANGELOG.txt +++ b/sites/all/modules/contrib/fields/field_group/CHANGELOG.txt @@ -1,6 +1,58 @@ /* $Id*/ CHANGELOG for field_group for Drupal 7 +Field Group origin/7.x-1.x, 2017-11-04 +-------------------------------------- +- Tests fail after new 'administer fields' permission. +- Update CHANGELOG.txt to 7.x-1.5 Release. +- Revert "Issue #2646106 by jribeiro: Update CHANGELOG.txt to 7.x-1.5 Release". +- Update CHANGELOG.txt to 7.x-1.5 Release. +- Fix whitespace between "&" and parameters for some functions. +- Avoid bad code pattern (that is picked up by security scanners) when getting hash. +- Should #array_parents be updated in field_group_fields_nest()?. +- "Show" appears in horizontal tab title if node form submitted through ajax. +- CSS breaks i18n string translation interface. +- "uncaught exception: Syntax error, unrecognized expression: #" after 7.x-1.4 update. +- PHP7 - Uniform Variable Syntax updates are causing exported field_groups to not have names. + +Field_group 7.x-1.5 + o Added extra formatting on html element attributes. + o Fixed bug on automatic ID generation in javascript. + o Issue #2511960 by rrfegade: spelling errors in D7. + o Issue #2194279 by Georgique: Export translatables (label and descriptions) in Features. + o Issue #2386335 by Dubs: Integer Group Array Keys can create empty node forms. + o Issue #2269133 by sammuell: Accordion is always closed when using jQuery update module. + o Issue #2258939 by Snipon: Fixed Change to preventDefault on multipage controls. + o Issue #2173937 by jantoine, omerida | Bernieman: Fixed Accordion Element has fixed height in HTML. + o Issue #2311789 by eelkeblok: Fixed Group is incorrectly determined to be empty with nested form elements. + o Issue #2272003 by karolrybak | Kwb: Fixed Fieldgroup no longer renders after using more than one 'HTML Element' on the same level. + o Issue #2309219 by czigor: Fixed Proper CTools exportable loading. + o Issue #2283245 by stefan.r | jrb: Fixed New id functionality breaks tests and CSS on existing field groups. + o Issue #2295133 by boyan.borisov, interX: Fixed field_group_update_7007 error. + o Remove field_group.css, the css is not needed anymore. + o Fix horiziontal tabs when used as standalone element. + +Field_group 7.x-1.4 + o Issue #2129805 by RaF: Incorrect markup when open div & custom classes provided. + o Issue #2037731 by maximpodorov, Zach Harkey: Remove id attribute from HTML elements. + o Issue #2099505 by borisson_ | Maks: Warning: Invalid argument supplied for foreach() in field_group_build_entity_groups() (line 1894 ..sites/all/modules/field_group. + o Issue #2102397 by thebruce: Field Group 7006 update fails with "Cannot use string offset as an array in /field_group/field_group.install on line 318. + o Issue #2122733 by Alan D.: Remove test module from admin listing. + o Issue #2212431 by tim.plunkett: Field groups that contain only elements that use #markup are hidden. + o Issue #2175731 by tobiasb, daggerhart: HTML produced by module is broken. + o Issue #2190425 by tobiasb: Fix attach behavior. + o Issue #1911530 by tobiasb, Simon Georges: Remove useless files[] directive from .info files. + o Issue #1358430 by oushen, tobiasb | FriedJam: JS "Error: uncaught exception: Syntax error, unrecognized expression:". + o Issue #2104391 by mike_san: Package descriptions. + o Issue #2189777 by gmercer: Exporting a feature with field groups sometimes leads to $field_group->data being set to an empty string. + o Issue #2168689 by Paul B: Beïng should be being. + o Issue #2037731 by rreiss, maximpodorov, Zach Harkey: Make id attribute optional. Current installations will default get the old ids + o Issue #2173351 by axe312: Add a label to html-element wrappers. + o Issue #1954056 by klonos: Proper capitalization in the project name. + o Issue #2224547 by sdrycroft: Fixed field_group_info_groups() clears all CTools caches when it should only clear the field_group caches. + o Issue #2099505 by joelpittet, borisson_ | Maks: Fixed Warning: Invalid argument supplied for foreach() in field_group_build_entity_groups() (line 1894 ..sites/all/modules/field_group. + o Issue #2223269 by barraponto: Fixed Don't filter and translate empty strings. + Field_group 7.x-1.3 o Issue #2077695 by FreekVR | ChoY: Fixed field group entity display bug after update. o Issue #2078201 by DeFr, eneko1907 | cmriley: Fixed Started getting a ton of notices. diff --git a/sites/all/modules/contrib/fields/field_group/LICENSE.txt b/sites/all/modules/contrib/fields/field_group/LICENSE.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/contrib/fields/field_group/field_group.api.php b/sites/all/modules/contrib/fields/field_group/field_group.api.php index cef5b0a..fdcbe03 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.api.php +++ b/sites/all/modules/contrib/fields/field_group/field_group.api.php @@ -220,7 +220,7 @@ function hook_field_group_format_settings($group) { * @param Array $elements by address. * @param Object $group The Field group info. */ -function hook_field_group_pre_render(& $element, $group, & $form) { +function hook_field_group_pre_render(&$element, $group, &$form) { // You can prepare some variables to use in the logic. $view_mode = isset($form['#view_mode']) ? $form['#view_mode'] : 'form'; @@ -268,7 +268,7 @@ function hook_field_group_pre_render(& $element, $group, & $form) { * * Function that fungates as last resort to alter the pre_render build. */ -function hook_field_group_pre_render_alter(&$element, $group, & $form) { +function hook_field_group_pre_render_alter(&$element, $group, &$form) { if ($group->format_type == 'htab') { $element['#theme_wrappers'] = array('my_horizontal_tab'); @@ -285,7 +285,7 @@ function hook_field_group_pre_render_alter(&$element, $group, & $form) { * * @param Array $elements by address. */ -function hook_field_group_build_pre_render_alter(& $element) { +function hook_field_group_build_pre_render_alter(&$element) { // Prepare variables. $display = isset($element['#view_mode']); diff --git a/sites/all/modules/contrib/fields/field_group/field_group.css b/sites/all/modules/contrib/fields/field_group/field_group.css deleted file mode 100644 index d47f007..0000000 --- a/sites/all/modules/contrib/fields/field_group/field_group.css +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id: field_group.css,v 1.1.2.12 2010/12/22 22:22:35 stalski Exp $ */ - -/** - * Fix for fieldsets in vertical tabs. - * Note that this can only be hardcoded to the Seven theme - * where people who override this, are in trouble. - * This can be removed in next d7 release. - */ -.vertical-tabs fieldset.default-fallback, -div.field-group-tabs-wrapper div.field-type-image fieldset, -div.field-group-tabs-wrapper div.field-type-file fieldset, -div.field-group-tabs-wrapper div.field-type-datetime fieldset { - border: 1px solid #CCCCCC; - margin: 1em 0; - padding: 2.5em 0 0; - position: relative; -} - -div.field-group-tabs-wrapper div.field-type-image legend, -div.field-group-tabs-wrapper div.field-type-file legend, -div.field-group-tabs-wrapper div.field-type-datetime legend { - display: block; -} \ No newline at end of file diff --git a/sites/all/modules/contrib/fields/field_group/field_group.field_ui.inc b/sites/all/modules/contrib/fields/field_group/field_group.field_ui.inc index 557b0c6..dbd26d0 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.field_ui.inc +++ b/sites/all/modules/contrib/fields/field_group/field_group.field_ui.inc @@ -99,10 +99,10 @@ function field_group_field_ui_overview_form_alter(&$form, &$form_state, $display // Play around with form_state so we only need to hold things // between requests, until the save button was hit. if (isset($form_state['field_group'][$name])) { - $group = & $form_state['field_group'][$name]; + $group = &$form_state['field_group'][$name]; } else { - $group = & $params->groups[$name]; + $group = &$params->groups[$name]; } // Check the currently selected formatter, and merge persisted values for @@ -222,7 +222,7 @@ function field_group_field_ui_overview_form_alter(&$form, &$form_state, $display $table[$name]['format']['type']['#attributes']['class'] = array('element-invisible'); } else { - // After saving, the settings are updated here aswell. First we create + // After saving, the settings are updated here as well. First we create // the element for the table cell. $table[$name]['settings_summary'] = array('#markup' => ''); if (!empty($group->format_settings)) { @@ -456,7 +456,7 @@ function field_group_format_settings_label_validate($element, &$form_state) { * @param Object $group * @param array $settings */ -function field_group_formatter_row_update(& $group, $settings) { +function field_group_formatter_row_update(&$group, $settings) { // if the row has changed formatter type, update the group object if (!empty($settings['format']['type']) && $settings['format']['type'] != $group->format_type) { $group->format_type = $settings['format']['type']; @@ -469,7 +469,7 @@ function field_group_formatter_row_update(& $group, $settings) { * @param Object $group The group object * @param Array $settings Configuration settings */ -function field_group_formatter_settings_update(& $group, $settings) { +function field_group_formatter_settings_update(&$group, $settings) { // for format changes we load the defaults. if (empty($settings['format_settings']['settings'])) { diff --git a/sites/all/modules/contrib/fields/field_group/field_group.info b/sites/all/modules/contrib/fields/field_group/field_group.info index 96a6053..49eae8d 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.info +++ b/sites/all/modules/contrib/fields/field_group/field_group.info @@ -6,9 +6,9 @@ dependencies[] = ctools core = 7.x files[] = tests/field_group.ui.test files[] = tests/field_group.display.test -; Information added by Drupal.org packaging script on 2014-06-04 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2017-11-03 +version = "7.x-1.6" core = "7.x" project = "field_group" -datestamp = "1401918529" +datestamp = "1509751991" diff --git a/sites/all/modules/contrib/fields/field_group/field_group.install b/sites/all/modules/contrib/fields/field_group/field_group.install index fa5371d..a7bb85c 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.install +++ b/sites/all/modules/contrib/fields/field_group/field_group.install @@ -17,6 +17,7 @@ function field_group_schema() { 'key' => 'identifier', 'identifier' => 'field_group', 'default hook' => 'field_group_info', + 'load callback' => 'field_group_group_load_by_identifier', 'save callback' => 'field_group_group_save', 'delete callback' => 'field_group_group_export_delete', 'can disable' => TRUE, @@ -229,6 +230,8 @@ function field_group_update_7001() { ->condition('name', 'field_group') ->execute(); + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -246,6 +249,8 @@ function field_group_update_7002() { // See http://drupal.org/node/1018550. _field_group_recreate_identifiers(); + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -257,6 +262,8 @@ function field_group_update_7003() { module_load_include('module', 'field_group'); _field_group_recreate_identifiers(); + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -295,6 +302,8 @@ function field_group_update_7005() { drupal_write_record('field_group', $row, array('id')); } + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -330,6 +339,8 @@ function field_group_update_7006() { } } + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -344,8 +355,18 @@ function field_group_update_7007() { // Migrate the field groups so they have a unique identifier. $field_groups = ctools_export_load_object("field_group"); foreach ($field_groups as $row) { - if ($row->data['format_type'] == 'div' || $row->data['format_type'] == 'html5' || $row->data['format_type'] == 'html-element') { + // These field group types have an ID setting to populate. + $populate_id_setting = array( + 'html-element', + 'div', + 'html5', + 'fieldset', + 'tabs', + 'htabs', + 'accordion', + ); + if (in_array($row->data['format_type'], $populate_id_setting)) { // If mode is default, we don't know what view mode it was. Take full then. $view_mode = $row->mode == 'default' ? 'full' : $row->mode; $id = $row->entity_type . '_' . $row->bundle . '_' . $view_mode . '_' . $row->group_name; @@ -360,4 +381,14 @@ function field_group_update_7007() { drupal_write_record('field_group', $row, array('id')); } } + + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } + +/** + * Clear cache to notice the CTools load callback. + */ +function field_group_update_7008() { + drupal_flush_all_caches(); +} \ No newline at end of file diff --git a/sites/all/modules/contrib/fields/field_group/field_group.js b/sites/all/modules/contrib/fields/field_group/field_group.js index eef6aaa..0b0a565 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.js +++ b/sites/all/modules/contrib/fields/field_group/field_group.js @@ -41,9 +41,17 @@ Drupal.FieldGroup.Effects.processAccordion = { $('div.field-group-accordion-wrapper', context).once('fieldgroup-effects', function () { var wrapper = $(this); + // Get the index to set active. + var active_index = false; + wrapper.find('.accordion-item').each(function(i) { + if ($(this).hasClass('field-group-accordion-active')) { + active_index = i; + } + }); + wrapper.accordion({ - autoHeight: false, - active: '.field-group-accordion-active', + heightStyle: "content", + active: active_index, collapsible: true, changestart: function(event, ui) { if ($(this).hasClass('effect-none')) { @@ -111,6 +119,9 @@ Drupal.FieldGroup.Effects.processHtabs = { Drupal.FieldGroup.Effects.processTabs = { execute: function (context, settings, type) { if (type == 'form') { + + var errorFocussed = false; + // Add required fields mark to any fieldsets containing required fields $('fieldset.vertical-tabs-pane', context).once('fieldgroup-effects', function(i) { if ($(this).is('.required-fields') && $(this).find('.form-required').length > 0) { @@ -118,8 +129,12 @@ Drupal.FieldGroup.Effects.processTabs = { } if ($('.error', $(this)).length) { $(this).data('verticalTab').link.parent().addClass('error'); - Drupal.FieldGroup.setGroupWithfocus($(this)); - $(this).data('verticalTab').focus(); + // Focus the first tab with error. + if (!errorFocussed) { + Drupal.FieldGroup.setGroupWithfocus($(this)); + $(this).data('verticalTab').focus(); + errorFocussed = true; + } } }); } @@ -202,15 +217,14 @@ Drupal.behaviors.fieldGroup = { $('.fieldset-wrapper .fieldset > legend').css({display: 'block'}); $('.vertical-tabs fieldset.fieldset').addClass('default-fallback'); - // Add a new ID to each fieldset. - $('.group-wrapper fieldset').each(function() { + $('.group-wrapper .horizontal-tabs-panes > fieldset', context).once('group-wrapper-panes-processed', function() { // Tats bad, but we have to keep the actual id to prevent layouts to break. - var fieldgorupID = 'field_group-' + $(this).attr('id') + ' ' + $(this).attr('id'); - $(this).attr('id', fieldgorupID); - }) + var fieldgroupID = 'field_group-' + $(this).attr('id'); + $(this).attr('id', fieldgroupID); + }); // Set the hash in url to remember last userselection. - $('.group-wrapper ul li').each(function() { + $('.group-wrapper ul li').once('group-wrapper-ul-processed', function() { var fieldGroupNavigationListIndex = $(this).index(); $(this).children('a').click(function() { var fieldset = $('.group-wrapper fieldset').get(fieldGroupNavigationListIndex); @@ -219,7 +233,8 @@ Drupal.behaviors.fieldGroup = { window.location.hash = hashUrl; }); }); + } }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/sites/all/modules/contrib/fields/field_group/field_group.module b/sites/all/modules/contrib/fields/field_group/field_group.module index da1a791..4fe2547 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.module +++ b/sites/all/modules/contrib/fields/field_group/field_group.module @@ -122,6 +122,20 @@ function field_group_menu_load($group_name, $entity_type, $bundle_name, $bundle_ return empty($group) ? FALSE : $group; } +/** + * Ctools load callback to load fieldgroup by identifier. + */ +function field_group_load_field_group_by_identifier($identifier) { + + $parts = explode('|', $identifier); + if (count($parts) != 4) { + return; + } + + return field_group_load_field_group($parts[0], $parts[1], $parts[2], $parts[3]); + +} + /** * Loads a group definition. * @@ -244,8 +258,6 @@ function field_group_field_attach_delete_bundle($entity_type, $bundle) { * Implements hook_field_attach_form(). */ function field_group_field_attach_form($entity_type, $entity, &$form, &$form_state, $langcode) { - - $form['#attached']['css'][] = drupal_get_path('module', 'field_group') . '/field_group.field_ui.css'; field_group_attach_groups($form, 'form', $form_state); $form['#pre_render'][] = 'field_group_form_pre_render'; } @@ -292,7 +304,7 @@ function field_group_field_group_formatter_info() { 'html-element' => array( 'label' => t('HTML element'), 'description' => t('This fieldgroup renders the inner content in a HTML element with classes and attributes.'), - 'instance_settings' => array('element' => 'div', 'show_label' => 0, 'label_element' => 'div', 'classes' => '', 'attributes' => '', 'required_fields' => 1), + 'instance_settings' => array('element' => 'div', 'show_label' => 0, 'label_element' => 'div', 'classes' => '', 'attributes' => '', 'required_fields' => 1, 'id' => ''), ), 'div' => array( 'label' => t('Div'), @@ -310,13 +322,13 @@ function field_group_field_group_formatter_info() { 'label' => t('Fieldset'), 'description' => t('This fieldgroup renders the inner content in a fieldset with the title as legend.'), 'format_types' => array('open', 'collapsible', 'collapsed'), - 'instance_settings' => array('description' => '', 'classes' => '', 'required_fields' => 1), + 'instance_settings' => array('description' => '', 'classes' => '', 'required_fields' => 1, 'id' => ''), 'default_formatter' => 'collapsible', ), 'tabs' => array( 'label' => t('Vertical tabs group'), 'description' => t('This fieldgroup renders child groups in its own vertical tabs wrapper.'), - 'instance_settings' => array('classes' => ''), + 'instance_settings' => array('classes' => '', 'id' => ''), ), 'tab' => array( 'label' => t('Vertical tab'), @@ -328,14 +340,14 @@ function field_group_field_group_formatter_info() { 'htabs' => array( 'label' => t('Horizontal tabs group'), 'description' => t('This fieldgroup renders child groups in its own horizontal tabs wrapper.'), - 'instance_settings' => array('classes' => ''), + 'instance_settings' => array('classes' => '', 'id' => ''), ), 'htab' => array( 'label' => t('Horizontal tab'), 'format_types' => array('open', 'closed'), 'description' => t('This fieldgroup renders the content in a fieldset, part of horizontal tabs group.'), 'default_formatter' => 'closed', - 'instance_settings' => array('description' => '', 'classes' => '', 'required_fields' => 1, 'id' => ''), + 'instance_settings' => array('description' => '', 'classes' => '', 'required_fields' => 1), ), 'multipage-group' => array( 'label' => t('Multipage group'), @@ -352,7 +364,7 @@ function field_group_field_group_formatter_info() { 'accordion' => array( 'label' => t('Accordion group'), 'description' => t('This fieldgroup renders child groups as jQuery accordion.'), - 'instance_settings' => array('effect' => 'none', 'classes' => ''), + 'instance_settings' => array('effect' => 'none', 'classes' => '', 'id' => ''), ), 'accordion-item' => array( 'label' => t('Accordion item'), @@ -366,7 +378,7 @@ function field_group_field_group_formatter_info() { 'html-element' => array( 'label' => t('HTML element'), 'description' => t('This fieldgroup renders the inner content in a HTML element with classes and attributes.'), - 'instance_settings' => array('element' => 'div', 'show_label' => 0, 'label_element' => 'div', 'classes' => '', 'attributes' => '', 'required_fields' => 1), + 'instance_settings' => array('element' => 'div', 'show_label' => 0, 'label_element' => 'div', 'classes' => '', 'attributes' => '', 'required_fields' => 1, 'id' => ''), ), 'div' => array( 'label' => t('Div'), @@ -384,13 +396,13 @@ function field_group_field_group_formatter_info() { 'label' => t('Fieldset'), 'description' => t('This fieldgroup renders the inner content in a fieldset with the title as legend.'), 'format_types' => array('open', 'collapsible', 'collapsed'), - 'instance_settings' => array('description' => '', 'classes' => ''), + 'instance_settings' => array('description' => '', 'classes' => '', 'id' => ''), 'default_formatter' => 'collapsible', ), 'tabs' => array( 'label' => t('Vertical tabs group'), 'description' => t('This fieldgroup renders child groups in its own vertical tabs wrapper.'), - 'instance_settings' => array('classes' => ''), + 'instance_settings' => array('classes' => '', 'id' => ''), ), 'tab' => array( 'label' => t('Vertical tab'), @@ -402,7 +414,7 @@ function field_group_field_group_formatter_info() { 'htabs' => array( 'label' => t('Horizontal tabs group'), 'description' => t('This fieldgroup renders child groups in its own horizontal tabs wrapper.'), - 'instance_settings' => array('classes' => ''), + 'instance_settings' => array('classes' => '', 'id' => ''), ), 'htab' => array( 'label' => t('Horizontal tab item'), @@ -414,7 +426,7 @@ function field_group_field_group_formatter_info() { 'accordion' => array( 'label' => t('Accordion group'), 'description' => t('This fieldgroup renders child groups as jQuery accordion.'), - 'instance_settings' => array('description' => '', 'classes' => '', 'effect' => 'bounceslide'), + 'instance_settings' => array('description' => '', 'classes' => '', 'effect' => 'bounceslide', 'id' => ''), ), 'accordion-item' => array( 'label' => t('Accordion item'), @@ -706,12 +718,12 @@ function field_group_pre_render_html_element(&$element, $group, &$form) { $html_element = isset($group->format_settings['instance_settings']['element']) ? $group->format_settings['instance_settings']['element'] : 'div'; $show_label = isset($group->format_settings['instance_settings']['show_label']) ? $group->format_settings['instance_settings']['show_label'] : 0; $label_element = isset($group->format_settings['instance_settings']['label_element']) ? $group->format_settings['instance_settings']['label_element'] : 'div'; - $attributes = isset($group->format_settings['instance_settings']['attributes']) ? ' ' . $group->format_settings['instance_settings']['attributes'] : ''; + $configured_attributes = isset($group->format_settings['instance_settings']['attributes']) ? ' ' . $group->format_settings['instance_settings']['attributes'] : ''; $group->classes = trim($group->classes); // This regex split the attributes string so that we can pass that // later to drupal_attributes(). - preg_match_all('/([^\s=]+)="([^"]+)"/', $attributes, $matches); + preg_match_all('/([^\s=]+)="([^"]+)"/', $configured_attributes, $matches); $element_attributes = array(); // Put the attribute and the value together. @@ -727,7 +739,13 @@ function field_group_pre_render_html_element(&$element, $group, &$form) { $element_attributes['class'] .= ' ' . $group->classes; } - $attributes = drupal_attributes($element_attributes); + if (isset($element['#id'])) { + $element_attributes['id'] = $element['#id']; + } + + // Sanitize the attributes. + $element_attributes = _filter_xss_attributes(drupal_attributes($element_attributes)); + $attributes = $element_attributes ? ' ' . implode(' ', $element_attributes) : ''; $element['#prefix'] = '<' . $html_element . $attributes . '>'; if ($show_label) { @@ -810,9 +828,11 @@ function field_group_pre_render_accordion(&$element, $group, &$form) { // Add the jQuery UI accordion. $element['#attached']['library'][] = array('system', 'ui.accordion'); + $id = !empty($element['#id']) ? ' id="' . $element['#id'] . '"' : ''; + $element += array( '#type' => 'markup', - '#prefix' => '
',
+ '#suffix' => '
',
+ '#description' => t("When the resulting value is multiple valued and the context is passed on to a view as argument, the value can be concatenated in the form of 1+2+3 (for OR) or 1,2,3 (for AND)."),
+ );
+ return $form;
+}
+
+function entity_entity_property_edit_form_validate($form, &$form_state) {
+ $context_key = $form_state['values']['context'];
+ $context = $form_state['contexts'][$context_key];
+ $entity_type = $context->type[2];
+
+ try {
+ $all_properties = entity_get_all_property_info($entity_type);
+ $wrapper = entity_metadata_wrapper($entity_type, NULL, array('property info' => $all_properties));
+ $parts = explode(':', $form_state['values']['selector']);
+ foreach ($parts as $part) {
+ if (!($wrapper instanceof EntityStructureWrapper || $wrapper instanceof EntityListWrapper)) {
+ form_set_error('selector', t('Unable to apply the data selector part %key.'. array('%key' => $part)));
+ continue;
+ }
+ $wrapper = $wrapper->get($part);
+ }
+ $type = entity_entity_property_map_data_type($wrapper->type());
+ $form_state['conf']['target_context'] = $type;
+ }
+ catch (EntityMetadataWrapperException $e) {
+ form_set_error('selector', t('Unable to apply the data selector on entity type %type. @reason', array('@reason' => $e->getMessage(), '%type' => $entity_type)));
+ }
+
+ // Auto-generate a sane identifier.
+ if ($form_state['values']['identifier'] == $form['identifier']['#default_value']) {
+ $form_state['values']['identifier'] = 'Entity property ' . $entity_type . ':' . check_plain($form_state['values']['selector']);
+ }
+}
+
+/**
+ * Maps an entity-property data type to ctools types.
+ */
+function entity_entity_property_map_data_type($type) {
+ // Remove list<> wrappers from types.
+ while ($item_type = entity_property_list_extract_type($type)) {
+ $type = $item_type;
+ }
+ // Massage data type of entites to c
+ if (entity_get_info($type)) {
+ $type = "entity:$type";
+ }
+ if ($type == 'text') {
+ $type = 'string';
+ }
+ return $type;
+}
diff --git a/sites/all/modules/contrib/dev/entity/entity.features.inc b/sites/all/modules/contrib/dev/entity/entity.features.inc
index e266aaf..0ec3e61 100644
--- a/sites/all/modules/contrib/dev/entity/entity.features.inc
+++ b/sites/all/modules/contrib/dev/entity/entity.features.inc
@@ -7,6 +7,12 @@
/**
* Returns the configured entity features controller.
+ *
+ * @param string $type
+ * The entity type to get the controller for.
+ *
+ * @return EntityDefaultFeaturesController
+ * The configured entity features controller.
*/
function entity_features_get_controller($type) {
$static = &drupal_static(__FUNCTION__);
@@ -85,6 +91,7 @@ class EntityDefaultFeaturesController {
$fields = field_info_instances($this->info['bundle of'], $entity->{$this->bundleKey});
foreach ($fields as $name => $field) {
$pipe['field'][] = "{$field['entity_type']}-{$field['bundle']}-{$field['field_name']}";
+ $pipe['field_instance'][] = "{$field['entity_type']}-{$field['bundle']}-{$field['field_name']}";
}
}
}
@@ -125,9 +132,7 @@ class EntityDefaultFeaturesController {
*/
function revert($module = NULL) {
if ($defaults = features_get_default($this->type, $module)) {
- foreach ($defaults as $name => $entity) {
- entity_delete($this->type, $name);
- }
+ entity_delete_multiple($this->type, array_keys($defaults));
}
}
}
@@ -146,6 +151,8 @@ function entity_features_api() {
}
/**
+ * Implements hook_features_export_options().
+ *
* Features component callback.
*/
function entity_features_export_options($a1, $a2 = NULL) {
@@ -157,6 +164,8 @@ function entity_features_export_options($a1, $a2 = NULL) {
}
/**
+ * Implements hook_features_export().
+ *
* Features component callback.
*/
function entity_features_export($data, &$export, $module_name = '', $entity_type) {
@@ -164,6 +173,8 @@ function entity_features_export($data, &$export, $module_name = '', $entity_type
}
/**
+ * Implements hook_features_export_render().
+ *
* Features component callback.
*/
function entity_features_export_render($module, $data, $export = NULL, $entity_type) {
@@ -171,8 +182,23 @@ function entity_features_export_render($module, $data, $export = NULL, $entity_t
}
/**
+ * Implements hook_features_revert().
+ *
* Features component callback.
*/
function entity_features_revert($module = NULL, $entity_type) {
return entity_features_get_controller($entity_type)->revert($module);
}
+
+/**
+ * Implements hook_features_post_restore().
+ *
+ * Rebuild all defaults when a features rebuild is triggered - even the ones not
+ * handled by features itself.
+ */
+function entity_features_post_restore($op, $items = array()) {
+ if ($op == 'rebuild') {
+ // Use features rebuild to rebuild the features independent exports too.
+ entity_defaults_rebuild();
+ }
+}
diff --git a/sites/all/modules/contrib/dev/entity/entity.info b/sites/all/modules/contrib/dev/entity/entity.info
index a60170f..0b865a0 100644
--- a/sites/all/modules/contrib/dev/entity/entity.info
+++ b/sites/all/modules/contrib/dev/entity/entity.info
@@ -25,9 +25,9 @@ files[] = views/handlers/entity_views_handler_field_uri.inc
files[] = views/handlers/entity_views_handler_relationship_by_bundle.inc
files[] = views/handlers/entity_views_handler_relationship.inc
files[] = views/plugins/entity_views_plugin_row_entity_view.inc
-; Information added by Drupal.org packaging script on 2014-04-08
-version = "7.x-1.5"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1396975454"
+datestamp = "1518620551"
diff --git a/sites/all/modules/contrib/dev/entity/entity.info.inc b/sites/all/modules/contrib/dev/entity/entity.info.inc
index fd52d06..30da655 100644
--- a/sites/all/modules/contrib/dev/entity/entity.info.inc
+++ b/sites/all/modules/contrib/dev/entity/entity.info.inc
@@ -169,6 +169,7 @@ function _entity_metadata_convert_schema_type($type) {
switch ($type) {
case 'int':
case 'serial':
+ case 'date':
return 'integer';
case 'float':
case 'numeric':
diff --git a/sites/all/modules/contrib/dev/entity/entity.install b/sites/all/modules/contrib/dev/entity/entity.install
index f6f8cc2..118820b 100644
--- a/sites/all/modules/contrib/dev/entity/entity.install
+++ b/sites/all/modules/contrib/dev/entity/entity.install
@@ -13,6 +13,14 @@ function entity_enable() {
entity_entitycache_installed_modules();
}
+/**
+ * Implements hook_uninstall().
+ */
+function entity_uninstall() {
+ // Delete variables.
+ variable_del('entity_rebuild_on_flush');
+}
+
/**
* The entity API modules have been merged into a single module.
*/
diff --git a/sites/all/modules/contrib/dev/entity/entity.module b/sites/all/modules/contrib/dev/entity/entity.module
index d4a882c..da0acf6 100644
--- a/sites/all/modules/contrib/dev/entity/entity.module
+++ b/sites/all/modules/contrib/dev/entity/entity.module
@@ -184,8 +184,17 @@ function entity_ui_entity_page_view($entity) {
* Gets the page title for the passed operation.
*/
function entity_ui_get_page_title($op, $entity_type, $entity = NULL) {
- module_load_include('inc', 'entity', 'includes/entity.ui');
- $label = entity_label($entity_type, $entity);
+ if (isset($entity)) {
+ module_load_include('inc', 'entity', 'includes/entity.ui');
+ $label = entity_label($entity_type, $entity);
+ list(, , $bundle) = entity_extract_ids($entity_type, $entity);
+ }
+ else {
+ $info = entity_get_info($entity_type);
+ $label = $info['label'];
+ $bundle = NULL;
+ }
+
switch ($op) {
case 'view':
return $label;
@@ -200,12 +209,7 @@ function entity_ui_get_page_title($op, $entity_type, $entity = NULL) {
case 'export':
return t('Export @label', array('@label' => $label));
}
- if (isset($entity)) {
- list(, , $bundle) = entity_extract_ids($entity_type, $entity);
- }
- else {
- $bundle = NULL;
- }
+
return entity_ui_get_action_title($op, $entity_type, $bundle);
}
@@ -600,7 +604,7 @@ function entity_id($entity_type, $entity) {
* content language of the current request.
* @param $page
* (optional) If set will control if the entity is rendered: if TRUE
- * the entity will be rendered without its title, so that it can be embeded
+ * the entity will be rendered without its title, so that it can be embedded
* in another context. If FALSE the entity will be displayed with its title
* in a mode suitable for lists.
* If unset, the page mode will be enabled if the current path is the URI
@@ -1076,16 +1080,18 @@ function entity_flush_caches() {
// case of enabling or disabling modules we already rebuild defaults in
// entity_modules_enabled() and entity_modules_disabled(), so we do not need
// to do it again.
- if (current_path() != 'admin/modules/list/confirm') {
+ // Also check if rebuilding on cache flush is explicitly disabled.
+ if (current_path() != 'admin/modules/list/confirm' && variable_get('entity_rebuild_on_flush', TRUE)) {
entity_defaults_rebuild();
}
// Care about entitycache tables.
if (module_exists('entitycache')) {
$tables = array();
- foreach (entity_crud_get_info() as $entity_type => $entity_info) {
- if (isset($entity_info['module']) && !empty($entity_info['entity cache'])) {
- $tables[] = 'cache_entity_' . $entity_type;
+ $tables_created = variable_get('entity_cache_tables_created');
+ if (is_array($tables_created)) {
+ foreach ($tables_created as $module => $entity_cache_tables) {
+ $tables = array_merge($tables, $entity_cache_tables);
}
}
return $tables;
@@ -1372,7 +1378,7 @@ function entity_get_extra_fields_controller($type = NULL) {
* Returns a property wrapper for the given data.
*
* If an entity is wrapped, the wrapper can be used to retrieve further wrappers
- * for the entitity properties. For that the wrapper support chaining, e.g. you
+ * for the entity properties. For that the wrapper support chaining, e.g. you
* can use a node wrapper to get the node authors mail address:
*
* @code
@@ -1563,7 +1569,7 @@ function _entity_info_add_metadata(&$entity_info) {
* Implements hook_ctools_plugin_directory().
*/
function entity_ctools_plugin_directory($module, $plugin) {
- if ($module == 'ctools' && $plugin == 'content_types') {
- return 'ctools/content_types';
+ if ($module == 'ctools') {
+ return "ctools/$plugin";
}
}
diff --git a/sites/all/modules/contrib/dev/entity/entity.test b/sites/all/modules/contrib/dev/entity/entity.test
index 03c2551..fd8cea1 100644
--- a/sites/all/modules/contrib/dev/entity/entity.test
+++ b/sites/all/modules/contrib/dev/entity/entity.test
@@ -1342,6 +1342,74 @@ class EntityMetadataNodeRevisionAccessTestCase extends DrupalWebTestCase {
}
}
+/**
+ * Tests basic entity_access() functionality for taxonomy terms.
+ */
+class EntityMetadataTaxonomyAccessTestCase extends EntityWebTestCase {
+ public static function getInfo() {
+ return array(
+ 'name' => 'Entity Metadata Taxonomy Access',
+ 'description' => 'Test entity_access() for taxonomy terms',
+ 'group' => 'Entity API',
+ );
+ }
+
+ /**
+ * Asserts entity_access() correctly grants or denies access.
+ */
+ function assertTaxonomyMetadataAccess($ops, $term, $account) {
+ foreach ($ops as $op => $result) {
+ $msg = t("entity_access() returns @result with operation '@op'.", array('@result' => $result ? 'TRUE' : 'FALSE', '@op' => $op));
+ $access = entity_access($op, 'taxonomy_term', $term, $account);
+ $this->assertEqual($result, $access, $msg);
+ }
+ }
+
+ /**
+ * @inheritdoc
+ */
+ function setUp() {
+ parent::setUp('entity', 'taxonomy');
+ // Clear permissions for authenticated users.
+ db_delete('role_permission')
+ ->condition('rid', DRUPAL_AUTHENTICATED_RID)
+ ->execute();
+ }
+
+ /**
+ * Runs basic tests for entity_access() function.
+ */
+ function testTaxonomyMetadataAccess() {
+ $vocab = $this->createVocabulary();
+ $term = entity_property_values_create_entity('taxonomy_term', array(
+ 'name' => $this->randomName(),
+ 'vocabulary' => $vocab,
+ ))->save()->value();
+ // Clear permissions static cache to get new taxonomy permissions.
+ drupal_static_reset('checkPermissions');
+
+ // Check assignment of view permissions.
+ $user1 = $this->drupalCreateUser(array('access content'));
+ $this->assertTaxonomyMetadataAccess(array('create' => FALSE, 'view' => TRUE, 'update' => FALSE, 'delete' => FALSE), $term, $user1);
+
+ // Check assignment of edit permissions.
+ $user2 = $this->drupalCreateUser(array('edit terms in ' . $vocab->vid));
+ $this->assertTaxonomyMetadataAccess(array('create' => FALSE, 'view' => FALSE, 'update' => TRUE, 'delete' => FALSE), $term, $user2);
+
+ // Check assignment of delete permissions.
+ $user3 = $this->drupalCreateUser(array('delete terms in ' . $vocab->vid));
+ $this->assertTaxonomyMetadataAccess(array('create' => FALSE, 'view' => FALSE, 'update' => FALSE, 'delete' => TRUE), $term, $user3);
+
+ // Check assignment of view, edit, delete permissions.
+ $user4 = $this->drupalCreateUser(array('access content', 'edit terms in ' . $vocab->vid, 'delete terms in ' . $vocab->vid));
+ $this->assertTaxonomyMetadataAccess(array('create' => FALSE, 'view' => TRUE, 'update' => TRUE, 'delete' => TRUE), $term, $user4);
+
+ // Check assignment of administration permissions.
+ $user5 = $this->drupalCreateUser(array('administer taxonomy'));
+ $this->assertTaxonomyMetadataAccess(array('create' => TRUE, 'view' => TRUE, 'update' => TRUE, 'delete' => TRUE), $term, $user5);
+ }
+}
+
/**
* Tests provided entity property info of the core modules.
*/
@@ -1466,6 +1534,7 @@ class EntityMetadataIntegrationTestCase extends EntityWebTestCase {
$book = array('bid' => $node->nid, 'plid' => $node->book['mlid']);
$node2 = $this->drupalCreateNode(array('type' => 'book', 'book' => $book));
$node3 = $this->drupalCreateNode(array('type' => 'page'));
+ $node4 = $this->drupalCreateNode(array('type' => 'book', 'book' => array('bid' => 0, 'plid' => -1)));
// Test whether the properties work.
$wrapper = entity_metadata_wrapper('node', $node2);
@@ -1477,6 +1546,10 @@ class EntityMetadataIntegrationTestCase extends EntityWebTestCase {
$wrapper = entity_metadata_wrapper('node', $node3);
$this->assertEmpty($wrapper, 'book');
$this->assertEmptyArray($wrapper, 'book_ancestors');
+
+ // Test a book node which is not contained in a hierarchy.
+ $wrapper = entity_metadata_wrapper('node', $node4);
+ $this->assertEmptyArray($wrapper, 'book_ancestors');
}
/**
diff --git a/sites/all/modules/contrib/dev/entity/entity_token.info b/sites/all/modules/contrib/dev/entity/entity_token.info
index 194e213..c59c650 100644
--- a/sites/all/modules/contrib/dev/entity/entity_token.info
+++ b/sites/all/modules/contrib/dev/entity/entity_token.info
@@ -5,9 +5,9 @@ files[] = entity_token.tokens.inc
files[] = entity_token.module
dependencies[] = entity
-; Information added by Drupal.org packaging script on 2014-04-08
-version = "7.x-1.5"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1396975454"
+datestamp = "1518620551"
diff --git a/sites/all/modules/contrib/dev/entity/includes/entity.controller.inc b/sites/all/modules/contrib/dev/entity/includes/entity.controller.inc
index f675a63..5e86b52 100644
--- a/sites/all/modules/contrib/dev/entity/includes/entity.controller.inc
+++ b/sites/all/modules/contrib/dev/entity/includes/entity.controller.inc
@@ -107,7 +107,7 @@ interface EntityAPIControllerInterface extends DrupalEntityControllerInterface {
* content language of the current request.
* @param $page
* (optional) If set will control if the entity is rendered: if TRUE
- * the entity will be rendered without its title, so that it can be embeded
+ * the entity will be rendered without its title, so that it can be embedded
* in another context. If FALSE the entity will be displayed with its title
* in a mode suitable for lists.
* If unset, the page mode will be enabled if the current path is the URI
diff --git a/sites/all/modules/contrib/dev/entity/includes/entity.inc b/sites/all/modules/contrib/dev/entity/includes/entity.inc
index 4efd071..2f504f3 100644
--- a/sites/all/modules/contrib/dev/entity/includes/entity.inc
+++ b/sites/all/modules/contrib/dev/entity/includes/entity.inc
@@ -5,6 +5,168 @@
* Provides a base class for entities.
*/
+/**
+ * Interface for class based entities.
+ */
+interface EntityInterface {
+
+ /**
+ * Returns the internal, numeric identifier.
+ *
+ * Returns the numeric identifier, even if the entity type has specified a
+ * name key. In the latter case, the numeric identifier is supposed to be used
+ * when dealing generically with entities or internally to refer to an entity,
+ * i.e. in a relational database. If unsure, use Entity:identifier().
+ */
+ public function internalIdentifier();
+
+ /**
+ * Returns the entity identifier, i.e. the entities name or numeric id.
+ *
+ * @return
+ * The identifier of the entity. If the entity type makes use of a name key,
+ * the name is returned, else the numeric id.
+ *
+ * @see entity_id()
+ */
+ public function identifier();
+
+ /**
+ * Returns the info of the type of the entity.
+ *
+ * @see entity_get_info()
+ */
+ public function entityInfo();
+
+ /**
+ * Returns the type of the entity.
+ */
+ public function entityType();
+
+ /**
+ * Returns the bundle of the entity.
+ *
+ * @return
+ * The bundle of the entity. Defaults to the entity type if the entity type
+ * does not make use of different bundles.
+ */
+ public function bundle();
+
+ /**
+ * Returns the EntityMetadataWrapper of the entity.
+ *
+ * @return EntityDrupalWrapper
+ * An EntityMetadataWrapper containing the entity.
+ */
+ public function wrapper();
+
+ /**
+ * Returns the label of the entity.
+ *
+ * Modules may alter the label by specifying another 'label callback' using
+ * hook_entity_info_alter().
+ *
+ * @see entity_label()
+ */
+ public function label();
+
+ /**
+ * Returns the uri of the entity just as entity_uri().
+ *
+ * Modules may alter the uri by specifying another 'uri callback' using
+ * hook_entity_info_alter().
+ *
+ * @see entity_uri()
+ */
+ public function uri();
+
+ /**
+ * Checks if the entity has a certain exportable status.
+ *
+ * @param $status
+ * A status constant, i.e. one of ENTITY_CUSTOM, ENTITY_IN_CODE,
+ * ENTITY_OVERRIDDEN or ENTITY_FIXED.
+ *
+ * @return bool
+ * For exportable entities TRUE if the entity has the status, else FALSE.
+ * In case the entity is not exportable, NULL is returned.
+ *
+ * @see entity_has_status()
+ */
+ public function hasStatus($status);
+
+ /**
+ * Permanently saves the entity.
+ *
+ * @see entity_save()
+ */
+ public function save();
+
+ /**
+ * Permanently deletes the entity.
+ *
+ * @see entity_delete()
+ */
+ public function delete();
+
+ /**
+ * Exports the entity.
+ *
+ * @see entity_export()
+ */
+ public function export($prefix = '');
+
+ /**
+ * Generate an array for rendering the entity.
+ *
+ * @see entity_view()
+ */
+ public function view($view_mode = 'full', $langcode = NULL, $page = NULL);
+
+ /**
+ * Builds a structured array representing the entity's content.
+ *
+ * @see entity_build_content()
+ */
+ public function buildContent($view_mode = 'full', $langcode = NULL);
+
+ /**
+ * Gets the raw, translated value of a property or field.
+ *
+ * Supports retrieving field translations as well as i18n string translations.
+ *
+ * Note that this returns raw data values, which might not reflect what
+ * has been declared for hook_entity_property_info() as no 'getter callbacks'
+ * are invoked or no referenced entities are loaded. For retrieving values
+ * reflecting the property info make use of entity metadata wrappers, see
+ * entity_metadata_wrapper().
+ *
+ * @param $property
+ * The name of the property to return; e.g., 'title'.
+ * @param $langcode
+ * (optional) The language code of the language to which the value should
+ * be translated. If set to NULL, the default display language is being
+ * used.
+ *
+ * @return
+ * The raw, translated property value; or the raw, un-translated value if no
+ * translation is available.
+ *
+ * @todo Implement an analogous setTranslation() method for updating.
+ */
+ public function getTranslation($property, $langcode = NULL);
+
+ /**
+ * Checks whether the entity is the default revision.
+ *
+ * @return Boolean
+ *
+ * @see entity_revision_is_default()
+ */
+ public function isDefaultRevision();
+
+}
+
/**
* A common class for entities.
*
@@ -25,17 +187,16 @@
* public $count = 0;
* @endcode
*/
-class Entity {
+class Entity implements EntityInterface {
protected $entityType;
protected $entityInfo;
protected $idKey, $nameKey, $statusKey;
protected $defaultLabel = FALSE;
+ protected $wrapper;
/**
- * Creates a new entity.
- *
- * @see entity_create()
+ * {@inheritdoc}
*/
public function __construct(array $values = array(), $entityType = NULL) {
if (empty($entityType)) {
@@ -60,64 +221,56 @@ class Entity {
}
/**
- * Returns the internal, numeric identifier.
- *
- * Returns the numeric identifier, even if the entity type has specified a
- * name key. In the latter case, the numeric identifier is supposed to be used
- * when dealing generically with entities or internally to refer to an entity,
- * i.e. in a relational database. If unsure, use Entity:identifier().
+ * {@inheritdoc}
*/
public function internalIdentifier() {
return isset($this->{$this->idKey}) ? $this->{$this->idKey} : NULL;
}
/**
- * Returns the entity identifier, i.e. the entities name or numeric id.
- *
- * @return
- * The identifier of the entity. If the entity type makes use of a name key,
- * the name is returned, else the numeric id.
- *
- * @see entity_id()
+ * {@inheritdoc}
*/
public function identifier() {
return isset($this->{$this->nameKey}) ? $this->{$this->nameKey} : NULL;
}
/**
- * Returns the info of the type of the entity.
- *
- * @see entity_get_info()
+ * {@inheritdoc}
*/
public function entityInfo() {
return $this->entityInfo;
}
/**
- * Returns the type of the entity.
+ * {@inheritdoc}
*/
public function entityType() {
return $this->entityType;
}
/**
- * Returns the bundle of the entity.
- *
- * @return
- * The bundle of the entity. Defaults to the entity type if the entity type
- * does not make use of different bundles.
+ * {@inheritdoc}
*/
public function bundle() {
return !empty($this->entityInfo['entity keys']['bundle']) ? $this->{$this->entityInfo['entity keys']['bundle']} : $this->entityType;
}
/**
- * Returns the label of the entity.
- *
- * Modules may alter the label by specifying another 'label callback' using
- * hook_entity_info_alter().
- *
- * @see entity_label()
+ * {@inheritdoc}
+ */
+ public function wrapper() {
+ if (empty($this->wrapper)) {
+ $this->wrapper = entity_metadata_wrapper($this->entityType, $this);
+ }
+ elseif ($this->wrapper->value() !== $this) {
+ // Wrapper has been modified outside, so let's better create a new one.
+ $this->wrapper = entity_metadata_wrapper($this->entityType, $this);
+ }
+ return $this->wrapper;
+ }
+
+ /**
+ * {@inheritdoc}
*/
public function label() {
// If the default label flag is enabled, this is being invoked recursively.
@@ -147,12 +300,7 @@ class Entity {
}
/**
- * Returns the uri of the entity just as entity_uri().
- *
- * Modules may alter the uri by specifying another 'uri callback' using
- * hook_entity_info_alter().
- *
- * @see entity_uri()
+ * {@inheritdoc}
*/
public function uri() {
if (isset($this->entityInfo['uri callback']) && $this->entityInfo['uri callback'] == 'entity_class_uri') {
@@ -170,17 +318,7 @@ class Entity {
}
/**
- * Checks if the entity has a certain exportable status.
- *
- * @param $status
- * A status constant, i.e. one of ENTITY_CUSTOM, ENTITY_IN_CODE,
- * ENTITY_OVERRIDDEN or ENTITY_FIXED.
- *
- * @return
- * For exportable entities TRUE if the entity has the status, else FALSE.
- * In case the entity is not exportable, NULL is returned.
- *
- * @see entity_has_status()
+ * {@inheritdoc}
*/
public function hasStatus($status) {
if (!empty($this->entityInfo['exportable'])) {
@@ -189,18 +327,14 @@ class Entity {
}
/**
- * Permanently saves the entity.
- *
- * @see entity_save()
+ * {@inheritdoc}
*/
public function save() {
return entity_get_controller($this->entityType)->save($this);
}
/**
- * Permanently deletes the entity.
- *
- * @see entity_delete()
+ * {@inheritdoc}
*/
public function delete() {
$id = $this->identifier();
@@ -210,55 +344,28 @@ class Entity {
}
/**
- * Exports the entity.
- *
- * @see entity_export()
+ * {@inheritdoc}
*/
public function export($prefix = '') {
return entity_get_controller($this->entityType)->export($this, $prefix);
}
/**
- * Generate an array for rendering the entity.
- *
- * @see entity_view()
+ * {@inheritdoc}
*/
public function view($view_mode = 'full', $langcode = NULL, $page = NULL) {
return entity_get_controller($this->entityType)->view(array($this), $view_mode, $langcode, $page);
}
/**
- * Builds a structured array representing the entity's content.
- *
- * @see entity_build_content()
+ * {@inheritdoc}
*/
public function buildContent($view_mode = 'full', $langcode = NULL) {
return entity_get_controller($this->entityType)->buildContent($this, $view_mode, $langcode);
}
/**
- * Gets the raw, translated value of a property or field.
- *
- * Supports retrieving field translations as well as i18n string translations.
- *
- * Note that this returns raw data values, which might not reflect what
- * has been declared for hook_entity_property_info() as no 'getter callbacks'
- * are invoked or no referenced entities are loaded. For retrieving values
- * reflecting the property info make use of entity metadata wrappers, see
- * entity_metadata_wrapper().
- *
- * @param $property_name
- * The name of the property to return; e.g., 'title'.
- * @param $langcode
- * (optional) The language code of the language to which the value should
- * be translated. If set to NULL, the default display language is being
- * used.
- *
- * @return
- * The raw, translated property value; or the raw, un-translated value if no
- * translation is available.
- *
- * @todo Implement an analogous setTranslation() method for updating.
+ * {@inheritdoc}
*/
public function getTranslation($property, $langcode = NULL) {
$all_info = entity_get_all_property_info($this->entityType);
@@ -278,11 +385,7 @@ class Entity {
}
/**
- * Checks whether the entity is the default revision.
- *
- * @return Boolean
- *
- * @see entity_revision_is_default()
+ * {@inheritdoc}
*/
public function isDefaultRevision() {
if (!empty($this->entityInfo['entity keys']['revision'])) {
diff --git a/sites/all/modules/contrib/dev/entity/includes/entity.property.inc b/sites/all/modules/contrib/dev/entity/includes/entity.property.inc
index 38e4fd7..e8714e6 100644
--- a/sites/all/modules/contrib/dev/entity/includes/entity.property.inc
+++ b/sites/all/modules/contrib/dev/entity/includes/entity.property.inc
@@ -69,7 +69,7 @@ function entity_property_info_defaults() {
* (optiona) The entity type to return properties for.
*
* @return
- * An array of info about properties. If the type is ommitted, all known
+ * An array of info about properties. If the type is omitted, all known
* properties are returned.
*/
function entity_get_all_property_info($entity_type = NULL) {
diff --git a/sites/all/modules/contrib/dev/entity/includes/entity.ui.inc b/sites/all/modules/contrib/dev/entity/includes/entity.ui.inc
index 1826da4..24e3c2b 100644
--- a/sites/all/modules/contrib/dev/entity/includes/entity.ui.inc
+++ b/sites/all/modules/contrib/dev/entity/includes/entity.ui.inc
@@ -127,8 +127,8 @@ class EntityDefaultUIController {
* Use per bundle form ids if possible, such that easy per bundle alterations
* are supported too.
*
- * Note that for performance reasons, this method is only invoked for forms,
- * which receive the entity_type as first argument. Thus any forms added, must
+ * Note that for performance reasons, this method is invoked only for forms
+ * which receive the entity_type as first argument. Thus any forms added must
* follow that pattern.
*
* @see entity_forms()
@@ -645,7 +645,7 @@ function entity_ui_operation_form($form, &$form_state, $entity_type, $entity, $o
*/
function entity_ui_main_form_defaults($form, &$form_state, $entity = NULL, $op = NULL) {
// Now equals entity_ui_form_defaults() but is still here to keep backward
- // compatability.
+ // compatibility.
return entity_ui_form_defaults($form, $form_state, $form_state['entity_type'], $entity, $op);
}
@@ -760,7 +760,7 @@ function entity_ui_validate_machine_name($element, &$form_state) {
function theme_entity_ui_overview_item($variables) {
$output = $variables['url'] ? l($variables['label'], $variables['url']['path'], $variables['url']['options']) : check_plain($variables['label']);
if ($variables['name']) {
- $output .= ' (' . t('Machine name') . ': ' . check_plain($variables['name']) . ')';
+ $output .= ' (' . t('Machine name') . ': ' . check_plain($variables['name']) . ')';
}
return $output;
}
diff --git a/sites/all/modules/contrib/dev/entity/includes/entity.wrapper.inc b/sites/all/modules/contrib/dev/entity/includes/entity.wrapper.inc
index 67764e7..860d2c3 100644
--- a/sites/all/modules/contrib/dev/entity/includes/entity.wrapper.inc
+++ b/sites/all/modules/contrib/dev/entity/includes/entity.wrapper.inc
@@ -119,7 +119,11 @@ abstract class EntityMetadataWrapper {
*/
public function set($value) {
if (!$this->validate($value)) {
- throw new EntityMetadataWrapperException('Invalid data value given. Be sure it matches the required data type and format.');
+ throw new EntityMetadataWrapperException(t('Invalid data value given. Be sure it matches the required data type and format. Value at !location: !value.', array(
+ // An exception's message is output through check_plain().
+ '!value' => is_array($value) || is_object($value) ? var_export($value, TRUE) : $value,
+ '!location' => $this->debugIdentifierLocation(),
+ )));
}
$this->clear();
$this->data = $value;
@@ -231,6 +235,21 @@ abstract class EntityMetadataWrapper {
return !empty($this->info['parent']) ? $this->info['parent']->propertyAccess($this->info['name'], $op, $account) : TRUE;
}
+ /**
+ * Returns a string to use to identify this wrapper in error messages.
+ *
+ * @return
+ * A string that identifies this wrapper and its chain of ancestors, of the
+ * form 'grandparentidentifier->parentidentifier->identifier'.
+ */
+ public function debugIdentifierLocation() {
+ $debug = $this->info['name'];
+ if (isset($this->info['parent'])) {
+ $debug = $this->info['parent']->debugIdentifierLocation() . '->' . $debug;
+ }
+ return $debug;
+ }
+
/**
* Prepare for serializiation.
*/
@@ -504,7 +523,7 @@ class EntityStructureWrapper extends EntityMetadataWrapper implements IteratorAg
while (!($entity instanceof EntityDrupalWrapper) && isset($entity->info['parent'])) {
$entity = $entity->info['parent'];
}
- if ($entity instanceof EntityDrupalWrapper && !$entity->entityAccess('update', $account)) {
+ if ($entity instanceof EntityDrupalWrapper && $entity->entityAccess('update', $account) === FALSE) {
return FALSE;
}
}
@@ -515,6 +534,7 @@ class EntityStructureWrapper extends EntityMetadataWrapper implements IteratorAg
elseif ($op == 'edit' && isset($info['setter permission'])) {
return user_access($info['setter permission'], $account);
}
+ // If access is unknown, we return TRUE.
return TRUE;
}
@@ -733,7 +753,11 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
*/
public function set($value) {
if (!$this->validate($value)) {
- throw new EntityMetadataWrapperException('Invalid data value given. Be sure it matches the required data type and format.');
+ throw new EntityMetadataWrapperException(t('Invalid data value given. Be sure it matches the required data type and format. Value at !location: !value.', array(
+ // An exception's message is output through check_plain().
+ '!value' => is_array($value) || is_object($value) ? var_export($value, TRUE) : $value,
+ '!location' => $this->debugIdentifierLocation(),
+ )));
}
if ($this->info['type'] == 'entity' && $value === $this) {
// Nothing to do.
@@ -809,11 +833,23 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
if (!empty($this->info['parent'])) {
// If this is a property, make sure the user is able to view the
// currently referenced entity also.
- return $this->entityAccess('view', $account) && parent::access($op, $account);
+ if ($this->entityAccess('view', $account) === FALSE) {
+ return FALSE;
+ }
+ if (parent::access($op, $account) === FALSE) {
+ return FALSE;
+ }
+ // If access is unknown, we return TRUE.
+ return TRUE;
}
else {
// This is not a property, so fallback on entity access.
- return $this->entityAccess($op == 'edit' ? 'update' : 'view', $account);
+ if ($op == 'edit') {
+ // If the operation is "edit" determine if its actually a "create" for
+ // new un-saved entities, or an "update" for existing ones.
+ return $this->entityAccess($this->getIdentifier() ? 'update' : 'create', $account);
+ }
+ return $this->entityAccess('view', $account);
}
}
@@ -901,6 +937,27 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
}
}
+ /**
+ * Returns a string to use to identify this wrapper in error messages.
+ */
+ public function debugIdentifierLocation() {
+ // An entity wrapper can be at the top of the chain or a part of it.
+ if (isset($this->info['name'])) {
+ // This wrapper is part of a chain, eg in the position node->author.
+ // Return the name.
+ $debug = $this->info['name'];
+ }
+ else {
+ // This is a wrapper for an actual entity: return its type and id.
+ $debug = $this->info['type'] . '(' . $this->getIdentifier() . ')';
+ }
+
+ if (isset($this->info['parent'])) {
+ $debug = $this->info['parent']->debugIdentifierLocation() . '->' . $debug;
+ }
+ return $debug;
+ }
+
/**
* Prepare for serializiation.
*/
@@ -1059,7 +1116,7 @@ class EntityListWrapper extends EntityMetadataWrapper implements IteratorAggrega
*/
public function getIterator() {
// In case there is no data available, just iterate over the first item.
- return new EntityMetadataWrapperIterator($this, $this->dataAvailable() ? array_keys(parent::value()) : array(0));
+ return new EntityMetadataWrapperIterator($this, ($this->dataAvailable() && is_array(parent::value())) ? array_keys(parent::value()) : array(0));
}
/**
diff --git a/sites/all/modules/contrib/dev/entity/modules/callbacks.inc b/sites/all/modules/contrib/dev/entity/modules/callbacks.inc
index 3865efd..ee156ab 100644
--- a/sites/all/modules/contrib/dev/entity/modules/callbacks.inc
+++ b/sites/all/modules/contrib/dev/entity/modules/callbacks.inc
@@ -29,7 +29,7 @@ function entity_metadata_book_get_properties($node, array $options, $name, $enti
case 'book_ancestors':
$ancestors = array();
- while (!empty($node->book['plid'])) {
+ while (!empty($node->book['plid']) && $node->book['plid'] != -1) {
$link = book_link_load($node->book['plid']);
array_unshift($ancestors, $link['nid']);
$node = node_load($link['nid']);
@@ -670,9 +670,11 @@ function entity_metadata_field_file_validate_item($items, $context) {
function entity_metadata_no_hook_node_access($op, $node = NULL, $account = NULL) {
// First deal with the case where a $node is provided.
if (isset($node)) {
- if ($op == 'create') {
+ if (empty($node->vid) && in_array($op, array('create', 'update'))) {
+ // This is a new node or the original node.
if (isset($node->type)) {
- return node_access($op, $node->type, $account);
+ $op = empty($node->nid) || !empty($node->is_new) ? 'create' : 'update';
+ return node_access($op, $op == 'create' ? $node->type : $node, $account);
}
else {
throw new EntityMalformedException('Permission to create a node was requested but no node type was given.');
@@ -703,13 +705,14 @@ function entity_metadata_no_hook_node_access($op, $node = NULL, $account = NULL)
/**
* Access callback for the user entity.
*/
-function entity_metadata_user_access($op, $entity = NULL, $account = NULL, $entity_type) {
+function entity_metadata_user_access($op, $entity = NULL, $account = NULL, $entity_type = NULL) {
$account = isset($account) ? $account : $GLOBALS['user'];
// Grant access to the users own user account and to the anonymous one.
- if (isset($entity) && $op != 'delete' && (($entity->uid == $account->uid && $entity->uid) || (!$entity->uid && $op == 'view'))) {
+ if (isset($entity->uid) && $op != 'delete' && (($entity->uid == $account->uid && $entity->uid) || (!$entity->uid && $op == 'view'))) {
return TRUE;
}
- if (user_access('administer users', $account) || user_access('access user profiles', $account) && $op == 'view' && $entity->status) {
+ if (user_access('administer users', $account)
+ || user_access('access user profiles', $account) && $op == 'view' && (empty($entity) || !empty($entity->status))) {
return TRUE;
}
return FALSE;
@@ -724,7 +727,7 @@ function entity_metadata_user_properties_access($op, $property, $entity = NULL,
}
$account = isset($account) ? $account : $GLOBALS['user'];
// Flag to indicate if this user entity is the own user account.
- $is_own_account = isset($entity) && $account->uid == $entity->uid;
+ $is_own_account = isset($entity->uid) && $account->uid == $entity->uid;
switch ($property) {
case 'name':
// Allow view access to anyone with access to the entity.
@@ -794,15 +797,36 @@ function entity_metadata_comment_properties_access($op, $property, $entity = NUL
/**
* Access callback for the taxonomy entities.
*/
-function entity_metadata_taxonomy_access($op, $entity = NULL, $account = NULL, $entity_type) {
- if ($entity_type == 'taxonomy_vocabulary') {
- return user_access('administer taxonomy', $account);
- }
- if (isset($entity) && $op == 'update' && !isset($account) && taxonomy_term_edit_access($entity)) {
+function entity_metadata_taxonomy_access($op, $entity = NULL, $account = NULL, $entity_type = NULL) {
+ // If user has administer taxonomy permission then no further checks.
+ if (user_access('administer taxonomy', $account)) {
return TRUE;
}
- if (user_access('administer taxonomy', $account) || user_access('access content', $account) && $op == 'view') {
- return TRUE;
+ switch ($op) {
+ case "view":
+ if (user_access('access content', $account)) {
+ return TRUE;
+ }
+ break;
+ case "update":
+ if ($entity_type == 'taxonomy_term') {
+ return user_access("edit terms in $entity->vid", $account);
+ }
+ break;
+ case "create":
+ if ($entity_type == 'taxonomy_term') {
+ // Check for taxonomy_access_fix contrib module which adds additional
+ // permissions to create new terms in a given vocabulary.
+ if (function_exists('taxonomy_access_fix_access')) {
+ return taxonomy_access_fix_access('add terms', $entity->vocabulary_machine_name);
+ }
+ }
+ break;
+ case "delete":
+ if ($entity_type == 'taxonomy_term') {
+ return user_access("delete terms in $entity->vid", $account);
+ }
+ break;
}
return FALSE;
}
diff --git a/sites/all/modules/contrib/dev/entity/modules/field.info.inc b/sites/all/modules/contrib/dev/entity/modules/field.info.inc
index 9ef372b..aeea79a 100644
--- a/sites/all/modules/contrib/dev/entity/modules/field.info.inc
+++ b/sites/all/modules/contrib/dev/entity/modules/field.info.inc
@@ -51,7 +51,10 @@ function entity_metadata_field_default_property_callback(&$info, $entity_type, $
$property = &$info[$entity_type]['bundles'][$instance['bundle']]['properties'][$name];
$instance += array('property info' => array());
$property = $instance['property info'] + array(
- 'label' => $instance['label'],
+ // Since the label will be exposed via hook_token_info() and it is not
+ // clearly defined if that should be sanitized already we prevent XSS
+ // right here (field labels are user provided text).
+ 'label' => filter_xss_admin($instance['label']),
'type' => $field_type['property_type'],
'description' => t('Field "@name".', array('@name' => $name)),
'getter callback' => 'entity_metadata_field_property_get',
@@ -164,7 +167,7 @@ function entity_metadata_field_image_callback(&$info, $entity_type, $field, $ins
if (empty($instance['settings']['alt_field'])) {
unset($property['property info']['alt']);
}
- if (empty($field['settings']['title_field'])) {
+ if (empty($instance['settings']['title_field'])) {
unset($property['property info']['title']);
}
}
diff --git a/sites/all/modules/contrib/dev/entity/modules/node.info.inc b/sites/all/modules/contrib/dev/entity/modules/node.info.inc
index 3512d9a..f146a7e 100644
--- a/sites/all/modules/contrib/dev/entity/modules/node.info.inc
+++ b/sites/all/modules/contrib/dev/entity/modules/node.info.inc
@@ -163,4 +163,10 @@ function entity_metadata_node_entity_property_info_alter(&$info) {
'auto creation' => 'entity_property_create_array',
'field' => TRUE,
);
+
+ // Make it a list if cardinality is not 1.
+ $field_body = field_info_field('body');
+ if (isset($field_body) && $field_body['cardinality'] != 1) {
+ $info['node']['properties']['body']['type'] = 'list', $summary); @@ -1171,19 +1279,22 @@ function entityreference_field_formatter_settings_summary($field, $instance, $vi * Implements hook_field_formatter_prepare_view(). */ function entityreference_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) { + $field_type_settings = entityreference_field_type_settings($field); + $target_type = $field_type_settings['entity_type']; + $column = $field_type_settings['column']; $target_ids = array(); // Collect every possible entity attached to any of the entities. foreach ($entities as $id => $entity) { foreach ($items[$id] as $delta => $item) { - if (isset($item['target_id'])) { - $target_ids[] = $item['target_id']; + if (isset($item[$column])) { + $target_ids[] = $item[$column]; } } } if ($target_ids) { - $target_entities = entity_load($field['settings']['target_type'], $target_ids); + $target_entities = entity_load($target_type, $target_ids); } else { $target_entities = array(); @@ -1195,12 +1306,12 @@ function entityreference_field_formatter_prepare_view($entity_type, $entities, $ foreach ($items[$id] as $delta => $item) { // Check whether the referenced entity could be loaded. - if (isset($target_entities[$item['target_id']])) { + if (isset($target_entities[$item[$column]]) && isset($target_entities[$item[$column]])) { // Replace the instance value with the term data. - $items[$id][$delta]['entity'] = $target_entities[$item['target_id']]; + $items[$id][$delta]['entity'] = $target_entities[$item[$column]]; // Check whether the user has access to the referenced entity. - $has_view_access = (entity_access('view', $field['settings']['target_type'], $target_entities[$item['target_id']]) !== FALSE); - $has_update_access = (entity_access('update', $field['settings']['target_type'], $target_entities[$item['target_id']]) !== FALSE); + $has_view_access = (entity_access('view', $target_type, $target_entities[$item[$column]]) !== FALSE); + $has_update_access = (entity_access('update', $target_type, $target_entities[$item[$column]]) !== FALSE); $items[$id][$delta]['access'] = ($has_view_access || $has_update_access); } // Otherwise, unset the instance value, since the entity does not exist. @@ -1223,52 +1334,91 @@ function entityreference_field_formatter_prepare_view($entity_type, $entities, $ function entityreference_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { $result = array(); $settings = $display['settings']; - - // Rebuild the items list to contain only those with access. - foreach ($items as $key => $item) { - if (empty($item['access'])) { - unset($items[$key]); - } - } + $field_type_settings = entityreference_field_type_settings($field); + $target_type = $field_type_settings['entity_type']; + $column = $field_type_settings['column']; switch ($display['type']) { case 'entityreference_label': $handler = entityreference_get_selection_handler($field, $instance, $entity_type, $entity); foreach ($items as $delta => $item) { - $label = $handler->getLabel($item['entity']); - // If the link is to be displayed and the entity has a uri, display a link. - // Note the assignment ($url = ) here is intended to be an assignment. - if ($display['settings']['link'] && ($uri = entity_uri($field['settings']['target_type'], $item['entity']))) { - $result[$delta] = array('#markup' => l($label, $uri['path'], $uri['options'])); + // Skip an item that is not accessible, unless we're allowing output of + // entity labels without considering access. + if (empty($item['access']) && !$display['settings']['bypass_access']) { + continue; } - else { - $result[$delta] = array('#markup' => check_plain($label)); + + // Calling EntityReferenceHandler::getLabel() would make a repeated, + // wasteful call to entity_access(). + $label = entity_label($field['settings']['target_type'], $item['entity']); + + // Check if the settings and access allow a link to be displayed. + $display_link = $display['settings']['link'] && $item['access']; + + $uri = NULL; + + // If the link is allowed and the entity has a uri, display a link. + if ($display_link) { + $uri = entity_uri($target_type, $item['entity']); } + + $result[$delta] = array( + '#theme' => 'entityreference_label', + '#label' => $label, + '#item' => $item, + '#uri' => $uri, + '#settings' => array( + 'display' => $display['settings'], + 'field' => $field['settings'], + ), + ); } break; case 'entityreference_entity_id': foreach ($items as $delta => $item) { - $result[$delta] = array('#markup' => check_plain($item['target_id'])); + // Skip an item that is not accessible. + if (empty($item['access'])) { + continue; + } + + $result[$delta] = array( + '#theme' => 'entityreference_entity_id', + '#item' => $item, + '#settings' => array( + 'display' => $display['settings'], + 'field' => $field['settings'], + ), + ); } break; case 'entityreference_entity_view': + $target_langcode = $langcode; + if (!empty($settings['use_content_language']) && !empty($GLOBALS['language_content']->language)) { + $target_langcode = $GLOBALS['language_content']->language; + } + foreach ($items as $delta => $item) { + // Skip an item that is not accessible. + if (empty($item['access'])) { + continue; + } + // Protect ourselves from recursive rendering. static $depth = 0; $depth++; if ($depth > 20) { - throw new EntityReferenceRecursiveRenderingException(t('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $entity_type, '@entity_id' => $item['target_id']))); + throw new EntityReferenceRecursiveRenderingException(t('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $target_type, '@entity_id' => $item[$column]))); } - $entity = clone $item['entity']; - unset($entity->content); - $result[$delta] = entity_view($field['settings']['target_type'], array($item['target_id'] => $entity), $settings['view_mode'], $langcode, FALSE); + $target_entity = clone $item['entity']; + unset($target_entity->content); + $result[$delta] = entity_view($target_type, array($item[$column] => $target_entity), $settings['view_mode'], $target_langcode, FALSE); - if (empty($settings['links']) && isset($result[$delta][$field['settings']['target_type']][$item['target_id']]['links'])) { - $result[$delta][$field['settings']['target_type']][$item['target_id']]['links']['#access'] = FALSE; + if (empty($settings['links']) && isset($result[$delta][$target_type][$column]['links'])) { + $result[$delta][$target_type][$item[$column]]['links']['#access'] = FALSE; } $depth = 0; } @@ -1292,3 +1442,44 @@ function entityreference_views_api() { 'path' => drupal_get_path('module', 'entityreference') . '/views', ); } + +/** + * Theme label. + * + * @ingroup themeable. + */ +function theme_entityreference_label($vars) { + $label = $vars['label']; + $settings = $vars['settings']; + $item = $vars['item']; + $uri = $vars['uri']; + + $output = ''; + + // If the link is to be displayed and the entity has a uri, display a link. + // Note the assignment ($url = ) here is intended to be an assignment. + if ($settings['display']['link'] && isset($uri['path'])) { + $output .= l($label, $uri['path'], $uri['options']); + } + else { + $output .= check_plain($label); + } + + return $output; +} + +/** + * Theme entity_id + * + * @ingroup themeable. + */ +function theme_entityreference_entity_id($vars) { + $settings = $vars['settings']; + $item = $vars['item']; + + $output = ''; + + $output = check_plain($item['target_id']); + + return $output; +} diff --git a/sites/all/modules/contrib/fields/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info b/sites/all/modules/contrib/fields/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info index 88ad7b5..70bcc4f 100644 --- a/sites/all/modules/contrib/fields/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info +++ b/sites/all/modules/contrib/fields/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info @@ -4,9 +4,9 @@ core = 7.x package = Fields dependencies[] = entityreference -; Information added by packaging script on 2013-11-20 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-08-16 +version = "7.x-1.5" core = "7.x" project = "entityreference" -datestamp = "1384973110" +datestamp = "1502895850" diff --git a/sites/all/modules/contrib/fields/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php b/sites/all/modules/contrib/fields/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php index 43ac693..075b54d 100644 --- a/sites/all/modules/contrib/fields/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php +++ b/sites/all/modules/contrib/fields/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php @@ -144,18 +144,20 @@ class EntityReferenceBehavior_TaxonomyIndex extends EntityReference_BehaviorHand // already inserted in taxonomy_build_node_index(). $tid_all = array_diff($tid_all, $original_tid_all); - // Insert index entries for all the node's terms. + // Insert index entries for all the node's terms, preventing duplicates. if (!empty($tid_all)) { - $query = db_insert('taxonomy_index')->fields(array('nid', 'tid', 'sticky', 'created')); foreach ($tid_all as $tid) { - $query->values(array( + $row = array( 'nid' => $node->nid, 'tid' => $tid, 'sticky' => $sticky, 'created' => $node->created, - )); + ); + $query = db_merge('taxonomy_index') + ->key($row) + ->fields($row); + $query->execute(); } - $query->execute(); } } } diff --git a/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php index 444a74c..6ec28a4 100644 --- a/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php +++ b/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php @@ -208,7 +208,11 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select * Implements EntityReferenceHandler::validateAutocompleteInput(). */ public function validateAutocompleteInput($input, &$element, &$form_state, $form) { - $entities = $this->getReferencableEntities($input, '=', 6); + $bundled_entities = $this->getReferencableEntities($input, '=', 6); + $entities = array(); + foreach($bundled_entities as $entities_list) { + $entities += $entities_list; + } if (empty($entities)) { // Error if there are no entities available for a required field. form_error($element, t('There are no entities matching "%value"', array('%value' => $input))); @@ -305,7 +309,7 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select */ public function getLabel($entity) { $target_type = $this->field['settings']['target_type']; - return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -'); + return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t(ENTITYREFERENCE_DENIED); } /** @@ -339,9 +343,11 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select // Join the known base-table. $target_type = $this->field['settings']['target_type']; $entity_info = entity_get_info($target_type); + $target_type_base_table = $entity_info['base table']; $id = $entity_info['entity keys']['id']; + // Return the alias of the table. - return $query->innerJoin($target_type, NULL, "%alias.$id = $alias.entity_id"); + return $query->innerJoin($target_type_base_table, NULL, "%alias.$id = $alias.entity_id"); } } @@ -543,7 +549,7 @@ class EntityReference_SelectionHandler_Generic_taxonomy_term extends EntityRefer if ($vocabulary = taxonomy_vocabulary_machine_name_load($bundle)) { if ($terms = taxonomy_get_tree($vocabulary->vid, 0, NULL, TRUE)) { foreach ($terms as $term) { - $options[$vocabulary->machine_name][$term->tid] = str_repeat('-', $term->depth) . check_plain($term->name); + $options[$vocabulary->machine_name][$term->tid] = str_repeat('-', $term->depth) . check_plain(entity_label('taxonomy_term', $term)); } } } diff --git a/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php b/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php index 1b036a7..cbed33b 100644 --- a/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php +++ b/sites/all/modules/contrib/fields/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php @@ -9,12 +9,13 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio * Implements EntityReferenceHandler::getInstance(). */ public static function getInstance($field, $instance = NULL, $entity_type = NULL, $entity = NULL) { - return new EntityReference_SelectionHandler_Views($field, $instance); + return new EntityReference_SelectionHandler_Views($field, $instance, $entity); } - protected function __construct($field, $instance) { + protected function __construct($field, $instance, $entity) { $this->field = $field; $this->instance = $instance; + $this->entity = $entity; } /** @@ -52,13 +53,32 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio ); $default = !empty($view_settings['args']) ? implode(', ', $view_settings['args']) : ''; + $description = t('Provide a comma separated list of arguments to pass to the view.') . '
' . t('This field supports tokens.'); + + if (!module_exists('token')) { + $description .= '
' . t('Install the token module to get more tokens and display available once.', array('@url' => 'http://drupal.org/project/token')); + } + $form['view']['args'] = array( '#type' => 'textfield', '#title' => t('View arguments'), '#default_value' => $default, '#required' => FALSE, - '#description' => t('Provide a comma separated list of arguments to pass to the view.'), + '#description' => $description, + '#maxlength' => '512', ); + if (module_exists('token')) { + // Get the token type for the entity type our field is in (a type 'taxonomy_term' has a 'term' type token). + $info = entity_get_info($instance['entity_type']); + + $form['view']['tokens'] = array( + '#theme' => 'token_tree', + '#token_types' => array($info['token type']), + '#global_types' => TRUE, + '#click_insert' => TRUE, + '#dialog' => TRUE, + ); + } } else { $form['view']['no_view_help'] = array( @@ -84,6 +104,7 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio return FALSE; } $this->view->set_display($display_name); + $this->view->pre_execute(); // Make sure the query is not cached. $this->view->is_cacheable = FALSE; @@ -104,7 +125,7 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio */ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) { $display_name = $this->field['settings']['handler_settings']['view']['display_name']; - $args = $this->field['settings']['handler_settings']['view']['args']; + $args = $this->handleArgs($this->field['settings']['handler_settings']['view']['args']); $result = array(); if ($this->initializeView($match, $match_operator, $limit)) { // Get the results. @@ -133,12 +154,14 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio function validateReferencableEntities(array $ids) { $display_name = $this->field['settings']['handler_settings']['view']['display_name']; - $args = $this->field['settings']['handler_settings']['view']['args']; + $args = $this->handleArgs($this->field['settings']['handler_settings']['view']['args']); $result = array(); if ($this->initializeView(NULL, 'CONTAINS', 0, $ids)) { // Get the results. $entities = $this->view->execute_display($display_name, $args); - $result = array_keys($entities); + if (!empty($entities)) { + $result = array_keys($entities); + } } return $result; } @@ -164,6 +187,49 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio } + /** + * Handles arguments for views. + * + * Replaces tokens using token_replace(). + * + * @param array $args + * Usually $this->field['settings']['handler_settings']['view']['args']. + * + * @return array + * The arguments to be send to the View. + */ + protected function handleArgs($args) { + if (!module_exists('token')) { + return $args; + } + + // Parameters for token_replace(). + $data = array(); + $options = array('clear' => TRUE); + + if ($entity = $this->entity) { + // D7 HACK: For new entities, entity and revision id are not set. This leads to + // * token replacement emitting PHP warnings + // * views choking on empty arguments + // We workaround this by filling in '0' for these IDs + // and use a clone to leave no traces of our unholy doings. + $info = entity_get_info($this->instance['entity_type']); + if (!isset($entity->{$info['entity keys']['id']})) { + $entity = clone $entity; + $entity->{$info['entity keys']['id']} = '0'; + if (!empty($info['entity keys']['revision'])) { + $entity->{$info['entity keys']['revision']} = '0'; + } + } + + $data[$info['token type']] = $entity; + } + // Replace tokens for each argument. + foreach ($args as $key => $arg) { + $args[$key] = token_replace($arg, $data, $options); + } + return $args; + } } function entityreference_view_settings_validate($element, &$form_state, $form) { diff --git a/sites/all/modules/contrib/fields/entityreference/plugins/selection/abstract.inc b/sites/all/modules/contrib/fields/entityreference/plugins/selection/abstract.inc index 1d2ea0d..a4805b1 100644 --- a/sites/all/modules/contrib/fields/entityreference/plugins/selection/abstract.inc +++ b/sites/all/modules/contrib/fields/entityreference/plugins/selection/abstract.inc @@ -21,8 +21,9 @@ interface EntityReference_SelectionHandler { * Return a list of referencable entities. * * @return - * An array of referencable entities, which keys are entity ids and - * values (safe HTML) labels to be displayed to the user. + * A nested array of entities, the first level is keyed by the + * entity bundle, which contains an array of entity labels (safe HTML), + * keyed by the entity ID. */ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0); diff --git a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.admin.test b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.admin.test index 9a12119..ec78e7b 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.admin.test +++ b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.admin.test @@ -21,7 +21,7 @@ class EntityReferenceAdminTestCase extends DrupalWebTestCase { parent::setUp(array('field_ui', 'entity', 'ctools', 'entityreference')); // Create test user. - $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types')); + $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer fields')); $this->drupalLogin($this->admin_user); // Create content type, with underscores. diff --git a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.feeds.test b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.feeds.test index 4dc1901..32248cc 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.feeds.test +++ b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.feeds.test @@ -17,6 +17,7 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ 'name' => 'Feeds integration (field mapper)', 'description' => 'Test Feeds Mapper support for fields.', 'group' => 'Entity Reference', + 'dependencies' => array('feeds'), ); } @@ -28,10 +29,6 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ module_enable(array('entityreference_feeds_test'), TRUE); $this->resetAll(); - if (!module_exists('feeds')) { - return; - } - $permissions[] = 'access content'; $permissions[] = 'administer site configuration'; $permissions[] = 'administer content types'; @@ -157,10 +154,6 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ * Basic test loading a double entry CSV file. */ public function test() { - if (!module_exists('feeds')) { - return; - } - $this->drupalLogin($this->admin_user); $this->drupalGet('admin/structure/types/manage/article/fields'); $this->assertText('Ref - entity ID', t('Found Entity reference field %field.', array('%field' => 'field_er_id'))); diff --git a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.handlers.test b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.handlers.test index b88e106..1367b44 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.handlers.test +++ b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.handlers.test @@ -194,6 +194,21 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase { ), ); $this->assertReferencable($field, $referencable_tests, 'Node handler (admin)'); + + // Verify autocomplete input validation. + $handler = entityreference_get_selection_handler($field); + $element = array( + '#parents' => array('element_name'), + ); + $form_state = array(); + $form = array(); + $value = $handler->validateAutocompleteInput($nodes['published1']->title, $element, $form_state, $form); + $this->assertEqual($value, $nodes['published1']->nid); + + $invalid_input = $this->randomName(); + $value = $handler->validateAutocompleteInput($invalid_input, $element, $form_state, $form); + $this->assertNull($value); + $this->assertEqual(form_get_error($element), t('There are no entities matching "%value"', array('%value' => $invalid_input))); } /** @@ -256,7 +271,7 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase { ), 'result' => array( 'user' => array( - $users['admin']->uid => '- Restricted access -', + $users['admin']->uid => ENTITYREFERENCE_DENIED, $users['non_admin']->uid => $user_labels['non_admin'], ), ), diff --git a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.taxonomy.test b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.taxonomy.test index 6e4afb7..94b3f56 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/entityreference.taxonomy.test +++ b/sites/all/modules/contrib/fields/entityreference/tests/entityreference.taxonomy.test @@ -112,4 +112,52 @@ class EntityReferenceTaxonomyTestCase extends DrupalWebTestCase { $this->assertFalse(taxonomy_select_nodes(1)); } + /** + * Add a second ER field from node/article to taxonomy. + * + * This should not cause {taxonomy_index} to receive duplicate entries. + */ + protected function setupForIndexDuplicates() { + // Create an entity reference field. + $field = array( + 'entity_types' => array('node'), + 'settings' => array( + 'handler' => 'base', + 'target_type' => 'taxonomy_term', + 'handler_settings' => array( + 'target_bundles' => array(), + ), + ), + 'field_name' => 'field_entityreference_term2', + 'type' => 'entityreference', + ); + $field = field_create_field($field); + $instance = array( + 'field_name' => 'field_entityreference_term2', + 'bundle' => 'article', + 'entity_type' => 'node', + ); + + // Enable the taxonomy-index behavior. + $instance['settings']['behaviors']['taxonomy-index']['status'] = TRUE; + field_create_instance($instance); + } + + /** + * Make sure the index only contains one entry for a given node->term + * reference, even when multiple ER fields link from the node bundle to terms. + */ + public function testIndexDuplicates() { + // Extra setup for this test: add another ER field on this content type. + $this->setupForIndexDuplicates(); + + // Assert node insert with reference to term in first field. + $tid = 1; + $settings = array(); + $settings['type'] = 'article'; + $settings['field_entityreference_term'][LANGUAGE_NONE][0]['target_id'] = $tid; + $node = $this->drupalCreateNode($settings); + + $this->assertEqual(taxonomy_select_nodes($tid), array($node->nid)); + } } diff --git a/sites/all/modules/contrib/fields/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info b/sites/all/modules/contrib/fields/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info index 311ae3f..5bbf9b6 100644 --- a/sites/all/modules/contrib/fields/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info +++ b/sites/all/modules/contrib/fields/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info @@ -8,9 +8,9 @@ dependencies[] = feeds dependencies[] = feeds_ui dependencies[] = entityreference -; Information added by packaging script on 2013-11-20 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-08-16 +version = "7.x-1.5" core = "7.x" project = "entityreference" -datestamp = "1384973110" +datestamp = "1502895850" diff --git a/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_display.inc b/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_display.inc index f13e88a..cca3650 100644 --- a/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_display.inc +++ b/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_display.inc @@ -81,8 +81,9 @@ class entityreference_plugin_display extends views_plugin_display { $field = $this->view->query->fields[$this->view->field[$field_alias]->field_alias]; } else { - $this->view->query->add_field($this->view->field[$field_alias]->options['table'], $this->view->field[$field_alias]->real_field, $this->view->field[$field_alias]->options['field'], array()); - $field = $this->view->query->fields[$this->view->field[$field_alias]->options['field']]; + $field_table = $this->view->query->ensure_table($this->view->field[$field_alias]->table, $this->view->field[$field_alias]->relationship); + $this->view->query->add_field($field_table, $this->view->field[$field_alias]->real_field, $this->view->field[$field_alias]->field, array()); + $field = $this->view->query->fields[$this->view->field[$field_alias]->field]; } // Add an OR condition for the field $conditions->condition($field['table'] . '.' . $field['field'], $value, 'LIKE'); diff --git a/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_style.inc b/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_style.inc index fadaa9e..b72a235 100644 --- a/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_style.inc +++ b/sites/all/modules/contrib/fields/entityreference/views/entityreference_plugin_style.inc @@ -26,7 +26,7 @@ class entityreference_plugin_style extends views_plugin_style { '#title' => t('Search fields'), '#options' => $options, '#required' => TRUE, - '#default_value' => $this->options['search_fields'], + '#default_value' => isset($this->options['search_fields']) ? $this->options['search_fields'] : array(), '#description' => t('Select the field(s) that will be searched when using the autocomplete widget.'), '#weight' => -3, ); diff --git a/sites/all/modules/contrib/fields/field_group/CHANGELOG.txt b/sites/all/modules/contrib/fields/field_group/CHANGELOG.txt index 5e3ea36..5798162 100644 --- a/sites/all/modules/contrib/fields/field_group/CHANGELOG.txt +++ b/sites/all/modules/contrib/fields/field_group/CHANGELOG.txt @@ -1,6 +1,58 @@ /* $Id*/ CHANGELOG for field_group for Drupal 7 +Field Group origin/7.x-1.x, 2017-11-04 +-------------------------------------- +- Tests fail after new 'administer fields' permission. +- Update CHANGELOG.txt to 7.x-1.5 Release. +- Revert "Issue #2646106 by jribeiro: Update CHANGELOG.txt to 7.x-1.5 Release". +- Update CHANGELOG.txt to 7.x-1.5 Release. +- Fix whitespace between "&" and parameters for some functions. +- Avoid bad code pattern (that is picked up by security scanners) when getting hash. +- Should #array_parents be updated in field_group_fields_nest()?. +- "Show" appears in horizontal tab title if node form submitted through ajax. +- CSS breaks i18n string translation interface. +- "uncaught exception: Syntax error, unrecognized expression: #" after 7.x-1.4 update. +- PHP7 - Uniform Variable Syntax updates are causing exported field_groups to not have names. + +Field_group 7.x-1.5 + o Added extra formatting on html element attributes. + o Fixed bug on automatic ID generation in javascript. + o Issue #2511960 by rrfegade: spelling errors in D7. + o Issue #2194279 by Georgique: Export translatables (label and descriptions) in Features. + o Issue #2386335 by Dubs: Integer Group Array Keys can create empty node forms. + o Issue #2269133 by sammuell: Accordion is always closed when using jQuery update module. + o Issue #2258939 by Snipon: Fixed Change to preventDefault on multipage controls. + o Issue #2173937 by jantoine, omerida | Bernieman: Fixed Accordion Element has fixed height in HTML. + o Issue #2311789 by eelkeblok: Fixed Group is incorrectly determined to be empty with nested form elements. + o Issue #2272003 by karolrybak | Kwb: Fixed Fieldgroup no longer renders after using more than one 'HTML Element' on the same level. + o Issue #2309219 by czigor: Fixed Proper CTools exportable loading. + o Issue #2283245 by stefan.r | jrb: Fixed New id functionality breaks tests and CSS on existing field groups. + o Issue #2295133 by boyan.borisov, interX: Fixed field_group_update_7007 error. + o Remove field_group.css, the css is not needed anymore. + o Fix horiziontal tabs when used as standalone element. + +Field_group 7.x-1.4 + o Issue #2129805 by RaF: Incorrect markup when open div & custom classes provided. + o Issue #2037731 by maximpodorov, Zach Harkey: Remove id attribute from HTML elements. + o Issue #2099505 by borisson_ | Maks: Warning: Invalid argument supplied for foreach() in field_group_build_entity_groups() (line 1894 ..sites/all/modules/field_group. + o Issue #2102397 by thebruce: Field Group 7006 update fails with "Cannot use string offset as an array in /field_group/field_group.install on line 318. + o Issue #2122733 by Alan D.: Remove test module from admin listing. + o Issue #2212431 by tim.plunkett: Field groups that contain only elements that use #markup are hidden. + o Issue #2175731 by tobiasb, daggerhart: HTML produced by module is broken. + o Issue #2190425 by tobiasb: Fix attach behavior. + o Issue #1911530 by tobiasb, Simon Georges: Remove useless files[] directive from .info files. + o Issue #1358430 by oushen, tobiasb | FriedJam: JS "Error: uncaught exception: Syntax error, unrecognized expression:". + o Issue #2104391 by mike_san: Package descriptions. + o Issue #2189777 by gmercer: Exporting a feature with field groups sometimes leads to $field_group->data being set to an empty string. + o Issue #2168689 by Paul B: Beïng should be being. + o Issue #2037731 by rreiss, maximpodorov, Zach Harkey: Make id attribute optional. Current installations will default get the old ids + o Issue #2173351 by axe312: Add a label to html-element wrappers. + o Issue #1954056 by klonos: Proper capitalization in the project name. + o Issue #2224547 by sdrycroft: Fixed field_group_info_groups() clears all CTools caches when it should only clear the field_group caches. + o Issue #2099505 by joelpittet, borisson_ | Maks: Fixed Warning: Invalid argument supplied for foreach() in field_group_build_entity_groups() (line 1894 ..sites/all/modules/field_group. + o Issue #2223269 by barraponto: Fixed Don't filter and translate empty strings. + Field_group 7.x-1.3 o Issue #2077695 by FreekVR | ChoY: Fixed field group entity display bug after update. o Issue #2078201 by DeFr, eneko1907 | cmriley: Fixed Started getting a ton of notices. diff --git a/sites/all/modules/contrib/fields/field_group/LICENSE.txt b/sites/all/modules/contrib/fields/field_group/LICENSE.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/contrib/fields/field_group/field_group.api.php b/sites/all/modules/contrib/fields/field_group/field_group.api.php index cef5b0a..fdcbe03 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.api.php +++ b/sites/all/modules/contrib/fields/field_group/field_group.api.php @@ -220,7 +220,7 @@ function hook_field_group_format_settings($group) { * @param Array $elements by address. * @param Object $group The Field group info. */ -function hook_field_group_pre_render(& $element, $group, & $form) { +function hook_field_group_pre_render(&$element, $group, &$form) { // You can prepare some variables to use in the logic. $view_mode = isset($form['#view_mode']) ? $form['#view_mode'] : 'form'; @@ -268,7 +268,7 @@ function hook_field_group_pre_render(& $element, $group, & $form) { * * Function that fungates as last resort to alter the pre_render build. */ -function hook_field_group_pre_render_alter(&$element, $group, & $form) { +function hook_field_group_pre_render_alter(&$element, $group, &$form) { if ($group->format_type == 'htab') { $element['#theme_wrappers'] = array('my_horizontal_tab'); @@ -285,7 +285,7 @@ function hook_field_group_pre_render_alter(&$element, $group, & $form) { * * @param Array $elements by address. */ -function hook_field_group_build_pre_render_alter(& $element) { +function hook_field_group_build_pre_render_alter(&$element) { // Prepare variables. $display = isset($element['#view_mode']); diff --git a/sites/all/modules/contrib/fields/field_group/field_group.css b/sites/all/modules/contrib/fields/field_group/field_group.css deleted file mode 100644 index d47f007..0000000 --- a/sites/all/modules/contrib/fields/field_group/field_group.css +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id: field_group.css,v 1.1.2.12 2010/12/22 22:22:35 stalski Exp $ */ - -/** - * Fix for fieldsets in vertical tabs. - * Note that this can only be hardcoded to the Seven theme - * where people who override this, are in trouble. - * This can be removed in next d7 release. - */ -.vertical-tabs fieldset.default-fallback, -div.field-group-tabs-wrapper div.field-type-image fieldset, -div.field-group-tabs-wrapper div.field-type-file fieldset, -div.field-group-tabs-wrapper div.field-type-datetime fieldset { - border: 1px solid #CCCCCC; - margin: 1em 0; - padding: 2.5em 0 0; - position: relative; -} - -div.field-group-tabs-wrapper div.field-type-image legend, -div.field-group-tabs-wrapper div.field-type-file legend, -div.field-group-tabs-wrapper div.field-type-datetime legend { - display: block; -} \ No newline at end of file diff --git a/sites/all/modules/contrib/fields/field_group/field_group.field_ui.inc b/sites/all/modules/contrib/fields/field_group/field_group.field_ui.inc index 557b0c6..dbd26d0 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.field_ui.inc +++ b/sites/all/modules/contrib/fields/field_group/field_group.field_ui.inc @@ -99,10 +99,10 @@ function field_group_field_ui_overview_form_alter(&$form, &$form_state, $display // Play around with form_state so we only need to hold things // between requests, until the save button was hit. if (isset($form_state['field_group'][$name])) { - $group = & $form_state['field_group'][$name]; + $group = &$form_state['field_group'][$name]; } else { - $group = & $params->groups[$name]; + $group = &$params->groups[$name]; } // Check the currently selected formatter, and merge persisted values for @@ -222,7 +222,7 @@ function field_group_field_ui_overview_form_alter(&$form, &$form_state, $display $table[$name]['format']['type']['#attributes']['class'] = array('element-invisible'); } else { - // After saving, the settings are updated here aswell. First we create + // After saving, the settings are updated here as well. First we create // the element for the table cell. $table[$name]['settings_summary'] = array('#markup' => ''); if (!empty($group->format_settings)) { @@ -456,7 +456,7 @@ function field_group_format_settings_label_validate($element, &$form_state) { * @param Object $group * @param array $settings */ -function field_group_formatter_row_update(& $group, $settings) { +function field_group_formatter_row_update(&$group, $settings) { // if the row has changed formatter type, update the group object if (!empty($settings['format']['type']) && $settings['format']['type'] != $group->format_type) { $group->format_type = $settings['format']['type']; @@ -469,7 +469,7 @@ function field_group_formatter_row_update(& $group, $settings) { * @param Object $group The group object * @param Array $settings Configuration settings */ -function field_group_formatter_settings_update(& $group, $settings) { +function field_group_formatter_settings_update(&$group, $settings) { // for format changes we load the defaults. if (empty($settings['format_settings']['settings'])) { diff --git a/sites/all/modules/contrib/fields/field_group/field_group.info b/sites/all/modules/contrib/fields/field_group/field_group.info index 96a6053..49eae8d 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.info +++ b/sites/all/modules/contrib/fields/field_group/field_group.info @@ -6,9 +6,9 @@ dependencies[] = ctools core = 7.x files[] = tests/field_group.ui.test files[] = tests/field_group.display.test -; Information added by Drupal.org packaging script on 2014-06-04 -version = "7.x-1.4" +; Information added by Drupal.org packaging script on 2017-11-03 +version = "7.x-1.6" core = "7.x" project = "field_group" -datestamp = "1401918529" +datestamp = "1509751991" diff --git a/sites/all/modules/contrib/fields/field_group/field_group.install b/sites/all/modules/contrib/fields/field_group/field_group.install index fa5371d..a7bb85c 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.install +++ b/sites/all/modules/contrib/fields/field_group/field_group.install @@ -17,6 +17,7 @@ function field_group_schema() { 'key' => 'identifier', 'identifier' => 'field_group', 'default hook' => 'field_group_info', + 'load callback' => 'field_group_group_load_by_identifier', 'save callback' => 'field_group_group_save', 'delete callback' => 'field_group_group_export_delete', 'can disable' => TRUE, @@ -229,6 +230,8 @@ function field_group_update_7001() { ->condition('name', 'field_group') ->execute(); + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -246,6 +249,8 @@ function field_group_update_7002() { // See http://drupal.org/node/1018550. _field_group_recreate_identifiers(); + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -257,6 +262,8 @@ function field_group_update_7003() { module_load_include('module', 'field_group'); _field_group_recreate_identifiers(); + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -295,6 +302,8 @@ function field_group_update_7005() { drupal_write_record('field_group', $row, array('id')); } + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -330,6 +339,8 @@ function field_group_update_7006() { } } + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } /** @@ -344,8 +355,18 @@ function field_group_update_7007() { // Migrate the field groups so they have a unique identifier. $field_groups = ctools_export_load_object("field_group"); foreach ($field_groups as $row) { - if ($row->data['format_type'] == 'div' || $row->data['format_type'] == 'html5' || $row->data['format_type'] == 'html-element') { + // These field group types have an ID setting to populate. + $populate_id_setting = array( + 'html-element', + 'div', + 'html5', + 'fieldset', + 'tabs', + 'htabs', + 'accordion', + ); + if (in_array($row->data['format_type'], $populate_id_setting)) { // If mode is default, we don't know what view mode it was. Take full then. $view_mode = $row->mode == 'default' ? 'full' : $row->mode; $id = $row->entity_type . '_' . $row->bundle . '_' . $view_mode . '_' . $row->group_name; @@ -360,4 +381,14 @@ function field_group_update_7007() { drupal_write_record('field_group', $row, array('id')); } } + + // Clear drupal and static cache. + field_group_info_groups(NULL, NULL, NULL, TRUE); } + +/** + * Clear cache to notice the CTools load callback. + */ +function field_group_update_7008() { + drupal_flush_all_caches(); +} \ No newline at end of file diff --git a/sites/all/modules/contrib/fields/field_group/field_group.js b/sites/all/modules/contrib/fields/field_group/field_group.js index eef6aaa..0b0a565 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.js +++ b/sites/all/modules/contrib/fields/field_group/field_group.js @@ -41,9 +41,17 @@ Drupal.FieldGroup.Effects.processAccordion = { $('div.field-group-accordion-wrapper', context).once('fieldgroup-effects', function () { var wrapper = $(this); + // Get the index to set active. + var active_index = false; + wrapper.find('.accordion-item').each(function(i) { + if ($(this).hasClass('field-group-accordion-active')) { + active_index = i; + } + }); + wrapper.accordion({ - autoHeight: false, - active: '.field-group-accordion-active', + heightStyle: "content", + active: active_index, collapsible: true, changestart: function(event, ui) { if ($(this).hasClass('effect-none')) { @@ -111,6 +119,9 @@ Drupal.FieldGroup.Effects.processHtabs = { Drupal.FieldGroup.Effects.processTabs = { execute: function (context, settings, type) { if (type == 'form') { + + var errorFocussed = false; + // Add required fields mark to any fieldsets containing required fields $('fieldset.vertical-tabs-pane', context).once('fieldgroup-effects', function(i) { if ($(this).is('.required-fields') && $(this).find('.form-required').length > 0) { @@ -118,8 +129,12 @@ Drupal.FieldGroup.Effects.processTabs = { } if ($('.error', $(this)).length) { $(this).data('verticalTab').link.parent().addClass('error'); - Drupal.FieldGroup.setGroupWithfocus($(this)); - $(this).data('verticalTab').focus(); + // Focus the first tab with error. + if (!errorFocussed) { + Drupal.FieldGroup.setGroupWithfocus($(this)); + $(this).data('verticalTab').focus(); + errorFocussed = true; + } } }); } @@ -202,15 +217,14 @@ Drupal.behaviors.fieldGroup = { $('.fieldset-wrapper .fieldset > legend').css({display: 'block'}); $('.vertical-tabs fieldset.fieldset').addClass('default-fallback'); - // Add a new ID to each fieldset. - $('.group-wrapper fieldset').each(function() { + $('.group-wrapper .horizontal-tabs-panes > fieldset', context).once('group-wrapper-panes-processed', function() { // Tats bad, but we have to keep the actual id to prevent layouts to break. - var fieldgorupID = 'field_group-' + $(this).attr('id') + ' ' + $(this).attr('id'); - $(this).attr('id', fieldgorupID); - }) + var fieldgroupID = 'field_group-' + $(this).attr('id'); + $(this).attr('id', fieldgroupID); + }); // Set the hash in url to remember last userselection. - $('.group-wrapper ul li').each(function() { + $('.group-wrapper ul li').once('group-wrapper-ul-processed', function() { var fieldGroupNavigationListIndex = $(this).index(); $(this).children('a').click(function() { var fieldset = $('.group-wrapper fieldset').get(fieldGroupNavigationListIndex); @@ -219,7 +233,8 @@ Drupal.behaviors.fieldGroup = { window.location.hash = hashUrl; }); }); + } }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/sites/all/modules/contrib/fields/field_group/field_group.module b/sites/all/modules/contrib/fields/field_group/field_group.module index da1a791..4fe2547 100644 --- a/sites/all/modules/contrib/fields/field_group/field_group.module +++ b/sites/all/modules/contrib/fields/field_group/field_group.module @@ -122,6 +122,20 @@ function field_group_menu_load($group_name, $entity_type, $bundle_name, $bundle_ return empty($group) ? FALSE : $group; } +/** + * Ctools load callback to load fieldgroup by identifier. + */ +function field_group_load_field_group_by_identifier($identifier) { + + $parts = explode('|', $identifier); + if (count($parts) != 4) { + return; + } + + return field_group_load_field_group($parts[0], $parts[1], $parts[2], $parts[3]); + +} + /** * Loads a group definition. * @@ -244,8 +258,6 @@ function field_group_field_attach_delete_bundle($entity_type, $bundle) { * Implements hook_field_attach_form(). */ function field_group_field_attach_form($entity_type, $entity, &$form, &$form_state, $langcode) { - - $form['#attached']['css'][] = drupal_get_path('module', 'field_group') . '/field_group.field_ui.css'; field_group_attach_groups($form, 'form', $form_state); $form['#pre_render'][] = 'field_group_form_pre_render'; } @@ -292,7 +304,7 @@ function field_group_field_group_formatter_info() { 'html-element' => array( 'label' => t('HTML element'), 'description' => t('This fieldgroup renders the inner content in a HTML element with classes and attributes.'), - 'instance_settings' => array('element' => 'div', 'show_label' => 0, 'label_element' => 'div', 'classes' => '', 'attributes' => '', 'required_fields' => 1), + 'instance_settings' => array('element' => 'div', 'show_label' => 0, 'label_element' => 'div', 'classes' => '', 'attributes' => '', 'required_fields' => 1, 'id' => ''), ), 'div' => array( 'label' => t('Div'), @@ -310,13 +322,13 @@ function field_group_field_group_formatter_info() { 'label' => t('Fieldset'), 'description' => t('This fieldgroup renders the inner content in a fieldset with the title as legend.'), 'format_types' => array('open', 'collapsible', 'collapsed'), - 'instance_settings' => array('description' => '', 'classes' => '', 'required_fields' => 1), + 'instance_settings' => array('description' => '', 'classes' => '', 'required_fields' => 1, 'id' => ''), 'default_formatter' => 'collapsible', ), 'tabs' => array( 'label' => t('Vertical tabs group'), 'description' => t('This fieldgroup renders child groups in its own vertical tabs wrapper.'), - 'instance_settings' => array('classes' => ''), + 'instance_settings' => array('classes' => '', 'id' => ''), ), 'tab' => array( 'label' => t('Vertical tab'), @@ -328,14 +340,14 @@ function field_group_field_group_formatter_info() { 'htabs' => array( 'label' => t('Horizontal tabs group'), 'description' => t('This fieldgroup renders child groups in its own horizontal tabs wrapper.'), - 'instance_settings' => array('classes' => ''), + 'instance_settings' => array('classes' => '', 'id' => ''), ), 'htab' => array( 'label' => t('Horizontal tab'), 'format_types' => array('open', 'closed'), 'description' => t('This fieldgroup renders the content in a fieldset, part of horizontal tabs group.'), 'default_formatter' => 'closed', - 'instance_settings' => array('description' => '', 'classes' => '', 'required_fields' => 1, 'id' => ''), + 'instance_settings' => array('description' => '', 'classes' => '', 'required_fields' => 1), ), 'multipage-group' => array( 'label' => t('Multipage group'), @@ -352,7 +364,7 @@ function field_group_field_group_formatter_info() { 'accordion' => array( 'label' => t('Accordion group'), 'description' => t('This fieldgroup renders child groups as jQuery accordion.'), - 'instance_settings' => array('effect' => 'none', 'classes' => ''), + 'instance_settings' => array('effect' => 'none', 'classes' => '', 'id' => ''), ), 'accordion-item' => array( 'label' => t('Accordion item'), @@ -366,7 +378,7 @@ function field_group_field_group_formatter_info() { 'html-element' => array( 'label' => t('HTML element'), 'description' => t('This fieldgroup renders the inner content in a HTML element with classes and attributes.'), - 'instance_settings' => array('element' => 'div', 'show_label' => 0, 'label_element' => 'div', 'classes' => '', 'attributes' => '', 'required_fields' => 1), + 'instance_settings' => array('element' => 'div', 'show_label' => 0, 'label_element' => 'div', 'classes' => '', 'attributes' => '', 'required_fields' => 1, 'id' => ''), ), 'div' => array( 'label' => t('Div'), @@ -384,13 +396,13 @@ function field_group_field_group_formatter_info() { 'label' => t('Fieldset'), 'description' => t('This fieldgroup renders the inner content in a fieldset with the title as legend.'), 'format_types' => array('open', 'collapsible', 'collapsed'), - 'instance_settings' => array('description' => '', 'classes' => ''), + 'instance_settings' => array('description' => '', 'classes' => '', 'id' => ''), 'default_formatter' => 'collapsible', ), 'tabs' => array( 'label' => t('Vertical tabs group'), 'description' => t('This fieldgroup renders child groups in its own vertical tabs wrapper.'), - 'instance_settings' => array('classes' => ''), + 'instance_settings' => array('classes' => '', 'id' => ''), ), 'tab' => array( 'label' => t('Vertical tab'), @@ -402,7 +414,7 @@ function field_group_field_group_formatter_info() { 'htabs' => array( 'label' => t('Horizontal tabs group'), 'description' => t('This fieldgroup renders child groups in its own horizontal tabs wrapper.'), - 'instance_settings' => array('classes' => ''), + 'instance_settings' => array('classes' => '', 'id' => ''), ), 'htab' => array( 'label' => t('Horizontal tab item'), @@ -414,7 +426,7 @@ function field_group_field_group_formatter_info() { 'accordion' => array( 'label' => t('Accordion group'), 'description' => t('This fieldgroup renders child groups as jQuery accordion.'), - 'instance_settings' => array('description' => '', 'classes' => '', 'effect' => 'bounceslide'), + 'instance_settings' => array('description' => '', 'classes' => '', 'effect' => 'bounceslide', 'id' => ''), ), 'accordion-item' => array( 'label' => t('Accordion item'), @@ -706,12 +718,12 @@ function field_group_pre_render_html_element(&$element, $group, &$form) { $html_element = isset($group->format_settings['instance_settings']['element']) ? $group->format_settings['instance_settings']['element'] : 'div'; $show_label = isset($group->format_settings['instance_settings']['show_label']) ? $group->format_settings['instance_settings']['show_label'] : 0; $label_element = isset($group->format_settings['instance_settings']['label_element']) ? $group->format_settings['instance_settings']['label_element'] : 'div'; - $attributes = isset($group->format_settings['instance_settings']['attributes']) ? ' ' . $group->format_settings['instance_settings']['attributes'] : ''; + $configured_attributes = isset($group->format_settings['instance_settings']['attributes']) ? ' ' . $group->format_settings['instance_settings']['attributes'] : ''; $group->classes = trim($group->classes); // This regex split the attributes string so that we can pass that // later to drupal_attributes(). - preg_match_all('/([^\s=]+)="([^"]+)"/', $attributes, $matches); + preg_match_all('/([^\s=]+)="([^"]+)"/', $configured_attributes, $matches); $element_attributes = array(); // Put the attribute and the value together. @@ -727,7 +739,13 @@ function field_group_pre_render_html_element(&$element, $group, &$form) { $element_attributes['class'] .= ' ' . $group->classes; } - $attributes = drupal_attributes($element_attributes); + if (isset($element['#id'])) { + $element_attributes['id'] = $element['#id']; + } + + // Sanitize the attributes. + $element_attributes = _filter_xss_attributes(drupal_attributes($element_attributes)); + $attributes = $element_attributes ? ' ' . implode(' ', $element_attributes) : ''; $element['#prefix'] = '<' . $html_element . $attributes . '>'; if ($show_label) { @@ -810,9 +828,11 @@ function field_group_pre_render_accordion(&$element, $group, &$form) { // Add the jQuery UI accordion. $element['#attached']['library'][] = array('system', 'ui.accordion'); + $id = !empty($element['#id']) ? ' id="' . $element['#id'] . '"' : ''; + $element += array( '#type' => 'markup', - '#prefix' => '
',
+ '#prefix' => '
',
'#suffix' => '
',
);
}
@@ -850,11 +870,18 @@ function field_group_pre_render_accordion_item(&$element, $group, &$form) {
*/
function field_group_pre_render_htabs(&$element, $group, &$form) {
+ $classes = 'field-group-' . $group->format_type . '-wrapper';
+ if (!empty($group->classes)) {
+ $classes .= ' ' . $group->classes;
+ }
+
+ $id = !empty($element['#id']) ? ' id="' . $element['#id'] . '"' : '';
+
$element += array(
'#type' => 'horizontal_tabs',
'#title' => check_plain(t($group->label)),
'#theme_wrappers' => array('horizontal_tabs'),
- '#prefix' => '',
+ '#prefix' => '' : 'video_embed_field';
+ $property['property info'] = video_embed_field_data_property_info('Video embed');
+ $property['getter callback'] = 'entity_metadata_field_verbatim_get';
+ $property['setter callback'] = 'entity_metadata_field_verbatim_set';
+}
+
+/**
+ * Defines info for the properties of the video_embed_field data structure.
+ */
+function video_embed_field_data_property_info($name = NULL) {
+ // Build an array of basic property information for video_embed_field.
+ $properties = array(
+ 'video_url' => array(
+ 'label' => 'Video URL',
+ 'type' => 'uri',
+ 'setter callback' => 'entity_property_verbatim_set',
+ ),
+ 'thumbnail_path' => array(
+ 'label' => 'Thumbnail path',
+ 'type' => 'uri',
+ 'getter callback' => 'entity_property_verbatim_get_url',
+ ),
+ 'description' => array(
+ 'label' => 'Description',
+ 'type' => 'text',
+ 'setter callback' => 'entity_property_verbatim_set',
+ ),
+ );
+
+ // Add the default values for each of the video_embed_field properties.
+ foreach ($properties as $key => &$value) {
+ $value += array(
+ 'description' => !empty($name) ? t('!label of field %name', array('!label' => $value['label'], '%name' => $name)) : '',
+ );
+ }
+
+ return $properties;
+}
+
+/**
+ * Gets the property just as it is set in the data and converts to absolute url.
+ */
+function entity_property_verbatim_get_url($data, array $options, $name, $type, $info) {
+ $property = entity_property_verbatim_get($data, $options, $name, $type, $info);
+ return file_create_url($property);
+}
+
/**
* Implements hook_field_instance_settings_form().
*/
function video_embed_field_field_instance_settings_form($field, $instance) {
$settings = $instance['settings'];
+ $providers = video_embed_get_handlers();
+ $allowed_providers = array();
+ foreach ($providers as $provider_id => $definition) {
+ $allowed_providers[$provider_id] = $definition['title'];
+ }
+
+ $form['allowed_providers'] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Select the allowed video providers'),
+ '#options' => $allowed_providers,
+ '#default_value' => isset($settings['allowed_providers']) ? $settings['allowed_providers'] : array(),
+ '#weight' => 10,
+ );
+
$form['description_field'] = array(
'#type' => 'checkbox',
'#title' => t('Enable Description field'),
'#default_value' => isset($settings['description_field']) ? $settings['description_field'] : '',
'#description' => t('The description field allows users to enter a description about the video.'),
- '#parents' => array('instance', 'settings', 'description_field'),
'#weight' => 11,
);
@@ -43,10 +116,14 @@ function video_embed_field_field_instance_settings_form($field, $instance) {
'#type' => 'textfield',
'#title' => t('Max description length'),
'#default_value' => isset($settings['description_length']) ? $settings['description_length'] : 128,
- '#parents' => array('instance', 'settings', 'description_length'),
'#weight' => 12,
'#size' => 5,
'#maxlength' => 5,
+ '#states' => array(
+ 'visible' => array(
+ ':input[id="edit-instance-settings-description-field"]' => array('checked' => TRUE),
+ ),
+ ),
);
return $form;
@@ -74,7 +151,7 @@ function video_embed_field_field_widget_info() {
* Implements hook_field_widget_form().
*/
function video_embed_field_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
- // Don't need to check the type right now because we're only defining one
+ // Don't need to check the type right now because we're only defining one.
$element += array(
'#type' => 'fieldset',
);
@@ -90,6 +167,7 @@ function video_embed_field_field_widget_form(&$form, &$form_state, $field, $inst
),
'#default_value' => isset($items[$delta]['video_url']) ? $items[$delta]['video_url'] : '',
'#required' => $element['#required'],
+ '#maxlength' => 255,
);
// Add the description field if enabled.
@@ -129,7 +207,7 @@ function video_embed_field_field_validate($entity_type, $entity, $field, $instan
if (stripos($host, 'www.') > -1) {
$host = substr($host, 4);
}
- $domains = _video_embed_field_get_provider_domains();
+ $domains = _video_embed_field_get_instance_provider_domains($instance);
if (!array_key_exists($host, $domains)) {
$errors[$field['field_name']][$langcode][$delta][] = array(
'error' => t('Unsupported Video Provider'),
@@ -142,41 +220,44 @@ function video_embed_field_field_validate($entity_type, $entity, $field, $instan
}
/**
- * Implementation of hook_field_presave().
+ * Implements hook_field_presave().
*
* Download and save the thumbnail if it hasn't already been stored.
* Get video data.
*/
function video_embed_field_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
foreach ($items as $delta => $item) {
- //Trim whitespace from the video URL.
+ // Trim whitespace from the video URL.
$items[$delta]['video_url'] = trim($item['video_url']);
- // Try to load thumbnail URL
+ // Try to load thumbnail URL.
$info = video_embed_field_thumbnail_url($item['video_url']);
if (isset($info['url']) && $info['url']) {
$thumb_url = $info['url'];
- $local_path = 'public://video_embed_field_thumbnails/' . $info['handler'] . '/' . $info['id'] . '.jpg';
+ $thumb_extension = pathinfo($thumb_url, PATHINFO_EXTENSION);
+ $local_path = "public://video_embed_field_thumbnails/{$info['handler']}/{$info['id']}.$thumb_extension";
$dirname = drupal_dirname($local_path);
file_prepare_directory($dirname, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
$response = drupal_http_request($thumb_url);
if (!isset($response->error)) {
- file_save_data($response->data, $local_path, TRUE);
+ file_save_data($response->data, $local_path, FILE_EXISTS_REPLACE);
}
else {
@copy($thumb_url, $local_path);
}
-
$items[$delta]['thumbnail_path'] = $local_path;
- } //couldn't get the thumbnail for whatever reason
+ // Delete any image derivatives at the original image path.
+ image_path_flush($local_path);
+ }
+ // Couldn't get the thumbnail for whatever reason.
else {
$items[$delta]['thumbnail_path'] = '';
}
- // Try to load video data
+ // Try to load video data.
$data = video_embed_field_get_video_data($item['video_url']);
if (is_array($data) && !empty($data)) {
$items[$delta]['video_data'] = serialize($data);
@@ -206,31 +287,43 @@ function video_embed_field_field_formatter_info() {
'settings' => array(
'video_style' => 'normal',
'description' => 1,
- 'description_position' => 'bottom'
+ 'description_position' => 'bottom',
),
),
+ 'video_embed_field_url' => array(
+ 'label' => t('URL to Video'),
+ 'field types' => array('video_embed_field'),
+ 'settings' => array(),
+ ),
'video_embed_field_thumbnail' => array(
'label' => t('Thumbnail Preview'),
'field types' => array('video_embed_field'),
'settings' => array(
- 'image_style' => 'none',
+ 'image_style' => '',
'description' => 1,
'description_position' => 'bottom',
'image_link' => 'none',
),
),
);
- if ( module_exists('colorbox') ) {
+ if (module_exists('colorbox')) {
$info['video_embed_field_thumbnail_colorbox'] = array(
'label' => t('Thumbnail Preview w/Colorbox'),
'field types' => array('video_embed_field'),
'settings' => array(
'video_style' => 'normal',
- 'image_style' => 'none',
+ 'image_style' => '',
'description' => 1,
'description_position' => 'bottom',
),
);
+ $info['video_embed_field_url_colorbox'] = array(
+ 'label' => t('URL to Video w/Colorbox'),
+ 'field types' => array('video_embed_field'),
+ 'settings' => array(
+ 'video_style' => 'normal',
+ ),
+ );
}
return $info;
}
@@ -243,7 +336,7 @@ function video_embed_field_field_formatter_settings_form($field, $instance, $vie
$settings = $display['settings'];
$element = array();
- if ($display['type'] == 'video_embed_field' || $display['type'] == 'video_embed_field_thumbnail_colorbox') {
+ if ($display['type'] == 'video_embed_field' || $display['type'] == 'video_embed_field_thumbnail_colorbox' || $display['type'] == 'video_embed_field_url_colorbox') {
$video_styles = video_embed_field_video_style_options(FALSE);
$element['video_style'] = array(
'#title' => t('Video style'),
@@ -264,7 +357,7 @@ function video_embed_field_field_formatter_settings_form($field, $instance, $vie
if ($display['type'] == 'video_embed_field_thumbnail') {
$link_types = array(
- 'node' => t('Node'),
+ 'content' => t('Content'),
'source' => t('Video Source'),
);
$element['image_link'] = array(
@@ -276,7 +369,7 @@ function video_embed_field_field_formatter_settings_form($field, $instance, $vie
);
}
- if ($instance['settings']['description_field']) {
+ if ($instance['settings']['description_field'] && $display['type'] != 'video_embed_field_url' && $display['type'] != 'video_embed_field_url_colorbox') {
$element['description'] = array(
'#title' => t('Show description'),
'#type' => 'checkbox',
@@ -288,9 +381,14 @@ function video_embed_field_field_formatter_settings_form($field, $instance, $vie
'#type' => 'select',
'#options' => array(
'top' => t('Top'),
- 'bottom' => t('Bottom')
+ 'bottom' => t('Bottom'),
),
'#default_value' => $settings['description_position'],
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="fields[' . $field['field_name'] . '][settings_edit_form][settings][description]"]' => array('checked' => TRUE),
+ ),
+ ),
);
}
return $element;
@@ -303,7 +401,7 @@ function video_embed_field_field_formatter_settings_summary($field, $instance, $
$settings = $display['settings'];
$summary = array();
- if ($display['type'] == 'video_embed_field' || $display['type'] == 'video_embed_field_thumbnail_colorbox') {
+ if ($display['type'] == 'video_embed_field' || $display['type'] == 'video_embed_field_thumbnail_colorbox' || $display['type'] == 'video_embed_field_url_colorbox') {
$video_styles = video_embed_field_video_style_options(FALSE);
// Styles could be lost because of enabled/disabled modules that defines
// their styles in code.
@@ -315,23 +413,26 @@ function video_embed_field_field_formatter_settings_summary($field, $instance, $
$image_styles = image_style_options(FALSE);
if (isset($image_styles[$settings['image_style']])) {
$summary[] = t('Image style: @style', array('@style' => $image_styles[$settings['image_style']]));
- } //No Image style (original image)
+ }
+ // No Image style (original image).
else {
$summary[] = t('Original Image.');
}
if (isset($settings['image_link'])) {
- $summary[] = t('Image link: ' . $settings['image_link']);
+ $summary[] = t('Image link: @image_link', array('@image_link' => $settings['image_link']));
}
else {
$summary[] = t('Image link: none');
}
}
- if ($settings['description'] && $instance['settings']['description_field']) {
- $summary[] = t('Show description');
- }
- elseif ($instance['settings']['description_field']) {
- $summary[] = t('Hide description');
+ if (isset($settings['description'])) {
+ if ($settings['description'] && $instance['settings']['description_field']) {
+ $summary[] = t('Show description');
+ }
+ elseif ($instance['settings']['description_field']) {
+ $summary[] = t('Hide description');
+ }
}
return implode('
', $summary); @@ -344,20 +445,26 @@ function video_embed_field_field_formatter_view($entity_type, $entity, $field, $ $element = array(); $settings = $display['settings']; + if ($display['type'] == 'video_embed_field_thumbnail' && $display['settings']['image_link'] == 'content') { + $path = entity_uri($entity_type, $entity); + } + foreach ($items as $delta => $item) { - //create the render array for the description + // Create the render array for the description. if (isset($item['description']) && $item['description'] && $settings['description'] && $instance['settings']['description_field']) { $description = array( '#prefix' => '', ); + $alt = $item['description']; } else { $description = array(); + $alt = ''; } - //Render the field + // Render the field. if ($display['type'] == 'video_embed_field') { $element[$delta] = array( array( @@ -368,63 +475,74 @@ function video_embed_field_field_formatter_view($entity_type, $entity, $field, $ ), ); } + elseif ($display['type'] == 'video_embed_field_url') { + $element[$delta] = array( + array( + '#markup' => url($item['video_url']), + ), + ); + } elseif ($display['type'] == 'video_embed_field_thumbnail') { if (isset($item['thumbnail_path'])) { - if (empty($settings['image_style']) || $settings['image_style'] == 'none') { - $element[$delta] = array( - array( - '#theme' => 'image', - '#path' => $item['thumbnail_path'], - ), + if ($display['settings']['image_link'] == 'source') { + if ($ret = parse_url($item['video_url'])) { + if (!isset($ret["scheme"])) { + $item['video_url'] = "http://{$item['video_url']}"; + } + } + $path = array( + 'path' => $item['video_url'], + 'options' => array(), ); } - else { - $element[$delta] = array( - array( - '#theme' => 'image_style', - '#path' => $item['thumbnail_path'], - '#style_name' => $settings['image_style'], - ), - ); - } - if ($settings['image_link'] == 'source') { - $link = explode('|||', l('|||', $item['video_url'])); - $element[$delta]['#prefix'] = $link[0]; - $element[$delta]['#suffix'] = $link[1]; - } - elseif ($settings['image_link'] == 'node') { - $nid = $entity->nid; - $link = explode('|||', l('|||', 'node/' . $nid)); - $element[$delta]['#prefix'] = $link[0]; - $element[$delta]['#suffix'] = $link[1]; - } - } //incase no thumbnail was downloaded / provider doesn't support thumbnails - else { + $element[$delta] = array( + '#theme' => 'image_formatter', + '#item' => array('uri' => $item['thumbnail_path'], 'alt' => $alt), + '#image_style' => $display['settings']['image_style'], + '#path' => isset($path) ? $path : '', ); } + // Incase no thumbnail was downloaded/provider doesn't support thumbnails. + else { + $element[$delta] = array(); + } } elseif ($display['type'] == 'video_embed_field_thumbnail_colorbox') { if (isset($item['thumbnail_path'])) { + if ($ret = parse_url($item['video_url'])) { + if (!isset($ret["scheme"])) { + $item['video_url'] = "http://{$item['video_url']}"; + } + } $element[$delta] = array( array( '#theme' => 'video_embed_field_colorbox_code', '#image_url' => $item['thumbnail_path'], '#image_style' => $display['settings']['image_style'], + '#image_alt' => $alt, '#video_url' => $item['video_url'], '#video_style' => $display['settings']['video_style'], '#video_data' => unserialize($item['video_data']), ), ); } - //incase no thumbnail was downloaded / provider doesn't support thumbnails + // Incase no thumbnail was downloaded/provider doesn't support thumbnails. else { - $element[$delta] = array( - ); + $element[$delta] = array(); } } - //Get the HTML instead of the array, because we append it to the suffix. - //This way, the thumbnail link wrapper doesn't make the description a link as well. + elseif ($display['type'] == 'video_embed_field_url_colorbox') { + $path = video_embed_field_get_ajax_url($item['video_url'], $display['settings']['video_style']); + + $element[$delta] = array( + array( + '#markup' => url($path['path'], $path['options']), + ), + ); + } + // Get the HTML instead of the array, because we append it to the suffix. + // This way, the thumbnail link doesn't make the description a link as well. $description_html = drupal_render($description); $pos = isset($settings['description_position']) ? $settings['description_position'] : 'bottom'; @@ -438,6 +556,5 @@ function video_embed_field_field_formatter_view($entity_type, $entity, $field, $ } } - return $element; } diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc old mode 100755 new mode 100644 index f0824bd..1962008 --- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc @@ -1,7 +1,10 @@ 'Youtube', 'function' => 'video_embed_field_handle_youtube', 'thumbnail_function' => 'video_embed_field_handle_youtube_thumbnail', + 'thumbnail_default' => drupal_get_path('module', 'video_embed_field') . '/img/youtube.jpg', 'data_function' => 'video_embed_field_handle_youtube_data', 'form' => 'video_embed_field_handler_youtube_form', + 'form_validate' => 'video_embed_field_handler_youtube_form_validate', 'domains' => array( 'youtube.com', 'youtu.be', ), 'defaults' => array( - 'width' => '640px', - 'height' => '360px', + 'width' => 640, + 'height' => 360, 'autoplay' => 0, - 'hd' => 1, + 'vq' => 'large', 'rel' => 0, + 'controls' => 1, 'autohide' => 2, 'showinfo' => 1, 'modestbranding' => 0, 'theme' => 'dark', 'iv_load_policy' => 1, + 'class' => '', ), ); @@ -39,20 +46,24 @@ function video_embed_field_video_embed_handler_info() { 'title' => 'Vimeo', 'function' => 'video_embed_field_handle_vimeo', 'thumbnail_function' => 'video_embed_field_handle_vimeo_thumbnail', - 'data_function' => 'video_embed_field_handle_vimeo_data', + 'thumbnail_default' => drupal_get_path('module', 'video_embed_field') . '/img/vimeo.jpg', + 'data_function' => '_video_embed_field_get_vimeo_data', 'form' => 'video_embed_field_handler_vimeo_form', + 'form_validate' => 'video_embed_field_handler_vimeo_form_validate', 'domains' => array( 'vimeo.com', ), 'defaults' => array( - 'width' => '640px', - 'height' => '360px', + 'width' => 640, + 'height' => 360, 'color' => '00adef', 'portrait' => 1, 'title' => 1, 'byline' => 1, 'autoplay' => 0, 'loop' => 0, + 'froogaloop' => 0, + 'class' => '' ), ); @@ -60,11 +71,16 @@ function video_embed_field_video_embed_handler_info() { } /** - * Helper function to get the youtube video's id - * Returns false if it doesn't parse for wahtever reason + * Helper function to get the youtube video's id. + * + * @param string $url + * The video URL. + * + * @return string|bool + * The video ID, or FALSE in case the ID can't be retrieved from the URL. */ function _video_embed_field_get_youtube_id($url) { - // Find the ID of the video they want to play from the url + // Find the ID of the video they want to play from the url. if (stristr($url, 'http://')) { $url = substr($url, 7); } @@ -73,7 +89,7 @@ function _video_embed_field_get_youtube_id($url) { } if (stristr($url, 'playlist')) { - //Playlists need the appended ampersand to take the options properly. + // Playlists need the appended ampersand to take the options properly. $url = $url . '&'; $pos = strripos($url, '?list='); if ($pos !== FALSE) { @@ -84,14 +100,14 @@ function _video_embed_field_get_youtube_id($url) { return FALSE; } } - //Alternate playlist link + // Alternate playlist link. elseif (stristr($url, 'view_play_list')) { $url = $url . '&'; - //All playlist ID's are prepended with PL. view_play_list links allow you to not have that, though. + // All playlist ID's are prepended with PL. if (!stristr($url, '?p=PL')) { $url = substr_replace($url, 'PL', strpos($url, '?p=') + 3, 0); } - //Replace the links format with the embed format + // Replace the links format with the embed format. $url = str_ireplace('play_list?p=', 'videoseries?list=', $url); $pos = strripos($url, 'videoseries?list='); if ($pos !== FALSE) { @@ -133,57 +149,81 @@ function _video_embed_field_get_youtube_id($url) { $id = substr($url, $pos); } } - return $id; + return check_plain($id); } /** * Handler for Youtube videos. + * + * @param string $url + * The video URL. + * @param array $settings + * The settings array. + * + * @return array + * The video iframe render array. */ function video_embed_field_handle_youtube($url, $settings) { $output = array(); - //Grab the minutes and seconds, and just convert it down to seconds - preg_match('/#t=((?P\d+)m)?((?P\d+)s)?/', $url, $matches);
-
- //Give it some default data in case there is no #t=...
- $matches += array(
- "min" => 0,
- "sec" => 0,
- );
- $time = ($matches["min"] * 60) + $matches["sec"];
- $settings['start'] = $time;
+ if(preg_match('/#t=((?P\d+)m)?((?P\d+)s)?((?P\d+))?/', $url, $matches)){
+ if(isset($matches['tinsec'])){
+ $settings['start'] = $matches['tinsec']; // url already in form #t=125 for 2 minutes and 5 seconds
+ } else {
+ // url in form #t=2m5s or with other useless data, this is why we still keep adding the default data..
+ // give it some default data in case there is no #t=...
+ $matches += array(
+ "min" => 0,
+ "sec" => 0,
+ );
+ if ($time = ($matches["min"] * 60) + $matches["sec"]) {
+ $settings['start'] = $time;
+ }
+ }
+ }
$id = _video_embed_field_get_youtube_id($url);
if (!$id) {
- // We can't decode the URL - just return the URL as a link
+ // We can't decode the URL - just return the URL as a link.
$output['#markup'] = l($url, $url);
return $output;
}
- // Construct the embed code
- $settings['wmode'] = 'opaque';
- $settings_str = _video_embed_code_get_settings_str($settings);
- $output['#markup'] = '';
+ // Add class to variable to avoid adding it to URL param string.
+ $class = $settings['class'];
+ unset($settings['class']);
+
+ // Construct the embed code.
+ $settings['wmode'] = 'opaque';
+ $settings_str = urlencode(_video_embed_code_get_settings_str($settings));
+
+ $output['#markup'] = '';
return $output;
}
/**
- * Get the thumbnail url for youtube videos
+ * Gets the thumbnail url for youtube videos.
+ *
+ * @param string $url
+ * The video URL.
+ *
+ * @return array
+ * The video thumbnail information.
*/
-function video_embed_field_handle_youtube_thumbnail($video_url) {
+function video_embed_field_handle_youtube_thumbnail($url) {
$info = array();
- $id = _video_embed_field_get_youtube_id($video_url);
+ $id = _video_embed_field_get_youtube_id($url);
- //Playlist
+ // Playlist.
if (stristr($id, '?list=')) {
- //Strip out all but the ID, including the PL behind the ID.
+ // Strip out all but the ID, including the PL behind the ID.
$start = strpos($id, '?list=PL') + 8;
$length = strpos($id, '&') - $start;
$id = substr($id, $start, $length);
$info['id'] = $id;
- //Playlist info is stored in XML. The thumbnail is in there.
+ // Playlist info is stored in XML. The thumbnail is in there.
$xml = drupal_http_request('http://gdata.youtube.com/feeds/api/playlists/' . $id);
if (!isset($xml->error)) {
$xml = new SimpleXMLElement($xml->data);
@@ -194,7 +234,7 @@ function video_embed_field_handle_youtube_thumbnail($video_url) {
}
}
}
- //Regular video
+ // Regular video.
elseif ($id) {
$info['id'] = $id;
$info['url'] = 'http://img.youtube.com/vi/' . $id . '/0.jpg';
@@ -203,26 +243,30 @@ function video_embed_field_handle_youtube_thumbnail($video_url) {
}
/**
- * Get video data for a YouTube video URL
+ * Gets video data for a YouTube video URL.
*
* @param string $url
* A YouTube video URL to get data for
*
- * @return array|false $data
+ * @return array|bool
* An array of video data, or FALSE if unable to fetch data
*/
function video_embed_field_handle_youtube_data($url) {
- $data = array();
-
- // Get YouTube video ID from URL
+ // Get YouTube video ID from URL.
$id = _video_embed_field_get_youtube_id($url);
if ($id) {
- $response = drupal_http_request('http://gdata.youtube.com/feeds/api/videos/' . $id . '?v=2&alt=json');
+
+ $options['v'] = 3;
+ $options['key'] = variable_get('video_embed_field_youtube_v3_api_key', '');
+ $options['part'] = 'snippet';
+ $options['id'] = $id;
+
+ $response = drupal_http_request(url('https://www.googleapis.com/youtube/v3/videos', array('query' => $options)));
+
if (!isset($response->error)) {
$data = json_decode($response->data);
- $data = isset($data->entry) ? (array) $data->entry : (array) $data->feed;
- return _video_embed_field_clean_up_youtube_data($data);
+ return _video_embed_field_clean_up_youtube_data($data->items);
}
}
@@ -230,10 +274,16 @@ function video_embed_field_handle_youtube_data($url) {
}
/**
- * Flatten out some unnecessary nesting in the youtube data
+ * Flattens out some unnecessary nesting in the youtube data.
+ *
+ * @param array $data
+ * The unflattened data.
+ *
+ * @return array
+ * The flattened data.
*/
function _video_embed_field_clean_up_youtube_data($data) {
- //make things a bit nicer for people trying to use the data
+ // Make things a bit nicer for people trying to use the data.
foreach ($data as $key => $value) {
if (is_object($value)) {
$temp = (array) $value;
@@ -267,6 +317,12 @@ function _video_embed_field_clean_up_youtube_data($data) {
/**
* Defines the form elements for the Youtube configuration form.
+ *
+ * @param array $defaults
+ * The form default values.
+ *
+ * @return array
+ * The provider settings form array.
*/
function video_embed_field_handler_youtube_form($defaults) {
$form = array();
@@ -300,11 +356,18 @@ function video_embed_field_handler_youtube_form($defaults) {
'#description' => t('Play the video immediately.'),
'#default_value' => $defaults['autoplay'],
);
- $form['hd'] = array(
- '#type' => 'checkbox',
- '#title' => t('Use HD'),
- '#description' => t('Attempt to play the video in HD if available.'),
- '#default_value' => $defaults['hd'],
+ $form['vq'] = array(
+ '#type' => 'select',
+ '#title' => t('Video quality'),
+ '#options' => array(
+ 'small' => t('Small (240p)'),
+ 'medium' => t('Medium (360p)'),
+ 'large' => t('Large (480p)'),
+ 'hd720' => t('HD 720p'),
+ 'hd1080' => t('HD 10800p'),
+ ),
+ '#default_value' => $defaults['vq'],
+ '#description' => t('Attempt to play the video in certain quality if available.'),
);
$form['rel'] = array(
'#type' => 'checkbox',
@@ -334,6 +397,17 @@ function video_embed_field_handler_youtube_form($defaults) {
'#description' => t('Controls the display of annotations over the video content. Only works when using the flash player.'),
'#default_value' => $defaults['iv_load_policy'],
);
+ $form['controls'] = array(
+ '#type' => 'radios',
+ '#options' => array(
+ 0 => t('Hide video controls.'),
+ 1 => t('Show video controls. Youtube default.'),
+ 2 => t('Show video controls with performance improvement for iframe embeds.'),
+ ),
+ '#title' => t('Display Youtube player controls'),
+ '#description' => t('This parameter indicates whether the video player controls will display.'),
+ '#default_value' => $defaults['controls'],
+ );
$form['autohide'] = array(
'#type' => 'radios',
'#options' => array(
@@ -346,93 +420,149 @@ function video_embed_field_handler_youtube_form($defaults) {
'#default_value' => $defaults['autohide'],
);
+ $form['class'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Player CSS class'),
+ '#description' => t('CSS class to add to the player'),
+ '#default_value' => $defaults['class'],
+ );
+
return $form;
}
/**
- * Helper function to get the Vimeo video's ID
+ * Validates the form elements for the Youtube configuration form.
+ *
+ * @param array $element
+ * The form element to validate.
+ * @param array $form_state
+ * The form to validate state.
+ * @param array $form
+ * The form to validate structure.
+ */
+function video_embed_field_handler_youtube_form_validate($element, &$form_state, $form) {
+ video_embed_field_validate_dimensions($element);
+}
+
+/**
+ * Helper function to get the Vimeo video's data attributes.
*
* @param string $url
- * A Vimeo video URL to get the ID of
+ * A Vimeo video URL to get the data from.
*
- * @return integer|false $id
- * The video ID, or FALSE if unable to get the video ID
+ * @return integer|false
+ * The video's data attributes, or FALSE if unable to get the video ID.
*/
-function _video_embed_field_get_vimeo_id($url) {
- $pos = strripos($url, '/');
- if ($pos != FALSE) {
- $pos += 1;
- return (int) substr($url, $pos);
+function _video_embed_field_get_vimeo_data($url) {
+ // Set oembed endpoint
+ $oembed_endpoint = 'http://vimeo.com/api/oembed';
+ // Fetch vimeo data
+ $response = drupal_http_request($oembed_endpoint . '.json?url=' . rawurlencode($url));
+
+ try {
+ return json_decode($response->data, TRUE);
+ } catch (Exception $e) {
+ return FALSE;
}
- return FALSE;
+}
+
+/**
+ * Helper function to get the Vimeo video's data attributes.
+ *
+ * @param string $url
+ * A Vimeo video URL to get the ID of.
+ *
+ * @return integer|false
+ * The video ID, or FALSE if unable to get the video ID.
+ */
+function _video_embed_field_get_vimeo_id($vimeo_data) {
+ try {
+ $video_id = $vimeo_data['video_id'];
+ } catch (Exception $e) {
+ $video_id = FALSE;
+ }
+
+ return $video_id;
}
/**
* Handler for Vimeo videos.
+ *
+ * @param string $url
+ * The video URL.
+ * @param array $settings
+ * The settings array.
+ *
+ * @return string
+ * The video iframe.
*/
function video_embed_field_handle_vimeo($url, $settings) {
- // Get ID of video from URL
- $id = _video_embed_field_get_vimeo_id($url);
- if (!$id) {
+ $vimeo_data = _video_embed_field_get_vimeo_data($url);
+
+ // Get ID of video from URL.
+ $id = _video_embed_field_get_vimeo_id($vimeo_data);
+
+ if (empty($id)) {
return array(
'#markup' => l($url, $url),
);
}
- // Construct the embed code
- $settings['portrait'] = 0;
+ // Construct the embed code.
+ $settings['player_id'] = drupal_html_id('vimeo-' . $id);
+ if (!empty($settings['froogaloop'])) {
+ $settings['api'] = 1;
+ }
+ unset($settings['froogaloop']);
+
+ // Add class to variable to avoid adding it to URL param string.
+ $class = $settings['class'];
+ unset($settings['class']);
+
$settings_str = _video_embed_code_get_settings_str($settings);
return array(
- '#markup' => '',
+ '#markup' => '',
);
}
/**
- * Get the thumbnail url for youtube videos
+ * Gets the thumbnail url for vimeo videos.
+ *
+ * @param string $url
+ * The video URL.
+ *
+ * @return array
+ * The video thumbnail information.
*/
function video_embed_field_handle_vimeo_thumbnail($url) {
- // Get ID of video from URL
- $id = _video_embed_field_get_vimeo_id($url);
+ $vimeo_data = _video_embed_field_get_vimeo_data($url);
+
+ // Get ID of video from URL.
+ $id = _video_embed_field_get_vimeo_id($vimeo_data);
+
$info = array(
'id' => $id,
);
- $response = drupal_http_request('http://vimeo.com/api/v2/video/' . $id . '.php');
- if (!isset($response->error)) {
- $response = unserialize($response->data);
- $video = current($response);
- $image_url = $video['thumbnail_large'];
- $info['url'] = $image_url;
+ try {
+ $info['url'] = $vimeo_data['thumbnail_url'];
+ } catch (Exception $e) {
+
}
+
return $info;
}
-/**
- * Get video data for a Vimeo video URL
- *
- * @param string $url
- * A Vimeo video URL to get data for
- *
- * @return array|false $data
- * An array of video data, or FALSE if unable to fetch data
- */
-function video_embed_field_handle_vimeo_data($url) {
- // Get ID of video from URL
- $id = _video_embed_field_get_vimeo_id($url);
- if ($id) {
- $response = drupal_http_request('http://vimeo.com/api/v2/video/' . $id . '.php');
- if (!isset($response->error)) {
- $response = unserialize($response->data);
- return (array) current($response);
- }
- }
- return FALSE;
-}
-
/**
* Defines the form elements for the Vimeo configuration form.
+ *
+ * @param array $defaults
+ * The form default values.
+ *
+ * @return array
+ * The provider settings form array.
*/
function video_embed_field_handler_vimeo_form($defaults) {
$form = array();
@@ -444,6 +574,7 @@ function video_embed_field_handler_vimeo_form($defaults) {
'#description' => t('The width of the vimeo player.'),
'#default_value' => $defaults['width'],
);
+
$form['height'] = array(
'#type' => 'textfield',
'#size' => '5',
@@ -451,6 +582,7 @@ function video_embed_field_handler_vimeo_form($defaults) {
'#description' => t('The height of the vimeo player.'),
'#default_value' => $defaults['height'],
);
+
$form['color'] = array(
'#type' => 'select',
'#options' => array(
@@ -464,47 +596,90 @@ function video_embed_field_handler_vimeo_form($defaults) {
'#description' => t('The color to use on the vimeo player.'),
'#default_value' => $defaults['color'],
);
+
$form['portrait'] = array(
'#type' => 'checkbox',
'#title' => t('Overlay Author Thumbnail'),
- '#description' => t('Overlay the author\'s thumbnail before the video is played.'),
+ '#description' => t("Overlay the author's thumbnail before the video is played."),
'#default_value' => $defaults['portrait'],
);
+
$form['title'] = array(
'#type' => 'checkbox',
- '#title' => t('Overlay Video\'s Title'),
- '#description' => t('Overlay the video\'s title before the video is played.'),
+ '#title' => t("Overlay Video's Title"),
+ '#description' => t("Overlay the video's title before the video is played."),
'#default_value' => $defaults['title'],
);
+
$form['byline'] = array(
'#type' => 'checkbox',
- '#title' => t('Overlay Video\'s Byline'),
- '#description' => t('Overlay the video\'s description before the video is played.'),
+ '#title' => t("Overlay Video's Byline"),
+ '#description' => t("Overlay the video's description before the video is played."),
'#default_value' => $defaults['byline'],
);
+
$form['overridable'] = array(
'#prefix' => ' option will be inserted in the options array.
- * @return
+ *
+ * @return array
* Array of image styles both key and value are set to style name.
*/
function video_embed_field_video_style_options($include_empty = TRUE) {
@@ -271,7 +337,9 @@ function video_embed_field_video_style_options($include_empty = TRUE) {
if ($include_empty && !empty($styles)) {
$options[''] = t('');
}
- $options = array_merge($options, drupal_map_assoc(array_keys($styles)));
+ foreach ($styles as $style) {
+ $options[$style->name] = $style->title;
+ }
if (empty($options)) {
$options[''] = t('No defined styles');
}
@@ -286,11 +354,23 @@ function video_embed_field_filter_info() {
'title' => t('Video Embedding'),
'description' => t('Replaces [VIDEO::http://www.youtube.com/watch?v=someVideoID::aVideoStyle] tags with embedded videos.'),
'process callback' => 'video_embed_field_filter_process',
+ 'tips callback' => '_filter_video_embed_tips',
);
return $filters;
}
+/**
+ * Implements callback_filter_tips().
+ *
+ * Provides help for the URL filter.
+ *
+ * @see filter_filter_info()
+ */
+function _filter_video_embed_tips($filter, $format, $long = FALSE) {
+ return t('Replaces [VIDEO::http://www.youtube.com/watch?v=someVideoID::aVideoStyle] tags with embedded videos.');
+}
+
/**
* Video Embed Field filter process callback.
*/
@@ -298,12 +378,11 @@ function video_embed_field_filter_process($text, $filter, $format) {
preg_match_all('/ \[VIDEO:: ( [^\[\]]+ )* \] /x', $text, $matches);
$tag_match = (array) array_unique($matches[1]);
- $handlers = video_embed_get_handlers();
foreach ($tag_match as $tag) {
$parts = explode('::', $tag);
- // Get video style
+ // Get video style.
if (isset($parts[1])) {
$style = $parts[1];
}
@@ -320,40 +399,41 @@ function video_embed_field_filter_process($text, $filter, $format) {
}
/**
- * Process variables to format a video player.
+ * Processes variables to format a video player.
*
- * $variables contains the following information:
- * - $url
- * - $style
- * - $video_data
+ * @param array $variables
+ * Contains the following information:
+ * - $url
+ * - $style
+ * - $video_data
*
* @see video-embed.tpl.php
*/
function template_preprocess_video_embed_field_embed_code(&$variables) {
- // Get the handler
+ // Get the handler.
$handler = video_embed_get_handler($variables['url']);
$variables['handler'] = $handler['name'];
- // Load the style
+ // Load the style.
$style = video_embed_field_video_style_load($variables['style']);
- // If there was an issue load in the default style
+ // If there was an issue load in the default style.
if ($style == FALSE) {
$style = video_embed_field_video_style_load('normal');
}
if (isset($style->data[$variables['handler']])) {
$variables['style_settings'] = $style->data[$variables['handler']];
- } //safety valve for when we add new handlers and there are styles in the database.
+ }
+ // Safety value for when we add new handlers and there are styles stored.
else {
$variables['style_settings'] = $handler['defaults'];
}
-
- // Prepare the URL
+ // Prepare the URL.
if (!stristr($variables['url'], 'http://') && !stristr($variables['url'], 'https://')) {
$variables['url'] = 'http://' . $variables['url'];
}
- // Prepare embed code
+ // Prepare embed code.
if ($handler && isset($handler['function']) && function_exists($handler['function'])) {
$embed_code = call_user_func($handler['function'], $variables['url'], $variables['style_settings']);
$variables['embed_code'] = drupal_render($embed_code);
@@ -362,89 +442,76 @@ function template_preprocess_video_embed_field_embed_code(&$variables) {
$variables['embed_code'] = l($variables['url'], $variables['url']);
}
- // Prepare video data
+ // Prepare video data.
$variables['data'] = $variables['video_data'];
unset($variables['video_data']);
}
/**
- * Returns image style image with a link to
- * an embedded video in colorbox.
+ * Returns image style image with a link to an embedded video in colorbox.
*
- * @param $variables
+ * @param array $variables
* An associative array containing:
* - image_url: The image URL.
* - image_style: The image style to use.
+ * - image_alt: The image ALT attribute.
* - video_url: The video URL.
* - video_style: The video style to use.
* - video_data: An array of data about the video.
*
+ * @return string
+ * The themed output.
+ *
* @ingroup themeable
*/
function theme_video_embed_field_colorbox_code($variables) {
- $style = video_embed_field_video_style_load($variables['video_style']);
+ $path = video_embed_field_get_ajax_url($variables['video_url'], $variables['video_style']);
- // If there was an issue load in the default style
- if ($style == FALSE) {
- $style = video_embed_field_video_style_load('normal');
- }
+ $image = array(
+ '#theme' => 'image_formatter',
+ '#item' => array('uri' => $variables['image_url'], 'alt' => $variables['image_alt']),
+ '#image_style' => $variables['image_style'],
+ '#path' => $path,
+ );
- $handler = video_embed_get_handler($variables['video_url']);
-
- $data = $style->data[$handler['name']];
-
- //Create a unique ID for colorbox inline
- $id = uniqid('video_embed_field-' . rand());
-
- if ($variables['image_style'] == 'none') {
- $image = array(
- array(
- '#theme' => 'image',
- '#path' => $variables['image_url'],
- ),
- );
- }
- else {
- $image = array(
- '#theme' => 'image_style',
- '#path' => $variables['image_url'],
- '#style_name' => $variables['image_style'],
- );
- }
-
- $image = drupal_render($image);
-
- // Write values for later AJAX load
- $hash = _video_embed_field_store_video($variables['video_url'], $variables['video_style']);
-
- $output = l($image, base_path() . '?q=vef/load/' . $hash . '&width=' . ($data['width']) . '&height=' . ($data['height'] + 3), array('html' => TRUE, 'external' => TRUE, 'attributes' => array('class' => array('colorbox-load'))));
-
- return $output;
+ return drupal_render($image);
}
/**
- * Get the thumbnail url for a given video url
- * @param $url - the url of the video
- * @return a string representing the url of the thumbnail, or FALSE on error
- */
-function video_embed_field_thumbnail_url($url) {
- $handler = video_embed_get_handler($url);
- if ($handler && isset($handler['thumbnail_function']) && function_exists($handler['thumbnail_function'])) {
- $info = call_user_func($handler['thumbnail_function'], $url);
- $info['handler'] = $handler['name'];
- return $info;
- }
- return FALSE;
-}
-
-/**
- * Get a video data array for a given video url
+ * Gets the thumbnail url for a given video url.
*
* @param string $url
- * A video URL of the data array you want returned
+ * The url of the video.
*
- * @return array|false $data
- * An array of video data, or FALSE on error
+ * @return string
+ * String representing the url of the thumbnail, or FALSE on error.
+ */
+function video_embed_field_thumbnail_url($url) {
+ $info = FALSE;
+ if ($handler = video_embed_get_handler($url)) {
+ if (isset($handler['thumbnail_function']) && function_exists($handler['thumbnail_function'])) {
+ $info = call_user_func($handler['thumbnail_function'], $url);
+ $info['handler'] = $handler['name'];
+ }
+ if (empty($info['url']) && isset($handler['thumbnail_default']) && file_exists($handler['thumbnail_default'])) {
+ $info = array(
+ 'handler' => $handler['name'],
+ 'id' => 'default_thumbnail',
+ 'url' => $handler['thumbnail_default'],
+ );
+ }
+ }
+ return $info;
+}
+
+/**
+ * Gets a video data array for a given video url.
+ *
+ * @param string $url
+ * A video URL of the data array you want returned.
+ *
+ * @return array|false
+ * An array of video data, or FALSE on error.
*/
function video_embed_field_get_video_data($url) {
$handler = video_embed_get_handler($url);
@@ -457,7 +524,53 @@ function video_embed_field_get_video_data($url) {
}
/**
- * Fetch all available provider domains.
+ * Generates the AJAX path array from the video URL and the video_style.
+ *
+ * @param string $video_url
+ * The URL to the video.
+ * @param string $video_style
+ * The video style to render the video.
+ *
+ * @return array
+ * The AJAX path array.
+ */
+function video_embed_field_get_ajax_url($video_url, $video_style) {
+ $style = video_embed_field_video_style_load($video_style);
+
+ // If there was an issue load in the default style.
+ if ($style == FALSE) {
+ $style = video_embed_field_video_style_load('normal');
+ }
+
+ $handler = video_embed_get_handler($video_url);
+
+ $data = $style->data[$handler['name']];
+
+ // Write values for later AJAX load.
+ $hash = _video_embed_field_store_video($video_url, $video_style);
+
+ return array(
+ 'path' => 'vef/load/' . $hash,
+ 'options' => array(
+ 'attributes' => array(
+ 'class' => array(
+ 'colorbox-load',
+ 'colorbox'
+ ),
+ ),
+ 'query' => array(
+ 'width' => $data['width'],
+ 'height' => $data['height'] + 5,
+ ),
+ ),
+ );
+}
+
+/**
+ * Fetches all available provider domains.
+ *
+ * @return array
+ * An array containing the allowed video domains.
*/
function _video_embed_field_get_provider_domains() {
$domains = array();
@@ -475,13 +588,32 @@ function _video_embed_field_get_provider_domains() {
}
/**
- * Fetch settings string
+ * Fetches all available provider domains for certain field instance.
+ *
+ * @param array $instance
+ * The instance definition.
+ *
+ * @return array
+ * An array containing the allowed video domains.
+ */
+function _video_embed_field_get_instance_provider_domains($instance) {
+ return array_intersect(_video_embed_field_get_provider_domains(), $instance['settings']['allowed_providers']);
+}
+
+/**
+ * Fetches settings string.
+ *
+ * @param array $settings
+ * The settings array.
+ *
+ * @return string
+ * The settings string generated from the settings array.
*/
function _video_embed_code_get_settings_str($settings = array()) {
$values = array();
foreach ($settings as $name => $value) {
- if (empty($value)) {
+ if (!isset($value)) {
$values[] = $name;
}
else {
@@ -492,19 +624,22 @@ function _video_embed_code_get_settings_str($settings = array()) {
return implode('&', $values);
}
-//used to array filter in video_embed_field_requirements
-function _video_embed_field_array_filter($item) {
- return (isset($item['type']) && $item['type'] == 'video_embed_field');
-}
-
/**
- * Store a video to be loaded later from an _video_embed_field_load_video
+ * Stores a video to be loaded later from an _video_embed_field_load_video.
+ *
+ * @param string $video_url
+ * The video URL.
+ * @param string $video_style
+ * The video style.
+ *
+ * @return string
+ * The hash generated for the video URL and the given style.
*/
function _video_embed_field_store_video($video_url, $video_style) {
- //create a hash key
+ // Create a hash key.
$hash = _video_embed_field_hash($video_url, $video_style);
- //check that is record doesn't already exist before saving it
+ // Check that this record doesn't already exist before saving it.
if (!_video_embed_field_load_video($hash)) {
$record = array(
'vhash' => $hash,
@@ -514,7 +649,7 @@ function _video_embed_field_store_video($video_url, $video_style) {
cache_set('vef-store-' . $hash, $record);
- //add it to our static cache so we won't have to go to the database
+ // Add it to our static cache so we won't have to go to the database.
$static_cache = &drupal_static('vef_video_store', array());
$static_cache[$hash] = $record;
}
@@ -522,7 +657,13 @@ function _video_embed_field_store_video($video_url, $video_style) {
}
/**
- * Callback to render a video for an Ajax call
+ * Renders a video for an AJAX call.
+ *
+ * @param string $hash
+ * The video hash.
+ *
+ * @return Null
+ * Null because prints an AJAX output.
*/
function _video_embed_field_show_video($hash) {
$data = _video_embed_field_load_video($hash);
@@ -537,20 +678,24 @@ function _video_embed_field_show_video($hash) {
}
/**
- * Loads a video from the video store given its hash
- * Returns either the data - an array with hash, video_url and video_style keys
+ * Loads a video from the video store given its hash.
+ *
+ * @param string $hash
+ * The video hash.
+ *
+ * @return array|bool
+ * An array with video definition, FALSE if the hash does not exist.
*/
function _video_embed_field_load_video($hash) {
$static_cache = &drupal_static('vef_video_store', array());
- //check if we've already loaded it
+ // Check if we've already loaded it.
if (isset($static_cache[$hash])) {
return $static_cache[$hash];
}
else {
-
$result = cache_get('vef-store-' . $hash);
if ($result) {
- //cache it before returning
+ // Cache it before returning.
$data = $result->data;
$static_cache[$hash] = $data;
return $data;
@@ -562,9 +707,16 @@ function _video_embed_field_load_video($hash) {
}
/**
- * Creates a hash for storing or looking up a video in the store table
+ * Creates a hash for storing or looking up a video in the store table.
+ *
+ * @param string $video_url
+ * The video URL.
+ * @param string $video_style
+ * The video style.
+ *
+ * @return string
+ * The hash generated for the video URL and the given style.
*/
function _video_embed_field_hash($video_url, $video_style) {
return md5('vef' . $video_url . $video_style);
}
-
diff --git a/sites/all/modules/contrib/fields/video_embed_field/views/handlers/views_embed_field_views_handler_field_thumbnail_path.inc b/sites/all/modules/contrib/fields/video_embed_field/views/handlers/views_embed_field_views_handler_field_thumbnail_path.inc
new file mode 100644
index 0000000..c1178fe
--- /dev/null
+++ b/sites/all/modules/contrib/fields/video_embed_field/views/handlers/views_embed_field_views_handler_field_thumbnail_path.inc
@@ -0,0 +1,22 @@
+ 'views_handler_field',
+ 'thumbnail_path' => 'views_embed_field_views_handler_field_thumbnail_path',
+ 'description' => 'views_handler_field',
+ );
+
+ // Get the translated field information.
+ $properties = video_embed_field_data_property_info();
+
+ // Iterate over video_embed_field defined tables.
+ foreach ($data as &$table) {
+ // Make sure the parent Views field (video_embed_field) is defined.
+ if (isset($table[$field['field_name']]['field'])) {
+ // Use the parent field definition as a template for component columns.
+ $field_def = $table[$field['field_name']]['field'];
+
+ // Remove 'additional fields' from the field definition. We don't
+ // necessarily want all our sibling columns.
+ unset($field_def['additional fields']);
+
+ // Define the valid columns.
+ $valid_columns = array();
+ foreach ($implemented as $implement => $handler) {
+ $column_name = $field['field_name'] . '_' . $implement;
+ $valid_columns[$column_name] = $handler;
+ }
+
+ // Iterate over the video_embed_field components.
+ foreach ($table as $column_name => &$column) {
+ if (empty($column['field']) && isset($valid_columns[$column_name])) {
+ // Assign the default component definition.
+ $column['field'] = $field_def;
+ $column['field']['real field'] = $column_name;
+ $column['field']['handler'] = $valid_columns[$column_name];
+
+ // Assign human-friendly labels for video_embed_field components.
+ $field_labels = field_views_field_label($field['field_name']);
+ $field_label = array_shift($field_labels);
+ $property = str_replace($field_def['field_name'] . '_', '', $column_name);
+
+ if (!empty($properties[$property])) {
+ $property_label = $properties[$property]['label'];
+
+ $title = t('@field-label - @property-label', array(
+ '@field-label' => $field_label,
+ '@property-label' => $property_label,
+ ));
+
+ $column['title'] = $title;
+ $column['title short'] = $title;
+ }
+ }
+ }
+ }
+ }
+
+ return $data;
+}
diff --git a/sites/all/modules/contrib/js/jquery_update/jquery_update.info b/sites/all/modules/contrib/js/jquery_update/jquery_update.info
index 7517c48..81c86a7 100644
--- a/sites/all/modules/contrib/js/jquery_update/jquery_update.info
+++ b/sites/all/modules/contrib/js/jquery_update/jquery_update.info
@@ -7,9 +7,9 @@ files[] = jquery_update.install
configure = admin/config/development/jquery_update
-; Information added by Drupal.org packaging script on 2015-01-25
-version = "7.x-2.5"
+; Information added by Drupal.org packaging script on 2015-10-20
+version = "7.x-2.7"
core = "7.x"
project = "jquery_update"
-datestamp = "1422221882"
+datestamp = "1445379855"
diff --git a/sites/all/modules/contrib/js/jquery_update/jquery_update.module b/sites/all/modules/contrib/js/jquery_update/jquery_update.module
index 956c9e5..9d143be 100644
--- a/sites/all/modules/contrib/js/jquery_update/jquery_update.module
+++ b/sites/all/modules/contrib/js/jquery_update/jquery_update.module
@@ -267,11 +267,11 @@ function jquery_update_jquery_replace(&$javascript, $cdn, $path, $min, $version)
break;
case '1.7':
- $trueversion = '1.7.1';
+ $trueversion = '1.7.2';
break;
case '1.8':
- $trueversion = '1.8.2';
+ $trueversion = '1.8.3';
break;
case '1.9':
diff --git a/sites/all/modules/contrib/js/jquery_update/replace/jquery/1.7/jquery.js b/sites/all/modules/contrib/js/jquery_update/replace/jquery/1.7/jquery.js
index 8ccd0ea..3774ff9 100644
--- a/sites/all/modules/contrib/js/jquery_update/replace/jquery/1.7/jquery.js
+++ b/sites/all/modules/contrib/js/jquery_update/replace/jquery/1.7/jquery.js
@@ -1,5 +1,5 @@
/*!
- * jQuery JavaScript Library v1.7.1
+ * jQuery JavaScript Library v1.7.2
* http://jquery.com/
*
* Copyright 2011, John Resig
@@ -11,7 +11,7 @@
* Copyright 2011, The Dojo Foundation
* Released under the MIT, BSD, and GPL Licenses.
*
- * Date: Mon Nov 21 21:11:03 2011 -0500
+ * Date: Wed Mar 21 12:46:34 2012 -0700
*/
(function( window, undefined ) {
@@ -210,7 +210,7 @@ jQuery.fn = jQuery.prototype = {
selector: "",
// The current version of jQuery being used
- jquery: "1.7.1",
+ jquery: "1.7.2",
// The default length of a jQuery object is 0
length: 0,
@@ -497,9 +497,8 @@ jQuery.extend({
return jQuery.type(obj) === "array";
},
- // A crude way of determining if an object is a window
isWindow: function( obj ) {
- return obj && typeof obj === "object" && "setInterval" in obj;
+ return obj != null && obj == obj.window;
},
isNumeric: function( obj ) {
@@ -579,6 +578,9 @@ jQuery.extend({
// Cross-browser xml parsing
parseXML: function( data ) {
+ if ( typeof data !== "string" || !data ) {
+ return null;
+ }
var xml, tmp;
try {
if ( window.DOMParser ) { // Standard
@@ -822,31 +824,55 @@ jQuery.extend({
// Mutifunctional method to get and set values to a collection
// The value/s can optionally be executed if it's a function
- access: function( elems, key, value, exec, fn, pass ) {
- var length = elems.length;
+ access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
+ var exec,
+ bulk = key == null,
+ i = 0,
+ length = elems.length;
- // Setting many attributes
- if ( typeof key === "object" ) {
- for ( var k in key ) {
- jQuery.access( elems, k, key[k], exec, fn, value );
+ // Sets many values
+ if ( key && typeof key === "object" ) {
+ for ( i in key ) {
+ jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
}
- return elems;
- }
+ chainable = 1;
- // Setting one attribute
- if ( value !== undefined ) {
+ // Sets one value
+ } else if ( value !== undefined ) {
// Optionally, function values get executed if exec is true
- exec = !pass && exec && jQuery.isFunction(value);
+ exec = pass === undefined && jQuery.isFunction( value );
- for ( var i = 0; i < length; i++ ) {
- fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+ if ( bulk ) {
+ // Bulk operations only iterate when executing function values
+ if ( exec ) {
+ exec = fn;
+ fn = function( elem, key, value ) {
+ return exec.call( jQuery( elem ), value );
+ };
+
+ // Otherwise they run against the entire set
+ } else {
+ fn.call( elems, value );
+ fn = null;
+ }
}
- return elems;
+ if ( fn ) {
+ for (; i < length; i++ ) {
+ fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+ }
+ }
+
+ chainable = 1;
}
- // Getting an attribute
- return length ? fn( elems[0], key ) : undefined;
+ return chainable ?
+ elems :
+
+ // Gets
+ bulk ?
+ fn.call( elems ) :
+ length ? fn( elems[0], key ) : emptyGet;
},
now: function() {
@@ -1005,6 +1031,8 @@ jQuery.Callbacks = function( flags ) {
stack = [],
// Last fire value (for non-forgettable lists)
memory,
+ // Flag to know if list was already fired
+ fired,
// Flag to know if list is currently firing
firing,
// First callback to fire (used internally by add and fireWith)
@@ -1038,6 +1066,7 @@ jQuery.Callbacks = function( flags ) {
fire = function( context, args ) {
args = args || [];
memory = !flags.memory || [ context, args ];
+ fired = true;
firing = true;
firingIndex = firingStart || 0;
firingStart = 0;
@@ -1173,7 +1202,7 @@ jQuery.Callbacks = function( flags ) {
},
// To know if the callbacks have already been called at least once
fired: function() {
- return !!memory;
+ return !!fired;
}
};
@@ -1336,7 +1365,6 @@ jQuery.support = (function() {
select,
opt,
input,
- marginDiv,
fragment,
tds,
events,
@@ -1419,9 +1447,13 @@ jQuery.support = (function() {
noCloneEvent: true,
inlineBlockNeedsLayout: false,
shrinkWrapBlocks: false,
- reliableMarginRight: true
+ reliableMarginRight: true,
+ pixelMargin: true
};
+ // jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
+ jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat");
+
// Make sure checked status is properly cloned
input.checked = true;
support.noCloneChecked = input.cloneNode( true ).checked;
@@ -1456,6 +1488,10 @@ jQuery.support = (function() {
support.radioValue = input.value === "t";
input.setAttribute("checked", "checked");
+
+ // #11217 - WebKit loses check when the name is after the checked attribute
+ input.setAttribute( "name", "t" );
+
div.appendChild( input );
fragment = document.createDocumentFragment();
fragment.appendChild( div.lastChild );
@@ -1470,23 +1506,6 @@ jQuery.support = (function() {
fragment.removeChild( input );
fragment.appendChild( div );
- div.innerHTML = "";
-
- // Check if div with explicit width and no margin-right incorrectly
- // gets computed margin-right based on width of container. For more
- // info see bug #3333
- // Fails in WebKit before Feb 2011 nightlies
- // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
- if ( window.getComputedStyle ) {
- marginDiv = document.createElement( "div" );
- marginDiv.style.width = "0";
- marginDiv.style.marginRight = "0";
- div.style.width = "2px";
- div.appendChild( marginDiv );
- support.reliableMarginRight =
- ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
- }
-
// Technique from Juriy Zaytsev
// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
// We only care about the case where non-standard event systems
@@ -1494,7 +1513,7 @@ jQuery.support = (function() {
// avoid an eval call (in setAttribute) which can cause CSP
// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
if ( div.attachEvent ) {
- for( i in {
+ for ( i in {
submit: 1,
change: 1,
focusin: 1
@@ -1512,12 +1531,13 @@ jQuery.support = (function() {
fragment.removeChild( div );
// Null elements to avoid leaks in IE
- fragment = select = opt = marginDiv = div = input = null;
+ fragment = select = opt = div = input = null;
// Run tests that need a body at doc ready
jQuery(function() {
var container, outer, inner, table, td, offsetSupport,
- conMarginTop, ptlm, vb, style, html,
+ marginDiv, conMarginTop, style, html, positionTopLeftWidthHeight,
+ paddingMarginBorderVisibility, paddingMarginBorder,
body = document.getElementsByTagName("body")[0];
if ( !body ) {
@@ -1526,15 +1546,16 @@ jQuery.support = (function() {
}
conMarginTop = 1;
- ptlm = "position:absolute;top:0;left:0;width:1px;height:1px;margin:0;";
- vb = "visibility:hidden;border:0;";
- style = "style='" + ptlm + "border:5px solid #000;padding:0;'";
- html = "" +
+ paddingMarginBorder = "padding:0;margin:0;border:";
+ positionTopLeftWidthHeight = "position:absolute;top:0;left:0;width:1px;height:1px;";
+ paddingMarginBorderVisibility = paddingMarginBorder + "0;visibility:hidden;";
+ style = "style='" + positionTopLeftWidthHeight + paddingMarginBorder + "5px solid #000;";
+ html = "" +
"
";
container = document.createElement("div");
- container.style.cssText = vb + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
+ container.style.cssText = paddingMarginBorderVisibility + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
body.insertBefore( container, body.firstChild );
// Construct the test element
@@ -1548,7 +1569,7 @@ jQuery.support = (function() {
// display:none (it is still safe to use offsets if a parent element is
// hidden; don safety goggles and see bug #4512 for more information).
// (only IE 8 fails this test)
- div.innerHTML = "
";
+ div.innerHTML = "
";
tds = div.getElementsByTagName( "td" );
isSupported = ( tds[ 0 ].offsetHeight === 0 );
@@ -1559,28 +1580,44 @@ jQuery.support = (function() {
// (IE <= 8 fail this test)
support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
- // Figure out if the W3C box model works as expected
- div.innerHTML = "";
- div.style.width = div.style.paddingLeft = "1px";
- jQuery.boxModel = support.boxModel = div.offsetWidth === 2;
+ // Check if div with explicit width and no margin-right incorrectly
+ // gets computed margin-right based on width of container. For more
+ // info see bug #3333
+ // Fails in WebKit before Feb 2011 nightlies
+ // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+ if ( window.getComputedStyle ) {
+ div.innerHTML = "";
+ marginDiv = document.createElement( "div" );
+ marginDiv.style.width = "0";
+ marginDiv.style.marginRight = "0";
+ div.style.width = "2px";
+ div.appendChild( marginDiv );
+ support.reliableMarginRight =
+ ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
+ }
if ( typeof div.style.zoom !== "undefined" ) {
// Check if natively block-level elements act like inline-block
// elements when setting their display to 'inline' and giving
// them layout
// (IE < 8 does this)
+ div.innerHTML = "";
+ div.style.width = div.style.padding = "1px";
+ div.style.border = 0;
+ div.style.overflow = "hidden";
div.style.display = "inline";
div.style.zoom = 1;
- support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 );
+ support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
// Check if elements with layout shrink-wrap their children
// (IE 6 does this)
- div.style.display = "";
- div.innerHTML = "";
- support.shrinkWrapBlocks = ( div.offsetWidth !== 2 );
+ div.style.display = "block";
+ div.style.overflow = "visible";
+ div.innerHTML = "";
+ support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
}
- div.style.cssText = ptlm + vb;
+ div.style.cssText = positionTopLeftWidthHeight + paddingMarginBorderVisibility;
div.innerHTML = html;
outer = div.firstChild;
@@ -1605,8 +1642,17 @@ jQuery.support = (function() {
offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 );
offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop );
+ if ( window.getComputedStyle ) {
+ div.style.marginTop = "1%";
+ support.pixelMargin = ( window.getComputedStyle( div, null ) || { marginTop: 0 } ).marginTop !== "1%";
+ }
+
+ if ( typeof container.style.zoom !== "undefined" ) {
+ container.style.zoom = 1;
+ }
+
body.removeChild( container );
- div = container = null;
+ marginDiv = div = container = null;
jQuery.extend( support, offsetSupport );
});
@@ -1863,62 +1909,70 @@ jQuery.extend({
jQuery.fn.extend({
data: function( key, value ) {
- var parts, attr, name,
+ var parts, part, attr, name, l,
+ elem = this[0],
+ i = 0,
data = null;
- if ( typeof key === "undefined" ) {
+ // Gets all values
+ if ( key === undefined ) {
if ( this.length ) {
- data = jQuery.data( this[0] );
+ data = jQuery.data( elem );
- if ( this[0].nodeType === 1 && !jQuery._data( this[0], "parsedAttrs" ) ) {
- attr = this[0].attributes;
- for ( var i = 0, l = attr.length; i < l; i++ ) {
+ if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+ attr = elem.attributes;
+ for ( l = attr.length; i < l; i++ ) {
name = attr[i].name;
if ( name.indexOf( "data-" ) === 0 ) {
name = jQuery.camelCase( name.substring(5) );
- dataAttr( this[0], name, data[ name ] );
+ dataAttr( elem, name, data[ name ] );
}
}
- jQuery._data( this[0], "parsedAttrs", true );
+ jQuery._data( elem, "parsedAttrs", true );
}
}
return data;
+ }
- } else if ( typeof key === "object" ) {
+ // Sets multiple values
+ if ( typeof key === "object" ) {
return this.each(function() {
jQuery.data( this, key );
});
}
- parts = key.split(".");
+ parts = key.split( ".", 2 );
parts[1] = parts[1] ? "." + parts[1] : "";
+ part = parts[1] + "!";
- if ( value === undefined ) {
- data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+ return jQuery.access( this, function( value ) {
- // Try to fetch any internally stored data first
- if ( data === undefined && this.length ) {
- data = jQuery.data( this[0], key );
- data = dataAttr( this[0], key, data );
+ if ( value === undefined ) {
+ data = this.triggerHandler( "getData" + part, [ parts[0] ] );
+
+ // Try to fetch any internally stored data first
+ if ( data === undefined && elem ) {
+ data = jQuery.data( elem, key );
+ data = dataAttr( elem, key, data );
+ }
+
+ return data === undefined && parts[1] ?
+ this.data( parts[0] ) :
+ data;
}
- return data === undefined && parts[1] ?
- this.data( parts[0] ) :
- data;
+ parts[1] = value;
+ this.each(function() {
+ var self = jQuery( this );
- } else {
- return this.each(function() {
- var self = jQuery( this ),
- args = [ parts[0], value ];
-
- self.triggerHandler( "setData" + parts[1] + "!", args );
+ self.triggerHandler( "setData" + part, parts );
jQuery.data( this, key, value );
- self.triggerHandler( "changeData" + parts[1] + "!", args );
+ self.triggerHandler( "changeData" + part, parts );
});
- }
+ }, null, value, arguments.length > 1, null, false );
},
removeData: function( key ) {
@@ -1942,7 +1996,7 @@ function dataAttr( elem, key, data ) {
data = data === "true" ? true :
data === "false" ? false :
data === "null" ? null :
- jQuery.isNumeric( data ) ? parseFloat( data ) :
+ jQuery.isNumeric( data ) ? +data :
rbrace.test( data ) ? jQuery.parseJSON( data ) :
data;
} catch( e ) {}
@@ -2077,21 +2131,27 @@ jQuery.extend({
jQuery.fn.extend({
queue: function( type, data ) {
+ var setter = 2;
+
if ( typeof type !== "string" ) {
data = type;
type = "fx";
+ setter--;
}
- if ( data === undefined ) {
+ if ( arguments.length < setter ) {
return jQuery.queue( this[0], type );
}
- return this.each(function() {
- var queue = jQuery.queue( this, type, data );
- if ( type === "fx" && queue[0] !== "inprogress" ) {
- jQuery.dequeue( this, type );
- }
- });
+ return data === undefined ?
+ this :
+ this.each(function() {
+ var queue = jQuery.queue( this, type, data );
+
+ if ( type === "fx" && queue[0] !== "inprogress" ) {
+ jQuery.dequeue( this, type );
+ }
+ });
},
dequeue: function( type ) {
return this.each(function() {
@@ -2145,7 +2205,7 @@ jQuery.fn.extend({
}
}
resolve();
- return defer.promise();
+ return defer.promise( object );
}
});
@@ -2164,7 +2224,7 @@ var rclass = /[\n\t\r]/g,
jQuery.fn.extend({
attr: function( name, value ) {
- return jQuery.access( this, name, value, true, jQuery.attr );
+ return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
},
removeAttr: function( name ) {
@@ -2174,7 +2234,7 @@ jQuery.fn.extend({
},
prop: function( name, value ) {
- return jQuery.access( this, name, value, true, jQuery.prop );
+ return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
},
removeProp: function( name ) {
@@ -2314,7 +2374,7 @@ jQuery.fn.extend({
if ( !arguments.length ) {
if ( elem ) {
- hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ];
+ hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
return ret;
@@ -2358,7 +2418,7 @@ jQuery.fn.extend({
});
}
- hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ];
+ hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
// If set returns undefined, fall back to normal setting
if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
@@ -2504,7 +2564,7 @@ jQuery.extend({
},
removeAttr: function( elem, value ) {
- var propName, attrNames, name, l,
+ var propName, attrNames, name, l, isBool,
i = 0;
if ( value && elem.nodeType === 1 ) {
@@ -2516,13 +2576,17 @@ jQuery.extend({
if ( name ) {
propName = jQuery.propFix[ name ] || name;
+ isBool = rboolean.test( name );
// See #9699 for explanation of this approach (setting first, then removal)
- jQuery.attr( elem, name, "" );
+ // Do not do this for boolean attributes (see #10870)
+ if ( !isBool ) {
+ jQuery.attr( elem, name, "" );
+ }
elem.removeAttribute( getSetAttribute ? name : propName );
// Set corresponding property to false for boolean attributes
- if ( rboolean.test( name ) && propName in elem ) {
+ if ( isBool && propName in elem ) {
elem[ propName ] = false;
}
}
@@ -2676,7 +2740,8 @@ if ( !getSetAttribute ) {
fixSpecified = {
name: true,
- id: true
+ id: true,
+ coords: true
};
// Use this for any attribute in IE6/7
@@ -2806,7 +2871,7 @@ jQuery.each([ "radio", "checkbox" ], function() {
var rformElems = /^(?:textarea|input|select)$/i,
rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
- rhoverHack = /\bhover(\.\S+)?\b/,
+ rhoverHack = /(?:^|\s)hover(\.\S+)?\b/,
rkeyEvent = /^key/,
rmouseEvent = /^(?:mouse|contextmenu)|click/,
rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
@@ -2854,6 +2919,7 @@ jQuery.event = {
if ( handler.handler ) {
handleObjIn = handler;
handler = handleObjIn.handler;
+ selector = handleObjIn.selector;
}
// Make sure that the handler has a unique ID, used to find/remove it later
@@ -2905,7 +2971,7 @@ jQuery.event = {
handler: handler,
guid: handler.guid,
selector: selector,
- quick: quickParse( selector ),
+ quick: selector && quickParse( selector ),
namespace: namespaces.join(".")
}, handleObjIn );
@@ -3194,6 +3260,7 @@ jQuery.event = {
delegateCount = handlers.delegateCount,
args = [].slice.call( arguments, 0 ),
run_all = !event.exclusive && !event.namespace,
+ special = jQuery.event.special[ event.type ] || {},
handlerQueue = [],
i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related;
@@ -3201,34 +3268,43 @@ jQuery.event = {
args[0] = event;
event.delegateTarget = this;
+ // Call the preDispatch hook for the mapped type, and let it bail if desired
+ if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+ return;
+ }
+
// Determine handlers that should run if there are delegated events
- // Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861)
- if ( delegateCount && !event.target.disabled && !(event.button && event.type === "click") ) {
+ // Avoid non-left-click bubbling in Firefox (#3861)
+ if ( delegateCount && !(event.button && event.type === "click") ) {
// Pregenerate a single jQuery object for reuse with .is()
jqcur = jQuery(this);
jqcur.context = this.ownerDocument || this;
for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
- selMatch = {};
- matches = [];
- jqcur[0] = cur;
- for ( i = 0; i < delegateCount; i++ ) {
- handleObj = handlers[ i ];
- sel = handleObj.selector;
- if ( selMatch[ sel ] === undefined ) {
- selMatch[ sel ] = (
- handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel )
- );
+ // Don't process events on disabled elements (#6911, #8165)
+ if ( cur.disabled !== true ) {
+ selMatch = {};
+ matches = [];
+ jqcur[0] = cur;
+ for ( i = 0; i < delegateCount; i++ ) {
+ handleObj = handlers[ i ];
+ sel = handleObj.selector;
+
+ if ( selMatch[ sel ] === undefined ) {
+ selMatch[ sel ] = (
+ handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel )
+ );
+ }
+ if ( selMatch[ sel ] ) {
+ matches.push( handleObj );
+ }
}
- if ( selMatch[ sel ] ) {
- matches.push( handleObj );
+ if ( matches.length ) {
+ handlerQueue.push({ elem: cur, matches: matches });
}
}
- if ( matches.length ) {
- handlerQueue.push({ elem: cur, matches: matches });
- }
}
}
@@ -3266,6 +3342,11 @@ jQuery.event = {
}
}
+ // Call the postDispatch hook for the mapped type
+ if ( special.postDispatch ) {
+ special.postDispatch.call( this, event );
+ }
+
return event.result;
},
@@ -3557,16 +3638,23 @@ if ( !jQuery.support.submitBubbles ) {
form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
if ( form && !form._submit_attached ) {
jQuery.event.add( form, "submit._submit", function( event ) {
- // If form was submitted by the user, bubble the event up the tree
- if ( this.parentNode && !event.isTrigger ) {
- jQuery.event.simulate( "submit", this.parentNode, event, true );
- }
+ event._submit_bubble = true;
});
form._submit_attached = true;
}
});
// return undefined since we don't need an event listener
},
+
+ postDispatch: function( event ) {
+ // If form was submitted by the user, bubble the event up the tree
+ if ( event._submit_bubble ) {
+ delete event._submit_bubble;
+ if ( this.parentNode && !event.isTrigger ) {
+ jQuery.event.simulate( "submit", this.parentNode, event, true );
+ }
+ }
+ },
teardown: function() {
// Only need this for delegated form submit events
@@ -3671,9 +3759,9 @@ jQuery.fn.extend({
// Types can be a map of types/handlers
if ( typeof types === "object" ) {
// ( types-Object, selector, data )
- if ( typeof selector !== "string" ) {
+ if ( typeof selector !== "string" ) { // && selector != null
// ( types-Object, data )
- data = selector;
+ data = data || selector;
selector = undefined;
}
for ( type in types ) {
@@ -3719,14 +3807,14 @@ jQuery.fn.extend({
});
},
one: function( types, selector, data, fn ) {
- return this.on.call( this, types, selector, data, fn, 1 );
+ return this.on( types, selector, data, fn, 1 );
},
off: function( types, selector, fn ) {
if ( types && types.preventDefault && types.handleObj ) {
// ( event ) dispatched jQuery.Event
var handleObj = types.handleObj;
jQuery( types.delegateTarget ).off(
- handleObj.namespace? handleObj.type + "." + handleObj.namespace : handleObj.type,
+ handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
handleObj.selector,
handleObj.handler
);
@@ -3885,7 +3973,7 @@ var Sizzle = function( selector, context, results, seed ) {
if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
return [];
}
-
+
if ( !selector || typeof selector !== "string" ) {
return results;
}
@@ -3895,7 +3983,7 @@ var Sizzle = function( selector, context, results, seed ) {
contextXML = Sizzle.isXML( context ),
parts = [],
soFar = selector;
-
+
// Reset the position of the chunker regexp (start from head)
do {
chunker.exec( "" );
@@ -3903,9 +3991,9 @@ var Sizzle = function( selector, context, results, seed ) {
if ( m ) {
soFar = m[3];
-
+
parts.push( m[1] );
-
+
if ( m[2] ) {
extra = m[3];
break;
@@ -3929,7 +4017,7 @@ var Sizzle = function( selector, context, results, seed ) {
if ( Expr.relative[ selector ] ) {
selector += parts.shift();
}
-
+
set = posProcess( selector, set, seed );
}
}
@@ -4057,7 +4145,7 @@ Sizzle.find = function( expr, context, isXML ) {
for ( i = 0, len = Expr.order.length; i < len; i++ ) {
type = Expr.order[i];
-
+
if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
left = match[1];
match.splice( 1, 1 );
@@ -4189,7 +4277,7 @@ var getText = Sizzle.getText = function( elem ) {
ret = "";
if ( nodeType ) {
- if ( nodeType === 1 || nodeType === 9 ) {
+ if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
// Use textContent || innerText for elements
if ( typeof elem.textContent === 'string' ) {
return elem.textContent;
@@ -4429,7 +4517,7 @@ var Expr = Sizzle.selectors = {
ATTR: function( match, curLoop, inplace, result, not, isXML ) {
var name = match[1] = match[1].replace( rBackslash, "" );
-
+
if ( !isXML && Expr.attrMap[name] ) {
match[1] = Expr.attrMap[name];
}
@@ -4463,7 +4551,7 @@ var Expr = Sizzle.selectors = {
} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
return true;
}
-
+
return match;
},
@@ -4473,7 +4561,7 @@ var Expr = Sizzle.selectors = {
return match;
}
},
-
+
filters: {
enabled: function( elem ) {
return elem.disabled === false && elem.type !== "hidden";
@@ -4486,14 +4574,14 @@ var Expr = Sizzle.selectors = {
checked: function( elem ) {
return elem.checked === true;
},
-
+
selected: function( elem ) {
// Accessing this property makes selected-by-default
// options in Safari work properly
if ( elem.parentNode ) {
elem.parentNode.selectedIndex;
}
-
+
return elem.selected === true;
},
@@ -4515,7 +4603,7 @@ var Expr = Sizzle.selectors = {
text: function( elem ) {
var attr = elem.getAttribute( "type" ), type = elem.type;
- // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+ // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
// use getAttribute instead to test this case
return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
},
@@ -4633,22 +4721,23 @@ var Expr = Sizzle.selectors = {
switch ( type ) {
case "only":
case "first":
- while ( (node = node.previousSibling) ) {
- if ( node.nodeType === 1 ) {
- return false;
+ while ( (node = node.previousSibling) ) {
+ if ( node.nodeType === 1 ) {
+ return false;
}
}
- if ( type === "first" ) {
- return true;
+ if ( type === "first" ) {
+ return true;
}
node = elem;
+ /* falls through */
case "last":
- while ( (node = node.nextSibling) ) {
- if ( node.nodeType === 1 ) {
- return false;
+ while ( (node = node.nextSibling) ) {
+ if ( node.nodeType === 1 ) {
+ return false;
}
}
@@ -4661,22 +4750,22 @@ var Expr = Sizzle.selectors = {
if ( first === 1 && last === 0 ) {
return true;
}
-
+
doneName = match[0];
parent = elem.parentNode;
-
+
if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) {
count = 0;
-
+
for ( node = parent.firstChild; node; node = node.nextSibling ) {
if ( node.nodeType === 1 ) {
node.nodeIndex = ++count;
}
- }
+ }
parent[ expando ] = doneName;
}
-
+
diff = elem.nodeIndex - last;
if ( first === 0 ) {
@@ -4695,7 +4784,7 @@ var Expr = Sizzle.selectors = {
TAG: function( elem, match ) {
return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
},
-
+
CLASS: function( elem, match ) {
return (" " + (elem.className || elem.getAttribute("class")) + " ")
.indexOf( match ) > -1;
@@ -4757,6 +4846,9 @@ for ( var type in Expr.match ) {
Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
}
+// Expose origPOS
+// "global" as in regardless of relation to brackets/parens
+Expr.match.globalPOS = origPOS;
var makeArray = function( array, results ) {
array = Array.prototype.slice.call( array, 0 );
@@ -4765,7 +4857,7 @@ var makeArray = function( array, results ) {
results.push.apply( results, array );
return results;
}
-
+
return array;
};
@@ -4997,7 +5089,7 @@ if ( document.querySelectorAll ) {
if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
return;
}
-
+
Sizzle = function( query, context, extra, seed ) {
context = context || document;
@@ -5006,24 +5098,24 @@ if ( document.querySelectorAll ) {
if ( !seed && !Sizzle.isXML(context) ) {
// See if we find a selector to speed up
var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
-
+
if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
// Speed-up: Sizzle("TAG")
if ( match[1] ) {
return makeArray( context.getElementsByTagName( query ), extra );
-
+
// Speed-up: Sizzle(".CLASS")
} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
return makeArray( context.getElementsByClassName( match[2] ), extra );
}
}
-
+
if ( context.nodeType === 9 ) {
// Speed-up: Sizzle("body")
// The body element only exists once, optimize finding it
if ( query === "body" && context.body ) {
return makeArray( [ context.body ], extra );
-
+
// Speed-up: Sizzle("#ID")
} else if ( match && match[3] ) {
var elem = context.getElementById( match[3] );
@@ -5036,12 +5128,12 @@ if ( document.querySelectorAll ) {
if ( elem.id === match[3] ) {
return makeArray( [ elem ], extra );
}
-
+
} else {
return makeArray( [], extra );
}
}
-
+
try {
return makeArray( context.querySelectorAll(query), extra );
} catch(qsaError) {}
@@ -5079,7 +5171,7 @@ if ( document.querySelectorAll ) {
}
}
}
-
+
return oldSizzle(query, context, extra, seed);
};
@@ -5106,7 +5198,7 @@ if ( document.querySelectorAll ) {
// This should fail with an exception
// Gecko does not error, returns false instead
matches.call( document.documentElement, "[test!='']:sizzle" );
-
+
} catch( pseudoError ) {
pseudoWorks = true;
}
@@ -5116,7 +5208,7 @@ if ( document.querySelectorAll ) {
expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
if ( !Sizzle.isXML( node ) ) {
- try {
+ try {
if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
var ret = matches.call( node, expr );
@@ -5153,7 +5245,7 @@ if ( document.querySelectorAll ) {
if ( div.getElementsByClassName("e").length === 1 ) {
return;
}
-
+
Expr.order.splice(1, 0, "CLASS");
Expr.find.CLASS = function( match, context, isXML ) {
if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
@@ -5204,7 +5296,7 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
if ( elem ) {
var match = false;
-
+
elem = elem[dir];
while ( elem ) {
@@ -5257,7 +5349,7 @@ if ( document.documentElement.contains ) {
Sizzle.isXML = function( elem ) {
// documentElement is verified for cases where it doesn't yet exist
- // (such as loading iframes in IE - #4833)
+ // (such as loading iframes in IE - #4833)
var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
return documentElement ? documentElement.nodeName !== "HTML" : false;
@@ -5307,7 +5399,7 @@ var runtil = /Until$/,
rmultiselector = /,/,
isSimple = /^.[^:#\[\.,]*$/,
slice = Array.prototype.slice,
- POS = jQuery.expr.match.POS,
+ POS = jQuery.expr.match.globalPOS,
// methods guaranteed to produce a unique set when starting from a unique set
guaranteedUnique = {
children: true,
@@ -5374,11 +5466,11 @@ jQuery.fn.extend({
},
is: function( selector ) {
- return !!selector && (
+ return !!selector && (
typeof selector === "string" ?
// If this is a positional selector, check membership in the returned set
// so $("p:first").is("p:last") won't return true for a doc with two "p".
- POS.test( selector ) ?
+ POS.test( selector ) ?
jQuery( selector, this.context ).index( this[0] ) >= 0 :
jQuery.filter( selector, this ).length > 0 :
this.filter( selector ).length > 0 );
@@ -5386,7 +5478,7 @@ jQuery.fn.extend({
closest: function( selectors, context ) {
var ret = [], i, l, cur = this[0];
-
+
// Array (deprecated as of jQuery 1.7)
if ( jQuery.isArray( selectors ) ) {
var level = 1;
@@ -5505,7 +5597,7 @@ jQuery.each({
return jQuery.dir( elem, "previousSibling", until );
},
siblings: function( elem ) {
- return jQuery.sibling( elem.parentNode.firstChild, elem );
+ return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
},
children: function( elem ) {
return jQuery.sibling( elem.firstChild );
@@ -5639,7 +5731,7 @@ function createSafeFragment( document ) {
return safeFrag;
}
-var nodeNames = "abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|" +
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
rleadingWhitespace = /^\s+/,
@@ -5649,7 +5741,7 @@ var nodeNames = "abbr|article|aside|audio|canvas|datalist|details|figcaption|fig
rhtml = /<|&#?\w+;/,
rnoInnerhtml = /<(?:script|style)/i,
rnocache = /<(?:script|object|embed|option|style)/i,
- rnoshimcache = new RegExp("<(?:" + nodeNames + ")", "i"),
+ rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
// checked="checked" or checked
rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
rscriptType = /\/(java|ecma)script/i,
@@ -5676,20 +5768,12 @@ if ( !jQuery.support.htmlSerialize ) {
}
jQuery.fn.extend({
- text: function( text ) {
- if ( jQuery.isFunction(text) ) {
- return this.each(function(i) {
- var self = jQuery( this );
-
- self.text( text.call(this, i, self.text()) );
- });
- }
-
- if ( typeof text !== "object" && text !== undefined ) {
- return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
- }
-
- return jQuery.text( this );
+ text: function( value ) {
+ return jQuery.access( this, function( value ) {
+ return value === undefined ?
+ jQuery.text( this ) :
+ this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+ }, null, value, arguments.length );
},
wrapAll: function( html ) {
@@ -5841,44 +5925,44 @@ jQuery.fn.extend({
},
html: function( value ) {
- if ( value === undefined ) {
- return this[0] && this[0].nodeType === 1 ?
- this[0].innerHTML.replace(rinlinejQuery, "") :
- null;
+ return jQuery.access( this, function( value ) {
+ var elem = this[0] || {},
+ i = 0,
+ l = this.length;
- // See if we can take a shortcut and just use innerHTML
- } else if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
- (jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
- !wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
-
- value = value.replace(rxhtmlTag, "<$1>");
-
- try {
- for ( var i = 0, l = this.length; i < l; i++ ) {
- // Remove element nodes and prevent memory leaks
- if ( this[i].nodeType === 1 ) {
- jQuery.cleanData( this[i].getElementsByTagName("*") );
- this[i].innerHTML = value;
- }
- }
-
- // If using innerHTML throws an exception, use the fallback method
- } catch(e) {
- this.empty().append( value );
+ if ( value === undefined ) {
+ return elem.nodeType === 1 ?
+ elem.innerHTML.replace( rinlinejQuery, "" ) :
+ null;
}
- } else if ( jQuery.isFunction( value ) ) {
- this.each(function(i){
- var self = jQuery( this );
- self.html( value.call(this, i, self.html()) );
- });
+ if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+ ( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+ !wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
- } else {
- this.empty().append( value );
- }
+ value = value.replace( rxhtmlTag, "<$1>" );
- return this;
+ try {
+ for (; i < l; i++ ) {
+ // Remove element nodes and prevent memory leaks
+ elem = this[i] || {};
+ if ( elem.nodeType === 1 ) {
+ jQuery.cleanData( elem.getElementsByTagName( "*" ) );
+ elem.innerHTML = value;
+ }
+ }
+
+ elem = 0;
+
+ // If using innerHTML throws an exception, use the fallback method
+ } catch(e) {}
+ }
+
+ if ( elem ) {
+ this.empty().append( value );
+ }
+ }, null, value, arguments.length );
},
replaceWith: function( value ) {
@@ -5981,7 +6065,23 @@ jQuery.fn.extend({
}
if ( scripts.length ) {
- jQuery.each( scripts, evalScript );
+ jQuery.each( scripts, function( i, elem ) {
+ if ( elem.src ) {
+ jQuery.ajax({
+ type: "GET",
+ global: false,
+ url: elem.src,
+ async: false,
+ dataType: "script"
+ });
+ } else {
+ jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
+ }
+
+ if ( elem.parentNode ) {
+ elem.parentNode.removeChild( elem );
+ }
+ });
}
}
@@ -6013,7 +6113,7 @@ function cloneCopyEvent( src, dest ) {
for ( type in events ) {
for ( i = 0, l = events[ type ].length; i < l; i++ ) {
- jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
+ jQuery.event.add( dest, type, events[ type ][ i ] );
}
}
}
@@ -6075,11 +6175,20 @@ function cloneFixAttributes( src, dest ) {
// cloning other types of input fields
} else if ( nodeName === "input" || nodeName === "textarea" ) {
dest.defaultValue = src.defaultValue;
+
+ // IE blanks contents when cloning scripts
+ } else if ( nodeName === "script" && dest.text !== src.text ) {
+ dest.text = src.text;
}
// Event data gets referenced instead of copied if the expando
// gets copied too
dest.removeAttribute( jQuery.expando );
+
+ // Clear flags for bubbling special change/submit events, they must
+ // be reattached when the newly cloned events are first activated
+ dest.removeAttribute( "_submit_attached" );
+ dest.removeAttribute( "_change_attached" );
}
jQuery.buildFragment = function( args, nodes, scripts ) {
@@ -6204,7 +6313,7 @@ jQuery.extend({
destElements,
i,
// IE<=8 does not properly clone detached, unknown element nodes
- clone = jQuery.support.html5Clone || !rnoshimcache.test( "<" + elem.nodeName ) ?
+ clone = jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ?
elem.cloneNode( true ) :
shimCloneNode( elem );
@@ -6254,7 +6363,8 @@ jQuery.extend({
},
clean: function( elems, context, fragment, scripts ) {
- var checkScriptType;
+ var checkScriptType, script, j,
+ ret = [];
context = context || document;
@@ -6263,8 +6373,6 @@ jQuery.extend({
context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
}
- var ret = [], j;
-
for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
if ( typeof elem === "number" ) {
elem += "";
@@ -6286,7 +6394,9 @@ jQuery.extend({
var tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(),
wrap = wrapMap[ tag ] || wrapMap._default,
depth = wrap[0],
- div = context.createElement("div");
+ div = context.createElement("div"),
+ safeChildNodes = safeFragment.childNodes,
+ remove;
// Append wrapper element to unknown element safe doc fragment
if ( context === document ) {
@@ -6331,6 +6441,21 @@ jQuery.extend({
}
elem = div.childNodes;
+
+ // Clear elements from DocumentFragment (safeFragment or otherwise)
+ // to avoid hoarding elements. Fixes #11356
+ if ( div ) {
+ div.parentNode.removeChild( div );
+
+ // Guard against -1 index exceptions in FF3.6
+ if ( safeChildNodes.length > 0 ) {
+ remove = safeChildNodes[ safeChildNodes.length - 1 ];
+
+ if ( remove && remove.parentNode ) {
+ remove.parentNode.removeChild( remove );
+ }
+ }
+ }
}
}
@@ -6359,16 +6484,17 @@ jQuery.extend({
return !elem.type || rscriptType.test( elem.type );
};
for ( i = 0; ret[i]; i++ ) {
- if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
- scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+ script = ret[i];
+ if ( scripts && jQuery.nodeName( script, "script" ) && (!script.type || rscriptType.test( script.type )) ) {
+ scripts.push( script.parentNode ? script.parentNode.removeChild( script ) : script );
} else {
- if ( ret[i].nodeType === 1 ) {
- var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType );
+ if ( script.nodeType === 1 ) {
+ var jsTags = jQuery.grep( script.getElementsByTagName( "script" ), checkScriptType );
ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
}
- fragment.appendChild( ret[i] );
+ fragment.appendChild( script );
}
}
}
@@ -6422,22 +6548,6 @@ jQuery.extend({
}
});
-function evalScript( i, elem ) {
- if ( elem.src ) {
- jQuery.ajax({
- url: elem.src,
- async: false,
- dataType: "script"
- });
- } else {
- jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
- }
-
- if ( elem.parentNode ) {
- elem.parentNode.removeChild( elem );
- }
-}
-
@@ -6445,29 +6555,27 @@ var ralpha = /alpha\([^)]*\)/i,
ropacity = /opacity=([^)]*)/,
// fixed for IE9, see #8346
rupper = /([A-Z]|^ms)/g,
- rnumpx = /^-?\d+(?:px)?$/i,
- rnum = /^-?\d/,
+ rnum = /^[\-+]?(?:\d*\.)?\d+$/i,
+ rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,
rrelNum = /^([\-+])=([\-+.\de]+)/,
+ rmargin = /^margin/,
cssShow = { position: "absolute", visibility: "hidden", display: "block" },
- cssWidth = [ "Left", "Right" ],
- cssHeight = [ "Top", "Bottom" ],
+
+ // order is important!
+ cssExpand = [ "Top", "Right", "Bottom", "Left" ],
+
curCSS,
getComputedStyle,
currentStyle;
jQuery.fn.css = function( name, value ) {
- // Setting 'undefined' is a no-op
- if ( arguments.length === 2 && value === undefined ) {
- return this;
- }
-
- return jQuery.access( this, name, value, true, function( elem, name, value ) {
+ return jQuery.access( this, function( elem, name, value ) {
return value !== undefined ?
jQuery.style( elem, name, value ) :
jQuery.css( elem, name );
- });
+ }, name, value, arguments.length > 1 );
};
jQuery.extend({
@@ -6478,7 +6586,7 @@ jQuery.extend({
get: function( elem, computed ) {
if ( computed ) {
// We should always get a number back from opacity
- var ret = curCSS( elem, "opacity", "opacity" );
+ var ret = curCSS( elem, "opacity" );
return ret === "" ? "1" : ret;
} else {
@@ -6586,56 +6694,174 @@ jQuery.extend({
// A method for quickly swapping in/out CSS properties to get correct calculations
swap: function( elem, options, callback ) {
- var old = {};
+ var old = {},
+ ret, name;
// Remember the old values, and insert the new ones
- for ( var name in options ) {
+ for ( name in options ) {
old[ name ] = elem.style[ name ];
elem.style[ name ] = options[ name ];
}
- callback.call( elem );
+ ret = callback.call( elem );
// Revert the old values
for ( name in options ) {
elem.style[ name ] = old[ name ];
}
+
+ return ret;
}
});
-// DEPRECATED, Use jQuery.css() instead
+// DEPRECATED in 1.3, Use jQuery.css() instead
jQuery.curCSS = jQuery.css;
-jQuery.each(["height", "width"], function( i, name ) {
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+ getComputedStyle = function( elem, name ) {
+ var ret, defaultView, computedStyle, width,
+ style = elem.style;
+
+ name = name.replace( rupper, "-$1" ).toLowerCase();
+
+ if ( (defaultView = elem.ownerDocument.defaultView) &&
+ (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+
+ ret = computedStyle.getPropertyValue( name );
+ if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+ ret = jQuery.style( elem, name );
+ }
+ }
+
+ // A tribute to the "awesome hack by Dean Edwards"
+ // WebKit uses "computed value (percentage if specified)" instead of "used value" for margins
+ // which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+ if ( !jQuery.support.pixelMargin && computedStyle && rmargin.test( name ) && rnumnonpx.test( ret ) ) {
+ width = style.width;
+ style.width = ret;
+ ret = computedStyle.width;
+ style.width = width;
+ }
+
+ return ret;
+ };
+}
+
+if ( document.documentElement.currentStyle ) {
+ currentStyle = function( elem, name ) {
+ var left, rsLeft, uncomputed,
+ ret = elem.currentStyle && elem.currentStyle[ name ],
+ style = elem.style;
+
+ // Avoid setting ret to empty string here
+ // so we don't default to auto
+ if ( ret == null && style && (uncomputed = style[ name ]) ) {
+ ret = uncomputed;
+ }
+
+ // From the awesome hack by Dean Edwards
+ // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+ // If we're not dealing with a regular pixel number
+ // but a number that has a weird ending, we need to convert it to pixels
+ if ( rnumnonpx.test( ret ) ) {
+
+ // Remember the original values
+ left = style.left;
+ rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
+
+ // Put in the new values to get a computed value out
+ if ( rsLeft ) {
+ elem.runtimeStyle.left = elem.currentStyle.left;
+ }
+ style.left = name === "fontSize" ? "1em" : ret;
+ ret = style.pixelLeft + "px";
+
+ // Revert the changed values
+ style.left = left;
+ if ( rsLeft ) {
+ elem.runtimeStyle.left = rsLeft;
+ }
+ }
+
+ return ret === "" ? "auto" : ret;
+ };
+}
+
+curCSS = getComputedStyle || currentStyle;
+
+function getWidthOrHeight( elem, name, extra ) {
+
+ // Start with offset property
+ var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+ i = name === "width" ? 1 : 0,
+ len = 4;
+
+ if ( val > 0 ) {
+ if ( extra !== "border" ) {
+ for ( ; i < len; i += 2 ) {
+ if ( !extra ) {
+ val -= parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0;
+ }
+ if ( extra === "margin" ) {
+ val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ] ) ) || 0;
+ } else {
+ val -= parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+ }
+ }
+ }
+
+ return val + "px";
+ }
+
+ // Fall back to computed then uncomputed css if necessary
+ val = curCSS( elem, name );
+ if ( val < 0 || val == null ) {
+ val = elem.style[ name ];
+ }
+
+ // Computed unit is not pixels. Stop here and return.
+ if ( rnumnonpx.test(val) ) {
+ return val;
+ }
+
+ // Normalize "", auto, and prepare for extra
+ val = parseFloat( val ) || 0;
+
+ // Add padding, border, margin
+ if ( extra ) {
+ for ( ; i < len; i += 2 ) {
+ val += parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0;
+ if ( extra !== "padding" ) {
+ val += parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+ }
+ if ( extra === "margin" ) {
+ val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ]) ) || 0;
+ }
+ }
+ }
+
+ return val + "px";
+}
+
+jQuery.each([ "height", "width" ], function( i, name ) {
jQuery.cssHooks[ name ] = {
get: function( elem, computed, extra ) {
- var val;
-
if ( computed ) {
if ( elem.offsetWidth !== 0 ) {
- return getWH( elem, name, extra );
+ return getWidthOrHeight( elem, name, extra );
} else {
- jQuery.swap( elem, cssShow, function() {
- val = getWH( elem, name, extra );
+ return jQuery.swap( elem, cssShow, function() {
+ return getWidthOrHeight( elem, name, extra );
});
}
-
- return val;
}
},
set: function( elem, value ) {
- if ( rnumpx.test( value ) ) {
- // ignore negative width and height values #1599
- value = parseFloat( value );
-
- if ( value >= 0 ) {
- return value + "px";
- }
-
- } else {
- return value;
- }
+ return rnum.test( value ) ?
+ value + "px" :
+ value;
}
};
});
@@ -6689,130 +6915,18 @@ jQuery(function() {
get: function( elem, computed ) {
// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
// Work around by temporarily setting element display to inline-block
- var ret;
- jQuery.swap( elem, { "display": "inline-block" }, function() {
+ return jQuery.swap( elem, { "display": "inline-block" }, function() {
if ( computed ) {
- ret = curCSS( elem, "margin-right", "marginRight" );
+ return curCSS( elem, "margin-right" );
} else {
- ret = elem.style.marginRight;
+ return elem.style.marginRight;
}
});
- return ret;
}
};
}
});
-if ( document.defaultView && document.defaultView.getComputedStyle ) {
- getComputedStyle = function( elem, name ) {
- var ret, defaultView, computedStyle;
-
- name = name.replace( rupper, "-$1" ).toLowerCase();
-
- if ( (defaultView = elem.ownerDocument.defaultView) &&
- (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
- ret = computedStyle.getPropertyValue( name );
- if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
- ret = jQuery.style( elem, name );
- }
- }
-
- return ret;
- };
-}
-
-if ( document.documentElement.currentStyle ) {
- currentStyle = function( elem, name ) {
- var left, rsLeft, uncomputed,
- ret = elem.currentStyle && elem.currentStyle[ name ],
- style = elem.style;
-
- // Avoid setting ret to empty string here
- // so we don't default to auto
- if ( ret === null && style && (uncomputed = style[ name ]) ) {
- ret = uncomputed;
- }
-
- // From the awesome hack by Dean Edwards
- // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
- // If we're not dealing with a regular pixel number
- // but a number that has a weird ending, we need to convert it to pixels
- if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-
- // Remember the original values
- left = style.left;
- rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
-
- // Put in the new values to get a computed value out
- if ( rsLeft ) {
- elem.runtimeStyle.left = elem.currentStyle.left;
- }
- style.left = name === "fontSize" ? "1em" : ( ret || 0 );
- ret = style.pixelLeft + "px";
-
- // Revert the changed values
- style.left = left;
- if ( rsLeft ) {
- elem.runtimeStyle.left = rsLeft;
- }
- }
-
- return ret === "" ? "auto" : ret;
- };
-}
-
-curCSS = getComputedStyle || currentStyle;
-
-function getWH( elem, name, extra ) {
-
- // Start with offset property
- var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
- which = name === "width" ? cssWidth : cssHeight,
- i = 0,
- len = which.length;
-
- if ( val > 0 ) {
- if ( extra !== "border" ) {
- for ( ; i < len; i++ ) {
- if ( !extra ) {
- val -= parseFloat( jQuery.css( elem, "padding" + which[ i ] ) ) || 0;
- }
- if ( extra === "margin" ) {
- val += parseFloat( jQuery.css( elem, extra + which[ i ] ) ) || 0;
- } else {
- val -= parseFloat( jQuery.css( elem, "border" + which[ i ] + "Width" ) ) || 0;
- }
- }
- }
-
- return val + "px";
- }
-
- // Fall back to computed then uncomputed css if necessary
- val = curCSS( elem, name, name );
- if ( val < 0 || val == null ) {
- val = elem.style[ name ] || 0;
- }
- // Normalize "", auto, and prepare for extra
- val = parseFloat( val ) || 0;
-
- // Add padding, border, margin
- if ( extra ) {
- for ( ; i < len; i++ ) {
- val += parseFloat( jQuery.css( elem, "padding" + which[ i ] ) ) || 0;
- if ( extra !== "padding" ) {
- val += parseFloat( jQuery.css( elem, "border" + which[ i ] + "Width" ) ) || 0;
- }
- if ( extra === "margin" ) {
- val += parseFloat( jQuery.css( elem, extra + which[ i ] ) ) || 0;
- }
- }
- }
-
- return val + "px";
-}
-
if ( jQuery.expr && jQuery.expr.filters ) {
jQuery.expr.filters.hidden = function( elem ) {
var width = elem.offsetWidth,
@@ -6826,6 +6940,31 @@ if ( jQuery.expr && jQuery.expr.filters ) {
};
}
+// These hooks are used by animate to expand properties
+jQuery.each({
+ margin: "",
+ padding: "",
+ border: "Width"
+}, function( prefix, suffix ) {
+
+ jQuery.cssHooks[ prefix + suffix ] = {
+ expand: function( value ) {
+ var i,
+
+ // assumes a single number if not a string
+ parts = typeof value === "string" ? value.split(" ") : [ value ],
+ expanded = {};
+
+ for ( i = 0; i < 4; i++ ) {
+ expanded[ prefix + cssExpand[ i ] + suffix ] =
+ parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+ }
+
+ return expanded;
+ }
+ };
+});
+
@@ -7144,7 +7283,7 @@ jQuery.extend({
isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
global: true,
type: "GET",
- contentType: "application/x-www-form-urlencoded",
+ contentType: "application/x-www-form-urlencoded; charset=UTF-8",
processData: true,
async: true,
/*
@@ -7470,7 +7609,7 @@ jQuery.extend({
// Apply prefilters
inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
- // If request was aborted inside a prefiler, stop there
+ // If request was aborted inside a prefilter, stop there
if ( state === 2 ) {
return false;
}
@@ -7643,11 +7782,11 @@ function buildParams( prefix, obj, traditional, add ) {
// a server error. Possible fixes are to modify rack's
// deserialization algorithm or to provide an option or flag
// to force array serialization to be shallow.
- buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+ buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
}
});
- } else if ( !traditional && obj != null && typeof obj === "object" ) {
+ } else if ( !traditional && jQuery.type( obj ) === "object" ) {
// Serialize object item.
for ( var name in obj ) {
buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
@@ -7843,8 +7982,7 @@ jQuery.ajaxSetup({
// Detect, normalize options and install callbacks for jsonp requests
jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
- var inspectData = s.contentType === "application/x-www-form-urlencoded" &&
- ( typeof s.data === "string" );
+ var inspectData = ( typeof s.data === "string" ) && /^application\/x\-www\-form\-urlencoded/.test( s.contentType );
if ( s.dataTypes[ 0 ] === "jsonp" ||
s.jsonp !== false && ( jsre.test( s.url ) ||
@@ -8145,7 +8283,13 @@ if ( jQuery.support.ajax ) {
if ( xml && xml.documentElement /* #4958 */ ) {
responses.xml = xml;
}
- responses.text = xhr.responseText;
+
+ // When requesting binary data, IE6-9 will throw an exception
+ // on any attempt to access responseText (#11426)
+ try {
+ responses.text = xhr.responseText;
+ } catch( _ ) {
+ }
// Firefox throws an exception when accessing
// statusText for faulty cross-domain requests
@@ -8253,7 +8397,8 @@ jQuery.fn.extend({
// Set elements which have been overridden with display: none
// in a stylesheet to whatever the default browser style is
// for such an element
- if ( display === "" && jQuery.css(elem, "display") === "none" ) {
+ if ( (display === "" && jQuery.css(elem, "display") === "none") ||
+ !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
}
}
@@ -8357,24 +8502,37 @@ jQuery.fn.extend({
var opt = jQuery.extend( {}, optall ),
isElement = this.nodeType === 1,
hidden = isElement && jQuery(this).is(":hidden"),
- name, val, p, e,
+ name, val, p, e, hooks, replace,
parts, start, end, unit,
method;
// will store per property easing and be used to determine when an animation is complete
opt.animatedProperties = {};
+ // first pass over propertys to expand / normalize
for ( p in prop ) {
-
- // property name normalization
name = jQuery.camelCase( p );
if ( p !== name ) {
prop[ name ] = prop[ p ];
delete prop[ p ];
}
- val = prop[ name ];
+ if ( ( hooks = jQuery.cssHooks[ name ] ) && "expand" in hooks ) {
+ replace = hooks.expand( prop[ name ] );
+ delete prop[ name ];
+ // not quite $.extend, this wont overwrite keys already present.
+ // also - reusing 'p' from above because we have the correct "name"
+ for ( p in replace ) {
+ if ( ! ( p in prop ) ) {
+ prop[ p ] = replace[ p ];
+ }
+ }
+ }
+ }
+
+ for ( name in prop ) {
+ val = prop[ name ];
// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
if ( jQuery.isArray( val ) ) {
opt.animatedProperties[ name ] = val[ 1 ];
@@ -8601,11 +8759,11 @@ jQuery.extend({
},
easing: {
- linear: function( p, n, firstNum, diff ) {
- return firstNum + diff * p;
+ linear: function( p ) {
+ return p;
},
- swing: function( p, n, firstNum, diff ) {
- return ( ( -Math.cos( p*Math.PI ) / 2 ) + 0.5 ) * diff + firstNum;
+ swing: function( p ) {
+ return ( -Math.cos( p*Math.PI ) / 2 ) + 0.5;
}
},
@@ -8663,8 +8821,12 @@ jQuery.fx.prototype = {
t.queue = this.options.queue;
t.elem = this.elem;
t.saveState = function() {
- if ( self.options.hide && jQuery._data( self.elem, "fxshow" + self.prop ) === undefined ) {
- jQuery._data( self.elem, "fxshow" + self.prop, self.start );
+ if ( jQuery._data( self.elem, "fxshow" + self.prop ) === undefined ) {
+ if ( self.options.hide ) {
+ jQuery._data( self.elem, "fxshow" + self.prop, self.start );
+ } else if ( self.options.show ) {
+ jQuery._data( self.elem, "fxshow" + self.prop, self.end );
+ }
}
};
@@ -8831,12 +8993,14 @@ jQuery.extend( jQuery.fx, {
}
});
-// Adds width/height step functions
-// Do not set anything below 0
-jQuery.each([ "width", "height" ], function( i, prop ) {
- jQuery.fx.step[ prop ] = function( fx ) {
- jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit );
- };
+// Ensure props that can't be negative don't go there on undershoot easing
+jQuery.each( fxAttrs.concat.apply( [], fxAttrs ), function( i, prop ) {
+ // exclude marginTop, marginLeft, marginBottom and marginRight from this list
+ if ( prop.indexOf( "margin" ) ) {
+ jQuery.fx.step[ prop ] = function( fx ) {
+ jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit );
+ };
+ }
});
if ( jQuery.expr && jQuery.expr.filters ) {
@@ -8873,7 +9037,7 @@ function defaultDisplay( nodeName ) {
// document to it; WebKit & Firefox won't allow reusing the iframe document.
if ( !iframeDoc || !iframe.createElement ) {
iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
- iframeDoc.write( ( document.compatMode === "CSS1Compat" ? "" : "" ) + "" );
+ iframeDoc.write( ( jQuery.support.boxModel ? "" : "" ) + "" );
iframeDoc.close();
}
@@ -8895,41 +9059,23 @@ function defaultDisplay( nodeName ) {
-var rtable = /^t(?:able|d|h)$/i,
+var getOffset,
+ rtable = /^t(?:able|d|h)$/i,
rroot = /^(?:body|html)$/i;
if ( "getBoundingClientRect" in document.documentElement ) {
- jQuery.fn.offset = function( options ) {
- var elem = this[0], box;
-
- if ( options ) {
- return this.each(function( i ) {
- jQuery.offset.setOffset( this, options, i );
- });
- }
-
- if ( !elem || !elem.ownerDocument ) {
- return null;
- }
-
- if ( elem === elem.ownerDocument.body ) {
- return jQuery.offset.bodyOffset( elem );
- }
-
+ getOffset = function( elem, doc, docElem, box ) {
try {
box = elem.getBoundingClientRect();
} catch(e) {}
- var doc = elem.ownerDocument,
- docElem = doc.documentElement;
-
// Make sure we're not dealing with a disconnected DOM node
if ( !box || !jQuery.contains( docElem, elem ) ) {
return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
}
var body = doc.body,
- win = getWindow(doc),
+ win = getWindow( doc ),
clientTop = docElem.clientTop || body.clientTop || 0,
clientLeft = docElem.clientLeft || body.clientLeft || 0,
scrollTop = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop,
@@ -8941,28 +9087,10 @@ if ( "getBoundingClientRect" in document.documentElement ) {
};
} else {
- jQuery.fn.offset = function( options ) {
- var elem = this[0];
-
- if ( options ) {
- return this.each(function( i ) {
- jQuery.offset.setOffset( this, options, i );
- });
- }
-
- if ( !elem || !elem.ownerDocument ) {
- return null;
- }
-
- if ( elem === elem.ownerDocument.body ) {
- return jQuery.offset.bodyOffset( elem );
- }
-
+ getOffset = function( elem, doc, docElem ) {
var computedStyle,
offsetParent = elem.offsetParent,
prevOffsetParent = elem,
- doc = elem.ownerDocument,
- docElem = doc.documentElement,
body = doc.body,
defaultView = doc.defaultView,
prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
@@ -9013,6 +9141,29 @@ if ( "getBoundingClientRect" in document.documentElement ) {
};
}
+jQuery.fn.offset = function( options ) {
+ if ( arguments.length ) {
+ return options === undefined ?
+ this :
+ this.each(function( i ) {
+ jQuery.offset.setOffset( this, options, i );
+ });
+ }
+
+ var elem = this[0],
+ doc = elem && elem.ownerDocument;
+
+ if ( !doc ) {
+ return null;
+ }
+
+ if ( elem === doc.body ) {
+ return jQuery.offset.bodyOffset( elem );
+ }
+
+ return getOffset( elem, doc, doc.documentElement );
+};
+
jQuery.offset = {
bodyOffset: function( body ) {
@@ -9118,42 +9269,30 @@ jQuery.fn.extend({
// Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
- var method = "scroll" + name;
+jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+ var top = /Y/.test( prop );
jQuery.fn[ method ] = function( val ) {
- var elem, win;
+ return jQuery.access( this, function( elem, method, val ) {
+ var win = getWindow( elem );
- if ( val === undefined ) {
- elem = this[ 0 ];
-
- if ( !elem ) {
- return null;
+ if ( val === undefined ) {
+ return win ? (prop in win) ? win[ prop ] :
+ jQuery.support.boxModel && win.document.documentElement[ method ] ||
+ win.document.body[ method ] :
+ elem[ method ];
}
- win = getWindow( elem );
-
- // Return the scroll offset
- return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
- jQuery.support.boxModel && win.document.documentElement[ method ] ||
- win.document.body[ method ] :
- elem[ method ];
- }
-
- // Set the scroll offset
- return this.each(function() {
- win = getWindow( this );
-
if ( win ) {
win.scrollTo(
- !i ? val : jQuery( win ).scrollLeft(),
- i ? val : jQuery( win ).scrollTop()
+ !top ? val : jQuery( win ).scrollLeft(),
+ top ? val : jQuery( win ).scrollTop()
);
} else {
- this[ method ] = val;
+ elem[ method ] = val;
}
- });
+ }, method, val, arguments.length, null );
};
});
@@ -9169,9 +9308,10 @@ function getWindow( elem ) {
// Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
-
- var type = name.toLowerCase();
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+ var clientProp = "client" + name,
+ scrollProp = "scroll" + name,
+ offsetProp = "offset" + name;
// innerHeight and innerWidth
jQuery.fn[ "inner" + name ] = function() {
@@ -9193,50 +9333,48 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
null;
};
- jQuery.fn[ type ] = function( size ) {
- // Get window width or height
- var elem = this[0];
- if ( !elem ) {
- return size == null ? null : this;
- }
+ jQuery.fn[ type ] = function( value ) {
+ return jQuery.access( this, function( elem, type, value ) {
+ var doc, docElemProp, orig, ret;
- if ( jQuery.isFunction( size ) ) {
- return this.each(function( i ) {
- var self = jQuery( this );
- self[ type ]( size.call( this, i, self[ type ]() ) );
- });
- }
+ if ( jQuery.isWindow( elem ) ) {
+ // 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+ doc = elem.document;
+ docElemProp = doc.documentElement[ clientProp ];
+ return jQuery.support.boxModel && docElemProp ||
+ doc.body && doc.body[ clientProp ] || docElemProp;
+ }
- if ( jQuery.isWindow( elem ) ) {
- // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
- // 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
- var docElemProp = elem.document.documentElement[ "client" + name ],
- body = elem.document.body;
- return elem.document.compatMode === "CSS1Compat" && docElemProp ||
- body && body[ "client" + name ] || docElemProp;
+ // Get document width or height
+ if ( elem.nodeType === 9 ) {
+ // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+ doc = elem.documentElement;
- // Get document width or height
- } else if ( elem.nodeType === 9 ) {
- // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
- return Math.max(
- elem.documentElement["client" + name],
- elem.body["scroll" + name], elem.documentElement["scroll" + name],
- elem.body["offset" + name], elem.documentElement["offset" + name]
- );
+ // when a window > document, IE6 reports a offset[Width/Height] > client[Width/Height]
+ // so we can't use max, as it'll choose the incorrect offset[Width/Height]
+ // instead we use the correct client[Width/Height]
+ // support:IE6
+ if ( doc[ clientProp ] >= doc[ scrollProp ] ) {
+ return doc[ clientProp ];
+ }
- // Get or set width or height on the element
- } else if ( size === undefined ) {
- var orig = jQuery.css( elem, type ),
+ return Math.max(
+ elem.body[ scrollProp ], doc[ scrollProp ],
+ elem.body[ offsetProp ], doc[ offsetProp ]
+ );
+ }
+
+ // Get width or height on the element
+ if ( value === undefined ) {
+ orig = jQuery.css( elem, type );
ret = parseFloat( orig );
+ return jQuery.isNumeric( ret ) ? ret : orig;
+ }
- return jQuery.isNumeric( ret ) ? ret : orig;
-
- // Set the width or height on the element (default to pixels if value is unitless)
- } else {
- return this.css( type, typeof size === "string" ? size : size + "px" );
- }
+ // Set the width or height on the element
+ jQuery( elem ).css( type, value );
+ }, type, value, arguments.length, null );
};
-
});
diff --git a/sites/all/modules/contrib/js/jquery_update/replace/jquery/1.7/jquery.min.js b/sites/all/modules/contrib/js/jquery_update/replace/jquery/1.7/jquery.min.js
index 198b3ff..cf22687 100644
--- a/sites/all/modules/contrib/js/jquery_update/replace/jquery/1.7/jquery.min.js
+++ b/sites/all/modules/contrib/js/jquery_update/replace/jquery/1.7/jquery.min.js
@@ -1,4 +1,4 @@
-/*! jQuery v1.7.1 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o=""+"
",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
-f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,""],thead:[1,"","
"],tr:[2,"","
"],td:[3,"
"],col:[2,"
"],area:[1,""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i
',
'#suffix' => '
',
);
@@ -964,10 +991,17 @@ function field_group_pre_render_multipage(&$element, $group, &$form) {
*/
function field_group_pre_render_tabs(&$element, $group, &$form) {
+ $classes = 'field-group-' . $group->format_type . '-wrapper';
+ if (!empty($group->classes)) {
+ $classes .= ' ' . $group->classes;
+ }
+
+ $id = !empty($element['#id']) ? ' id="' . $element['#id'] . '"' : '';
+
$element += array(
'#type' => 'vertical_tabs',
'#theme_wrappers' => array('vertical_tabs'),
- '#prefix' => '',
+ '#prefix' => ' will convert into http://drupal.org and
+node/74971 into http://drupal.org/project/link
+
+Anchors and query strings may also be used in any of these cases, including:
+node/74971/edit?destination=node/74972#pager
+
+
+THEMING AND OUTPUT
+------------------
+Since link module is mainly a data storage field in a modular framework, the
+theming and output is up to the site builder and other additional modules. There
+are many modules in the Drupal repository, which control the output of fields
+perfectly and can handle rules, user actions, markup dependencies, and can vary
+the output under many different conditions, with much more efficience and
+flexibility for different scenarios. Please check out modules like views,
+display suite, panels, etc for such needs
+
+
+MAINTAINERS
+-----------
+
+Current maintainers:
+ * John C Fiala (jcfiala) - https://www.drupal.org/user/163643
+ * Renato Gonçalves (RenatoG) - https://www.drupal.org/user/3326031
+ * Clemens Tolboom (clemens.tolboom) - https://www.drupal.org/user/125814
+ * diqidoq - https://www.drupal.org/user/1001934
+ * dropcube - https://www.drupal.org/user/37031
+ * Tom Kirkpatrick (mrfelton) - https://www.drupal.org/user/305669
+ * Sumit Madan (sumitmadan) - https://www.drupal.org/user/1538790
+ * Daniel Kudwien (sun) - https://www.drupal.org/user/54136
diff --git a/sites/all/modules/contrib/fields/link/link-rtl.css b/sites/all/modules/contrib/fields/link/link-rtl.css
index 0359487..613db5d 100644
--- a/sites/all/modules/contrib/fields/link/link-rtl.css
+++ b/sites/all/modules/contrib/fields/link/link-rtl.css
@@ -1,7 +1,6 @@
.link-field-column {
float: right;
}
-
.link-field-column.link-field-url .form-text {
direction: ltr;
text-align: left;
diff --git a/sites/all/modules/contrib/fields/link/link.css b/sites/all/modules/contrib/fields/link/link.css
index 1590e7a..6250df7 100644
--- a/sites/all/modules/contrib/fields/link/link.css
+++ b/sites/all/modules/contrib/fields/link/link.css
@@ -2,7 +2,6 @@
float: left;
width: 48%;
}
-
.link-field-column .form-text {
width: 95%;
}
diff --git a/sites/all/modules/contrib/fields/link/link.diff.inc b/sites/all/modules/contrib/fields/link/link.diff.inc
index 9e34123..b01ba6e 100644
--- a/sites/all/modules/contrib/fields/link/link.diff.inc
+++ b/sites/all/modules/contrib/fields/link/link.diff.inc
@@ -11,11 +11,11 @@
function link_field_diff_view($items, $context) {
$diff_items = array();
foreach ($items as $delta => $item) {
- if ($item['url'] && $item['title']) {
+ if ($item['url'] && isset($item['title'])) {
$diff_items[$delta] = $item['title'] . ' (' . $item['url'] . ')';
}
else {
- $diff_items[$delta] = $item['title'] . $item['url'];
+ $diff_items[$delta] = $item['url'];
}
}
return $diff_items;
diff --git a/sites/all/modules/contrib/fields/link/link.info b/sites/all/modules/contrib/fields/link/link.info
index 016b799..351e178 100644
--- a/sites/all/modules/contrib/fields/link/link.info
+++ b/sites/all/modules/contrib/fields/link/link.info
@@ -3,7 +3,6 @@ description = Defines simple link field types.
core = 7.x
package = Fields
-files[] = link.module
files[] = link.migrate.inc
; Tests
@@ -12,15 +11,15 @@ files[] = tests/link.attribute.test
files[] = tests/link.crud.test
files[] = tests/link.crud_browser.test
files[] = tests/link.token.test
+files[] = tests/link.entity_token.test
files[] = tests/link.validate.test
; Views Handlers
files[] = views/link_views_handler_argument_target.inc
files[] = views/link_views_handler_filter_protocol.inc
-; Information added by Drupal.org packaging script on 2014-10-21
-version = "7.x-1.3"
+; Information added by Drupal.org packaging script on 2019-02-20
+version = "7.x-1.6"
core = "7.x"
project = "link"
-datestamp = "1413924830"
-
+datestamp = "1550680687"
diff --git a/sites/all/modules/contrib/fields/link/link.install b/sites/all/modules/contrib/fields/link/link.install
index 14e745d..8125b69 100644
--- a/sites/all/modules/contrib/fields/link/link.install
+++ b/sites/all/modules/contrib/fields/link/link.install
@@ -6,10 +6,38 @@
*/
/**
- * Upgrade notes:
- * Things we need to make sure work when upgrading from Drupal 6 to Drupal 7:
+ * Upgrade notes.
+ *
+ * Things we need to make sure work when upgrading from Drupal 6 to Drupal 7:.
*/
+/**
+ * Implements hook_uninstall().
+ */
+function link_install() {
+ // Notify the user they may want to install token.
+ if (!module_exists('token')) {
+ $t = get_t();
+ drupal_set_message($t('If you install the Token, static title can use any other entity field as its value.', array(
+ '!url' => 'http://drupal.org/project/token',
+ )));
+ }
+}
+
+/**
+ * Removes unused link_extra_domains variable.
+ */
+function link_update_7002() {
+ variable_del('link_extra_domains');
+}
+
+/**
+ * Implements hook_uninstall().
+ */
+function link_uninstall() {
+ variable_del('link_allowed_domains');
+}
+
/**
* Implements hook_field_schema().
*/
@@ -46,19 +74,21 @@ function link_update_last_removed() {
}
/**
- * Handles moving settings data from field_config.data to field_config_instance.data.
+ * Implements hook_update_N().
+ *
+ * Handles moving settings data from field_config.data to
+ * field_config_instance.data.
*/
function link_update_7000() {
-
- // For each field that is a link field, we need to copy the settings from the general field level down to the instance.
- //$field_data = array();
+
+ // For each field that is a link field, we need to copy the settings from the
+ // general field level down to the instance.
$result = db_query("SELECT id, field_name, data FROM {field_config} WHERE module = 'link' AND type = 'link_field'");
foreach ($result as $field) {
- $field_id = $field->id;
- $name = $field->field_name;
+
$field_data = unserialize($field->data);
-
- $instances = db_query("SELECT id, data FROM {field_config_instance} WHERE field_id = :field_id", array(':field_id' => $field_id));
+
+ $instances = db_query("SELECT id, data FROM {field_config_instance} WHERE field_id = :field_id", array(':field_id' => $field->id));
foreach ($instances as $instance) {
// If this field has been updated already, we want to skip it.
$instance_data = unserialize($instance->data);
@@ -71,8 +101,8 @@ function link_update_7000() {
}
}
if ($update_instance) {
- // update the database.
- $num_updated = db_update('field_config_instance')
+ // Update the database.
+ db_update('field_config_instance')
->fields(array('data' => serialize($instance_data)))
->condition('id', $instance->id)
->execute();
@@ -80,22 +110,19 @@ function link_update_7000() {
}
}
}
-
+
return t("Instance settings have been set with the data from the field settings.");
}
/**
- * Renames all displays from foobar to link_foobar
+ * Renames all displays from foobar to link_foobar.
*/
function link_update_7001() {
// Update the display type for each link field type.
$result = db_query("SELECT id, field_name, data FROM {field_config} WHERE module = 'link' AND type = 'link_field'");
foreach ($result as $field) {
- $field_id = $field->id;
- $name = $field->field_name;
- $field_data = unserialize($field->data);
-
- $instances = db_query("SELECT id, data FROM {field_config_instance} WHERE field_id = :field_id", array(':field_id' => $field_id));
+
+ $instances = db_query("SELECT id, data FROM {field_config_instance} WHERE field_id = :field_id", array(':field_id' => $field->id));
foreach ($instances as $instance) {
// If this field has been updated already, we want to skip it.
$instance_data = unserialize($instance->data);
diff --git a/sites/all/modules/contrib/fields/link/link.migrate.inc b/sites/all/modules/contrib/fields/link/link.migrate.inc
index fc8363f..4900051 100644
--- a/sites/all/modules/contrib/fields/link/link.migrate.inc
+++ b/sites/all/modules/contrib/fields/link/link.migrate.inc
@@ -11,11 +11,9 @@
* $this->addFieldMapping('field_my_link', 'source_url');
* $this->addFieldMapping('field_my_link:title', 'source_title');
* $this->addFieldMapping('field_my_link:attributes', 'source_attributes');
- * @endcode
*
- * With earlier versions of Migrate, you must pass an arguments array:
+ * # With earlier versions of Migrate, you must pass an arguments array:
*
- * @code
* $link_args = array(
* 'title' => array('source_field' => 'source_title'),
* 'attributes' => array('source_field' => 'source_attributes'),
@@ -25,6 +23,10 @@
* @endcode
*/
+if (!class_exists('MigrateFieldHandler')) {
+ return;
+}
+
/**
* Implements hook_migrate_api().
*/
@@ -35,12 +37,20 @@ function link_migrate_api() {
);
}
+// @codingStandardsIgnoreLine
class MigrateLinkFieldHandler extends MigrateFieldHandler {
+
+ /**
+ * Construct.
+ */
public function __construct() {
$this->registerTypes(array('link_field'));
}
- static function arguments($title = NULL, $attributes = NULL, $language = NULL) {
+ /**
+ * Arguments.
+ */
+ public static function arguments($title = NULL, $attributes = NULL, $language = NULL) {
$arguments = array();
if (!is_null($title)) {
$arguments['title'] = $title;
@@ -57,16 +67,21 @@ class MigrateLinkFieldHandler extends MigrateFieldHandler {
/**
* Implementation of MigrateFieldHandler::fields().
*
- * @param $type
- * The field type.
- * @param $instance
- * Instance info for the field.
+ * @param array $type
+ * The field type.
+ * @param array $instance
+ * Instance info for the field.
* @param Migration $migration
- * The migration context for the parent field. We can look at the mappings
- * and determine which subfields are relevant.
+ * The migration context for the parent field. We can look at the mappings
+ * and determine which subfields are relevant.
+ *
* @return array
+ * Array with values.
+ *
+ * @codingStandardsIgnoreStart
*/
public function fields($type, $instance, $migration = NULL) {
+ // @codingStandardsIgnoreEnd
return array(
'title' => t('Subfield: The link title attribute'),
'attributes' => t('Subfield: The attributes for this link'),
@@ -74,6 +89,9 @@ class MigrateLinkFieldHandler extends MigrateFieldHandler {
);
}
+ /**
+ * Prepare.
+ */
public function prepare($entity, array $field_info, array $instance, array $values) {
if (isset($values['arguments'])) {
$arguments = $values['arguments'];
@@ -105,9 +123,17 @@ class MigrateLinkFieldHandler extends MigrateFieldHandler {
}
}
$item['url'] = $value;
- $return[$language][$delta] = $item;
+
+ if (is_array($language)) {
+ $current_language = $language[$delta];
+ }
+ else {
+ $current_language = $language;
+ }
+ $return[$current_language][$delta] = $item;
}
return isset($return) ? $return : NULL;
}
+
}
diff --git a/sites/all/modules/contrib/fields/link/link.module b/sites/all/modules/contrib/fields/link/link.module
index b0c53c3..8b3094f 100644
--- a/sites/all/modules/contrib/fields/link/link.module
+++ b/sites/all/modules/contrib/fields/link/link.module
@@ -10,8 +10,6 @@ define('LINK_INTERNAL', 'internal');
define('LINK_FRONT', 'front');
define('LINK_EMAIL', 'email');
define('LINK_NEWS', 'news');
-define('LINK_DOMAINS', 'aero|arpa|asia|biz|build|com|cat|ceo|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|post|pro|tel|travel|mobi|local|xxx');
-
define('LINK_TARGET_DEFAULT', 'default');
define('LINK_TARGET_NEW_WINDOW', '_blank');
define('LINK_TARGET_TOP', '_top');
@@ -22,6 +20,22 @@ define('LINK_TARGET_USER', 'user');
*/
define('LINK_URL_MAX_LENGTH', 2048);
+/**
+ * Implements hook_help().
+ */
+function link_help($path, $arg) {
+ switch ($path) {
+ case 'admin/help#link':
+ $output = '') === 0) {
@@ -1290,6 +1564,9 @@ function link_validate_url($text) {
if (preg_match($internal_pattern . $end, $text)) {
return LINK_INTERNAL;
}
+ if (drupal_valid_path($text) && url_is_external($text) == FALSE) {
+ return LINK_INTERNAL;
+ }
if (preg_match($external_pattern . $end, $text)) {
return LINK_EXTERNAL;
}
@@ -1301,11 +1578,16 @@ function link_validate_url($text) {
}
/**
- * Returns the list of allowed domains, including domains added by admins via variable_set/$config.
+ * Returns the list of allowed domains.
+ *
+ * If the variable link_allowed_domains is set, restrict allowed domains to the
+ * strings in that array. If the variable link_allowed_domains is not set, allow
+ * all domains between 2 and 63 characters in length.
+ * See https://tools.ietf.org/html/rfc1034.
*/
function _link_domains() {
- $link_extra_domains = variable_get('link_extra_domains', array());
- return empty($link_extra_domains) ? LINK_DOMAINS : LINK_DOMAINS . '|' . implode('|', $link_extra_domains);
+ $link_allowed_domains = variable_get('link_allowed_domains', array());
+ return empty($link_allowed_domains) ? '[a-z][a-z0-9-]{1,62}' : implode('|', $link_allowed_domains);
}
/**
@@ -1316,7 +1598,15 @@ function link_content_migrate_field_alter(&$field_value, $instance_value) {
// Adjust the field type.
$field_value['type'] = 'link_field';
// Remove settings that are now on the instance.
- foreach (array('attributes', 'display', 'url', 'title', 'title_value', 'enable_tokens', 'validate_url') as $setting) {
+ foreach (array(
+ 'attributes',
+ 'display',
+ 'url',
+ 'title',
+ 'title_value',
+ 'enable_tokens',
+ 'validate_url',
+ ) as $setting) {
unset($field_value['settings'][$setting]);
}
}
@@ -1330,7 +1620,15 @@ function link_content_migrate_field_alter(&$field_value, $instance_value) {
function link_content_migrate_instance_alter(&$instance_value, $field_value) {
if ($field_value['type'] == 'link') {
// Grab settings that were previously on the field.
- foreach (array('attributes', 'display', 'url', 'title', 'title_value', 'enable_tokens', 'validate_url') as $setting) {
+ foreach (array(
+ 'attributes',
+ 'display',
+ 'url',
+ 'title',
+ 'title_value',
+ 'enable_tokens',
+ 'validate_url',
+ ) as $setting) {
if (isset($field_value['settings'][$setting])) {
$instance_value['settings'][$setting] = $field_value['settings'][$setting];
}
@@ -1341,7 +1639,15 @@ function link_content_migrate_instance_alter(&$instance_value, $field_value) {
}
// Adjust formatter types.
foreach ($instance_value['display'] as $context => $settings) {
- if (in_array($settings['type'], array('default', 'title_plain', 'url', 'plain', 'short', 'label', 'separate'))) {
+ if (in_array($settings['type'], array(
+ 'default',
+ 'title_plain',
+ 'url',
+ 'plain',
+ 'short',
+ 'label',
+ 'separate',
+ ))) {
$instance_value['display'][$context]['type'] = 'link_' . $settings['type'];
}
}
@@ -1357,7 +1663,7 @@ function link_field_settings_form() {
/**
* Additional callback to adapt the property info of link fields.
- *
+ *
* @see entity_metadata_field_entity_property_info()
*/
function link_field_property_info_callback(&$info, $entity_type, $field, $instance, $field_type) {
@@ -1385,7 +1691,7 @@ function link_field_property_info_callback(&$info, $entity_type, $field, $instan
* @see link_field_property_info_callback()
*/
function link_field_item_create() {
- return array('title' => NULL, 'url' => NULL);
+ return array('title' => NULL, 'url' => NULL, 'display_url' => NULL);
}
/**
@@ -1398,7 +1704,7 @@ function link_field_item_property_info() {
'setter callback' => 'entity_property_verbatim_set',
);
$properties['url'] = array(
- 'type' => 'uri',
+ 'type' => 'text',
'label' => t('The URL of the link.'),
'setter callback' => 'entity_property_verbatim_set',
);
@@ -1408,6 +1714,11 @@ function link_field_item_property_info() {
'setter callback' => 'entity_property_verbatim_set',
'getter callback' => 'link_attribute_property_get',
);
+ $properties['display_url'] = array(
+ 'type' => 'uri',
+ 'label' => t('The full URL of the link.'),
+ 'setter callback' => 'entity_property_verbatim_set',
+ );
return $properties;
}
@@ -1422,7 +1733,7 @@ function link_attribute_property_get($data, array $options, $name, $type, $info)
* Implements hook_field_update_instance().
*/
function link_field_update_instance($instance, $prior_instance) {
- if (function_exists('i18n_string_update') && $instance['widget']['type'] == 'link_field' && $prior_instance['settings']['title_value'] != $instance['settings']['title_value']) {
+ if (function_exists('i18n_string_update') && isset($instance['widget']) && $instance['widget']['type'] == 'link_field' && $prior_instance['settings']['title_value'] != $instance['settings']['title_value']) {
$i18n_string_name = "field:{$instance['field_name']}:{$instance['bundle']}:title_value";
i18n_string_update($i18n_string_name, $instance['settings']['title_value']);
}
diff --git a/sites/all/modules/contrib/fields/link/tests/link.attribute.test b/sites/all/modules/contrib/fields/link/tests/link.attribute.test
index 603847e..f66a0e6 100644
--- a/sites/all/modules/contrib/fields/link/tests/link.attribute.test
+++ b/sites/all/modules/contrib/fields/link/tests/link.attribute.test
@@ -5,7 +5,11 @@
* Basic simpletests to test options on link module.
*/
+/**
+ * Attribute Crud Test.
+ */
class LinkAttributeCrudTest extends DrupalWebTestCase {
+
private $zebra;
protected $permissions = array(
@@ -19,6 +23,9 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
'access administration pages',
);
+ /**
+ * Get Info.
+ */
public static function getInfo() {
return array(
'name' => 'Link Attribute Tests',
@@ -27,14 +34,23 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
);
}
- function setup() {
+ /**
+ * Setup.
+ */
+ public function setup() {
parent::setup('field_ui', 'link');
$this->zebra = 0;
// Create and login user.
- $this->web_user = $this->drupalCreateUser(array('administer content types'));
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ ));
$this->drupalLogin($this->web_user);
}
+ /**
+ * Create Link.
+ */
protected function createLink($url, $title, $attributes = array()) {
return array(
'url' => $url,
@@ -43,20 +59,26 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
);
}
+ /**
+ * Assert Link On Node.
+ */
protected function assertLinkOnNode($field_name, $link_value, $message = '', $group = 'Other') {
$this->zebra++;
$zebra_string = ($this->zebra % 2 == 0) ? 'even' : 'odd';
$cssFieldLocator = 'field-' . str_replace('_', '-', $field_name);
$this->assertPattern('@
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/README.txt b/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/README.txt
new file mode 100644
index 0000000..2deae7f
--- /dev/null
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/README.txt
@@ -0,0 +1,5 @@
+Brightcove Video Embed Field
+----------------------------
+This module parses a Brightcove URL via the Video Embed Field
+
+Example URL: http://link.brightcove.com/services/player/bcpid3303744435001?bckey=AQ~~,AAAAAGL7jok~,vslbwQw3pdWM_Ya9IsUVNvJJIhV9YG1S&bctid=3118695475001
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/img/brightcove.jpg b/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/img/brightcove.jpg
new file mode 100644
index 0000000..d72cdca
Binary files /dev/null and b/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/img/brightcove.jpg differ
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/video_embed_brightcove.info b/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/video_embed_brightcove.info
new file mode 100644
index 0000000..8ca93ff
--- /dev/null
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/video_embed_brightcove.info
@@ -0,0 +1,14 @@
+name = "Video Embed Brightcove"
+description = "Provides Brightcove handler for Video Embed Fields."
+core = 7.x
+package = Media
+configure = admin/config/media/vef_video_styles
+
+dependencies[] = "video_embed_field"
+
+; Information added by Drupal.org packaging script on 2015-09-07
+version = "7.x-2.0-beta11"
+core = "7.x"
+project = "video_embed_field"
+datestamp = "1441639440"
+
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/video_embed_brightcove.module b/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/video_embed_brightcove.module
new file mode 100644
index 0000000..f48f6c1
--- /dev/null
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_brightcove/video_embed_brightcove.module
@@ -0,0 +1,168 @@
+ 'Brightcove Video',
+ 'function' => 'video_embed_brightcove_handle_video',
+ 'thumbnail_default' => drupal_get_path('module', 'video_embed_brightcove') . '/img/brightcove.jpg',
+ 'form' => 'video_embed_brightcove_form',
+ 'form_validate' => 'video_embed_field_handler_brightcove_form_validate',
+ 'domains' => array(
+ 'brightcove.com',
+ 'link.brightcove.com',
+ ),
+ 'defaults' => array(
+ 'width' => 640,
+ 'height' => 360,
+ 'class' => '',
+ ),
+ );
+
+ return $handlers;
+}
+
+/**
+ * Form to configure out video settings.
+ *
+ * @param array $defaults
+ * Values for your provider.
+ *
+ * @return array
+ * A form as defined by form API.
+ */
+function video_embed_brightcove_form($defaults) {
+ $form = array();
+ // Element for the width of the player.
+ $form['width'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Player Width'),
+ '#description' => t('The width of the player.'),
+ '#default_value' => $defaults['width'],
+ );
+
+ // Element for the height of the player.
+ $form['height'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Player Height'),
+ '#description' => t('The height of the player.'),
+ '#default_value' => $defaults['height'],
+ );
+
+ $form['class'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Player CSS class'),
+ '#description' => t('CSS class to add to the player'),
+ '#default_value' => $defaults['class'],
+ );
+
+ return $form;
+}
+
+/**
+ * Validates the form elements for the Brightcove configuration form.
+ */
+function video_embed_field_handler_brightcove_form_validate($element, &$form_state, $form) {
+ video_embed_field_validate_dimensions($element);
+}
+
+/**
+ * The video handler.
+ *
+ * @param string $url
+ * The full video url.
+ * @param array $settings
+ * Handlers settings from the settings form.
+ *
+ * @return array|string
+ * The embed code for the video.
+ */
+function video_embed_brightcove_handle_video($url, $settings) {
+ $parameters = _video_embed_brightcove_get_video_properties($url);
+
+ if (isset($parameters['id']) && isset($parameters['key'])) {
+ // Embed code.
+ $embed = '';
+ // Replace our placeholders with the values from the settings.
+ $embed = format_string($embed, array(
+ '!id' => $parameters['id'],
+ '!key' => $parameters['key'],
+ '@width' => $settings['width'],
+ '@height' => $settings['height'],
+ '@class' => $settings['class'],
+ '!videoplayer' => $parameters['player'],
+ ));
+
+ $video = array(
+ '#markup' => $embed,
+ '#suffix' => '',
+ '#attached' => array(
+ 'js' => array(
+ '//admin.brightcove.com/js/BrightcoveExperiences.js' => array(
+ 'type' => 'external',
+ ),
+ ),
+ ),
+ );
+
+ return $video;
+ }
+ return '';
+}
+
+/**
+ * Helper function to take a brightcove video url and return its id.
+ *
+ * @param string $url
+ * The full brightcove video url.
+ *
+ * @return array
+ * The video properties.
+ */
+function _video_embed_brightcove_get_video_properties($url) {
+ // Easy way to break a url into its components.
+ $components = array(
+ 'id' => array(
+ 'start' => 'bcpid',
+ 'finish' => '\?bckey',
+ ),
+ 'key' => array(
+ 'start' => 'bckey=',
+ 'finish' => '&bctid',
+ ),
+ 'player' => array(
+ 'start' => 'bctid=',
+ 'finish' => '',
+ ),
+ );
+
+ $matches = array();
+ $return = array();
+ foreach ($components as $key => $component) {
+ $string = "/(.*){$component['start']}(.*){$component['finish']}/";
+ preg_match($string, $url, $matches);
+ if ($matches && !empty($matches[2])) {
+ $return[$key] = check_plain($matches[2]);
+ }
+ }
+ return $return;
+}
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/img/facebook.jpg b/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/img/facebook.jpg
new file mode 100644
index 0000000..79a1a13
Binary files /dev/null and b/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/img/facebook.jpg differ
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/video_embed_facebook.info b/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/video_embed_facebook.info
index 30141ba..618c2d7 100644
--- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/video_embed_facebook.info
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/video_embed_facebook.info
@@ -5,9 +5,9 @@ package = Media
configure = admin/config/media/vef_video_styles
dependencies[] = "video_embed_field"
-; Information added by drupal.org packaging script on 2012-10-17
-version = "7.x-2.0-beta5+11-dev"
+; Information added by Drupal.org packaging script on 2015-09-07
+version = "7.x-2.0-beta11"
core = "7.x"
project = "video_embed_field"
-datestamp = "1350438417"
+datestamp = "1441639440"
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/video_embed_facebook.module b/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/video_embed_facebook.module
index d4c1db8..bca0297 100644
--- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/video_embed_facebook.module
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_facebook/video_embed_facebook.module
@@ -1,41 +1,31 @@
'Facebook Video', //The title is the name to show to users
- //function is a function to take the url and return the embed code
+ 'title' => 'Facebook Video',
'function' => 'video_embed_facebook_handle_video',
- //thumbnail_function is optional and takes the url and returns the thumbnail url
'thumbnail_function' => 'video_embed_facebook_handle_thumbnail',
- //data_function is optional and returns an array of extra data for the given video url
- //because facebook requires oath to get this data, we'll leave it out for now
- //'data_function' => 'video_embed_facebook_handle_data',
- //form is the configure form to embed into video_embed styles - this is where all settings should go
+ 'thumbnail_default' => drupal_get_path('module', 'video_embed_facebook') . '/img/facebook.jpg',
'form' => 'video_embed_facebook_form',
- //domains is how video embed determines which handler to use, its an array of domains to match
- //urls against. Don't include the scheme (like http://) or www.
+ 'form_validate' => 'video_embed_field_handler_youtube_form_validate',
'domains' => array(
'facebook.com',
),
- //defaults are the defaults to provide to your form (as defined in your form callback)
'defaults' => array(
'width' => 640,
'height' => 360,
- 'allowfullscreen' => TRUE,
+ 'class' => '',
),
);
@@ -43,107 +33,124 @@ function video_embed_facebook_video_embed_handler_info() {
}
/**
- * Our configuration form (the callback for the form key in info)
- * Provide a form to configure out video settings
- * @param $defaults - default/current values for your provider, the currently saved settings
- * with empty values filled with the defaults provided in info hook
- * @return a form as defined by forms api
+ * Defines the form elements for the Facebook videos configuration form.
+ *
+ * @param array $defaults
+ * The form default values.
+ *
+ * @return array
+ * The provider settings form array.
*/
function video_embed_facebook_form($defaults) {
$form = array();
- //form element for the width of the player - note we're using the default from defaults
- $form['height'] = array(
- '#type' => 'textfield',
- '#title' => t('Player Width'),
- '#description' => t('The width of the player.'),
- '#default_value' => $defaults['height'],
- );
- //element for width
+
$form['width'] = array(
'#type' => 'textfield',
'#title' => t('Player Width'),
'#description' => t('The width of the player.'),
'#default_value' => $defaults['width'],
);
- //allow configuration of fullscreen
- $form['allowfullscreen'] = array(
- '#type' => 'checkbox',
- '#title' => t('Allow Fullscreen'),
- '#desecription' => t('This will allow the video to be fullscreened.'),
- '#default_value' => $defaults['allowfullscreen'],
+
+ $form['height'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Player Height'),
+ '#description' => t('The height of the player.'),
+ '#default_value' => $defaults['height'],
+ );
+
+ $form['class'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Player CSS class'),
+ '#description' => t('CSS class to add to the player'),
+ '#default_value' => $defaults['class'],
);
return $form;
}
+/**
+ * Validates the form elements for the Facebook video configuration form.
+ *
+ * @param array $element
+ * The form element to validate.
+ * @param array $form_state
+ * The form to validate state.
+ * @param array $form
+ * The form to validate structure.
+ */
+function video_embed_field_handler_facebook_form_validate($element, &$form_state, $form) {
+ video_embed_field_validate_dimensions($element);
+}
/**
- * This is the video handler (the 'function' key from handler_info)
- * @param $url - the full video url
- * @param $settings - an associative array of this handlers settings, from the settings form
- * @return - the embed code for the video
+ * Handler for Facebook videos.
+ *
+ * @param string $url
+ * The video URL.
+ * @param array $settings
+ * The settings array.
+ *
+ * @return string|bool
+ * The video iframe, or FALSE in case the ID can't be retrieved from the URL.
*/
function video_embed_facebook_handle_video($url, $settings) {
$id = _video_embed_facebook_get_video_id($url);
if ($id) {
- //our embed code
- $embed = '';
- //use format_string to replace our placeholders with the values from the settings
+ // Our embed code.
+ $embed=' ';
+ // Use format_string to replace our placeholders with the settings values.
$embed = format_string($embed, array(
'!id' => $id,
- '!fullscreen' => $settings['allowfullscreen'] ? 'true' : 'false',
- '!width' => $settings['width'],
- '!height' => $settings['height'],
+ '@width' => $settings['width'],
+ '@height' => $settings['height'],
+ '@class' => $settings['class'],
));
- //we want to return a render array
+
$video = array(
'#markup' => $embed,
);
return $video;
}
- // just return an empty string if there is no id, so we don't have broken embeds showing up
- return '';
+
+ return FALSE;
}
/**
- * Retreive the thumbnail for the facebook video - note that based on a users permissions, this may be
- * the facebook unknown thumbnail: https://s-static.ak.facebook.com/rsrc.php/v1/y0/r/XsEg9L6Ie5_.jpg
- * @param $url - the url of the video as entered by the user
- * @return an array with the keys:
- * 'id' => an id for the video which is unique to your provider, used for naming the cached thumbnail file
- * 'url' => the url to retrieve the thumbnail from
+ * Gets the thumbnail url for Facebook videos.
+ *
+ * @param string $url
+ * The video URL.
+ *
+ * @return array
+ * The video thumbnail information.
*/
function video_embed_facebook_handle_thumbnail($url) {
$id = _video_embed_facebook_get_video_id($url);
- // We're using a part of the graphs api to return the thumbnail. This only works for some videos
+
return array(
- 'id' => $id, //generally the id that the provider uses for the video
- 'url' => 'https://graph.facebook.com/' . $id . '/picture', //the url of the thumbnail
+ 'id' => $id,
+ 'url' => 'https://graph.facebook.com/' . $id . '/picture',
);
}
/**
- * Helper function to take a facebook video url and return its id
- * @param $url - the full facebook video url
- * @return the id for the video
+ * Helper function to get the Facebook video's id.
+ *
+ * @param string $url
+ * The video URL.
+ *
+ * @return string|bool
+ * The video ID, or FALSE in case the ID can't be retrieved from the URL.
*/
function _video_embed_facebook_get_video_id($url) {
- //parse_url is an easy way to break a url into its components
+ // Parse_url is an easy way to break a url into its components.
$matches = array();
- preg_match('/(.*)?v=([^&#]*)/', $url, $matches);
- //if the v get parameter is set, return it
- if ($matches && !empty($matches[2])) {
- return $matches[2];
+ preg_match('/(?:.*)(?:v=|video_id=|videos\/|videos\/v.\.\d+\/)(\d+).*/', $url, $matches);
+ // If the v or video_id get parameters are set, return it.
+ if ($matches && !empty($matches[1])) {
+ return check_plain($matches[1]);
}
- //otherwise return false.
+ // Otherwise return false.
return FALSE;
}
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.admin.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.admin.inc
index 3a3f029..861fc64 100644
--- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.admin.inc
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.admin.inc
@@ -1,11 +1,14 @@
'vertical_tabs',
'#title' => t('Playback settings'),
'#tree' => TRUE,
- ) + $parser_form; //add in our extra settings
+ ) + $parser_form;
return $form;
}
+
+/**
+ * VEF settings page form callback.
+ */
+function video_embed_field_settings_form($form, &$form_state) {
+ $form['video_embed_field_youtube_v3_api_key'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Youtube v3 API key'),
+ '#default_value' => variable_get('video_embed_field_youtube_v3_api_key', ''),
+ );
+ return system_settings_form($form);
+}
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.api.php b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.api.php
old mode 100755
new mode 100644
index 0f40367..3a16016
--- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.api.php
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.api.php
@@ -7,15 +7,26 @@
/**
* @function hook_video_embed_handler_info
* Can be used to add more handlers for video_embed_field
- * @return an array of handlers, each handler is an array with the following keys
- * 'title' : required, the untranslated title of the provider, to show to the admin user
- * 'function' : required, the function used to generate the embed code
- * 'thumbnail_function' : optional, the function used to provide the thumbnail for a video
+ * @return an array of handlers, each handler is an array with the following
+ * keys:
+ * 'title' : required, the untranslated title of the provider, to show to the
+ * admin user.
+ * 'function' : required, the function used to generate the embed code.
+ * 'thumbnail_function' : optional, the function used to provide the thumbnail
+ * for a video.
+ * 'thumbnail_default : optional, the default thumbnail image to display in case
+ * thumbnail_function does not exist or has no results.
* 'data_function' : optional, the function to return an array of video data.
- * 'form' : required, the function that returns the settings form for your provider
- * 'domains' : required, an array of domains to match against, this is used to know which provider to use
- * 'defaults' : default values for each setting made configurable in your form function
+ * 'form' : required, the function that returns the settings form for your
+ * provider.
+ * 'form_validate: optional the function that validates the settings form for
+ * your provider.
+ * 'domains' : required, an array of domains to match against, this is used to
+ * know which provider to use.
+ * 'defaults' : default values for each setting made configurable in your form
+ * function.
*
+ * @see hook_video_embed_handler_info_alter()
* @see below for function definitions
*/
function hook_video_embed_handler_info() {
@@ -25,8 +36,10 @@ function hook_video_embed_handler_info() {
'title' => 'UStream',
'function' => 'your_module_handle_ustream',
'thumbnail_function' => 'your_module_handle_ustream_thumbnail',
+ 'thumbnail_default' => drupal_get_path('module', 'your_module') . '/img/ustream.jpg',
'data_function' => 'your_module_handler_ustream_data',
'form' => 'your_module_handler_ustream_form',
+ 'form_validate' => 'your_module_handler_ustream_form_validate',
'domains' => array(
'ustream.com',
),
@@ -39,8 +52,24 @@ function hook_video_embed_handler_info() {
return $handlers;
}
-// Example callbacks for a provider (in this case for ustream) - obviously, these functions are only for example
-// purposes
+/**
+ * Performs alterations on video_embed_field handlers.
+ *
+ * @param $info
+ * Array of information on video handlers exposed by
+ * hook_video_embed_handler_info() implementations.
+ */
+function hook_video_embed_handler_info_alter(&$info) {
+ // Change the thumbnail function for 'ustream' provider.
+ if (isset($info['ustream'])) {
+ $info['ustream']['thumbnail_function'] = 'your_module_handle_ustream_thumbnail_alter';
+ }
+}
+
+/**
+ * Example callbacks for a provider (in this case for ustream).
+ * Obviously, these functions are only for example purposes.
+ */
/**
* Generate the embed code for a video
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.devel_generate.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.devel_generate.inc
new file mode 100644
index 0000000..5428883
--- /dev/null
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.devel_generate.inc
@@ -0,0 +1,94 @@
+entry as $entry) {
+ $videos[] = array(
+ 'video_url' => $entry->children('media', TRUE)->group->player->attributes()->url,
+ 'description' => $entry->title,
+ );
+ }
+ if (empty($videos)) {
+ video_embed_field_generate_videos();
+ }
+ }
+ return $videos;
+}
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.feeds.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.feeds.inc
index 5196383..84bdb7a 100644
--- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.feeds.inc
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.feeds.inc
@@ -7,16 +7,23 @@
/**
* Implements hook_feeds_processor_targets_alter().
*
- * @see FeedsNodeProcessor::getMappingTargets().
+ * @see FeedsNodeProcessor::getMappingTargets()
*/
function video_embed_field_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_name) {
foreach (field_info_instances($entity_type, $bundle_name) as $name => $instance) {
$info = field_info_field($name);
if ($info['type'] == 'video_embed_field') {
- $targets[$name] = array(
- 'name' => $instance['label'],
+ $targets[$name . ":video_url"] = array(
+ 'name' => t('@name: Embed URL', array('@name' => $instance['label'])),
'callback' => 'video_embed_field_set_target',
- 'description' => t('The @label field of the node.', array('@label' => $instance['label'])),
+ 'description' => t('The URL for the @label field of the @entity_type.', array('@entity_type' => $entity_type, '@label' => $instance['label'])),
+ 'real_target' => $name,
+ );
+ $targets[$name . ':description'] = array(
+ 'name' => t('@name: Embed description', array('@name' => $instance['label'])),
+ 'callback' => 'video_embed_field_set_target',
+ 'description' => t('The description for the @label field of the @entity_type.', array('@entity_type' => $entity_type, '@label' => $instance['label'])),
+ 'real_target' => $name,
);
}
}
@@ -34,10 +41,33 @@ function video_embed_field_set_target($source, $entity, $target, $value) {
return;
}
- $field = isset($entity->$target) ? $entity->$target : array();
- if (!is_array($value) && !is_object($value)) {
- $field['und'][0]['video_url'] = $value;
+ if (!is_array($value)) {
+ $value = array($value);
}
- $entity->{$target} = $field;
+ list($field_name, $sub_field) = explode(':', $target, 2);
+
+ $info = field_info_field($field_name);
+
+ // Iterate over all values.
+ $field = isset($entity->$field_name) ? $entity->$field_name : array(LANGUAGE_NONE => array());
+
+ // Allow for multiple mappings to the same target.
+ $count = call_user_func_array('array_merge_recursive', $field[LANGUAGE_NONE]);
+ $delta = count($count[$sub_field]);
+
+ foreach ($value as $v) {
+
+ if ($info['cardinality'] != FIELD_CARDINALITY_UNLIMITED && $info['cardinality'] <= $delta) {
+ break;
+ }
+
+ if (is_scalar($v)) {
+ $field[LANGUAGE_NONE][$delta][$sub_field] = $v;
+
+ $delta++;
+ }
+ }
+
+ $entity->{$field_name} = $field;
}
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.field.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.field.inc
old mode 100755
new mode 100644
index 9b9135a..0c23804
--- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.field.inc
+++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.field.inc
@@ -17,25 +17,98 @@ function video_embed_field_field_info() {
'instance_settings' => array(
'description_field' => 0,
'description_length' => 128,
+ 'allowed_providers' => array_keys(video_embed_get_handlers()),
),
'default_widget' => 'video_embed_field_video',
'default_formatter' => 'video_embed_field',
+ 'property_type' => 'video_embed_field',
+ 'property_callbacks' => array('video_embed_field_property_info_callback'),
),
);
}
+/**
+ * Property callback for the Entity Metadata framework.
+ */
+function video_embed_field_property_info_callback(&$info, $entity_type, $field, $instance, $field_type) {
+ // Apply the default.
+ entity_metadata_field_default_property_callback($info, $entity_type, $field, $instance, $field_type);
+
+ // Finally add in instance specific property info.
+ $name = $field['field_name'];
+ $property = &$info[$entity_type]['bundles'][$instance['bundle']]['properties'][$name];
+ $property['type'] = ($field['cardinality'] != 1) ? 'list',
'#suffix' => '
',
);
@@ -1074,7 +1108,7 @@ function field_group_pre_render_tab(&$element, $group, &$form) {
* Implements hook_field_group_build_pre_render_alter().
* @param Array $elements by address.
*/
-function field_group_field_group_build_pre_render_alter(& $element) {
+function field_group_field_group_build_pre_render_alter(&$element) {
// Someone is doing a node view, in a node view. Reset content.
// TODO Check if this breaks something else.
@@ -1096,7 +1130,6 @@ function field_group_field_group_build_pre_render_alter(& $element) {
// Add the default field_group javascript and stylesheet.
$element['#attached']['js'][] = drupal_get_path('module', 'field_group') . '/field_group.js';
- $element['#attached']['css'][] = drupal_get_path('module', 'field_group') . '/field_group.css';
// Move additional settings to the last multipage pane if configured that way.
// Note that multipages MUST be in the root of the form.
@@ -1127,19 +1160,16 @@ function field_group_field_group_build_pre_render_alter(& $element) {
*/
function field_group_remove_empty_form_groups($name, & $element, $groups, &$form_groups, $entity) {
- $exceptions = array('user__account', 'comment__author');
-
$children = element_children($element);
$hasChildren = FALSE;
if (count($children)) {
foreach ($children as $childname) {
- if (in_array($childname, $groups)) {
+ if (in_array($childname, $groups, TRUE)) {
field_group_remove_empty_form_groups($childname, $element[$childname], $groups, $form_groups, $entity);
}
- $exception = $entity . '__' . $childname;
- $hasChildren = $hasChildren ? TRUE : (isset($element[$childname]['#type']) || isset($element[$childname]['#markup']) || in_array($exception, $exceptions));
+ $hasChildren = $hasChildren ? TRUE : _field_group_is_empty_element($element, $entity, $childname, $groups);
}
}
@@ -1164,6 +1194,43 @@ function field_group_remove_empty_form_groups($name, & $element, $groups, &$form
}
+/**
+ * Determine if an element has non-empty children.
+ */
+function _field_group_is_empty_element($element, $entity, $childname, $groups) {
+
+ $exceptions = array('user__account', 'comment__author');
+ $exception = $entity . '__' . $childname;
+
+ if (in_array($exception, $exceptions)) {
+ return TRUE;
+ }
+
+ if (isset($element[$childname]['#type'])
+ || isset($element[$childname]['#markup'])
+ || isset($element[$childname]['#prefix'])
+ || isset($element[$childname]['#suffix'])
+ ) {
+ return TRUE;
+ }
+
+ // Prevent a double recursive loop (groups are already recursive looped in field_group_remove_empty_form_groups.
+ if (in_array($childname, $groups)) {
+ return FALSE;
+ }
+
+ $children = element_children($element[$childname]);
+
+ foreach ($children as $child) {
+ if (_field_group_is_empty_element($element[$childname], $entity, $child, $groups)) {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+
+}
+
/**
* Remove empty groups on entity display.
* @param array $element
@@ -1423,7 +1490,7 @@ function form_process_horizontal_tabs($element, &$form_state) {
function theme_horizontal_tabs($variables) {
$element = $variables['element'];
// Add required JavaScript and Stylesheet.
- $element['#attached']['library'][] = array('field_group', 'horizontal-tabs');
+ drupal_add_library('field_group', 'horizontal-tabs');
$output = '' . (!empty($element['#title']) ? $element['#title'] : t('Horizontal Tabs')) . '
'; $output .= '' . $element['#children'] . '
';
@@ -1861,8 +1928,10 @@ function field_group_attach_groups(&$element, $view_mode, $form_state = array())
// Create a lookup array.
$group_children = array();
foreach ($element['#groups'] as $group_name => $group) {
- foreach ($group->children as $child) {
- $group_children[$child] = $group_name;
+ if (!empty($group->children)) {
+ foreach ($group->children as $child) {
+ $group_children[$child] = $group_name;
+ }
}
}
$element['#group_children'] = $group_children;
@@ -1951,9 +2020,25 @@ function field_group_fields_nest(&$element, &$vars = NULL) {
// Create all groups and keep a flat list of references to these groups.
$group_references = array();
foreach ($element['#fieldgroups'] as $group_name => $group) {
- // Construct own weight, as some fields (for example preprocess fields) don't have weight set.
- $element[$group_name] = array();
- $group_references[$group_name] = &$element[$group_name];
+ // check for any erroneous groups from other modules
+ if (is_string($group_name)) {
+ // Construct own weight, as some fields (for example preprocess fields) don't have weight set.
+ $element[$group_name] = array();
+ $group_references[$group_name] = &$element[$group_name];
+ // Get group parents
+ $parents = array();
+ $current_group = $group;
+ while (!empty($current_group)) {
+ array_unshift($parents, $current_group->group_name);
+ $current_group = isset($element['#fieldgroups'][$current_group->parent_name]) ?
+ $element['#fieldgroups'][$current_group->parent_name] : NULL;
+ }
+ $group_references[$group_name]['#array_parents'] = $parents;
+ $element['#fieldgroups'][$group_name]->array_parents = $parents;
+ // Remove self from parents and set #field_parents
+ array_pop($parents);
+ $group_references[$group_name]['#field_parents'] = $parents;
+ }
}
// Loop through all form children looking for those that are supposed to be
@@ -2003,6 +2088,19 @@ function field_group_fields_nest(&$element, &$vars = NULL) {
// list intact (but if it is a field we don't mind).
$group_references[$parent_name][$child_name] = &$element[$child_name];
$group_references[$parent_name]['#weight'] = $element['#fieldgroups'][$parent_name]->weight;
+ // Prepend #array_parents & #field_parents of group child element & its element_children
+ // if those keys are set, and don't already include the group parents
+ $group_child = &$group_references[$parent_name][$child_name];
+ $group_parents = $group_references[$parent_name]['#array_parents'];
+ $process_elements = array_merge(array(&$group_child), _field_group_element_children_recursive_ref($group_child));
+ foreach ($process_elements as $key => $current_element) {
+ if (isset($current_element['#array_parents']) && !in_array($group_parents[0], $current_element['#array_parents'])) {
+ $process_elements[$key]['#array_parents'] = array_merge($group_parents, $current_element['#array_parents']);
+ }
+ if (isset($current_element['#field_parents']) && !in_array($group_parents[0], $current_element['#field_parents'])) {
+ $process_elements[$key]['#field_parents'] = array_merge($group_parents, $current_element['#field_parents']);
+ }
+ }
}
// The child has been copied to its parent: remove it from the root element.
@@ -2019,6 +2117,23 @@ function field_group_fields_nest(&$element, &$vars = NULL) {
}
+/**
+ * Recursive element_children, returns children by reference
+ */
+function _field_group_element_children_recursive_ref(&$element) {
+ $results = array();
+ $children = element_children($element);
+ foreach ($children as $key) {
+ $child = &$element[$key];
+ if (is_array($child)) {
+ $results[] = &$child;
+ $results = array_merge($results, _field_group_element_children_recursive_ref($child));
+ }
+ unset($child);
+ }
+ return $results;
+}
+
/**
* Function to pre render the field group element.
*
@@ -2167,3 +2282,37 @@ function _field_group_get_default_formatter_settings($format_type, $mode) {
);
}
+/**
+ * Callback to bulk export field groups.
+ */
+function field_group_field_group_to_hook_code($data, $module) {
+ ctools_include('export');
+ $schema = ctools_export_get_schema('field_group');
+ $export = $schema['export'];
+
+ $translatables = array();
+ $objects = ctools_export_load_object('field_group', 'names', array_values($data));
+ $code = "/**\n";
+ $code .= " * Implements hook_{$export['default hook']}()\n";
+ $code .= " */\n";
+ $code .= "function " . $module . "_{$export['default hook']}() {\n";
+ $code .= " \${$export['identifier']}s = array();\n\n";
+ foreach ($objects as $object) {
+ $code .= ctools_export_object('field_group', $object, ' ');
+ $code .= " \${$export['identifier']}s['" . check_plain($object->{$export['key']}) . "'] = \${$export['identifier']};\n\n";
+ if (!empty($object->data['label'])) {
+ $translatables[] = $object->data['label'];
+ }
+ if (!empty($object->data['description'])) {
+ $translatables[] = $object->data['description'];
+ }
+ }
+
+ if (!empty($translatables)) {
+ $code .= features_translatables_export($translatables, ' ') . "\n";
+ }
+
+ $code .= " return \${$export['identifier']}s;";
+ $code .= "}\n";
+ return $code;
+}
diff --git a/sites/all/modules/contrib/fields/field_group/horizontal-tabs/horizontal-tabs.js b/sites/all/modules/contrib/fields/field_group/horizontal-tabs/horizontal-tabs.js
index 977e1b6..6429f90 100644
--- a/sites/all/modules/contrib/fields/field_group/horizontal-tabs/horizontal-tabs.js
+++ b/sites/all/modules/contrib/fields/field_group/horizontal-tabs/horizontal-tabs.js
@@ -29,8 +29,10 @@ Drupal.behaviors.horizontalTabs = {
// Transform each fieldset into a tab.
$fieldsets.each(function (i) {
+ var $legend = $('> legend', this);
+ $('.element-invisible', $legend).remove();
var horizontal_tab = new Drupal.horizontalTab({
- title: $('> legend', this).text(),
+ title: $legend.text(),
fieldset: $(this)
});
horizontal_tab.item.addClass('horizontal-tab-button-' + i);
@@ -52,7 +54,7 @@ Drupal.behaviors.horizontalTabs = {
// element that matches the URL fragment, activate that tab.
var hash = window.location.hash.replace(/[=%;,\/]/g, "");
if (hash !== '#' && $(hash, this).length) {
- tab_focus = $(window.location.hash, this).closest('.horizontal-tabs-pane');
+ tab_focus = $(hash, this).closest('.horizontal-tabs-pane');
}
else {
tab_focus = $('> .horizontal-tabs-pane:first', this);
diff --git a/sites/all/modules/contrib/fields/field_group/multipage/multipage.js b/sites/all/modules/contrib/fields/field_group/multipage/multipage.js
index 5314031..b5f4d08 100644
--- a/sites/all/modules/contrib/fields/field_group/multipage/multipage.js
+++ b/sites/all/modules/contrib/fields/field_group/multipage/multipage.js
@@ -82,14 +82,14 @@ Drupal.multipageControl = function (settings) {
var controls = Drupal.theme('multipage', settings);
$.extend(self, settings, controls);
- this.nextLink.click(function () {
+ this.nextLink.click(function (e) {
+ e.preventDefault();
self.nextPage();
- return false;
});
- this.previousLink.click(function () {
+ this.previousLink.click(function (e) {
+ e.preventDefault();
self.previousPage();
- return false;
});
/*
diff --git a/sites/all/modules/contrib/fields/field_group/tests/field_group.display.test b/sites/all/modules/contrib/fields/field_group/tests/field_group.display.test
index 5b82385..6058522 100644
--- a/sites/all/modules/contrib/fields/field_group/tests/field_group.display.test
+++ b/sites/all/modules/contrib/fields/field_group/tests/field_group.display.test
@@ -16,7 +16,7 @@ class GroupDisplayTestCase extends DrupalWebTestCase {
return array(
'name' => 'Display tests',
'description' => 'Test the field group display.',
- 'group' => 'Field group',
+ 'group' => 'Field Group',
);
}
@@ -209,7 +209,6 @@ class GroupDisplayTestCase extends DrupalWebTestCase {
),
);
$first_tab = $this->createGroup('default', $data);
- $first_tab_id = 'node_article_full_' . $first_tab->group_name;
$data = array(
'label' => 'Tab 2',
@@ -228,7 +227,6 @@ class GroupDisplayTestCase extends DrupalWebTestCase {
),
);
$second_tab = $this->createGroup('default', $data);
- $second_tab_id = 'node_article_full_' . $first_tab->group_name;
$data = array(
'label' => 'Tabs',
@@ -258,8 +256,8 @@ class GroupDisplayTestCase extends DrupalWebTestCase {
$this->assertRaw('class="collapsible collapsed test-class-2', t('Second tab is default collapsed'));
// Test if correctly nested
- $this->assertFieldByXPath("//div[contains(@class, 'test-class-wrapper')]//fieldset[contains(@id, '$first_tab_id')]", NULL, 'First tab is displayed as child of the wrapper.');
- $this->assertFieldByXPath("//div[contains(@class, 'test-class-wrapper')]//fieldset[contains(@id, '$second_tab_id')]", NULL, 'Second tab is displayed as child of the wrapper.');
+ $this->assertFieldByXPath("//div[contains(@class, 'test-class-wrapper')]//fieldset[contains(@class, 'test-class')]", NULL, 'First tab is displayed as child of the wrapper.');
+ $this->assertFieldByXPath("//div[contains(@class, 'test-class-wrapper')]//fieldset[contains(@class, 'test-class-2')]", NULL, 'Second tab is displayed as child of the wrapper.');
}
@@ -285,7 +283,7 @@ class GroupDisplayTestCase extends DrupalWebTestCase {
),
);
$first_tab = $this->createGroup('default', $data);
- $first_tab_id = 'node_article_full_' . $first_tab->group_name;
+ $first_tab_id = 'edit-' . $first_tab->group_name;
$data = array(
'label' => 'Tab 2',
@@ -304,7 +302,7 @@ class GroupDisplayTestCase extends DrupalWebTestCase {
),
);
$second_tab = $this->createGroup('default', $data);
- $second_tab_id = 'node_article_full_' . $first_tab->group_name;
+ $second_tab_id = 'edit-' . $second_tab->group_name;
$data = array(
'label' => 'Tabs',
diff --git a/sites/all/modules/contrib/fields/field_group/tests/field_group.ui.test b/sites/all/modules/contrib/fields/field_group/tests/field_group.ui.test
index 55fa595..6c4436a 100644
--- a/sites/all/modules/contrib/fields/field_group/tests/field_group.ui.test
+++ b/sites/all/modules/contrib/fields/field_group/tests/field_group.ui.test
@@ -22,7 +22,7 @@ class GroupUITestCase extends DrupalWebTestCase {
parent::setUp('field_test', 'field_group', 'field_group_test');
// Create test user.
- $admin_user = $this->drupalCreateUser(array('administer content types', 'administer nodes', 'access administration pages', 'bypass node access'));
+ $admin_user = $this->drupalCreateUser(array('administer content types', 'administer nodes', 'access administration pages', 'bypass node access', 'administer fields'));
$this->drupalLogin($admin_user);
}
diff --git a/sites/all/modules/contrib/fields/field_group/tests/field_group_test.info b/sites/all/modules/contrib/fields/field_group/tests/field_group_test.info
index 006a7f3..22bd921 100644
--- a/sites/all/modules/contrib/fields/field_group/tests/field_group_test.info
+++ b/sites/all/modules/contrib/fields/field_group/tests/field_group_test.info
@@ -5,9 +5,9 @@ package = Fields
hidden = TRUE
-; Information added by Drupal.org packaging script on 2014-06-04
-version = "7.x-1.4"
+; Information added by Drupal.org packaging script on 2017-11-03
+version = "7.x-1.6"
core = "7.x"
project = "field_group"
-datestamp = "1401918529"
+datestamp = "1509751991"
diff --git a/sites/all/modules/contrib/fields/link/README.txt b/sites/all/modules/contrib/fields/link/README.txt
new file mode 100644
index 0000000..a258d4d
--- /dev/null
+++ b/sites/all/modules/contrib/fields/link/README.txt
@@ -0,0 +1,101 @@
+CONTENTS OF THIS FILE
+---------------------
+
+ * Introduction
+ * Requirements
+ * Installation
+ * Configuration
+ * Example
+ * Theming and Output
+ * Maintainers
+
+
+INTRODUCTION
+------------
+
+The link can be count to the top 50 projects in Drupal installations and
+provides a standard custom content field for links. With this module links can
+be added easily to any content types and profiles and include advanced
+validating and different ways of storing internal or external links and URLs. It
+also supports additional link text title, site wide tokens for titles and title
+attributes, target attributes, css class attribution, static repeating values,
+input conversion, and many more.
+
+
+
+REQUIREMENTS
+------------
+
+Project in Drupal 7 requires the following modules:
+
+ * Fields API (Fields API is provided already by core)
+ * Panels (https://drupal.org/project/panels)
+
+Drupal 8:
+
+ * Link is in core now. No installation needed. Yay! Don't forget to activate
+ it. It's deactivated by default.
+
+
+INSTALLATION
+------------
+
+Install as you would normally install a contributed Drupal module. See:
+https://drupal.org/documentation/install/modules-themes/modules-7 for further
+information.
+
+
+CONFIGURATION
+-------------
+
+ * Configuration is only slightly more complicated than a text field. Link text
+ titles for URLs can be made required, set as instead of URL, optional
+ (default), or left out entirely. If no link text title is provided, the
+ trimmed version of the complete URL will be displayed. The target attribute
+ should be set to "_blank", "top", or left out completely (checkboxes provide
+ info). The rel=nofollow attribute prevents the link from being followed by
+ certain search engines. More info at Wikipedia
+ (http://en.wikipedia.org/wiki/Spam_in_blogs#rel.3D.22nofollow.22).
+
+
+EXAMPLE
+-------
+If you were to create a field named 'My New Link', the default display of the
+link would be:
+ where items between [] characters would be customized
+based on the user input.
+
+The link project supports both, internal and external URLs. URLs are validated
+on input. Here are some examples of data input and the default view of a link:
+http://drupal.org results in http://drupal.org, but drupal.org results in
+http://drupal.org, while About
'; + $output .= '' . 'The link provides a standard custom content field for links. Links can be easily added to any content types and profiles and include advanced validating and different ways of storing internal or external links and URLs. It also supports additional link text title, site wide tokens for titles and title attributes, target attributes, css class attribution, static repeating values, input conversion, and many more.' . '
'; + $output .= '' . 'Requirements / Dependencies' . '
'; + $output .= '' . 'Fields API is provided already by core [no dependencies].' . '
'; + $output .= 'Configuration
'; + $output .= '' . 'Configuration is only slightly more complicated than a text field. Link text titles for URLs can be made required, set as instead of URL, optional (default), or left out entirely. If no link text title is provided, the trimmed version of the complete URL will be displayed. The target attribute should be set to "_blank", "top", or left out completely (checkboxes provide info). The rel=nofollow attribute prevents the link from being followed by certain search engines.' . '
'; + return $output; + } +} + /** * Implements hook_field_info(). */ @@ -98,6 +112,7 @@ function link_field_instance_settings_form($field, $instance) { 'optional' => t('Optional Title'), 'required' => t('Required Title'), 'value' => t('Static Title'), + 'select' => t('Selected Title'), 'none' => t('No Title'), ); @@ -111,9 +126,26 @@ function link_field_instance_settings_form($field, $instance) { $form['title_value'] = array( '#type' => 'textfield', - '#title' => t('Static title'), + '#title' => t('Static or default title'), '#default_value' => isset($instance['settings']['title_value']) ? $instance['settings']['title_value'] : '', - '#description' => t('This title will always be used if “Static Title” is selected above.'), + '#description' => t('This title will 1) always be used if "Static Title" is selected above, or 2) used if "Optional title" is selected above and no title is entered when creating content.'), + '#states' => array( + 'visible' => array( + ':input[name="instance[settings][title]"]' => array('value' => 'value'), + ), + ), + ); + + $form['title_allowed_values'] = array( + '#type' => 'textarea', + '#title' => t('Title allowed values'), + '#default_value' => isset($instance['settings']['title_allowed_values']) ? $instance['settings']['title_allowed_values'] : '', + '#description' => t('When using "Selected Title", you can allow users to select the title from a limited set of values (eg. Home, Office, Other). Enter here all possible values that title can take, one value per line.'), + '#states' => array( + 'visible' => array( + ':input[name="instance[settings][title]"]' => array('value' => 'select'), + ), + ), ); $form['title_label_use_field_label'] = array( @@ -181,7 +213,7 @@ function link_field_instance_settings_form($field, $instance) { $form['attributes']['rel'] = array( '#type' => 'textfield', '#title' => t('Rel Attribute'), - '#description' => t('When output, this link will have this rel attribute. The most common usage is rel="nofollow" which prevents some search engines from spidering entered links.'), + '#description' => t('When output, this link will have this rel attribute. The most common usage is rel="nofollow" which prevents some search engines from spidering entered links.'), '#default_value' => empty($instance['settings']['attributes']['rel']) ? '' : $instance['settings']['attributes']['rel'], '#field_prefix' => 'rel = "', '#field_suffix' => '"', @@ -207,7 +239,7 @@ function link_field_instance_settings_form($field, $instance) { $form['attributes']['class'] = array( '#type' => 'textfield', '#title' => t('Additional CSS Class'), - '#description' => t('When output, this link will have this class attribute. Multiple classes should be separated by spaces.'), + '#description' => t('When output, this link will have this class attribute. Multiple classes should be separated by spaces. Only alphanumeric characters and hyphens are allowed'), '#default_value' => empty($instance['settings']['attributes']['class']) ? '' : $instance['settings']['attributes']['class'], ); $form['attributes']['configurable_title'] = array( @@ -218,7 +250,7 @@ function link_field_instance_settings_form($field, $instance) { $form['attributes']['title'] = array( '#title' => t("Default link 'title' Attribute"), '#type' => 'textfield', - '#description' => t('When output, links will use this "title" attribute if the user does not provide one and when different from the link text. Read WCAG 1.0 Guidelines for links comformances. Tokens values will be evaluated.'), + '#description' => t('When output, links will use this "title" attribute if the user does not provide one and when different from the link text. Read WCAG 1.0 Guidelines for links comformances. Tokens values will be evaluated.'), '#default_value' => empty($instance['settings']['attributes']['title']) ? '' : $instance['settings']['attributes']['title'], '#field_prefix' => 'title = "', '#field_suffix' => '"', @@ -228,11 +260,17 @@ function link_field_instance_settings_form($field, $instance) { } /** + * Form validate. + * * #element_validate handler for link_field_instance_settings_form(). */ function link_field_settings_form_validate($element, &$form_state, $complete_form) { if ($form_state['values']['instance']['settings']['title'] === 'value' && empty($form_state['values']['instance']['settings']['title_value'])) { - form_set_error('title_value', t('A default title must be provided if the title is a static value.')); + form_set_error('instance][settings][title_value', t('A default title must be provided if the title is a static value.')); + } + if ($form_state['values']['instance']['settings']['title'] === 'select' + && empty($form_state['values']['instance']['settings']['title_allowed_values'])) { + form_set_error('instance][settings][title_allowed_values', t('You must enter one or more allowed values for link Title, the title is a selected value.')); } if (!empty($form_state['values']['instance']['settings']['display']['url_cutoff']) && !is_numeric($form_state['values']['instance']['settings']['display']['url_cutoff'])) { form_set_error('display', t('URL Display Cutoff value must be numeric.')); @@ -277,6 +315,16 @@ function link_field_validate($entity_type, $entity, $field, $instance, $langcode } } + foreach ($items as $delta => $value) { + if (isset($value['attributes']) && is_string($value['attributes'])) { + $errors[$field['field_name']][$langcode][$delta][] = array( + 'error' => 'link_required', + 'message' => t('String values are not acceptable for attributes.'), + 'error_element' => array('url' => TRUE, 'title' => FALSE), + ); + } + } + if ($instance['settings']['url'] === 'optional' && $instance['settings']['title'] === 'optional' && $instance['required'] && !$optional_field_found) { $errors[$field['field_name']][$langcode][0][] = array( 'error' => 'link_required', @@ -291,7 +339,7 @@ function link_field_validate($entity_type, $entity, $field, $instance, $langcode */ function link_field_insert($entity_type, $entity, $field, $instance, $langcode, &$items) { foreach ($items as $delta => $value) { - _link_process($items[$delta], $delta, $field, $entity); + _link_process($items[$delta], $delta, $field, $entity, $instance); } } @@ -300,7 +348,7 @@ function link_field_insert($entity_type, $entity, $field, $instance, $langcode, */ function link_field_update($entity_type, $entity, $field, $instance, $langcode, &$items) { foreach ($items as $delta => $value) { - _link_process($items[$delta], $delta, $field, $entity); + _link_process($items[$delta], $delta, $field, $entity, $instance); } } @@ -343,10 +391,10 @@ function link_field_widget_form(&$form, &$form_state, $field, $instance, $langco * Implements hook_field_widget_error(). */ function link_field_widget_error($element, $error, $form, &$form_state) { - if ($error['error_element']['title']) { + if (!empty($error['error_element']['title'])) { form_error($element['title'], $error['message']); } - elseif ($error['error_element']['url']) { + elseif (!empty($error['error_element']['url'])) { form_error($element['url'], $error['message']); } } @@ -371,8 +419,22 @@ function _link_load($field, $item, $instance) { /** * Prepares the item attributes and url for storage. + * + * @param array $item + * Link field values. + * @param array $delta + * The sequence number for current values. + * @param array $field + * The field structure array. + * @param object $entity + * Entity object. + * @param array $instance + * The instance structure for $field on $entity's bundle. + * + * @codingStandardsIgnoreStart */ -function _link_process(&$item, $delta, $field, $entity) { +function _link_process(&$item, $delta, $field, $entity, $instance) { + // @codingStandardsIgnoreEnd // Trim whitespace from URL. if (!empty($item['url'])) { $item['url'] = trim($item['url']); @@ -391,7 +453,8 @@ function _link_process(&$item, $delta, $field, $entity) { // Don't save an invalid default value (e.g. 'http://'). if ((isset($field['widget']['default_value'][$delta]['url']) && $item['url'] == $field['widget']['default_value'][$delta]['url']) && is_object($entity)) { - if (!link_validate_url($item['url'])) { + $langcode = !empty($entity) ? field_language($instance['entity_type'], $entity, $instance['field_name']) : LANGUAGE_NONE; + if (!link_validate_url($item['url'], $langcode)) { unset($item['url']); } } @@ -403,7 +466,7 @@ function _link_process(&$item, $delta, $field, $entity) { function _link_validate(&$item, $delta, $field, $entity, $instance, $langcode, &$optional_field_found, &$errors) { if ($item['url'] && !(isset($instance['default_value'][$delta]['url']) && $item['url'] === $instance['default_value'][$delta]['url'] && !$instance['required'])) { // Validate the link. - if (link_validate_url(trim($item['url'])) == FALSE) { + if (!link_validate_url(trim($item['url']), $langcode)) { $errors[$field['field_name']][$langcode][$delta][] = array( 'error' => 'link_required', 'message' => t('The value %value provided for %field is not a valid URL.', array( @@ -430,9 +493,10 @@ function _link_validate(&$item, $delta, $field, $entity, $instance, $langcode, & 'error_element' => array('url' => TRUE, 'title' => FALSE), ); } - // In a totally bizzaro case, where URLs and titles are optional but the field is required, ensure there is at least one link. + // In a totally bizzaro case, where URLs and titles are optional but the field + // is required, ensure there is at least one link. if ($instance['settings']['url'] === 'optional' && $instance['settings']['title'] === 'optional' - && (strlen(trim($item['url'])) !== 0 || strlen(trim($item['title'])) !== 0)) { + && (strlen(trim($item['url'])) !== 0 || strlen(trim($item['title'])) !== 0)) { $optional_field_found = TRUE; } // Require entire field. @@ -448,16 +512,19 @@ function _link_validate(&$item, $delta, $field, $entity, $instance, $langcode, & /** * Clean up user-entered values for a link field according to field settings. * - * @param array $item + * @param array $item * A single link item, usually containing url, title, and attributes. - * @param int $delta + * @param int $delta * The delta value if this field is one of multiple fields. - * @param array $field + * @param array $field * The CCK field definition. - * @param object $entity + * @param object $entity * The entity containing this link. + * + * @codingStandardsIgnoreStart */ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { + // @codingStandardsIgnoreEnd // Don't try to process empty links. if (empty($item['url']) && empty($item['title'])) { return; @@ -471,22 +538,24 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { $entity_info = entity_get_info($entity_type); $property_id = $entity_info['entity keys']['id']; $entity_token_type = isset($entity_info['token type']) ? $entity_info['token type'] : ( - $entity_type == 'taxonomy_term' || $entity_type == 'taxonomy_vocabulary' ? str_replace('taxonomy_', '', $entity_type) : $entity_type + $entity_type == 'taxonomy_term' || $entity_type == 'taxonomy_vocabulary' ? str_replace('taxonomy_', '', $entity_type) : $entity_type ); if (isset($instance['settings']['enable_tokens']) && $instance['settings']['enable_tokens']) { - global $user; - // Load the entity if necessary for entities in views. - if (isset($entity->{$property_id})) { - $entity_loaded = entity_load($entity_type, array($entity->{$property_id})); - $entity_loaded = array_pop($entity_loaded); + $text_tokens = token_scan($item['url']); + if (!empty($text_tokens)) { + // Load the entity if necessary for entities in views. + if (isset($entity->{$property_id})) { + $entity_loaded = entity_load($entity_type, array($entity->{$property_id})); + $entity_loaded = array_pop($entity_loaded); + } + else { + $entity_loaded = $entity; + } + $item['url'] = token_replace($item['url'], array($entity_token_type => $entity_loaded)); } - else { - $entity_loaded = $entity; - } - $item['url'] = token_replace($item['url'], array($entity_token_type => $entity_loaded)); } - $type = link_validate_url($item['url']); + $type = link_url_type($item['url']); // If the type of the URL cannot be determined and URL validation is disabled, // then assume LINK_EXTERNAL for later processing. if ($type == FALSE && $instance['settings']['validate_url'] === 0) { @@ -496,12 +565,13 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { $url_parts = _link_parse_url($url); if (!empty($url_parts['url'])) { - $item['url'] = $url_parts['url']; - $item += array( - 'query' => isset($url_parts['query']) ? $url_parts['query'] : NULL, - 'fragment' => isset($url_parts['fragment']) ? $url_parts['fragment'] : NULL, - 'absolute' => !empty($instance['settings']['absolute_url']), - 'html' => TRUE, + $item['url'] = url($url_parts['url'], + array( + 'query' => isset($url_parts['query']) ? $url_parts['query'] : NULL, + 'fragment' => isset($url_parts['fragment']) ? $url_parts['fragment'] : NULL, + 'absolute' => !empty($instance['settings']['absolute_url']), + 'html' => TRUE, + ) ); } @@ -532,28 +602,51 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { } } // Use the title defined by the user at the widget level. - elseif (isset($item['title'])) { + elseif (drupal_strlen(trim($item['title']))) { $title = $item['title']; } + // Use the static title if a user-defined title is optional and a static title + // has been defined. + elseif ($instance['settings']['title'] == 'optional' && drupal_strlen(trim($instance['settings']['title_value']))) { + $title = $instance['settings']['title_value']; + } else { $title = ''; } // Replace title tokens. + if ($title && $instance['settings']['enable_tokens']) { + $text_tokens = token_scan($title); + if (!empty($text_tokens)) { + // Load the entity if necessary for entities in views. + if (isset($entity->{$property_id})) { + $entity_loaded = entity_load($entity_type, array($entity->{$property_id})); + $entity_loaded = array_pop($entity_loaded); + } + else { + $entity_loaded = $entity; + } + $title = token_replace($title, array($entity_token_type => $entity_loaded)); + } + } if ($title && ($instance['settings']['title'] == 'value' || $instance['settings']['enable_tokens'])) { - // Load the entity if necessary for entities in views. - if (isset($entity->{$property_id})) { - $entity_loaded = entity_load($entity_type, array($entity->{$property_id})); - $entity_loaded = array_pop($entity_loaded); - } - else { - $entity_loaded = $entity; - } - $title = token_replace($title, array($entity_token_type => $entity_loaded)); - $title = filter_xss($title, array('b', 'br', 'code', 'em', 'i', 'img', 'span', 'strong', 'sub', 'sup', 'tt', 'u')); + $title = filter_xss($title, array( + 'b', + 'br', + 'code', + 'em', + 'i', + 'img', + 'span', + 'strong', + 'sub', + 'sup', + 'tt', + 'u', + )); $item['html'] = TRUE; } - $item['title'] = empty($title) ? $item['display_url'] : $title; + $item['title'] = empty($title) && $title !== '0' ? $item['display_url'] : $title; if (!isset($item['attributes'])) { $item['attributes'] = array(); @@ -599,22 +692,38 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { // Handle "title" link attribute. if (!empty($item['attributes']['title']) && module_exists('token')) { - // Load the entity (necessary for entities in views). - if (isset($entity->{$property_id})) { - $entity_loaded = entity_load($entity_type, array($entity->{$property_id})); - $entity_loaded = array_pop($entity_loaded); + $text_tokens = token_scan($item['attributes']['title']); + if (!empty($text_tokens)) { + // Load the entity (necessary for entities in views). + if (isset($entity->{$property_id})) { + $entity_loaded = entity_load($entity_type, array($entity->{$property_id})); + $entity_loaded = array_pop($entity_loaded); + } + else { + $entity_loaded = $entity; + } + $item['attributes']['title'] = token_replace($item['attributes']['title'], array($entity_token_type => $entity_loaded)); } - else { - $entity_loaded = $entity; - } - $item['attributes']['title'] = token_replace($item['attributes']['title'], array($entity_token_type => $entity_loaded)); - $item['attributes']['title'] = filter_xss($item['attributes']['title'], array('b', 'br', 'code', 'em', 'i', 'img', 'span', 'strong', 'sub', 'sup', 'tt', 'u')); + $item['attributes']['title'] = filter_xss($item['attributes']['title'], array( + 'b', + 'br', + 'code', + 'em', + 'i', + 'img', + 'span', + 'strong', + 'sub', + 'sup', + 'tt', + 'u', + )); } // Handle attribute classes. if (!empty($item['attributes']['class'])) { $classes = explode(' ', $item['attributes']['class']); foreach ($classes as &$class) { - $class = drupal_html_class($class); + $class = drupal_clean_css_identifier($class); } $item['attributes']['class'] = implode(' ', $classes); } @@ -660,7 +769,8 @@ function _link_parse_url($url) { * Replaces the PHP parse_str() function. * * Because parse_str replaces the following characters in query parameters name - * in order to maintain compability with deprecated register_globals directive: + * in order to maintain compatibility with deprecated register_globals + * directive: * * - chr(32) ( ) (space) * - chr(46) (.) (dot) @@ -700,11 +810,21 @@ function link_theme() { 'link_formatter_link_plain' => array( 'variables' => array('element' => NULL, 'field' => NULL), ), + 'link_formatter_link_host' => array( + 'variables' => array('element' => NULL), + ), 'link_formatter_link_absolute' => array( 'variables' => array('element' => NULL, 'field' => NULL), ), 'link_formatter_link_domain' => array( - 'variables' => array('element' => NULL, 'display' => NULL, 'field' => NULL), + 'variables' => array( + 'element' => NULL, + 'display' => NULL, + 'field' => NULL, + ), + ), + 'link_formatter_link_no_protocol' => array( + 'variables' => array('element' => NULL, 'field' => NULL), ), 'link_formatter_link_title_plain' => array( 'variables' => array('element' => NULL, 'field' => NULL), @@ -791,7 +911,8 @@ function _link_default_attributes() { * Build the form element. When creating a form using FAPI #process, * note that $element['#value'] is already set. * - * The $fields array is in $complete_form['#field_info'][$element['#field_name']]. + * The $fields array is in + * $complete_form['#field_info'][$element['#field_name']]. */ function link_field_process($element, $form_state, $complete_form) { $instance = field_widget_instance($element, $form_state); @@ -803,7 +924,7 @@ function link_field_process($element, $form_state, $complete_form) { '#required' => ($element['#delta'] == 0 && $settings['url'] !== 'optional') ? $element['#required'] : FALSE, '#default_value' => isset($element['#value']['url']) ? $element['#value']['url'] : NULL, ); - if ($settings['title'] !== 'none' && $settings['title'] !== 'value') { + if (in_array($settings['title'], array('optional', 'required'))) { // Figure out the label of the title field. if (!empty($settings['title_label_use_field_label'])) { // Use the element label as the title field label. @@ -815,15 +936,31 @@ function link_field_process($element, $form_state, $complete_form) { $title_label = t('Title'); } + // Default value. + $title_maxlength = 128; + if (!empty($settings['title_maxlength'])) { + $title_maxlength = $settings['title_maxlength']; + } + $element['title'] = array( '#type' => 'textfield', - '#maxlength' => $settings['title_maxlength'], + '#maxlength' => $title_maxlength, '#title' => $title_label, - '#description' => t('The link title is limited to @maxlength characters maximum.', array('@maxlength' => $settings['title_maxlength'])), + '#description' => t('The link title is limited to @maxlength characters maximum.', array('@maxlength' => $title_maxlength)), '#required' => ($settings['title'] == 'required' && (($element['#delta'] == 0 && $element['#required']) || !empty($element['#value']['url']))) ? TRUE : FALSE, '#default_value' => isset($element['#value']['title']) ? $element['#value']['title'] : NULL, ); } + elseif ($settings['title'] == 'select') { + $options = drupal_map_assoc(array_filter(explode("\n", str_replace("\r", "\n", trim($settings['title_allowed_values']))))); + $element['title'] = array( + '#type' => 'select', + '#title' => t('Title'), + '#description' => t('Select the a title for this link.'), + '#default_value' => isset($element['#value']['title']) ? $element['#value']['title'] : NULL, + '#options' => $options, + ); + } // Initialize field attributes as an array if it is not an array yet. if (!is_array($settings['attributes'])) { @@ -859,8 +996,9 @@ function link_field_process($element, $form_state, $complete_form) { ); } - // If the title field is avaliable or there are field accepts multiple values - // then allow the individual field items display the required asterisk if needed. + // If the title field is available or there are field accepts multiple values + // then allow the individual field items display the required asterisk if + // needed. if (isset($element['title']) || isset($element['_weight'])) { // To prevent an extra required indicator, disable the required flag on the // base element since all the sub-fields are already required if desired. @@ -885,6 +1023,11 @@ function link_field_formatter_info() { 'field types' => array('link_field'), 'multiple values' => FIELD_BEHAVIOR_DEFAULT, ), + 'link_host' => array( + 'label' => t('Host, as plain text'), + 'field types' => array('link_field'), + 'multiple values' => FIELD_BEHAVIOR_DEFAULT, + ), 'link_url' => array( 'label' => t('URL, as link'), 'field types' => array('link_field'), @@ -908,6 +1051,11 @@ function link_field_formatter_info() { 'strip_www' => FALSE, ), ), + 'link_no_protocol' => array( + 'label' => t('URL with the protocol removed'), + 'field types' => array('link_field'), + 'multiple values' => FIELD_BEHAVIOR_DEFAULT, + ), 'link_short' => array( 'label' => t('Short, as link with title "Link"'), 'field types' => array('link_field'), @@ -947,8 +1095,9 @@ function link_field_formatter_settings_form($field, $instance, $view_mode, $form * Implements hook_field_formatter_settings_summary(). */ function link_field_formatter_settings_summary($field, $instance, $view_mode) { + $display = $instance['display'][$view_mode]; - $settings = $display['settings']; + if ($display['type'] == 'link_domain') { if ($display['settings']['strip_www']) { return t('Strip www. from domain'); @@ -993,7 +1142,7 @@ function theme_link_formatter_link_default($vars) { } // If only a title, display the title. elseif (!empty($vars['element']['title'])) { - return $link_options['html'] ? $vars['element']['title'] : check_plain($vars['element']['title']); + return !empty($link_options['html']) ? $vars['element']['title'] : check_plain($vars['element']['title']); } elseif (!empty($vars['element']['url'])) { return l($vars['element']['title'], $vars['element']['url'], $link_options); @@ -1015,6 +1164,14 @@ function theme_link_formatter_link_plain($vars) { return empty($vars['element']['url']) ? check_plain($vars['element']['title']) : url($vars['element']['url'], $link_options); } +/** + * Theme function for 'host' text field formatter. + */ +function theme_link_formatter_link_host($vars) { + $host = @parse_url($vars['element']['url']); + return isset($host['host']) ? check_plain($host['host']) : ''; +} + /** * Formats a link as an absolute URL. */ @@ -1037,11 +1194,27 @@ function theme_link_formatter_link_domain($vars) { return $vars['element']['url'] ? l($domain, $vars['element']['url'], $link_options) : ''; } +/** + * Formats a link without the http:// or https://. + */ +function theme_link_formatter_link_no_protocol($vars) { + $link_options = $vars['element']; + unset($link_options['title']); + unset($link_options['url']); + // We drop any scheme of the url. + $scheme = parse_url($vars['element']['url']); + $search = '/' . preg_quote($scheme['scheme'] . '://', '/') . '/'; + $replace = ''; + $display_url = preg_replace($search, $replace, $vars['element']['url'], 1); + + return $vars['element']['url'] ? l($display_url, $vars['element']['url'], $link_options) : ''; +} + /** * Formats a link's title as plain text. */ function theme_link_formatter_link_title_plain($vars) { - return empty($vars['element']['title']) ? '' : check_plain($vars['element']['title']); + return empty($vars['element']['title']) ? '' : check_plain(decode_entities($vars['element']['title'])); } /** @@ -1101,7 +1274,8 @@ function theme_link_formatter_link_separate($vars) { /** * Implements hook_token_list(). * - * @TODO: hook_token_list no longer exists - this should change to hook_token_info(). + * @TODO: hook_token_list no longer exists - this should change to + * hook_token_info(). */ function link_token_list($type = 'all') { if ($type === 'field' || $type === 'all') { @@ -1116,7 +1290,8 @@ function link_token_list($type = 'all') { /** * Implements hook_token_values(). * - * @TODO: hook_token_values no longer exists - this should change to hook_tokens(). + * @TODO: hook_token_values no longer exists - this should change to + * hook_tokens(). */ function link_token_values($type, $object = NULL) { if ($type === 'field') { @@ -1142,26 +1317,27 @@ function link_views_api() { /** * Forms a valid URL if possible from an entered address. - * + * * Trims whitespace and automatically adds an http:// to addresses without a - * protocol specified + * protocol specified. * * @param string $url * The url entered by the user. * @param string $protocol - * The protocol to be prepended to the url if one is not specified + * The protocol to be prepended to the url if one is not specified. */ function link_cleanup_url($url, $protocol = 'http') { $url = trim($url); - $type = link_validate_url($url); + $type = link_url_type($url); if ($type === LINK_EXTERNAL) { // Check if there is no protocol specified. $protocol_match = preg_match("/^([a-z0-9][a-z0-9\.\-_]*:\/\/)/i", $url); if (empty($protocol_match)) { - // But should there be? Add an automatic http:// if it starts with a domain name. - $LINK_DOMAINS = _link_domains(); - $domain_match = preg_match('/^(([a-z0-9]([a-z0-9\-_]*\.)+)(' . $LINK_DOMAINS . '|[a-z]{2}))/i', $url); + // But should there be? Add an automatic http:// if it starts with a + // domain name. + $link_domains = _link_domains(); + $domain_match = preg_match('/^(([a-z0-9]([a-z0-9\-_]*\.)+)(' . $link_domains . '|[a-z]{2}))/i', $url); if (!empty($domain_match)) { $url = $protocol . "://" . $url; } @@ -1173,109 +1349,207 @@ function link_cleanup_url($url, $protocol = 'http') { /** * Validates a URL. - * + * + * @param string $text + * Url to be validated. + * @param string $langcode + * An optional language code to look up the path in. + * + * @return bool + * True if a valid link, FALSE otherwise. + */ +function link_validate_url($text, $langcode = NULL) { + + $text = _link_clean_relative($text); + $text = link_cleanup_url($text); + $type = link_url_type($text); + + if ($type && ($type == LINK_INTERNAL || $type == LINK_EXTERNAL)) { + $flag = valid_url($text, TRUE); + if (!$flag) { + $normal_path = drupal_get_normal_path($text, $langcode); + $parsed_link = parse_url($normal_path, PHP_URL_PATH); + if ($normal_path != $parsed_link) { + $normal_path = $parsed_link; + } + $flag = drupal_valid_path($normal_path); + } + if (!$flag) { + $flag = file_exists($normal_path); + } + if (!$flag) { + $uri = file_build_uri($normal_path); + $flag = file_exists($uri); + } + } + else { + $flag = (bool) $type; + } + + return $flag; +} + +/** + * Cleaner of relatives urls. + * + * @param string $url + * The url to clean up the relative protocol. + */ +function _link_clean_relative($url) { + $check = substr($url, 0, 2); + if (isset($_SERVER['HTTPS']) && + ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1) || + isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && + $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') { + $protocol = 'https://'; + } + else { + $protocol = 'http://'; + } + + if ($check == '//') { + $url = str_replace('//', $protocol, $url); + } + + return $url; +} + +/** + * Type check a URL. + * * Accepts all URLs following RFC 1738 standard for URL formation and all e-mail * addresses following the RFC 2368 standard for mailto address formation. * * @param string $text - * Url to be validated. - * + * Url to be checked. + * * @return mixed * Returns boolean FALSE if the URL is not valid. On success, returns one of * the LINK_(linktype) constants. */ -function link_validate_url($text) { +function link_url_type($text) { // @TODO Complete letters. - $LINK_ICHARS_DOMAIN = (string) html_entity_decode(implode("", array( - "æ", // æ - "Æ", // Æ + // @codingStandardsIgnoreStart + $link_ichars_domain = (string) html_entity_decode(implode("", array( + "¿", // ¿ "À", // À - "à", // à "Á", // Á - "á", // á "Â", //  - "â", // â - "å", // å - "Å", // Å - "ä", // ä + "Ã", // à "Ä", // Ä + "Å", // Å + "Æ", // Æ "Ç", // Ç - "ç", // ç - "Ð", // Ð - "ð", // ð "È", // È - "è", // è "É", // É - "é", // é "Ê", // Ê - "ê", // ê "Ë", // Ë - "ë", // ë + "Ì", // Ì + "Í", // Í "Î", // Î - "î", // î "Ï", // Ï - "ï", // ï - "ø", // ø - "Ø", // Ø - "ö", // ö - "Ö", // Ö + "Ð", // Ð + "Ñ", // Ñ + "Ò", // Ò + "Ó", // Ó "Ô", // Ô - "ô", // ô "Õ", // Õ + "Ö", // Ö + // × + "Ø", // Ø + "Ù", // Ù + "Ú", // Ú + "Û", // Û + "Ü", // Ü + "Ý", // Ý + "Þ", // Þ + // ß (see LINK_ICHARS) + "à", // à + "á", // á + "â", // â + "ã", // ã + "ä", // ä + "å", // å + "æ", // æ + "ç", // ç + "è", // è + "é", // é + "ê", // ê + "ë", // ë + "ì", // ì + "í", // í + "î", // î + "ï", // ï + "ð", // ð + "ñ", // ñ + "ò", // ò + "ó", // ó + "ô", // ô "õ", // õ + "ö", // ö + // ÷ + "ø", // ø + "ù", // ù + "ú", // ú + "û", // û + "ü", // ü + "ý", // ý + "þ", // þ + "ÿ", // ÿ "Œ", // Œ "œ", // œ - "ü", // ü - "Ü", // Ü - "Ù", // Ù - "ù", // ù - "Û", // Û - "û", // û "Ÿ", // Ÿ - "ÿ", // ÿ - "Ñ", // Ñ - "ñ", // ñ - "þ", // þ - "Þ", // Þ - "ý", // ý - "Ý", // Ý - "¿", // ¿ )), ENT_QUOTES, 'UTF-8'); + // @codingStandardsIgnoreEnd - $LINK_ICHARS = $LINK_ICHARS_DOMAIN . (string) html_entity_decode(implode("", array( - "ß", // ß - )), ENT_QUOTES, 'UTF-8'); - $allowed_protocols = variable_get('filter_allowed_protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal')); - $LINK_DOMAINS = _link_domains(); + $link_ichars = $link_ichars_domain . (string) html_entity_decode(implode("", array( + // ß. + "ß", + )), ENT_QUOTES, 'UTF-8'); + $allowed_protocols = variable_get('filter_allowed_protocols', array( + 'http', + 'https', + 'ftp', + 'news', + 'nntp', + 'telnet', + 'mailto', + 'irc', + 'ssh', + 'sftp', + 'webcal', + )); + $link_domains = _link_domains(); - // Starting a parenthesis group with (?: means that it is grouped, but is not captured. + // Starting a parenthesis group with (?: means that it is grouped, but is not + // captured. $protocol = '((?:' . implode("|", $allowed_protocols) . '):\/\/)'; - $authentication = "(?:(?:(?:[\w\.\-\+!$&'\(\)*\+,;=" . $LINK_ICHARS . "]|%[0-9a-f]{2})+(?::(?:[\w" . $LINK_ICHARS . "\.\-\+%!$&'\(\)*\+,;=]|%[0-9a-f]{2})*)?)?@)"; - $domain = '(?:(?:[a-z0-9' . $LINK_ICHARS_DOMAIN . ']([a-z0-9' . $LINK_ICHARS_DOMAIN . '\-_\[\]])*)(\.(([a-z0-9' . $LINK_ICHARS_DOMAIN . '\-_\[\]])+\.)*(' . $LINK_DOMAINS . '|[a-z]{2}))?)'; + $authentication = "(?:(?:(?:[\w\.\-\+!$&'\(\)*\+,;=" . $link_ichars . "]|%[0-9a-f]{2})+(?::(?:[\w" . $link_ichars . "\.\-\+%!$&'\(\)*\+,;=]|%[0-9a-f]{2})*)?)?@)"; + $domain = '(?:(?:[a-z0-9' . $link_ichars_domain . ']([a-z0-9' . $link_ichars_domain . '\-_\[\]])*)(\.(([a-z0-9' . $link_ichars_domain . '\-_\[\]])+\.)*(' . $link_domains . '|[a-z]{2}))?)'; $ipv4 = '(?:[0-9]{1,3}(\.[0-9]{1,3}){3})'; $ipv6 = '(?:[0-9a-fA-F]{1,4}(\:[0-9a-fA-F]{1,4}){7})'; $port = '(?::([0-9]{1,5}))'; - // Pattern specific to external links. $external_pattern = '/^' . $protocol . '?' . $authentication . '?(' . $domain . '|' . $ipv4 . '|' . $ipv6 . ' |localhost)' . $port . '?'; // Pattern specific to internal links. - $internal_pattern = "/^(?:[a-z0-9" . $LINK_ICHARS . "_\-+\[\] ]+)"; - $internal_pattern_file = "/^(?:[a-z0-9" . $LINK_ICHARS . "_\-+\[\]\. \/\(\)][a-z0-9" . $LINK_ICHARS . "_\-+\[\]\. \(\)][a-z0-9" . $LINK_ICHARS . "_\-+\[\]\. \/\(\)]+)$/i"; + $internal_pattern = "/^(?:[a-z0-9" . $link_ichars . "_\-+\[\] ]+)"; + $internal_pattern_file = "/^(?:[a-z0-9" . $link_ichars . "_\-+\[\]\. \/\(\)][a-z0-9" . $link_ichars . "_\-+\[\]\. \(\)][a-z0-9" . $link_ichars . "_\-+\[\]\. \/\(\)]+)$/i"; - $directories = "(?:\/[a-z0-9" . $LINK_ICHARS . "_\-\.~+%=&,$'#!():;*@\[\]]*)*"; + $directories = "(?:\/[a-z0-9" . $link_ichars . "_\-\.~+%=&,$'#!():;*@\[\]]*)*"; // Yes, four backslashes == a single backslash. - $query = "(?:\/?\?([?a-z0-9" . $LINK_ICHARS . "+_|\-\.~\/\\\\%=&,$'!():;*@\[\]{} ]*))"; - $anchor = "(?:#[a-z0-9" . $LINK_ICHARS . "_\-\.~+%=&,$'():;*@\[\]\/\?]*)"; + $query = "(?:\/?\?([?a-z0-9" . $link_ichars . "+_|\-\.~\/\\\\%=&,$'!():;*@\[\]{} ]*))"; + $anchor = "(?:#[a-z0-9" . $link_ichars . "_\-\.~+%=&,$'():;*@\[\]\/\?]*)"; // The rest of the path for a standard URL. + // @codingStandardsIgnoreLine $end = $directories . '?' . $query . '?' . $anchor . '?' . '$/i'; $message_id = '[^@].*@' . $domain; $newsgroup_name = '(?:[0-9a-z+-]*\.)*[0-9a-z+-]*'; $news_pattern = '/^news:(' . $newsgroup_name . '|' . $message_id . ')$/i'; - $user = '[a-zA-Z0-9' . $LINK_ICHARS . '_\-\.\+\^!#\$%&*+\/\=\?\`\|\{\}~\'\[\]]+'; + $user = '[a-zA-Z0-9' . $link_ichars . '_\-\.\+\^!#\$%&*+\/\=\?\`\|\{\}~\'\[\]]+'; $email_pattern = '/^mailto:' . $user . '@' . '(?:' . $domain . '|' . $ipv4 . '|' . $ipv6 . '|localhost)' . $query . '?$/'; if (strpos($text, '\s*' . $link_value . '\s*
@is',
- $message,
- $group);
+ $message,
+ $group);
}
/**
- * A simple test that just creates a new node type, adds a link field to it, creates a new node of that type, and makes sure
- * that the node is being displayed.
+ * Test Basic.
+ *
+ * A simple test that just creates a new node type, adds a link field to it,
+ * creates a new node of that type, and makes sure that the node is being
+ * displayed.
*/
- function testBasic() {
+ public function testBasic() {
$content_type_friendly = $this->randomName(20);
$content_type_machine = strtolower($this->randomName(10));
$title = $this->randomName(20);
@@ -76,7 +98,7 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
// Now add a singleton field.
$single_field_name_friendly = $this->randomName(20);
$single_field_name_machine = strtolower($this->randomName(10));
- $single_field_name = 'field_' . $single_field_name_machine;
+
$edit = array(
'fields[_add_new_field][label]' => $single_field_name_friendly,
'fields[_add_new_field][field_name]' => $single_field_name_machine,
@@ -101,7 +123,7 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
$this->assertTrue($type_exists, 'The new content type has been created in the database.');
$permission = 'create ' . $content_type_machine . ' content';
- $permission_edit = 'edit ' . $content_type_machine . ' content';
+
// Reset the permissions cache.
$this->checkPermissions(array($permission), TRUE);
@@ -122,7 +144,10 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
);
$this->drupalPost(NULL, $edit, t('Save'));
- $this->assertText(t('@content_type_friendly @title has been created', array('@content_type_friendly' => $content_type_friendly, '@title' => $title)));
+ $this->assertText(t('@content_type_friendly @title has been created', array(
+ '@content_type_friendly' => $content_type_friendly,
+ '@title' => $title,
+ )));
$this->drupalGet('node/add/' . $content_type_machine);
@@ -135,12 +160,18 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
// Now we can fill in the second item in the multivalue field and save.
$this->drupalPost(NULL, $edit, t('Save'));
- $this->assertText(t('@content_type_friendly @title has been created', array('@content_type_friendly' => $content_type_friendly, '@title' => $title)));
+ $this->assertText(t('@content_type_friendly @title has been created', array(
+ '@content_type_friendly' => $content_type_friendly,
+ '@title' => $title,
+ )));
$this->assertText('Display');
$this->assertLinkByHref('http://www.example.com');
}
+ /**
+ * Create Simple Link Field.
+ */
protected function createSimpleLinkField($single_field_name_machine, $single_field_name_friendly, $content_type_machine) {
$this->drupalGet('admin/structure/types/manage/' . $content_type_machine . '/fields');
$edit = array(
@@ -166,9 +197,11 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
$this->assertTrue($type_exists, 'The new content type has been created in the database.');
}
+ /**
+ * Create Node Type User.
+ */
protected function createNodeTypeUser($content_type_machine) {
$permission = 'create ' . $content_type_machine . ' content';
- $permission_edit = 'edit ' . $content_type_machine . ' content';
// Reset the permissions cache.
$this->checkPermissions(array($permission), TRUE);
@@ -179,6 +212,9 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
$this->drupalLogin($this->web_user);
}
+ /**
+ * Create Node For Testing.
+ */
protected function createNodeForTesting($content_type_machine, $content_type_friendly, $single_field_name_machine, $title, $url, $node_title = '') {
$this->drupalGet('node/add/' . $content_type_machine);
@@ -196,14 +232,17 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
}
$this->drupalPost(NULL, $edit, t('Save'));
- $this->assertText(t('@content_type_friendly @title has been created', array('@content_type_friendly' => $content_type_friendly, '@title' => $node_title)));
+ $this->assertText(t('@content_type_friendly @title has been created', array(
+ '@content_type_friendly' => $content_type_friendly,
+ '@title' => $node_title,
+ )));
}
/**
* Test the link_plain formatter and it's output.
*/
- function testFormatterPlain() {
+ public function testFormatterPlain() {
$content_type_friendly = $this->randomName(20);
$content_type_machine = strtolower($this->randomName(10));
@@ -215,7 +254,7 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
// Now add a singleton field.
$single_field_name_friendly = $this->randomName(20);
$single_field_name_machine = strtolower($this->randomName(10));
- //$single_field_name = 'field_'. $single_field_name_machine;
+ // $single_field_name = 'field_'. $single_field_name_machine;.
$this->createSimpleLinkField($single_field_name_machine, $single_field_name_friendly, $content_type_machine);
// Okay, now we want to make sure this display is changed:
@@ -227,7 +266,7 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
$this->drupalPost(NULL, $edit, t('Save'));
$this->createNodeTypeUser($content_type_machine);
-
+
$link_tests = array(
'plain' => array(
'text' => 'Display',
@@ -243,18 +282,21 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
),
);
- foreach ($link_tests as $key => $link_test) {
+ foreach ($link_tests as $link_test) {
$link_text = $link_test['text'];
$link_url = $link_test['url'];
$this->createNodeForTesting($content_type_machine, $content_type_friendly, $single_field_name_machine, $link_text, $link_url);
-
+
$this->assertText($link_url);
$this->assertNoText($link_text);
$this->assertNoLinkByHref($link_url);
}
}
- function testFormatterURL() {
+ /**
+ * Formatter Host.
+ */
+ public function testFormatterHost() {
$content_type_friendly = $this->randomName(20);
$content_type_machine = strtolower($this->randomName(10));
@@ -266,7 +308,47 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
// Now add a singleton field.
$single_field_name_friendly = $this->randomName(20);
$single_field_name_machine = strtolower($this->randomName(10));
- //$single_field_name = 'field_'. $single_field_name_machine;
+ // $single_field_name = 'field_'. $single_field_name_machine;.
+ $this->createSimpleLinkField($single_field_name_machine, $single_field_name_friendly, $content_type_machine);
+
+ // Okay, now we want to make sure this display is changed:
+ $this->drupalGet('admin/structure/types/manage/' . $content_type_machine . '/display');
+ $edit = array(
+ 'fields[field_' . $single_field_name_machine . '][label]' => 'above',
+ 'fields[field_' . $single_field_name_machine . '][type]' => 'link_host',
+ );
+ $this->drupalPost(NULL, $edit, t('Save'));
+
+ $this->createNodeTypeUser($content_type_machine);
+
+ $link_text = 'Display';
+ $link_url = 'http://www.example.com/';
+ $this->createNodeForTesting($content_type_machine, $content_type_friendly, $single_field_name_machine, $link_text, $link_url);
+
+ $this->assertText('www.example.com');
+ $this->assertNoText($link_text);
+ $this->assertNoLinkByHref($link_url);
+ }
+
+ /**
+ * Formatter URL.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function testFormatterURL() {
+ // @codingStandardsIgnoreEnd
+ $content_type_friendly = $this->randomName(20);
+ $content_type_machine = strtolower($this->randomName(10));
+
+ $this->drupalCreateContentType(array(
+ 'type' => $content_type_machine,
+ 'name' => $content_type_friendly,
+ ));
+
+ // Now add a singleton field.
+ $single_field_name_friendly = $this->randomName(20);
+ $single_field_name_machine = strtolower($this->randomName(10));
+ // $single_field_name = 'field_'. $single_field_name_machine;.
$this->createSimpleLinkField($single_field_name_machine, $single_field_name_friendly, $content_type_machine);
// Okay, now we want to make sure this display is changed:
@@ -278,7 +360,7 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
$this->drupalPost(NULL, $edit, t('Save'));
$this->createNodeTypeUser($content_type_machine);
-
+
$link_tests = array(
'plain' => array(
'text' => 'Display',
@@ -294,17 +376,20 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
),
);
- foreach ($link_tests as $key => $link_test) {
+ foreach ($link_tests as $link_test) {
$link_text = $link_test['text'];
$link_url = $link_test['url'];
$this->createNodeForTesting($content_type_machine, $content_type_friendly, $single_field_name_machine, $link_text, $link_url);
-
+
$this->assertNoText($link_text);
$this->assertLinkByHref($link_url);
}
}
- function testFormatterShort() {
+ /**
+ * Formatter Short.
+ */
+ public function testFormatterShort() {
$content_type_friendly = $this->randomName(20);
$content_type_machine = strtolower($this->randomName(10));
@@ -316,7 +401,7 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
// Now add a singleton field.
$single_field_name_friendly = $this->randomName(20);
$single_field_name_machine = strtolower($this->randomName(10));
- //$single_field_name = 'field_'. $single_field_name_machine;
+ // $single_field_name = 'field_'. $single_field_name_machine;.
$this->createSimpleLinkField($single_field_name_machine, $single_field_name_friendly, $content_type_machine);
// Okay, now we want to make sure this display is changed:
@@ -344,18 +429,21 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
),
);
- foreach ($link_tests as $key => $link_test) {
+ foreach ($link_tests as $link_test) {
$link_text = $link_test['text'];
$link_url = $link_test['url'];
$this->createNodeForTesting($content_type_machine, $content_type_friendly, $single_field_name_machine, $link_text, $link_url);
-
+
$this->assertText('Link');
$this->assertNoText($link_text);
$this->assertLinkByHref($link_url);
}
}
- function testFormatterLabel() {
+ /**
+ * Formatter Label.
+ */
+ public function testFormatterLabel() {
$content_type_friendly = $this->randomName(20);
$content_type_machine = strtolower($this->randomName(10));
@@ -367,7 +455,7 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
// Now add a singleton field.
$single_field_name_friendly = $this->randomName(20);
$single_field_name_machine = strtolower($this->randomName(10));
- //$single_field_name = 'field_'. $single_field_name_machine;
+ // $single_field_name = 'field_'. $single_field_name_machine;.
$this->createSimpleLinkField($single_field_name_machine, $single_field_name_friendly, $content_type_machine);
// Okay, now we want to make sure this display is changed:
@@ -395,18 +483,21 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
),
);
- foreach ($link_tests as $key => $link_test) {
+ foreach ($link_tests as $link_test) {
$link_text = $link_test['text'];
- $link_url = $link_test['url'];
+ $link_url = $link_test['url'];
$this->createNodeForTesting($content_type_machine, $content_type_friendly, $single_field_name_machine, $link_text, $link_url);
-
+
$this->assertNoText($link_text);
$this->assertText($single_field_name_friendly);
$this->assertLinkByHref($link_url);
}
}
- function testFormatterSeparate() {
+ /**
+ * Formatter Separate.
+ */
+ public function testFormatterSeparate() {
$content_type_friendly = $this->randomName(20);
$content_type_machine = strtolower($this->randomName(10));
@@ -418,7 +509,7 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
// Now add a singleton field.
$single_field_name_friendly = $this->randomName(20);
$single_field_name_machine = strtolower($this->randomName(10));
- //$single_field_name = 'field_'. $single_field_name_machine;
+ // $single_field_name = 'field_'. $single_field_name_machine;.
$this->createSimpleLinkField($single_field_name_machine, $single_field_name_friendly, $content_type_machine);
// Okay, now we want to make sure this display is changed:
@@ -447,32 +538,35 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
),
);
- foreach ($link_tests as $key => $link_test) {
+ foreach ($link_tests as $link_test) {
$link_text = $link_test['text'];
$link_url = $link_test['url'];
$this->createNodeForTesting($content_type_machine, $content_type_friendly, $single_field_name_machine, $link_text, $link_url);
-
+
$this->assertText($link_text);
$this->assertLink($plain_url);
$this->assertLinkByHref($link_url);
}
}
-
- function testFormatterPlainTitle() {
+
+ /**
+ * Formatter Plain Title.
+ */
+ public function testFormatterPlainTitle() {
$content_type_friendly = $this->randomName(20);
$content_type_machine = strtolower($this->randomName(10));
-
+
$this->drupalCreateContentType(array(
'type' => $content_type_machine,
'name' => $content_type_friendly,
));
-
+
// Now add a singleton field.
$single_field_name_friendly = $this->randomName(20);
$single_field_name_machine = strtolower($this->randomName(10));
- //$single_field_name = 'field_'. $single_field_name_machine;
+ // $single_field_name = 'field_'. $single_field_name_machine;.
$this->createSimpleLinkField($single_field_name_machine, $single_field_name_friendly, $content_type_machine);
-
+
// Okay, now we want to make sure this display is changed:
$this->drupalGet('admin/structure/types/manage/' . $content_type_machine . '/display');
$edit = array(
@@ -480,15 +574,16 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
'fields[field_' . $single_field_name_machine . '][type]' => 'link_title_plain',
);
$this->drupalPost(NULL, $edit, t('Save'));
-
+
$this->createNodeTypeUser($content_type_machine);
-
+
$link_text = 'Display';
$link_url = 'http://www.example.com/';
$this->createNodeForTesting($content_type_machine, $content_type_friendly, $single_field_name_machine, $link_text, $link_url);
-
+
$this->assertText($link_text);
$this->assertNoText($link_url);
$this->assertNoLinkByHref($link_url);
}
+
}
diff --git a/sites/all/modules/contrib/fields/link/tests/link.crud.test b/sites/all/modules/contrib/fields/link/tests/link.crud.test
index e9b7db4..6bc3867 100644
--- a/sites/all/modules/contrib/fields/link/tests/link.crud.test
+++ b/sites/all/modules/contrib/fields/link/tests/link.crud.test
@@ -2,11 +2,20 @@
/**
* @file
- * Basic CRUD simpletests for the link module, based off of content.crud.test in CCK.
+ * File for Crud Tests.
+ *
+ * Basic CRUD simpletests for the link module, based off of content.crud.test in
+ * CCK.
*/
+/**
+ * Content Crud.
+ */
class LinkContentCrudTest extends DrupalWebTestCase {
+ /**
+ * Get Info.
+ */
public static function getInfo() {
return array(
'name' => 'Link CRUD - Basic API tests',
@@ -15,21 +24,31 @@ class LinkContentCrudTest extends DrupalWebTestCase {
);
}
- function setUp() {
+ /**
+ * Setup.
+ */
+ public function setUp() {
parent::setUp('field_ui', 'link');
}
/**
- * All we're doing here is creating a content type, creating a simple link field
- * on that content type.
+ * Create Field API.
+ *
+ * All we're doing here is creating a content type, creating a simple link
+ * field on that content type.
+ *
+ * @codingStandardsIgnoreStart
*/
- function testLinkCreateFieldAPI() {
+ public function testLinkCreateFieldAPI() {
+ // @codingStandardsIgnoreEnd
$content_type_friendly = $this->randomName(20);
$content_type_machine = strtolower($this->randomName(10));
- $title = $this->randomName(20);
// Create and login user.
- $this->web_user = $this->drupalCreateUser(array('administer content types'));
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ ));
$this->drupalLogin($this->web_user);
$this->drupalGet('admin/structure/types');
@@ -69,4 +88,5 @@ class LinkContentCrudTest extends DrupalWebTestCase {
$type_exists = db_query('SELECT 1 FROM {node_type} WHERE type = :type', array(':type' => $content_type_machine))->fetchField();
$this->assertTrue($type_exists, 'The new content type has been created in the database.');
}
+
}
diff --git a/sites/all/modules/contrib/fields/link/tests/link.crud_browser.test b/sites/all/modules/contrib/fields/link/tests/link.crud_browser.test
index c90e86d..dc21857 100644
--- a/sites/all/modules/contrib/fields/link/tests/link.crud_browser.test
+++ b/sites/all/modules/contrib/fields/link/tests/link.crud_browser.test
@@ -6,25 +6,28 @@
*/
/**
- * Testing that users can not input bad URLs or labels
+ * Testing that users can not input bad URLs or labels.
*/
class LinkUITest extends DrupalWebTestcase {
/**
- * Link supposed to be good
+ * Link supposed to be good.
*/
const LINK_INPUT_TYPE_GOOD = 0;
/**
- * Link supposed to have a bad title
+ * Link supposed to have a bad title.
*/
const LINK_INPUT_TYPE_BAD_TITLE = 1;
/**
- * Link supposed to have a bad URL
+ * Link supposed to have a bad URL.
*/
const LINK_INPUT_TYPE_BAD_URL = 2;
+ /**
+ * Get Info.
+ */
public static function getInfo() {
return array(
'name' => 'Link CRUD - browser test',
@@ -33,26 +36,30 @@ class LinkUITest extends DrupalWebTestcase {
);
}
- function setUp() {
+ /**
+ * Setup.
+ */
+ public function setUp() {
parent::setUp('field_ui', 'link');
}
/**
* Creates a link field for the "page" type and creates a page with a link.
*/
- function testLinkCreate() {
- //libxml_use_internal_errors(true);
+ public function testLinkCreate() {
+ // libxml_use_internal_errors(true);
$this->web_user = $this->drupalCreateUser(array(
'administer content types',
+ 'administer fields',
'administer nodes',
'administer filters',
'access content',
'create page content',
- 'access administration pages'
+ 'access administration pages',
));
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$edit = array(
'fields[_add_new_field][label]' => $name,
@@ -72,8 +79,8 @@ class LinkUITest extends DrupalWebTestcase {
$permission = 'create page content';
$this->checkPermissions(array($permission), TRUE);
- // create page form
- //$this->drupalGet('node/add');
+ // Create page form
+ // $this->drupalGet('node/add');.
$this->drupalGet('node/add/page');
$field_name = 'field_' . $name;
$this->assertField('edit-field-' . $name . '-und-0-title', 'Title found');
@@ -84,37 +91,37 @@ class LinkUITest extends DrupalWebTestcase {
'href' => 'http://example.com/' . $this->randomName(),
'label' => $this->randomName(),
'msg' => 'Link found',
- 'type' => self::LINK_INPUT_TYPE_GOOD
+ 'type' => self::LINK_INPUT_TYPE_GOOD,
),
array(
'href' => 'http://example.com/' . $this->randomName(),
'label' => $this->randomName() . '',
'msg' => 'js label',
- 'type' => self::LINK_INPUT_TYPE_BAD_TITLE
+ 'type' => self::LINK_INPUT_TYPE_BAD_TITLE,
),
array(
'href' => 'http://example.com/' . $this->randomName(),
'label' => $this->randomName() . '',
'msg' => 'js label',
- 'type' => self::LINK_INPUT_TYPE_BAD_TITLE
+ 'type' => self::LINK_INPUT_TYPE_BAD_TITLE,
),
array(
'href' => 'http://example.com/' . $this->randomName(),
'label' => $this->randomName() . '" onmouseover="alert(\'hi\')',
'msg' => 'js label',
- 'type' => self::LINK_INPUT_TYPE_BAD_TITLE
+ 'type' => self::LINK_INPUT_TYPE_BAD_TITLE,
),
array(
'href' => 'http://example.com/' . $this->randomName(),
'label' => $this->randomName() . '\' onmouseover="alert(\'hi\')',
'msg' => 'js label',
- 'type' => self::LINK_INPUT_TYPE_BAD_TITLE
+ 'type' => self::LINK_INPUT_TYPE_BAD_TITLE,
),
array(
'href' => 'javascript:alert("http://example.com/' . $this->randomName() . '")',
'label' => $this->randomName(),
'msg' => 'js url',
- 'type' => self::LINK_INPUT_TYPE_BAD_URL
+ 'type' => self::LINK_INPUT_TYPE_BAD_URL,
),
array(
'href' => 'http://ecs-es.kelkoo.es/ctl/go/sitesearchGo?.ts=1338833010331&.sig=qP9GXeEFH6syBzwmzYkxmsvp1EI-',
@@ -143,23 +150,26 @@ class LinkUITest extends DrupalWebTestcase {
);
$this->drupalPost(NULL, $edit, t('Save'));
if ($input['type'] == self::LINK_INPUT_TYPE_BAD_URL) {
- $this->assertRaw(t('The value %value provided for %field is not a valid URL.', array('%field' => $name, '%value' => trim($input['href']))), 'Not a valid URL: ' . $input['href']);
+ $this->assertRaw(t('The value %value provided for %field is not a valid URL.', array(
+ '%field' => $name,
+ '%value' => trim($input['href']),
+ )), 'Not a valid URL: ' . $input['href']);
continue;
}
else {
$this->assertRaw(' ' . t('has been created.',
- array('@type' => 'Basic Page', '%title' => $edit['title'])),
- 'Page created: ' . $input['href']);
+ array('@type' => 'Basic Page', '%title' => $edit['title'])),
+ 'Page created: ' . $input['href']);
}
$url = $this->getUrl();
- // change to Anonymous user.
+ // Change to Anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
- //debug($this);
- // If simpletest starts using something to override the error system, this will flag
- // us and let us know it's broken.
+ // debug($this);
+ // If simpletest starts using something to override the error system, this
+ // will flag us and let us know it's broken.
$this->assertFalse(libxml_use_internal_errors(TRUE));
if (isset($input['expected_href'])) {
$path = '//a[@href="' . $input['expected_href'] . '" and text()="' . $input['label'] . '"]';
@@ -171,18 +181,27 @@ class LinkUITest extends DrupalWebTestcase {
libxml_use_internal_errors(FALSE);
$this->assertIdentical(isset($elements[0]), $input['type'] == self::LINK_INPUT_TYPE_GOOD, $input['msg']);
}
- //libxml_use_internal_errors(FALSE);
+ // libxml_use_internal_errors(FALSE);
}
/**
+ * Static Link Create.
+ *
* Testing that if you use in a static title for your link, that the
* title actually displays .
*/
- function testStaticLinkCreate() {
- $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+ public function testStaticLinkCreate() {
+
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'access content',
+ 'create page content',
+ ));
+
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$field_name = 'field_' . $name;
$edit = array(
@@ -195,17 +214,18 @@ class LinkUITest extends DrupalWebTestcase {
$this->drupalPost(NULL, array(), t('Save field settings'));
$this->drupalPost(NULL, array(
'instance[settings][title]' => 'value',
- 'instance[settings][title_value]' => '' . $name . ''), t('Save settings'));
+ 'instance[settings][title_value]' => '' . $name . '',
+ ), t('Save settings'));
// Is field created?
$this->assertRaw(t('Saved %label configuration', array('%label' => $name)), 'Field added');
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
$this->assertField($field_name . '[und][0][url]', 'URL found');
$input = array(
- 'href' => 'http://example.com/' . $this->randomName()
+ 'href' => 'http://example.com/' . $this->randomName(),
);
$edit = array(
@@ -216,21 +236,32 @@ class LinkUITest extends DrupalWebTestcase {
$url = $this->getUrl();
- // change to anonymous user
+ // Change to anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
$this->assertRaw(l('' . $name . '', $input['href'], array('html' => TRUE)));
}
-
+
/**
- * Testing that if you have the title but no url, the title is not sanitized twice.
+ * CRUD Title Only Title No Link.
+ *
+ * Testing that if you have the title but no url, the title is not sanitized
+ * twice.
+ *
+ * @codingStandardsIgnoreStart
*/
- function testCRUDTitleOnlyTitleNoLink() {
- $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+ public function testCRUDTitleOnlyTitleNoLink() {
+ // @codingStandardsIgnoreEnd
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'access content',
+ 'create page content',
+ ));
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$field_name = 'field_' . $name;
$edit = array(
@@ -247,8 +278,8 @@ class LinkUITest extends DrupalWebTestcase {
// Is field created?
$this->assertRaw(t('Saved %label configuration', array('%label' => $name)), 'Field added');
-
- // create page form
+
+ // Create page form.
$this->drupalGet('node/add/page');
$this->assertField($field_name . '[und][0][url]', 'URL found');
@@ -265,8 +296,8 @@ class LinkUITest extends DrupalWebTestcase {
$this->drupalPost(NULL, $edit, t('Save'));
$url = $this->getUrl();
-
- // change to anonymous user
+
+ // Change to anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
@@ -274,14 +305,26 @@ class LinkUITest extends DrupalWebTestcase {
}
/**
- * If we're creating a new field and just hit 'save' on the default options, we want to make
- * sure they are set to the expected results.
+ * CRUD Create Field Defaults.
+ *
+ * If we're creating a new field and just hit 'save' on the default options,
+ * we want to make sure they are set to the expected results.
+ *
+ * @codingStandardsIgnoreStart
*/
- function testCRUDCreateFieldDefaults() {
- $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+ public function testCRUDCreateFieldDefaults() {
+ // @codingStandardsIgnoreEnd
+
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'access content',
+ 'create page content',
+ ));
+
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$edit = array(
'fields[_add_new_field][label]' => $name,
@@ -312,4 +355,169 @@ class LinkUITest extends DrupalWebTestcase {
$this->assertFalse($instance['settings']['attributes']['class'], 'By default, no class should be set.');
$this->assertFalse($instance['settings']['title_value'], 'By default, no title should be set.');
}
+
+ /**
+ * CRUD Create Field With Class.
+ *
+ * If we're creating a new field and just hit 'save' on the default options,
+ * we want to make sure they are set to the expected results.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function testCRUDCreateFieldWithClass() {
+ // @codingStandardsIgnoreEnd
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'access content',
+ 'create page content',
+ ));
+ $this->drupalLogin($this->web_user);
+
+ // Create field.
+ $name = strtolower($this->randomName());
+ $edit = array(
+ 'fields[_add_new_field][label]' => $name,
+ 'fields[_add_new_field][field_name]' => $name,
+ 'fields[_add_new_field][type]' => 'link_field',
+ 'fields[_add_new_field][widget_type]' => 'link_field',
+ );
+ $this->drupalPost('admin/structure/types/manage/page/fields', $edit, t('Save'));
+
+ $this->drupalPost(NULL, array(), t('Save field settings'));
+ $link_class_name = 'basic-link-' . strtolower($this->randomName());
+ $edit = array(
+ 'instance[settings][attributes][class]' => $link_class_name,
+ );
+ $this->drupalPost(NULL, $edit, t('Save settings'));
+
+ // Is field created?
+ $this->assertRaw(t('Saved %label configuration', array('%label' => $name)), 'Field added');
+ node_types_rebuild();
+ menu_rebuild();
+
+ _field_info_collate_fields(TRUE);
+ $instances = field_info_instances('node', 'page');
+
+ $instance = $instances['field_' . $name];
+ $this->assertFalse($instance['required'], 'Make sure field is not required.');
+ $this->assertEqual($instance['settings']['title'], 'optional', 'Title should be optional by default.');
+ $this->assertTrue($instance['settings']['validate_url'], 'Make sure validation is on.');
+ $this->assertTrue($instance['settings']['enable_tokens'], 'Enable Tokens should be on by default.');
+ $this->assertEqual($instance['settings']['display']['url_cutoff'], 80, 'Url cutoff should be at 80 characters.');
+ $this->assertEqual($instance['settings']['attributes']['target'], 'default', 'Target should be "default"');
+ $this->assertFalse($instance['settings']['attributes']['rel'], 'Rel should be blank by default.');
+ $this->assertEqual($instance['settings']['attributes']['class'], $link_class_name, 'One class should be set.');
+ $this->assertFalse($instance['settings']['title_value'], 'By default, no title should be set.');
+
+ // Now, let's create a node with this field and make sure the link shows up:
+ // create page form.
+ $field_name = 'field_' . $name;
+ $this->drupalGet('node/add/page');
+ $this->assertField($field_name . '[und][0][url]', 'URL found');
+
+ $input = array(
+ 'title' => 'This & That',
+ 'href' => 'http://www.example.com/',
+ );
+
+ $edit = array(
+ 'title' => $field_name,
+ $field_name . '[und][0][title]' => $input['title'],
+ $field_name . '[und][0][url]' => $input['href'],
+ );
+ $this->drupalPost(NULL, $edit, t('Save'));
+
+ $url = $this->getUrl();
+
+ // Change to anonymous user.
+ $this->drupalLogout();
+ $this->drupalGet($url);
+
+ $this->assertRaw('This & That');
+ $this->assertPattern('|class\s?=\s?"' . $link_class_name . '"|', "Class $link_class_name exists on page.");
+ }
+
+ /**
+ * CRUD Create Field With Two Classes.
+ *
+ * If we're creating a new field and just hit 'save' on the default options,
+ * we want to make sure they are set to the expected results.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function testCRUDCreateFieldWithTwoClasses() {
+ // @codingStandardsIgnoreEnd
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'access content',
+ 'create page content',
+ ));
+ $this->drupalLogin($this->web_user);
+
+ // Create field.
+ $name = strtolower($this->randomName());
+ $edit = array(
+ 'fields[_add_new_field][label]' => $name,
+ 'fields[_add_new_field][field_name]' => $name,
+ 'fields[_add_new_field][type]' => 'link_field',
+ 'fields[_add_new_field][widget_type]' => 'link_field',
+ );
+ $this->drupalPost('admin/structure/types/manage/page/fields', $edit, t('Save'));
+
+ $this->drupalPost(NULL, array(), t('Save field settings'));
+ $link_class_name = 'basic-link ' . strtoupper($this->randomName());
+ $edit = array(
+ 'instance[settings][attributes][class]' => $link_class_name,
+ );
+ $this->drupalPost(NULL, $edit, t('Save settings'));
+
+ // Is field created?
+ $this->assertRaw(t('Saved %label configuration', array('%label' => $name)), 'Field added');
+ node_types_rebuild();
+ menu_rebuild();
+
+ _field_info_collate_fields(TRUE);
+ $instances = field_info_instances('node', 'page');
+
+ $instance = $instances['field_' . $name];
+ $this->assertFalse($instance['required'], 'Make sure field is not required.');
+ $this->assertEqual($instance['settings']['title'], 'optional', 'Title should be optional by default.');
+ $this->assertTrue($instance['settings']['validate_url'], 'Make sure validation is on.');
+ $this->assertTrue($instance['settings']['enable_tokens'], 'Enable Tokens should be on by default.');
+ $this->assertEqual($instance['settings']['display']['url_cutoff'], 80, 'Url cutoff should be at 80 characters.');
+ $this->assertEqual($instance['settings']['attributes']['target'], 'default', 'Target should be "default"');
+ $this->assertFalse($instance['settings']['attributes']['rel'], 'Rel should be blank by default.');
+ $this->assertEqual($instance['settings']['attributes']['class'], $link_class_name, 'Two classes should be set.');
+ $this->assertFalse($instance['settings']['title_value'], 'By default, no title should be set.');
+
+ // Now, let's create a node with this field and make sure the link shows up:
+ // create page form.
+ $field_name = 'field_' . $name;
+ $this->drupalGet('node/add/page');
+ $this->assertField($field_name . '[und][0][url]', 'URL found');
+
+ $input = array(
+ 'title' => 'This & That',
+ 'href' => 'http://www.example.com/',
+ );
+
+ $edit = array(
+ 'title' => $field_name,
+ $field_name . '[und][0][title]' => $input['title'],
+ $field_name . '[und][0][url]' => $input['href'],
+ );
+ $this->drupalPost(NULL, $edit, t('Save'));
+
+ $url = $this->getUrl();
+
+ // Change to anonymous user.
+ $this->drupalLogout();
+ $this->drupalGet($url);
+
+ $this->assertRaw('This & That');
+ $this->assertPattern('|class\s?=\s?"' . $link_class_name . '"|', "Classes $link_class_name exist on page.");
+ }
+
}
diff --git a/sites/all/modules/contrib/fields/link/tests/link.entity_token.test b/sites/all/modules/contrib/fields/link/tests/link.entity_token.test
new file mode 100644
index 0000000..6c42655
--- /dev/null
+++ b/sites/all/modules/contrib/fields/link/tests/link.entity_token.test
@@ -0,0 +1,164 @@
+ 'Link entity tokens test',
+ 'description' => 'Tests that a link field appears properly in entity tokens',
+ 'group' => 'Link',
+ 'dependencies' => array('token', 'entity', 'entity_token'),
+ );
+ }
+
+ /**
+ * Setup.
+ */
+ public function setUp($modules = array()) {
+ parent::setUp(array('token', 'entity', 'entity_token'));
+ }
+
+ /**
+ * Creates a link field, fills it, then uses a loaded node to test tokens.
+ */
+ public function testFieldTokenNodeLoaded() {
+ // Create field.
+ $settings = array(
+ 'instance[settings][enable_tokens]' => 0,
+ );
+ $field_name = $this->createLinkField('page',
+ $settings);
+
+ // Create page form.
+ $this->drupalGet('node/add/page');
+ // $field_name = 'field_' . $name;.
+ $this->assertField($field_name . '[und][0][title]', 'Title found');
+ $this->assertField($field_name . '[und][0][url]', 'URL found');
+
+ $token_url_tests = array(
+ 1 => array(
+ 'href' => 'http://example.com/' . $this->randomName(),
+ 'label' => $this->randomName(),
+ ),
+ 2 => array(
+ 'href' => 'http://example.com/' . $this->randomName() . '?property=value',
+ 'label' => $this->randomName(),
+ ),
+ 3 => array(
+ 'href' => 'http://example.com/' . $this->randomName() . '#position',
+ 'label' => $this->randomName(),
+ ),
+ 4 => array(
+ 'href' => 'http://example.com/' . $this->randomName() . '#lower?property=value2',
+ 'label' => $this->randomName(),
+ ),
+ );
+ // @codingStandardsIgnoreLine
+ // $this->assert('pass', '' . print_r($token_url_tests, TRUE) . '');.
+ foreach ($token_url_tests as &$input) {
+ $this->drupalGet('node/add/page');
+
+ $edit = array(
+ 'title' => $input['label'],
+ $field_name . '[und][0][title]' => $input['label'],
+ $field_name . '[und][0][url]' => $input['href'],
+ );
+ $this->drupalPost(NULL, $edit, t('Save'));
+ $url = $this->getUrl();
+ $input['url'] = $url;
+ }
+
+ // Change to anonymous user.
+ $this->drupalLogout();
+
+ foreach ($token_url_tests as $index => $input2) {
+ $node = node_load($index);
+ $this->assertNotEqual(NULL, $node, "Do we have a node?");
+ $this->assertEqual($node->nid, $index, "Test that we have a node.");
+ $token_name = '[node:' . str_replace('_', '-', $field_name) . ':url]';
+ $assert_data = token_replace($token_name,
+ array('node' => $node));
+ $this->assertEqual($input2['href'], $assert_data, "Test that the url token has been set to " . $input2['href'] . ' - ' . $assert_data);
+ }
+ }
+
+ /**
+ * Field Token Node Viewed.
+ *
+ * Creates a link field, fills it, then uses a loaded and node_view'd node to
+ * test tokens.
+ */
+ public function testFieldTokenNodeViewed() {
+ // Create field.
+ $settings = array(
+ 'instance[settings][enable_tokens]' => 0,
+ );
+ $field_name = $this->createLinkField('page',
+ $settings);
+
+ // Create page form.
+ $this->drupalGet('node/add/page');
+ // $field_name = 'field_' . $name;.
+ $this->assertField($field_name . '[und][0][title]', 'Title found');
+ $this->assertField($field_name . '[und][0][url]', 'URL found');
+
+ $token_url_tests = array(
+ 1 => array(
+ 'href' => 'http://example.com/' . $this->randomName(),
+ 'label' => $this->randomName(),
+ ),
+ 2 => array(
+ 'href' => 'http://example.com/' . $this->randomName() . '?property=value',
+ 'label' => $this->randomName(),
+ ),
+ 3 => array(
+ 'href' => 'http://example.com/' . $this->randomName() . '#position',
+ 'label' => $this->randomName(),
+ ),
+ 4 => array(
+ 'href' => 'http://example.com/' . $this->randomName() . '#lower?property=value2',
+ 'label' => $this->randomName(),
+ ),
+ );
+
+ //@codingStandardsIgnoreLine
+ // $this->assert('pass', '' . print_r($token_url_tests, TRUE) . '');.
+ foreach ($token_url_tests as &$input) {
+ $this->drupalGet('node/add/page');
+
+ $edit = array(
+ 'title' => $input['label'],
+ $field_name . '[und][0][title]' => $input['label'],
+ $field_name . '[und][0][url]' => $input['href'],
+ );
+ $this->drupalPost(NULL, $edit, t('Save'));
+ $url = $this->getUrl();
+ $input['url'] = $url;
+ }
+
+ // Change to anonymous user.
+ $this->drupalLogout();
+
+ foreach ($token_url_tests as $index => $input2) {
+ $node = node_load($index);
+ $this->assertNotEqual(NULL, $node, "Do we have a node?");
+ $this->assertEqual($node->nid, $index, "Test that we have a node.");
+ $token_name = '[node:' . str_replace('_', '-', $field_name) . ':url]';
+ $assert_data = token_replace($token_name,
+ array('node' => $node));
+ $this->assertEqual($input2['href'], $assert_data, "Test that the url token has been set to " . $input2['href'] . ' - ' . $assert_data);
+ }
+ }
+
+}
diff --git a/sites/all/modules/contrib/fields/link/tests/link.test b/sites/all/modules/contrib/fields/link/tests/link.test
index 962197f..dd9adb4 100644
--- a/sites/all/modules/contrib/fields/link/tests/link.test
+++ b/sites/all/modules/contrib/fields/link/tests/link.test
@@ -5,10 +5,15 @@
* Link base test file - contains common functions for testing links.
*/
+/**
+ * Base Test Class.
+ */
class LinkBaseTestClass extends DrupalWebTestCase {
+
protected $permissions = array(
'access content',
'administer content types',
+ 'administer fields',
'administer nodes',
'administer filters',
'access comments',
@@ -17,17 +22,23 @@ class LinkBaseTestClass extends DrupalWebTestCase {
'create page content',
);
- function setUp() {
+ /**
+ * Setup.
+ */
+ public function setUp() {
$modules = func_get_args();
$modules = (isset($modules[0]) && is_array($modules[0]) ? $modules[0] : $modules);
$modules[] = 'field_ui';
$modules[] = 'link';
parent::setUp($modules);
-
+
$this->web_user = $this->drupalCreateUser($this->permissions);
$this->drupalLogin($this->web_user);
}
+ /**
+ * Create Link Field.
+ */
protected function createLinkField($node_type = 'page', $settings = array()) {
$name = strtolower($this->randomName());
$edit = array(
@@ -48,4 +59,5 @@ class LinkBaseTestClass extends DrupalWebTestCase {
return $field_name;
}
+
}
diff --git a/sites/all/modules/contrib/fields/link/tests/link.token.test b/sites/all/modules/contrib/fields/link/tests/link.token.test
index 21bc4a0..edbb1df 100644
--- a/sites/all/modules/contrib/fields/link/tests/link.token.test
+++ b/sites/all/modules/contrib/fields/link/tests/link.token.test
@@ -6,10 +6,13 @@
*/
/**
- * Testing that tokens can be used in link titles
+ * Testing that tokens can be used in link titles.
*/
class LinkTokenTest extends LinkBaseTestClass {
+ /**
+ * Get Info.
+ */
public static function getInfo() {
return array(
'name' => 'Link tokens - browser test',
@@ -19,34 +22,38 @@ class LinkTokenTest extends LinkBaseTestClass {
);
}
- function setUp($modules = array()) {
+ /**
+ * Setup.
+ */
+ public function setUp($modules = array()) {
parent::setUp(array('token'));
}
/**
* Creates a link field with a required title enabled for user-entered tokens.
+ *
* Creates a node with a token in the link title and checks the value.
*/
- function testUserTokenLinkCreate() {
- // create field
+ public function testUserTokenLinkCreate() {
+ // Create field.
$settings = array(
'instance[settings][enable_tokens]' => 1,
);
$field_name = $this->createLinkField('page',
- $settings);
+ $settings);
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
- //$field_name = 'field_' . $name;
+ // $field_name = 'field_' . $name;.
$this->assertField($field_name . '[und][0][title]', 'Title found');
$this->assertField($field_name . '[und][0][url]', 'URL found');
$input = array(
- 'href' => 'http://example.com/' . $this->randomName(),
- 'label' => $this->randomName(),
+ 'href' => 'http://example.com/' . $this->randomName(),
+ 'label' => $this->randomName(),
);
- //$this->drupalLogin($this->web_user);
+ // $this->drupalLogin($this->web_user);.
$this->drupalGet('node/add/page');
$edit = array(
@@ -57,36 +64,37 @@ class LinkTokenTest extends LinkBaseTestClass {
$this->drupalPost(NULL, $edit, t('Save'));
$url = $this->getUrl();
- // change to anonymous user
+ // Change to anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
$this->assertRaw(l($input['label'] . ' page', $input['href']));
}
-
/**
* Creates a link field with a static title and an admin-entered token.
+ *
* Creates a node with a link and checks the title value.
*/
- function testStaticTokenLinkCreate() {
+ public function testStaticTokenLinkCreate() {
- // create field
+ // Create field.
$name = $this->randomName();
$settings = array(
'instance[settings][title]' => 'value',
- 'instance[settings][title_value]' => $name . ' [node:content-type:machine-name]');
+ 'instance[settings][title_value]' => $name . ' [node:content-type:machine-name]',
+ );
$field_name = $this->createLinkField('page', $settings);
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
$this->assertField($field_name . '[und][0][url]', 'URL found');
$input = array(
- 'href' => 'http://example.com/' . $this->randomName()
+ 'href' => 'http://example.com/' . $this->randomName(),
);
- //$this->drupalLogin($this->web_user);
+ // $this->drupalLogin($this->web_user);.
$this->drupalGet('node/add/page');
$edit = array(
@@ -97,7 +105,7 @@ class LinkTokenTest extends LinkBaseTestClass {
$url = $this->getUrl();
- // change to anonymous user
+ // Change to anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
@@ -106,30 +114,32 @@ class LinkTokenTest extends LinkBaseTestClass {
/**
* Creates a link field with a static title and an admin-entered token.
+ *
* Creates a node with a link and checks the title value.
*
* Basically, I want to make sure the [title-raw] token works, because it's a
* token that changes from node to node, where [type]'s always going to be the
* same.
*/
- function testStaticTokenLinkCreate2() {
+ public function testStaticTokenLinkCreate2() {
- // create field
+ // Create field.
$name = $this->randomName();
$settings = array(
'instance[settings][title]' => 'value',
- 'instance[settings][title_value]' => $name . ' [node:title]');
+ 'instance[settings][title_value]' => $name . ' [node:title]',
+ );
$field_name = $this->createLinkField('page', $settings);
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
$this->assertField($field_name . '[und][0][url]', 'URL found');
$input = array(
- 'href' => 'http://example.com/' . $this->randomName()
+ 'href' => 'http://example.com/' . $this->randomName(),
);
- //$this->drupalLogin($this->web_user);
+ // $this->drupalLogin($this->web_user);.
$this->drupalGet('node/add/page');
$edit = array(
@@ -140,27 +150,32 @@ class LinkTokenTest extends LinkBaseTestClass {
$url = $this->getUrl();
- // change to anonymous user
+ // Change to anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
$this->assertRaw(l($name . ' ' . $name, $input['href']));
}
- // This test doesn't seem to actually work, due to lack of 'title' in url.
- function _test_Link_With_Title_Attribute_token_url_form() {
- /* $this->loginWithPermissions($this->permissions);
+ /**
+ * This test doesn't seem to actually work, due to lack of 'title' in url.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function _test_Link_With_Title_Attribute_token_url_form() {
+ // @codingStandardsIgnoreEnd
+ /* $this->loginWithPermissions($this->permissions);
$this->acquireContentTypes(1);
$field_settings = array(
- 'type' => 'link',
- 'widget_type' => 'link',
- 'type_name' => $this->content_types[0]->name,
- 'attributes' => array(
- 'class' => '',
- 'target' => 'default',
- 'rel' => 'nofollow',
- 'title' => '',
- ),
+ 'type' => 'link',
+ 'widget_type' => 'link',
+ 'type_name' => $this->content_types[0]->name,
+ 'attributes' => array(
+ 'class' => '',
+ 'target' => 'default',
+ 'rel' => 'nofollow',
+ 'title' => '',
+ ),
);
$field = $this->createField($field_settings, 0);
@@ -170,10 +185,10 @@ class LinkTokenTest extends LinkBaseTestClass {
$url_type = str_replace('_', '-', $this->content_types[0]->type);
$edit = array('attributes[title]' => '['. $field_name .'-url]',
- 'enable_tokens' => TRUE);
-
+ 'enable_tokens' => TRUE);
+ // @codingStandardsIgnoreLine
$this->drupalPost('admin/content/node-type/'. $url_type .'/fields/'. $field['field_name'],
- $edit, t('Save field settings'));
+ $edit, t('Save field settings'));
$this->assertText(t('Saved field @field_name', array('@field_name' => $field['field_name'])));*/
$name = $this->randomName();
$settings = array(
@@ -183,12 +198,9 @@ class LinkTokenTest extends LinkBaseTestClass {
$field_name = $this->createLinkField('page', $settings);
// So, having saved this field_name, let's see if it works...
- //$this->acquireNodes(1);
-
- //$node = node_load($this->nodes[0]->nid);
-
- //$this->drupalGet('node/'. $this->nodes[0]->nid);
-
+ // $this->acquireNodes(1);
+ // $node = node_load($this->nodes[0]->nid);
+ // $this->drupalGet('node/'. $this->nodes[0]->nid);.
$edit = array();
$test_link_url = 'http://www.example.com/test';
$edit[$field_name . '[und][0][url]'] = $test_link_url;
@@ -200,23 +212,28 @@ class LinkTokenTest extends LinkBaseTestClass {
$this->drupalPost(NULL, $edit, t('Save'));
// Make sure we get a new version!
- //$node = node_load($this->nodes[0]->nid, NULL, TRUE);
+ // $node = node_load($this->nodes[0]->nid, NULL, TRUE);.
$this->assertText(t('Basic page @title has been updated.',
- array('@title' => $name)));
+ array('@title' => $name)));
- //$this->drupalGet('node/'. $node->nid);
+ // $this->drupalGet('node/'. $node->nid);.
$this->assertText($title, 'Make sure the link title/text shows');
$this->assertRaw(' title="' . $test_link_url . '"', "Do we show the link url as the title attribute?");
$this->assertNoRaw(' title="[' . $field_name . '-url]"');
$this->assertTrue(module_exists('token'), t('Assure that Token Module is enabled.'));
- //$this->fail($this->content);
+ // $this->fail($this->content);.
}
/**
+ * Link With Title Attribute token title form.
+ *
* If the title of the link is set to the title attribute, then the title
* attribute isn't supposed to show.
+ *
+ * @codingStandardsIgnoreStart
*/
- function _test_Link_With_Title_Attribute_token_title_form() {
+ public function _test_Link_With_Title_Attribute_token_title_form() {
+ // @codingStandardsIgnoreEnd
$this->loginWithPermissions($this->permissions);
$this->acquireContentTypes(1);
$field_settings = array(
@@ -233,21 +250,20 @@ class LinkTokenTest extends LinkBaseTestClass {
$field = $this->createField($field_settings, 0);
$field_name = $field['field_name'];
- $field_db_info = content_database_info($field);
$url_type = str_replace('_', '-', $this->content_types[0]->type);
- $edit = array('attributes[title]' => '[' . $field_name . '-title]',
- 'enable_tokens' => TRUE);
+ $edit = array(
+ 'attributes[title]' => '[' . $field_name . '-title]',
+ 'enable_tokens' => TRUE,
+ );
$this->drupalPost('admin/content/node-type/' . $url_type . '/fields/' . $field['field_name'],
- $edit, t('Save field settings'));
+ $edit, t('Save field settings'));
$this->assertText(t('Saved field @field_name', array('@field_name' => $field['field_name'])));
// So, having saved this field_name, let's see if it works...
$this->acquireNodes(1);
- $node = node_load($this->nodes[0]->nid);
-
$this->drupalGet('node/' . $this->nodes[0]->nid);
$edit = array();
@@ -260,24 +276,35 @@ class LinkTokenTest extends LinkBaseTestClass {
// Make sure we get a new version!
$node = node_load($this->nodes[0]->nid, NULL, TRUE);
$this->assertText(t('@type @title has been updated.',
- array('@title' => $node->title,
- '@type' => $this->content_types[0]->name)));
+ array(
+ '@title' => $node->title,
+ '@type' => $this->content_types[0]->name,
+ )));
$this->drupalGet('node/' . $node->nid);
$this->assertText($title, 'Make sure the link title/text shows');
$this->assertNoRaw(' title="' . $title . '"', "We should not show the link title as the title attribute?");
$this->assertNoRaw(' title="[' . $field_name . '-title]"');
- //$this->fail($this->content);
+ // $this->fail($this->content);.
}
/**
- * Trying to set the url to contain a token.
+ * Trying to set the url to contain a token.
+ *
+ * @codingStandardsIgnoreStart
*/
- function _testUserTokenLinkCreateInURL() {
- $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+ public function _testUserTokenLinkCreateInURL() {
+ //@codingStandardsIgnoreEnd
+
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'access content',
+ 'create page content',
+ ));
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$edit = array(
'_add_new_field[label]' => $name,
@@ -288,20 +315,21 @@ class LinkTokenTest extends LinkBaseTestClass {
$this->drupalPost('admin/content/node-type/page/fields', $edit, t('Save'));
$this->drupalPost(NULL, array(
'title' => 'required',
- 'enable_tokens' => 1), t('Save field settings'));
+ 'enable_tokens' => 1,
+ ), t('Save field settings'));
// Is field created?
$this->assertRaw(t('Added field %label.', array('%label' => $name)), 'Field added');
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
$field_name = 'field_' . $name;
$this->assertField($field_name . '[0][title]', 'Title found');
$this->assertField($field_name . '[0][url]', 'URL found');
$input = array(
- 'href' => 'http://example.com/' . $this->randomName(),
- 'label' => $this->randomName(),
+ 'href' => 'http://example.com/' . $this->randomName(),
+ 'label' => $this->randomName(),
);
$this->drupalLogin($this->web_user);
@@ -315,22 +343,31 @@ class LinkTokenTest extends LinkBaseTestClass {
$this->drupalPost(NULL, $edit, t('Save'));
$url = $this->getUrl();
- // change to anonymous user
+ // Change to anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
$this->assertRaw(l($input['label'], $input['href'] . '/page'));
- //$this->fail($this->content);
+ // $this->fail($this->content);.
}
/**
- * Trying to set the url to contain a token.
+ * Trying to set the url to contain a token.
+ *
+ * @codingStandardsIgnoreStart
*/
- function _testUserTokenLinkCreateInURL2() {
- $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+ public function _testUserTokenLinkCreateInURL2() {
+ // @codingStandardsIgnoreEnd
+
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'access content',
+ 'create page content',
+ ));
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$edit = array(
'_add_new_field[label]' => $name,
@@ -341,20 +378,21 @@ class LinkTokenTest extends LinkBaseTestClass {
$this->drupalPost('admin/content/node-type/page/fields', $edit, t('Save'));
$this->drupalPost(NULL, array(
'title' => 'required',
- 'enable_tokens' => 1), t('Save field settings'));
+ 'enable_tokens' => 1,
+ ), t('Save field settings'));
// Is field created?
$this->assertRaw(t('Added field %label.', array('%label' => $name)), 'Field added');
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
$field_name = 'field_' . $name;
$this->assertField($field_name . '[0][title]', 'Title found');
$this->assertField($field_name . '[0][url]', 'URL found');
$input = array(
- 'href' => 'http://example.com/' . $this->randomName(),
- 'label' => $this->randomName(),
+ 'href' => 'http://example.com/' . $this->randomName(),
+ 'label' => $this->randomName(),
);
$this->drupalLogin($this->web_user);
@@ -368,22 +406,34 @@ class LinkTokenTest extends LinkBaseTestClass {
$this->drupalPost(NULL, $edit, t('Save'));
$url = $this->getUrl();
- // change to anonymous user
+ // Change to anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
$this->assertRaw(l($input['label'], $input['href'] . '/' . $this->web_user->uid));
}
-
+
/**
- * Test that if you have a title and no url on a field which does not have tokens enabled,
- * that the title is sanitized once.
+ * CRUD Title Only Title No Link.
+ *
+ * Test that if you have a title and no url on a field which does not have
+ * tokens enabled, that the title is sanitized once.
+ *
+ * @codingStandardsIgnoreStart
*/
- function testCRUDTitleOnlyTitleNoLink2() {
- $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+ public function testCRUDTitleOnlyTitleNoLink2() {
+ //@codingStandardsIgnoreEnd
+
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'access content',
+ 'create page content',
+ ));
+
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$field_name = 'field_' . $name;
$edit = array(
@@ -401,8 +451,8 @@ class LinkTokenTest extends LinkBaseTestClass {
// Is field created?
$this->assertRaw(t('Saved %label configuration', array('%label' => $name)), 'Field added');
-
- // create page form
+
+ // Create page form.
$this->drupalGet('node/add/page');
$this->assertField($field_name . '[und][0][url]', 'URL found');
@@ -419,11 +469,12 @@ class LinkTokenTest extends LinkBaseTestClass {
$this->drupalPost(NULL, $edit, t('Save'));
$url = $this->getUrl();
-
- // change to anonymous user
+
+ // Change to anonymous user.
$this->drupalLogout();
$this->drupalGet($url);
$this->assertRaw('This & That');
}
+
}
diff --git a/sites/all/modules/contrib/fields/link/tests/link.validate.test b/sites/all/modules/contrib/fields/link/tests/link.validate.test
index 764eeaa..addd7d3 100644
--- a/sites/all/modules/contrib/fields/link/tests/link.validate.test
+++ b/sites/all/modules/contrib/fields/link/tests/link.validate.test
@@ -5,8 +5,14 @@
* Tests that exercise the validation functions in the link module.
*/
+/**
+ * Validate Test Case.
+ */
class LinkValidateTestCase extends LinkBaseTestClass {
+ /**
+ * Create Link.
+ */
protected function createLink($url, $title, $attributes = array()) {
return array(
'url' => $url,
@@ -17,35 +23,44 @@ class LinkValidateTestCase extends LinkBaseTestClass {
/**
* Takes a url, and sees if it can validate that the url is valid.
+ *
+ * @codingStandardsIgnoreStart
*/
protected function link_test_validate_url($url) {
+ // @codingStandardsIgnoreEnd
$field_name = $this->createLinkField();
- $permission = 'create page content';
- $this->checkPermissions(array($permission), TRUE);
-
- $this->drupalGet('node/add/page');
-
$label = $this->randomName();
- $edit = array(
+ $settings = array(
'title' => $label,
- $field_name . '[und][0][title]' => $label,
- $field_name . '[und][0][url]' => $url,
+ $field_name => array(
+ LANGUAGE_NONE => array(
+ array(
+ 'title' => $label,
+ 'url' => $url,
+ ),
+ ),
+ ),
);
- $this->drupalPost(NULL, $edit, t('Save'));
- $this->assertRaw(' has been created.', 'Node created');
- $nid = 1; //$matches[1];
+ $node = $this->drupalCreateNode($settings);
- $node = node_load($nid);
+ $this->assertNotNull($node, ' has been created.', 'Node created');
- $this->assertEqual($url, $node->{$field_name}['und'][0]['url']);
+ $this->assertEqual($url, $node->{$field_name}[LANGUAGE_NONE][0]['url']);
}
+
}
+/**
+ * Class for Validate Test.
+ */
class LinkValidateTest extends LinkValidateTestCase {
+ /**
+ * Get Info.
+ */
public static function getInfo() {
return array(
'name' => 'Link Validation Tests',
@@ -54,23 +69,35 @@ class LinkValidateTest extends LinkValidateTestCase {
);
}
- function test_link_validate_basic_url() {
+ /**
+ * Validate basic URL.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_link_validate_basic_url() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('http://www.example.com');
}
/**
* Test if we're stopped from posting a bad url on default validation.
+ *
+ * @codingStandardsIgnoreStart
*/
- function test_link_validate_bad_url_validate_default() {
- $this->web_user = $this->drupalCreateUser(array('administer content types',
- 'administer nodes',
- 'administer filters',
- 'access content',
- 'create page content',
- 'access administration pages'));
+ public function test_link_validate_bad_url_validate_default() {
+ // @codingStandardsIgnoreEnd
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'administer nodes',
+ 'administer filters',
+ 'access content',
+ 'create page content',
+ 'access administration pages',
+ ));
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$edit = array(
'fields[_add_new_field][label]' => $name,
@@ -87,35 +114,43 @@ class LinkValidateTest extends LinkValidateTestCase {
node_types_rebuild();
menu_rebuild();
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
$field_name = 'field_' . $name;
$this->assertField('edit-field-' . $name . '-und-0-title', 'Title found');
$this->assertField('edit-field-' . $name . '-und-0-url', 'URL found');
-
$edit = array(
'title' => 'Simple Title',
$field_name . '[und][0][url]' => 'edik:naw',
);
$this->drupalPost(NULL, $edit, t('Save'));
- $this->assertText(t('The value @value provided for @field is not a valid URL.', array('@value' => 'edik:naw', '@field' => $name)));
+ $this->assertText(t('The value @value provided for @field is not a valid URL.', array(
+ '@value' => 'edik:naw',
+ '@field' => $name,
+ )));
}
/**
* Test if we're stopped from posting a bad url with validation on.
+ *
+ * @codingStandardsIgnoreStart
*/
- function test_link_validate_bad_url_validate_on() {
- $this->web_user = $this->drupalCreateUser(array('administer content types',
- 'administer nodes',
- 'administer filters',
- 'access content',
- 'create page content',
- 'access administration pages'));
+ public function test_link_validate_bad_url_validate_on() {
+ // @codingStandardsIgnoreEnd
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'administer nodes',
+ 'administer filters',
+ 'access content',
+ 'create page content',
+ 'access administration pages',
+ ));
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$edit = array(
'fields[_add_new_field][label]' => $name,
@@ -132,36 +167,44 @@ class LinkValidateTest extends LinkValidateTestCase {
node_types_rebuild();
menu_rebuild();
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
$field_name = 'field_' . $name;
$this->assertField('edit-field-' . $name . '-und-0-title', 'Title found');
$this->assertField('edit-field-' . $name . '-und-0-url', 'URL found');
-
$edit = array(
'title' => 'Simple Title',
$field_name . '[und][0][url]' => 'edik:naw',
);
$this->drupalPost(NULL, $edit, t('Save'));
- $this->assertText(t('The value @value provided for @field is not a valid URL.', array('@field' => $name, '@value' => 'edik:naw')));
+ $this->assertText(t('The value @value provided for @field is not a valid URL.', array(
+ '@field' => $name,
+ '@value' => 'edik:naw',
+ )));
}
/**
* Test if we can post a bad url if the validation is expressly turned off.
+ *
+ * @codingStandardsIgnoreStart
*/
- function test_link_validate_bad_url_validate_off() {
- $this->web_user = $this->drupalCreateUser(array('administer content types',
- 'administer nodes',
- 'administer filters',
- 'access content',
- 'create page content',
- 'access administration pages'));
+ public function test_link_validate_bad_url_validate_off() {
+ // @codingStandardsIgnoreEnd
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'administer nodes',
+ 'administer filters',
+ 'access content',
+ 'create page content',
+ 'access administration pages',
+ ));
$this->drupalLogin($this->web_user);
- // create field
+ // Create field.
$name = strtolower($this->randomName());
$edit = array(
'fields[_add_new_field][label]' => $name,
@@ -173,6 +216,7 @@ class LinkValidateTest extends LinkValidateTestCase {
$this->drupalPost(NULL, array(), t('Save field settings'));
$this->drupalPost(NULL, array('instance[settings][validate_url]' => FALSE), t('Save settings'));
+ // @codingStandardsIgnoreLine
/*$instance_details = db_query("SELECT * FROM {field_config_instance} WHERE field_name = :field_name AND bundle = 'page'", array(':field_name' => 'field_'. $name))->fetchObject();
$this->fail(''. print_r($instance_details, TRUE) .'
');
$this->fail(''. print_r(unserialize($instance_details->data), TRUE) .'
');*/
@@ -182,51 +226,62 @@ class LinkValidateTest extends LinkValidateTestCase {
node_types_rebuild();
menu_rebuild();
- // create page form
+ // Create page form.
$this->drupalGet('node/add/page');
$field_name = 'field_' . $name;
$this->assertField('edit-field-' . $name . '-und-0-title', 'Title found');
$this->assertField('edit-field-' . $name . '-und-0-url', 'URL found');
-
$edit = array(
'title' => 'Simple Title',
$field_name . '[und][0][url]' => 'edik:naw',
);
$this->drupalPost(NULL, $edit, t('Save'));
- $this->assertNoText(t('The value %value provided for %field is not a valid URL.', array('%field' => $name, '%value' => 'edik:naw')));
+ $this->assertNoText(t('The value %value provided for %field is not a valid URL.', array(
+ '%field' => $name,
+ '%value' => 'edik:naw',
+ )));
}
/**
- * Test if a bad url can sneak through un-filtered if we play with the validation...
+ * Validate switching between validation status.
+ *
+ * Test if a bad url can sneak through un-filtered if we play with the
+ * validation...
+ *
+ * @codingStandardsIgnoreStart
*/
- function x_test_link_validate_switching_between_validation_status() {
+ public function x_test_link_validate_switching_between_validation_status() {
+ // @codingStandardsIgnoreEnd
$this->acquireContentTypes(1);
- $this->web_user = $this->drupalCreateUser(array('administer content types',
- 'administer nodes',
- 'access administration pages',
- 'access content',
- 'create ' . $this->content_types[0]->type . ' content',
- 'edit any ' . $this->content_types[0]->type . ' content'));
+ $this->web_user = $this->drupalCreateUser(array(
+ 'administer content types',
+ 'administer fields',
+ 'administer nodes',
+ 'access administration pages',
+ 'access content',
+ 'create ' . $this->content_types[0]->type . ' content',
+ 'edit any ' . $this->content_types[0]->type . ' content',
+ ));
$this->drupalLogin($this->web_user);
- variable_set('node_options_' . $this->content_types[0]->name, array('status', 'promote'));
+ variable_set('node_options_' . $this->content_types[0]->name, array(
+ 'status',
+ 'promote',
+ ));
$field_settings = array(
'type' => 'link',
'widget_type' => 'link',
'type_name' => $this->content_types[0]->name,
- 'attributes' => array(), // <-- This is needed or we have an error
+ // <-- This is needed or we have an error.
+ 'attributes' => array(),
'validate_url' => 0,
);
$field = $this->createField($field_settings, 0);
- //$this->fail(''. print_r($field, TRUE) .'
');
- $field_db_info = content_database_info($field);
$this->acquireNodes(2);
- $node = node_load($this->nodes[0]->nid);
-
$this->drupalGet('node/' . $this->nodes[0]->nid);
$edit = array();
@@ -236,8 +291,12 @@ class LinkValidateTest extends LinkValidateTestCase {
$edit[$field['field_name'] . '[0][title]'] = $title;
$this->drupalPost('node/' . $this->nodes[0]->nid . '/edit', $edit, t('Save'));
- //$this->pass($this->content);
- $this->assertNoText(t('The value %value provided for %field is not a valid URL.', array('%field' => $name, '%value' => trim($url))));
+ // $this->pass($this->content);.
+ // @codingStandardsIgnoreLine
+ $this->assertNoText(t('The value %value provided for %field is not a valid URL.', array(
+ '%field' => $name,
+ '%value' => trim($url),
+ )));
// Make sure we get a new version!
$node = node_load($this->nodes[0]->nid, NULL, TRUE);
@@ -249,8 +308,9 @@ class LinkValidateTest extends LinkValidateTestCase {
// Turn the array validation back _on_.
$edit = array('validate_url' => TRUE);
$node_type_link = str_replace('_', '-', $node->type);
- //$this->drupalGet('admin/content/node-type/'. $node_type_link .'/fields'); ///'. $field['field_name']);
- //$this->fail($this->content);
+ // @codingStandardsIgnoreLine
+ // $this->drupalGet('admin/content/node-type/'. $node_type_link .'/fields'); ///'. $field['field_name']);
+ // $this->fail($this->content);.
$this->drupalPost('admin/content/node-type/' . $node_type_link . '/fields/' . $field['field_name'], $edit, t('Save field settings'));
$this->drupalGet('node/' . $node->nid);
@@ -258,36 +318,75 @@ class LinkValidateTest extends LinkValidateTestCase {
// url() function. But we should have a test that makes sure it continues
// to work.
$this->assertNoRaw($url, 'Make sure Javascript does not display.');
- //$this->fail($this->content);
-
+ // $this->fail($this->content);.
}
- // Validate that '' is a valid url.
- function test_link_front_url() {
+ /**
+ * Validate that '' is a valid url.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_link_front_url() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('');
}
- // Validate that an internal url would be accepted.
- function test_link_internal_url() {
- $this->link_test_validate_url('node/32');
+ /**
+ * Validate that an internal url would be accepted.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_link_internal_url() {
+ // @codingStandardsIgnoreEnd
+ // Create the content first.
+ $node = $this->drupalCreateNode();
+
+ $link = 'node/' . $node->nid;
+ $this->link_test_validate_url($link);
+ $type = link_url_type($link);
+ $this->assertEqual(LINK_INTERNAL, $type, 'Test ' . $link . ' is an internal link.');
}
- // Validate a simple mailto.
- function test_link_mailto() {
+ /**
+ * Validate a simple mailto.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_link_mailto() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('mailto:jcfiala@gmail.com');
}
- function test_link_external_https() {
+ /**
+ * Check link external https.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_link_external_https() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('https://www.example.com/');
}
- function test_link_ftp() {
+ /**
+ * Check link FTP.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_link_ftp() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('ftp://www.example.com/');
}
+
}
+/**
+ * Validate Test News.
+ */
class LinkValidateTestNews extends LinkValidateTestCase {
+ /**
+ * Get Info.
+ */
public static function getInfo() {
return array(
'name' => 'Link News Validation Tests',
@@ -296,18 +395,36 @@ class LinkValidateTestNews extends LinkValidateTestCase {
);
}
- // Validate a news link to a message group
- function test_link_news() {
+ /**
+ * Validate a news link to a message group.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_link_news() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('news:comp.infosystems.www.misc');
}
- // Validate a news link to a message id. Said ID copied off of google groups.
- function test_link_news_message() {
+ /**
+ * Validate a news link to a message id. Said ID copied off of google groups.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_link_news_message() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('news:hj0db8$vrm$1@news.eternal-september.org');
}
+
}
+/**
+ * Validate Specific URL.
+ */
class LinkValidateSpecificURL extends LinkValidateTestCase {
+
+ /**
+ * Get Info.
+ */
public static function getInfo() {
return array(
'name' => 'Link Specific URL Validation Tests',
@@ -316,33 +433,65 @@ class LinkValidateSpecificURL extends LinkValidateTestCase {
);
}
- // Lets throw in a lot of umlouts for testing!
- function test_umlout_url() {
+ /**
+ * Lets throw in a lot of umlouts for testing!
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_umlout_url() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('http://üÜü.exämple.com/nöde');
}
- function test_umlout_mailto() {
+ /**
+ * Check umlout mailto.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_umlout_mailto() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('mailto:Üser@exÅmple.com');
}
- function test_german_b_url() {
+ /**
+ * Check german b in url.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_german_b_url() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('http://www.test.com/ßstuff');
}
- function test_special_n_url() {
+ /**
+ * Check Special in url.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_special_n_url() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('http://www.testÑñ.com/');
}
- function test_curly_brackets_in_query() {
+ /**
+ * Curly Brackets in query.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function test_curly_brackets_in_query() {
+ // @codingStandardsIgnoreEnd
$this->link_test_validate_url('http://www.healthyteennetwork.org/index.asp?Type=B_PR&SEC={2AE1D600-4FC6-4B4D-8822-F1D5F072ED7B}&DE={235FD1E7-208D-4363-9854-4E6775EB8A4C}');
}
/**
* Here, we're testing that a very long url is stored properly in the db.
*
- * Basicly, trying to test http://drupal.org/node/376818
+ * Basically, trying to test http://drupal.org/node/376818
+ *
+ * @codingStandardsIgnoreStart
*/
- function testLinkURLFieldIsBig() {
+ public function testLinkURLFieldIsBig() {
+ // @codingStandardsIgnoreEnd
$long_url = 'http://th.wikipedia.org/wiki/%E0%B9%82%E0%B8%A3%E0%B8%87%E0%B9%80%E0%B8%A3%E0%B8%B5%E0%B8%A2%E0%B8%99%E0%B9%80%E0%B8%9A%E0%B8%8D%E0%B8%88%E0%B8%A1%E0%B8%A3%E0%B8%B2%E0%B8%8A%E0%B8%B9%E0%B8%97%E0%B8%B4%E0%B8%A8_%E0%B8%99%E0%B8%84%E0%B8%A3%E0%B8%A8%E0%B8%A3%E0%B8%B5%E0%B8%98%E0%B8%A3%E0%B8%A3%E0%B8%A1%E0%B8%A3%E0%B8%B2%E0%B8%8A';
$this->link_test_validate_url($long_url);
}
@@ -350,12 +499,18 @@ class LinkValidateSpecificURL extends LinkValidateTestCase {
}
/**
- * A series of tests of links, only going against the link_validate_url function in link.module.
+ * Validate Url Light.
+ *
+ * A series of tests of links, only going against the link_validate_url function
+ * in link.module.
*
* Validation is guided by the rules in http://tools.ietf.org/html/rfc1738 !
*/
class LinkValidateUrlLight extends DrupalWebTestCase {
+ /**
+ * Get Info.
+ */
public static function getInfo() {
return array(
'name' => 'Link Light Validation Tests',
@@ -365,73 +520,117 @@ class LinkValidateUrlLight extends DrupalWebTestCase {
}
/**
- * Translates the LINK type constants to english for display and debugging of tests
+ * Setup.
*/
- function name_Link_Type($type) {
+ public function setUp() {
+ parent::setUp('link');
+ }
+
+ /**
+ * Name Link Type.
+ *
+ * Translates the LINK type constants to english for display and debugging of
+ * tests.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function name_Link_Type($type) {
+ // @codingStandardsIgnoreEnd
switch ($type) {
case LINK_FRONT:
return "Front";
+
case LINK_EMAIL:
return "Email";
+
case LINK_NEWS:
return "Newsgroup";
+
case LINK_INTERNAL:
return "Internal Link";
+
case LINK_EXTERNAL:
return "External Link";
+
case FALSE:
return "Invalid Link";
+
default:
return "Bad Value:" . $type;
}
}
- // Make sure that a link labelled works.
- function testValidateFrontLink() {
+ /**
+ * Make sure that a link labeled works.
+ */
+ public function testValidateFrontLink() {
$valid = link_validate_url('');
- $this->assertEqual(LINK_FRONT, $valid, 'Make sure that front link is verfied and identified');
+ $this->assertEqual(LINK_FRONT, $valid, 'Make sure that front link is verified and identified');
}
- function testValidateEmailLink() {
+ /**
+ * Validate Email Link.
+ */
+ public function testValidateEmailLink() {
$valid = link_validate_url('mailto:bob@example.com');
$this->assertEqual(LINK_EMAIL, $valid, "Make sure a basic mailto is verified and identified");
}
- function testValidateEmailLinkBad() {
+ /**
+ * Validate Email Link Bad.
+ */
+ public function testValidateEmailLinkBad() {
$valid = link_validate_url(':bob@example.com');
$this->assertEqual(FALSE, $valid, 'Make sure just a bad address is correctly failed');
}
- function testValidateNewsgroupLink() {
+ /**
+ * Validate Newsgroup Link.
+ */
+ public function testValidateNewsgroupLink() {
$valid = link_validate_url('news:comp.infosystems.www.misc');
$this->assertEqual(LINK_NEWS, $valid, 'Make sure link to newsgroup validates as news.');
}
- function testValidateNewsArticleLink() {
+ /**
+ * Validate News Article Link.
+ */
+ public function testValidateNewsArticleLink() {
$valid = link_validate_url('news:hj0db8$vrm$1@news.eternal-september.org');
- $this->assertEqual(LINK_NEWS, $valid, 'Make sure link to specific article valiates as news.');
+ $this->assertEqual(LINK_NEWS, $valid, 'Make sure link to specific article validates as news.');
}
- function testValidateBadNewsgroupLink() {
+ /**
+ * Validate Bad Newsgroup Link.
+ */
+ public function testValidateBadNewsgroupLink() {
$valid = link_validate_url('news:comp.bad_name.misc');
$this->assertEqual(FALSE, $valid, 'newsgroup names can\'t contain underscores, so it should come back as invalid.');
}
- function testValidateInternalLinks() {
+ /**
+ * Validate Internal Links.
+ */
+ public function testValidateInternalLinks() {
+ $tempfile = drupal_tempnam('public://files', 'test');
$links = array(
- 'node/5',
'rss.xml',
- 'files/test.jpg',
- '/var/www/test',
+ file_uri_target($tempfile),
+ drupal_realpath($tempfile),
);
-
+
foreach ($links as $link) {
+ $type = link_url_type($link);
+ $this->assertEqual(LINK_INTERNAL, $type, 'Test ' . $link . ' is an internal link.');
$valid = link_validate_url($link);
- $this->assertEqual(LINK_INTERNAL, $valid, 'Test ' . $link . ' internal link.');
+ $this->assertTrue($valid, 'Test ' . $link . ' is valid internal link.');
}
}
- function testValidateExternalLinks() {
+ /**
+ * Validate External Links.
+ */
+ public function testValidateExternalLinks() {
$links = array(
'http://localhost:8080/',
'www.example.com',
@@ -446,9 +645,8 @@ class LinkValidateUrlLight extends DrupalWebTestCase {
'http://255.255.255.255:4823/',
'www.test-site.com',
'http://example.com/index.php?q=node/123',
- 'http://example.com/index.php?page=this\that',
'http://example.com/?first_name=Joe Bob&last_name=Smith',
- // Anchors
+ // Anchors.
'http://www.example.com/index.php#test',
'http://www.example.com/index.php#this@that.',
'http://www.example.com/index.php#',
@@ -456,39 +654,61 @@ class LinkValidateUrlLight extends DrupalWebTestCase {
'http://www.archive.org/stream/aesopsfables00aesorich#page/n7/mode/2up',
'http://www.example.com/blah/#this@that?',
);
+
// Test all of the protocols.
- $allowed_protocols = variable_get('filter_allowed_protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal'));
+ $allowed_protocols = variable_get('filter_allowed_protocols', array(
+ 'http',
+ 'https',
+ 'ftp',
+ 'news',
+ 'nntp',
+ 'telnet',
+ 'mailto',
+ 'irc',
+ 'ssh',
+ 'sftp',
+ 'webcal',
+ ));
+
foreach ($allowed_protocols as $protocol) {
if ($protocol !== 'news' && $protocol !== 'mailto') {
$links[] = $protocol . '://www.example.com';
}
}
foreach ($links as $link) {
+ $type = link_url_type($link);
+ $this->assertEqual(LINK_EXTERNAL, $type, 'Testing that ' . $link . ' is an external link.');
$valid = link_validate_url($link);
- $this->assertEqual(LINK_EXTERNAL, $valid, 'Testing that ' . $link . ' is a valid external link.');
- // The following two lines are commented out and only used for comparisons.
- //$valid2 = valid_url($link, TRUE);
- //$this->assertEqual(TRUE, $valid2, "Using valid_url() on $link.");
+ $this->assertTrue($valid, 'Test ' . $link . ' is valid external link.');
+ // The following two lines are commented out and only used for
+ // comparisons.
+ // $valid2 = valid_url($link, TRUE);
+ // $this->assertEqual(TRUE, $valid2, "Using valid_url() on $link.");.
}
- // Test if we can make a tld valid:
- variable_set('link_extra_domains', array('frog'));
- $valid = link_validate_url('http://www.example.frog');
- $this->assertEqual(LINK_EXTERNAL, $valid, "Testing that http://www.example.frog is a valid external link if we've added 'frog' to the list of valid domains.");
}
- function testInvalidExternalLinks() {
+ /**
+ * Check Invalid External Links.
+ */
+ public function testInvalidExternalLinks() {
$links = array(
'http://www.ex ample.com/',
- 'http://25.0.0/', // bad ip!
+ // Bad ip!
+ 'http://25.0.0/',
'http://4827.0.0.2/',
- '//www.example.com/',
- 'http://www.testß.com/', // ß not allowed in domain names!
- 'http://www.example.frog/', // Bad TLD
- //'http://www.-fudge.com/', // domains can't have sections starting with a dash.
+ // ß not allowed in domain names!
+ 'http://www.testß.com/',
+ // Bad TLD.
+ 'http://.www.foo.bar./',
+ // Domains can't have sections starting with a dash.
+ // 'http://www.-fudge.com/',
+ 'http://example.com/index.php?page=this\that',
+ 'example@example.com',
);
foreach ($links as $link) {
$valid = link_validate_url($link);
$this->assertEqual(FALSE, $valid, 'Testing that ' . $link . ' is not a valid link.');
}
}
+
}
diff --git a/sites/all/modules/contrib/fields/link/views/link.views.inc b/sites/all/modules/contrib/fields/link/views/link.views.inc
index 27d5182..8c080ad 100644
--- a/sites/all/modules/contrib/fields/link/views/link.views.inc
+++ b/sites/all/modules/contrib/fields/link/views/link.views.inc
@@ -1,4 +1,7 @@
default_actions();
$form['title'] = array(
@@ -52,7 +58,7 @@ class link_views_handler_argument_target extends views_handler_argument {
$form['wildcard'] = array(
'#prefix' => '',
- // prefix and no suffix means these two items will be grouped together.
+ // Prefix and no suffix means these two items will be grouped together.
'#type' => 'textfield',
'#title' => t('Wildcard'),
'#size' => 20,
@@ -125,8 +131,8 @@ class link_views_handler_argument_target extends views_handler_argument {
asort($validate_types);
$form['validate_type']['#options'] = $validate_types;
- // Show this gadget if *anything* but 'none' is selected
+ // Show this gadget if *anything* but 'none' is selected.
$form['validate_fail'] = array(
'#type' => 'select',
'#title' => t('Action to take if argument does not validate'),
@@ -140,10 +146,11 @@ class link_views_handler_argument_target extends views_handler_argument {
*
* The argument sent may be found at $this->argument.
*/
- function query($group_by = FALSE) {
+ public function query($group_by = FALSE) {
$this->ensure_my_table();
// Because attributes are stored serialized, our only option is to also
// serialize the data we're searching for and use LIKE to find similar data.
$this->query->add_where(0, $this->table_alias . ' . ' . $this->real_field . " LIKE '%%%s%'", serialize(array('target' => $this->argument)));
}
+
}
diff --git a/sites/all/modules/contrib/fields/link/views/link_views_handler_filter_protocol.inc b/sites/all/modules/contrib/fields/link/views/link_views_handler_filter_protocol.inc
index a020b4e..ae00c17 100644
--- a/sites/all/modules/contrib/fields/link/views/link_views_handler_filter_protocol.inc
+++ b/sites/all/modules/contrib/fields/link/views/link_views_handler_filter_protocol.inc
@@ -7,22 +7,30 @@
/**
* Filter handler for limiting a view to URLs of a certain protocol.
+ *
+ * @codingStandardsIgnoreStart
*/
class link_views_handler_filter_protocol extends views_handler_filter_string {
+
/**
* Set defaults for the filter options.
+ *
+ * @codingStandardsIgnoreEnd
*/
- function options(&$options) {
- parent::options($options);
+ function option_definition() {
+ $options = parent::option_definition();
+
$options['operator'] = 'OR';
$options['value'] = 'http';
$options['case'] = 0;
+
+ return $options;
}
/**
* Define the operators supported for protocols.
*/
- function operators() {
+ public function operators() {
$operators = array(
'OR' => array(
'title' => t('Is one of'),
@@ -35,7 +43,13 @@ class link_views_handler_filter_protocol extends views_handler_filter_string {
return $operators;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * Options form.
+ *
+ * @codingStandardsIgnoreStart
+ */
+ public function options_form(&$form, &$form_state) {
+ //@codingStandardsIgnoreEnd
parent::options_form($form, $form_state);
$form['case'] = array(
'#type' => 'value',
@@ -45,8 +59,11 @@ class link_views_handler_filter_protocol extends views_handler_filter_string {
/**
* Provide a select list to choose the desired protocols.
+ *
+ * @codingStandardsIgnoreStart
*/
- function value_form(&$form, &$form_state) {
+ public function value_form(&$form, &$form_state) {
+ // @codingStandardsIgnoreEnd
// We have to make some choices when creating this as an exposed
// filter form. For example, if the operator is locked and thus
// not rendered, we can't render dependencies; instead we only
@@ -61,7 +78,19 @@ class link_views_handler_filter_protocol extends views_handler_filter_string {
'#type' => 'select',
'#title' => t('Protocol'),
'#default_value' => $this->value,
- '#options' => drupal_map_assoc(variable_get('filter_allowed_protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal'))),
+ '#options' => drupal_map_assoc(variable_get('filter_allowed_protocols', array(
+ 'http',
+ 'https',
+ 'ftp',
+ 'news',
+ 'nntp',
+ 'telnet',
+ 'mailto',
+ 'irc',
+ 'ssh',
+ 'sftp',
+ 'webcal',
+ ))),
'#multiple' => 1,
'#size' => 4,
'#description' => t('The protocols displayed here are those globally available. You may add more protocols by modifying the filter_allowed_protocols variable in your installation.'),
@@ -71,8 +100,11 @@ class link_views_handler_filter_protocol extends views_handler_filter_string {
/**
* Filter down the query to include only the selected protocols.
+ *
+ * @codingStandardsIgnoreStart
*/
- function op_protocol($field, $upper) {
+ public function op_protocol($field, $upper) {
+ // @codingStandardsIgnoreEnd
$db_type = db_driver();
$protocols = $this->value;
@@ -82,20 +114,25 @@ class link_views_handler_filter_protocol extends views_handler_filter_string {
// Simple case, the URL begins with the specified protocol.
$condition = $field . ' LIKE \'' . $protocol . '%\'';
- // More complex case, no protocol specified but is automatically cleaned up
- // by link_cleanup_url(). RegEx is required for this search operation.
+ // More complex case, no protocol specified but is automatically cleaned
+ // up by link_cleanup_url(). RegEx is required for this search operation.
if ($protocol == 'http') {
- $LINK_DOMAINS = _link_domains();
+ $link_domains = _link_domains();
if ($db_type == 'pgsql') {
- // PostGreSQL code has NOT been tested. Please report any problems to the link issue queue.
- // pgSQL requires all slashes to be double escaped in regular expressions.
+ // PostGreSQL code has NOT been tested. Please report any problems to
+ // the link issue queue.
+ // pgSQL requires all slashes to be double escaped in regular
+ // expressions.
+ // @codingStandardsIgnoreLine
// See http://www.postgresql.org/docs/8.1/static/functions-matching.html#FUNCTIONS-POSIX-REGEXP
- $condition .= ' OR ' . $field . ' ~* \'' . '^(([a-z0-9]([a-z0-9\\-_]*\\.)+)(' . $LINK_DOMAINS . '|[a-z][a-z]))' . '\'';
+ $condition .= ' OR ' . $field . ' ~* \'' . '^(([a-z0-9]([a-z0-9\\-_]*\\.)+)(' . $link_domains . '|[a-z][a-z]))' . '\'';
}
else {
- // mySQL requires backslashes to be double (triple?) escaped within character classes.
+ // mySQL requires backslashes to be double (triple?) escaped within
+ // character classes.
+ // @codingStandardsIgnoreLine
// See http://dev.mysql.com/doc/refman/5.0/en/string-comparison-functions.html#operator_regexp
- $condition .= ' OR ' . $field . ' REGEXP \'' . '^(([a-z0-9]([a-z0-9\\\-_]*\.)+)(' . $LINK_DOMAINS . '|[a-z][a-z]))' . '\'';
+ $condition .= ' OR ' . $field . ' REGEXP \'' . '^(([a-z0-9]([a-z0-9\\\-_]*\.)+)(' . $link_domains . '|[a-z][a-z]))' . '\'';
}
}
@@ -104,4 +141,5 @@ class link_views_handler_filter_protocol extends views_handler_filter_string {
$this->query->add_where($this->options['group'], implode(' ' . $this->operator . ' ', $where_conditions));
}
+
}
diff --git a/sites/all/modules/contrib/fields/title/CHANGELOG.txt b/sites/all/modules/contrib/fields/title/CHANGELOG.txt
index 3ccce43..c34f12d 100644
--- a/sites/all/modules/contrib/fields/title/CHANGELOG.txt
+++ b/sites/all/modules/contrib/fields/title/CHANGELOG.txt
@@ -3,6 +3,46 @@ Title 7.x-1.x, xxxx-xx-xx
-------------------------
+Title 7.x-1.0-alpha9, 2017-01-13
+--------------------------------
+#2757739 by dewalt, Pol: Token value is not sanitized, when replaced from title field.
+#2813673 by plach, czigor, Stevel: Tests broken since new permission in drupal core.
+
+
+Title 7.x-1.0-alpha8, 2016-03-28
+--------------------------------
+#2465141 by DuaelFr, Matthijs, jfrederick: Used entity_uri() options if given.
+#2602568 by sdstyles: Fixed title_entity_label() should be documented as
+ callback implementation.
+#2605040 by ShaxA, joelpittet, sylus: Removed recursive call to
+ entity_get_info().
+#2040055 by flux423, cs_shadow, visabhishek, plach, OlyN: Fixed Notice:
+ Undefined index: safe_value in title_field_formatter_view().
+#2426105 by Peacog, jcisio: Fixed Views "Link this field to the original entity"
+ doesn't work when using relationship.
+#2286147 by plach: Language fallback does not work when an entity translation is
+ unpublished.
+#2286145 by plach: Prevent empty translations from being synced into the legacy
+ field.
+#1772116 by duellj, GaëlG | f4o: Fixed Menu link title is not getting node title
+ by default.
+#1779268 by ndobromirov | brycesenz: Undefined index: field_name in
+ title_field_views_data_alter().
+#1441224 by MiroslavBanov | OPIN: Fieldgroup and Title break Manage Fields UI.
+#1980520 by StoraH, pbz1912: Fixed Empty wrapper tags.
+#1920096 by Johnny vd Laar | GiorgosK: Fixed Title incompatibility with the Term
+ reference widget
+#1991712 by milesw: Fixed Title displays wrong revision using Revisioning
+ module.
+#1907078 by sylus: Fixed Undefined index: field_name() in
+ title_field_replacement_enabled().
+#1961810 by peximo | fcortez: Fixed Wrap tag classes are not being inserted.
+#1850866 by B-Prod: Fixed Undefined index 'format' in
+ title_field_text_with_summary_sync_set().
+#1269076 by plach, das-peter, danielnolde | renat: Fixed Translated
+ title_field replaces node->title with translated value.
+
+
Title 7.x-1.0-alpha7, 2013-03-18
--------------------------------
#1919640 by peximo: Fixed Empty tag shown when the title field is displayed.
diff --git a/sites/all/modules/contrib/fields/title/MAINTAINERS.txt b/sites/all/modules/contrib/fields/title/MAINTAINERS.txt
new file mode 100644
index 0000000..f20ad65
--- /dev/null
+++ b/sites/all/modules/contrib/fields/title/MAINTAINERS.txt
@@ -0,0 +1,13 @@
+
+Title is built and maintained by the Drupal project community.
+Everyone is encouraged to submit issues and changes (patches) to improve it, and
+to contribute in other ways -- see http://drupal.org/contribute to find out how.
+
+Project maintainers
+-------------------
+
+The Title maintainers oversee the development of the project as a whole. The project
+maintainers for Title are:
+
+- Francesco Placella 'plach' , branch 7.x-1.x
+- Sam Becker 'Sam152' , branch 8.x-2.x
diff --git a/sites/all/modules/contrib/fields/title/tests/title.test b/sites/all/modules/contrib/fields/title/tests/title.test
index e88eb52..e66d095 100644
--- a/sites/all/modules/contrib/fields/title/tests/title.test
+++ b/sites/all/modules/contrib/fields/title/tests/title.test
@@ -9,6 +9,7 @@
* Tests for legacy field replacement.
*/
class TitleFieldReplacementTestCase extends DrupalWebTestCase {
+
public static function getInfo() {
return array(
'name' => 'Field replacement',
@@ -17,14 +18,17 @@ class TitleFieldReplacementTestCase extends DrupalWebTestCase {
);
}
- function setUp() {
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
parent::setUp('entity', 'field_test', 'title', 'title_test');
}
/**
* Test field replacement API and workflow.
*/
- function testFieldReplacementWorkflow() {
+ public function testFieldReplacementWorkflow() {
$info = entity_get_info('test_entity');
$label_key = $info['entity keys']['label'];
$field_name = $label_key . '_field';
@@ -72,12 +76,13 @@ class TitleFieldReplacementTestCase extends DrupalWebTestCase {
// Clear field cache so synchronization can be performed on field attach
// load.
cache_clear_all('*', 'cache_field');
+ drupal_static_reset();
// Check that the replacing field value is correctly synchronized on load
// and view.
$entity = title_test_entity_test_load($entity);
title_test_phase_check('after_load', $entity);
- $build = entity_view('test_entity', array($entity->ftid => $entity));
+ entity_view('test_entity', array($entity->ftid => $entity));
foreach (title_test_phase_store() as $phase => $value) {
$this->assertTrue($value, t('Field synchronization is correctly performed on %phase.', array('%phase' => $phase)));
@@ -94,8 +99,16 @@ class TitleFieldReplacementTestCase extends DrupalWebTestCase {
/**
* Test field replacement UI.
*/
- function testFieldReplacementUI() {
- $admin_user = $this->drupalCreateUser(array('access administration pages', 'view the administration theme', 'administer content types', 'administer taxonomy', 'administer comments'));
+ public function testFieldReplacementUI() {
+ $permissions = array(
+ 'access administration pages',
+ 'view the administration theme',
+ 'administer content types',
+ 'administer taxonomy',
+ 'administer comments',
+ 'administer fields',
+ );
+ $admin_user = $this->drupalCreateUser($permissions);
$this->drupalLogin($admin_user);
foreach (entity_get_info() as $entity_type => $entity_info) {
@@ -146,12 +159,14 @@ class TitleFieldReplacementTestCase extends DrupalWebTestCase {
}
}
}
+
}
/**
* Tests for legacy field replacement.
*/
class TitleAdminSettingsTestCase extends DrupalWebTestCase {
+
public static function getInfo() {
return array(
'name' => 'Admin settings',
@@ -160,7 +175,10 @@ class TitleAdminSettingsTestCase extends DrupalWebTestCase {
);
}
- function setUp() {
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
parent::setUp('field_test', 'title', 'title_test');
$admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer taxonomy'));
$this->drupalLogin($admin_user);
@@ -169,15 +187,18 @@ class TitleAdminSettingsTestCase extends DrupalWebTestCase {
/**
* Check for automated title_field attachment.
*/
- function testAutomatedFieldAttachement() {
- $this->assertAutomatedFieldAttachement(TRUE);
- $this->assertAutomatedFieldAttachement(FALSE);
+ public function testAutomatedFieldAttachment() {
+ $this->doTestAutomatedFieldAttachment(TRUE);
+ $this->doTestAutomatedFieldAttachment(FALSE);
}
/**
- * Check that the fields are replaced or skipped depdening on the given value.
+ * Check that the fields are replaced or skipped depending on the given value.
+ *
+ * @param bool $enabled
+ * Whether replacement is enabled or not.
*/
- function assertAutomatedFieldAttachement($enabled) {
+ public function doTestAutomatedFieldAttachment($enabled) {
$edit = array(
'title_taxonomy_term[auto_attach][name]' => $enabled,
'title_taxonomy_term[auto_attach][description]' => $enabled,
@@ -197,12 +218,14 @@ class TitleAdminSettingsTestCase extends DrupalWebTestCase {
$this->assertTrue(title_field_replacement_enabled($entity_type, $bundle, 'name') == $enabled, 'Name field correctly processed.');
$this->assertTrue(title_field_replacement_enabled($entity_type, $bundle, 'description') == $enabled, 'Description field correctly processed.');
}
+
}
/**
* Tests for legacy field replacement.
*/
class TitleTranslationTestCase extends DrupalWebTestCase {
+
public static function getInfo() {
return array(
'name' => 'Replaced fields translation',
@@ -211,11 +234,22 @@ class TitleTranslationTestCase extends DrupalWebTestCase {
);
}
- function setUp() {
- parent::setUp('locale', 'entity_translation', 'title');
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp('locale', 'entity_translation', 'title', 'field_test', 'title_test');
// Create a power user.
- $admin_user = $this->drupalCreateUser(array('administer modules', 'view the administration theme', 'administer languages', 'administer taxonomy', 'administer entity translation', 'translate any entity'));
+ $permissions = array(
+ 'administer modules',
+ 'view the administration theme',
+ 'administer languages',
+ 'administer taxonomy',
+ 'administer entity translation',
+ 'translate any entity',
+ );
+ $admin_user = $this->drupalCreateUser($permissions);
$this->drupalLogin($admin_user);
// Enable a translation language.
@@ -240,6 +274,7 @@ class TitleTranslationTestCase extends DrupalWebTestCase {
$edit = array(
'name' => $this->randomString(),
'machine_name' => $name,
+ 'entity_translation_taxonomy' => 1,
);
$this->drupalPost('admin/structure/taxonomy/add', $edit, t('Save'));
$this->vocabulary = taxonomy_vocabulary_machine_name_load($name);
@@ -252,19 +287,118 @@ class TitleTranslationTestCase extends DrupalWebTestCase {
$t_args = array('%legacy_field' => $legacy_field);
$this->assertTrue(field_info_instance($entity_type, $info['field']['field_name'], $name), t('The %legacy_field field has been correctly replaced.', $t_args));
}
+
+ // Ensure static caches do not interfere with API calls.
+ drupal_static_reset();
}
/**
- * Test taxonomy translation workflow.
+ * Tests taxonomy programmatic translation workflow.
*/
- function testTranslationWorkflow() {
+ public function testProgrammaticTranslationWorkflow() {
+ // Create a taxonomy term and assign it an original language different from
+ // the default language.
+ $langcode = 'it';
+ $original_values = array(
+ 'name' => $langcode . '_' . $this->randomName(),
+ 'description' => $langcode . '_' . $this->randomName(),
+ );
+ $term = (object) ($original_values + array(
+ 'format' => 'filtered_html',
+ 'vocabulary_machine_name' => $this->vocabulary->machine_name,
+ 'vid' => $this->vocabulary->vid,
+ ));
+ entity_translation_get_handler('taxonomy_term', $term)->setOriginalLanguage($langcode);
+ taxonomy_term_save($term);
+ $this->assertTrue($this->checkLegacyValues($term, $original_values), 'Legacy field values correctly stored.');
+ $term = $this->termLoad($term->tid);
+ $this->assertTrue($this->checkFieldValues($term, $original_values, $langcode), 'Replacing field values correctly created from the legacy field values.');
+
+ // Pollute synchronization cache to ensure the expected values are stored
+ // anyway.
+ title_entity_sync('taxonomy_term', $term, $langcode);
+
+ // Create a translation using the default language.
+ $translation_langcode = language_default()->language;
+ $translated_values = array(
+ 'name' => $translation_langcode . '_' . $this->randomName(),
+ 'description' => $translation_langcode . '_' . $this->randomName(),
+ );
+ foreach ($translated_values as $name => $value) {
+ $term->{$name} = $value;
+ }
+ $translation = array(
+ 'language' => $translation_langcode,
+ 'source' => $langcode,
+ 'uid' => $this->loggedInUser->uid,
+ 'status' => 1,
+ 'translate' => 0,
+ 'created' => REQUEST_TIME,
+ 'changed' => REQUEST_TIME,
+ );
+ entity_translation_get_handler('taxonomy_term', $term)->setTranslation($translation);
+ taxonomy_term_save($term);
+ $this->assertTrue($this->checkLegacyValues($term, $original_values), 'Legacy field values correctly stored.');
+ $term = $this->termLoad($term->tid, $translation_langcode);
+ $this->assertTrue($this->checkFieldValues($term, $translated_values, $translation_langcode), 'Replacing field translations correctly created.');
+ $this->assertTrue($this->checkFieldValues($term, $original_values, $langcode, FALSE), 'Replacing field original values correctly preserved.');
+
+ // Delete the translation.
+ entity_translation_get_handler('taxonomy_term', $term)->removeTranslation($translation_langcode);
+ taxonomy_term_save($term);
+ $this->assertTrue($this->checkLegacyValues($term, $original_values), 'Legacy field values correctly stored.');
+ $term = $this->termLoad($term->tid, $langcode);
+ $this->assertTrue($this->checkFieldValues($term, $original_values, $langcode), 'Replacing field translations correctly deleted.');
+
+ // Make the term language neutral.
+ entity_translation_get_handler('taxonomy_term', $term)->setOriginalLanguage(LANGUAGE_NONE);
+ foreach ($original_values as $name => $value) {
+ $field_name = $name . '_field';
+ $term->{$field_name}[LANGUAGE_NONE] = $term->{$field_name}[$langcode];
+ $term->{$field_name}[$langcode] = array();
+ }
+ taxonomy_term_save($term);
+ $this->assertTrue($this->checkLegacyValues($term, $original_values), 'Legacy field values correctly stored.');
+ $term = $this->termLoad($term->tid);
+ $this->assertTrue($this->checkFieldValues($term, $original_values, LANGUAGE_NONE), 'Term original language correctly changed to the former translation language.');
+
+ // Change the term language to the former translation language.
+ entity_translation_get_handler('taxonomy_term', $term)->setOriginalLanguage($translation_langcode);
+ foreach ($original_values as $name => $value) {
+ $field_name = $name . '_field';
+ $term->{$field_name}[$translation_langcode] = $term->{$field_name}[LANGUAGE_NONE];
+ $term->{$field_name}[LANGUAGE_NONE] = array();
+ }
+ taxonomy_term_save($term);
+ $this->assertTrue($this->checkLegacyValues($term, $original_values), 'Legacy field values correctly stored.');
+ $term = $this->termLoad($term->tid, $translation_langcode);
+ $this->assertTrue($this->checkFieldValues($term, $original_values, $translation_langcode), 'Term original language correctly changed to language neutral.');
+
+ // Make a replacing field untranslatable and change its value.
+ $field_name = 'name_field';
+ $field = field_info_field($field_name);
+ $field['translatable'] = FALSE;
+ field_update_field($field);
+ $original_values['name'] = LANGUAGE_NONE . '_' . $this->randomName();
+ $term->name = $original_values['name'];
+ taxonomy_term_save($term);
+ $this->assertTrue($this->checkLegacyValues($term, $original_values), 'Legacy field values correctly stored.');
+ $term = $this->termLoad($term->tid);
+ $this->assertEqual($term->{$field_name}[LANGUAGE_NONE][0]['value'], $original_values['name'], 'Untranslatable replacing field on translatable entity correctly handled.');
+ }
+
+ /**
+ * Tests taxonomy form translation workflow.
+ */
+ public function testFormTranslationWorkflow() {
// Create a taxonomy term and check that legacy fields are properly
// populated.
$original_values = array(
'name' => $this->randomName(),
'description' => $this->randomName(),
);
- $edit = $this->editValues($original_values, 'en');
+ $langcode = 'en';
+ $edit = $this->editValues($original_values, $langcode);
$this->drupalPost('admin/structure/taxonomy/' . $this->vocabulary->machine_name . '/add', $edit, t('Save'));
$term = current(entity_load('taxonomy_term', FALSE, array('name' => $original_values['name']), TRUE));
$this->assertEqual($term->description, $original_values['description'], t('Taxonomy term created.'));
@@ -275,11 +409,12 @@ class TitleTranslationTestCase extends DrupalWebTestCase {
'name' => $this->randomName(),
'description' => $this->randomName(),
);
+ $translation_langcode = 'it';
$edit = $this->editValues($translated_values, 'it');
- $this->drupalPost('it/taxonomy/term/' . $term->tid . '/edit/add/en/it', $edit, t('Save'));
- $term = current(entity_load('taxonomy_term', array($term->tid), array(), TRUE));
- $this->assertTrue($this->checkFieldValues($term, $translated_values, 'it'), t('Taxonomy term translation created.'));
- $this->assertTrue($this->checkFieldValues($term, $original_values, 'en'), t('Taxonomy term original values preserved.'));
+ $this->drupalPost($translation_langcode . '/taxonomy/term/' . $term->tid . '/edit/add/' . $langcode . '/' . $translation_langcode, $edit, t('Save'));
+ $term = $this->termLoad($term->tid);
+ $this->assertTrue($this->checkFieldValues($term, $translated_values, $translation_langcode, FALSE), t('Taxonomy term translation created.'));
+ $this->assertTrue($this->checkFieldValues($term, $original_values, $langcode), t('Taxonomy term original values preserved.'));
// Check that legacy fields have the correct values.
$this->assertEqual($term->name, $original_values['name'], t('Taxonomy term name correctly stored.'));
@@ -291,31 +426,69 @@ class TitleTranslationTestCase extends DrupalWebTestCase {
'name' => $this->randomName(),
'description' => $this->randomName(),
);
- $edit = $this->editValues($translated_values, 'it');
- $this->drupalPost('it/taxonomy/term/' . $term->tid . '/edit/it', $edit, t('Save'));
- $term = current(entity_load('taxonomy_term', array($term->tid), array(), TRUE));
- $this->assertTrue($this->checkFieldValues($term, $translated_values, 'it'), t('Taxonomy term translation updated.'));
- $this->assertTrue($this->checkFieldValues($term, $original_values, 'en'), t('Taxonomy term original values preserved.'));
+ $edit = $this->editValues($translated_values, $translation_langcode);
+ $this->drupalPost($translation_langcode . '/taxonomy/term/' . $term->tid . '/edit/' . $translation_langcode, $edit, t('Save'));
+ $term = $this->termLoad($term->tid);
+ $this->assertTrue($this->checkFieldValues($term, $translated_values, $translation_langcode, FALSE), t('Taxonomy term translation updated.'));
+ $this->assertTrue($this->checkFieldValues($term, $original_values, $langcode), t('Taxonomy term original values preserved.'));
// Check that legacy fields have the correct values.
$this->assertEqual($term->name, $original_values['name'], t('Taxonomy term name correctly stored.'));
$this->assertEqual($term->description, $original_values['description'], t('Taxonomy term description correctly stored.'));
}
+ /**
+ * Loads a term using the given language as active language.
+ *
+ * @param int $tid
+ * The term identifier.
+ * @param string|null $langcode
+ * (optional) The active language to be set. Defaults to none.
+ *
+ * @return object|bool
+ * A term object.
+ */
+ protected function termLoad($tid, $langcode = NULL) {
+ drupal_static_reset();
+ title_active_language($langcode);
+ return current(entity_load('taxonomy_term', array($tid), array(), TRUE));
+ }
+
+ /**
+ * Returns the drupalPost() $edit array corresponding to the given values.
+ */
protected function editValues($values, $langcode) {
$edit = array();
- foreach ($values as $key => $value) {
- $edit["{$key}_field[{$langcode}][0][value]"] = $value;
+ foreach ($values as $name => $value) {
+ $edit["{$name}_field[{$langcode}][0][value]"] = $value;
}
return $edit;
}
- protected function checkFieldValues($term, $values, $langcode) {
- foreach ($values as $key => $value) {
- if ($term->{$key . '_field'}[$langcode][0]['value'] != $value) {
+ /**
+ * Checks that the field values and optionally the legacy ones match the given values.
+ */
+ protected function checkFieldValues($term, $values, $langcode, $legacy_match = TRUE) {
+ foreach ($values as $name => $value) {
+ $field_value = $term->{$name . '_field'}[$langcode][0]['value'];
+ if ($field_value != $value || ($legacy_match !== ($field_value == $term->{$name}))) {
return FALSE;
}
}
return TRUE;
}
+
+ /**
+ * Checks that the legacy field values stored in the database match the given values.
+ */
+ protected function checkLegacyValues($term, $values) {
+ $record = db_query('SELECT * FROM {taxonomy_term_data} t WHERE t.tid = :tid', array(':tid' => $term->tid))->fetchAssoc();
+ foreach ($values as $name => $value) {
+ if ($record[$name] != $value) {
+ return FALSE;
+ }
+ }
+ return TRUE;
+ }
+
}
diff --git a/sites/all/modules/contrib/fields/title/tests/title_test.info b/sites/all/modules/contrib/fields/title/tests/title_test.info
index 45846d3..1e5d2e5 100644
--- a/sites/all/modules/contrib/fields/title/tests/title_test.info
+++ b/sites/all/modules/contrib/fields/title/tests/title_test.info
@@ -7,9 +7,9 @@ dependencies[] = title
dependencies[] = entity
dependencies[] = entity_translation
-; Information added by drupal.org packaging script on 2013-03-18
-version = "7.x-1.0-alpha7"
+; Information added by Drupal.org packaging script on 2017-01-13
+version = "7.x-1.0-alpha9"
core = "7.x"
project = "title"
-datestamp = "1363626024"
+datestamp = "1484302985"
diff --git a/sites/all/modules/contrib/fields/title/title.admin.inc b/sites/all/modules/contrib/fields/title/title.admin.inc
index 9cb0065..380cabe 100644
--- a/sites/all/modules/contrib/fields/title/title.admin.inc
+++ b/sites/all/modules/contrib/fields/title/title.admin.inc
@@ -14,20 +14,16 @@ function title_form_field_ui_overview(&$form, &$form_state) {
if (!empty($entity_info['field replacement'])) {
$field_replacement_info = $entity_info['field replacement'];
$admin_path = _field_ui_bundle_admin_path($form['#entity_type'], $form['#bundle']);
- $form['fields']['#header'][6]['colspan'] += 1;
foreach (element_children($form['fields']) as $field_name) {
if (isset($field_replacement_info[$field_name])) {
- $form['fields'][$field_name]['field_replacement'] = array(
+ $form['fields'][$field_name]['delete'] = array(
'#type' => 'link',
'#title' => t('replace'),
'#href' => $admin_path . '/fields/replace/' . $field_name,
'#options' => array('attributes' => array('title' => t('Replace %field with a customizable field instance that can be translated.', array('%field' => $field_name)))),
);
}
- else {
- $form['fields'][$field_name]['field_replacement'] = array();
- }
}
}
}
diff --git a/sites/all/modules/contrib/fields/title/title.core.inc b/sites/all/modules/contrib/fields/title/title.core.inc
index d75e656..2af63f9 100644
--- a/sites/all/modules/contrib/fields/title/title.core.inc
+++ b/sites/all/modules/contrib/fields/title/title.core.inc
@@ -127,7 +127,7 @@ function title_field_text_sync_get($entity_type, $entity, $legacy_field, $info,
$items = $entity->{$field_name}[$langcode];
$value = !empty($items[0]['value']) ? $items[0]['value'] : NULL;
}
- return $value;
+ return array($legacy_field => $value);
}
/**
@@ -142,25 +142,31 @@ function title_field_text_sync_set($entity_type, $entity, $legacy_field, $info,
*/
function title_field_text_with_summary_sync_get($entity_type, $entity, $legacy_field, $info, $langcode) {
$value = NULL;
+ $format = NULL;
$format_key = $info['additional keys']['format'];
$field_name = $info['field']['field_name'];
// Return values only if there is any available to process for the current
// language.
if (!empty($entity->{$field_name}[$langcode]) && is_array($entity->{$field_name}[$langcode])) {
- $entity->{$format_key} = $entity->{$field_name}[$langcode][0]['format'];
$items = $entity->{$field_name}[$langcode];
$value = !empty($items[0]['value']) ? $items[0]['value'] : NULL;
+ $format = $entity->{$field_name}[$langcode][0]['format'];
}
- return $value;
+ return array(
+ $legacy_field => $value,
+ $format_key => $format,
+ );
}
/**
* Sync back callback for the text with summary field type.
*/
function title_field_text_with_summary_sync_set($entity_type, $entity, $legacy_field, $info, $langcode) {
- $format_key = $info['additional keys']['format'];
- $entity->{$info['field']['field_name']}[$langcode][0]['value'] = $entity->{$legacy_field};
- $entity->{$info['field']['field_name']}[$langcode][0]['format'] = $entity->{$format_key};
+ foreach (array('value' => $legacy_field, 'format' => $info['additional keys']['format']) as $column => $name) {
+ if (isset($entity->{$name})) {
+ $entity->{$info['field']['field_name']}[$langcode][0][$column] = $entity->{$name};
+ }
+ }
}
/**
diff --git a/sites/all/modules/contrib/fields/title/title.field.inc b/sites/all/modules/contrib/fields/title/title.field.inc
index d94905b..1523fc1 100644
--- a/sites/all/modules/contrib/fields/title/title.field.inc
+++ b/sites/all/modules/contrib/fields/title/title.field.inc
@@ -97,36 +97,48 @@ function title_field_formatter_settings_summary($field, $instance, $view_mode) {
*/
function title_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
$settings = $display['settings'];
- $output = isset($items[0]) ? $items[0]['safe_value'] : '';
-
- if (!empty($output) && $settings['title_link'] == 'content') {
- $uri = entity_uri($entity_type, $entity);
- $output = l($output, $uri['path'], array('html' => TRUE));
+ $output = '';
+ if (isset($items[0]['safe_value'])) {
+ $output = $items[0]['safe_value'];
}
+ elseif (isset($items[0]['value'])) {
+ $output = _text_sanitize($instance, $langcode, $items[0], 'value');
+ }
+ $element = array();
- $wrap_tag = empty($settings['title_style']) ? '_none' : $settings['title_style'];
-
- if ($wrap_tag != '_none') {
- $element = array(
- 'element' => array(
- '#tag' => $wrap_tag,
- '#value' => $output,
- ),
- );
-
- if (!empty($settings['title_class'])) {
- $element['#attributes'] = array('class' => $settings['title_class']);
+ if (!empty($output)) {
+ if ($settings['title_link'] == 'content') {
+ $uri = entity_uri($entity_type, $entity);
+ $options = array('html' => TRUE);
+ if (!empty($uri['options'])) {
+ $options = array_merge($options, $uri['options']);
+ }
+ $output = l($output, $uri['path'], $options);
}
- $output = theme('html_tag', $element);
+ $wrap_tag = empty($settings['title_style']) ? '_none' : $settings['title_style'];
+
+ if ($wrap_tag != '_none') {
+ $variables = array(
+ 'element' => array(
+ '#tag' => $wrap_tag,
+ '#value' => $output,
+ ),
+ );
+
+ if (!empty($settings['title_class'])) {
+ $variables['element']['#attributes'] = array('class' => $settings['title_class']);
+ }
+
+ $output = theme('html_tag', $variables);
+ }
+
+ $element = array(
+ array(
+ '#markup' => $output,
+ ),
+ );
}
-
- $element = array(
- array(
- '#markup' => $output,
- ),
- );
-
return $element;
}
diff --git a/sites/all/modules/contrib/fields/title/title.info b/sites/all/modules/contrib/fields/title/title.info
index a331e8f..78153e3 100644
--- a/sites/all/modules/contrib/fields/title/title.info
+++ b/sites/all/modules/contrib/fields/title/title.info
@@ -9,9 +9,9 @@ files[] = title.module
files[] = views/views_handler_title_field.inc
files[] = tests/title.test
-; Information added by drupal.org packaging script on 2013-03-18
-version = "7.x-1.0-alpha7"
+; Information added by Drupal.org packaging script on 2017-01-13
+version = "7.x-1.0-alpha9"
core = "7.x"
project = "title"
-datestamp = "1363626024"
+datestamp = "1484302985"
diff --git a/sites/all/modules/contrib/fields/title/title.module b/sites/all/modules/contrib/fields/title/title.module
index 06b6b3a..2342f81 100644
--- a/sites/all/modules/contrib/fields/title/title.module
+++ b/sites/all/modules/contrib/fields/title/title.module
@@ -33,6 +33,7 @@ function title_module_implements_alter(&$implementations, $hook) {
// The following hook implementations should be executed as last ones.
case 'entity_info_alter':
case 'entity_presave':
+ case 'field_attach_presave':
$implementations['title'] = $group;
break;
@@ -104,17 +105,7 @@ function title_field_replacement_info($entity_type, $legacy_field = NULL) {
}
/**
- * Return an entity label value.
- *
- * @param $entity
- * The entity whose label has to be displayed.
- * @param $type
- * The name of the entity type.
- * @param $langcode
- * (Optional) The language the entity label has to be displayed in.
- *
- * @return
- * The entity label as a string value.
+ * Implements callback_entity_info_label().
*/
function title_entity_label($entity, $type, $langcode = NULL) {
$entity_info = entity_get_info($type);
@@ -125,7 +116,8 @@ function title_entity_label($entity, $type, $langcode = NULL) {
// If field replacement is enabled we use the replacing field value.
if (title_field_replacement_enabled($type, $bundle, $legacy_field)) {
$langcode = field_language($type, $entity, $info['field']['field_name'], $langcode);
- return $info['callbacks']['sync_get']($type, $entity, $legacy_field, $info, $langcode);
+ $values = $info['callbacks']['sync_get']($type, $entity, $legacy_field, $info, $langcode);
+ return $values[$legacy_field];
}
// Otherwise if we have a fallback defined we use the original label callback.
elseif (isset($entity_info['label fallback']['title']) && function_exists($entity_info['label fallback']['title'])) {
@@ -139,8 +131,57 @@ function title_entity_label($entity, $type, $langcode = NULL) {
/**
* Implements hook_entity_presave().
*/
-function title_entity_presave($entity, $type) {
- title_entity_sync($type, $entity, NULL, TRUE);
+function title_entity_presave($entity, $entity_type) {
+ $entity_langcode = title_entity_language($entity_type, $entity);
+ $langcode = $entity_langcode;
+
+ // If Entity Translation is enabled and the entity type is transltable,we need
+ // to check if we have a translation for the current active language. If so we
+ // need to synchronize the legacy field values into the replacing field
+ // translations in the active language.
+ if (module_invoke('entity_translation', 'enabled', $entity_type)) {
+ $langcode = title_active_language();
+ $translations = entity_translation_get_handler($entity_type, $entity)->getTranslations();
+ // If we are removing a translation for the active language we need to skip
+ // reverse synchronization, as we would store empty values in the original
+ // replacing fields immediately afterwards.
+ if (!isset($translations->data[$langcode])) {
+ $langcode = isset($translations->hook[$langcode]['hook']) && $translations->hook[$langcode]['hook'] == 'delete' ? FALSE : $entity_langcode;
+ }
+ }
+
+ // Perform reverse synchronization to retain any change in the legacy field
+ // values. We must avoid doing this twice as we might overwrite the already
+ // synchronized values, if we are updating an existing entity.
+ if ($langcode) {
+ title_entity_sync($entity_type, $entity, $langcode, TRUE);
+ }
+
+ // If we are not dealing with the entity language, we need to synchronize the
+ // original values into the legacy fields to ensure they are always stored in
+ // the entity table.
+ if ($entity_langcode != $langcode) {
+ list($id, , ) = entity_extract_ids($entity_type, $entity);
+ $sync = &drupal_static('title_entity_sync', array());
+ unset($sync[$entity_type][$id]);
+ title_entity_sync($entity_type, $entity, $entity_langcode);
+ }
+}
+
+/**
+ * Implements hook_field_attach_update().
+ */
+function title_field_attach_update($entity_type, $entity) {
+ // Reset the field_attach_presave static cache so that subsequent saves work
+ // correctly.
+ $sync = &drupal_static('title_field_attach_presave', array());
+ list($id, , ) = entity_extract_ids($entity_type, $entity);
+ unset($sync[$entity_type][$id]);
+
+ // Immediately after saving the entity we need to ensure that the legacy field
+ // holds a value corresponding to the current active language, as it were
+ // just loaded.
+ title_entity_sync($entity_type, $entity);
}
/**
@@ -152,7 +193,10 @@ function title_entity_presave($entity, $type) {
* @see title_entity_load()
*/
function title_field_attach_load($entity_type, $entities, $age, $options) {
- // @todo: Do we need to handle revisions here?
+ // Allow values to re-sync when field_attach_load_revision() is called.
+ if ($age == FIELD_LOAD_REVISION) {
+ title_entity_sync_static_reset($entity_type, array_keys($entities));
+ }
title_entity_load($entities, $entity_type);
}
@@ -164,6 +208,9 @@ function title_field_attach_load($entity_type, $entities, $age, $options) {
* replaced fields.
*/
function title_entity_load($entities, $type) {
+ // Load entity translations otherwise field language will not be computed
+ // correctly.
+ module_invoke('entity_translation', 'entity_load', $entities, $type);
foreach ($entities as &$entity) {
// Synchronize values from the regular field unless we are intializing it.
title_entity_sync($type, $entity, NULL, !empty($GLOBALS['title_field_replacement_init']));
@@ -183,20 +230,10 @@ function title_entitycache_load($entities, $type) {
/**
* Implements hook_entitycache_reset().
*
- * If the entity cache is reseted the field sync has to be done again.
+ * When the entity cache is reset the field sync has to be done again.
*/
function title_entitycache_reset($ids, $entity_type) {
- $sync = &drupal_static('title_entity_sync', array());
- if (!empty($ids)) {
- // Clear specific ids.
- foreach ($ids as $id) {
- unset($sync[$entity_type][$id]);
- }
- }
- elseif (!empty($sync[$entity_type])) {
- // Reset cache for an entity_type.
- $sync[$entity_type] = array();
- }
+ title_entity_sync_static_reset($entity_type, $ids);
}
/**
@@ -227,7 +264,9 @@ function title_entity_prepare_view($entities, $type, $langcode) {
*/
function title_field_replacement_enabled($entity_type, $bundle, $legacy_field) {
$info = title_field_replacement_info($entity_type, $legacy_field);
- $instance = field_info_instance($entity_type, $info['field']['field_name'], $bundle);
+ if (!empty($info['field']['field_name'])) {
+ $instance = field_info_instance($entity_type, $info['field']['field_name'], $bundle);
+ }
return !empty($instance);
}
@@ -374,10 +413,13 @@ function title_field_replacement_init($entity_type, $bundle, $legacy_field, $ids
function title_entity_sync($entity_type, &$entity, $langcode = NULL, $set = FALSE) {
$sync = &drupal_static(__FUNCTION__, array());
list($id, , $bundle) = entity_extract_ids($entity_type, $entity);
- $langcode = field_valid_language($langcode, FALSE);
- // We do not need to perform this more than once.
- if (!empty($id) && !empty($sync[$entity_type][$id][$langcode][$set])) {
+ if (!isset($langcode)) {
+ $langcode = $set ? title_entity_language($entity_type, $entity) : title_active_language();
+ }
+
+ // We do not need to perform synchronization more than once.
+ if (!$set && !empty($id) && !empty($sync[$entity_type][$id][$langcode][$set])) {
return;
}
@@ -394,6 +436,26 @@ function title_entity_sync($entity_type, &$entity, $langcode = NULL, $set = FALS
}
}
+/**
+ * Reset the list of entities whose fields have already been synchronized.
+ *
+ * @param $entity_type
+ * The name of the entity type.
+ * @param $entity_ids
+ * Either an array of entity IDs to reset or NULL to reset all.
+ */
+function title_entity_sync_static_reset($entity_type, $entity_ids = NULL) {
+ $sync = &drupal_static('title_entity_sync', array());
+ if (is_array($entity_ids)) {
+ foreach ($entity_ids as $id) {
+ unset($sync[$entity_type][$id]);
+ }
+ }
+ else {
+ unset($sync[$entity_type]);
+ }
+}
+
/**
* Synchronize a single legacy field with its regular field value.
*
@@ -405,8 +467,8 @@ function title_entity_sync($entity_type, &$entity, $langcode = NULL, $set = FALS
* The name of the legacy field to be replaced.
* @param $field_name
* The regular field to use as source value.
- * @param $display
- * Specifies if synchronization is being performed on display or on save.
+ * @param $info
+ * Field replacement information for the given entity.
* @param $langcode
* The field language to use for the source value.
*/
@@ -416,7 +478,16 @@ function title_field_sync_get($entity_type, $entity, $legacy_field, $info, $lang
$entity->{$legacy_field . '_original'} = $entity->{$legacy_field};
// Find out the actual language to use (field might be untranslatable).
$langcode = field_language($entity_type, $entity, $info['field']['field_name'], $langcode);
- $entity->{$legacy_field} = $info['callbacks']['sync_get']($entity_type, $entity, $legacy_field, $info, $langcode);
+ $values = $info['callbacks']['sync_get']($entity_type, $entity, $legacy_field, $info, $langcode);
+ foreach ($values as $name => $value) {
+ if ($value !== NULL) {
+ $entity->{$name} = $value;
+ }
+ }
+ // Ensure we do not pollute field language static cache.
+ $cache = &drupal_static('field_language');
+ list($id, ,) = entity_extract_ids($entity_type, $entity);
+ unset($cache[$entity_type][$id]);
}
}
@@ -431,18 +502,45 @@ function title_field_sync_get($entity_type, $entity, $legacy_field, $info, $lang
* The name of the legacy field to be replaced.
* @param $field_name
* The regular field to use as source value.
- * @param $display
- * Specifies if synchronization is being performed on display or on save.
+ * @param $info
+ * Field replacement information for the given entity.
* @param $langcode
- * The field language to use for the source value.
+ * The field language to use for the target value.
*/
-function title_field_sync_set($entity_type, $entity, $legacy_field, $info) {
+function title_field_sync_set($entity_type, $entity, $legacy_field, $info, $langcode) {
if (property_exists($entity, $legacy_field)) {
- $langcode = title_entity_language($entity_type, $entity);
+ // Find out the actual language to use (field might be untranslatable).
+ $field = field_info_field($info['field']['field_name']);
+ $langcode = field_is_translatable($entity_type, $field) ? $langcode : LANGUAGE_NONE;
$info['callbacks']['sync_set']($entity_type, $entity, $legacy_field, $info, $langcode);
}
}
+/**
+ * Returns and optionally stores the active language.
+ *
+ * @param string $langcode
+ * (optional) The active language to be set. If none is provided the active
+ * language is just returned.
+ *
+ * @return string
+ * The active language code. Defaults to the current content language.
+ */
+function title_active_language($langcode = NULL) {
+ static $drupal_static_fast;
+ if (!isset($drupal_static_fast)) {
+ $drupal_static_fast['active_language'] = &drupal_static(__FUNCTION__);
+ }
+ $active_langcode = &$drupal_static_fast['active_language'];
+ if (isset($langcode)) {
+ $active_langcode = $langcode;
+ }
+ if (empty($active_langcode)) {
+ $active_langcode = $GLOBALS['language_content']->language;
+ }
+ return $active_langcode;
+}
+
/**
* Provide the original entity language.
*
@@ -485,6 +583,11 @@ function title_field_attach_form($entity_type, $entity, &$form, &$form_state, $l
if (isset($form[$legacy_field]['#access'])) {
$form[$info['field']['field_name']]['#access'] = $form[$legacy_field]['#access'];
}
+
+ // Add class from legacy field so behaviors can still be applied on
+ // title widget.
+ $form[$info['field']['field_name']]['#attributes']['class'] = array('form-item-' . $legacy_field);
+
// Restrict access to the legacy field form element and mark it as
// replaced.
$form[$legacy_field]['#access'] = FALSE;
@@ -510,7 +613,7 @@ function title_field_attach_submit($entity_type, $entity, $form, &$form_state) {
// drupal_array_set_nested_value().
$values = $form_state['values'];
$values = drupal_array_get_nested_value($values, $form['#parents']);
- $langcode = title_entity_language($entity_type, $entity);
+ $langcode = entity_language($entity_type, $entity);
foreach ($fr_info as $legacy_field => $info) {
if (!empty($form[$legacy_field]['#field_replacement'])) {
@@ -641,23 +744,26 @@ function title_tokens_alter(array &$replacements, array $context) {
$entity = $context['data'][$context['type']];
list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
$options = $context['options'];
+ $sanitize = !empty($options['sanitize']);
- $langcode = NULL;
- if (isset($options['language'])) {
- $langcode = $options['language']->language;
- }
+ // Since Title tokens are mostly used in storage contexts we default to
+ // the current working language, that is the entity language. Modules
+ // using Title tokens in display contexts need to specify the current
+ // display language.
+ $langcode = isset($options['language']) ? $options['language']->language : entity_language($entity_type, $entity);
if ($fr_info) {
foreach ($fr_info as $legacy_field => $info) {
if (title_field_replacement_enabled($entity_type, $bundle, $legacy_field)) {
if (isset($context['tokens'][$legacy_field])) {
- title_field_sync_get($entity_type, $entity, $legacy_field, $info, $langcode);
- $item = $entity->{$legacy_field};
+ $langcode = field_language($entity_type, $entity, $info['field']['field_name'], $langcode);
+ $values = $info['callbacks']['sync_get']($entity_type, $entity, $legacy_field, $info, $langcode);
+ $item = $values[$legacy_field];
if (!empty($item)) {
if (is_array($item)) {
$item = reset($item);
}
- $replacements[$context['tokens'][$legacy_field]] = $item;
+ $replacements[$context['tokens'][$legacy_field]] = $sanitize ? check_plain($item) : $item;
}
}
}
@@ -851,3 +957,38 @@ function title_field_attach_create_bundle($entity_type, $bundle) {
}
}
}
+
+/**
+ * Implements hook_field_info_alter().
+ */
+function title_field_info_alter(&$info) {
+ $supported_types = array('taxonomy_term_reference' => TRUE);
+ foreach ($info as $field_type => &$field_type_info) {
+ if (isset($supported_types[$field_type])) {
+ if (!isset($field_type_info['settings'])) {
+ $field_type_info['settings'] = array();
+ }
+ $field_type_info['settings'] += array('options_list_callback' => 'title_taxonomy_allowed_values');
+ }
+ }
+}
+
+/**
+ * Return taxonomy term values for taxonomy reference fields.
+ */
+function title_taxonomy_allowed_values($field) {
+ $bundle = !empty($field['settings']['allowed_values'][0]['vocabulary']) ? $field['settings']['allowed_values'][0]['vocabulary'] : NULL;
+ if ($bundle && ($label = title_field_replacement_get_label_field('taxonomy_term', $bundle))) {
+ $options = array();
+ foreach ($field['settings']['allowed_values'] as $tree) {
+ $vocabulary = taxonomy_vocabulary_machine_name_load($tree['vocabulary']);
+ if ($vocabulary && ($terms = taxonomy_get_tree($vocabulary->vid, $tree['parent'], NULL, TRUE))) {
+ foreach ($terms as $term) {
+ $options[$term->tid] = str_repeat('-', $term->depth) . entity_label('taxonomy_term', $term);
+ }
+ }
+ }
+ return $options;
+ }
+ return taxonomy_allowed_values($field);
+}
diff --git a/sites/all/modules/contrib/fields/title/views/title.views.inc b/sites/all/modules/contrib/fields/title/views/title.views.inc
index f973d9f..9ae50c8 100644
--- a/sites/all/modules/contrib/fields/title/views/title.views.inc
+++ b/sites/all/modules/contrib/fields/title/views/title.views.inc
@@ -6,13 +6,14 @@
*/
function title_field_views_data_alter(&$data) {
foreach (entity_get_info() as $entity_type => $entity_info) {
- $replacements = title_field_replacement_info($entity_type);
- if ($replacements) {
- foreach ($replacements as $replacement) {
- $field = field_info_field($replacement['field']['field_name']);
- $table = _field_sql_storage_tablename($field);
- if (isset($data[$table][$field['field_name']])) {
- $data[$table][$field['field_name']]['field']['handler'] = 'views_handler_title_field';
+ if (!empty($entity_info['field replacement'])) {
+ foreach ($entity_info['field replacement'] as $replacement) {
+ if (isset($replacement['field']['field_name'])) {
+ $field = field_info_field($replacement['field']['field_name']);
+ $table = _field_sql_storage_tablename($field);
+ if (isset($data[$table][$field['field_name']])) {
+ $data[$table][$field['field_name']]['field']['handler'] = 'views_handler_title_field';
+ }
}
}
}
diff --git a/sites/all/modules/contrib/fields/title/views/views_handler_title_field.inc b/sites/all/modules/contrib/fields/title/views/views_handler_title_field.inc
index 03516e9..3a11ad1 100644
--- a/sites/all/modules/contrib/fields/title/views/views_handler_title_field.inc
+++ b/sites/all/modules/contrib/fields/title/views/views_handler_title_field.inc
@@ -36,13 +36,13 @@ class views_handler_title_field extends views_handler_field_field {
if (!empty($this->options['link_to_entity'])) {
$values = $this->original_values;
$entity_type = $this->definition['entity_tables'][$this->base_table];
- $entity_info = entity_get_info($entity_type);
- $key = $entity_info['entity keys']['id'];
+ $key = $this->field_alias;
if (!empty($values->_field_data[$key]['entity'])) {
$entity = $values->_field_data[$key]['entity'];
$uri = entity_uri($entity_type, $entity);
$this->options['alter']['make_link'] = TRUE;
$this->options['alter']['path'] = $uri['path'];
+ $this->options['alter']['options'] = !empty($uri['options']) ? $uri['options'] : array();
}
}
return parent::render_item($count, $item);
diff --git a/sites/all/modules/contrib/fields/video_embed_field/img/vimeo.jpg b/sites/all/modules/contrib/fields/video_embed_field/img/vimeo.jpg
new file mode 100644
index 0000000..dd70565
Binary files /dev/null and b/sites/all/modules/contrib/fields/video_embed_field/img/vimeo.jpg differ
diff --git a/sites/all/modules/contrib/fields/video_embed_field/img/youtube.jpg b/sites/all/modules/contrib/fields/video_embed_field/img/youtube.jpg
new file mode 100644
index 0000000..2012390
Binary files /dev/null and b/sites/all/modules/contrib/fields/video_embed_field/img/youtube.jpg differ
diff --git a/sites/all/modules/contrib/fields/video_embed_field/plugins/export_ui/video_embed_field_export_ui.inc b/sites/all/modules/contrib/fields/video_embed_field/plugins/export_ui/video_embed_field_export_ui.inc
old mode 100755
new mode 100644
index 1ac41d6..a43ca66
--- a/sites/all/modules/contrib/fields/video_embed_field/plugins/export_ui/video_embed_field_export_ui.inc
+++ b/sites/all/modules/contrib/fields/video_embed_field/plugins/export_ui/video_embed_field_export_ui.inc
@@ -1,16 +1,21 @@
'vef_video_styles', // As defined in hook_schema().
- 'access' => 'administer video styles', // Define a permission users must have to access these pages.
+ 'schema' => 'vef_video_styles',
+ 'access' => 'administer video styles',
// Define the menu item.
'menu' => array(
- 'menu prefix' => 'admin/config/media',
+ 'menu prefix' => 'admin/config/media/vef',
'menu item' => 'vef_video_styles',
- 'menu title' => 'Configure Video Embed Styles',
+ 'menu title' => 'Video Embed Styles',
'menu description' => 'Administer Video Embed Field\'s video styles.',
),
// Define user interface texts.
@@ -23,4 +28,7 @@ $plugin = array(
'settings' => 'video_embed_field_video_style_form',
// 'submit' and 'validate' are also valid callbacks.
),
+ 'export' => array(
+ 'admin_title' => 'title',
+ ),
);
diff --git a/sites/all/modules/contrib/fields/video_embed_field/video-embed-field-embed-code.tpl.php b/sites/all/modules/contrib/fields/video_embed_field/video-embed-field-embed-code.tpl.php
index b049be9..c06ddef 100644
--- a/sites/all/modules/contrib/fields/video_embed_field/video-embed-field-embed-code.tpl.php
+++ b/sites/all/modules/contrib/fields/video_embed_field/video-embed-field-embed-code.tpl.php
@@ -19,4 +19,4 @@
-
\ No newline at end of file
+
', $summary); @@ -344,20 +445,26 @@ function video_embed_field_field_formatter_view($entity_type, $entity, $field, $ $element = array(); $settings = $display['settings']; + if ($display['type'] == 'video_embed_field_thumbnail' && $display['settings']['image_link'] == 'content') { + $path = entity_uri($entity_type, $entity); + } + foreach ($items as $delta => $item) { - //create the render array for the description + // Create the render array for the description. if (isset($item['description']) && $item['description'] && $settings['description'] && $instance['settings']['description_field']) { $description = array( '#prefix' => '', ); + $alt = $item['description']; } else { $description = array(); + $alt = ''; } - //Render the field + // Render the field. if ($display['type'] == 'video_embed_field') { $element[$delta] = array( array( @@ -368,63 +475,74 @@ function video_embed_field_field_formatter_view($entity_type, $entity, $field, $ ), ); } + elseif ($display['type'] == 'video_embed_field_url') { + $element[$delta] = array( + array( + '#markup' => url($item['video_url']), + ), + ); + } elseif ($display['type'] == 'video_embed_field_thumbnail') { if (isset($item['thumbnail_path'])) { - if (empty($settings['image_style']) || $settings['image_style'] == 'none') { - $element[$delta] = array( - array( - '#theme' => 'image', - '#path' => $item['thumbnail_path'], - ), + if ($display['settings']['image_link'] == 'source') { + if ($ret = parse_url($item['video_url'])) { + if (!isset($ret["scheme"])) { + $item['video_url'] = "http://{$item['video_url']}"; + } + } + $path = array( + 'path' => $item['video_url'], + 'options' => array(), ); } - else { - $element[$delta] = array( - array( - '#theme' => 'image_style', - '#path' => $item['thumbnail_path'], - '#style_name' => $settings['image_style'], - ), - ); - } - if ($settings['image_link'] == 'source') { - $link = explode('|||', l('|||', $item['video_url'])); - $element[$delta]['#prefix'] = $link[0]; - $element[$delta]['#suffix'] = $link[1]; - } - elseif ($settings['image_link'] == 'node') { - $nid = $entity->nid; - $link = explode('|||', l('|||', 'node/' . $nid)); - $element[$delta]['#prefix'] = $link[0]; - $element[$delta]['#suffix'] = $link[1]; - } - } //incase no thumbnail was downloaded / provider doesn't support thumbnails - else { + $element[$delta] = array( + '#theme' => 'image_formatter', + '#item' => array('uri' => $item['thumbnail_path'], 'alt' => $alt), + '#image_style' => $display['settings']['image_style'], + '#path' => isset($path) ? $path : '', ); } + // Incase no thumbnail was downloaded/provider doesn't support thumbnails. + else { + $element[$delta] = array(); + } } elseif ($display['type'] == 'video_embed_field_thumbnail_colorbox') { if (isset($item['thumbnail_path'])) { + if ($ret = parse_url($item['video_url'])) { + if (!isset($ret["scheme"])) { + $item['video_url'] = "http://{$item['video_url']}"; + } + } $element[$delta] = array( array( '#theme' => 'video_embed_field_colorbox_code', '#image_url' => $item['thumbnail_path'], '#image_style' => $display['settings']['image_style'], + '#image_alt' => $alt, '#video_url' => $item['video_url'], '#video_style' => $display['settings']['video_style'], '#video_data' => unserialize($item['video_data']), ), ); } - //incase no thumbnail was downloaded / provider doesn't support thumbnails + // Incase no thumbnail was downloaded/provider doesn't support thumbnails. else { - $element[$delta] = array( - ); + $element[$delta] = array(); } } - //Get the HTML instead of the array, because we append it to the suffix. - //This way, the thumbnail link wrapper doesn't make the description a link as well. + elseif ($display['type'] == 'video_embed_field_url_colorbox') { + $path = video_embed_field_get_ajax_url($item['video_url'], $display['settings']['video_style']); + + $element[$delta] = array( + array( + '#markup' => url($path['path'], $path['options']), + ), + ); + } + // Get the HTML instead of the array, because we append it to the suffix. + // This way, the thumbnail link doesn't make the description a link as well. $description_html = drupal_render($description); $pos = isset($settings['description_position']) ? $settings['description_position'] : 'bottom'; @@ -438,6 +556,5 @@ function video_embed_field_field_formatter_view($entity_type, $entity, $field, $ } } - return $element; } diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc old mode 100755 new mode 100644 index f0824bd..1962008 --- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc @@ -1,7 +1,10 @@ 'Youtube', 'function' => 'video_embed_field_handle_youtube', 'thumbnail_function' => 'video_embed_field_handle_youtube_thumbnail', + 'thumbnail_default' => drupal_get_path('module', 'video_embed_field') . '/img/youtube.jpg', 'data_function' => 'video_embed_field_handle_youtube_data', 'form' => 'video_embed_field_handler_youtube_form', + 'form_validate' => 'video_embed_field_handler_youtube_form_validate', 'domains' => array( 'youtube.com', 'youtu.be', ), 'defaults' => array( - 'width' => '640px', - 'height' => '360px', + 'width' => 640, + 'height' => 360, 'autoplay' => 0, - 'hd' => 1, + 'vq' => 'large', 'rel' => 0, + 'controls' => 1, 'autohide' => 2, 'showinfo' => 1, 'modestbranding' => 0, 'theme' => 'dark', 'iv_load_policy' => 1, + 'class' => '', ), ); @@ -39,20 +46,24 @@ function video_embed_field_video_embed_handler_info() { 'title' => 'Vimeo', 'function' => 'video_embed_field_handle_vimeo', 'thumbnail_function' => 'video_embed_field_handle_vimeo_thumbnail', - 'data_function' => 'video_embed_field_handle_vimeo_data', + 'thumbnail_default' => drupal_get_path('module', 'video_embed_field') . '/img/vimeo.jpg', + 'data_function' => '_video_embed_field_get_vimeo_data', 'form' => 'video_embed_field_handler_vimeo_form', + 'form_validate' => 'video_embed_field_handler_vimeo_form_validate', 'domains' => array( 'vimeo.com', ), 'defaults' => array( - 'width' => '640px', - 'height' => '360px', + 'width' => 640, + 'height' => 360, 'color' => '00adef', 'portrait' => 1, 'title' => 1, 'byline' => 1, 'autoplay' => 0, 'loop' => 0, + 'froogaloop' => 0, + 'class' => '' ), ); @@ -60,11 +71,16 @@ function video_embed_field_video_embed_handler_info() { } /** - * Helper function to get the youtube video's id - * Returns false if it doesn't parse for wahtever reason + * Helper function to get the youtube video's id. + * + * @param string $url + * The video URL. + * + * @return string|bool + * The video ID, or FALSE in case the ID can't be retrieved from the URL. */ function _video_embed_field_get_youtube_id($url) { - // Find the ID of the video they want to play from the url + // Find the ID of the video they want to play from the url. if (stristr($url, 'http://')) { $url = substr($url, 7); } @@ -73,7 +89,7 @@ function _video_embed_field_get_youtube_id($url) { } if (stristr($url, 'playlist')) { - //Playlists need the appended ampersand to take the options properly. + // Playlists need the appended ampersand to take the options properly. $url = $url . '&'; $pos = strripos($url, '?list='); if ($pos !== FALSE) { @@ -84,14 +100,14 @@ function _video_embed_field_get_youtube_id($url) { return FALSE; } } - //Alternate playlist link + // Alternate playlist link. elseif (stristr($url, 'view_play_list')) { $url = $url . '&'; - //All playlist ID's are prepended with PL. view_play_list links allow you to not have that, though. + // All playlist ID's are prepended with PL. if (!stristr($url, '?p=PL')) { $url = substr_replace($url, 'PL', strpos($url, '?p=') + 3, 0); } - //Replace the links format with the embed format + // Replace the links format with the embed format. $url = str_ireplace('play_list?p=', 'videoseries?list=', $url); $pos = strripos($url, 'videoseries?list='); if ($pos !== FALSE) { @@ -133,57 +149,81 @@ function _video_embed_field_get_youtube_id($url) { $id = substr($url, $pos); } } - return $id; + return check_plain($id); } /** * Handler for Youtube videos. + * + * @param string $url + * The video URL. + * @param array $settings + * The settings array. + * + * @return array + * The video iframe render array. */ function video_embed_field_handle_youtube($url, $settings) { $output = array(); - //Grab the minutes and seconds, and just convert it down to seconds - preg_match('/#t=((?P
' . t('Note') . ': ', '#markup' => t('Color, portrait, title and byline can be restricted by Vimeo Plus videos. Such videos will ignore these settings.'), '#suffix' => '
', ); + $form['autoplay'] = array( '#type' => 'checkbox', '#title' => t('Autoplay'), '#description' => t('Play the video immediately.'), '#default_value' => $defaults['autoplay'], ); + $form['loop'] = array( '#type' => 'checkbox', '#title' => t('Loop'), - '#description' => t('Loop the video\'s playback'), + '#description' => t("Loop the video's playback"), '#default_value' => $defaults['loop'], ); + + $form['froogaloop'] = array( + '#type' => 'checkbox', + '#title' => t('Enable froogaloop support'), + '#description' => t("Enables Froogallop Vimeo's library support"), + '#default_value' => $defaults['loop'], + ); + + $form['class'] = array( + '#type' => 'textfield', + '#title' => t('Player CSS class'), + '#description' => t('CSS class to add to the player'), + '#default_value' => $defaults['class'], + ); + return $form; } /** - * Calculate the min index for use in finding the id of a youtube video + * Validates the form elements for the Vimeo configuration form. + * + * @param array $element + * The form element to validate. + * @param array $form_state + * The form to validate state. + * @param array $form + * The form to validate structure. + */ +function video_embed_field_handler_vimeo_form_validate($element, &$form_state, $form) { + video_embed_field_validate_dimensions($element); +} + +/** + * Calculates the min index for use in finding the id of a youtube video. + * + * @param string $pos1 + * The first index. + * @param string $pos2 + * The second index. + * + * @return string + * The min index. */ function _video_embed_get_min($pos1, $pos2) { if (!$pos1) { diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.info b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.info index da965b3..ffb8d65 100644 --- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.info +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.info @@ -2,13 +2,17 @@ name = "Video Embed Field" description = "Expose a field type for embedding videos from youtube or vimeo." core = 7.x package = Media -configure = admin/config/media/vef_video_styles +configure = admin/config/media/vef + +files[] = video_embed_field.migrate.inc +files[] = views/handlers/views_embed_field_views_handler_field_thumbnail_path.inc dependencies[] = ctools dependencies[] = image -; Information added by drupal.org packaging script on 2012-10-17 -version = "7.x-2.0-beta5+11-dev" + +; Information added by Drupal.org packaging script on 2015-09-07 +version = "7.x-2.0-beta11" core = "7.x" project = "video_embed_field" -datestamp = "1350438417" +datestamp = "1441639440" diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.install b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.install old mode 100755 new mode 100644 index 2537ab4..2009b2a --- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.install +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.install @@ -1,8 +1,8 @@ 'Stores video embed styles.', 'export' => array( 'key' => 'name', - 'primary key' => 'vsid', - 'identifier' => 'video_embed_style', // Exports will be as $video_style - 'default hook' => 'default_video_embed_styles', // Function hook name. + 'identifier' => 'video_embed_style', + 'default hook' => 'default_video_embed_styles', 'api' => array( 'owner' => 'video_embed_field', - 'api' => 'default_video_embed_styles', // Base name for api include files. + 'api' => 'default_video_embed_styles', 'minimum_version' => 1, 'current_version' => 1, ), ), 'fields' => array( - 'vsid' => array( - 'description' => 'The primary identifier for a video style.', - 'type' => 'serial', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'no export' => TRUE, - ), 'name' => array( - 'description' => 'The style name.', + 'description' => 'The machine-readable option set name.', 'type' => 'varchar', - 'length' => '255', + 'length' => 255, + 'not null' => TRUE, + ), + 'title' => array( + 'description' => 'The human-readable title for this option set.', + 'type' => 'varchar', + 'length' => 255, 'not null' => TRUE, ), 'data' => array( @@ -93,10 +91,7 @@ function video_embed_field_schema() { 'serialize' => TRUE, ), ), - 'primary key' => array('vsid'), - 'unique keys' => array( - 'name' => array('name'), - ), + 'primary key' => array('name'), ); return $schema; } @@ -105,12 +100,11 @@ function video_embed_field_schema() { * Implements hook_uninstall(). */ function video_embed_field_uninstall() { - //do nothing right now - should eventually remove all the variables + variable_del('video_embed_field_youtube_api_key'); } /** - * Update 7000 - * Add an optional description form + * Adds an optional description form. */ function video_embed_field_update_7000() { // Get the list of fields of type 'video_embed_field'. @@ -130,7 +124,7 @@ function video_embed_field_update_7000() { $table = "field_data_{$field['field_name']}"; $revision_table = "field_revision_{$field['field_name']}"; } - $column = $field['field_name'] . '_' . 'description'; + $column = $field['field_name'] . '_description'; db_add_field($table, $column, array('type' => 'text', 'not null' => FALSE)); db_add_field($revision_table, $column, array('type' => 'text', 'not null' => FALSE)); } @@ -139,8 +133,7 @@ function video_embed_field_update_7000() { } /** - * Update 7001 - * Add video style storage table + * Adds video style storage table. */ function video_embed_field_update_7001() { if (!db_table_exists('vef_video_styles')) { @@ -151,8 +144,7 @@ function video_embed_field_update_7001() { return t('Video styles storage table created.'); } /** - * Update 7002 - * Add field for storing the path to the video thumbnail + * Adds field for storing the path to the video thumbnail. */ function video_embed_field_update_7002() { // Get the list of fields of type 'video_embed_field'. @@ -172,7 +164,7 @@ function video_embed_field_update_7002() { $table = "field_data_{$field['field_name']}"; $revision_table = "field_revision_{$field['field_name']}"; } - $column = $field['field_name'] . '_' . 'thumbnail_path'; + $column = $field['field_name'] . '_thumbnail_path'; db_add_field($table, $column, array( 'type' => 'varchar', 'length' => 512, @@ -189,22 +181,22 @@ function video_embed_field_update_7002() { } /** - * Enable inline colorbox support if colorbox is installed [NO LONGER NEEDED - This update hook does nothing] + * Enables inline colorbox support if colorbox is installed. + * + * [NO LONGER NEEDED - This update hook does nothing] */ function video_embed_field_update_7003() { - //this is no longer needed - //variable_set('colorbox_inline', 1); } /** - * Enable colorbox load support if colorbox is installed, we no longer need inline support + * Enables colorbox load support if colorbox is installed. */ function video_embed_field_update_7004() { variable_set('colorbox_load', 1); } /** - * Add data column to field database. + * Adds data column to field database. */ function video_embed_field_update_7005() { // Get the list of fields of type 'video_embed_field'. @@ -224,7 +216,7 @@ function video_embed_field_update_7005() { $table = "field_data_{$field['field_name']}"; $revision_table = "field_revision_{$field['field_name']}"; } - $column = $field['field_name'] . '_' . 'video_data'; + $column = $field['field_name'] . '_video_data'; db_add_field($table, $column, array( 'type' => 'blob', 'not null' => FALSE, @@ -241,3 +233,159 @@ function video_embed_field_update_7005() { return t('Data column added. Please clear cache.'); } + +/** + * Updates vef_video_styles table structure. + */ +function video_embed_field_update_7006() { + // Convert the table structure. + db_drop_field('vef_video_styles', 'vsid'); + db_add_primary_key('vef_video_styles', array('name')); + db_drop_unique_key('vef_video_styles', 'name'); + + db_add_field('vef_video_styles', 'title', array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + )); + // Update title and name values. + $result = db_select('vef_video_styles', 'vef') + ->fields('vef', array('name')) + ->execute(); + foreach ($result as $record) { + // Set current name as title. + db_update('vef_video_styles') + ->fields(array( + 'title' => $record->name, + )) + ->condition('name', $record->name) + ->execute(); + + // Update name to fit with machine_name constraints. + $new_name = preg_replace('/[^a-z0-9_]+/', '_', drupal_strtolower($record->name)); + if ($new_name != $record->name) { + // Check if new name already exists in the database. + $counter = 1; + $base_name = $new_name; + while (TRUE) { + $result = db_select('vef_video_styles', 'vef') + ->fields('vef', array('name')) + ->condition('name', $new_name) + ->execute(); + if ($result->rowCount()) { + $new_name = $base_name . '_' . $counter; + } + else { + db_update('vef_video_styles') + ->fields(array( + 'name' => $new_name, + )) + ->condition('name', $record->name) + ->execute(); + break; + } + } + } + } + + return t('Database schema updated successfully'); +} + +/** + * Update youtube "hd" URL deprecated parameter. + */ +function video_embed_field_update_7007() { + drupal_get_schema('vef_video_styles', TRUE); + ctools_include('export'); + $styles = ctools_export_load_object('vef_video_styles'); + foreach ($styles as $style) { + if (isset($style->data['youtube']['hd'])) { + if ($style->data['youtube']['hd']) { + $style->data['youtube']['vq'] = 'hd720'; + } + else { + $style->data['youtube']['vq'] = 'large'; + } + unset($style->data['youtube']['hd']); + ctools_export_crud_save('vef_video_styles', $style); + } + } + + return t('Parameter hd has been converted to vq.'); +} + +/** + * Updates naming of 'node' formatter setting to 'content'. + */ +function video_embed_field_update_7008() { + $instances = field_info_instances(); + foreach ($instances as $entity_type) { + foreach ($entity_type as $bundle) { + foreach ($bundle as $instance) { + $field_info = field_info_field($instance['field_name']); + if ($field_info['type'] == 'video_embed_field') { + $update = FALSE; + foreach ($instance['display'] as &$display) { + if ($display['type'] == 'video_embed_field_thumbnail') { + if ($display['settings']['image_link'] == 'node') { + $display['settings']['image_link'] = 'content'; + $update = TRUE; + } + if ($display['settings']['image_style'] == 'none') { + $display['settings']['image_style'] = ''; + $update = TRUE; + } + } + } + if ($update) { + field_update_instance($instance); + } + } + } + } + } + + return t("Updated 'node' setting to 'content'"); +} + +/** + * Adds new Allowed Providers setting to existing instances. + */ +function video_embed_field_update_7009() { + $allowed_providers = array_keys(video_embed_get_handlers()); + + $instances = field_info_instances(); + foreach ($instances as $entity_type) { + foreach ($entity_type as $bundle) { + foreach ($bundle as $instance) { + $field_info = field_info_field($instance['field_name']); + if ($field_info['type'] == 'video_embed_field') { + $instance['settings']['allowed_providers'] = $allowed_providers; + field_update_instance($instance); + } + } + } + } + + return t('Updated default instance settings'); +} + +/** + * Update styles with empty class parameter. + */ +function video_embed_field_update_7010() { + drupal_get_schema('vef_video_styles', TRUE); + ctools_include('export'); + $styles = ctools_export_load_object('vef_video_styles'); + foreach ($styles as $style) { + foreach ($style->data as &$provider) { + if (!isset($provider['class'])) { + $provider['class'] = ''; + } + } + ctools_export_crud_save('vef_video_styles', $style); + } + + return 'Parameter class added to existing styles'; +} diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.migrate.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.migrate.inc new file mode 100644 index 0000000..a714ca6 --- /dev/null +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.migrate.inc @@ -0,0 +1,57 @@ + 2, + 'field handlers' => array('MigrateVideoEmbedFieldFieldHandler'), + ); + return $api; +} + +/** + * Custom extended MigrateFieldHandler class for Video Embed Field module. + */ +class MigrateVideoEmbedFieldFieldHandler extends MigrateFieldHandler { + + public function __construct() { + $this->registerTypes(array('video_embed_field')); + } + + /** + * {@inheritdoc} + */ + public function fields($type, $parent_field, $migration = NULL) { + $fields = array( + 'video_url' => t('Video: The video URL.'), + ); + return $fields; + } + + /** + * {@inheritdoc} + */ + public function prepare($entity, array $field_info, array $instance, array $values) { + $arguments = array(); + if (isset($values['arguments'])) { + $arguments = array_filter($values['arguments']); + unset($values['arguments']); + } + $language = $this->getFieldLanguage($entity, $field_info, $arguments); + + // Setup the standard Field API array for saving. + $delta = 0; + foreach ($values as $value) { + $return[$language][$delta] = array('video_url' => $value); + $delta++; + } + + return isset($return) ? $return : NULL; + } +} diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module old mode 100755 new mode 100644 index 8f25a71..8826ead --- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module @@ -1,23 +1,28 @@ disabled = FALSE; /* Edit this to true to make a default video_embed_style disabled initially */ $normal->api_version = 1; $normal->name = 'normal'; + $normal->title = 'Normal'; $normal->data = array(); - $teaser = new stdClass; + $teaser = new stdClass(); $teaser->disabled = FALSE; /* Edit this to true to make a default video_embed_style disabled initially */ $teaser->api_version = 1; $teaser->name = 'teaser'; + $teaser->title = 'Teaser'; $teaser->data = array(); - //add in our settings for each of the handlers + // Add in our settings for each of the handlers. foreach ($handlers as $name => $handler) { $normal->data[$name] = $handler['defaults']; $teaser->data[$name] = $handler['defaults']; @@ -86,71 +93,29 @@ function video_embed_field_menu() { 'type' => MENU_CALLBACK, ); + $items['admin/config/media/vef'] = array( + 'title' => 'Video Embed Field', + 'description' => 'Video Embed Field configuration', + 'page callback' => 'system_admin_menu_block_page', + 'access arguments' => array('administer video styles'), + 'file' => 'system.admin.inc', + 'file path' => drupal_get_path('module', 'system'), + 'type' => MENU_NORMAL_ITEM, + ); + + $items['admin/config/media/vef/settings'] = array( + 'title' => 'Settings', + 'description' => 'Video Embed Field module settings', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('video_embed_field_settings_form'), + 'file' => 'video_embed_field.admin.inc', + 'access arguments' => array('administer video styles'), + 'type' => MENU_NORMAL_ITEM, + ); + return $items; } -/** - * Get an array of all styles and their settings. - * - * @return - * An array of styles keyed by the video style ID (vsid). - * @see video_embed_field_video_style_load() - */ -function video_embed_field_video_styles() { - $styles = &drupal_static(__FUNCTION__); - - // Grab from cache or build the array. - if (!isset($styles)) { - // load the style via ctools - which will handle all the caching for us - - // however, because it does a bit more logic, lets still statically cache this function - ctools_include('export'); - $styles = ctools_export_load_object('vef_video_styles'); - } - - return $styles; -} - -/** - * Load a style by style name or ID. May be used as a loader for menu items. - * - * Note that you may also use ctools_export_load_object with the key being vef_video_styles - * - * @param $name - * The name of the style. - * @param $isid - * Optional. The numeric id of a style if the name is not known. - * @return - * An video style array containing the following keys: - * - "vsid": The unique image style ID. - * - "name": The unique image style name. - * - "data": An array of video settings within this video style. - * If the video style name or ID is not valid, an empty array is returned. - */ -function video_embed_field_video_style_load($name = NULL, $vsid = NULL) { - $styles = video_embed_field_video_styles(); - - // If retrieving by name. - if (isset($name) && isset($styles[$name])) { - $style = $styles[$name]; - } // If retrieving by image style id. - elseif (!isset($name) && isset($vsid)) { - foreach ($styles as $name => $database_style) { - if (isset($database_style['vsid']) && $database_style['vsid'] == $vsid) { - $style = $database_style; - break; - } - } - } - - //if we found a style return it - if (isset($style)) { - return $style; - } - - // Otherwise the style was not found. - return FALSE; -} - /** * Implements hook_permission(). */ @@ -174,36 +139,115 @@ function video_embed_field_theme() { ), 'video_embed_field_embed_code' => array( 'template' => 'video-embed-field-embed-code', - 'variables' => array('url' => NULL, 'style' => 'normal', 'video_data' => array()), + 'variables' => array( + 'url' => NULL, + 'style' => 'normal', + 'video_data' => array(), + ), ), 'video_embed_field_colorbox_code' => array( - 'variables' => array('image_url' => NULL, 'image_style' => 'normal', 'video_url' => NULL, 'video_style' => NULL, 'video_data' => array()), + 'variables' => array( + 'image_url' => NULL, + 'image_style' => 'normal', + 'image_alt' => NULL, + 'video_url' => NULL, + 'video_style' => NULL, + 'video_data' => array(), + ), ), ); } /** - * Creates a hook that other modules can implement to get handlers - hook_video_embed_handler_info - * Can be used to add more handlers if needed - from other modules and such - * @see video_embed_field.api.php for more information + * Implements hook_views_api(). + */ +function video_embed_field_views_api() { + return array( + 'api' => 3, + 'path' => drupal_get_path('module', 'video_embed_field') . '/views', + ); +} + +/** + * Get an array of all styles and their settings. + * + * @return array + * An array of styles keyed by the video style name (name). + * + * @see video_embed_field_video_style_load() + */ +function video_embed_field_video_styles() { + $styles = &drupal_static(__FUNCTION__); + + // Grab from cache or build the array. + if (!isset($styles)) { + // Load the style via ctools - which will handle all the caching for us - + // Because it does a bit more logic, lets still statically cache this. + ctools_include('export'); + $styles = ctools_export_load_object('vef_video_styles'); + } + + return $styles; +} + +/** + * Load a style by style name. May be used as a loader for menu items. + * + * Note that you may also use ctools_export_load_object with the key being + * vef_video_styles + * + * @param string $name + * The name of the style. + * + * @return array + * An video style array containing the following keys: + * - "name": The unique video style ID. + * - "title": The human readable video style name. + * - "data": An array of video settings within this video style. + * If the video style name or ID is not valid, an empty array is returned. + */ +function video_embed_field_video_style_load($name) { + $styles = video_embed_field_video_styles(); + + return isset($styles[$name]) ? $styles[$name] : FALSE; +} + +/** + * Creates a hook that other modules can implement to get handlers. + * + * Can be used to add more handlers if needed - from other modules and such. + * + * @see hook_video_embed_handler_info + * @see video_embed_field.api.php */ function video_embed_get_handlers() { - $handlers = cache_get('video_embed_field_handlers'); + $handlers = &drupal_static(__FUNCTION__); - if ($handlers === FALSE) { - $handlers = module_invoke_all('video_embed_handler_info'); - drupal_alter('video_embed_field_handlers', $handlers); - cache_set('video_embed_field_handlers', $handlers); - } - else { - $handlers = $handlers->data; + if (!isset($handlers)) { + if ($handlers = cache_get('video_embed_field_handlers')) { + $handlers = $handlers->data; + } + else { + $handlers = module_invoke_all('video_embed_handler_info'); + drupal_alter('video_embed_handler_info', $handlers); + cache_set('video_embed_field_handlers', $handlers); + } } return $handlers; } +/** + * Retrieves the video handler for a video URL. + * + * @param string $url + * The video URL. + * + * @return string|bool + * The handler name for the URL, FALSE in case there is no handler. + */ function video_embed_get_handler($url) { - // Process video URL + // Process video URL. if (!stristr($url, 'http://') && !stristr($url, 'https://')) { $url = 'http://' . $url; } @@ -231,8 +275,13 @@ function video_embed_get_handler($url) { } /** - * Create a form from the player configuration options - * $defaults will be passed in with the default settings for the various fields + * Creates a form from the player configuration options. + * + * @param array $defaults + * The default settings for the various fields. + * + * @return array + * The configuration form array. */ function video_embed_field_get_form($defaults) { $form = array(); @@ -248,8 +297,9 @@ function video_embed_field_get_form($defaults) { $form[$name] += array( '#type' => 'fieldset', - '#title' => t($handler['title']), + '#title' => t('@provider settings', array('@provider' => $handler['title'])), '#tree' => TRUE, + '#element_validate' => isset($handler['form_validate']) ? array($handler['form_validate']) : array(), ); } } @@ -257,12 +307,28 @@ function video_embed_field_get_form($defaults) { return $form; } +/** + * Validates the iframe CSS dimensions. + * + * @param array $element + * The element to validate. + */ +function video_embed_field_validate_dimensions($element) { + if (!preg_match('/^(\d*)(px|%)?$/', $element['width']['#value'], $results)) { + form_error($element['width'], t('You should use a valid CSS value for width in @plugin plugin', array('@plugin' => $element['#title']))); + } + if (!preg_match('/^(\d*)(px|%)?$/', $element['height']['#value'], $results)) { + form_error($element['height'], t('You should use a valid CSS value for height in @plugin plugin', array('@plugin' => $element['#title']))); + } +} + /** * Get an array of image styles suitable for using as select list options. * - * @param $include_empty + * @param bool $include_empty * If TRUE a" +
- "
| t |
| t |
"+"
| t |
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
-{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c"+"
| t |
","
"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
+.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d| t |
","
"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d| t |
","
"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1>");try{for(;r| Source: | " + escapeText( source ) + " |
|---|
" + escapeText( document.title ) + "
" + - "" + - "" + - "" + - ""; - } - }, - - // Resets the test setup. Useful for tests that modify the DOM. - reset: function() { - var fixture = id( "qunit-fixture" ); - if ( fixture ) { - fixture.innerHTML = config.fixture; - } - }, - - // Trigger an event on an element. - // @example triggerEvent( document.body, "click" ); - triggerEvent: function( elem, type, event ) { - if ( document.createEvent ) { - event = document.createEvent( "MouseEvents" ); - event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView, - 0, 0, 0, 0, 0, false, false, false, false, 0, null); - - elem.dispatchEvent( event ); - } else if ( elem.fireEvent ) { - elem.fireEvent( "on" + type ); - } - }, - - // Safe object type checking - is: function( type, obj ) { - return QUnit.objectType( obj ) === type; - }, - - objectType: function( obj ) { - if ( typeof obj === "undefined" ) { - return "undefined"; - // consider: typeof null === object - } - if ( obj === null ) { - return "null"; - } - - var match = toString.call( obj ).match(/^\[object\s(.*)\]$/), - type = match && match[1] || ""; - - switch ( type ) { - case "Number": - if ( isNaN(obj) ) { - return "nan"; - } - return "number"; - case "String": - case "Boolean": - case "Array": - case "Date": - case "RegExp": - case "Function": - return type.toLowerCase(); - } - if ( typeof obj === "object" ) { - return "object"; - } - return undefined; - }, - - push: function( result, actual, expected, message ) { - if ( !config.current ) { - throw new Error( "assertion outside test context, was " + sourceFromStacktrace() ); - } - - var output, source, - details = { - module: config.current.module, - name: config.current.testName, - result: result, - message: message, - actual: actual, - expected: expected - }; - - message = escapeText( message ) || ( result ? "okay" : "failed" ); - message = ""; - output = message; - - if ( !result ) { - expected = escapeText( QUnit.jsDump.parse(expected) ); - actual = escapeText( QUnit.jsDump.parse(actual) ); - output += "
| Expected: | " + expected + " |
|---|---|
| Result: | " + actual + " |
| Diff: | " + QUnit.diff( expected, actual ) + " |
| Source: | " + escapeText( source ) + " |
| Result: | " + escapeText( actual ) + " |
|---|---|
| Source: | " + escapeText( source ) + " |
", - "", - passed, - " assertions of ", - config.stats.all, - " passed, ", - config.stats.bad, - " failed." - ].join( "" ); - - if ( banner ) { - banner.className = ( config.stats.bad ? "qunit-fail" : "qunit-pass" ); - } - - if ( tests ) { - id( "qunit-testresult" ).innerHTML = html; - } - - if ( config.altertitle && typeof document !== "undefined" && document.title ) { - // show ✖ for good, ✔ for bad suite result in title - // use escape sequences in case file gets loaded with non-utf-8-charset - document.title = [ - ( config.stats.bad ? "\u2716" : "\u2714" ), - document.title.replace( /^[\u2714\u2716] /i, "" ) - ].join( " " ); - } - - // clear own sessionStorage items if all tests passed - if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) { - // `key` & `i` initialized at top of scope - for ( i = 0; i < sessionStorage.length; i++ ) { - key = sessionStorage.key( i++ ); - if ( key.indexOf( "qunit-test-" ) === 0 ) { - sessionStorage.removeItem( key ); - } - } - } - - // scroll back to top to show results - if ( window.scrollTo ) { - window.scrollTo(0, 0); - } - - runLoggingCallbacks( "done", QUnit, { - failed: config.stats.bad, - passed: passed, - total: config.stats.all, - runtime: runtime - }); -} - -/** @return Boolean: true if this test should be ran */ -function validTest( test ) { - var include, - filter = config.filter && config.filter.toLowerCase(), - module = config.module && config.module.toLowerCase(), - fullName = (test.module + ": " + test.testName).toLowerCase(); - - // Internally-generated tests are always valid - if ( test.callback && test.callback.validTest === validTest ) { - delete test.callback.validTest; - return true; - } - - if ( config.testNumber ) { - return test.testNumber === config.testNumber; - } - - if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) { - return false; - } - - if ( !filter ) { - return true; - } - - include = filter.charAt( 0 ) !== "!"; - if ( !include ) { - filter = filter.slice( 1 ); - } - - // If the filter matches, we need to honour include - if ( fullName.indexOf( filter ) !== -1 ) { - return include; - } - - // Otherwise, do the opposite - return !include; -} - -// so far supports only Firefox, Chrome and Opera (buggy), Safari (for real exceptions) -// Later Safari and IE10 are supposed to support error.stack as well -// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack -function extractStacktrace( e, offset ) { - offset = offset === undefined ? 3 : offset; - - var stack, include, i; - - if ( e.stacktrace ) { - // Opera - return e.stacktrace.split( "\n" )[ offset + 3 ]; - } else if ( e.stack ) { - // Firefox, Chrome - stack = e.stack.split( "\n" ); - if (/^error$/i.test( stack[0] ) ) { - stack.shift(); - } - if ( fileName ) { - include = []; - for ( i = offset; i < stack.length; i++ ) { - if ( stack[ i ].indexOf( fileName ) !== -1 ) { - break; - } - include.push( stack[ i ] ); - } - if ( include.length ) { - return include.join( "\n" ); - } - } - return stack[ offset ]; - } else if ( e.sourceURL ) { - // Safari, PhantomJS - // hopefully one day Safari provides actual stacktraces - // exclude useless self-reference for generated Error objects - if ( /qunit.js$/.test( e.sourceURL ) ) { - return; - } - // for actual exceptions, this is useful - return e.sourceURL + ":" + e.line; - } -} -function sourceFromStacktrace( offset ) { - try { - throw new Error(); - } catch ( e ) { - return extractStacktrace( e, offset ); - } -} - -/** - * Escape text for attribute or text content. - */ -function escapeText( s ) { - if ( !s ) { - return ""; - } - s = s + ""; - // Both single quotes and double quotes (for attributes) - return s.replace( /['"<>&]/g, function( s ) { - switch( s ) { - case '\'': - return '''; - case '"': - return '"'; - case '<': - return '<'; - case '>': - return '>'; - case '&': - return '&'; - } - }); -} - -function synchronize( callback, last ) { - config.queue.push( callback ); - - if ( config.autorun && !config.blocking ) { - process( last ); - } -} - -function process( last ) { - function next() { - process( last ); - } - var start = new Date().getTime(); - config.depth = config.depth ? config.depth + 1 : 1; - - while ( config.queue.length && !config.blocking ) { - if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) { - config.queue.shift()(); - } else { - window.setTimeout( next, 13 ); - break; - } - } - config.depth--; - if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) { - done(); - } -} - -function saveGlobal() { - config.pollution = []; - - if ( config.noglobals ) { - for ( var key in window ) { - // in Opera sometimes DOM element ids show up here, ignore them - if ( !hasOwn.call( window, key ) || /^qunit-test-output/.test( key ) ) { - continue; - } - config.pollution.push( key ); - } - } -} - -function checkPollution() { - var newGlobals, - deletedGlobals, - old = config.pollution; - - saveGlobal(); - - newGlobals = diff( config.pollution, old ); - if ( newGlobals.length > 0 ) { - QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join(", ") ); - } - - deletedGlobals = diff( old, config.pollution ); - if ( deletedGlobals.length > 0 ) { - QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join(", ") ); - } -} - -// returns a new Array with the elements that are in a but not in b -function diff( a, b ) { - var i, j, - result = a.slice(); - - for ( i = 0; i < result.length; i++ ) { - for ( j = 0; j < b.length; j++ ) { - if ( result[i] === b[j] ) { - result.splice( i, 1 ); - i--; - break; - } - } - } - return result; -} - -function extend( a, b ) { - for ( var prop in b ) { - if ( b[ prop ] === undefined ) { - delete a[ prop ]; - - // Avoid "Member not found" error in IE8 caused by setting window.constructor - } else if ( prop !== "constructor" || a !== window ) { - a[ prop ] = b[ prop ]; - } - } - - return a; -} - -/** - * @param {HTMLElement} elem - * @param {string} type - * @param {Function} fn - */ -function addEvent( elem, type, fn ) { - // Standards-based browsers - if ( elem.addEventListener ) { - elem.addEventListener( type, fn, false ); - // IE - } else { - elem.attachEvent( "on" + type, fn ); - } -} - -/** - * @param {Array|NodeList} elems - * @param {string} type - * @param {Function} fn - */ -function addEvents( elems, type, fn ) { - var i = elems.length; - while ( i-- ) { - addEvent( elems[i], type, fn ); - } -} - -function hasClass( elem, name ) { - return (" " + elem.className + " ").indexOf(" " + name + " ") > -1; -} - -function addClass( elem, name ) { - if ( !hasClass( elem, name ) ) { - elem.className += (elem.className ? " " : "") + name; - } -} - -function removeClass( elem, name ) { - var set = " " + elem.className + " "; - // Class name may appear multiple times - while ( set.indexOf(" " + name + " ") > -1 ) { - set = set.replace(" " + name + " " , " "); - } - // If possible, trim it for prettiness, but not neccecarily - elem.className = window.jQuery ? jQuery.trim( set ) : ( set.trim ? set.trim() : set ); -} - -function id( name ) { - return !!( typeof document !== "undefined" && document && document.getElementById ) && - document.getElementById( name ); -} - -function registerLoggingCallback( key ) { - return function( callback ) { - config[key].push( callback ); - }; -} - -// Supports deprecated method of completely overwriting logging callbacks -function runLoggingCallbacks( key, scope, args ) { - var i, callbacks; - if ( QUnit.hasOwnProperty( key ) ) { - QUnit[ key ].call(scope, args ); - } else { - callbacks = config[ key ]; - for ( i = 0; i < callbacks.length; i++ ) { - callbacks[ i ].call( scope, args ); - } - } -} - -// Test for equality any JavaScript type. -// Author: Philippe Rathé
" : "\n" : this.HTML ? " " : " "; - }, - // extra can be a number, shortcut for increasing-calling-decreasing - indent: function( extra ) { - if ( !this.multiline ) { - return ""; - } - var chr = this.indentChar; - if ( this.HTML ) { - chr = chr.replace( /\t/g, " " ).replace( / /g, " " ); - } - return new Array( this._depth_ + (extra||0) ).join(chr); - }, - up: function( a ) { - this._depth_ += a || 1; - }, - down: function( a ) { - this._depth_ -= a || 1; - }, - setParser: function( name, parser ) { - this.parsers[name] = parser; - }, - // The next 3 are exposed so you can use them - quote: quote, - literal: literal, - join: join, - // - _depth_: 1, - // This is the list of parsers, to modify them, use jsDump.setParser - parsers: { - window: "[Window]", - document: "[Document]", - error: function(error) { - return "Error(\"" + error.message + "\")"; - }, - unknown: "[Unknown]", - "null": "null", - "undefined": "undefined", - "function": function( fn ) { - var ret = "function", - // functions never have name in IE - name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1]; - - if ( name ) { - ret += " " + name; - } - ret += "( "; - - ret = [ ret, QUnit.jsDump.parse( fn, "functionArgs" ), "){" ].join( "" ); - return join( ret, QUnit.jsDump.parse(fn,"functionCode" ), "}" ); - }, - array: array, - nodelist: array, - "arguments": array, - object: function( map, stack ) { - var ret = [ ], keys, key, val, i; - QUnit.jsDump.up(); - keys = []; - for ( key in map ) { - keys.push( key ); - } - keys.sort(); - for ( i = 0; i < keys.length; i++ ) { - key = keys[ i ]; - val = map[ key ]; - ret.push( QUnit.jsDump.parse( key, "key" ) + ": " + QUnit.jsDump.parse( val, undefined, stack ) ); - } - QUnit.jsDump.down(); - return join( "{", ret, "}" ); - }, - node: function( node ) { - var len, i, val, - open = QUnit.jsDump.HTML ? "<" : "<", - close = QUnit.jsDump.HTML ? ">" : ">", - tag = node.nodeName.toLowerCase(), - ret = open + tag, - attrs = node.attributes; - - if ( attrs ) { - for ( i = 0, len = attrs.length; i < len; i++ ) { - val = attrs[i].nodeValue; - // IE6 includes all attributes in .attributes, even ones not explicitly set. - // Those have values like undefined, null, 0, false, "" or "inherit". - if ( val && val !== "inherit" ) { - ret += " " + attrs[i].nodeName + "=" + QUnit.jsDump.parse( val, "attribute" ); - } - } - } - ret += close; - - // Show content of TextNode or CDATASection - if ( node.nodeType === 3 || node.nodeType === 4 ) { - ret += node.nodeValue; - } - - return ret + open + "/" + tag + close; - }, - // function calls it internally, it's the arguments part of the function - functionArgs: function( fn ) { - var args, - l = fn.length; - - if ( !l ) { - return ""; - } - - args = new Array(l); - while ( l-- ) { - // 97 is 'a' - args[l] = String.fromCharCode(97+l); - } - return " " + args.join( ", " ) + " "; - }, - // object calls it internally, the key part of an item in a map - key: quote, - // function calls it internally, it's the content of the function - functionCode: "[code]", - // node calls it internally, it's an html attribute value - attribute: quote, - string: quote, - date: quote, - regexp: literal, - number: literal, - "boolean": literal - }, - // if true, entities are escaped ( <, >, \t, space and \n ) - HTML: false, - // indentation unit - indentChar: " ", - // if true, items in a collection, are separated by a \n, else just a space. - multiline: true - }; - - return jsDump; -}()); - -// from jquery.js -function inArray( elem, array ) { - if ( array.indexOf ) { - return array.indexOf( elem ); - } - - for ( var i = 0, length = array.length; i < length; i++ ) { - if ( array[ i ] === elem ) { - return i; - } - } - - return -1; -} - -/* - * Javascript Diff Algorithm - * By John Resig (http://ejohn.org/) - * Modified by Chu Alan "sprite" - * - * Released under the MIT license. - * - * More Info: - * http://ejohn.org/projects/javascript-diff-algorithm/ - * - * Usage: QUnit.diff(expected, actual) - * - * QUnit.diff( "the quick brown fox jumped over", "the quick fox jumps over" ) == "the quick
' . t('Any items marked "Unknown" are configurations in the system for entity types or bundles which have been disabled via the API or the Settings page; they will not be used.', array('@url' => url('admin/config/search/metatags/settings'))) . '
', ); return $build; @@ -281,7 +264,8 @@ function metatag_config_edit_form($form, &$form_state, $config) { else { $options['token types'] = array($contexts[0]); } - // Allow hook_metatag_token_types_alter() to modify the defined tokens. + // Trigger hook_metatag_token_types_alter(). + // Allow the defined tokens to be modified. drupal_alter('metatag_token_types', $options); } @@ -308,10 +292,6 @@ function metatag_config_edit_form($form, &$form_state, $config) { metatag_metatags_form($form, $config->instance, $config->config, $options); $form['metatags']['#type'] = 'container'; - // Make the token browser available. - $form['metatags']['#prefix'] = $form['metatags'][LANGUAGE_NONE]['#description']; - unset($form['metatags'][LANGUAGE_NONE]['#description']); - $form['actions']['#type'] = 'actions'; $form['actions']['save'] = array( '#type' => 'submit', @@ -333,7 +313,7 @@ function metatag_config_edit_form_submit($form, &$form_state) { $config = (object) $form_state['values']; // @todo Consider renaming the config field from 'config' to 'metatags' $config->config = $config->metatags[LANGUAGE_NONE]; - unset($config->metatags[LANGUAGE_NONE]); + unset($config->metatags); metatag_config_save($config); $label = metatag_config_instance_label($config->instance); @@ -362,7 +342,7 @@ function metatag_config_disable($config) { ctools_export_crud_disable('metatag_config', $config); $label = metatag_config_instance_label($config->instance); - drupal_set_message(t('The meta tag defaults for @label have been disabed.', array('@label' => $label))); + drupal_set_message(t('The meta tag defaults for @label have been disabled.', array('@label' => $label))); drupal_goto(); } @@ -384,7 +364,7 @@ function metatag_config_delete_form($form, &$form_state, $config) { function metatag_config_delete_form_submit($form, &$form_state) { $config = metatag_config_load($form_state['values']['instance']); - metatag_config_delete($config->instance); + metatag_config_delete($config); $label = metatag_config_instance_label($config->instance); $delete = metatag_config_access('delete', $config); @@ -403,16 +383,16 @@ function metatag_config_export_form($config) { * Form constructor to revert nodes to their default metatags. * * @see metatag_bulk_revert_form_submit() + * * @ingroup forms */ function metatag_bulk_revert_form() { - // Get the list of entity:bundle options + // Get the list of entity:bundle options. $options = array(); foreach (entity_get_info() as $entity_type => $entity_info) { foreach (array_keys($entity_info['bundles']) as $bundle) { if (metatag_entity_supports_metatags($entity_type, $bundle)) { - $options[$entity_type . ':' . $bundle] = - $entity_info['label'] . ': ' . $entity_info['bundles'][$bundle]['label']; + $options[$entity_type . ':' . $bundle] = $entity_info['label'] . ': ' . $entity_info['bundles'][$bundle]['label']; } } } @@ -426,6 +406,41 @@ function metatag_bulk_revert_form() { '#description' => t('All meta tags will be removed for all content of the selected entities.'), ); + $metatags = metatag_get_info(); + $options = array(); + foreach ($metatags['tags'] as $tag_name => $tag) { + $options[$tag_name] = t('@group_label: @tag_label', array( + '@group_label' => $metatags['groups'][$tag['group']]['label'], + '@tag_label' => $tag['label'], + )); + } + + if (count($options) > 0) { + $form['tags'] = array( + '#type' => 'checkboxes', + '#required' => FALSE, + '#title' => t('Select the tags to revert'), + '#description' => t('If you select any tags, only those tags will be reverted.'), + '#options' => $options, + ); + } + + $languages = language_list(); + $options = array( + LANGUAGE_NONE => t('Language neutral'), + ); + foreach ($languages as $language) { + $options[$language->language] = $language->name; + } + + $form['languages'] = array( + '#type' => 'checkboxes', + '#required' => FALSE, + '#title' => t('Select the languages to revert'), + '#description' => t('If you select any languages, only tags for those languages will be reverted.'), + '#options' => $options, + ); + $form['submit'] = array( '#type' => 'submit', '#value' => t('Revert'), @@ -448,10 +463,13 @@ function metatag_bulk_revert_form_submit($form, &$form_state) { 'file' => drupal_get_path('module', 'metatag') . '/metatag.admin.inc', ); + $tags = isset($form_state['values']['tags']) ? array_filter($form_state['values']['tags']) : array(); + $languages = isset($form_state['values']['languages']) ? array_filter($form_state['values']['languages']) : array(); + // Set a batch operation per entity:bundle. foreach (array_filter($form_state['values']['update']) as $option) { list($entity_type, $bundle) = explode(':', $option); - $batch['operations'][] = array('metatag_bulk_revert_batch_operation', array($entity_type, $bundle)); + $batch['operations'][] = array('metatag_bulk_revert_batch_operation', array($entity_type, $bundle, $tags, $languages)); } batch_set($batch); @@ -460,7 +478,7 @@ function metatag_bulk_revert_form_submit($form, &$form_state) { /** * Batch callback: delete custom metatags for selected bundles. */ -function metatag_bulk_revert_batch_operation($entity_type, $bundle, &$context) { +function metatag_bulk_revert_batch_operation($entity_type, $bundle, $tags, $languages, &$context) { if (!isset($context['sandbox']['current'])) { $context['sandbox']['count'] = 0; $context['sandbox']['current'] = 0; @@ -498,14 +516,53 @@ function metatag_bulk_revert_batch_operation($entity_type, $bundle, &$context) { foreach ($entity_ids as $entity_id) { $metatags = metatag_metatags_load($entity_type, $entity_id); if (!empty($metatags)) { - db_delete('metatag')->condition('entity_type', $entity_type) - ->condition('entity_id', $entity_id) - ->execute(); - metatag_metatags_cache_clear($entity_type, $entity_id); - $context['results'][] = t('Reverted metatags for @bundle with id @id.', array( - '@bundle' => $entity_type . ': ' . $bundle, - '@id' => $entity_id, - )); + $reset = FALSE; + if (empty($tags)) { + // All tags should be reset, so we just delete any records from the db. + $query = db_delete('metatag') + ->condition('entity_type', $entity_type) + ->condition('entity_id', $entity_id); + if (!empty($languages)) { + $query->condition('language', $languages, 'IN'); + } + $query->execute(); + metatag_metatags_cache_clear($entity_type, $entity_id); + $reset = TRUE; + } + else { + // Iterate over tags and unset those, that we want to reset. + $needs_reset = FALSE; + foreach ($metatags as $metatags_language => $metatags_tags) { + if (empty($languages) || in_array($metatags_language, $languages)) { + foreach ($metatags_tags as $metatags_tag => $metatags_value) { + if (in_array($metatags_tag, $tags)) { + unset($metatags[$metatags_language][$metatags_tag]); + $needs_reset = TRUE; + } + } + } + } + // Save modified metatags. + if ($needs_reset) { + // We don't have a revision id, so we'll get the active one. + // Unfortunately, the only way of getting the active revision ID is to + // first load the entity, and then extract the ID. This is a bit + // performance intensive, but it seems to be the only way of doing it. + $entities = entity_load($entity_type, array($entity_id)); + if (!empty($entities[$entity_id])) { + // We only care about the revision_id. + list(, $revision_id,) = entity_extract_ids($entity_type, $entities[$entity_id]); + } + metatag_metatags_save($entity_type, $entity_id, $revision_id, $metatags, $bundle); + $reset = TRUE; + } + } + if ($reset) { + $context['results'][] = t('Reverted metatags for @bundle with id @id.', array( + '@bundle' => $entity_type . ': ' . $bundle, + '@id' => $entity_id, + )); + } } } @@ -552,11 +609,108 @@ function metatag_admin_settings_form() { ), ); + $form['entities'] = array( + '#type' => 'fieldset', + '#title' => t('Master controls for all entities'), + '#description' => t('By enabling and disabling items here, it is possible to control which entities (e.g. nodes, taxonomy terms) and bundles (e.g. content types, vocabularies) will have the meta tag form available on their respective edit pages. If an entity type is disabled it also disables it for all of that entity type\'s bundles.Technical note: Entity types must not be configuration entities and must have view modes in order to be compatible.'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + ); + + foreach (entity_get_info() as $entity_type => $entity_info) { + // Only show entities that are capable of using meta tags. + if (metatag_entity_type_is_suitable($entity_type, $entity_info)) { + $entity_enabled = metatag_entity_supports_metatags($entity_type); + $form['entities']['metatag_enable_' . $entity_type] = array( + '#type' => 'checkbox', + '#title' => t($entity_info['label']), + '#default_value' => $entity_enabled, + // '#description' => t('Enable meta tags for all pages of this entity type.'), + ); + + // Some entities, e.g. User, (core) File, have a single bundle with the + // same name as the entity, so only show the bundles list if there is + // more than one of them and the bundle's name isn't the same as the + // entity type's. + if (!empty($entity_info['bundles'])) { + foreach ($entity_info['bundles'] as $bundle_name => $bundle_info) { + if (count($entity_info['bundles']) > 1 || $entity_type != $bundle_name) { + // If the entity type was disabled, automatically enable the bundle. + // This will have the effect that if the entity type is enabled in + // the form then all of the bundles will then also be enabled. This + // is safe to do because in the rest of the module the bundle will + // be ignored if the entity is disabled. + $form['entities']['metatag_enable_' . $entity_type . '__' . $bundle_name] = array( + '#type' => 'checkbox', + '#title' => t($bundle_info['label']), + '#default_value' => !$entity_enabled || metatag_entity_supports_metatags($entity_type, $bundle_name), + '#attributes' => array( + // Add some theming that'll indent this bundle. + 'class' => array('metatag-bundle-checkbox'), + ), + '#states' => array( + 'visible' => array( + ':input[name="metatag_enable_' . $entity_type . '"]' => array('checked' => TRUE), + ), + ), + ); + } + } + } + } + } + + $form['additional'] = array( + '#type' => 'fieldset', + '#title' => t('Additional settings'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + ); + + $form['additional']['metatag_pager_string'] = array( + '#title' => t('Custom pager string'), + '#type' => 'textfield', + '#description' => t('When the current page includes a pager, e.g. the URL contains "?page=42", the [current-page:pager] token may be added to a meta tag to differentiate between two pages that would otherwise have the same meta tags. The value "PAGER" (must be in uppercase) will be replaced by the actual page count. Note: the pager will only output if the page number is 2 or above and the string "page=NUMBER" is in the URL.
For best use, it may be worthwhile to add the [current-page:pager] to the page title to the left of the site name, to the start of description tags, etc.'), + '#default_value' => variable_get('metatag_pager_string', 'Page PAGER | '), + ); + + $form['i18n'] = array( + '#type' => 'fieldset', + '#title' => t('Internationalization options'), + '#description' => t('Additional options are available when using the Internationalization module.', array('@url' => 'https://www.drupal.org/project/i18n')), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + ); + + $form['i18n']['metatag_i18n_disabled'] = array( + '#title' => t('Disable i18n integration'), + '#type' => 'checkbox', + '#description' => t('If the i18n_string module is enabled but the site does not need to translate Metatag strings, the integration may be disabled to avoid a large volume of records being added to the translation system.'), + '#default_value' => variable_get('metatag_i18n_disabled', FALSE), + '#disabled' => !module_exists('i18n_string'), + ); + + $form['i18n']['metatag_i18n_translate_output'] = array( + '#title' => t('Translate output'), + '#type' => 'checkbox', + '#description' => t('Optionally translate the final page output.'), + '#default_value' => variable_get('metatag_i18n_translate_output', FALSE), + '#disabled' => !module_exists('i18n_string'), + ); + + $form['i18n']['metatag_i18n_enable_watchdog'] = array( + '#title' => t('Enable logging of translations to Watchdog'), + '#type' => 'checkbox', + '#description' => t('Optionally log to Watchdog any changes that happen.'), + '#default_value' => variable_get('metatag_i18n_enable_watchdog', FALSE), + '#disabled' => !module_exists('i18n_string'), + ); + $form['advanced'] = array( '#type' => 'fieldset', '#title' => t('Advanced settings'), '#collapsible' => TRUE, - '#collapsed' => FALSE, + '#collapsed' => TRUE, ); $form['advanced']['metatag_load_all_pages'] = array( @@ -594,6 +748,20 @@ function metatag_admin_settings_form() { '#default_value' => variable_get('metatag_load_defaults', TRUE), ); + $form['advanced']['metatag_cache_output'] = array( + '#type' => 'checkbox', + '#title' => t('Cache meta tag output'), + '#description' => t('Enabling this will cause all meta tag output to be cached for each page, which may aid with site performance in some circumstances. Should not be used if there are paths which include user-specific meta tags for the current user, they may lead to information about the user being accidentally leaked; this problem does not affect the "user/[uid]" pages. It may also cause the {cache_metatag} cache table to grow to be extremely large in certain circumstances.'), + '#default_value' => variable_get('metatag_cache_output', FALSE), + ); + + $form['advanced']['metatag_leave_core_tags'] = array( + '#type' => 'checkbox', + '#title' => t("Leave core's meta tags as-is"), + '#description' => t("Drupal core outputs a number of meta tags itself: canonical, shortlink, and generator. Metatag can be used to replace these with custom values. Should Metatag not have values for these meta tags, core's tags will normally be removed. Enabling this option will leave those meta tags on the page, even if Metatag is not replacing them."), + '#default_value' => variable_get('metatag_leave_core_tags', FALSE), + ); + $form['advanced']['metatag_page_region'] = array( '#type' => 'select', '#title' => t("Page region to use"), @@ -602,50 +770,36 @@ function metatag_admin_settings_form() { '#default_value' => variable_get('metatag_page_region', 'content'), ); - $form['entities'] = array( - '#type' => 'fieldset', - '#title' => t('Master controls for all entities'), - '#description' => t('By enabling and disabling items here, it is possible to control which entities (e.g. nodes, taxonomy terms) and bundles (e.g. content types, vocabularies) will have meta tags available to them.
Note: the entities first have to have meta tags enabled via hook_entity_info; see the API documentation for full details.'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, + $form['advanced']['metatag_token_sanitize'] = array( + '#type' => 'checkbox', + '#title' => t('Sanitize content during token replacement'), + '#description' => t('If checked, will ensure that metatag value output is encoded and text filters are processed.'), + '#default_value' => variable_get('metatag_token_sanitize', FALSE), ); - foreach (entity_get_info() as $entity_name => $entity_info) { - // Only show entities that have been enabled via the hooks. - if (!empty($entity_info['metatags'])) { - $form['entities']['metatag_enable_' . $entity_name] = array( - '#type' => 'checkbox', - '#title' => t($entity_info['label']), - '#default_value' => variable_get('metatag_enable_' . $entity_name, TRUE), - '#description' => t('Enable meta tags for all pages this entity type.'), - ); - - if (!empty($entity_info['bundles'])) { - $desc_added = FALSE; - foreach ($entity_info['bundles'] as $bundle_name => $bundle_info) { - // Some entities, e.g. User, (core) File, have a bundle with the same - // name as the entity, so - if ($bundle_name != $entity_name) { - // Add an extra line to the description introducing the entity - // bundles. - if (!$desc_added) { - $form['entities']['metatag_enable_' . $entity_name]['#disabled'] = TRUE; - $form['entities']['metatag_enable_' . $entity_name]['#default_value'] = TRUE; - $form['entities']['metatag_enable_' . $entity_name]['#description'] = t('Each bundle for this entity must be controlled individually.'); - $desc_added = TRUE; - } - $form['entities']['metatag_enable_' . $entity_name . '__' . $bundle_name] = array( - '#type' => 'checkbox', - '#title' => t($bundle_info['label']), - '#default_value' => variable_get('metatag_enable_' . $entity_name . '__' . $bundle_name, isset($bundle_info['metatags']) ? $bundle_info['metatags'] : TRUE), - '#attributes' => array( - // Add some theming that'll indent this bundle. - 'class' => array('metatag-bundle-checkbox'), - ), - ); - } - } + $form['lengths'] = array( + '#type' => 'fieldset', + '#title' => t('Maximum meta tag lengths'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#description' => t('Many meta tags may be shortened to a certain length. To reset to the default, leave the field blank. To keep the entire meta tag, regardless of length, set the value to zero (0). Note: the meta tag will be shortened after the tokens have been replaced, not before.'), + ); + $info = metatag_get_info(); + $groups = $info['groups']; + $tags = $info['tags']; + foreach ($tags as $tag => $info) { + if (isset($info['maxlength'])) { + $default = $info['maxlength']; + $var_name = 'metatag_maxlength_' . $tag; + $title = $info['label']; + if (!empty($info['group']) && isset($groups[$info['group']])) { + $title = $groups[$info['group']]['label'] . ': ' . $title; } + $form['lengths'][$var_name] = array( + '#type' => 'textfield', + '#title' => $title, + '#default_value' => intval(variable_get($var_name, $default)), + ); } } @@ -658,8 +812,21 @@ function metatag_admin_settings_form() { /** * Form API submission callback for metatag_admin_settings_form(). */ -function metatag_admin_settings_form_submit() { - cache_clear_all('entity_info:', 'cache', TRUE); +function metatag_admin_settings_form_submit($form, &$form_state) { + // Only keep maxlength values that are numeric. Any empty, non-zero values + // will be removed. + foreach ($form_state['values'] as $name => $value) { + if (strpos($name, 'metatag_maxlength_') !== FALSE) { + if ((empty($value) && $value !== 0 && $value !== '0') || !is_numeric($value)) { + unset($form_state['values'][$name]); + variable_del($name); + } + else { + $form_state['values'][$name] = intval($value); + } + } + } + cache_clear_all('*', 'cache_metatag', TRUE); - drupal_set_message(t('The Metatag cache has been cleared, so all meta tags can be reloaded.')); + drupal_set_message(t('The Metatag cache has been cleared so all meta tags can be reloaded.')); } diff --git a/sites/all/modules/contrib/seo/metatag/metatag.admin.js b/sites/all/modules/contrib/seo/metatag/metatag.admin.js index 64e6778..b157e6e 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.admin.js +++ b/sites/all/modules/contrib/seo/metatag/metatag.admin.js @@ -6,43 +6,43 @@ (function ($) { 'use strict'; -Drupal.behaviors.metatagUIConfigListing = { - attach: function (context) { - // Hidden elements to be visible if JavaScript is enabled. - $('.js-show').show(); + Drupal.behaviors.metatagUIConfigListing = { + attach: function (context) { + // Hidden elements to be visible if JavaScript is enabled. + $('.js-show').show(); - // Make the leaf arrow clickable. - $('.metatag-config-label').hover(function(){ - $(this).css({'cursor': 'pointer'}); - }) - .click(function(){ - $(this).find('a.toggle-details', context).trigger('click'); - }); + // Make the leaf arrow clickable. + $('.metatag-config-label').hover(function(){ + $(this).css({'cursor': 'pointer'}); + }) + .click(function(){ + $(this).find('a.toggle-details', context).trigger('click'); + }); - // Show or hide the summary - $('table.metatag-config-overview a.toggle-details', context).click(function(event) { - $(this).parent('div').siblings('div.metatag-config-details').each(function() { - if ($(this).hasClass('js-hide')) { - $(this).slideDown('slow').removeClass('js-hide'); + // Show or hide the summary. + $('table.metatag-config-overview a.toggle-details', context).click(function(event) { + $(this).parent('div').siblings('div.metatag-config-details').each(function() { + if ($(this).hasClass('js-hide')) { + $(this).slideDown('slow').removeClass('js-hide'); + } + else { + $(this).slideUp('slow').addClass('js-hide'); + } + }); + + // Change the expanded or collapsed state of the instance label. + if ($(this).parent('div').hasClass('collapsed')) { + $(this).parent('div').removeClass('collapsed').addClass('expanded'); } else { - $(this).slideUp('slow').addClass('js-hide'); + $(this).parent('div').removeClass('expanded').addClass('collapsed'); } + + // This event may be triggered by a parent element click - so we don't + // want the click to bubble up otherwise we get recursive click events. + event.stopPropagation(); }); - - // Change the expanded or collapsed state of the instance label. - if ($(this).parent('div').hasClass('collapsed')) { - $(this).parent('div').removeClass('collapsed').addClass('expanded'); - } - else { - $(this).parent('div').removeClass('expanded').addClass('collapsed'); - } - - // This event may be triggered by a parent element click - so we don't - // want the click to bubble up otherwise we get recursive click events. - event.stopPropagation(); - }); - } -}; + } + }; })(jQuery); diff --git a/sites/all/modules/contrib/seo/metatag/metatag.api.php b/sites/all/modules/contrib/seo/metatag/metatag.api.php index bdcb4dd..9d4bc4d 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.api.php +++ b/sites/all/modules/contrib/seo/metatag/metatag.api.php @@ -1,70 +1,10 @@ TRUE to the - * entity definition in hook_entity_info(), e.g.: - * - * /** - * * Implements hook_entity_info(). - * * - * * Taken from the Examples module. - * * / - * function entity_example_entity_info() { - * $info['entity_example_basic'] = array( - * 'label' => t('Example Basic Entity'), - * 'controller class' => 'EntityExampleBasicController', - * 'base table' => 'entity_example_basic', - * 'uri callback' => 'entity_example_basic_uri', - * 'fieldable' => TRUE, - * 'metatags' => TRUE, - * 'entity keys' => array( - * 'id' => 'basic_id' , // The 'id' (basic_id here) is the unique id. - * 'bundle' => 'bundle_type' // Bundle will be determined by the 'bundle_type' field - * ), - * 'bundle keys' => array( - * 'bundle' => 'bundle_type', - * ), - * 'static cache' => TRUE, - * 'bundles' => array( - * 'first_example_bundle' => array( - * 'label' => 'First example bundle', - * 'admin' => array( - * 'path' => 'admin/structure/entity_example_basic/manage', - * 'access arguments' => array('administer entity_example_basic entities'), - * ), - * ), - * ), - * 'view modes' => array( - * 'tweaky' => array( - * 'label' => t('Tweaky'), - * 'custom settings' => FALSE, - * ), - * ) - * ); - * - * return $info; - * } - * - * The definition of each bundle may be handled separately, thus support may be - * disabled for the entity as a whole but enabled for individual bundles. This - * is handled via the 'metatags' value on the bundle definition, e.g.: - * - * 'bundles' => array( - * 'first_example_bundle' => array( - * 'label' => 'First example bundle', - * 'metatags' => TRUE, - * 'admin' => array( - * 'path' => 'admin/structure/entity_example_basic/manage', - * 'access arguments' => array('administer entity_example_basic entities'), - * ), - * ), - * ), - */ - /** * Provides a default configuration for Metatag intances. * @@ -80,7 +20,7 @@ * The $config->disabled boolean attribute indicates whether the Metatag * instance should be enabled (FALSE) or disabled (TRUE) by default. * - * @return + * @return array * An associative array containing the structures of Metatag instances, as * generated from the Export tab, keyed by the Metatag config name. * @@ -96,7 +36,7 @@ function hook_metatag_config_default() { $config->disabled = FALSE; $config->config = array( 'title' => array('value' => '[current-page:title] | [site:name]'), - 'generator' => array('value' => 'Drupal 7 (http://drupal.org)'), + 'generator' => array('value' => 'Drupal 7 (https://www.drupal.org)'), 'canonical' => array('value' => '[current-page:url:absolute]'), 'shortlink' => array('value' => '[current-page:url:unaliased]'), ); @@ -114,6 +54,12 @@ function hook_metatag_config_default() { return $configs; } +/** + * Allow the exported configurations to be changed prior to being cached. + */ +function hook_metatag_config_default_alter(&$config) { +} + /** * Internal hook for adding further configuration values in bundled submodules. * @@ -128,62 +74,107 @@ function hook_metatag_config_default() { */ function hook_metatag_bundled_config_alter(&$config) { } - -/** - * - */ -function hook_metatag_config_default_alter(&$config) { -} /** - * - */ -function hook_metatag_config_delete($entity_type, $entity_ids, $revision_ids, $langcode) { -} - -/** - * - */ -function hook_metatag_config_insert($config) { -} - -/** - * + * Allow modules to act upon the record insertion. */ function hook_metatag_config_instance_info() { return array(); } /** - * + * Alter record insertion provided by modules with the previous hook. + * + * @see hook_metatag_config_instance_info() */ function hook_metatag_config_instance_info_alter(&$info) { } /** - * + * Allow the Metatag config instance name to be changed. + * + * By default, Metatag module define config instance per entity bundle, making + * it impossible to store set of meta tags based on other criteria. Combining + * this hook with hook_metatag_config_instance_info_alter() it is possible to + * alter the logic of how instances are named based on any custom criteria. + * + * @param string $instance + * The name of the instance generated by default. + * @param object $entity + * The entity object to generate the Metatag instance name for. + * @param string $entity_type + * The entity type of the entity. + * @param string $bundle + * The bundle of the entity. + */ +function hook_metatag_get_entity_metatags_instance_alter(&$instance, $entity, $entity_type, $bundle) { + if ($entity_type == 'user') { + // Split config instances based on user roles. + foreach (array_reverse(user_roles(), TRUE) as $rid => $role) { + if ($rid == DRUPAL_AUTHENTICATED_RID) { + continue; + } + + if (isset($entity->roles[$rid])) { + $instance = 'user:' . $role; + break; + } + } + } +} + +/** + * Never triggered? + * + * @todo Confirm whether this still exists. */ function hook_metatag_config_load() { } /** - * + * Never triggered? + * + * @todo Confirm whether this still exists. */ function hook_metatag_config_load_presave() { } /** - * + * Allow a Metatag configuration to be modified prior to being saved. + * + * @param object $config + * The configuration object that is about to be saved. */ function hook_metatag_config_presave($config) { } /** - * + * Triggered when a Metatag configuration is created. + * + * @param object $config + * The configuration object that was created. + */ +function hook_metatag_config_insert($config) { +} + +/** + * Triggered when a Metatag configuration is updated. + * + * @param object $config + * The configuration object that was modified. */ function hook_metatag_config_update($config) { } +/** + * Triggered when a Metatag configuration is removed. + * + * @param object $config + * The name of the configuration object that was removed. + */ +function hook_metatag_config_delete($config) { +} + /** * Definition of the meta tags and groups. * @@ -215,6 +206,23 @@ function hook_metatag_config_update($config) { * one meta tag can replace several others, only one of the possible * values will be used, the others will be silently purged upon the next * configuration/object save. + * 'multiple' - If set to TRUE the output will be comma-separated and output + * as multiple tags. + * 'image' - If set to TRUE some additional effort will be added to attempt + * extracting image URLs from the value. Currently limited to matching + * the default output of core image theming, i.e. the following string: + * src="[URL]" width= + * 'url' - If set to TRUE, relative paths will be converted to absolute. + * 'is_language' - If set to TRUE, will not allow the Drupal default + * language value "und" to be output. + * 'maxlength' - If set to a numeric value, meta tag values will be trimmed + * to this limit, which may be overridden via the settings page. Note: any + * meta tags with this value assigned can have its maxlength controlled, + * so setting the attribute to an empty string will allow site builders to + * adjust the meta tag lengths as needed. + * 'select_or_other' - If set to TRUE, form[#type] is set to 'select' and + * the "select_or_other" module is available, that module will be used to + * provide a text field to manually insert another option. * 'form' - Optional items to be passed directly to the form; uses standard * Form API values. * 'devel_generate' - Optional values to be passed to the Devel Generate @@ -252,24 +260,20 @@ function hook_metatag_config_update($config) { * Note: 'label', 'description', and any text strings passed in 'form', should * be translated. * - * @see metatag_metatag_info(). + * @see metatag_metatag_info() */ function hook_metatag_info() { return array(); } /** - * + * Alter record insertion provided by modules with the previous hook. + * + * @see hook_metatag_info() */ function hook_metatag_info_alter(&$info) { } -/** - * - */ -function hook_metatag_load_entity_from_path_alter(&$path, $result) { -} - /** * Alter metatags before being cached. * @@ -291,13 +295,13 @@ function hook_metatag_metatags_view_alter(&$output, $instance, $options) { } /** - * + * Allow other modules to customize the data to generate the cache ID. */ function hook_metatag_page_cache_cid_parts_alter(&$cid_parts) { } /** - * + * Allow other modules to alter the meta tags prior to saving. */ function hook_metatag_presave(&$metatags, $entity_type, $entity_id, $revision_id, $langcode) { } @@ -320,16 +324,16 @@ function hook_metatag_presave(&$metatags, $entity_type, $entity_id, $revision_id * @see metatag_field_attach_form() */ function hook_metatag_token_types_alter(&$options) { - // Watchout: $options['token types'] might be empty + // Watchout: $options['token types'] might be empty. if (!isset($options['token types'])) { $options['token types'] = array(); } - if ($options['context'] == 'config1'){ - $options['token types'] += array('token_type1','token_type2'); + if ($options['context'] == 'config1') { + $options['token types'] += array('token_type1', 'token_type2'); } - elseif ($options['context'] == 'config2'){ - $options['token types'] += array('token_type3','token_type4'); + elseif ($options['context'] == 'config2') { + $options['token types'] += array('token_type3', 'token_type4'); } } @@ -343,11 +347,11 @@ function hook_metatag_token_types_alter(&$options) { * * See facetapi and facetapi_bonus modules for an example of implementation. * - * @param $pattern + * @param string $pattern * A string potentially containing replaceable tokens. The pattern could also * be altered by reference, allowing modules to implement further logic, such * as tokens lists or masks/filters. - * @param $types + * @param array $types * Corresponds to the 'token data' property of the $options object. * (optional) An array of keyed objects. For simple replacement scenarios * 'node', 'user', and others are common keys, with an accompanying node or @@ -370,3 +374,87 @@ function hook_metatag_pattern_alter(&$pattern, &$types, $tag_name) { $pattern = str_replace('[token_type3]', '', $pattern); } } + +/** + * Allow modules to override whether entity types are enabled for use. + * + * By default the system only support entities that are not configuration + * entities, have multiple view modes (excluding those created by the ical, + * diff and token modules), are fieldable, and are not one of the following: + * - field_collection_item (from the Field Collection module) + * - paragraphs_item (from the Paragraphs module) + * + * @param bool $suitable + * Whether or not the entity type is enabled for use with Metatag. + * @param string $entity_type + * The machine name of the entity type. + * @param array $entity_info + * The full specifications for this entity type, as returned by + * entity_get_info(). + */ +function hook_metatag_entity_type_is_supported_alter(&$suitable, $entity_type, $entity_info) { + // Enable Metatag support for a custom entity that might otherwise be + // ignored, e.g. it doesn't allow fields. + if ($entity_type == 'my_entity') { + $suitable = TRUE; + } +} + +/** + * Identify the entity type provided by a specific view. + * + * When a view is used to display a page it can be difficult to identify what + * entity type is being managed. Use this hook to inform Metatag what type of + * entity is being displayed. + * + * @param object $view + * The view object being displayed. + * + * @return string|NULL + * Should return a string indicating an entity type that will be paired with + * the views' first argument ($view->args[0]) to load that entity. + */ +function hook_metatag_views_post_render_get_entity($view) { + $display = $view->display[$view->current_display]; + if ($display->display_options['path'] == 'coolpage/%') { + return 'my_entity'; + } +} + +/** + * Allow the context string being passed to i18n_string to be changed before it + * is used. + * + * If the string is set to an empty value it will cause this meta tag to not + * be translated. + * + * @param string $context + * The context string being passed into i18n_string. Will usually be in the + * format "[category]:[path-identifier]", e.g. "[node:123]", "[page:contact]", + * etc. + * @param string $tag_name + * The name of the meta tag being translated. + */ +function hook_metatag_i18n_context_alter(&$context, $tag_name) { + // Don't bother translating the canonical URL. + if ($tag_name == 'canonical') { + $context = ''; + } +} + +/** + * Allow modules to overide the expiration of metatag caches. + * + * By default Metatag caches everything as CACHE_PERMANENT, this alter allows to + * change that. + * + * @param $expire + * The expire value to change. + * @param $cid + * The cid about to be cached. + * @param $data + * The data to be cached. + */ +function hook_metatag_cache_set_expire_alter(&$expire, $cid, $data) { + $expire = CACHE_TEMPORARY; +} diff --git a/sites/all/modules/contrib/seo/metatag/metatag.drush.inc b/sites/all/modules/contrib/seo/metatag/metatag.drush.inc index 950e560..710e96a 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.drush.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag.drush.inc @@ -1,4 +1,5 @@ instance = $config; $object->config = $feature_conf[$config]['config']; metatag_config_save($object); + + if (!empty($feature_conf[$config]['disabled'])) { + ctools_export_crud_disable('metatag_config', $config); + } + else { + ctools_export_crud_enable('metatag_config', $config); + } } } } diff --git a/sites/all/modules/contrib/seo/metatag/metatag.feeds.inc b/sites/all/modules/contrib/seo/metatag/metatag.feeds.inc index 92a2417..3d29f24 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.feeds.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag.feeds.inc @@ -1,4 +1,5 @@ $tag) { $targets['meta_' . $name] = array( - 'name' => 'Meta tag: ' . check_plain($tag['label']), + 'name' => t('Meta tag: !label', array('!label' => $tag['label'])), 'callback' => 'metatag_feeds_set_target', 'description' => $tag['description'], ); @@ -23,12 +24,18 @@ function metatag_feeds_processor_targets_alter(&$targets, $entity_type, $bundle) /** * Callback function to set value of a metatag tag. */ -function metatag_feeds_set_target($source, $entity, $target, $value) { +function metatag_feeds_set_target($source, $entity, $target, $values) { // Don't do anything if we weren't given any data. - if (empty($value)) { + if (empty($values)) { return; } + // The Feed API was changed so that the $values are passed as an array rather + // than a single value. For backwards compatibility, support both. + if (!is_array($values)) { + $values = array($values); + } + // Strip the prefix that was added above. $name = str_replace('meta_', '', $target); @@ -45,11 +52,12 @@ function metatag_feeds_set_target($source, $entity, $target, $value) { if (!empty($stored_entities)) { $stored_entity = reset($stored_entities); if (!empty($stored_entity)) { + // Only load meta tags for the current revision. + list(, $revision_id) = entity_extract_ids($entity_type, $stored_entity); + // This function returns all values for all revisions. - $metatags = metatag_metatags_load($entity_type, $entity_id); + $metatags = metatag_metatags_load($entity_type, $entity_id, $revision_id); if (!empty($metatags)) { - // Only load meta tags for the current revision. - list(, $revision_id) = entity_extract_ids($entity_type, $stored_entity); if (!empty($metatags[$revision_id])) { // Just copy all meta tags for all languages. $entity->metatags = $metatags[$revision_id]; @@ -61,5 +69,5 @@ function metatag_feeds_set_target($source, $entity, $target, $value) { // Assign the value. $langcode = metatag_entity_get_language($entity_type, $entity); - $entity->metatags[$langcode][$name]['value'] = $value; + $entity->metatags[$langcode][$name]['value'] = $values[0]; } diff --git a/sites/all/modules/contrib/seo/metatag/metatag.i18n.inc b/sites/all/modules/contrib/seo/metatag/metatag.i18n.inc index 194d14c..7f884c3 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.i18n.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag.i18n.inc @@ -1,4 +1,5 @@ t('Metatag'), - 'description' => t('Configurable metatags.'), + 'description' => t('Configurable meta tags.'), + + // This group does not have strings with text formats. 'format' => FALSE, - 'list' => FALSE, + + // This group can list all strings. + // @todo What does this actually do? + 'list' => TRUE, ); return $groups; } + +/** + * Implements hook_i18n_object_info(). + */ +function metatag_i18n_object_info() { + // Compile all of the tags to add to the translation stack. + $meta_tag_info = metatag_get_info(); + $groups = $meta_tag_info['groups']; + $config_properties = $output_properties = array(); + foreach ($meta_tag_info['tags'] as $tag_name => $tag_info) { + // Ignore certain field types that aren't translatable, mostly fields that + // list predetermined options in various forms. + if (!empty($tag_info['class']) && $tag_info['class'] == 'DrupalListMetaTag') { + continue; + } + elseif (!empty($tag_info['form']['#type']) && $tag_info['form']['#type'] == 'select') { + continue; + } + elseif (!empty($tag_info['form']['#options'])) { + continue; + } + + // Build a suitable structure for this meta tag. + if (!empty($tag_info['group']) && !empty($groups[$tag_info['group']]['label'])) { + $group_label = $groups[$tag_info['group']]['label'] . ': '; + } + elseif (!empty($tag_info['group'])) { + $group_label = $tag_info['group'] . ': '; + } + else { + $group_label = ''; + } + + // Configuration items. + $config_properties[$tag_name] = array( + 'title' => $group_label . $tag_info['label'], + 'field' => "config.{$tag_name}.value", + ); + + // Output items. + $output_properties[$tag_name] = array( + 'title' => $group_label . ': ' . $tag_info['label'], + 'field' => "data.{$tag_name}.value", + ); + } + + // The main Metatag configuration items. + $info['metatag_config'] = array( + 'title' => t('Metatag configuration'), + // Callback to load all config objects. + 'list callback' => 'metatag_i18n_list_metatag_config', + // The object load callback. + 'load callback' => 'metatag_config_load', + // @todo Custom i18n object overrides. + // 'class' => 'metatag_i18n_metatag', + // @todo Is this needed? What does it do? + // 'translation set' => TRUE, + // The object key field. + 'key' => 'instance', + // Placeholders for automatic paths. This connects the 'key' to strings in + // the paths listed below. + 'placeholders' => array( + '%instance' => 'instance', + ), + // To produce edit links automatically. + 'edit path' => 'admin/config/search/metatags/config/%instance', + // Auto-generate a 'translate' tab. + 'translate tab' => 'admin/config/search/metatags/config/%instance/translate', + + // Properties for string translation. + 'string translation' => array( + // The textgroup, type and (below) name will be concatenated into a single + // string as the {locales_source} context. + 'textgroup' => 'metatag', + 'type' => 'metatag_config', + // Table where the object is stored, to automate string lists. + 'table' => 'metatag_config', + // Translatable properties of these objects. + 'properties' => $config_properties, + // The path to translate individual strings. + 'translate path' => 'admin/config/search/metatags/config/%instance/translate/%i18n_language', + ), + ); + + // The final meta tags being output on the page. + if (variable_get('metatag_i18n_translate_output', FALSE)) { + $info['output'] = array( + 'title' => t('Metatag final tag output'), + + // Properties for string translation. + 'string translation' => array( + // The textgroup, type and (below) name will be concatenated into a + // single string as the {locales_source} context. + 'textgroup' => 'metatag', + 'type' => 'output', + // Translatable properties of these objects. + 'properties' => $output_properties, + ), + ); + } + + return $info; +} + +/** + * List callback for {metatag_config} strings. + */ +function metatag_i18n_list_metatag_config() { + ctools_include('export'); + $configs = ctools_export_crud_load_all('metatag_config'); + + if (!empty($configs)) { + // Unserialize the config array. + foreach ($configs as &$config) { + if (is_string($config->config)) { + $config->config = unserialize($config->config); + } + } + } + + return $configs; +} diff --git a/sites/all/modules/contrib/seo/metatag/metatag.inc b/sites/all/modules/contrib/seo/metatag/metatag.inc index 0a57517..5bbdcf1 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag.inc @@ -1,36 +1,76 @@ ''); + + /** + * This item's weight; used for sorting the output. + * + * @var float + */ protected $weight = 0; + /** + * Constructor. + */ function __construct(array $info, array $data = NULL) { $this->info = $info; if (isset($data)) { @@ -39,11 +79,12 @@ class DrupalDefaultMetaTag implements DrupalMetaTagInterface { } /** - * Calculate the weight or this meta tag. + * Calculate the weight of this meta tag. * - * @return integer + * @return int + * Weight. */ - public function getWeight() { + function getWeight() { static $counter = 0; // If no weight value is found, stack this meta tag at the end. @@ -55,14 +96,39 @@ class DrupalDefaultMetaTag implements DrupalMetaTagInterface { return $weight + ($counter++ * 0.1); } + /** + * Build the form for this meta tag. + * + * @return array + * A standard FormAPI array. + */ public function getForm(array $options = array()) { return array(); } + /** + * Get the string value of this meta tag. + * + * @return string + * The value of this meta tag. + */ public function getValue(array $options = array()) { - return $this->tidyValue($this->data['value']); + $value = $this->tidyValue($this->data['value']); + + // Translate the final output string prior to output. Use the + // 'output' i18n_string object type, and pass along the meta tag's + // options as the context so it can be handled appropriately. + $value = metatag_translate_metatag($value, $this->info['name'], $options, NULL, TRUE); + + return $this->truncate($this->tidyValue($this->data['value'])); } + /** + * Get the HTML tag for this meta tag. + * + * @return array + * A render array for this meta tag. + */ public function getElement(array $options = array()) { $value = $this->getValue($options); if (strlen($value) === 0) { @@ -124,19 +190,27 @@ class DrupalDefaultMetaTag implements DrupalMetaTagInterface { /** * Remove unwanted formatting from a meta tag. * - * @param $value string + * @param string $value * The meta tag value to be tidied up. * * @return string * The meta tag value after it has been tidied up. */ public function tidyValue($value) { + // Check for Media strings from the WYSIWYG submodule. + if (module_exists('media_wysiwyg') && strpos($value, '[[{') !== FALSE) { + // In https://www.drupal.org/node/2129273 media_wysiwyg_filter() was + // changed to require several additional arguments. + $langcode = language_default('language'); + $value = media_wysiwyg_filter($value, NULL, NULL, $langcode, NULL, NULL); + } + // Specifically replace encoded spaces, because some WYSIWYG editors are // silly. Do this before decoding the other HTML entities so that the output // doesn't end up with a bunch of a-circumflex characters. $value = str_replace(' ', ' ', $value); - // Convert any HTML entities into regular characters. + // Decode HTML entities. $value = decode_entities($value); // Remove any HTML code that might have been included. @@ -150,6 +224,178 @@ class DrupalDefaultMetaTag implements DrupalMetaTagInterface { return $value; } + + /** + * Make sure a given URL is absolute. + * + * @param string $url + * The URL to convert to an absolute URL. + * + * @return string + * The argument converted to an absolute URL. + */ + function convertUrlToAbsolute($url) { + // Convert paths relative to the hostname, that start with a slash, to + // ones that are relative to the Drupal root path; ignore protocol-relative + // URLs. + if (strpos($url, base_path()) === 0 && strpos($url, '//') !== 0) { + // Logic: + // * Get the length of the base_path(), + // * Get a portion of the image's path starting from the position equal + // to the base_path()'s length; this will result in a path relative + // to the Drupal installation's base directory. + $len = strlen(base_path()); + $url = substr($url, $len); + } + + // Pass everything else through file_create_url(). The alternative is to + // use url() but it would insert '?q=' into the path. + return file_create_url($url); + } + + /** + * Shorten a string to a certain length using text_summary(). + * + * @param string $value + * String to shorten. + * + * @return string + * Shortened string. + */ + function truncate($value) { + $maxlength = $this->maxlength(); + + if (!empty($value) && $maxlength > 0) { + $value = $this->text_summary($value, $maxlength); + } + + return $value; + } + + /** + * Identify the maximum length of which strings will be allowed. + * + * @return int + * Maxlenght. + */ + function maxlength() { + if (isset($this->info['maxlength'])) { + return intval(variable_get('metatag_maxlength_' . $this->info['name'], $this->info['maxlength'])); + } + return 0; + } + + /** + * Copied from text.module with the following changes:. + * + * Change 1: $size is required. + * Change 2: $format is removed. + * Change 3: Don't trim at the end of short sentences + * (https://www.drupal.org/node/1620104). + * Change 4: Word boundaries (https://www.drupal.org/node/1482178). + * Change 5: Trim the final string. + */ + static function text_summary($text, $size) { + // if (!isset($size)) { + // // What used to be called 'teaser' is now called 'summary', but + // // the variable 'teaser_length' is preserved for backwards compatibility. + // $size = variable_get('teaser_length', 600); + // } + // Find where the delimiter is in the body. + $delimiter = strpos($text, ''); + + // If the size is zero, and there is no delimiter, + // the entire body is the summary. + if ($size == 0 && $delimiter === FALSE) { + return $text; + } + + // If a valid delimiter has been specified, use it to chop off the summary. + if ($delimiter !== FALSE) { + return substr($text, 0, $delimiter); + } + + // We check for the presence of the PHP evaluator filter in the current + // format. If the body contains PHP code, we do not split it up to prevent + // parse errors. + // if (isset($format)) { + // $filters = filter_list_format($format); + // if (isset($filters['php_code']) && $filters['php_code']->status && strpos($text, '' => 0); + + // If no complete paragraph then treat line breaks as paragraphs. + // $line_breaks = array('
' => 6, '
' => 4); + // Newline only indicates a line break if line break converter + // filter is present. + // if (isset($filters['filter_autop'])) { + // $line_breaks["\n"] = 1; + // } + // $break_points[] = $line_breaks; + // If the first paragraph is too long, split at the end of a sentence. + // $break_points[] = array('. ' => 1, '! ' => 1, '? ' => 1, '。' => 0, '؟ ' => 1); + // From https://www.drupal.org/node/1482178. + // If the first sentence is too long, split at the first word break. + $word_breaks = array(' ' => 0, "\t" => 0); + $break_points[] = $word_breaks; + + // Iterate over the groups of break points until a break point is found. + foreach ($break_points as $points) { + // Look for each break point, starting at the end of the summary. + foreach ($points as $point => $offset) { + // The summary is already reversed, but the break point isn't. + $rpos = strpos($reversed, strrev($point)); + if ($rpos !== FALSE) { + $min_rpos = min($rpos + $offset, $min_rpos); + } + } + + // If a break point was found in this group, slice and stop searching. + if ($min_rpos !== $max_rpos) { + // Don't slice with length 0. Length must be <0 to slice from RHS. + $summary = ($min_rpos === 0) ? $summary : substr($summary, 0, 0 - $min_rpos); + break; + } + } + + // If the htmlcorrector filter is present, apply it to the generated + // summary. + // if (isset($filters['filter_htmlcorrector'])) { + // $summary = _filter_htmlcorrector($summary); + // } + return trim($summary); + } + } /** @@ -157,6 +403,9 @@ class DrupalDefaultMetaTag implements DrupalMetaTagInterface { */ class DrupalTextMetaTag extends DrupalDefaultMetaTag { + /** + * {@inheritdoc} + */ public function getForm(array $options = array()) { $options += array( 'token types' => array(), @@ -174,10 +423,39 @@ class DrupalTextMetaTag extends DrupalDefaultMetaTag { '#maxlength' => 1024, ); + // Optional handling for items that allow multiple values. if (!empty($this->info['multiple'])) { $form['value']['#description'] .= ' ' . t('Multiple values may be used, separated by a comma. Note: Tokens that return multiple values will be handled automatically.'); } + // Optionally limit the field to a certain length. + $maxlength = $this->maxlength(); + if (!empty($maxlength)) { + $form['value']['#description'] .= ' ' . t('This will be truncated to a maximum of %max characters.', array('%max' => $maxlength)); + } + + // Optional handling for images. + if (!empty($this->info['image'])) { + $form['value']['#description'] .= ' ' . t('This will be able to extract the URL from an image field.'); + } + + // Optional handling for languages. + if (!empty($this->info['is_language'])) { + $form['value']['#description'] .= ' ' . t('This will not be displayed if it is set to the "Language neutral" (i.e. "und").'); + } + + // Optional support for select_or_other. + if ($form['value']['#type'] == 'select' && !empty($this->info['select_or_other']) && module_exists('select_or_other')) { + $form['value']['#type'] = 'select_or_other'; + $form['value']['#other'] = t('Other (please type a value)'); + $form['value']['#multiple'] = FALSE; + $form['value']['#other_unknown_defaults'] = 'other'; + $form['value']['#other_delimiter'] = FALSE; + $form['value']['#theme'] = 'select_or_other'; + $form['value']['#select_type'] = 'select'; + $form['value']['#element_validate'] = array('select_or_other_element_validate'); + } + // Support for dependencies, using Form API's #states system. // @see metatag.api.php. // @see https://api.drupal.org/drupal_process_states @@ -192,26 +470,87 @@ class DrupalTextMetaTag extends DrupalDefaultMetaTag { return $form; } + /** + * {@inheritdoc} + */ public function getValue(array $options = array()) { $options += array( 'instance' => '', 'token data' => array(), + // Remove any remaining token after the string is parsed. 'clear' => TRUE, - 'sanitize' => TRUE, + 'sanitize' => variable_get('metatag_token_sanitize', FALSE), 'raw' => FALSE, ); - $name = "metatag:" . $options["instance"] . ":" . $this->info["name"]; + $value = $this->data['value']; - $value = metatag_translate($name, $this->data['value']); if (empty($options['raw'])) { // Give other modules the opportunity to use hook_metatag_pattern_alter() // to modify defined token patterns and values before replacement. drupal_alter('metatag_pattern', $value, $options['token data'], $this->info['name']); $value = token_replace($value, $options['token data'], $options); } - return $this->tidyValue($value); + + // Special handling for language meta tags. + if (!empty($this->info['is_language'])) { + // If the meta tag value equals LANGUAGE_NONE, i.e. "und", then don't + // output it. + if (is_string($value) && $value == LANGUAGE_NONE) { + $value = ''; + } + } + + // Special handling for images and other URLs. + if (!empty($this->info['image']) || !empty($this->info['url'])) { + // Support multiple items, whether it's needed or not. Also remove the + // empty values and reindex the array. + $values = array_values(array_filter(explode(',', $value))); + + // If this meta tag does *not* allow multiple items, only keep the first + // one. + if (empty($this->info['multiple']) && !empty($values[0])) { + $values = array($values[0]); + } + + foreach ($values as $key => &$image_value) { + // Remove any unwanted whitespace around the value. + $image_value = trim($image_value); + + // If this contains embedded image tags, extract the image URLs. + if (!empty($this->info['image']) && strip_tags($image_value) != $image_value) { + $matches = array(); + preg_match('/src="([^"]*)"/', $image_value, $matches); + if (!empty($matches[1])) { + $image_value = $matches[1]; + } + } + + // Convert the URL to an absolute URL. + $image_value = $this->convertUrlToAbsolute($image_value); + + // Replace spaces the URL encoded entity to avoid validation problems. + $image_value = str_replace(' ', '%20', $image_value); + } + + // Combine the multiple values into a single string. + $value = implode(',', $values); + } + + // Clean up the string a bit. + $value = $this->tidyValue($value); + + // Optionally truncate the value. + $value = $this->truncate($value); + + // Translate the final output string prior to output. Use the + // 'output' i18n_string object type, and pass along the meta tag's + // options as the context so it can be handled appropriately. + $value = metatag_translate_metatag($value, $this->info['name'], $options, NULL, TRUE); + + return $value; } + } /** @@ -219,6 +558,9 @@ class DrupalTextMetaTag extends DrupalDefaultMetaTag { */ class DrupalLinkMetaTag extends DrupalTextMetaTag { + /** + * {@inheritdoc} + */ public function getElement(array $options = array()) { $element = isset($this->info['element']) ? $this->info['element'] : array(); @@ -239,13 +581,16 @@ class DrupalLinkMetaTag extends DrupalTextMetaTag { if (!isset($this->info['header']) || !empty($this->info['header'])) { // Also send the generator in the HTTP header. // @todo This does not support 'rev' or alternate link headers. - $element['#attached']['drupal_add_http_header'][] = array('Link', '<' . $value . '>;' . drupal_http_header_attributes(array('rel' => $element['#name'])), TRUE); + $element['#attached']['drupal_add_http_header'][] = array( + 'Link', '<' . $value . '>;' . drupal_http_header_attributes(array('rel' => $element['#name'])), TRUE, + ); } return array( '#attached' => array('drupal_add_html_head' => array(array($element, $element['#id']))), ); } + } /** @@ -256,13 +601,26 @@ class DrupalLinkMetaTag extends DrupalTextMetaTag { */ class DrupalTitleMetaTag extends DrupalTextMetaTag { + /** + * {@inheritdoc} + */ public function getElement(array $options = array()) { $element = array(); - $value = $this->getValue($options); - $element['#attached']['metatag_set_preprocess_variable'][] = array('html', 'head_title', $value); - $element['#attached']['metatag_set_preprocess_variable'][] = array('html', 'head_array', array('title' => $value)); + if ($value = $this->getValue($options)) { + $element['#attached']['metatag_set_preprocess_variable'][] = array( + 'html', + 'head_title', + decode_entities($value), + ); + $element['#attached']['metatag_set_preprocess_variable'][] = array( + 'html', + 'head_array', + array('title' => $value), + ); + } return $element; } + } /** @@ -270,6 +628,9 @@ class DrupalTitleMetaTag extends DrupalTextMetaTag { */ class DrupalListMetaTag extends DrupalDefaultMetaTag { + /** + * {@inheritdoc} + */ function __construct(array $info, array $data = NULL) { // Ensure that the $data['value] argument is an array. if (empty($data['value'])) { @@ -280,6 +641,9 @@ class DrupalListMetaTag extends DrupalDefaultMetaTag { parent::__construct($info, $data); } + /** + * {@inheritdoc} + */ public function getForm(array $options = array()) { $form['value'] = isset($this->info['form']) ? $this->info['form'] : array(); @@ -293,12 +657,23 @@ class DrupalListMetaTag extends DrupalDefaultMetaTag { return $form; } + /** + * {@inheritdoc} + */ public function getValue(array $options = array()) { $values = array_keys(array_filter($this->data['value'])); sort($values); $value = implode(', ', $values); - return $this->tidyValue($value); + $value = $this->tidyValue($value); + + // Translate the final output string prior to output. Use the + // 'output' i18n_string object type, and pass along the meta tag's + // options as the context so it can be handled appropriately. + $value = metatag_translate_metatag($value, $this->info['name'], $options, NULL, TRUE); + + return $value; } + } /** @@ -306,10 +681,13 @@ class DrupalListMetaTag extends DrupalDefaultMetaTag { */ class DrupalDateIntervalMetaTag extends DrupalDefaultMetaTag { + /** + * {@inheritdoc} + */ public function getForm(array $options = array()) { $form['value'] = array( '#type' => 'textfield', - '#title' => t('@title interval', array('@title' => $this->info['label'])), + '#title' => t('!title interval', array('!title' => $this->info['label'])), '#default_value' => isset($this->data['value']) ? $this->data['value'] : '', '#element_validate' => array('element_validate_integer_positive'), '#maxlength' => 4, @@ -317,7 +695,7 @@ class DrupalDateIntervalMetaTag extends DrupalDefaultMetaTag { ); $form['period'] = array( '#type' => 'select', - '#title' => t('@title interval type', array('@title' => $this->info['label'])), + '#title' => t('!title interval type', array('!title' => $this->info['label'])), '#default_value' => isset($this->data['period']) ? $this->data['period'] : '', '#options' => array( '' => t('- none -'), @@ -331,6 +709,9 @@ class DrupalDateIntervalMetaTag extends DrupalDefaultMetaTag { return $form; } + /** + * {@inheritdoc} + */ public function getValue(array $options = array()) { $value = ''; if (!empty($this->data['value'])) { @@ -340,6 +721,13 @@ class DrupalDateIntervalMetaTag extends DrupalDefaultMetaTag { $value = format_plural($interval, '@count ' . $period, '@count ' . $period . 's'); } } + + // Translate the final output string prior to output. Use the 'output' + // i18n_string object type, and pass along the meta tag's options as the + // context so it can be handled appropriately. + $value = metatag_translate_metatag($value, $this->info['name'], $options, NULL, TRUE); + return $value; } + } diff --git a/sites/all/modules/contrib/seo/metatag/metatag.info b/sites/all/modules/contrib/seo/metatag/metatag.info index d1645a5..f393781 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.info +++ b/sites/all/modules/contrib/seo/metatag/metatag.info @@ -3,26 +3,109 @@ description = "Adds support and an API to implement meta tags." package = SEO core = 7.x -; This requires Drupal 7.28 or newer as it fixes the [node:summary] token that -; was previously broken. -dependencies[] = system (>= 7.28) +; This requires Drupal 7.40 because of the project:module dependency structure. +dependencies[] = drupal:system (>= 7.40) ; CTools is required. -dependencies[] = ctools +dependencies[] = ctools:ctools -; Must have this release of Token to avoid a bug with tokens that contain the -; colon symbol, as used in OG meta tags. -dependencies[] = token (>= 1.6) +; Requires Token; v7.x-1.6 is highly recommended due to bugs with certain tags +; when using older versions. +dependencies[] = token:token configure = admin/config/search/metatags +; The main classes. files[] = metatag.inc -files[] = metatag.migrate.inc -files[] = metatag.test -; Information added by Drupal.org packaging script on 2015-05-01 -version = "7.x-1.5-beta1+22-dev" +; Defines the basic meta tags. +files[] = metatag.migrate.inc + +; Search API integration. +files[] = metatag.search_api.inc + + +; Tests. +files[] = tests/metatag.helper.test + +; Basic configuration handling. +files[] = tests/metatag.unit.test + +; Basic tag testing. +files[] = tests/metatag.tags_helper.test +files[] = tests/metatag.tags.test + +; Core entities. +files[] = tests/metatag.node.test +files[] = tests/metatag.term.test +files[] = tests/metatag.user.test + +; Handling of core's default meta tags. +files[] = tests/metatag.core_tag_removal.test + +; The custom Bulk Revert functionality. +files[] = tests/metatag.bulk_revert.test + +; String handling. +files[] = tests/metatag.string_handling.test +files[] = tests/metatag.string_handling_with_i18n.test + +; XSS testing. +files[] = tests/metatag.xss.test + +; Output caching. +files[] = tests/metatag.output_caching.test + +; Images need specia attention. +test_dependencies[] = devel:devel +test_dependencies[] = imagecache_token:imagecache_token +files[] = tests/metatag.image.test + +; Internationalization & translation. +test_dependencies[] = entity_translation:entity_translation +test_dependencies[] = i18n:i18n +files[] = tests/metatag.locale.test +files[] = tests/metatag.node.with_i18n.test +files[] = tests/metatag.term.with_i18n.test +files[] = tests/metatag.with_i18n_output.test +files[] = tests/metatag.with_i18n_disabled.test +files[] = tests/metatag.with_i18n_config.test + +; Basic integration with Me. +test_dependencies[] = me:me +files[] = tests/metatag.with_me.test + +; Basic integration with Media. +test_dependencies[] = file_entity:file_entity +test_dependencies[] = media:media (>= 2.0, < 3.0) +files[] = tests/metatag.with_media.test + +; Basic integration with Panels. +test_dependencies[] = panels:panels +files[] = tests/metatag.with_panels.test + +; Basic integration with Profile2. +test_dependencies[] = profile2:profile2 +files[] = tests/metatag.with_profile2.test + +; Basic integration with Search API. +test_dependencies[] = entity:entity +test_dependencies[] = search_api:search_api +files[] = tests/metatag.with_search_api.test + +; Integration with Workbench Moderation. +test_dependencies[] = workbench_moderation:workbench_moderation +files[] = tests/metatag.with_workbench_moderation.test + +; Basic integration with Views. +test_dependencies[] = views:views +files[] = tests/metatag.with_views.test + +; Other test dependencies. +test_dependencies[] = context:context + +; Information added by Drupal.org packaging script on 2018-04-04 +version = "7.x-1.25" core = "7.x" project = "metatag" -datestamp = "1430441289" - +datestamp = "1522849089" diff --git a/sites/all/modules/contrib/seo/metatag/metatag.install b/sites/all/modules/contrib/seo/metatag/metatag.install index 6f6adae..12d5f4f 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.install +++ b/sites/all/modules/contrib/seo/metatag/metatag.install @@ -1,4 +1,5 @@ REQUIREMENT_WARNING, 'title' => 'Metatag', - 'value' => $t('Upgrade Drupal core to v7.28 or newer'), - 'description' => $t("This older version of Drupal core is missing functionality necessary for the module's multilingual support and contains a broken [node:summary] token, it must be upgraded to version 7.28 or newer."), - ); - } - // Everything's OK. - else { - $requirements['metatag'] = array( - 'severity' => REQUIREMENT_OK, - 'title' => 'Metatag', - 'value' => $t('Drupal core is compatible'), - 'description' => $t('Older versions of Drupal core contained bugs that made them incompatible with Metatag, but this version will work correctly.'), + 'value' => $t('Upgrade Drupal core to v7.40 or newer'), + 'description' => $t("This older version of Drupal core is missing functionality necessary for Metatag to work correctly, it must be upgraded to version 7.40 or newer."), ); } // Add a note if Page Title is also installed. if (module_exists('page_title')) { $requirements['metatag_page_title'] = array( - 'severity' => REQUIREMENT_INFO, + 'severity' => REQUIREMENT_WARNING, 'title' => 'Metatag', - 'value' => $t('Possible conflicts with Page Title module'), - 'description' => $t('The Metatag module is able to customize page titles so running the Page Title module simultaneously can lead to complications.'), + 'value' => $t('Page Title module should be removed'), + 'description' => $t('The Metatag module is able to customize page titles, so running the Page Title module simultaneously can lead to complications. Please follow the instructions to convert the Page Title settings and uninstall the module.', array('@page' => 'https://www.drupal.org/node/2774833')), ); } @@ -104,16 +100,16 @@ function metatag_requirements($phase) { } // Check that Entity_Translation is current. - if (module_exists('entity_translation')) { - $rev = db_query("SELECT schema_version FROM {system} WHERE name = :module", array(':module' => 'entity_translation'))->fetchColumn(); - if ($rev < 7004) { - $requirements['metatag_et_old'] = array( - 'severity' => REQUIREMENT_ERROR, - 'title' => 'Metatag', - 'value' => $t('Entity_Translation is out of date and requires updating', array('@url' => 'https://www.drupal.org/project/entity_translation')), - 'description' => $t('The Entity_Translation module is out of date and needs to be updated in order to be compatible with Metatag.'), - ); - } + if (module_exists('entity_translation') + && !empty($module_data['entity_translation']) + && !empty($module_data['entity_translation']->schema_version) + && $module_data['entity_translation']->schema_version < 7004) { + $requirements['metatag_et_version'] = array( + 'severity' => REQUIREMENT_ERROR, + 'title' => 'Metatag', + 'value' => $t('Entity_Translation is out of date and requires updating', array('@url' => 'https://www.drupal.org/project/entity_translation')), + 'description' => $t('The Entity_Translation module is out of date and needs to be updated in order to be compatible with Metatag.'), + ); } // It's recommended to install the Transliteration module to clean up file @@ -134,12 +130,12 @@ function metatag_requirements($phase) { 'severity' => REQUIREMENT_INFO, 'title' => 'Metatag', 'value' => $t('The Imagecache Token module is recommended.'), - 'description' => $t("It is recommended to install the Imagecache Token module to make it easier to control image meta tags, e.g. og:image.", array('@url' => 'https://drupal.org/project/imagecache_token')), + 'description' => $t("It is recommended to install the Imagecache Token module to make it easier to control image meta tags, e.g. og:image. See the Metatag module's README.txt for details.", array('@url' => 'https://drupal.org/project/imagecache_token')), ); } // The Admin Language module can cause problems. - if (!module_exists('admin_language') && variable_get('admin_language_force_neutral', 0)) { + if (module_exists('admin_language') && variable_get('admin_language_force_neutral', 0)) { $requirements['metatag_admin_language'] = array( 'severity' => REQUIREMENT_WARNING, 'title' => 'Metatag', @@ -147,6 +143,95 @@ function metatag_requirements($phase) { 'description' => $t("Using the \"@option\" with Metatag can lead to data loss, so it is recommended to disable that option.", array('@option' => t('Force language neutral aliases'), '@url' => url('admin/config/regional/language/admin_language'))), ); } + + // Token v7.x-1.6 is *highly* recommended. + $token_module = $module_data['token']; + // If the version string is not present then it means the module is running + // from git, which means it can't be compared against. Alternatively, look + // for the test file, which was the last commit of the 1.6 release. + if (!empty($token_module->info['version']) + || empty($token_module->info['files'])) { + // If there's no test file then this is older than v1.6. + if (empty($token_module->info['files'])) { + $minor = 5; + } + // Otherwise check the version string. + else { + // Versions are in the format 7.x-1.y, so split the string up to find + // the 'y' portion. + $version = explode('-', $token_module->info['version']); + if (isset($version[1])) { + list($major, $minor) = explode('.', $version[1]); + // Strip off any suffixes on the version string, e.g. "17-dev". + if (strpos('-', $minor)) { + list($minor, $suffix) = explode('-', $minor); + } + } + // If the version string couldn't be extracted correctly, assume that + // an incorrect version is installed. + else { + $minor = 0; + } + } + // If v1.6 is not installed, give a warning. + if ($minor < 6) { + $requirements['metatag_token_version'] = array( + 'severity' => REQUIREMENT_WARNING, + 'title' => 'Metatag', + 'value' => $t('Token module is out of date.'), + 'description' => $t('It is highly recommended to install Token module v7.x-1.6 or newer, otherwise there may be problems using certain meta tags.'), + ); + } + } + + // If Workbench Moderation is installed, show a message if it is out of + // date. + if (module_exists('workbench_moderation')) { + $wm_module = $module_data['workbench_moderation']; + // If the version string is not present then it means the module is + // running from git, which means it can't be compared against. + if (!empty($wm_module->info['version'])) { + // Versions are in the format 7.x-1.y, so split the string up to find + // the 'y' portion. + $version = explode('-', $wm_module->info['version']); + if (isset($version[1])) { + list($major, $minor) = explode('.', $version[1]); + } + // If the version string couldn't be extracted correctly, assume that + // an incorrect version is installed. + else { + $major = 0; + } + } + // If v3.x is not installed, give a message. + if ($major < 3) { + $requirements['metatag_wm_version'] = array( + 'severity' => REQUIREMENT_INFO, + 'title' => 'Metatag', + 'value' => $t('Workbench Moderation module is out of date.'), + 'description' => $t('It is recommended to use Workbench Moderation module v7.x-3.0 or newer.'), + ); + } + } + + // Recommend the Schema.org Metatag module. + if (!module_exists('schema_metatag')) { + $requirements['metatag_schema'] = array( + 'severity' => REQUIREMENT_INFO, + 'title' => 'Metatag', + 'value' => $t('Schema.org Metatag is recommended'), + 'description' => $t('The Schema.org Metatag module is highly recommended to add JSON-LD -formatted schema.org compatible data structures to the site.', array('@module' => 'https://www.drupal.org/project/schema_metatag', '@jsonld' => 'https://json-ld.org', '@schema' => 'http://schema.org')), + ); + } + else { + $requirements['metatag_schema'] = array( + 'severity' => REQUIREMENT_OK, + 'title' => 'Metatag', + 'value' => $t('Schema.org Metatag is installed'), + 'description' => $t('The Schema.org Metatag module is installed.', array('@module' => 'https://www.drupal.org/project/schema_metatag')), + ); + } + } return $requirements; @@ -241,13 +326,21 @@ function metatag_schema() { ), ), 'indexes' => array( - 'type_revision' => array('entity_type','revision_id'), + 'type_revision' => array( + 'entity_type', + 'revision_id', + ), + ), + 'primary key' => array( + 'entity_type', + 'entity_id', + 'revision_id', + 'language', ), - 'primary key' => array('entity_type', 'entity_id', 'revision_id', 'language'), ); $schema['cache_metatag'] = drupal_get_schema_unprocessed('system', 'cache'); - $schema['cache_metatag']['description'] = t('Cache table for the generated meta tag output.'); + $schema['cache_metatag']['description'] = 'Cache table for the generated meta tag output.'; return $schema; } @@ -257,6 +350,86 @@ function metatag_schema() { */ function metatag_install() { drupal_set_message(t("Thank you for installing the Metatag module. It is recommended to read the module's README.txt file as there are some known issues that may affect this site.", array('!url' => url(drupal_get_path('module', 'metatag') . '/README.txt')))); + + // Always enable the node, taxonomy term and user entities. + foreach (array('node', 'taxonomy_term', 'user') as $entity_type) { + // Enable the main entity type. + $variable_name = 'metatag_enable_' . $entity_type; + variable_set($variable_name, TRUE); + + // Update each entity bundle too. + $entity_info = entity_get_info($entity_type); + if (!empty($entity_info['bundles'])) { + foreach ($entity_info['bundles'] as $bundle_name => $bundle_info) { + $variable_name = 'metatag_enable_' . $entity_type . '__' . $bundle_name; + variable_set($variable_name, TRUE); + } + } + } + + // Possibly enable other entities, if they're specifically requested. + foreach (entity_get_info() as $entity_type => $entity_info) { + // Skip the three entity types that were already enabled. + if (in_array($entity_type, array('node', 'taxonomy_term', 'user'))) { + continue; + } + + $variable_name = 'metatag_enable_' . $entity_type; + + // Configuration entities are skipped. + if (isset($entity_info['configuration']) && $entity_info['configuration'] == TRUE) { + continue; + } + + // Entities must have bundles. + if (empty($entity_info['bundles'])) { + continue; + } + + // Entities must be fieldable. + elseif (empty($entity_info['fieldable'])) { + continue; + } + + // Ignore some view modes that are automatically added by certain modules. + unset($entity_info['view modes']['ical']); + unset($entity_info['view modes']['diff_standard']); + unset($entity_info['view modes']['token']); + + // Entities without view modes are skipped. + if (empty($entity_info['view modes'])) { + continue; + } + + // At this point, disable the entity by default. + $entity_enabled = FALSE; + + // Anything that was specifically enabled via hook_entity_info() from older + // versions will be enabled if not configured already. + if (!empty($entity_info['metatag']) || !empty($entity_info['metatags'])) { + $entity_enabled = variable_get($variable_name, 'monkey'); + if ($entity_enabled === 'monkey') { + $entity_enabled = TRUE; + } + } + + variable_set($variable_name, $entity_enabled); + + // Loop through the bundles, but only if the entity is enabled. + if ($entity_enabled) { + foreach ($entity_info['bundles'] as $bundle_name => $bundle_info) { + $variable_name = 'metatag_enable_' . $entity_type . '__' . $bundle_name; + + // If it wasn't specifically disabled before, enable it. + $bundle_enabled = variable_get($variable_name, 'monkey'); + if ($bundle_name != FALSE) { + variable_set($variable_name, TRUE); + } + } + } + } + + drupal_set_message(t('It may be worth verifying on the Settings page which types of content on the site should allow meta tags.', array('@url' => url('admin/config/search/metatags/settings')))); } /** @@ -286,6 +459,50 @@ function metatag_uninstall() { // Optionally disable the default configurations. variable_del('metatag_load_defaults'); + + // Optionally disables the output cache. + variable_del('metatag_cache_output'); + + // Customizable pager string. + variable_del('metatag_pager_string'); + + // Optionally enable translations of final output. + variable_del('metatag_i18n_translate_output'); + + // Optionally enable the automatic watchdog logging of i18n strings. + variable_del('metatag_i18n_enable_watchdog'); + + // Optionally disable the i18n integration. + variable_del('metatag_i18n_disabled'); + + // Optionally output core's meta tags. + variable_del('metatag_leave_core_tags'); + + // Optionally enable individual permissions for each meta tag. + variable_del('metatag_extended_permissions'); + + // Optionally load meta tags on admin pages. + variable_del('metatag_load_all_pages'); + + // Sanitize token replacement output. + variable_del('metatag_token_sanitize'); + + // Remove all possible 'enable' variables. + foreach (entity_get_info() as $entity_type => $entity_info) { + variable_del('metatag_enable_' . $entity_type); + if (!empty($entity_info['bundles'])) { + foreach ($entity_info['bundles'] as $bundle_name => $bundle_info) { + variable_del('metatag_enable_' . $entity_type . '__' . $bundle_name); + } + } + } + + // Remove all of the maxlength variables. + variable_del('metatag_maxlength_title'); + variable_del('metatag_maxlength_description'); + variable_del('metatag_maxlength_abstract'); + variable_del('metatag_maxlength_keywords'); + variable_del('metatag_maxlength_news_keywords'); } /** @@ -296,13 +513,329 @@ function metatag_enable() { } /** - * Implements hook_disable(). + * Replace one meta tag's with another in the entity records. + * + * @param array $sandbox + * A Batch API sandbox, passed by reference. + * @param string $old_tag + * The meta tag that is to be replaced. + * @param string $new_tag + * The meta tag that replaces the old one. */ -// function metatag_disable() { -// } +function metatag_update_replace_entity_tag(&$sandbox, $old_tag, $new_tag) { + if (!isset($sandbox['progress'])) { + // Count of all {metatag} records that contained an entry for the old meta + // tag. + $records_count = db_select('metatag', 'm') + ->condition('m.data', '%' . db_like('"' . $old_tag . '"') . '%', 'LIKE') + ->countQuery() + ->execute() + ->fetchField(); + + if (empty($records_count)) { + return t('No Metatag entity records needed to have the "@tag" meta tag renamed.', array('@tag' => $old_tag)); + } + + $sandbox['max'] = $records_count; + $sandbox['progress'] = 0; + } + + // Count of rows that will be processed per iteration. + $limit = 100; + + // Fetches a part of records. + $records = db_select('metatag', 'm') + ->fields('m', array()) + ->condition('m.data', '%' . db_like('"' . $old_tag . '"') . '%', 'LIKE') + ->range(0, $limit) + ->execute(); + + $count = 0; + $keys = array('entity_type', 'entity_id', 'revision_id', 'language'); + + // Loop over the values and correct them. + foreach ($records as $record) { + $record->data = unserialize($record->data); + + if (isset($record->data[$old_tag])) { + $record->data[$new_tag] = $record->data[$old_tag]; + unset($record->data[$old_tag]); + drupal_write_record('metatag', $record, $keys); + + // Clear the cache for the entity this belongs to. + entity_get_controller($record->entity_type)->resetCache(array($record->entity_id)); + } + + $count++; + } + + if (!empty($count)) { + $sandbox['progress'] += $count; + // In some cases the query yields results that cannot be fixed and we would + // run into an infinite loop. Stop immediately if we processed all records. + if ($sandbox['progress'] >= $sandbox['max']) { + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max']; + } + } + else { + $sandbox['#finished'] = TRUE; + return t('Converted the "@old_tag" meta tag for @count entity records to "@new_tag" meta tag.', array('@old_tag' => $old_tag, '@new_tag' => $new_tag, '@count' => $sandbox['progress'])); + } +} /** - * Disable the deprecated metatag_ui module which has been merged into metatag. + * Replace one meta tag's value in the entity records. + * + * @param array $sandbox + * A Batch API sandbox, passed by reference. + * @param string $meta_tag + * The meta tag that needs its value replaced. + * @param string $old_value + * The meta tag value that is to be replaced. + * @param string $new_value + * The meta tag value that replaces the old one. + */ +function metatag_update_replace_entity_value(&$sandbox, $meta_tag, $old_value, $new_value) { + // The condition used for both queries. + $db_and = db_and(); + $db_and->condition('m.data', '%' . db_like('"' . $meta_tag . '"') . '%', 'LIKE'); + $db_and->condition('m.data', '%' . db_like('"' . $old_value . '"') . '%', 'LIKE'); + + if (!isset($sandbox['progress'])) { + // Count of all {metatag} records that contained an entry for the old meta + // tag value. + $records_count = db_select('metatag', 'm') + ->condition($db_and) + ->countQuery() + ->execute() + ->fetchField(); + + if (empty($records_count)) { + return t('No Metatag entity records needed to have the "@tag" meta tag "@old_value" value replaced.', array('@tag' => $meta_tag, '@old_value' => $old_value)); + } + + $sandbox['max'] = $records_count; + $sandbox['progress'] = 0; + + // Keep track of the number of replaced values separately. + $sandbox['count'] = 0; + } + + // Count of rows that will be processed per iteration. + $limit = 100; + + // Fetches a part of records. + $records = db_select('metatag', 'm') + ->fields('m', array()) + ->condition($db_and) + ->range(0, $limit) + ->execute(); + + $count = 0; + $keys = array('entity_type', 'entity_id', 'revision_id', 'language'); + + // Loop over the values and correct them. + foreach ($records as $record) { + $record->data = unserialize($record->data); + + if (isset($record->data[$meta_tag])) { + $record->data[$meta_tag]['value'] = str_replace($old_value, $new_value, $record->data[$meta_tag]['value']); + drupal_write_record('metatag', $record, $keys); + + // Clear the cache for the entity this belongs to. + entity_get_controller($record->entity_type)->resetCache(array($record->entity_id)); + + $sandbox['count']++; + } + + $sandbox['progress']++; + } + + if (!empty($count)) { + // In some cases the query yields results that cannot be fixed and we would + // run into an infinite loop. Stop immediately if we processed all records. + if ($sandbox['progress'] >= $sandbox['max']) { + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max']; + } + } + else { + $sandbox['#finished'] = TRUE; + return t('Replaced the value of @count entity records for the "@meta_tag" meta tag.', array('@meta_tag' => $meta_tag, '@count' => $sandbox['count'])); + } +} + +/** + * Replace one meta tag with another in the configs. + * + * @param string $old_tag + * The meta tag that is to be replaced. + * @param string $new_tag + * The meta tag that replaces the old one. + */ +function metatag_update_replace_config_tag($old_tag, $new_tag) { + // Find all {metatag_config} records that contained an entry for the old meta + // tag. + $records = db_select('metatag_config', 'm') + ->fields('m', array('cid', 'config')) + ->condition('m.config', '%' . db_like('"' . $old_tag . '"') . '%', 'LIKE') + ->execute(); + // This message will be returned if nothing needed to be updated. + $none_message = t('No Metatag configuration records needed to have the "@tag" meta tag fixed. That said, there may be other configurations elsewhere that do need updating.', array('@tag' => $old_tag)); + + // Loop over the values and correct them. + if ($records->rowCount() == 0) { + $message = $none_message; + } + else { + $keys = array('cid'); + + // Loop over the values and correct them. + $counter = 0; + foreach ($records as $record) { + $record->config = unserialize($record->config); + if (isset($record->config[$old_tag])) { + $record->config[$new_tag] = $record->config[$old_tag]; + unset($record->config[$old_tag]); + drupal_write_record('metatag_config', $record, $keys); + $counter++; + } + } + if ($counter == 0) { + $message = $none_message; + } + else { + $message = t('Converted the "@old_tag" meta tag for @count configurations to the new "@new_tag" meta tag.', array('@old_tag' => $old_tag, '@new_tag' => $new_tag, '@count' => $counter)); + } + } + + // Clear all Metatag caches. + cache_clear_all('*', 'cache_metatag', TRUE); + drupal_static_reset('metatag_config_load_with_defaults'); + drupal_static_reset('metatag_entity_supports_metatags'); + drupal_static_reset('metatag_config_instance_info'); + drupal_static_reset('metatag_get_info'); + ctools_include('export'); + ctools_export_load_object_reset('metatag_config'); + + return $message; +} + +/** + * Replace one meta tag with another in the configs. + * + * @param string $meta_tag + * The meta tag that needs its value replaced. + * @param string $old_value + * The meta tag value that is to be replaced. + * @param string $new_value + * The meta tag value that replaces the old one. + */ +function metatag_update_replace_config_value($meta_tag, $old_value, $new_value) { + // Find all {metatag_config} records that contained an entry for the old meta + // tag. + $db_and = db_and(); + $db_and->condition('m.config', '%' . db_like('"' . $meta_tag . '"') . '%', 'LIKE'); + $db_and->condition('m.config', '%' . db_like('"' . $old_value . '"') . '%', 'LIKE'); + $records = db_select('metatag_config', 'm') + ->fields('m', array('cid', 'config')) + ->condition($db_and) + ->execute(); + // This message will be returned if nothing needed to be updated. + $none_message = t('No Metatag configuration records needed to have the "@tag" meta tag values updated. That said, there may be other configurations elsewhere that do need updating.', array('@tag' => $meta_tag)); + + // Loop over the values and correct them. + if ($records->rowCount() == 0) { + $message = $none_message; + } + else { + $keys = array('cid'); + + // Loop over the values and correct them. + $counter = 0; + foreach ($records as $record) { + $record->config = unserialize($record->config); + if (isset($record->config[$meta_tag])) { + $record->config[$meta_tag]['value'] = str_replace($old_value, $new_value, $record->config[$meta_tag]['value']); + drupal_write_record('metatag_config', $record, $keys); + $counter++; + } + } + if ($counter == 0) { + $message = $none_message; + } + else { + $message = t('Replaced the value of @count entity records for the "@meta_tag" meta tag.', array('@meta_tag' => $meta_tag, '@count' => $counter)); + } + } + + // Clear all Metatag caches. + cache_clear_all('*', 'cache_metatag', TRUE); + drupal_static_reset('metatag_config_load_with_defaults'); + drupal_static_reset('metatag_entity_supports_metatags'); + drupal_static_reset('metatag_config_instance_info'); + drupal_static_reset('metatag_get_info'); + ctools_include('export'); + ctools_export_load_object_reset('metatag_config'); + + return $message; +} + +/** + * Remove a specific meta tag from all configs. + * + * @param string $$tag_name + * The meta tag that is to be removed. + */ +function metatag_update_delete_config($tag_name) { + // Find all {metatag_config} records that contained an entry for the meta tag. + $records = db_select('metatag_config', 'm') + ->fields('m', array('cid', 'config')) + ->condition('m.config', '%' . db_like('"' . $tag_name . '"') . '%', 'LIKE') + ->execute(); + // This message will be returned if nothing needed to be updated. + $none_message = t('No Metatag configuration records needed to have the "@tag" meta tag removed.', array('@tag' => $tag_name)); + + // Loop over the values and correct them. + if ($records->rowCount() == 0) { + drupal_set_message($none_message); + } + else { + // Loop over the values and correct them. + $counter = 0; + foreach ($records as $record) { + $record->config = unserialize($record->config); + if (isset($record->config[$tag_name])) { + unset($record->config[$tag_name]); + drupal_write_record('metatag_config', $record, array('cid')); + $counter++; + } + } + if ($counter == 0) { + drupal_set_message($none_message); + } + else { + drupal_set_message(t('Removed the "@tag" meta tag for @count configurations.', array('@tag' => $tag_name, '@count' => $counter))); + } + } + + // Clear all Metatag caches. + cache_clear_all('*', 'cache_metatag', TRUE); + drupal_static_reset('metatag_config_load_with_defaults'); + drupal_static_reset('metatag_entity_supports_metatags'); + drupal_static_reset('metatag_config_instance_info'); + drupal_static_reset('metatag_get_info'); + ctools_include('export'); + ctools_export_load_object_reset('metatag_config'); +} + +/** + * Disable the deprecated metatag_ui module, which has been merged into metatag. */ function metatag_update_7000() { if (module_exists('metatag_ui')) { @@ -650,7 +1183,12 @@ function metatag_update_7011(&$sandbox) { // Set the "finished" status, to tell batch engine whether this function // needs to run again. If you set a float, this will indicate the progress of // the batch so the progress bar will update. - $sandbox['#finished'] = ($sandbox['progress'] >= $sandbox['max']) ? TRUE : ($sandbox['progress'] / $sandbox['max']); + if ($sandbox['progress'] >= $sandbox['max']) { + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max']; + } if ($sandbox['#finished']) { // Clear all caches so the fixed data will be reloaded. @@ -808,7 +1346,12 @@ function metatag_update_7013(&$sandbox) { // Set the "finished" status, to tell batch engine whether this function // needs to run again. If you set a float, this will indicate the progress of // the batch so the progress bar will update. - $sandbox['#finished'] = ($sandbox['progress'] >= $sandbox['max']) ? TRUE : ($sandbox['progress'] / $sandbox['max']); + if ($sandbox['progress'] >= $sandbox['max']) { + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max']; + } if ($sandbox['#finished']) { // Clear all caches so the fixed data will be reloaded. @@ -1172,6 +1715,13 @@ function metatag_update_7018(&$sandbox) { } $records = entity_load($entity_type, array($entity_id), $conditions); + // Try to fallback to default language if no record was found. This may + // happen when using entity_translation as the parent entity table only + // contains one record. + if (!empty($conditions) && empty($records)) { + $records = entity_load($entity_type, array($entity_id)); + } + // Fix this record. if (!empty($records)) { $entity = reset($records); @@ -1286,7 +1836,12 @@ function metatag_update_7018(&$sandbox) { // Set the "finished" status, to tell batch engine whether this function // needs to run again. If you set a float, this will indicate the progress of // the batch so the progress bar will update. - $sandbox['#finished'] = ($sandbox['progress'] >= $sandbox['max']) ? TRUE : ($sandbox['progress'] / $sandbox['max']); + if ($sandbox['progress'] >= $sandbox['max']) { + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max']; + } if ($sandbox['#finished']) { // Clear all caches so the fixed data will be reloaded. @@ -1354,40 +1909,10 @@ function metatag_update_7023() { } /** - * Rename the 'twitter:image' meta tag to 'twitter:image:src', part 1. + * No-op update. Renaming twitter:image to twitter:image:src no longer needed. */ function metatag_update_7024() { - // Find all {metatag} records that contained an entry for the old meta tag. - $records = db_query("SELECT entity_type, entity_id, revision_id, language, data - FROM {metatag} - WHERE data LIKE '%twitter:image%'"); - // This message will be returned if nothing needed to be updated. - $none_message = t('No Metatag entity records needed to have the "twitter:image" meta tag fixed.'); - - if ($records->rowCount() == 0) { - drupal_set_message($none_message); - } - else { - $keys = array('entity_type', 'entity_id', 'revision_id', 'language'); - - // Loop over the values and correct them. - $counter = 0; - foreach ($records as $record) { - $record->data = unserialize($record->data); - if (isset($record->data['twitter:image'])) { - $record->data['twitter:image:src'] = $record->data['twitter:image']; - unset($record->data['twitter:image']); - drupal_write_record('metatag', $record, $keys); - $counter++; - } - } - if ($counter == 0) { - drupal_set_message($none_message); - } - else { - drupal_set_message(t('Converted the "twitter:image" meta tag for @count entity records to the correct "twitter:image:src" meta tag.', array('@count' => $counter))); - } - } + // Do nothing. } /** @@ -1400,38 +1925,10 @@ function metatag_update_7025() { /** * Rename the 'copyright' meta tag to 'rights', part 1. */ -function metatag_update_7026() { - // Find all {metatag} records that contained an entry for the old meta tag. - $records = db_query("SELECT entity_type, entity_id, revision_id, language, data - FROM {metatag} - WHERE data LIKE '%copyright%'"); - // This message will be returned if nothing needed to be updated. - $none_message = t('No Metatag entity records needed to have the "copyright" meta tag fixed.'); - - if ($records->rowCount() == 0) { - drupal_set_message($none_message); - } - else { - $keys = array('entity_type', 'entity_id', 'revision_id', 'language'); - - // Loop over the values and correct them. - $counter = 0; - foreach ($records as $record) { - $record->data = unserialize($record->data); - if (isset($record->data['copyright'])) { - $record->data['rights'] = $record->data['copyright']; - unset($record->data['copyright']); - drupal_write_record('metatag', $record, $keys); - $counter++; - } - } - if ($counter == 0) { - drupal_set_message($none_message); - } - else { - drupal_set_message(t('Converted the "copyright" meta tag for @count entity records to the correct "rights" meta tag.', array('@count' => $counter))); - } - } +function metatag_update_7026(&$sandbox) { + $old_tag = 'copyright'; + $new_tag = 'rights'; + return metatag_update_replace_entity_tag($sandbox, $old_tag, $new_tag); } /** @@ -1442,7 +1939,7 @@ function metatag_update_7027() { } /** - * Clear the menu cache so the new Advanced Settings page will be picked up. + * Clear the menu cache so the new Settings page will be picked up. */ function metatag_update_7028() { variable_set('menu_rebuild_needed', TRUE); @@ -1452,86 +1949,29 @@ function metatag_update_7028() { * Add an index to the {metatag} table to speed up some queries. */ function metatag_update_7029() { - db_add_index('metatag', 'type_revision', array('entity_type', 'revision_id')); - drupal_set_message(t('Added an index to the main Metatag table that will hopefully improve performance a little.')); + if (!db_index_exists('metatag', 'type_revision')) { + db_add_index('metatag', 'type_revision', array('entity_type', 'revision_id')); + return t('Added an index to the main Metatag table that will hopefully improve performance a little.'); + } + else { + return t('Did not add the index, it already existed.'); + } } /** - * Rename the 'twitter:image' meta tag to 'twitter:image:src', part 2. + * No-op update. Renaming twitter:image to twitter:image:src no longer needed. */ function metatag_update_7030() { - // Find all {metatag_config} records that contained an entry for the old meta - // tag. - $records = db_query("SELECT cid, config - FROM {metatag_config} - WHERE config LIKE '%twitter:image%'"); - // This message will be returned if nothing needed to be updated. - $none_message = t('No Metatag configuration records needed to have the "twitter:image" meta tag fixed. That said, there may be other configurations elsewhere that do need updating.'); - - // Loop over the values and correct them. - if ($records->rowCount() == 0) { - drupal_set_message($none_message); - } - else { - $keys = array('cid'); - - // Loop over the values and correct them. - $counter = 0; - foreach ($records as $record) { - $record->config = unserialize($record->config); - if (isset($record->config['twitter:image'])) { - $record->config['twitter:image:src'] = $record->config['twitter:image']; - unset($record->config['twitter:image']); - drupal_write_record('metatag_config', $record, $keys); - $counter++; - } - } - if ($counter == 0) { - drupal_set_message($none_message); - } - else { - drupal_set_message(t('Converted the "twitter:image" meta tag for @count configurations to the correct "twitter:image:src" meta tag.', array('@count' => $counter))); - } - } + // Do nothing. } /** * Rename the 'copyright' meta tag to 'rights', part 2. */ function metatag_update_7031() { - // Find all {metatag_config} records that contained an entry for the old meta - // tag. - $records = db_query("SELECT cid, config - FROM {metatag_config} - WHERE config LIKE '%copyright%'"); - // This message will be returned if nothing needed to be updated. - $none_message = t('No Metatag configuration records needed to have the "copyright" meta tag fixed. That said, there may be other configurations elsewhere that do need updating.'); - - // Loop over the values and correct them. - if ($records->rowCount() == 0) { - drupal_set_message($none_message); - } - else { - $keys = array('cid'); - - // Loop over the values and correct them. - $counter = 0; - foreach ($records as $record) { - $record->config = unserialize($record->config); - if (isset($record->config['copyright'])) { - $record->config['rights'] = $record->config['copyright']; - unset($record->config['copyright']); - drupal_write_record('metatag_config', $record, $keys); - $counter++; - } - } - if ($counter == 0) { - drupal_set_message($none_message); - } - else { - drupal_set_message(t('Converted the "copyright" meta tag for @count configurations to the correct "rights" meta tag.', array('@count' => $counter))); - } - } + $old_tag = 'copyright'; + $new_tag = 'rights'; + return metatag_update_replace_config_tag($old_tag, $new_tag); } /** @@ -1555,3 +1995,620 @@ function metatag_update_7034() { } function metatag_update_7035() { } + +/** + * Update variables to indicate which entities should be supported. + */ +function metatag_update_7036() { + foreach (entity_get_info() as $entity_type => $entity_info) { + $variable_name = 'metatag_enable_' . $entity_type; + + // Configuration entities are skipped. + if (isset($entity_info['configuration']) && $entity_info['configuration'] == TRUE) { + continue; + } + + // Entities without view modes are skipped. + elseif (empty($entity_info['view modes'])) { + continue; + } + + // Basic core entities or "normal" entities that have been enabled via the + // API. + elseif (in_array($entity_type, array('node', 'taxonomy_term', 'user')) || + !empty($entity_info['metatag']) || !empty($entity_info['metatags'])) { + // Check if the entity type has been enabled or disabled previously; if + // the variable equals a junk value then it was not previously set, + // therefore we'll set a default. + if (variable_get($variable_name, 'monkey') == 'monkey') { + // By default these entity types are enabled. + variable_set($variable_name, TRUE); + // Check each entity bundle. + if (!empty($entity_info['bundles'])) { + foreach ($entity_info['bundles'] as $bundle_name => $bundle_info) { + $variable_name = 'metatag_enable_' . $entity_type . '__' . $bundle_name; + // Check if the bundle has been enabled or disabled previously; if + // the variable equals a junk value then it was not previously set, + // therefore we'll set a default. + if (variable_get($variable_name, 'monkey') == 'monkey') { + if (!empty($bundle_info['metatag']) || !empty($bundle_info['metatags'])) { + variable_set($variable_name, TRUE); + } + else { + variable_set($variable_name, FALSE); + } + } + // This variable was set before. + else { + // Do nothing. + } + } + } + } + // This variable was set before. + else { + // Do nothing. + } + } + + // Disable this entity type. + else { + variable_set($variable_name, FALSE); + } + } + + // Clear the caches. + cache_clear_all('*', 'cache_metatag', TRUE); + drupal_static_reset('metatag_config_load_with_defaults'); + drupal_static_reset('metatag_entity_supports_metatags'); + ctools_include('export'); + ctools_export_load_object_reset('metatag_config'); + + drupal_set_message(t('The way that Metatag tracks which entity types are compatible has changed. Please review the Settings page to ensure that all of the entity types are enabled correctly.', array('@url' => 'admin/config/search/metatags/settings'))); +} + +/** + * Clear the menu cache so the renamed Settings page will be picked up. + */ +function metatag_update_7037() { + variable_set('menu_rebuild_needed', TRUE); +} + +/** + * Manually enable all content types, vocabularies and the user entity to help + * resolve issues from 1.5's architecture change. + */ +function metatag_update_7038() { + foreach (array('node', 'taxonomy_term', 'user') as $entity_type) { + // Enable the main entity type. + $variable_name = 'metatag_enable_' . $entity_type; + variable_set($variable_name, TRUE); + + // Update each entity bundle too. + $entity_info = entity_get_info($entity_type); + if (!empty($entity_info['bundles'])) { + foreach ($entity_info['bundles'] as $bundle_name => $bundle_info) { + $variable_name = 'metatag_enable_' . $entity_type . '__' . $bundle_name; + variable_set($variable_name, TRUE); + } + } + } +} + +/** + * Reload some meta tag caches. + */ +function metatag_update_7039() { + foreach (language_list() as $langcode => $language) { + cache_clear_all('info:' . $langcode, 'cache_metatag'); + } +} + +/** + * Fix robots meta tags that might have been broken when they were imported + * from Nodewords. + */ +function metatag_update_7040(&$sandbox) { + // Process records by groups of 10 (arbitrary value). + // When a group is processed, the batch update engine determines whether it + // should continue processing in the same request or provide progress + // feedback to the user and wait for the next request. + $limit = 10; + // When ran through Drush it's Ok to process a larger number of objects at a + // time. + if (drupal_is_cli()) { + $limit = 100; + } + + // Use the sandbox at your convenience to store the information needed + // to track progression between successive calls to the function. + if (!isset($sandbox['progress'])) { + // The count of records visited so far. + $sandbox['progress'] = 0; + + // Get a count of {metatag} records that have a robots meta tag definition + // that is not in the correct format. + $records = db_select('metatag', 'm') + ->fields('m') + ->condition('m.data', '%:6:"robots";%', 'LIKE') + ->condition('m.data', '%:6:"robots";a:1:{s:5:"value";%', 'NOT LIKE') + ->countQuery() + ->execute() + ->fetchField(); + + // If there's no data, don't bother with the extra work. + if (empty($records)) { + watchdog('metatag', 'Update 7040: No robots meta tags need to be fixed.', array(), WATCHDOG_INFO); + if (drupal_is_cli()) { + drupal_set_message(t('Update 7040: No robots meta tags need to be fixed.')); + } + return t('No robots meta tags need to be fixed.'); + } + + // Total records that must be visited. + $sandbox['max'] = $records; + + // A place to store messages during the run. + $sandbox['messages'] = array(); + + // An initial record of the number of records to be updated. + watchdog('metatag', 'Update 7040: !count records to examine.', array('!count' => $sandbox['max']), WATCHDOG_INFO); + if (drupal_is_cli()) { + drupal_set_message(t('Update 7040: !count records to examine.', array('!count' => $sandbox['max']))); + } + + // Log how many records are fixed. + $sandbox['fixed'] = 0; + + // Because a lot of other processing happens on the first iteration, just do + // ten. + $limit = 10; + } + + // Get a list of records that need to be fixed. + $records = db_select('metatag', 'm') + ->fields('m') + ->condition('m.data', '%:6:"robots";%', 'LIKE') + ->condition('m.data', '%:6:"robots";a:1:{s:5:"value";%', 'NOT LIKE') + ->range(0, $limit) + ->execute(); + + // Set default values. + foreach ($records as $record) { + // Extract the record. + $record->data = unserialize($record->data); + + // See if the record needs to be fixed. + if (!empty($record->data['robots']) && empty($record->data['robots']['value'])) { + // Fix the record. + $robots = $record->data['robots']; + $record->data['robots'] = array( + 'value' => $robots, + ); + + // Update the database. + db_update('metatag') + ->fields(array('data' => serialize($record->data))) + ->condition('entity_type', $record->entity_type) + ->condition('entity_id', $record->entity_id) + ->condition('revision_id', $record->revision_id) + ->condition('language', $record->language) + ->execute(); + + // Clear the cache for this entity. + entity_get_controller($record->entity_type)->resetCache(array($record->entity_id)); + + // Update our progress information. + $sandbox['fixed']++; + } + + // Update our progress information. + $sandbox['progress']++; + } + + // Set the "finished" status, to tell batch engine whether this function + // needs to run again. If you set a float, this will indicate the progress of + // the batch so the progress bar will update. + if ($sandbox['progress'] >= $sandbox['max']) { + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max']; + } + + // Only display a status message if process finished. + if ($sandbox['#finished'] === TRUE) { + // Clear all caches so the fixed data will be reloaded. + cache_clear_all('*', 'cache_metatag', TRUE); + + // A final log of the number of records that were converted. + watchdog('metatag', 'Update 7040: !count records were fixed.', array('!count' => $sandbox['fixed']), WATCHDOG_INFO); + if (drupal_is_cli()) { + drupal_set_message(t('Update 7040: !count records were fixed.', array('!count' => $sandbox['fixed']))); + } + + // hook_update_N() may optionally return a string which will be displayed + // to the user. + return t('Fixed the Metatag robots values for @count nodes.', array('@count' => $sandbox['fixed'])); + } +} + +/** + * Rerun update 7018 that was fixed to run correctly when using Entity + * Translation. This may take some time. + */ +function metatag_update_7041(&$sandbox) { + metatag_update_7018($sandbox); +} + +/** + * Delete a deprecated variable and clear all Metatag caches. + */ +function metatag_update_7100() { + variable_del('metatag_translate_final_values'); + + // Clear all caches so that i18n support can be activated, if necessary. + cache_clear_all('*', 'cache_metatag', TRUE); +} + +/** + * Update i18n strings for all meta tags to use the new format. + */ +function metatag_update_7101() { + if (!module_exists('locale') || !db_table_exists('locales_source')) { + return t('No translations to fix as the locale system is not enabled.'); + } + + // Loop through each entity type. Not going to bother filtering this list, + // it'll only be a difference of a few entities anyway and the queries + // should be fairly quick. + foreach (entity_get_info() as $entity_type => $entity_info) { + // Entities must have bundles. + if (empty($entity_info['bundles'])) { + $entity_info['bundles'] = array( + $entity_type => $entity_type, + ); + } + foreach ($entity_info['bundles'] as $bundle_type => $bundle_info) { + // Update {locales_source}, replace 'metatag:ENTITYTYPE:BUNDLE:tag' with + // 'metatag:metatag_config:ENTITYTYPE:BUNDLE:tag'. + db_query("UPDATE {locales_source} + SET location = REPLACE(location, 'metatag:{$entity_type}:{$bundle_type}:', 'metatag:metatag_config:{$entity_type}:{$bundle_type}:'), + context = REPLACE(context, '{$entity_type}:{$bundle_type}:', 'metatag_config:{$entity_type}:{$bundle_type}:') + WHERE textgroup = 'metatag' + AND location LIKE 'metatag:{$entity_type}:{$bundle_type}:%'"); + + // Update {locales_source}, replace 'metatag:ENTITYTYPE:tag' with + // 'metatag:metatag_config:ENTITYTYPE:tag'. + db_query("UPDATE {locales_source} + SET location = REPLACE(location, 'metatag:{$entity_type}:', 'metatag:metatag_config:{$entity_type}:'), + context = REPLACE(context, '{$entity_type}:', 'metatag_config:{$entity_type}:') + WHERE textgroup = 'metatag' + AND location LIKE 'metatag:{$entity_type}:%'"); + } + } + // Update {locales_source}, replace 'metatag:metatag:' with + // 'metatag:output:'. + db_query("UPDATE {locales_source} + SET location = REPLACE(location, 'metatag:metatag:', 'metatag:output:'), + context = REPLACE(context, 'metatag:', 'output:') + WHERE textgroup = 'metatag' + AND location LIKE 'metatag:metatag:%'"); +} + +/** + * Re-run update 7101. + */ +function metatag_update_7102() { + metatag_update_7101(); +} + +/** + * Clear all metatag caches so the new entity caching structure takes over. + */ +function metatag_update_7103() { + cache_clear_all('*', 'cache_metatag', TRUE); +} + +/** + * Remove the entity revision ID from the translation strings. + */ +function metatag_update_7104(&$sandbox) { + // Verify that locales are being used in the first place. + if (!module_exists('locale') || !db_table_exists('locales_source')) { + return t('Metatag: No translations to fix as the locale system is not enabled.'); + } + + // No need to do anything if output translation is disabled. + if (!variable_get('metatag_i18n_translate_output', FALSE)) { + return t('Metatag: Output translation is disabled, so no need to update anything.'); + } + + // Process records by groups of 10 (arbitrary value). + // When a group is processed, the batch update engine determines whether it + // should continue processing in the same request or provide progress + // feedback to the user and wait for the next request. + $limit = 10; + // When ran through Drush it's Ok to process a larger number of objects at a + // time. + if (drupal_is_cli()) { + $limit = 100; + } + + // Use the sandbox at your convenience to store the information needed + // to track progression between successive calls to the function. + if (!isset($sandbox['progress'])) { + // The count of records visited so far. + $sandbox['progress'] = 0; + + // Total records that must be visited. + $sandbox['max'] = db_query("SELECT COUNT(lid) + FROM {locales_source} + WHERE textgroup = 'metatag' + AND context LIKE 'output:%:%:%:%'")->fetchField(); + + // If there's no data, don't bother with the extra work. + if (empty($sandbox['max'])) { + watchdog('metatag', 'Update 7104: No nodes need the translation entity string fixed.', array(), WATCHDOG_INFO); + if (drupal_is_cli()) { + drupal_set_message(t('Update 7104: No nodes need the translation entity string fixed.')); + } + return t('No nodes need the Metatag language values fixed.'); + } + + // A place to store messages during the run. + $sandbox['messages'] = array(); + + // An initial record of the number of records to be updated. + watchdog('metatag', 'Update 7104: !count records to update.', array('!count' => $sandbox['max']), WATCHDOG_INFO); + if (drupal_is_cli()) { + drupal_set_message(t('Update 7104: !count records to update.', array('!count' => $sandbox['max']))); + } + } + + // Get a batch of records that need to be fixed. + $records = db_query_range("SELECT lid, location, context + FROM {locales_source} + WHERE textgroup = 'metatag' + AND context LIKE 'output:%:%:%:%'", 0, $limit); + + // Update each of the records. + foreach ($records as $record) { + $old_location = '/metatag:output:([^:]*):([^:]*):([^:]*):([^:]*)/'; + $new_location = 'metatag:output:$1:$2:$4'; + $location = preg_replace($old_location, $new_location, $record->location); + $old_context = '/output:([^:]*):([^:]*):([^:]*):([^:]*)/'; + $new_context = 'output:$1:$2:$4'; + $context = preg_replace($old_context, $new_context, $record->context); + drupal_set_message($location); + drupal_set_message($context); + db_update('locales_source') + ->fields(array( + 'location' => $location, + 'context' => $context, + )) + ->condition('lid', $record->lid) + ->execute(); + + // Update our progress information. + $sandbox['progress']++; + } + + // Set the "finished" status, to tell batch engine whether this function + // needs to run again. If you set a float, this will indicate the progress of + // the batch so the progress bar will update. + if ($sandbox['progress'] >= $sandbox['max']) { + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max']; + } + + if ($sandbox['#finished']) { + // Clear all caches so the fixed data will be reloaded. + cache_clear_all('*', 'cache_metatag', TRUE); + + // hook_update_N() may optionally return a string which will be displayed + // to the user. + return t('Fixed the Metatag language values for @count nodes.', array('@count' => $sandbox['progress'])); + } +} + +/** + * Fix the output translation strings. + */ +function metatag_update_7105() { + if (!module_exists('locale') || !db_table_exists('locales_source')) { + return t('No translations to fix as the locale system is not enabled.'); + } + + db_query("UPDATE {locales_source} + SET location = REPLACE(location, 'metatag:metatag:', 'metatag:output:'), + context = REPLACE(context, 'metatag:', 'output:') + WHERE textgroup = 'metatag' + AND location LIKE 'metatag:metatag:%'"); + + return t('Fixed the Metatag output strings.'); +} + + +/** + * The output translation strings were renamed to something shorter, so rerun + * update 7105. + */ +function metatag_update_7106() { + return metatag_update_7105(); +} + +/** + * Fix the global config translation strings. + */ +function metatag_update_7107() { + if (!module_exists('locale') || !db_table_exists('locales_source')) { + return t('No translations to fix as the locale system is not enabled.'); + } + + db_query("UPDATE {locales_source} + SET location = REPLACE(location, 'metatag:global:', 'metatag:metatag_config:global:'), + context = REPLACE(context, 'global:', 'metatag_config:global:') + WHERE textgroup = 'metatag' + AND location LIKE 'metatag:global:%'"); + + return t('Fixed the Metatag global config string translations.'); +} + +/** + * Delete output translations if it's disabled. + */ +function metatag_update_7108(&$sandbox) { + if (!module_exists('locale') || !db_table_exists('locales_source')) { + return t('No translations to fix as the locale system is not enabled.'); + } + + // If the output-translation option is enabled then don't delete anything. + if (variable_get('metatag_i18n_translate_output', FALSE)) { + return t("Metatag: Not deleting output translations because that option is enabled."); + } + + $limit = 100; + + // When ran through Drush it's Ok to process a larger number of objects at a + // time. + if (drupal_is_cli()) { + $limit = 500; + } + + // Use the sandbox at your convenience to store the information needed to + // track progression between successive calls to the function. + if (!isset($sandbox['progress'])) { + // The count of records visited so far. + $sandbox['progress'] = 0; + + $sandbox['max'] = db_query("SELECT COUNT(lid) + FROM {locales_source} + WHERE textgroup = 'metatag' + AND context LIKE 'output:%'")->fetchField(); + + // If there's no data, don't bother with the extra work. + if (empty($sandbox['max'])) { + watchdog('metatag', 'Update 7108: No nodes need the translation entity string fixed.', array(), WATCHDOG_INFO); + if (drupal_is_cli()) { + drupal_set_message(t('Update 7108: No nodes need the translation entity string fixed.')); + } + return t('No nodes need the Metatag language values fixed.'); + } + + // A place to store messages during the run. + $sandbox['messages'] = array(); + + // An initial record of the number of records to be updated. + watchdog('metatag', 'Update 7108: !count records to update.', array('!count' => $sandbox['max']), WATCHDOG_INFO); + if (drupal_is_cli()) { + drupal_set_message(t('Update 7108: !count records to update.', array('!count' => $sandbox['max']))); + } + } + + // Get a batch of records that need to be fixed. + $records = db_query_range("SELECT lid + FROM {locales_source} + WHERE textgroup = 'metatag' + AND context LIKE 'output:%'", 0, $limit); + + $lids = $records->fetchCol(); + $count = count($lids); + // Delete records in the tables in reverse order, so that if the query fails + // and has to be reran it'll still find records. But it should be ok. + if (db_table_exists('i18n_string')) { + db_delete('i18n_string') + ->condition('lid', $lids, 'IN') + ->execute(); + } + db_delete('locales_target') + ->condition('lid', $lids, 'IN') + ->execute(); + db_delete('locales_source') + ->condition('lid', $lids, 'IN') + ->execute(); + + $sandbox['progress'] = $sandbox['progress'] + $count; + + // Set the "finished" status, to tell batch engine whether this function + // needs to run again. If you set a float, this will indicate the progress of + // the batch so the progress bar will update. + if ($sandbox['progress'] >= $sandbox['max']) { + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max']; + } + + if ($sandbox['#finished']) { + // Clear all caches so the fixed data will be reloaded. + cache_clear_all('*', 'cache_metatag', TRUE); + + // hook_update_N() may optionally return a string which will be displayed + // to the user. + return t('Deleted output translation if disabled for @count items.', array('@count' => $sandbox['progress'])); + } +} + +/** + * Rename the 'icon_any' meta tag to 'mask-icon' in the entity records. + */ +function metatag_update_7109(&$sandbox) { + module_load_include('install', 'metatag'); + $old_tag = 'icon_any'; + $new_tag = 'mask-icon'; + return metatag_update_replace_entity_tag($sandbox, $old_tag, $new_tag); +} + +/** + * Rename the 'icon_any' meta tag to 'mask-icon' in the configs. + */ +function metatag_update_7110() { + module_load_include('install', 'metatag'); + $old_tag = 'icon_any'; + $new_tag = 'mask-icon'; + return metatag_update_replace_config_tag($old_tag, $new_tag); +} + +/** + * Remove the "metatag_ui" record from the {system} table. + */ +function metatag_update_7111() { + db_delete('system') + ->condition('name', 'metatag_ui') + ->execute(); +} + +/** + * The Publisher meta tag is now part of the Google Plus submodule. + */ +function metatag_update_7112() { + cache_clear_all('*', 'cache_metatag', TRUE); + drupal_set_message(t('The Publisher meta tag is now part of the Google Plus submodule.')); +} + +/** + * Clear all metatag output caches if output caching is disabled. + */ +function metatag_update_7113() { + if (variable_get('metatag_cache_output', TRUE) == FALSE) { + cache_clear_all('output:', 'cache_metatag', TRUE); + } +} + +/** + * Disable output caching. + */ +function metatag_update_7114() { + variable_del('metatag_cache_output'); + drupal_set_message(t('Note: Output caching of meta tags has been disabled, it may be reenabled from the Metatag settings page if needed.')); +} + +/** + * Clear all metatag output caches, it will be rebuild if needed. + */ +function metatag_update_7115() { + cache_clear_all('output:', 'cache_metatag', TRUE); +} diff --git a/sites/all/modules/contrib/seo/metatag/metatag.metatag.inc b/sites/all/modules/contrib/seo/metatag/metatag.metatag.inc index fde4366..5b67115 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.metatag.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag.metatag.inc @@ -1,5 +1,10 @@ api_version = 1; $config->disabled = FALSE; $config->config = array( - 'title' => array('value' => '[current-page:title] | [site:name]'), - 'generator' => array('value' => 'Drupal 7 (http://drupal.org)'), + 'title' => array('value' => '[current-page:title] | [current-page:pager][site:name]'), + 'generator' => array('value' => 'Drupal 7 (https://www.drupal.org)'), 'canonical' => array('value' => '[current-page:url:absolute]'), 'shortlink' => array('value' => '[current-page:url:unaliased]'), ); @@ -28,7 +33,7 @@ function metatag_metatag_config_default() { $config->api_version = 1; $config->disabled = FALSE; $config->config = array( - 'title' => array('value' => variable_get('site_slogan') ? '[site:name] | [site:slogan]' : '[site:name]'), + 'title' => array('value' => variable_get('site_slogan') ? '[site:name] | [current-page:pager][site:slogan]' : '[site:name] | [current-page:pager]'), 'canonical' => array('value' => '[site:url]'), 'shortlink' => array('value' => '[site:url]'), ); @@ -59,7 +64,7 @@ function metatag_metatag_config_default() { $config->api_version = 1; $config->disabled = FALSE; $config->config = array( - 'title' => array('value' => '[node:title] | [site:name]'), + 'title' => array('value' => '[node:title] | [current-page:pager][site:name]'), 'description' => array('value' => '[node:summary]'), ); $configs[$config->instance] = $config; @@ -70,7 +75,7 @@ function metatag_metatag_config_default() { $config->api_version = 1; $config->disabled = FALSE; $config->config = array( - 'title' => array('value' => '[term:name] | [site:name]'), + 'title' => array('value' => '[term:name] | [current-page:pager][site:name]'), 'description' => array('value' => '[term:description]'), ); $configs[$config->instance] = $config; @@ -84,7 +89,7 @@ function metatag_metatag_config_default() { 'title' => array('value' => '[user:name] | [site:name]'), ); if (variable_get('user_pictures')) { - $config->config['image'] = array('value' => '[user:picture:url]'); + $config->config['image_src'] = array('value' => '[user:picture:url]'); } $configs[$config->instance] = $config; @@ -112,7 +117,7 @@ function metatag_metatag_config_instance_info() { if (metatag_entity_supports_metatags($entity_type)) { $info[$entity_type] = array('label' => $entity_info['label']); foreach ($entity_info['bundles'] as $bundle => $bundle_info) { - if (count($entity_info['bundles'] == 1) && $bundle == $entity_type) { + if (count($entity_info['bundles']) == 1 && $bundle == $entity_type) { // Skip default bundles (entities that do not really have bundles). continue; } @@ -130,10 +135,17 @@ function metatag_metatag_config_instance_info() { * Implements hook_metatag_info(). */ function metatag_metatag_info() { - $info['groups']['advanced'] = array( - 'label' => t('Advanced'), + $info['groups']['basic'] = array( + 'label' => t('Basic tags'), 'form' => array( - '#weight' => 100, + '#weight' => 1, + '#collapsed' => FALSE, + ), + ); + $info['groups']['advanced'] = array( + 'label' => t('Advanced tags'), + 'form' => array( + '#weight' => 2, ), ); @@ -143,14 +155,18 @@ function metatag_metatag_info() { $info['tags']['title'] = array( 'label' => t('Page title'), 'description' => t("The text to display in the title bar of a visitor's web browser when they view this page. This meta tag may also be used as the title of the page when a visitor bookmarks or favorites this page."), + 'maxlength' => 0, 'class' => 'DrupalTitleMetaTag', + 'group' => 'basic', 'weight' => ++$weight, ); $info['tags']['description'] = array( 'label' => t('Description'), - 'description' => t("A brief and concise summary of the page's content, preferably 150 characters or less. The description meta tag may be used by search engines to display a snippet about the page in search results."), + 'description' => t("A brief and concise summary of the page's content, preferably 320 characters or less. The description meta tag may be used by search engines to display a snippet about the page in search results."), + 'maxlength' => 380, 'class' => 'DrupalTextMetaTag', + 'group' => 'basic', 'weight' => ++$weight, 'form' => array( '#type' => 'textarea', @@ -161,8 +177,10 @@ function metatag_metatag_info() { $info['tags']['abstract'] = array( 'label' => t('Abstract'), - 'description' => t("A brief and concise summary of the page's content, preferably 150 characters or less. The abstract meta tag may be used by search engines for archiving purposes."), + 'description' => t("A brief and concise summary of the page's content, preferably 150 characters or less. Where as the description meta tag may be used by search engines to display a snippet about the page in search results, the abstract tag may be used to archive a summary about the page. This meta tag is no longer supported by major search engines."), + 'maxlength' => 0, 'class' => 'DrupalTextMetaTag', + 'group' => 'basic', 'weight' => ++$weight, 'form' => array( '#type' => 'textarea', @@ -174,7 +192,9 @@ function metatag_metatag_info() { $info['tags']['keywords'] = array( 'label' => t('Keywords'), 'description' => t("A comma-separated list of keywords about the page. This meta tag is not supported by most search engines anymore."), + 'maxlength' => 0, 'class' => 'DrupalTextMetaTag', + 'group' => 'basic', 'weight' => ++$weight, ); @@ -204,6 +224,7 @@ function metatag_metatag_info() { $info['tags']['news_keywords'] = array( 'label' => t('Google News Keywords'), 'description' => t('A comma-separated list of keywords about the page. This meta tag is used as an indicator in Google News.', array('@google_news' => 'http://support.google.com/news/publisher/bin/answer.py?hl=en&answer=68297')), + 'maxlength' => 0, 'class' => 'DrupalTextMetaTag', 'group' => 'advanced', 'weight' => ++$weight, @@ -217,6 +238,46 @@ function metatag_metatag_info() { 'weight' => ++$weight, ); + $info['tags']['rating'] = array( + 'label' => t('Content rating'), + 'description' => t('Used to indicate the intended audience for the content.'), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'select_or_other' => TRUE, + 'form' => array( + '#type' => 'select', + '#options' => array( + 'general' => t('General'), + 'mature' => t("Mature"), + 'restricted' => t("Restricted"), + '14 years' => t("14 years or Older"), + 'safe for kids' => t("Safe for kids"), + ), + '#empty_option' => t('- None -'), + ), + 'weight' => ++$weight, + ); + + $info['tags']['referrer'] = array( + 'label' => t('Referrer policy'), + 'description' => t('Indicate to search engines and other page scrapers whether or not links should be followed. See the W3C specifications for further details.'), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'select_or_other' => TRUE, + 'form' => array( + '#type' => 'select', + '#options' => array( + 'no-referrer' => t('No Referrer'), + 'origin' => t('Origin'), + 'no-referrer-when-downgrade' => t('No Referrer When Downgrade'), + 'origin-when-cross-origin' => t('Origin When Cross-Origin'), + 'unsafe-url' => t('Unsafe URL'), + ), + '#empty_option' => t('- None -'), + ), + 'weight' => ++$weight, + ); + $info['tags']['generator'] = array( 'label' => t('Generator'), 'description' => t("Describes the name and version number of the software or publishing tool used to create the page."), @@ -244,6 +305,7 @@ function metatag_metatag_info() { 'class' => 'DrupalLinkMetaTag', 'group' => 'advanced', 'weight' => ++$weight, + 'image' => TRUE, 'devel_generate' => array( 'type' => 'image', ), @@ -260,39 +322,32 @@ function metatag_metatag_info() { ), ); + $info['tags']['set_cookie'] = array( + 'label' => t('Set cookie'), + 'description' => t('Sets a cookie on the visitor\'s browser. Can be in either NAME=VALUE format, or a more verbose format including the path and expiration date; see the link for full details on the syntax.'), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'weight' => ++$weight, + 'is_language' => TRUE, + 'element' => array( + '#theme' => 'metatag_http_equiv', + ), + ); + $info['tags']['shortlink'] = array( 'label' => t('Shortlink URL'), 'description' => t('A brief URL, often created by a URL shortening service.'), 'class' => 'DrupalLinkMetaTag', 'group' => 'advanced', 'weight' => ++$weight, + 'replaces' => array( + 'shorturl', + ), 'devel_generate' => array( 'type' => 'shortlink', ), ); - $info['tags']['publisher'] = array( - 'label' => t('Publisher URL'), - 'description' => '', - 'class' => 'DrupalLinkMetaTag', - 'group' => 'advanced', - 'weight' => ++$weight, - 'devel_generate' => array( - 'type' => 'url', - ), - ); - - $info['tags']['author'] = array( - 'label' => t('Author URL'), - 'description' => t("Used by some search engines to confirm authorship of the content on a page. Should be either the full URL for the author's Google+ profile page or a local page with information about the author."), - 'class' => 'DrupalLinkMetaTag', - 'group' => 'advanced', - 'weight' => ++$weight, - 'devel_generate' => array( - 'type' => 'url', - ), - ); - $info['tags']['original-source'] = array( 'label' => t('Original Source'), 'description' => '', @@ -327,6 +382,61 @@ function metatag_metatag_info() { ), ); + $info['tags']['content-language'] = array( + 'label' => t('Content language'), + 'description' => t("Used to define this page's language code. May be the two letter language code, e.g. \"de\" for German, or the two letter code with a dash and the two letter ISO country code, e.g. \"de-AT\" for German in Austria. Still used by Bing."), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'weight' => ++$weight, + 'is_language' => TRUE, + 'element' => array( + '#theme' => 'metatag_http_equiv', + ), + ); + + $info['tags']['geo.position'] = array( + 'label' => t('Geo position'), + 'description' => t('Geo-spatial information in "latitude;longitude" format, e.g. "50.167958;-97.133185"; see Wikipedia for details.'), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'weight' => ++$weight, + ); + + $info['tags']['geo.placename'] = array( + 'label' => t('Geo place name'), + 'description' => t("A location's formal name."), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'weight' => ++$weight, + ); + + $info['tags']['geo.region'] = array( + 'label' => t('Geo region'), + 'description' => t("A location's two-letter international country code, with an optional two-letter region, e.g. \"US-NH\" for New Hampshire in the USA."), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'weight' => ++$weight, + ); + + $info['tags']['icbm'] = array( + 'label' => t('ICBM'), + 'description' => t('Geo-spatial information in "latitude, longitude" format, e.g. "50.167958, -97.133185"; see Wikipedia for details.'), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'weight' => ++$weight, + ); + + $info['tags']['refresh'] = array( + 'label' => t('Refresh'), + 'description' => t('The number of seconds to wait before refreshing the page. May also force redirect to another page using the format "5; url=http://example.com/", which would be triggered after five seconds.'), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'weight' => ++$weight, + 'element' => array( + '#theme' => 'metatag_http_equiv', + ), + ); + $info['tags']['revisit-after'] = array( 'label' => t('Revisit After'), 'description' => t('Tell search engines when to index the page again. Very few search engines support this tag, it is more useful to use an XML Sitemap file.', array('@xmlsitemap' => 'https://www.drupal.org/project/xmlsitemap')), @@ -338,9 +448,9 @@ function metatag_metatag_info() { ), ); - $info['tags']['content-language'] = array( - 'label' => t('Content language'), - 'description' => t("A deprecated meta tag for defining this page's two-letter language code(s)."), + $info['tags']['pragma'] = array( + 'label' => t('Pragma'), + 'description' => t('Used to control whether a browser caches a specific page locally. Little used today. Should be used in conjunction with the Cache-Control meta tag.'), 'class' => 'DrupalTextMetaTag', 'group' => 'advanced', 'weight' => ++$weight, @@ -349,5 +459,27 @@ function metatag_metatag_info() { ), ); + $info['tags']['cache-control'] = array( + 'label' => t('Cache-Control'), + 'description' => t('Used to control whether a browser caches a specific page locally. Little used today. Should be used in conjunction with the Pragma meta tag.'), + 'class' => 'DrupalTextMetaTag', + 'group' => 'advanced', + 'weight' => ++$weight, + 'element' => array( + '#theme' => 'metatag_http_equiv', + ), + ); + + $info['tags']['expires'] = array( + 'label' => t('Expires'), + 'description' => t("Control when the browser's internal cache of the current page should expire. The date must to be an RFC-1123-compliant date string that is represented in Greenwich Mean Time (GMT), e.g. 'Thu, 01 Sep 2016 00:12:56 GMT'. Set to '0' to stop the page being cached entirely.", array('@rfc' => 'http://www.csgnetwork.com/timerfc1123calc.html')), + 'class' => 'DrupalTextMetaTag', + 'weight' => ++$weight, + 'group' => 'advanced', + 'devel_generate' => array( + 'type' => 'date', + ), + ); + return $info; } diff --git a/sites/all/modules/contrib/seo/metatag/metatag.migrate.inc b/sites/all/modules/contrib/seo/metatag/metatag.migrate.inc index 1592038..f2c6c38 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.migrate.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag.migrate.inc @@ -5,20 +5,24 @@ * Metatag support for Migrate. */ +if (!class_exists('MigrateDestinationHandler')) { + return; +} + /** * Basic usage of the Migrate integration. * * This example assumes the custom module's name is "example_migrate". - * + * * example_migrate.inc: - * + * * class MetatagTestMigration extends DynamicMigration { - * + * * public function __construct() { * parent::__construct(); - * + * * $this->description = t('Migrate test.'); - * + * * $this->map = new MigrateSQLMap( * $this->machineName, * array( @@ -31,22 +35,22 @@ * ), * MigrateDestinationNode::getKeySchema() * ); - * + * * $this->source = new MigrateSourceCSV( * drupal_get_path('module', 'example_migrate') . '/sample.csv', * array(), * array('header_rows' => TRUE) * ); - * + * * $this->destination = new MigrateDestinationNode('article'); - * + * * $this->addFieldMapping('metatag_description', 'description'); * $this->addFieldMapping('metatag_keywords', 'keywords'); * } * } - * + * * example_migrate.migrate.inc: - * + * * /** * * Implements hook_migrate_api(). * * / @@ -57,7 +61,7 @@ * 'MetatagTest' => array('class_name' => 'MetatagTestMigration'), * ), * ); - * + * * return $api; * } */ @@ -81,13 +85,13 @@ function metatag_migrate_api() { */ class MigrateMetatagHandler extends MigrateDestinationHandler { + /** + * Identify a list of supported entity types. + */ public function __construct() { - $entity_types = array(); - foreach (entity_get_info() as $entity_type => $entity_info) { - if (isset($entity_info['metatags']) && !empty($entity_info['metatags'])) { - $entity_types[] = $entity_type; - } - } + $entity_types = metatag_entity_supports_metatags(); + $entity_types = array_filter($entity_types); + $entity_types = array_keys($entity_types); $this->registerTypes($entity_types); } @@ -122,4 +126,5 @@ class MigrateMetatagHandler extends MigrateDestinationHandler { } } } + } diff --git a/sites/all/modules/contrib/seo/metatag/metatag.module b/sites/all/modules/contrib/seo/metatag/metatag.module index 9f3a46f..aef85fb 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.module +++ b/sites/all/modules/contrib/seo/metatag/metatag.module @@ -1,4 +1,5 @@ -10, ); $items['admin/config/search/metatags/config/add'] = array( - 'title' => 'Add a Metatag default', + 'title' => 'Add default meta tags', 'page callback' => 'drupal_get_form', 'page arguments' => array('metatag_config_add_form'), 'access arguments' => array('administer meta tags'), @@ -186,7 +196,7 @@ function metatag_menu() { 'weight' => 10, ); $items['admin/config/search/metatags/settings'] = array( - 'title' => 'Advanced settings', + 'title' => 'Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('metatag_admin_settings_form'), 'access arguments' => array('administer meta tags'), @@ -204,6 +214,29 @@ function metatag_menu() { 'file' => 'metatag.admin.inc', ); + // Optional integration with the i18n_string module for translating the + // configurations. Note: this should also check for 'metatag_i18n_disabled' + // but doing so would require rebuilding the menu cache every time the Metatag + // settings page was saved, which may not be advised. Instead the links to + // these pages on the config pages *do* check the variable, which is close + // enough. + if (module_exists('i18n_string')) { + $items['admin/config/search/metatags/config/%metatag_config/translate'] = array( + 'title' => 'Translate', + 'access arguments' => array('administer meta tags'), + 'page callback' => 'i18n_string_object_translate_page', + 'page arguments' => array('metatag_config', 5), + 'type' => MENU_LOCAL_TASK, + ); + $items['admin/config/search/metatags/config/%metatag_config/translate/%i18n_language'] = array( + 'title' => 'Translate', + 'access arguments' => array('administer meta tags'), + 'page callback' => 'i18n_string_object_translate_page', + 'page arguments' => array('metatag_config', 5, 7), + 'type' => MENU_CALLBACK, + ); + } + return $items; } @@ -214,6 +247,147 @@ function metatag_flush_caches() { return array('cache_metatag'); } +/** + * Implements hook_action_info(). + * Provides integration with Views bulk operations. + */ +function metatag_action_info() { + return array( + 'metatag_modify_metatags_action' => array( + 'type' => 'entity', + 'label' => t('Modify entity metatags'), + 'configurable' => FALSE, + 'vbo_configurable' => TRUE, + 'behavior' => array('changes_property'), + 'triggers' => array('any'), + 'permissions' => array('edit meta tags'), + ), + ); +} + +/** + * Updates entity metatags with values from the action form. + * + * @param object $entity + * The entity housing the metatags to modify. + * @param array $context + * Contextual information passed from the View bulk operation configuration + * form. The updated metatag values for the entity are stored in + * $context['updates']. + */ +function metatag_modify_metatags_action($entity, $context) { + if (empty($entity)) { + drupal_set_message(t("Error while trying to update an entity's metatags."), + 'warning', FALSE); + return; + } + + $updates = $context['updates']; + $language = $entity->language; + + // Reset metatags to the entity default configs. + if ($context['reset_default']) { + $instance = $context['entity_type'] . ':' . $entity->type; + $entity_defaults = metatag_config_load_with_defaults($instance); + + // Clean up empty values. + foreach ($entity_defaults as $name => $tag) { + if (empty($tag['value'])) { + unset($entity_defaults[$name]); + } + } + + $entity->metatags[$language] = $entity_defaults; + } + // Otherwise, we're updating existing values. Ensure that the entity has any + // metatags already set. If so then merge the updates to avoid overwriting + // existing values that may exist as an array. E.g. robots. + elseif (!empty($entity->metatags) && !empty($entity->metatags[$language])) { + foreach ($updates as $tag => $value_array) { + if (is_array($updates[$tag]['value']) && !empty($entity->metatags[$language][$tag]['value'])) { + $entity->metatags[$language][$tag]['value'] = array_merge($entity->metatags[$language][$tag]['value'], + array_filter($updates[$tag]['value'])); + } + elseif (!empty($updates[$tag]['value'])) { + $entity->metatags[$language][$tag]['value'] = $updates[$tag]['value']; + } + } + } + // Otherwise just set the net new tags. + else { + $entity->metatags[$language] = $updates; + } + + entity_save($context['entity_type'], $entity); +} + +/** + * The Views bulk operation configuration form for modifying metatags. + * + * @param array $context + * Contextual information passed from the View bulk operation configuration + * form. + * + * @return array + * A form API compatible array. + */ +function metatag_modify_metatags_action_form($context) { + $form = array( + '#entity_type' => $context['entity_type'], + ); + + // There can be multiple instances being edited here. So the 2nd param passed + // here is as generic as possible. + metatag_metatags_form($form, 'global'); + + // Force the metatags tab to be fully visible and save a click from the user. + $form['metatags']['#collapsed'] = FALSE; + $form['metatags']['#collapsible'] = FALSE; + + // If we're reseting to the entity default, then we don't need to show the + // form fields. + $form['metatags']['#states'] = array( + 'visible' => array( + ':input[name="reset_default"]' => array('checked' => FALSE), + ), + ); + + // Add an option to reset selected entities to the default configuration. + $form['reset_default'] = array( + '#type' => 'checkbox', + '#title' => t('Reset to metatag defaults'), + '#default_value' => FALSE, + '#description' => t('Check to fully reset all metatags on + the entities being modified to their default + configuration.', array( + '@settings' => url('admin/config/search/metatags'), + )), + ); + + return $form; +} + +/** + * Submit handler for metatag_modify_metatags_action_form(). Filters out + * the user entered values from the defaults and returns the updated values to + * the $context array. + * + * @return array + * The updated metatag values that is ultimately keyed at $context['updates']. + */ +function metatag_modify_metatags_action_submit($form, &$form_state) { + $updates = $form_state['values']['metatags'][LANGUAGE_NONE]; + $defaults = metatag_config_load_with_defaults($form['#entity_type']); + + // Filter out the true updates. + metatag_filter_values_from_defaults($updates, $defaults); + + return array( + 'updates' => $updates, + 'reset_default' => $form_state['values']['reset_default'], + ); +} + /** * Load a metatag configuration record with all the defaults merged in. * @@ -227,8 +401,12 @@ function metatag_flush_caches() { function metatag_config_load_with_defaults($instance, $include_global = TRUE) { $defaults = &drupal_static(__FUNCTION__, array()); + // Use the current page's locale. + $langcode = $GLOBALS['language_content']->language; + // Statically cache defaults since they can include multiple levels. - $cid = "config:{$instance}" . ($include_global ? ':withglobal' : ':withoutglobal'); + $cid = "config:{$instance}:{$langcode}" . ($include_global ? ':withglobal' : ':withoutglobal'); + if (!isset($defaults[$cid])) { if ($cache = metatag_cache_get($cid)) { $defaults[$cid] = $cache->data; @@ -275,7 +453,7 @@ function metatag_config_load_multiple(array $instances) { // "Fix" any records that might be using old values. Ideally these will be // permanently fixed by being re-saved or re-exported. foreach (metatag_config_get_replacements() as $old_tag => $new_tag) { - foreach ($configs as $config_name => $config) { + foreach ($configs as $instance => $config) { if (isset($config->config[$old_tag])) { $config->config[$new_tag] = $config->config[$old_tag]; unset($config->config[$old_tag]); @@ -283,6 +461,29 @@ function metatag_config_load_multiple(array $instances) { } } + // Translate the configuration. + if (module_exists('i18n_string') && !variable_get('metatag_i18n_disabled', FALSE)) { + $options = array(); + + // By default disable the watchdog logging of translation messages. + $options['watchdog'] = variable_get('metatag_i18n_enable_watchdog', FALSE); + + foreach ($configs as $instance => &$config) { + foreach ($config->config as $tag => &$value) { + if (isset($value['value']) && is_string($value['value'])) { + $value['value'] = i18n_string_translate(array( + 'metatag', + 'metatag_config', + $instance, + $tag, + ), + $value['value'], + $options); + } + } + } + } + return $configs; } @@ -320,16 +521,6 @@ function metatag_config_save($config) { // hook_metatag_config_presave(). module_invoke_all('metatag_config_presave', $config); - // Update the i18n string - if (function_exists('i18n_string_update')) { - $instance = $config->instance; - - foreach ($config->config as $field => $item) { - $name = "metatag:" . $instance . ":" . $field; - i18n_string_update($name, $item['value']); - } - } - if ($config->is_new) { drupal_write_record('metatag_config', $config); @@ -354,11 +545,15 @@ function metatag_config_save($config) { /** * Delete a metatag configuration record. */ -function metatag_config_delete($instance) { +function metatag_config_delete($config) { db_delete('metatag_config') - ->condition('instance', $instance) + ->condition('instance', $config->instance) ->execute(); + // Allow modules to act upon the record deletion using + // hook_metatag_config_delete(). + module_invoke_all('metatag_config_delete', $config); + // Clear any caches. metatag_config_cache_clear(); } @@ -369,8 +564,9 @@ function metatag_config_delete($instance) { function metatag_config_cache_clear() { cache_clear_all('*', 'cache_metatag', TRUE); drupal_static_reset('metatag_config_load_with_defaults'); - drupal_static_reset('metatag_entity_has_metatags'); drupal_static_reset('metatag_entity_supports_metatags'); + drupal_static_reset('metatag_config_instance_info'); + drupal_static_reset('metatag_get_info'); ctools_include('export'); ctools_export_load_object_reset('metatag_config'); } @@ -378,37 +574,72 @@ function metatag_config_cache_clear() { /** * Load an entity's tags. * - * @param $entity_type + * @param string $entity_type * The entity type to load. - * @param $entity_id + * @param int $entity_id * The ID of the entity to load. + * @param mixed $revision_id + * Optional revision ID to load instead of the entity ID. * - * @return - * An array of tag data keyed by revision ID and language. + * @return array + * An array of tag data keyed by language for the entity's current active + * revision. */ -function metatag_metatags_load($entity_type, $entity_id) { - $metatags = metatag_metatags_load_multiple($entity_type, array($entity_id)); - return !empty($metatags) ? reset($metatags) : array(); +function metatag_metatags_load($entity_type, $entity_id, $revision_id = NULL) { + // A specific revision ID was not requested, so get the active revision ID. + if (is_null($revision_id)) { + // Unfortunately, the only way of getting the active revision ID is to + // first load the entity, and then extract the ID. This is a bit + // performance intensive, but it seems to be the only way of doing it. + $entities = entity_load($entity_type, array($entity_id)); + if (!empty($entities[$entity_id])) { + // We only care about the revision_id. + list(, $revision_id,) = entity_extract_ids($entity_type, $entities[$entity_id]); + } + } + + // This returns an array nested by the entity ID, the revision ID and the + // langcode. + $metatags = metatag_metatags_load_multiple($entity_type, array($entity_id), array($revision_id)); + + // Look for records for the requested revision ID. + if (isset($metatags[$entity_id][$revision_id])) { + return $metatags[$entity_id][$revision_id]; + } + + // Getting to this point means that no meta tags were identified earlier, so + // return an empty array. + return array(); } /** * Load tags for multiple entities. * - * @param $entity_type + * @param string $entity_type * The entity type to load. - * @param $entity_ids + * @param array $entity_ids * The list of entity IDs. + * @param array $revision_ids + * Optional revision ID to load instead of the entity ID. * - * @return + * @return array * An array of tag data, keyed by entity ID, revision ID and language. */ function metatag_metatags_load_multiple($entity_type, array $entity_ids, array $revision_ids = array()) { - // Double check entity IDs are numeric thanks to Entity API module. + // Double check entity IDs are all numeric. $entity_ids = array_filter($entity_ids, 'is_numeric'); if (empty($entity_ids)) { return array(); } + // Ensure that the revision IDs are all numeric too. + $revision_ids = array_filter($revision_ids, 'is_numeric'); + + // Verify that there aren't any empty values copied in from + // metatag_metatags_load(). Note: a zero indicates that the entity record does + // not support revisions, so this is ok to do. + $revision_ids = array_filter($revision_ids); + // Also need to check if the metatag table exists since this condition could // fire before the table has been installed yet. if (!variable_get('metatag_schema_installed', FALSE)) { @@ -436,9 +667,7 @@ function metatag_metatags_load_multiple($entity_type, array $entity_ids, array $ // Get all translations of tag data for this entity. $query = db_select('metatag', 'm') ->fields('m', array('entity_id', 'revision_id', 'language', 'data')) - ->condition('m.entity_type', $entity_type) - ->orderBy('entity_id') - ->orderBy('revision_id'); + ->condition('m.entity_type', $entity_type); // Filter by revision_ids if they are available. If not, filter by entity_ids. if (!empty($revision_ids)) { $query->condition('m.revision_id', $revision_ids, 'IN'); @@ -472,41 +701,67 @@ function metatag_metatags_load_multiple($entity_type, array $entity_ids, array $ /** * Save an entity's tags. * - * @param $entity_type - * The entity type to load - * @param $entity_id - * The entity's ID - * @param $revision_id - * The entity's VID. - * @param $metatags - * All of the tag information - * @param $language - * The language of the translation set + * @param string $entity_type + * The entity type to load. + * @param int $entity_id + * The entity's primary ID. + * @param int $revision_id + * The entity's revision ID. + * @param array $metatags + * All of the tag information, keyed by the language code. Most meta tags use + * the 'value' element, so the structure should look like: + * array( + * LANGUAGE_NONE => array( + * 'title' => array( + * 'value' => "This node's title!", + * ), + * 'og:title' => array( + * 'value' => "This node's title for Open Graph!", + * ), + * 'og:image' => array( + * 'value' => "[node:field_thumbnail]", + * ), + * ), + * ); + * @param string|null $bundle + * The bundle of the entity that is being saved. Optional. */ -function metatag_metatags_save($entity_type, $entity_id, $revision_id, $metatags, $langcode, $old_vid = NULL) { - // If no language assigned, or the language doesn't exist, use the - // has-no-language language. - $languages = language_list(); - if (empty($langcode) || !isset($languages[$langcode])) { - $langcode = LANGUAGE_NONE; - } - +function metatag_metatags_save($entity_type, $entity_id, $revision_id, $metatags, $bundle = NULL) { // Check that $entity_id is numeric because of Entity API and string IDs. if (!is_numeric($entity_id)) { return; } + // Don't do anything if the entity type is not supported. + if (!metatag_entity_supports_metatags($entity_type)) { + return; + } + + // Verify the entity bundle is supported, if not available just check the + // entity type. + if (!empty($bundle)) { + if (!metatag_entity_supports_metatags($entity_type, $bundle)) { + return; + } + } + else { + if (!metatag_entity_supports_metatags($entity_type)) { + return; + } + } + // The revision_id must be a numeric value; some entities use NULL for the // revision so change that to a zero. if (is_null($revision_id)) { $revision_id = 0; } - // Handle scenarios where the metatags are completely empty. + // Handle scenarios where the metatags are completely empty, this will have + // the effect of erasing the meta tags for those this entity. if (empty($metatags)) { $metatags = array(); // Add an empty array record for each language. - $languages = db_query("SELECT language, '' + $languages = db_query("SELECT language FROM {metatag} WHERE (entity_type = :type) AND (entity_id = :id) @@ -515,8 +770,8 @@ function metatag_metatags_save($entity_type, $entity_id, $revision_id, $metatags ':type' => $entity_type, ':id' => $entity_id, ':revision' => $revision_id, - ))->fetchAllKeyed(); - foreach ($languages as $oldlang => $empty) { + ))->fetchCol(); + foreach ($languages as $oldlang) { $metatags[$oldlang] = array(); } } @@ -558,18 +813,21 @@ function metatag_metatags_save($entity_type, $entity_id, $revision_id, $metatags // Clear cached data. metatag_metatags_cache_clear($entity_type, $entity_id); + + // Clear the entity cache. + entity_get_controller($entity_type)->resetCache(array($entity_id)); } /** * Delete an entity's tags. * - * @param $entity_type - * The entity type - * @param $entity_id - * The entity's ID - * @param $revision_id + * @param string $entity_type + * The entity type. + * @param int $entity_id + * The entity's ID. + * @param int $revision_id * The entity's VID. - * @param $langcode + * @param string $langcode * The language ID of the entry to delete. If left blank, all language * entries for this entity will be deleted. */ @@ -584,21 +842,25 @@ function metatag_metatags_delete($entity_type, $entity_id, $revision_id = NULL, /** * Delete multiple entities' tags. * - * @param $entity_type - * The entity type - * @param $entity_ids - * The list of IDs - * @param $revision_id - * An optional list of VIDs, if omitted all revisions will be deleted. - * @param $langcode + * @param string $entity_type + * The entity type. + * @param array $entity_ids + * The list of IDs. + * @param array $revision_ids + * An optional list of revision IDs; if omitted all revisions will be deleted. + * @param string $langcode * The language ID of the entities to delete. If left blank, all language * entries for the enities will be deleted. + * + * @return bool + * If any problems were encountered will return FALSE, otherwise TRUE. */ function metatag_metatags_delete_multiple($entity_type, array $entity_ids, array $revision_ids = array(), $langcode = NULL) { - // Double check entity IDs are numeric thanks to Entity API module. + // Double check entity IDs and revision IDs are numeric. $entity_ids = array_filter($entity_ids, 'is_numeric'); + $revision_ids = array_filter($revision_ids, 'is_numeric'); - if ($metatags = metatag_metatags_load_multiple($entity_type, $entity_ids, $revision_ids)) { + if (!empty($entity_ids) || !empty($revision_ids)) { $transaction = db_transaction(); try { // Let other modules know about the records being deleted using @@ -607,15 +869,18 @@ function metatag_metatags_delete_multiple($entity_type, array $entity_ids, array // Set the entity to delete. $query = db_delete('metatag') - ->condition('entity_type', $entity_type) - ->condition('entity_id', $entity_ids, 'IN'); + ->condition('entity_type', $entity_type); - // Optionally delete a specific revision. + // If revision IDs were specified then just use those in the query. if (!empty($revision_ids)) { $query->condition('revision_id', $revision_ids, 'IN'); } + // No revision IDs were specified, so work from the entity IDs. + else { + $query->condition('entity_id', $entity_ids, 'IN'); + } - // Specify a language if there is one. + // Limit to a language if one was specified. if (!empty($langcode)) { $query->condition('language', $langcode); } @@ -625,6 +890,11 @@ function metatag_metatags_delete_multiple($entity_type, array $entity_ids, array // Clear cached data. metatag_metatags_cache_clear($entity_type, $entity_ids); + + // Clear the caches for these entities. + entity_get_controller($entity_type)->resetCache($entity_ids); + + return TRUE; } catch (Exception $e) { $transaction->rollback(); @@ -632,6 +902,11 @@ function metatag_metatags_delete_multiple($entity_type, array $entity_ids, array throw $e; } } + else { + watchdog('metatag', 'No entity IDs or revision IDs were submitted to metatag_metatags_delete_multiple().'); + } + + return FALSE; } /** @@ -649,7 +924,7 @@ function metatag_metatags_cache_clear($entity_type, $entity_ids = NULL) { $entity_ids = array($entity_ids); } foreach ($entity_ids as $entity_id) { - cache_clear_all("output:$entity_type:$entity_id", 'cache_metatag', TRUE); + cache_clear_all("output:$entity_type:$entity_id", 'cache_metatag'); } } } @@ -664,27 +939,54 @@ function metatag_entity_load($entities, $entity_type) { if (metatag_entity_supports_metatags($entity_type)) { // Get the revision_ids. $revision_ids = array(); + + // Track the entity IDs for values to load. + $entity_ids = array(); + + // Some entities don't support revisions. + $supports_revisions = TRUE; + + // Extract the revision ID and verify the entity's bundle is supported. foreach ($entities as $key => $entity) { - list($entity_id, $revision_id) = entity_extract_ids($entity_type, $entity); - $revision_id = intval($revision_id); - if (!empty($revision_id)) { - $revision_ids[] = $revision_id; + list($entity_id, $revision_id, $bundle) = entity_extract_ids($entity_type, $entity); + + // Verify that each entity bundle supports Metatag. + if (metatag_entity_supports_metatags($entity_type, $bundle)) { + $entity_ids[] = $entity_id; + + if (!empty($revision_id)) { + $revision_ids[] = $revision_id; + } } } - // Load all meta tags for these entities. - $metatags = metatag_metatags_load_multiple($entity_type, array_keys($entities), $revision_ids); + // Only proceed if either there were revision IDs identified, or the + // entity doesn't support revisions anyway. + if (!empty($entity_ids)) { + // Load all meta tags for these entities. + $metatags = metatag_metatags_load_multiple($entity_type, $entity_ids, $revision_ids); - // Assign the metatag records for the correct revision ID. - foreach ($entities as $entity_id => $entity) { - list($entity_id, $revision_id) = entity_extract_ids($entity_type, $entity); - $revision_id = intval($revision_id); - $entities[$entity_id]->metatags = isset($metatags[$entity_id][$revision_id]) ? $metatags[$entity_id][$revision_id] : array(); + // Assign the metatag records for the correct revision ID. + if (!empty($metatags)) { + foreach ($entities as $entity_id => $entity) { + list($entity_id, $revision_id) = entity_extract_ids($entity_type, $entity); + $revision_id = intval($revision_id); + $entities[$entity_id]->metatags = isset($metatags[$entity_id][$revision_id]) ? $metatags[$entity_id][$revision_id] : array(); + } + } } } } catch (Exception $e) { - watchdog('metatag', 'Error loading meta tag data, do the database updates need to be run? The error occurred when loading record(s) %ids for the %type entity type. The error message was: %error', array('@update' => base_path() . 'update.php', '%ids' => implode(', ', array_keys($entities)), '%type' => $entity_type, '%error' => $e->getMessage()), WATCHDOG_WARNING); + watchdog('metatag', 'Error loading meta tag data, do the database updates need to be run? The error occurred when loading record(s) %ids for the %type entity type. The error message was: %error', + array( + '@update' => base_path() . 'update.php', + '%ids' => implode(', ', array_keys($entities)), + '%type' => $entity_type, + '%error' => $e->getMessage(), + ), + WATCHDOG_WARNING); + // Don't display the same message twice for Drush. if (drupal_is_cli()) { drupal_set_message(t('Run your updates, like drush updb.')); @@ -701,7 +1003,13 @@ function metatag_entity_load($entities, $entity_type) { */ function metatag_entity_insert($entity, $entity_type) { if (isset($entity->metatags)) { - list($entity_id, $revision_id) = entity_extract_ids($entity_type, $entity); + list($entity_id, $revision_id, $bundle) = entity_extract_ids($entity_type, $entity); + + // Verify that this entity type / bundle is supported. + if (!metatag_entity_supports_metatags($entity_type, $bundle)) { + return; + } + $revision_id = intval($revision_id); // Determine the entity's language. @@ -726,12 +1034,12 @@ function metatag_entity_insert($entity, $entity_type) { unset($entity->metatags[LANGUAGE_NONE]); } - // Support for Workbench Moderation v1. + // Support for Workbench Moderation. if ($entity_type == 'node' && _metatag_isdefaultrevision($entity)) { return; } - metatag_metatags_save($entity_type, $entity_id, $revision_id, $entity->metatags, $langcode); + metatag_metatags_save($entity_type, $entity_id, $revision_id, $entity->metatags, $bundle); } } @@ -739,11 +1047,13 @@ function metatag_entity_insert($entity, $entity_type) { * Implements hook_entity_update(). */ function metatag_entity_update($entity, $entity_type) { - if (!metatag_entity_supports_metatags($entity_type)) { + list($entity_id, $revision_id, $bundle) = entity_extract_ids($entity_type, $entity); + + // If this entity object isn't allowed meta tags, don't continue. + if (!metatag_entity_supports_metatags($entity_type, $bundle)) { return; } - list($entity_id, $revision_id) = entity_extract_ids($entity_type, $entity); $revision_id = intval($revision_id); if (isset($entity->metatags)) { @@ -784,14 +1094,13 @@ function metatag_entity_update($entity, $entity_type) { } } - // Support for Workbench Moderation v1. + // Support for Workbench Moderation. if ($entity_type == 'node' && _metatag_isdefaultrevision($entity)) { return; } // Save the record. - $old_vid = isset($entity->old_vid) ? $entity->old_vid : NULL; - metatag_metatags_save($entity_type, $entity_id, $revision_id, $entity->metatags, $new_language, $old_vid); + metatag_metatags_save($entity_type, $entity_id, $revision_id, $entity->metatags, $bundle); } else { // Still ensure the meta tag output is cached. @@ -816,6 +1125,25 @@ function metatag_field_attach_delete_revision($entity_type, $entity) { metatag_metatags_delete($entity_type, $entity_id, $revision_id); } +/** + * Build and alter metatag instance name. + * + * @param object $entity + * The entity object to generate the metatags instance name for. + * @param string $entity_type + * The entity type of the entity. + * @param string $bundle + * The bundle of the entity. + * + * @return string + * The resulting name of the config instance. + */ +function metatag_get_entity_metatags_instance($entity, $entity_type, $bundle) { + $instance = "{$entity_type}:{$bundle}"; + drupal_alter('metatag_get_entity_metatags_instance', $instance, $entity, $entity_type, $bundle); + return $instance; +} + /** * Implements hook_entity_view(). * @@ -823,11 +1151,20 @@ function metatag_field_attach_delete_revision($entity_type, $entity) { * around problems elsewhere in the APIs. */ function metatag_entity_view($entity, $entity_type, $view_mode, $langcode, $force = FALSE) { - // Only run this function once per page load. + // Only run this function once per page load, for an entity which is allowed + // metatags. static $i_will_say_this_only_once = FALSE; // Only proceed if this entity object is the page being viewed. if (_metatag_entity_is_page($entity_type, $entity)) { + // Get the entity's extra information. + list($entity_id, $revision_id, $bundle) = entity_extract_ids($entity_type, $entity); + + // If this entity object isn't allowed meta tags, don't continue. + if (!metatag_entity_supports_metatags($entity_type, $bundle)) { + return; + } + // Some API calls need to force the data loading. if (!$force) { // Only run this function once per page load. @@ -845,8 +1182,7 @@ function metatag_entity_view($entity, $entity_type, $view_mode, $langcode, $forc // Generate metatags output. if ($output = metatag_generate_entity_metatags($entity, $entity_type, $langcode, $view_mode)) { - list($entity_id, $revision_id, $bundle) = entity_extract_ids($entity_type, $entity); - $instance = "{$entity_type}:{$bundle}"; + $instance = metatag_get_entity_metatags_instance($entity, $entity_type, $bundle); // We need to register the term's metatags, so we can later fetch them. // @see metatag_page_build(). metatag_page_set_metatags($instance, $output); @@ -869,22 +1205,24 @@ function metatag_entity_view($entity, $entity_type, $view_mode, $langcode, $forc * TRUE if metatags can be loaded from and saved to the cache. FALSE if the * cache should be bypassed. * - * @return array + * @return mixed * A renderable array of metatags for the given entity. + * If this entity object isn't allowed meta tags, return FALSE (empty). */ function metatag_generate_entity_metatags($entity, $entity_type, $langcode = NULL, $view_mode = 'full', $cached = TRUE) { - // If this entity object isn't allowed meta tags, don't continue. - if (!metatag_entity_has_metatags($entity_type, $entity)) { - return array(); - } - // Obtain some details of the entity that are needed elsewhere. list($entity_id, $revision_id, $bundle) = entity_extract_ids($entity_type, $entity); + + // If this entity object isn't allowed meta tags, don't continue. + if (!metatag_entity_supports_metatags($entity_type, $bundle)) { + return; + } + $revision_id = intval($revision_id); // Check if a specific metatag config exists, otherwise just use the global // one, stripping out the bundle. - $instance = "{$entity_type}:{$bundle}"; + $instance = metatag_get_entity_metatags_instance($entity, $entity_type, $bundle); if (!metatag_config_load_with_defaults($instance, FALSE)) { $instance = "{$entity_type}"; } @@ -921,9 +1259,17 @@ function metatag_generate_entity_metatags($entity, $entity_type, $langcode = NUL } $cid = FALSE; - if ($cached) { + $key = FALSE; + $metatag_variants = array(); + + // Caching is enabled. + if ($cached && variable_get('metatag_cache_output', FALSE)) { + // All possible variants of the metatags for this entity are stored in a + // single cache entry. + $cid = "output:$entity_type:$entity_id"; + // All applicable pieces for this current page. - $cid_parts = array( + $key_parts = array( 'entity_type' => $entity_type, 'bundle' => $bundle, 'entity_id' => $entity_id, @@ -934,12 +1280,19 @@ function metatag_generate_entity_metatags($entity, $entity_type, $langcode = NUL 'language_content' => $GLOBALS['language_content']->language, 'view_mode' => $view_mode, ); - $cid = metatag_cache_default_cid_parts($cid_parts); + $key = metatag_cache_default_cid_parts($key_parts); + + if ($cache = metatag_cache_get($cid)) { + $metatag_variants = $cache->data; + } } - if ($cid && $cache = metatag_cache_get($cid)) { - $output = $cache->data; + // If a cached object exists for this key, return it. + if (!empty($key) && isset($metatag_variants[$key])) { + $output = $metatag_variants[$key]; } + + // Otherwise, generate the output tags. else { // Separate the meta tags. $metatags = isset($entity->metatags) ? $entity->metatags : array(); @@ -950,24 +1303,27 @@ function metatag_generate_entity_metatags($entity, $entity_type, $langcode = NUL 'entity_type' => $entity_type, 'view_mode' => $view_mode, ); + // Ensure we actually pass a language object rather than language code. $languages = language_list(); if (isset($languages[$langcode])) { $options['language'] = $languages[$langcode]; } - // Reload the entity object from cache as it may have been altered. + // Include token replacement data. Don't reload the entity object as doing + // so would conflict with content editorial workflows. if (!empty($entity_id)) { $token_type = token_get_entity_mapping('entity', $entity_type); - $entities = entity_load($entity_type, array($entity_id)); - $options['token data'][$token_type] = $entities[$entity_id]; - $options['entity'] = $entities[$entity_id]; + $options['token data'][$token_type] = $entity; } // Render the metatags and save to the cache. $output = metatag_metatags_view($instance, $metatags, $options); - if ($cid) { - metatag_cache_set($cid, $output); + + // If output caching is enabled, store the data for later. + if (!empty($key) && !empty($cid)) { + $metatag_variants[$key] = $output; + metatag_cache_set($cid, $metatag_variants); } } @@ -1016,6 +1372,10 @@ function metatag_metatags_view($instance, array $metatags = array(), array $opti $options['language'] = isset($languages[$options['language']]) ? $languages[$options['language']] : NULL; } + if (empty($options['language'])) { + $options['language'] = $GLOBALS['language_content']; + } + // If there are any tags, determine the translation to display. if (!empty($metatags)) { // Get the display language; default to the entity's language. @@ -1036,10 +1396,17 @@ function metatag_metatags_view($instance, array $metatags = array(), array $opti $options['instance'] = $instance; + // Don't output meta tags that only contain the pager. + $current_pager = metatag_get_current_pager(); + foreach ($metatags as $metatag => $data) { if ((!empty($data['value']) || (isset($data['value']) && is_numeric($data['value']))) && $metatag_instance = metatag_get_instance($metatag, $data)) { - $output[$metatag] = $metatag_instance->getElement($options); + $tag_output = $metatag_instance->getElement($options); + // Don't output the pager if that's all there is. + if ($tag_output != $current_pager) { + $output[$metatag] = $tag_output; + } } } @@ -1050,6 +1417,26 @@ function metatag_metatags_view($instance, array $metatags = array(), array $opti return $output; } +/** + * Get the pager string for the current page. + * + * @return string + * Returns a string based upon the 'metatag_pager_string' variable and the + * current page number. + */ +function metatag_get_current_pager() { + if (isset($_GET['page']) && !empty($_GET['page']) && is_numeric($_GET['page'])) { + $page = intval($_GET['page']) + 1; + if ($page > 1) { + $pager = variable_get('metatag_pager_string', 'Page PAGER | '); + return str_replace('PAGER', $page, $pager); + } + } +} + +/** + * Returns metatags values. + */ function metatag_metatags_values($instance, array $metatags = array(), array $options = array()) { $values = array(); @@ -1120,6 +1507,10 @@ function metatag_metatags_form(array &$form, $instance, array $metatags = array( 'instance' => $instance, ); + // Trigger hook_metatag_token_types_alter(). + // Allow the defined tokens to be modified. + drupal_alter('metatag_token_types', $options); + $form['metatags'] = array( '#type' => 'fieldset', '#title' => t('Meta tags'), @@ -1142,13 +1533,13 @@ function metatag_metatags_form(array &$form, $instance, array $metatags = array( ); // Show a different intro message for entity pages vs config pages. if (isset($form['#entity'])) { - $form['metatags'][$langcode]['intro_text'] = array( + $form['metatags']['intro_text'] = array( '#markup' => '
' . t('Configure the meta tags below. Tokens, e.g. "[node:summary]", automatically insert the corresponding information from that field or value, which helps to avoid redundant meta data and possible search engine penalization; see the "Browse available tokens" popup for more details.') . '
', '#weight' => -10, ); } else { - $form['metatags'][$langcode]['intro_text'] = array( + $form['metatags']['intro_text'] = array( '#markup' => '' . t('Configure the meta tags below. Use tokens (see the "Browse available tokens" popup) to avoid redundant meta data and search engine penalization. For example, a \'keyword\' value of "example" will be shown on all content using this configuration, whereas using the [node:field_keywords] automatically inserts the "keywords" values from the current entity (node, term, etc).') . '
', '#weight' => -10, ); @@ -1185,9 +1576,16 @@ function metatag_metatags_form(array &$form, $instance, array $metatags = array( // Get the form element from the meta tag class. $metatag_form = $metatag_instance->getForm($options); + if (isset($metatag_form['value']['#default_value']) && is_array($metatag_form['value']['#default_value'])) { + $metatag_form['value']['#default_value'] = array_filter($metatag_form['value']['#default_value']); + } // Add a default value form element. if (isset($options['defaults'][$metatag]['value'])) { + if (is_array($options['defaults'][$metatag]['value'])) { + $options['defaults'][$metatag]['value'] = array_filter($options['defaults'][$metatag]['value']); + } + $metatag_form['default'] = array( '#type' => 'hidden', '#value' => $options['defaults'][$metatag]['value'], @@ -1208,13 +1606,15 @@ function metatag_metatags_form(array &$form, $instance, array $metatags = array( $group = $info['groups'][$group_key] + array('form' => array(), 'description' => NULL); $form['metatags'][$langcode][$group_key] = $group['form'] + array( '#type' => 'fieldset', - '#title' => check_plain($group['label']), - '#description' => filter_xss($group['description']), + '#title' => $group['label'], + '#description' => !empty($group['description']) ? $group['description'] : '', '#collapsible' => TRUE, '#collapsed' => TRUE, ); } - $form['metatags'][$langcode][$group_key][$metatag] = $metatag_form + array('#parents' => array('metatags', $langcode, $metatag)); + $form['metatags'][$langcode][$group_key][$metatag] = $metatag_form + array( + '#parents' => array('metatags', $langcode, $metatag), + ); // Hide the fieldset itself if there is not at least one of the meta tag // fields visible. @@ -1243,14 +1643,20 @@ function metatag_metatags_form(array &$form, $instance, array $metatags = array( // Check the #access of each group. If it passed, we display options for // tokens. By this we update the #description of each group. if ($form['metatags']['#access']) { - // Built the token list. - $token_listing_link = theme('token_tree', array('token_types' => $options['token types'], 'dialog' => TRUE)); - - // Add the token list to the top of the fieldset. - $form['metatags'][$langcode]['#description'] = $token_listing_link; - // Check if each meta tag group is being displayed. if (!empty($group_metatag_access)) { + // Built the token browser link. For value "all" theme_token_tree() + // compares with string, not array. + if (in_array('all', $options['token types'])) { + $options['token types'] = 'all'; + } + $token_listing_link = theme('token_tree', + array( + 'token_types' => $options['token types'], + 'dialog' => TRUE, + ) + ); + foreach ($group_metatag_access as $group_key => $token_access) { if ($token_access) { // Update the description. @@ -1260,16 +1666,23 @@ function metatag_metatags_form(array &$form, $instance, array $metatags = array( else { $form['metatags'][$langcode][$group_key]['#description'] = ''; } + + // Add the token browser popup link. $form['metatags'][$langcode][$group_key]['#description'] .= $token_listing_link; } } } } - // Add a submit handler to compare the submitted values against the deafult + // Add a submit handler to compare the submitted values against the default // values. $form += array('#submit' => array()); - array_unshift($form['#submit'], 'metatag_metatags_form_submit'); + if (module_exists('commerce') && isset($form['#entity_type']) && $form['#entity_type'] == 'commerce_product') { + $form['actions']['submit']['#submit'][] = 'metatag_commerce_product_form_submit'; + } + else { + array_unshift($form['#submit'], 'metatag_metatags_form_submit'); + } } /** @@ -1302,200 +1715,193 @@ function metatag_metatags_form_submit($form, &$form_state) { } } +/** + * Form API submission callback for Commerce product. + * + * Unlike metatag_metatags_form_submit. + * + * @see metatag_metatags_save() + */ +function metatag_commerce_product_form_submit($form, &$form_state) { + // Trigger the normal meta tag form submission. + metatag_metatags_form_submit($form, $form_state); + + // The entity being saved. + $entity_type = 'commerce_product'; + $product = $form_state[$entity_type]; + $entity_id = $product->product_id; + $revision_id = $product->revision_id; + + // Get the full entity details. + list(, , $bundle) = entity_extract_ids($entity_type, $product); + + // Update the meta tags for this entity type. + metatag_metatags_save($entity_type, $entity_id, $revision_id, $form_state['values']['metatags'], $bundle); +} + /** * Implements hook_field_extra_fields(). */ function metatag_field_extra_fields() { $extra = array(); foreach (entity_get_info() as $entity_type => $entity_info) { - foreach (array_keys($entity_info['bundles']) as $bundle) { - if (metatag_entity_supports_metatags($entity_type, $bundle)) { - $extra[$entity_type][$bundle]['form']['metatags'] = array( - 'label' => t('Meta tags'), - 'description' => t('Meta tag module form elements.'), - 'weight' => 40, - ); + if (!empty($entity_info['bundles'])) { + foreach (array_keys($entity_info['bundles']) as $bundle) { + if (metatag_entity_supports_metatags($entity_type, $bundle)) { + $extra[$entity_type][$bundle]['form']['metatags'] = array( + 'label' => t('Meta tags'), + 'description' => t('Meta tag module form elements.'), + 'weight' => 40, + ); + } } } } return $extra; } -/** - * Check if an individual entity has meta tags defined, or has defaults. - * - * @param string $entity_type - * An entity type. - * @param object $entity - * An entity object. - * - * @return boolean - * TRUE or FALSE if the entity should have a form for or process meta tags. - */ -function metatag_entity_has_metatags($entity_type, $entity) { - // If an entity has custom meta tags assigned, then we should return TRUE. - if (!empty($entity->metatags)) { - return TRUE; - } - - // Otherwise, check to see if there exists any enabed configuration for - // either the entity type, or bundle (even if the configuration is empty). - // If no configuration exists, then we should not be displaying the meta tag - // forms or processing meta tags on entity view. - $config_exists = &drupal_static(__FUNCTION__, array()); - list( , , $bundle) = entity_extract_ids($entity_type, $entity); - // Do not pretend to have metatags when the bundle does not support them. - if (!metatag_entity_supports_metatags($entity_type, $bundle)) { - return FALSE; - } - $instance = "{$entity_type}:{$bundle}"; - if (!isset($config_exists[$instance])) { - // Check if the intstance or its parents (excluding global) are enabled. - $config_exists[$instance] = metatag_config_is_enabled($instance, TRUE, FALSE); - } - - return !empty($config_exists[$instance]); -} - /** * Check whether the requested entity type (and bundle) support metatag. * - * By default this will be FALSE, support has to be specifically enabled by - * assigning 'metatag' => TRUE within the hook_entity_info() definition for the - * entity. + * By default the entities are disabled, only certain entities will have been + * enabled during installation. If an entity type is enabled it is assumed that + * the entity bundles will also be enabled by default. + * + * @see metatag_entity_type_is_suitable() */ function metatag_entity_supports_metatags($entity_type = NULL, $bundle = NULL) { $entity_types = &drupal_static(__FUNCTION__); + // Identify which entities & bundles are supported the first time the + // function is called. if (!isset($entity_types)) { - $entity_types = array(); - } + foreach (entity_get_info() as $entity_name => $entity_info) { + // Verify that this entity type is suitable. + $entity_types[$entity_name] = metatag_entity_type_is_suitable($entity_name, $entity_info); - // Everything else depends upon a specific entity type being checked. - if (isset($entity_type)) { - if (!isset($entity_types[$entity_type])) { - $entity_info = entity_get_info($entity_type); - if (empty($entity_info['metatags'])) { - $entity_types[$entity_type] = FALSE; - } - else { - $entity_types[$entity_type] = array(); - foreach ($entity_info['bundles'] as $bundle_key => $bundle_info) { - $entity_types[$entity_type][$bundle_key] = !isset($bundle_info['metatags']) || !empty($bundle_info['metatags']); + // The entity type technically supports entities. + if (!empty($entity_types[$entity_name])) { + // Entiy types are enabled by default. + // Allow entities to be disabled by assigning a variable + // 'metatag_enable_{$entity_type}' the value FALSE, e.g.: + // + // // Disable metatags for file_entity. + // $conf['metatag_enable_file'] = FALSE; + // + // @see Settings page. + if (variable_get('metatag_enable_' . $entity_name, FALSE) == FALSE) { + $entity_types[$entity_name] = FALSE; + } + + // Check each bundle. + else { + $entity_types[$entity_name] = array(); + foreach ($entity_info['bundles'] as $bundle_name => $bundle_info) { + // If only one bundle exists, take configuration for entity, to + // reflect options as they are available in the UI. + if (count($entity_info['bundles']) === 1) { + $entity_types[$entity_name][$bundle_name] = variable_get('metatag_enable_' . $entity_name, FALSE) == TRUE; + continue; + } + + // Allow bundles to be disabled by assigning a variable + // 'metatag_enable_{$entity_type}__{$bundle}' the value FALSE, e.g.: + // + // // Disable metatags for carousel nodes. + // $conf['metatag_enable_node__carousel'] = FALSE; + // + // @see Settings page. + if (variable_get('metatag_enable_' . $entity_name . '__' . $bundle_name, TRUE) == FALSE) { + $entity_types[$entity_name][$bundle_name] = FALSE; + } + else { + $entity_types[$entity_name][$bundle_name] = TRUE; + } + } } } } - - // If a specific entity bundle is being compared, check it first. - if (isset($bundle)) { - // Allow entities to be disabled by assigning a variable - // 'metatag_enable_{$entity_type}__{$bundle}' the value FALSE, e.g.: - // - // // Disable metatags for carousel nodes. - // $conf['metatag_enable_node__carousel'] = FALSE; - // - // @see Advanced settings page. - if (variable_get('metatag_enable_' . $entity_type . '__' . $bundle, 'monkey') == FALSE) { - return FALSE; - } - - return isset($entity_types[$entity_type][$bundle]) ? $entity_types[$entity_type][$bundle] : FALSE; - } - - // Otherwise check the entity type itself. - else { - // Allow entities to be disabled by assigning a variable - // 'metatag_enable_{$entity_type}' the value FALSE, e.g.: - // - // // Disable metatags for file_entity. - // $conf['metatag_enable_file'] = FALSE; - // - // @see Advanced settings page. - if (variable_get('metatag_enable_' . $entity_type, 'monkey') == FALSE) { - return FALSE; - } - - return isset($entity_types[$entity_type]) ? ($entity_types[$entity_type] !== FALSE) : FALSE; - } } + // It was requested to check a specific entity. + if (isset($entity_type)) { + // It was also requested to check a specific bundle for this entity. + if (isset($bundle)) { + $supported = !empty($entity_types[$entity_type][$bundle]); + } + + // Check the entity. + else { + $supported = !empty($entity_types[$entity_type]); + } + + return $supported; + } + + // If nothing specific was requested, return the complete list of supported + // entities & bundles. return $entity_types; } /** - * Implements hook_entity_info_alter(). + * Enable support for a specific entity type if setting does not exist. * - * Enables Metatag support for the core entities. + * @param string $entity_type + * The entity type. + * @param string $bundle + * The bundle of the entity. + * @param bool $force_enable + * If TRUE, then the type is enabled regardless of any stored variables. + * + * @return bool + * TRUE if either the bundle or entity type was enabled by this function. */ -function metatag_entity_info_alter(&$info) { - $defaults['node'] = array( - 'path' => 'node/%node', - 'metatags' => TRUE, - ); - $defaults['user'] = array( - 'path' => 'user/%user', - 'metatags' => TRUE, - ); - $defaults['taxonomy_term'] = array( - 'path' => 'taxonomy/term/%taxonomy_term', - 'metatags' => TRUE, - ); - - // Just running taxonomy_vocabulary_load() here would cause problems for - // EntityCache in certain circumstances, so instead the query is executed - // directly instead. - if (module_exists('forum') && ($vocab_id = variable_get('forum_nav_vocabulary', 0))) { - $vocab_name = db_query("SELECT machine_name FROM {taxonomy_vocabulary} WHERE vid = :vid", array(':vid' => $vocab_id))->fetchField(); - if (!empty($vocab_name)) { - $defaults['taxonomy_term']['bundles'][$vocab_name]['path'] = 'forum/%taxonomy_term'; +function metatag_entity_type_enable($entity_type, $bundle = NULL, $force_enable = FALSE) { + // The bundle was defined. + $bundle_set = FALSE; + if (isset($bundle)) { + $stored_bundle = variable_get('metatag_enable_' . $entity_type . '__' . $bundle, NULL); + if ($force_enable || !isset($stored_bundle)) { + variable_set('metatag_enable_' . $entity_type . '__' . $bundle, TRUE); + $bundle_set = TRUE; } } - foreach ($defaults as $key => $entity_defaults) { - if (isset($info[$key])) { - $info[$key] = drupal_array_merge_deep($entity_defaults, $info[$key]); - } + // Always enable the entity type, because otherwise there's no point in + // enabling the bundle. + $entity_type_set = FALSE; + $stored_entity_type = variable_get('metatag_enable_' . $entity_type, NULL); + if ($force_enable || !isset($stored_entity_type)) { + variable_set('metatag_enable_' . $entity_type, TRUE); + $entity_type_set = TRUE; } + + // Clear the static cache so that the entity type / bundle will work. + drupal_static_reset('metatag_entity_supports_metatags'); + + return $bundle_set || $entity_type_set; } /** - * Given a path determine if it is an entity default path. + * Disable support for a specific entity type. * - * @param $path - * The internal path. The id of the entity should be in the string as '[id]'. - * @return - * An array with the entity type and the loaded entity object. + * @param string $entity_type + * The entity type. + * @param string $bundle + * The bundle of the entity. */ -function metatag_load_entity_from_path($path) { - $entity_paths = &drupal_static(__FUNCTION__); - $result = FALSE; - - if (!isset($entity_paths)) { - $entity_paths = array(); - foreach (entity_get_info() as $entity_type => $entity_info) { - if (isset($entity_info['default path'])) { - $default_path = $entity_info['default path']; - $default_path = preg_quote($default_path, '/'); - $default_path = str_replace('\[id\]', '(\d+)', $default_path); - $entity_paths[$entity_type] = $default_path; - } - } +function metatag_entity_type_disable($entity_type, $bundle = NULL) { + // The bundle was defined. + if (isset($bundle)) { + variable_set('metatag_enable_' . $entity_type . '__' . $bundle, FALSE); + } + // The bundle was not defined. + else { + variable_set('metatag_enable_' . $entity_type, FALSE); } - foreach ($entity_paths as $entity_type => $default_path) { - if (preg_match("/^{$default_path}$/", $path, $matches)) { - if ($entity = entity_load($entity_type, array($matches[1]))) { - $result = array('entity_type' => $entity_type, 'entity' => reset($entity)); - } - break; - } - } - - // Allow other modules to customize the data using - // hook_metatag_load_entity_from_path_alter(). - drupal_alter('metatag_load_entity_from_path', $path, $result); - - return $result; + // Clear the static cache so that the entity type / bundle will work. + drupal_static_reset('metatag_entity_supports_metatags'); } /** @@ -1529,6 +1935,12 @@ function metatag_page_build(&$page) { return; } + // Special consideration for the Me module, which uses the "user/me" path and + // will cause problems. + if (arg(0) == 'user' && arg(1) == 'me' && function_exists('me_menu_alter')) { + return; + } + // The page region can be changed. $region = variable_get('metatag_page_region', 'content'); @@ -1557,7 +1969,10 @@ function metatag_page_build(&$page) { } else { $metatags = metatag_metatags_view($instance, array()); - metatag_cache_set($cid, $metatags); + // If output caching is enabled, save this for later. + if (variable_get('metatag_cache_output', FALSE)) { + metatag_cache_set($cid, $metatags); + } } $page[$region]['metatags'][$instance] = $metatags; @@ -1586,7 +2001,10 @@ function metatag_page_build(&$page) { } else { $metatags = metatag_metatags_view($instance, array()); - metatag_cache_set($cid, $metatags); + // If output caching is enabled, save this for later. + if (variable_get('metatag_cache_output', FALSE)) { + metatag_cache_set($cid, $metatags); + } } $page[$region]['metatags'][$instance] = $metatags; } @@ -1595,14 +2013,14 @@ function metatag_page_build(&$page) { /** * Returns whether the current page is the page of the passed in entity. * - * @param $entity_type + * @param string $entity_type * The entity type; e.g. 'node' or 'user'. - * @param $entity + * @param object $entity * The entity object. * - * @return + * @return mixed * TRUE if the current page is the page of the specified entity, or FALSE - * otherwise. + * otherwise. If $entity_type == 'comment' return empty (FALSE). */ function _metatag_entity_is_page($entity_type, $entity) { // Exclude comment entities as this conflicts with comment_fragment.module. @@ -1613,8 +2031,8 @@ function _metatag_entity_is_page($entity_type, $entity) { $uri = entity_uri($entity_type, $entity); $current_path = current_path(); - // Support for Workbench Moderation v1 - if this is a node, check if the - // content type supports moderation. + // Support for Workbench Moderation - if this is a node, check if the content + // type supports moderation. if ($entity_type == 'node' && function_exists('workbench_moderation_node_type_moderated') && workbench_moderation_node_type_moderated($entity->type) === TRUE) { return !empty($uri['path']) && ($current_path == $uri['path'] || $current_path == $uri['path'] . '/draft'); } @@ -1639,7 +2057,8 @@ function metatag_field_attach_rename_bundle($entity_type, $bundle_old, $bundle_n if ($config = metatag_config_load($instance_old)) { $config->instance = $instance_new; metatag_config_save($config); - metatag_config_delete($instance_old); + $config->instance = $instance_old; + metatag_config_delete($config); } } @@ -1648,23 +2067,27 @@ function metatag_field_attach_rename_bundle($entity_type, $bundle_old, $bundle_n */ function metatag_field_attach_delete_bundle($entity_type, $bundle) { $instance = $entity_type . ':' . $bundle; - metatag_config_delete($instance); + if ($config = metatag_config_load($instance)) { + metatag_config_delete($config); + } } /** * Implements hook_field_attach_form(). */ function metatag_field_attach_form($entity_type, $entity, &$form, &$form_state, $langcode) { - if (!metatag_entity_has_metatags($entity_type, $entity)) { - return; - } // Entity_Translation will trigger this hook again, skip it. if (!empty($form_state['entity_translation']['is_translation'])) { return; } list($entity_id, $revision_id, $bundle) = entity_extract_ids($entity_type, $entity); - $instance = "{$entity_type}:{$bundle}"; + + if (!metatag_entity_supports_metatags($entity_type, $bundle)) { + return; + } + + $instance = metatag_get_entity_metatags_instance($entity, $entity_type, $bundle); // Grab the meta tags for display in the form if there are any. if (!empty($entity->metatags)) { @@ -1698,14 +2121,18 @@ function metatag_field_attach_form($entity_type, $entity, &$form, &$form_state, $metatags = array(); } - $options['token types'] = array(token_get_entity_mapping('entity', $entity_type)); + // Certain circumstances can result in $metatags not being an array. + if (!is_array($metatags)) { + $metatags = array(); + } + + $options['token types'] = array( + token_get_entity_mapping('entity', $entity_type), + ); $options['context'] = $entity_type; - // Allow hook_metatag_token_types_alter() to modify the defined tokens. - drupal_alter('metatag_token_types', $options); // @todo Remove metatag_form_alter() when https://www.drupal.org/node/1284642 is fixed in core. - //metatag_metatags_form($form, $instance, $metatags, $options); - + // metatag_metatags_form($form, $instance, $metatags, $options); $form['#metatags'] = array( 'instance' => $instance, 'metatags' => $metatags, @@ -1729,7 +2156,7 @@ function metatag_form_alter(&$form, $form_state, $form_id) { /** * Get the meta tag information array of a meta tag. * - * @param $metatag + * @param string $name * The meta tag name, e.g. description, for which the info shall be returned, * or NULL to return an array with info about all meta tags. */ @@ -1743,8 +2170,8 @@ function metatag_get_info($type = NULL, $name = NULL) { global $language; if (!isset($info)) { - // hook_metatag_info() includes translated strings, so each language is cached - // separately. + // hook_metatag_info() includes translated strings, so each language is + // cached separately. $cid = 'info:' . $language->language; if ($cache = metatag_cache_get($cid)) { @@ -1784,6 +2211,9 @@ function metatag_get_info($type = NULL, $name = NULL) { } } +/** + * Return instance of metatag. + */ function metatag_get_instance($metatag, array $data = array()) { $info = metatag_get_info('tags', $metatag); if (!empty($info['class']) && class_exists($info['class'])) { @@ -1795,16 +2225,16 @@ function metatag_get_instance($metatag, array $data = array()) { /** * Return the string value of a meta tag. * - * @param $metatag + * @param string $metatag * The meta tag string. - * @param $data + * @param array $data * The array of data for the meta tag class instance. - * @param $options + * @param array $options * An optional array of additional options to pass to the getValue() method * of the meta tag class instance. * - raw: A boolean if TRUE will not perform token replacement. * - * @return + * @return string * A string value. */ function metatag_get_value($metatag, array $data, array $options = array()) { @@ -1812,6 +2242,9 @@ function metatag_get_value($metatag, array $data, array $options = array()) { if ($metatag_instance = metatag_get_instance($metatag, $data)) { $options["instance"] = $metatag; $value = $metatag_instance->getValue($options); + if (is_array($value)) { + $value = implode(', ', $value); + } } return $value; } @@ -1860,31 +2293,95 @@ function metatag_preprocess_maintenance_page(&$variables) { /** * Implements hook_html_head_alter(). + * + * Hide tags added by core that are now handled by metatag. */ function metatag_html_head_alter(&$elements) { - // Remove duplicate link tags if found. - $metatags = metatag_get_info('tags'); - foreach (array_keys($metatags) as $name) { - if (!isset($elements['metatag_' . $name]) || $elements['metatag_' . $name]['#tag'] != 'link') { - // Only check for link tags added by the metatags module. - continue; + $metatags = array(); + $other_tags = array(); + foreach ($elements as $key => $data) { + // Identify meta tags added by the Metatag module. + if (strpos($key, 'metatag_') === 0) { + $metatags[] = $key; } - foreach (array_keys($elements) as $key) { - if (strpos($key, 'drupal_add_html_head_link:' . $name . ':') === 0) { - unset($elements[$key]); + // Identify meta tags added by other modules. + else { + $other_tags[] = $key; + } + } + + // The meta tag keys to look for. + $metatag_keys = array('name', 'property'); + + // Attributes to look for. + $attributes = array('name', 'rel'); + + // Look for meta tags that were added by other modules and hide them. + foreach ($metatags as $metatag_name) { + $metatag = &$elements[$metatag_name]; + + // Setting the #access attribute to these will stop them from being output + // but still leave the tags present for other modules to interact with. + foreach ($other_tags as $other_tag) { + $other = &$elements[$other_tag]; + + // Look for other meta tags that have one of the defined attributes which + // matches one of the values from Metatag's tag. + foreach ($attributes as $attribute) { + if (isset($other['#attributes'], $other['#attributes'][$attribute]) && is_string($other['#attributes'][$attribute])) { + foreach ($metatag_keys as $metatag_key) { + if (isset($metatag[$metatag_key])) { + if (strtolower($other['#attributes'][$attribute]) == $metatag[$metatag_key]) { + $other['#access'] = FALSE; + } + } + } + } } } } - // Remove the default generator meta tag. - unset($elements['system_meta_generator']); + // If the 'leave core tags' option is disabled then the following meta tags + // will be removed if they're provided by core. + if (!variable_get('metatag_leave_core_tags', FALSE)) { + $core_tags = array( + 'generator', + 'canonical', + 'shortlink', + // Leave the shortcut icon, that's more of a theming thing. + // 'shortcut icon',. + ); + foreach ($elements as $name => &$element) { + // Ignore meta tags provided by Metatag. + if (strpos($name, 'metatag_') === 0) { + continue; + } + + // Setting the #access attribute to these will stop them from being output + // but still leave the tags present for other modules to interact with. + foreach ($core_tags as $tag) { + if (!empty($element['#attributes']['rel']) && $element['#attributes']['rel'] == $tag) { + $element['#access'] = FALSE; + } + elseif (!empty($element['#attributes']['name']) && strtolower($element['#attributes']['name']) == $tag) { + $element['#access'] = FALSE; + } + } + } + } } +/** + * Implements hook_get_form(). + */ function metatag_metatag_get_form($metatag, array $data = array(), array $options = array()) { $instance = metatag_get_instance($metatag, $data); return $instance->getForm($options); } +/** + * Returns Instance info if exists otherwise return FALSE. + */ function metatag_config_instance_info($instance = NULL) { global $language; @@ -1945,10 +2442,10 @@ function metatag_filter_values_from_defaults(array &$values, array $defaults = a /** * Return all the parents of a given configuration instance. * - * @param $instance + * @param string $instance * A meta tag configuration instance. * - * @return + * @return array * An array of instances starting with the $instance parameter, with the end * of the array being the global instance. */ @@ -1969,7 +2466,7 @@ function metatag_config_get_parent_instances($instance, $include_global = TRUE) /** * Get the proper label of a configuration instance. * - * @param $instance + * @param string $instance * A meta tag configuration instance. */ function metatag_config_instance_label($instance) { @@ -2058,20 +2555,20 @@ function metatag_config_is_enabled($instance, $include_defaults = FALSE, $includ } /** - * Wrapper around entity_language() to use LANGUAGE_NONE if the entity does not - * have a language assigned. + * Wrapper around entity_language(). * - * @param $entity_type + * @param mixed $entity_type * An entity type's machine name. - * @param $entity - * The entity to review; + * @param object $entity + * The entity to review; will be typecast to an object if an array is passed. * - * @return - * A string indicating the language code to be used. + * @return string + * A string indicating the language code to be used; returns LANGUAGE_NONE if + * the entity does not have a language assigned. */ function metatag_entity_get_language($entity_type, $entity) { - // Determine the entity's language. - $langcode = entity_language($entity_type, $entity); + // Determine the entity's language, af. + $langcode = entity_language($entity_type, (object) $entity); // If no matching language was found, which will happen for e.g. terms and // users, it is normally recommended to use the system default language. @@ -2103,36 +2600,80 @@ function metatag_features_api() { /** * Implements hook_views_post_render(). + * + * Try loading meta tags from a Views page display. */ function metatag_views_post_render(&$view, &$output, &$cache) { + // By default do not add meta tags to admin pages. To enable meta tags on + // admin pages set the 'metatag_tag_admin_pages' variable to TRUE. + if (path_is_admin(current_path()) && !variable_get('metatag_tag_admin_pages', FALSE)) { + return; + } + + // If display is not set for some reason, get out to prevent PHP notices. + if (!isset($view->display[$view->current_display])) { + return; + } + // Build a shortcut to the current display object. $display = $view->display[$view->current_display]; - // Only proceed if this view is a full page, don't process block or other - // Views display objects. - if ($display->display_plugin == 'page' && isset($display->display_options['path'])) { - // Check if this is an entity display page, if so trigger - // hook_entity_view(). - foreach (entity_get_info() as $entity_type => $entity_info) { - // Entity paths will include an auto-loader that matches the entity's - // name, thus the path will be 'some/path/%entity_name'. - if (isset($entity_info['path']) && ($display->display_options['path'] . $entity_type) == $entity_info['path']) { - // Only proceed if this entity type supports meta tags. - if (metatag_entity_supports_metatags($entity_type)) { - // There must be at least one argument and the first argument must be - // numerical. - if (!empty($view->args) && is_numeric($view->args[0])) { - // Only the first argument is used. - $entities = entity_load($entity_type, array($view->args[0])); - // Only if the entity actually exists. - if (!empty($entities)) { - $entity = array_pop($entities); - metatag_entity_view($entity, $entity_type, 'full', NULL, TRUE); - } + // Only proceed if this view is a full page and has a valid path, don't + // process block or other Views display objects. + if ($display->display_plugin == 'page' && !empty($display->display_options['path'])) { + // Try to work out what entity type this is. + $entity_type = ''; + + // All paths must have a placeholder. + $placeholder_pos = strpos($display->display_options['path'], '%'); + if ($placeholder_pos !== FALSE) { + // The first argument must be a numeric entity ID. + if (!empty($view->args) && is_numeric($view->args[0])) { + // The first argument should be an entity ID. + $id = $view->args[0]; + + // Taxonomy terms are the most commonly used item, so check that first. + if ($display->display_options['path'] == 'taxonomy/term/%' || $display->display_options['path'] == 'taxonomy/term/%/%') { + $entity_type = 'taxonomy_term'; + } + // Node pages. + elseif ($display->display_options['path'] == 'node/%') { + $entity_type = 'node'; + } + // User pages. + elseif ($display->display_options['path'] == 'user/%') { + $entity_type = 'user'; + } + } + } + + // Check for other types of entities. + if (empty($entity_type)) { + // Trigger hook_metatag_views_post_render_get_entity(). + $hook = 'metatag_views_post_render_get_entity'; + foreach (module_implements($hook) as $module) { + $function = $module . '_' . $hook; + if (function_exists($function)) { + $entity_type = call_user_func($function, $view); + // If an entity type was identified, stop checking. + if (!empty($entity_type)) { + break; } } } } + + // If an entity type was identified, try loading the entity. + if (!empty($entity_type)) { + // Try loading the requested entity. + $entities = entity_load($entity_type, array($id)); + if (!empty($entities)) { + $entity = array_pop($entities); + + // Trigger our hook_entity_view(). + metatag_entity_view($entity, $entity_type, 'full', NULL, TRUE); + } + } } } @@ -2143,27 +2684,32 @@ function metatag_views_post_render(&$view, &$output, &$cache) { * CTools display handlers. */ function metatag_ctools_render_alter(&$info, $page, $context) { + // By default do not add meta tags to admin pages. To enable meta tags on + // admin pages set the 'metatag_tag_admin_pages' variable to TRUE. + if (path_is_admin(current_path()) && !variable_get('metatag_tag_admin_pages', FALSE)) { + return; + } + // Only proceed if this is a full page (don't process individual panes) and // there's an 'admin path' for the current task. if ($page && !empty($context['task']['admin path'])) { - // Check if this is an entity display page, if so trigger - // hook_entity_view(). - foreach (entity_get_info() as $entity_type => $entity_info) { - // Entity paths will include an auto-loader that matches the entity's - // name, thus the path will be 'some/path/%entity_name'. - if (isset($entity_info['path']) && $context['task']['admin path'] == $entity_info['path']) { - // Only proceed if this entity type supports meta tags. - if (metatag_entity_supports_metatags($entity_type)) { - // There must be at least one argument and the first argument must be - // numerical. - if (!empty($context['args']) && is_numeric($context['args'][0])) { - // We need to pop entity from contexts array. - $first_context = array_pop($context['contexts']); - // Only if the context actually exists, which would be an entity. - if (!empty($first_context->data) && is_object($first_context->data)) { - $langcode = $GLOBALS['language_content']->language; - metatag_entity_view($first_context->data, $entity_type, 'full', $langcode, TRUE); - } + // Loop over each context. + foreach ($context['contexts'] as $context_argument) { + if (is_array($context_argument->type) && !empty($context_argument->data)) { + if (in_array('entity', $context_argument->type)) { + $entity = $context_argument->data; + $entity_type = str_replace('entity:', '', $context_argument->plugin); + + // Verify this is an appropriate entity. + $entity_info = entity_get_info($entity_type); + if (!empty($entity_info) && _metatag_entity_is_page($entity_type, $entity)) { + // Load the meta tags for this entity. + global $language; + metatag_entity_view($entity, $entity_type, 'full', $language->language, TRUE); + + // Don't bother looping over any more contexts, an entity has been + // found. + break; } } } @@ -2171,47 +2717,11 @@ function metatag_ctools_render_alter(&$info, $page, $context) { } } -/** - * Implements hook_entity_translation_delete(). - * - * Required for content translations being handled via Entity_Translation to - * remove the appropriate record when a translation is removed without the - * corresponding entity record also being removed. - */ -function metatag_entity_translation_delete($entity_type, $entity, $langcode) { - // Get the entity's ID. - list($entity_id, $revision_id) = entity_extract_ids($entity_type, $entity); - $revision_id = intval($revision_id); - - // Delete the translation. - metatag_metatags_delete($entity_type, $entity_id, $revision_id, $langcode); -} - -/** - * Translates the metatag if i18n_string is enabled. - * @param $name - * Array or string concatenated with ':' that contains textgroup and string context - * @param string $string - * String in default language or array of strings to be translated - * @param $options - * An associative array of additional options. @see i18n_string_translate() - */ -function metatag_translate($name, $string, $langcode = NULL, $update = FALSE) { - if (function_exists('i18n_string_translate')) { - $options = array( - 'langcode' => $langcode, - 'update' => $update, - ); - return i18n_string_translate($name, $string, $options); - } - else { - return $string; - } -} - /** * Checks if this entity is the default revision (published). * + * Only needed when running Workbench Moderation v1; v3 is skipped. + * * @param object $entity * The entity object, e.g., $node. * @@ -2237,12 +2747,16 @@ function _metatag_isdefaultrevision($entity) { // // Every moderation module saving a forward revision needs to return FALSE. // @todo: Refactor this workaround under D8. - - // Support for Workbench Moderation v1 - if this is a node, check if the - // content type supports moderation. - if (function_exists('workbench_moderation_node_type_moderated') && workbench_moderation_node_type_moderated($entity->type) === TRUE) { - return !empty($entity->workbench_moderation['updating_live_revision']); + // Workbench Moderation v1 uses the hook_node_presave() for some custom logic. + // This was replaced with hook_entity_presave() in v3, so only proceed if the + // old hook implementation is present. + if (function_exists('workbench_moderation_node_presave')) { + // If this is a node, check if the content type supports moderation. + if (function_exists('workbench_moderation_node_type_moderated') && workbench_moderation_node_type_moderated($entity->type) === TRUE) { + return !empty($entity->workbench_moderation['updating_live_revision']); + } } + return FALSE; } @@ -2280,8 +2794,8 @@ function metatag_cache_default_cid_parts(array $cid_parts = array()) { } // Allow each page in a sequence to have different values. - if (isset($_GET['page'])) { - $cid_parts['page'] = $_GET['page']; + if (isset($_GET['page']) && is_numeric($_GET['page'])) { + $cid_parts['page'] = intval($_GET['page']); } // Allow other modules to customize the data using @@ -2291,24 +2805,28 @@ function metatag_cache_default_cid_parts(array $cid_parts = array()) { // Remove empty parts. $cid_parts = array_filter($cid_parts); - // Concatenate the cache ID parts, trim the results to 128 chars. - return substr(implode(':', $cid_parts), 0, 128); + // Concatenate the cache ID parts, trim the results to 255 chars. + return substr(implode(':', $cid_parts), 0, 255); } /** * Wrapper for cache_set. * - * @see cache_set(). + * @see cache_set() */ function metatag_cache_set($cid, $data) { - // Cache the data for later. - return cache_set($cid, $data, 'cache_metatag'); + // By default the cached data will not expire. + $expire = CACHE_PERMANENT; + + // Triggers hook_metatag_cache_set_expire_alter(). + drupal_alter("metatag_cache_set_expire", $expire, $cid, $data); + return cache_set($cid, $data, 'cache_metatag', $expire); } /** * Wrapper for cache_get. * - * @see cache_get(). + * @see cache_get() */ function metatag_cache_get($cid) { // Try to load the object. @@ -2319,6 +2837,7 @@ function metatag_cache_get($cid) { * Determines if we are in an error page and return the appropriate instance. * * @return string + * String of error. */ function metatag_is_error_page() { $known_errors = array( @@ -2335,3 +2854,434 @@ function metatag_is_error_page() { } return ''; } + +/** + * Implements hook_admin_menu_cache_info(). + */ +function metatag_admin_menu_cache_info() { + $caches['metatag'] = array( + 'title' => t('Metatag'), + 'callback' => 'metatag_config_cache_clear', + ); + return $caches; +} + +/** + * Identify whether an entity type is technically capable of having meta tags. + * + * In order to be capable of having meta tags, an entity type must have view + * modes, must be fieldable, and may not be a configuration entity. + * + * @param string $entity_type + * The entity type. + * @param array $entity_info + * Entity information. + * + * @return bool + * Return TRUE if suitable. + */ +function metatag_entity_type_is_suitable($entity_type, $entity_info = array()) { + $suitable = TRUE; + + // If the entity info was not passed along, load it. + if (empty($entity_info)) { + $entity_info = entity_get_info($entity_type); + } + + // Configuration entities may not have meta tags. + if (isset($entity_info['configuration']) && $entity_info['configuration'] == TRUE) { + $suitable = FALSE; + } + + // Entities must have bundles. + elseif (empty($entity_info['bundles'])) { + $suitable = FALSE; + } + + // The entity type must be fieldable. + elseif (empty($entity_info['fieldable'])) { + $suitable = FALSE; + } + + else { + // Ignore some view modes that are automatically added by certain modules. + unset($entity_info['view modes']['ical']); + unset($entity_info['view modes']['diff_standard']); + unset($entity_info['view modes']['token']); + + // There must be view modes. + if (empty($entity_info['view modes'])) { + $suitable = FALSE; + } + + else { + // Specifically disable some entity types. + $excluded = array( + // Comment module. + 'comment', + // Field Collection module. + 'field_collection_item', + // Paragraphs module. + 'paragraphs_item', + ); + if (in_array($entity_type, $excluded)) { + $suitable = FALSE; + } + } + } + + // Trigger hook_metatag_entity_type_is_supported_alter() to allow other + // modules to either enable or disable certain entity types. + drupal_alter('metatag_entity_type_is_supported', $suitable, $entity_type, $entity_info); + + return $suitable; +} + +/** + * Implements hook_node_type_insert(). + * + * When a content type is created, enable it for use with Metatag. + */ +function metatag_node_type_insert($info) { + if (metatag_entity_supports_metatags('node')) { + if (metatag_entity_type_enable('node', $info->type)) { + drupal_set_message(t('Metatag support has been enabled for the @label content type.', array('@label' => $info->name))); + } + } +} + +/** + * Implements hook_node_type_delete(). + * + * When a content type is deleted, remove the corresponding Metatag variable. + */ +function metatag_node_type_delete($info) { + variable_del('metatag_enable_node__' . $info->type); +} + +/** + * Implements hook_taxonomy_vocabulary_insert(). + * + * When a vocabulary is created, enable it for use with Metatag. + */ +function metatag_taxonomy_vocabulary_insert($vocabulary) { + if (metatag_entity_supports_metatags('taxonomy_term')) { + if (metatag_entity_type_enable('taxonomy_term', $vocabulary->machine_name)) { + drupal_set_message(t('Metatag support has been enabled for the @label vocabulary.', array('@label' => $vocabulary->name))); + } + } +} + +/** + * Implements hook_taxonomy_vocabulary_delete(). + * + * When a vocabulary is deleted, remove the corresponding Metatag variable. + */ +function metatag_taxonomy_vocabulary_delete($info) { + variable_del('metatag_enable_taxonomy_term__' . $info->machine_name); +} + +/** + * Implements hook_workbench_moderation_transition(). + * + * Clear a node's caches when its Workbench Moderation state is changed. + */ +function metatag_workbench_moderation_transition($node, $previous_state, $new_state) { + metatag_metatags_cache_clear('node', array($node->nid)); +} + +/** + * Sort callback for sorting by metatag instance string values. + */ +function _metatag_config_instance_sort($a, $b) { + $a_contexts = explode(':', $a); + $b_contexts = explode(':', $b); + + // Global config always comes first. + if ($a_contexts[0] == 'global' && $b_contexts[0] != 'global') { + return -1; + } + elseif ($b_contexts[0] == 'global' && $a_contexts[0] != 'global') { + return 1; + } + + for ($i = 0; $i < max(count($a_contexts), count($b_contexts)); $i++) { + $a_context = isset($a_contexts[$i]) ? $a_contexts[$i] : ''; + $b_context = isset($b_contexts[$i]) ? $b_contexts[$i] : ''; + if ($a_context == $b_context) { + continue; + } + else { + return strcmp($a_context, $b_context); + } + } +} + +/** + * Translations & internationalization (i18n). + */ + +/** + * Implements hook_entity_translation_delete(). + * + * Required for content translations being handled via Entity_Translation to + * remove the appropriate record when a translation is removed without the + * corresponding entity record also being removed. + */ +function metatag_entity_translation_delete($entity_type, $entity, $langcode) { + // Get the entity's ID. + list($entity_id, $revision_id) = entity_extract_ids($entity_type, $entity); + $revision_id = intval($revision_id); + + // Delete the translation. + metatag_metatags_delete($entity_type, $entity_id, $revision_id, $langcode); +} + +/** + * Translates the metatag if i18n_string integration is enabled. + * + * @param string $string + * String in default language or array of strings to be translated. + * @param string $tag_name + * The internal name of the meta tag being translated. + * @param mixed $context + * A context string to use with i18n, or the $options array from a Metatag:: + * getValue() method; if the latter it will be used to generate the full + * context. + * @param string $langcode + * The language code to submit instead of the current page's language. + * @param bool $update + * Whether or not to create/update records in {locales_source}. + * + * @return string + * The translated string if i18n_string is enabled, otherwise just returns the + * original string. + * + * @see i18n_string_translate() + */ +function metatag_translate_metatag($string, $tag_name, $context, $langcode = NULL, $update = TRUE) { + if (module_exists('i18n_string') && !variable_get('metatag_i18n_disabled', FALSE)) { + // By default do not add meta tags to admin pages. To enable meta tags on + // admin pages set the 'metatag_tag_admin_pages' variable to TRUE. + static $page_is_admin; + if (is_null($page_is_admin)) { + $page_is_admin = FALSE; + if (path_is_admin(current_path()) && !variable_get('metatag_tag_admin_pages', FALSE)) { + $page_is_admin = TRUE; + } + } + if ($page_is_admin) { + return $string; + } + + // If the context is an array then it is the $options from the meta tag + // generator and needs some custom tailoring. Doing it this way to avoid an + // unnecessary entity_extract_ids() call when i18n isn't being used. + if (is_array($context)) { + // Optionally disable output generation. + if (!variable_get('metatag_i18n_translate_output', FALSE)) { + return $string; + } + + // Output generation was enabled, so continue as normal. + $new_context = 'output:'; + if (drupal_is_front_page()) { + $new_context .= 'frontpage'; + } + // If this is an entity page, use the entity as the context. + elseif (!empty($context['entity_type']) && !empty($context['entity'])) { + list($entity_id, $revision_id, $bundle) = entity_extract_ids($context['entity_type'], $context['entity']); + $new_context .= $context['entity_type'] . ':' . $entity_id; + } + // Otherwise, use the page URL. + else { + // Trim this to avoid SQL errors on the {locales_source} table. + // length = 255 - strlen('metatag:output:page:') - strlen(metatag); + $strlen = 255 - strlen('metatag:output:page:' . $tag_name); + $new_context .= 'page:' . drupal_substr(current_path(), 0, $strlen); + } + $context = $new_context; + } + + $options = array( + // Automatically create/update the {locales_source} record if one wasn't + // found. + 'update' => $update, + // Translate the string. + 'translate' => TRUE, + ); + + // If the langcode was passed in, add it to the options passed to i18n. + if (!empty($langcode)) { + $options['langcode'] = $langcode; + } + + // By default disable the watchdog logging of translation messages. + $options['watchdog'] = variable_get('metatag_i18n_enable_watchdog', FALSE); + + // Triggers hook_metatag_i18n_context_alter() - allows the i18n string to + // be altered before being used. + drupal_alter('metatag_i18n_context', $context, $tag_name); + + // If the context was erased just send back the original string - it's + // unlikely, but it could happen. + if (empty($context)) { + return $string; + } + + // The 'name' is split up by i18n_string into two components - the textgroup + // is the first item, the others are joined together with a ':' separator + // to make the context. In order to have the contexts show with "metatag" as + // the first part of the context, it has to be added twice to the name. + $name = array( + 'metatag', + $context, + $tag_name, + ); + + // Notify i18n of the string, and obtain a translation if one is available. + return i18n_string($name, $string, $options); + } + + // If the i18n_string module isn't enabled then just pass back the string + // as-is. + else { + return $string; + } +} + +/** + * Translate a set of metatags to the current language. + * + * @param array $metatags + * List of meta tags to be translated. + * @param string $context + * An optional context to use with i18n. + * @param string $langcode + * The language code to submit instead of the current page's language. + * @param bool $update + * Whether or not to create/update records in {locales_source}. + */ +function metatag_translate_metatags(&$metatags, $context = NULL, $langcode = NULL, $update = TRUE) { + if (!empty($metatags)) { + foreach ($metatags as $key => $data) { + if (!empty($data['value']) && is_string($data['value'])) { + $metatags[$key] = array( + 'value' => metatag_translate_metatag($data['value'], $key, $context, $langcode, $update), + ); + } + } + } +} + +/** + * Update the translated definitions of meta tags. + * + * @param array $metatags + * List of meta tags to have their translations updated. + * @param string $context + * The string that will be used to group strings in the translation UI. + */ +function metatag_translations_update($metatags, $context) { + // Store the context as it was originally provided. + $original_context = $context; + + // Update the i18n string. + if (module_exists('i18n_string') && !variable_get('metatag_i18n_disabled', FALSE)) { + $options = array(); + + // By default disable the watchdog logging of translation messages. + $options['watchdog'] = variable_get('metatag_i18n_enable_watchdog', FALSE); + + foreach ($metatags as $tag_name => $data) { + // Revert the context, so that it can be changed if needed. + $context = $original_context; + + if (!empty($data['value']) && is_string($data['value'])) { + // Triggers hook_metatag_i18n_context_alter() - allows the i18n string + // to be altered before being used. + drupal_alter('metatag_i18n_context', $context, $tag_name); + + // Don't do anything if the context was erased - it's unlikely, but it + // could happen. + if (empty($context)) { + continue; + } + + // The textgroup is the first part of the string. + i18n_string_update("metatag:{$context}:{$tag_name}", $data['value'], $options); + } + } + } +} + +/** + * Remove the translated definitions of meta tags. + * + * @param array $metatags + * List of meta tags to have their translations updated. + * @param string $context + * The string that will be used to group strings in the translation UI. + */ +function metatag_translations_delete($metatags, $context) { + // Store the context as it was originally provided. + $original_context = $context; + + // Update the i18n string. + if (module_exists('i18n_string') && !variable_get('metatag_i18n_disabled', FALSE)) { + $options = array(); + + // By default disable the watchdog logging of translation messages. + $options['watchdog'] = variable_get('metatag_i18n_enable_watchdog', FALSE); + + foreach ($metatags as $tag_name => $data) { + // Revert the context, so that it can be changed if needed. + $context = $original_context; + + if (!empty($data['value']) && is_string($data['value'])) { + // Triggers hook_metatag_i18n_context_alter() - allows the i18n string + // to be altered before being used. + drupal_alter('metatag_i18n_context', $context, $tag_name); + + // Don't do anything if the context was erased - it's unlikely, but it + // could happen. + if (empty($context)) { + continue; + } + + // The textgroup is the first part of the string. + i18n_string_remove("metatag:{$context}:{$tag_name}", $data['value'], $options); + } + } + } +} + +/** + * Implements hook_config_insert(). + * + * Implements hook_metatag_config_insert() on behalf of i18n_string. + */ +function i18n_string_metatag_config_insert($config) { + $context = 'metatag_config:' . $config->instance; + metatag_translations_update($config->config, $context); +} + +/** + * Implements hook_config_update(). + * + * Implements hook_metatag_config_update() on behalf of i18n_string. + */ +function i18n_string_metatag_config_update($config) { + // Defer to the 'insert' function. + i18n_string_metatag_config_insert($config); +} + +/** + * Implements hook_config_delete(). + * + * Implements hook_metatag_config_delete() on behalf of i18n_string. + */ +function i18n_string_metatag_config_delete($config) { + $context = 'metatag_config:' . $config->instance; + metatag_translations_delete($config->config, $context); +} diff --git a/sites/all/modules/contrib/seo/metatag/metatag.search_api.inc b/sites/all/modules/contrib/seo/metatag/metatag.search_api.inc new file mode 100644 index 0000000..91c8546 --- /dev/null +++ b/sites/all/modules/contrib/seo/metatag/metatag.search_api.inc @@ -0,0 +1,85 @@ + array( + 'name' => t('Meta tags'), + 'description' => t("Adds the item's meta tags to the indexed data."), + 'class' => 'MetatagSearchAlterCallback', + ), + ); +} + +/** + * Only add the class if Search API is installed. + */ +if (class_exists('SearchApiAbstractAlterCallback')) { + + /** + * Adds meta tag values to the indexed items. + */ + class MetatagSearchAlterCallback extends SearchApiAbstractAlterCallback { + + /** + * {@inheritdoc} + */ + public function supportsIndex(SearchApiIndex $index) { + // Only works on entities. + return (bool) $index->getEntityType(); + } + + /** + * {@inheritdoc} + */ + public function alterItems(array &$items) { + $entity_type = $this->index->getEntityType(); + $tags = metatag_get_info('tags'); + foreach ($items as $id => $item) { + foreach (array_keys($tags) as $tag) { + $items[$id]->{'metatag_' . $tag} = NULL; + if (isset($item->language) && isset($item->metatags[$item->language][$tag])) { + $instance = metatag_get_instance($tag, $item->metatags[$item->language][$tag]); + $items[$id]->{'metatag_' . $tag} = $instance->getValue(array('token data' => array($entity_type => $item))); + } + } + } + } + + /** + * {@inheritdoc} + */ + public function propertyInfo() { + $properties = array(); + + // Get available meta tags. + $tags = metatag_get_info('tags'); + foreach ($tags as $id => $tag) { + switch ($tag['class']) { + case 'DrupalLinkMetaTag': + $type = 'uri'; + break; + + default: + $type = 'text'; + break; + } + $properties['metatag_' . $id] = array( + 'label' => t('Meta tag: @label', array('@label' => $tag['label'])), + 'description' => t('@label meta tag attached to an item.', array('@label' => $tag['label'])), + 'type' => $type, + ); + } + + return $properties; + } + + } +} diff --git a/sites/all/modules/contrib/seo/metatag/metatag.test b/sites/all/modules/contrib/seo/metatag/metatag.test deleted file mode 100644 index 6baebba..0000000 --- a/sites/all/modules/contrib/seo/metatag/metatag.test +++ /dev/null @@ -1,390 +0,0 @@ - 'Metatag tests for nodes', - 'description' => 'Test Metatag edit functionality for nodes.', - 'group' => 'Metatag', - ); - } - - /** - * {@inheritdoc} - */ - function setUp(array $modules = array()) { - $modules = array( - 'metatag_dc', - 'metatag_facebook', - 'metatag_google_plus', - 'metatag_opengraph', - 'metatag_twitter_cards', - ); - parent::setUp($modules); - } - - /** - * Tests filtering of values using metatag_filter_values_from_defaults(). - */ - public function testMetatagFilterValuesFromDefaults() { - // Create a content type. - $this->drupalCreateContentType(array( - 'type' => 'metatag_test', - 'name' => 'Test', - )); - - // Create an admin-level user. - $this->adminUser = $this->drupalCreateUser(array( - 'administer meta tags', - 'edit meta tags', - 'create metatag_test content', - 'delete any metatag_test content', - 'edit any metatag_test content', - )); - $this->drupalLogin($this->adminUser); - - // Assign default values for the new content type. - $this->drupalGet('admin/config/search/metatags/config/add'); - $this->drupalPost(NULL, array( - 'instance' => 'node:metatag_test', - ), t('Add and configure')); - $this->drupalPost(NULL, array( - 'metatags[und][dcterms.title][value]' => '[node:title]', - 'metatags[und][dcterms.creator][value]' => '[node:author]', - 'metatags[und][dcterms.date][value]' => '[node:created:custom:Y-m-d\TH:iP]', - 'metatags[und][dcterms.format][value]' => 'text/html', - 'metatags[und][dcterms.identifier][value]' => '[current-page:url:absolute]', - 'metatags[und][dcterms.language][value]' => '[node:language]', - ), t('Save')); - - // Create a test node. - $this->drupalGet('node/add/metatag-test'); - $this->drupalPost(NULL, array( - 'metatags[und][dcterms.title][value]' => '[node:title] ponies', - 'title' => 'Who likes magic', - ), t('Save')); - - // Verify that the node saved correctly. - $xpath = $this->xpath("//h1"); - $t_args = array('@type' => 'Test', '%title' => 'Who likes magic'); - $this->assertText(strip_tags(t('@type %title has been created.', $t_args))); - // This doesn't work for some reason, it seems the HTML is stripped off - // during output so the %title's standard Drupal wrappers don't match. - // $this->assertText(t('@type %title has been created.', $t_args)); - - // Verify the node data saved correctly. - $matches = array(); - if (preg_match('@node/(\d+)$@', $this->getUrl(), $matches)) { - $nid = end($matches); - $node = node_load($nid); - // Only the non-default values are stored. - $expected = array( - 'und' => array( - 'dcterms.title' => array( - 'value' => '[node:title] ponies', - ), - ), - ); - $this->assertEqual($expected, $node->metatags); - } - else { - $this->fail(t('Could not determine node ID for created node.')); - } - - // Verify the title is using the custom default for this content type. - $xpath = $this->xpath("//meta[@name='dcterms.title']"); - $this->assertEqual(count($xpath), 1); - $this->assertEqual($xpath[0]['content'], "Who likes magic ponies"); - } -} - -class MetaTagsUnitTest extends MetaTagsTestHelper { - public static function getInfo() { - return array( - 'name' => 'Metatag unit tests', - 'description' => 'Test basic meta tag functionality.', - 'group' => 'Metatag', - ); - } - - /** - * Test the metatag_config_load_with_defaults() function. - */ - public function testConfigLoadDefaults() { - $defaults = metatag_config_load_with_defaults('test:foo'); - $this->assertEqual($defaults, array( - // Basic meta tags. - 'title' => array('value' => 'Test altered title'), - 'description' => array('value' => 'Test foo description'), - 'abstract' => array('value' => 'Test foo abstract'), - // 'keywords' => array('value' => ''), - - // Advanced meta tags. - // 'robots' => array('value' => ''), - // 'news_keywords' => array('value' => ''), - // 'standout' => array('value' => ''), - // 'robots' => array('value' => ''), - // 'standout' => array('value' => ''), - 'generator' => array('value' => 'Drupal 7 (http://drupal.org)'), - // 'standout' => array('value' => ''), - // 'image_src' => array('value' => ''), - 'canonical' => array('value' => '[current-page:url:absolute]'), - 'shortlink' => array('value' => '[current-page:url:unaliased]'), - // 'publisher' => array('value' => ''), - // 'author' => array('value' => ''), - // 'original-source' => array('value' => ''), - // 'revisit-after' => array('value' => ''), - // 'content-language' => array('value' => ''), - - // Fake meta tag. - 'test:foo' => array('value' => 'foobar'), - )); - } - - public function testEntitySupport() { - $test_cases[1] = array('type' => 'node', 'bundle' => 'article', 'expected' => TRUE); - $test_cases[2] = array('type' => 'node', 'bundle' => 'page', 'expected' => TRUE); - $test_cases[3] = array('type' => 'node', 'bundle' => 'invalid-bundle', 'expected' => FALSE); - $test_cases[4] = array('type' => 'user', 'expected' => TRUE); - $test_cases[5] = array('type' => 'taxonomy_term', 'bundle' => 'tags', 'expected' => TRUE); - $test_cases[6] = array('type' => 'taxonomy_term', 'bundle' => 'invalid-bundle', 'expected' => FALSE); - foreach ($test_cases as $test_case) { - $test_case += array('bundle' => NULL); - $this->assertMetatagEntityHasMetatags($test_case['type'], $test_case['bundle'], $test_case['expected']); - } - - variable_set('metatag_test_entity_info_disable', TRUE); - drupal_static_reset('metatag_entity_has_metatags'); - drupal_static_reset('metatag_entity_supports_metatags'); - entity_info_cache_clear(); - - $test_cases[2]['expected'] = FALSE; - $test_cases[4]['expected'] = FALSE; - $test_cases[6]['expected'] = FALSE; - foreach ($test_cases as $test_case) { - $test_case += array('bundle' => NULL); - $this->assertMetatagEntityHasMetatags($test_case['type'], $test_case['bundle'], $test_case['expected']); - } - } - - function assertMetatagEntityHasMetatags($entity_type, $bundle, $expected) { - $entity = entity_create_stub_entity($entity_type, array(0, NULL, $bundle)); - return $this->assertEqual( - metatag_entity_has_metatags($entity_type, $entity), - $expected, - t("metatag_entity_has_metatags(:type, :entity) is :expected", array( - ':type' => var_export($entity_type, TRUE), - ':entity' => var_export($entity, TRUE), - ':expected' => var_export($expected, TRUE), - )) - ); - } - - /** - * Test the metatag_config_instance_label() function. - */ - public function testConfigLabels() { - $test_cases = array( - 'node' => 'Node', - 'node:article' => 'Node: Article', - 'node:article:c' => 'Node: Article: Unknown (c)', - 'node:b' => 'Node: Unknown (b)', - 'node:b:c' => 'Node: Unknown (b): Unknown (c)', - 'a' => 'Unknown (a)', - 'a:b' => 'Unknown (a): Unknown (b)', - 'a:b:c' => 'Unknown (a): Unknown (b): Unknown (c)', - 'a:b:c:d' => 'Unknown (a): Unknown (b): Unknown (c): Unknown (d)', - ); - - foreach ($test_cases as $input => $expected_output) { - drupal_static_reset('metatag_config_instance_label'); - $actual_output = metatag_config_instance_label($input); - $this->assertEqual($actual_output, $expected_output); - } - } -} - - -// TODO: Test each meta tag. -// TODO: Scenarios. -// -// 1. Node -// * No language assignment. -// * First save. -// -// 2. Node -// * No language assignment. -// * Edit existing revision. -// -// 3. Node -// * No language assignment. -// * Create new revision. -// * Publish new revision. -// -// 4. Node -// * No language assignment. -// * Create new revision. -// * Delete new revision. -// -// 5. Node + Translation -// * No language assignment -// * Change language assignment. -// * Edit existing revision. -// -// 6. Node + Translation -// * No language assignment -// * Change language assignment. -// * Create new revision. -// * Publish new revision. -// -// 7. Node + Translation -// * No language assignment -// * Change language assignment. -// * Create new revision. -// * Delete new revision. -// -// 8. Node + Translation -// * Initial language assignment -// -// 9. Node + Translation -// * Initial language assignment -// * Create new revision. -// * Publish new revision. -// -// 10. Node + Translation -// * Initial language assignment -// * Create new revision. -// * Delete new revision. -// -// 11. Node + Translation -// * Initial language assignment -// * Change language assignment. -// * Create new revision. -// * Publish new revision. -// -// 12. Node + Translation -// * Initial language assignment -// * Change language assignment. -// * Create new revision. -// * Delete new revision. -// -// 13. Node + Translation -// * Initial language assignment -// * Create translated node. -// -// 14. Node + Translation -// * Initial language assignment -// * Create new revision. -// * Publish new revision. -// * Create translated node. -// -// 15. Node + Translation -// * Initial language assignment -// * Create new revision. -// * Publish new revision. -// * Create translated node. -// * Delete translated node. -// -// 16. Node + Translation -// * Initial language assignment -// * Create translated node. -// * Delete original node. -// -// 17. Node + Translation -// * Initial language assignment -// * Create new revision. -// * Publish new revision. -// * Create translated node. -// * Delete original node. -// -// 18. Node + entity_translation -// * Initial language assignment -// * Create translated node. -// -// 19. Node + entity_translation -// * Initial language assignment -// * Create translated node. -// * Delete original. -// -// 20. Node + entity_translation -// * Initial language assignment -// * Create translated node. -// * Create new revision. -// * Publish new revision. -// -// 21. Node + entity_translation -// * Initial language assignment -// * Create translated node. -// * Create new revision. -// * Publish new revision. -// * Delete new revision. -// -// 22. Node + entity_translation -// * Initial language assignment -// * Create translated node. -// * Create new revision. -// * Publish new revision. -// * Delete original. -// -// 23. Node + entity_translation -// * Initial language assignment -// * Create translated node. -// * Create new revision. -// * Publish new revision. -// * Delete original. -// -// 24. Node + entity_translation -// * Initial language assignment -// * Create new revision. -// * Publish new revision. -// * Create translated node. -// -// 25. Node + entity_translation -// * Initial language assignment -// * Create new revision. -// * Publish new revision. -// * Create translated node. -// * Delete new revision. -// -// -// 30. Node + i18n -// -// -// 50. Term -// * Create term. -// -// 51. Term -// * Create term. -// * Change values. -// -// -// 60. User -// * Create user. -// -// 61. User -// * Create user. -// * Change values. -// -// -// 70. Custom path -// * Defaults loaded. diff --git a/sites/all/modules/contrib/seo/metatag/metatag.tokens.inc b/sites/all/modules/contrib/seo/metatag/metatag.tokens.inc index 498bdf1..80310c3 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.tokens.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag.tokens.inc @@ -1,4 +1,5 @@ $value['label'], - 'description' => $value['description'] + 'name' => $label, + 'description' => isset($value['description']) ? $value['description'] : '', ); } if (module_exists('taxonomy')) { $info['tokens']['term']['metatag'] = array( - 'name' => t('Metatag.'), - 'description' => t('Metatag.'), - 'type' => 'metatag' + 'name' => t('Meta tags'), + 'description' => t('Meta tags for this taxonomy term.'), + 'type' => 'metatag', ); } if (module_exists('node')) { $info['tokens']['node']['metatag'] = array( - 'name' => t('Metatag.'), - 'description' => t('Metatag.'), - 'type' => 'metatag' + 'name' => t('Meta tags'), + 'description' => t('Meta tags for this node.'), + 'type' => 'metatag', ); } + if (module_exists('user')) { + $info['tokens']['user']['metatag'] = array( + 'name' => t('Meta tags'), + 'description' => t('Meta tags for this user.'), + 'type' => 'metatag', + ); + } + + // A custom pager. + $pager = variable_get('metatag_pager_string', 'Page PAGER | '); + $page = str_replace('PAGER', 12, $pager); + $info['tokens']['current-page']['pager'] = array( + 'name' => t('Custom pager'), + 'description' => t('A custom pager (from the Metatag module). Currently set to "@pager" which would be output as e.g. "@page".', array('@pager' => $pager, '@page' => $page)), + ); + return $info; } @@ -55,7 +78,7 @@ function metatag_tokens($type, $tokens, array $data = array(), array $options = if ($type == 'metatag' && !empty($data['metatag'])) { $metatag = $data['metatag']; foreach ($tokens as $name => $original) { - if(isset($metatag[$name])){ + if (isset($metatag[$name])) { $replacements[$original] = $sanitize ? filter_xss($metatag[$name]) : $metatag[$name]; } } @@ -81,6 +104,30 @@ function metatag_tokens($type, $tokens, array $data = array(), array $options = } } + // User tokens. + if ($type == 'user' && !empty($data['user'])) { + $account = $data['user']; + + if ($metatag_tokens = token_find_with_prefix($tokens, 'metatag')) { + $result = metatag_token_generate_array($account, 'user', 'user'); + $replacements += token_generate('metatag', $metatag_tokens, array('metatag' => $result), $options); + } + } + + // Custom pager. + if ($type == 'current-page') { + foreach ($tokens as $name => $original) { + switch ($name) { + case 'pager': + $pager = metatag_get_current_pager(); + if (!empty($pager)) { + $replacements[$original] = $pager; + } + break; + } + } + } + return $replacements; } @@ -91,7 +138,7 @@ function metatag_token_generate_array($entity, $entity_type, $bundle) { if (metatag_entity_supports_metatags($entity_type, $bundle)) { $token_type = token_get_entity_mapping('entity', $entity_type); - $instance = "{$entity_type}:{$bundle}"; + $instance = metatag_get_entity_metatags_instance($entity, $entity_type, $bundle); $options = array(); $options['token data'][$token_type] = $entity; $options['entity'] = $entity; @@ -133,18 +180,29 @@ function metatag_token_generate_array($entity, $entity_type, $bundle) { */ function _metatag_token_process_metatag($metatags, $token_type) { foreach ($metatags as $metatag => $data) { + // Skip values that are not strings. + if (!is_string($data['value'])) { + continue; + } + // Explode all metatag token in field. $data_tokens = token_scan($data['value']); if (isset($data_tokens[$token_type])) { - foreach($data_tokens[$token_type] as $key => $value) { + foreach ($data_tokens[$token_type] as $key => $value) { $metatag_parts = explode(':', $key); // Check entity metatag token. Like [For best use, it may be worthwhile to add the [current-page:pager] to the page title to the left of the site name, to the start of description tags, etc.', array(), $options), + 'default' => 'Page PAGER | ', + 'group' => 'metatag', + 'localize' => TRUE, + 'multidomain' => TRUE, + ); + + $info = metatag_get_info(); + $groups = $info['groups']; + $tags = $info['tags']; + foreach ($tags as $tag => $info) { + if (isset($info['maxlength'])) { + $default = $info['maxlength']; + $var_name = 'metatag_maxlength_' . $tag; + $title = $info['label']; + if (!empty($info['group']) && isset($groups[$info['group']])) { + $title = $groups[$info['group']]['label'] . ': ' . $title; + } + $variables[$var_name] = array( + 'title' => t('Maximum length for @tag', array('@tag' => $title), $options), + 'type' => 'string', + 'description' => t('Controls the maximum length of the @tag meta tag, values longer than this will be truncated. If set to "0" the maximum length will be ignored.', array('@tag' => $title), $options), + 'default' => intval(variable_get($var_name, $default)), + 'group' => 'metatag', + 'localize' => TRUE, + 'multidomain' => TRUE, + ); + } + } + + return $variables; +} + +/** + * Implements hook_variable_group_info(). + */ +function metatag_variable_group_info() { + $groups['metatag'] = array( + 'title' => t('Metatag'), + 'description' => t('Configure meta tags on your website.'), + 'access' => 'administer meta tags', + 'path' => array('admin/config/search/metatags/settings'), + ); + + return $groups; +} diff --git a/sites/all/modules/contrib/seo/metatag/metatag.vertical-tabs.js b/sites/all/modules/contrib/seo/metatag/metatag.vertical-tabs.js index 242cf61..d14f375 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag.vertical-tabs.js +++ b/sites/all/modules/contrib/seo/metatag/metatag.vertical-tabs.js @@ -6,52 +6,53 @@ (function ($) { 'use strict'; -Drupal.behaviors.metatagFieldsetSummaries = { - attach: function (context) { - $('fieldset.metatags-form', context).drupalSetSummary(function (context) { - var vals = []; - $("input[type='text'], select, textarea", context).each(function() { - var input_field = $(this).attr('name'); - // Verify the field exists before proceeding. - if (input_field === undefined) { - return false; + Drupal.behaviors.metatagFieldsetSummaries = { + attach: function (context) { + $('fieldset.metatags-form', context).drupalSetSummary(function (context) { + var vals = []; + $("input[type='text'], select, textarea", context).each(function() { + var input_field = $(this).attr('name'); + // Verify the field exists before proceeding. + if (input_field === undefined) { + return false; + } + var default_name = input_field.replace(/\[value\]/, '[default]'); + var default_value = $("input[type='hidden'][name='" + default_name + "']", context); + if (default_value.length && default_value.val() === $(this).val()) { + // Meta tag has a default value and form value matches default + // value. + return true; + } + else if (!default_value.length && !$(this).val().length) { + // Meta tag has no default value and form value is empty. + return true; + } + var label = $("label[for='" + $(this).attr('id') + "']").text(); + vals.push(Drupal.t('@label: @value', { + '@label': $.trim(label), + '@value': Drupal.truncate($(this).val(), 25) || Drupal.t('None') + })); + }); + if (vals.length === 0) { + return Drupal.t('Using defaults'); } - var default_name = input_field.replace(/\[value\]/, '[default]'); - var default_value = $("input[type='hidden'][name='" + default_name + "']", context); - if (default_value.length && default_value.val() === $(this).val()) { - // Meta tag has a default value and form value matches default value. - return true; + else { + return vals.join('
'); } - else if (!default_value.length && !$(this).val().length) { - // Meta tag has no default value and form value is empty. - return true; - } - var label = $("label[for='" + $(this).attr('id') + "']").text(); - vals.push(Drupal.t('@label: @value', { - '@label': $.trim(label), - '@value': Drupal.truncate($(this).val(), 25) || Drupal.t('None') - })); }); - if (vals.length === 0) { - return Drupal.t('Using defaults'); - } - else { - return vals.join('
'); - } - }); - } -}; + } + }; -/** - * Encode special characters in a plain-text string for display as HTML. - */ -Drupal.truncate = function (str, limit) { - if (str.length > limit) { - return str.substr(0, limit) + '...'; - } - else { - return str; - } -}; + /** + * Encode special characters in a plain-text string for display as HTML. + */ + Drupal.truncate = function (str, limit) { + if (str.length > limit) { + return str.substr(0, limit) + '...'; + } + else { + return str; + } + }; })(jQuery); diff --git a/sites/all/modules/contrib/seo/metatag/metatag_app_links/metatag_app_links.info b/sites/all/modules/contrib/seo/metatag/metatag_app_links/metatag_app_links.info index 06703d0..d30bc86 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag_app_links/metatag_app_links.info +++ b/sites/all/modules/contrib/seo/metatag/metatag_app_links/metatag_app_links.info @@ -2,11 +2,14 @@ name = Metatag: App Links description = "Provides support for applinks.org meta tags." package = SEO core = 7.x -dependencies[] = metatag +dependencies[] = metatag:metatag -; Information added by Drupal.org packaging script on 2015-05-01 -version = "7.x-1.5-beta1+22-dev" +; Tests. +files[] = tests/metatag_app_links.test +files[] = tests/metatag_app_links.tags.test + +; Information added by Drupal.org packaging script on 2018-04-04 +version = "7.x-1.25" core = "7.x" project = "metatag" -datestamp = "1430441289" - +datestamp = "1522849089" diff --git a/sites/all/modules/contrib/seo/metatag/metatag_app_links/metatag_app_links.metatag.inc b/sites/all/modules/contrib/seo/metatag/metatag_app_links/metatag_app_links.metatag.inc index bec3591..8f1a4cb 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag_app_links/metatag_app_links.metatag.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag_app_links/metatag_app_links.metatag.inc @@ -1,4 +1,5 @@ t('App Links'), - 'description' => t('Meta tags used to expose App Links for app deep linking. See applinks.org for details and documentation.', array('@url' => 'http://applinks.org')), + 'description' => t('Meta tags used to expose app Links for app deep linking. See applinks.org for details and documentation.', array('@url' => 'http://applinks.org')), 'form' => array( '#weight' => 90, ), @@ -29,122 +30,122 @@ function metatag_app_links_metatag_info() { $weight = 80; $info['tags']['al:android:package'] = array( - 'label' => t('Android App Package ID'), - 'description' => t('A fully-qualified package name for intent generation. This attribute is required by the App Links specification.'), + 'label' => t('Android app package ID'), + 'description' => t('A fully-qualified package name for intent generation. This attribute is required by the app Links specification.'), 'weight' => ++$weight, ) + $defaults; $info['tags']['al:android:url'] = array( - 'label' => t('Android App URL scheme'), + 'label' => t('Android app URL scheme'), 'description' => t('A custom scheme for the Android app.'), ) + $defaults; $info['tags']['al:android:class'] = array( - 'label' => t('Android App Activity Class'), + 'label' => t('Android app Activity Class'), 'description' => t('A fully-qualified Activity class name for intent generation.'), ) + $defaults; $info['tags']['al:android:app_name'] = array( - 'label' => t('Android App Name'), + 'label' => t('Android app name'), 'description' => t('The name of the app (suitable for display)'), ) + $defaults; $info['tags']['al:ios:url'] = array( - 'label' => t('iOS App URL scheme'), - 'description' => t('A custom scheme for the iOS app. This attribute is required by the App Links specification.'), + 'label' => t('iOS app URL scheme'), + 'description' => t('A custom scheme for the iOS app. This attribute is required by the app Links specification.'), ) + $defaults; $info['tags']['al:ios:app_store_id'] = array( - 'label' => t('iOS App Store ID'), - 'description' => t('The app ID for the App Store.'), + 'label' => t('iOS app store ID'), + 'description' => t('The app ID for the app Store.'), 'devel_generate' => array( 'type' => 'integer', ), ) + $defaults; $info['tags']['al:ios:app_name'] = array( - 'label' => t('iOS App Name'), + 'label' => t('iOS app name'), 'description' => t('The name of the app (suitable for display)'), ) + $defaults; $info['tags']['al:ipad:url'] = array( - 'label' => t('iPad App URL scheme'), - 'description' => t('A custom scheme for the iPad app. This attribute is required by the App Links specification.'), + 'label' => t('iPad app URL scheme'), + 'description' => t('A custom scheme for the iPad app. This attribute is required by the app Links specification.'), ) + $defaults; $info['tags']['al:ipad:app_store_id'] = array( - 'label' => t('iPad App Store ID'), - 'description' => t('The app ID for the App Store.'), + 'label' => t('iPad app store ID'), + 'description' => t('The app ID for the app Store.'), 'devel_generate' => array( 'type' => 'integer', ), ) + $defaults; $info['tags']['al:ipad:app_name'] = array( - 'label' => t('iPad App Name'), + 'label' => t('iPad app name'), 'description' => t('The name of the app (suitable for display)'), ) + $defaults; $info['tags']['al:iphone:url'] = array( - 'label' => t('iPhone App URL'), - 'description' => t('A custom scheme for the iPhone app. This attribute is required by the App Links specification.'), + 'label' => t('iPhone app URL'), + 'description' => t('A custom scheme for the iPhone app. This attribute is required by the app Links specification.'), ) + $defaults; $info['tags']['al:iphone:app_store_id'] = array( - 'label' => t('iPhone App Store ID'), - 'description' => t('The app ID for the App Store.'), + 'label' => t('iPhone app store ID'), + 'description' => t('The app ID for the app Store.'), 'devel_generate' => array( 'type' => 'integer', ), ) + $defaults; $info['tags']['al:iphone:app_name'] = array( - 'label' => t('iPhone App Name'), + 'label' => t('iPhone app name'), 'description' => t('The name of the app (suitable for display)'), ) + $defaults; $info['tags']['al:windows_phone:url'] = array( - 'label' => t('Windows Phone App URL scheme'), - 'description' => t('A custom scheme for the Windows Phone app. This attribute is required by the App Links specification.'), + 'label' => t('Windows Phone app URL scheme'), + 'description' => t('A custom scheme for the Windows Phone app. This attribute is required by the app Links specification.'), ) + $defaults; $info['tags']['al:windows_phone:app_id'] = array( - 'label' => t('Windows Phone App GUID'), + 'label' => t('Windows Phone app GUID'), 'description' => t('The app ID (a GUID) for app store.'), ) + $defaults; $info['tags']['al:windows_phone:app_name'] = array( - 'label' => t('Windows Phone App Name'), + 'label' => t('Windows Phone app name'), 'description' => t('The name of the app (suitable for display)'), ) + $defaults; $info['tags']['al:windows:url'] = array( - 'label' => t('Windows App URL scheme'), - 'description' => t('A custom scheme for the Windows app. This attribute is required by the App Links specification.'), + 'label' => t('Windows app URL scheme'), + 'description' => t('A custom scheme for the Windows app. This attribute is required by the app Links specification.'), ) + $defaults; $info['tags']['al:windows:app_id'] = array( - 'label' => t('Windows App GUID'), + 'label' => t('Windows app GUID'), 'description' => t('The app ID (a GUID) for app store.'), ) + $defaults; $info['tags']['al:windows:app_name'] = array( - 'label' => t('Windows App Name'), + 'label' => t('Windows app name'), 'description' => t('The name of the app (suitable for display)'), ) + $defaults; $info['tags']['al:windows_universal:url'] = array( - 'label' => t('Windows Universal App URL scheme'), - 'description' => t('A custom scheme for the Windows Universal app. This attribute is required by the App Links specification.'), + 'label' => t('Windows Universal app URL scheme'), + 'description' => t('A custom scheme for the Windows Universal app. This attribute is required by the app Links specification.'), ) + $defaults; $info['tags']['al:windows_universal:app_id'] = array( - 'label' => t('Windows Universal App GUID'), + 'label' => t('Windows Universal app GUID'), 'description' => t('The app ID (a GUID) for app store.'), ) + $defaults; $info['tags']['al:windows_universal:app_name'] = array( - 'label' => t('Windows Universal App Name'), + 'label' => t('Windows Universal app name'), 'description' => t('The name of the app (suitable for display)'), ) + $defaults; diff --git a/sites/all/modules/contrib/seo/metatag/metatag_app_links/tests/metatag_app_links.tags.test b/sites/all/modules/contrib/seo/metatag/metatag_app_links/tests/metatag_app_links.tags.test new file mode 100644 index 0000000..6cb5bc6 --- /dev/null +++ b/sites/all/modules/contrib/seo/metatag/metatag_app_links/tests/metatag_app_links.tags.test @@ -0,0 +1,89 @@ + 'Metatag tags: App Links', + 'description' => 'Test the App Links meta tags.', + 'group' => 'Metatag', + ); + } + + /** + * {@inheritdoc} + */ + public $tags = array( + 'al:android:app_name', + 'al:android:class', + 'al:android:package', + 'al:android:url', + 'al:ios:app_name', + 'al:ios:app_store_id', + 'al:ios:url', + 'al:ipad:app_name', + 'al:ipad:app_store_id', + 'al:ipad:url', + 'al:iphone:app_name', + 'al:iphone:app_store_id', + 'al:iphone:url', + 'al:web:should_fallback', + 'al:web:url', + 'al:windows:app_id', + 'al:windows:app_name', + 'al:windows:url', + 'al:windows_phone:app_id', + 'al:windows_phone:app_name', + 'al:windows_phone:url', + 'al:windows_universal:app_id', + 'al:windows_universal:app_name', + 'al:windows_universal:url', + ); + + /** + * {@inheritdoc} + */ + public $test_name_attribute = 'property'; + + /** + * {@inheritdoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'metatag_app_links'; + parent::setUp($modules); + } + + /** + * {@inheritdoc} + */ + public function getTestTagName($tag_name) { + // All of the tags have their underlines replaced with colons. + // Start with the beginning of the string. + $tag_name = str_replace('al_', 'al:', $tag_name); + + // The three-ish standard tag names. + $tag_name = str_replace('_app_id', ':app_id', $tag_name); + $tag_name = str_replace('_app_name', ':app_name', $tag_name); + $tag_name = str_replace('_app_store_id', ':app_store_id', $tag_name); + $tag_name = str_replace('_url', ':url', $tag_name); + + // One-offs. + $tag_name = str_replace('_class', ':class', $tag_name); + $tag_name = str_replace('_package', ':package', $tag_name); + $tag_name = str_replace('_should_fallback', ':should_fallback', $tag_name); + + return $tag_name; + } + +} diff --git a/sites/all/modules/contrib/seo/metatag/metatag_app_links/tests/metatag_app_links.test b/sites/all/modules/contrib/seo/metatag/metatag_app_links/tests/metatag_app_links.test new file mode 100644 index 0000000..c6e2c5a --- /dev/null +++ b/sites/all/modules/contrib/seo/metatag/metatag_app_links/tests/metatag_app_links.test @@ -0,0 +1,48 @@ + 'Metatag AppLinks tests', + 'description' => 'Test the Metatag:AppLinks module.', + 'group' => 'Metatag', + ); + } + + /** + * {@inheritdoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'metatag_app_links'; + + parent::setUp($modules); + + // Create an admin user and log them in. + $this->adminUser = $this->createAdminUser(); + $this->drupalLogin($this->adminUser); + } + + /** + * Confirm that it's possible to load the main admin page. + */ + public function testAdminPage() { + $this->drupalGet('admin/config/search/metatags'); + $this->assertResponse(200); + + // Confirm the page is correct. + $this->assertText(t('To view a summary of the default meta tags and the inheritance, click on a meta tag type.')); + } + +} diff --git a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.admin.inc b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.admin.inc index 2ca07ce..3e8ba62 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.admin.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.admin.inc @@ -1,4 +1,5 @@ global defaults and will override any other meta tags assigned elsewhere.', array('@url' => url('admin/config/search/metatags/config/global'))); + $header = array(t('Name'), t('Paths'), t('Weight'), t('Operations')); $rows = array(); + + $caption = t('Values assigned here inherit from the global defaults. Use the weight to specify the order the context meta tags run.', array('@url' => url('admin/config/search/metatags/config/global'))); foreach ($contexts as $name => $context) { // Only show context items that are specifically selected to be "Shown on @@ -23,12 +24,15 @@ function metatag_context_context_overview() { l(t('Delete'), 'admin/config/search/metatags/context/' . $context->name . '/delete', array('query' => array('destination' => 'admin/config/search/metatags/context'))), ); $rows[] = array( - $context->name, - isset($context->conditions['path']) ? htmlspecialchars(implode(', ', $context->conditions['path']['values'])) : t('No path condition.'), - implode(' | ', $ops), + 'name' => $context->name, + 'path' => isset($context->conditions['path']) ? htmlspecialchars(implode(', ', $context->conditions['path']['values'])) : t('No path condition.'), + 'weight' => isset($context->reactions['metatag_context_reaction']['weight']) ? $context->reactions['metatag_context_reaction']['weight'] : 0, + 'ops' => implode(' | ', $ops), ); } } + uasort($rows, 'drupal_sort_weight'); + return theme('table', array('header' => $header, 'rows' => $rows, 'caption' => $caption)); } @@ -85,6 +89,12 @@ function metatag_context_config_add_form_submit($form, &$form_state) { $context = metatag_context_load_default_context(); $context->name = $form_state['values']['name']; context_save($context); + + // Update the i18n strings. + if (!empty($context->reactions['metatag_context_reaction']['metatags'][LANGUAGE_NONE])) { + metatag_translations_update($context->reactions['metatag_context_reaction']['metatags'][LANGUAGE_NONE], 'metatag_context:' . $context->name); + } + $form_state['redirect'] = 'admin/config/search/metatags/context/' . $context->name; } @@ -99,7 +109,9 @@ function metatag_context_config_edit_form($form, &$form_state, $context) { // Don't care about the instance name, the data is being managed by Context // and not Metatag. $instance = ""; - $options = array(); + $options = array( + 'token types' => array('node', 'term', 'user'), + ); $metatags = $context->reactions['metatag_context_reaction']['metatags']; if (!isset($metatags[LANGUAGE_NONE])) { @@ -138,14 +150,11 @@ function metatag_context_config_edit_form($form, &$form_state, $context) { $form['help'] = array( '#prefix' => '
', - '#markup' => t('Values assigned here inherit from the global defaults and will override any other meta tags assigned elsewhere.', array('@url' => url('admin/config/search/metatags/config/global'))), + '#markup' => t('Values assigned here inherit from the global defaults.', array('@url' => url('admin/config/search/metatags/config/global'))), '#suffix' => '
', '#weight' => -99, ); - // Show all tokens. - $form['metatags']['tokens']['#token_types'] = 'all'; - $form['metatags']['#type'] = 'container'; unset($form['metatags']['#collapsed']); unset($form['metatags']['#collapsible']); @@ -175,6 +184,12 @@ function metatag_context_config_edit_form_submit($form, &$form_state) { $paths = array_combine($paths, $paths); $context->conditions['path']['values'] = $paths; context_save($context); + + // Update the i18n strings. + if (!empty($context->reactions['metatag_context_reaction']['metatags'][LANGUAGE_NONE])) { + metatag_translations_update($context->reactions['metatag_context_reaction']['metatags'][LANGUAGE_NONE], 'metatag_context:' . $context->name); + } + $form_state['redirect'] = 'admin/config/search/metatags/context'; } @@ -185,7 +200,7 @@ function metatag_context_delete_form($form, &$form_state, $context) { $form_state['metatag_context']['context'] = $context; $form['delete'] = array( - '#value' => 'This action will permanently remove this item from your database.' + '#value' => 'This action will permanently remove this item from your database.', ); $form['actions']['#type'] = 'actions'; @@ -227,8 +242,7 @@ function metatag_context_load_default_context() { $context->metatag = TRUE; $context->conditions = array( 'path' => array( - 'values' => array( - ), + 'values' => array(), ), ); $context->reactions = array( diff --git a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.context.inc b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.context.inc index 15984fb..c3d2bca 100644 --- a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.context.inc +++ b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.context.inc @@ -1,9 +1,13 @@ array('node', 'term', 'user'), + ); $form['help'] = array( '#prefix' => '',
@@ -90,6 +96,20 @@ class metatag_context_reaction extends context_reaction {
'#default_value' => isset($data['metatag_admin']) ? $data['metatag_admin'] : '',
);
+ // Add weight for current metatag_context.
+ $default_weight = 0;
+ if (!empty($context->reactions['metatag_context_reaction']['weight'])) {
+ $default_weight = (int) $context->reactions['metatag_context_reaction']['weight'];
+ }
+ $form['weight'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Weight'),
+ '#size' => 2,
+ '#default_value' => $default_weight,
+ '#description' => t('A higher weight will make this context be executed later, overriding other context meta tags.'),
+ '#weight' => -99,
+ );
+
return $form;
}
@@ -112,14 +132,23 @@ class metatag_context_reaction extends context_reaction {
if (isset($metadata_array[LANGUAGE_NONE])) {
$metadata_array = $metadata_array[LANGUAGE_NONE];
}
- foreach ($metadata_array as $key => $data) {
- if (!empty($data['value'])) {
- $metatags[$key] = $data;//t(check_plain($data['value']));
+
+ // Translate all of the meta tags using i18n, but don't update the
+ // strings.
+ metatag_translate_metatags($metadata_array, 'metatag_context:' . $context->name, NULL, FALSE);
+
+ // Add the meta tags to the output.
+ foreach ($metadata_array as $langcode => $tags) {
+ foreach ($tags as $name => $value) {
+ $metatags[$langcode][$name] = $value;
}
}
// Add this context to the list of instances.
- $instance_names[] = $context->name;
+ $weight = isset($context->reactions['metatag_context_reaction']['weight'])
+ ? $context->reactions['metatag_context_reaction']['weight']
+ : 0;
+ $instance_names[] = array('name' => $context->name, 'weight' => $weight);
}
}
@@ -128,15 +157,37 @@ class metatag_context_reaction extends context_reaction {
// Load the global defaults.
$metatags += metatag_config_load_with_defaults('');
+ // Sort by weight.
+ uasort($instance_names, 'drupal_sort_weight');
+
+ // Keep names only.
+ $instance_names = array_map('current', $instance_names);
+
// Compile the identifier for this combination based on the context
// names.
- asort($instance_names);
$instance = 'context:' . implode(',', $instance_names);
$options['instance'] = $instance;
+ // If an entity & entity type were saved elsewhere, grab them for later.
+ // @see hook_entity_prepare_view().
+ $entities = drupal_static('metatag_context_entities');
+ if (!empty($entities) && (count($entities[1]) == 1)) {
+ $data = array_values($entities[1]);
+ $options['entity'] = $data[0];
+ $options['entity_type'] = $entities[0];
+ $options['token data'] = array($entities[0] => $data[0]);
+ }
+
+ // Don't output meta tags that only contain the pager.
+ $current_pager = metatag_get_current_pager();
+
foreach ($metatags as $metatag => $data) {
if ($metatag_instance = metatag_get_instance($metatag, $data)) {
- $output[$metatag] = $metatag_instance->getElement($options);
+ $tag_output = $metatag_instance->getElement($options);
+ // Don't output the pager if that's all there is.
+ if ($tag_output != $current_pager) {
+ $output[$metatag] = $tag_output;
+ }
}
}
@@ -146,6 +197,7 @@ class metatag_context_reaction extends context_reaction {
}
}
}
+
}
/**
@@ -157,7 +209,7 @@ function metatag_context_context_default_contexts() {
$context = new stdClass();
$context->disabled = TRUE; /* Edit this to true to make a default context disabled initially */
$context->api_version = 3;
- $context->name = 'user_login';
+ $context->name = 'metatag_context_user_login';
$context->description = 'A default Metatag:Context definition for the user login page. This needs to be enabled and then it can be customized as needed.';
$context->tag = 'Metatag';
$context->conditions = array(
@@ -176,9 +228,11 @@ function metatag_context_context_default_contexts() {
$context->reactions = array(
'metatag_context_reaction' => array(
'metatags' => array(
- 'title' => array(
- 'value' => '[current-page:title] | [site:name]',
- 'default' => '[current-page:title] | [site:name]',
+ 'und' => array(
+ 'title' => array(
+ 'value' => '[current-page:title] | [site:name]',
+ 'default' => '[current-page:title] | [site:name]',
+ ),
),
),
'metatag_admin' => 1,
@@ -190,7 +244,7 @@ function metatag_context_context_default_contexts() {
$context = new stdClass();
$context->disabled = TRUE; /* Edit this to true to make a default context disabled initially */
$context->api_version = 3;
- $context->name = 'user_register';
+ $context->name = 'metatag_context_user_register';
$context->description = 'A default Metatag:Context definition for the user registration page. This needs to be enabled and then it can be customized as needed.';
$context->tag = 'Metatag';
$context->conditions = array(
@@ -208,9 +262,11 @@ function metatag_context_context_default_contexts() {
$context->reactions = array(
'metatag_context_reaction' => array(
'metatags' => array(
- 'title' => array(
- 'value' => '[current-page:title] | [site:name]',
- 'default' => '[current-page:title] | [site:name]',
+ 'und' => array(
+ 'title' => array(
+ 'value' => '[current-page:title] | [site:name]',
+ 'default' => '[current-page:title] | [site:name]',
+ ),
),
),
'metatag_admin' => 1,
@@ -223,7 +279,7 @@ function metatag_context_context_default_contexts() {
$context = new stdClass();
$context->disabled = TRUE; /* Edit this to true to make a default context disabled initially */
$context->api_version = 3;
- $context->name = 'forum';
+ $context->name = 'metatag_context_forum';
$context->description = 'A default Metatag:Context definition for the main forum page. This needs to be enabled and then it can be customized as needed.';
$context->tag = 'Metatag';
$context->conditions = array(
@@ -236,9 +292,11 @@ function metatag_context_context_default_contexts() {
$context->reactions = array(
'metatag_context_reaction' => array(
'metatags' => array(
- 'title' => array(
- 'value' => '[current-page:title] | [site:name]',
- 'default' => '[current-page:title] | [site:name]',
+ 'und' => array(
+ 'title' => array(
+ 'value' => '[current-page:title] | [site:name]',
+ 'default' => '[current-page:title] | [site:name]',
+ ),
),
),
'metatag_admin' => 1,
@@ -252,7 +310,7 @@ function metatag_context_context_default_contexts() {
$context = new stdClass();
$context->disabled = TRUE; /* Edit this to true to make a default context disabled initially */
$context->api_version = 3;
- $context->name = 'blog';
+ $context->name = 'metatag_context_blog';
$context->description = 'A default Metatag:Context definition for the main blog page. This needs to be enabled and then it can be customized as needed. Note: this does not cover the individual user blog pages, only the main blog page.';
$context->tag = 'Metatag';
$context->conditions = array(
@@ -265,9 +323,11 @@ function metatag_context_context_default_contexts() {
$context->reactions = array(
'metatag_context_reaction' => array(
'metatags' => array(
- 'title' => array(
- 'value' => '[current-page:title] | [site:name]',
- 'default' => '[current-page:title] | [site:name]',
+ 'und' => array(
+ 'title' => array(
+ 'value' => '[current-page:title] | [site:name]',
+ 'default' => '[current-page:title] | [site:name]',
+ ),
),
),
'metatag_admin' => 1,
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.i18n.inc b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.i18n.inc
new file mode 100644
index 0000000..df8bfd9
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.i18n.inc
@@ -0,0 +1,132 @@
+ t('Metatag:Context configurations'),
+ // Callback to load all config objects.
+ 'list callback' => 'metatag_context_i18n_list_contexts',
+ // The object load callback.
+ // 'load callback' => 'metatag_context_i18n_load',
+ // @todo Custom i18n object overrides.
+ // 'class' => 'metatag_context_i18n_metatag',
+ // @todo Is this needed? What does it do?
+ // 'translation set' => TRUE,
+
+ // The object key field.
+ 'key' => 'name',
+ // Placeholders for automatic paths. This connects the 'key' to strings in
+ // the paths listed below.
+ // 'placeholders' => array(
+ // '%name' => 'name',
+ // ),
+ // To produce edit links automatically.
+ // 'edit path' => 'admin/config/search/metatags/config/%instance',
+ // Auto-generate a 'translate' tab.
+ // 'translate tab' => 'admin/config/search/metatags/config/%instance/translate',
+
+ // Properties for string translation.
+ 'string translation' => array(
+ // The textgroup, type and (below) name will be concatenated into a single
+ // string as the {locales_source} context.
+ 'textgroup' => 'metatag',
+ 'type' => 'metatag_context',
+ // Table where the object is stored, to automate string lists.
+ 'table' => 'context',
+ // Translatable properties of these objects, this will be added later.
+ 'properties' => array(),
+ // The path to translate individual strings.
+ // 'translate path' => 'admin/config/search/metatags/config/%instance/translate/%i18n_language',
+ ),
+ );
+
+ // Compile all of the tags to add to the translation stack.
+ $meta_tag_info = metatag_get_info();
+ $groups = $meta_tag_info['groups'];
+ foreach ($meta_tag_info['tags'] as $tag_info) {
+ // Ignore certain field types that aren't translatable, mostly fields that
+ // list predetermined options in various forms.
+ if (!empty($tag_info['class']) && $tag_info['class'] == 'DrupalListMetaTag') {
+ continue;
+ }
+ elseif (!empty($tag_info['form']['#type']) && $tag_info['form']['#type'] == 'select') {
+ continue;
+ }
+ elseif (!empty($tag_info['form']['#options'])) {
+ continue;
+ }
+
+ // Build a suitable structure for this meta tag.
+ $tag_name = $tag_info['name'];
+ $title = $tag_info['label'];
+ if (!empty($tag_info['group'])) {
+ $tag_group = $tag_info['group'];
+ $group_label = !empty($groups[$tag_group]['label']) ? $groups[$tag_group]['label'] : $tag_group;
+ $title = $group_label . ': ' . $title;
+ }
+
+ $info['metatag_context']['string translation']['properties'][$tag_name] = array(
+ 'title' => $title,
+ 'field' => "reactions.metatag_context_reaction.und.{$tag_name}.value",
+ );
+ }
+
+ return $info;
+}
+
+/**
+ * Implements hook_i18n_string_list().
+ *
+ * @todo Functionality to delete translation records when Panels are deleted.
+ */
+function metatag_context_i18n_string_list($group) {
+ if ($group == 'metatag' || $group == 'all') {
+ $strings = array();
+
+ foreach (context_context_list() as $context_name) {
+ $context = context_load($context_name);
+ if (!empty($context->reactions['metatag_context_reaction']['metatags'][LANGUAGE_NONE])) {
+ $new_strings = array();
+ foreach ($context->reactions['metatag_context_reaction']['metatags'][LANGUAGE_NONE] as $name => $value) {
+ if (isset($value['value'])) {
+ // Don't translate meta tags that are arrays.
+ if (is_array($value['value'])) {
+ continue;
+ }
+ // Collapse the array down one level.
+ else {
+ $new_strings[$name] = $value['value'];
+ }
+ }
+ }
+ $strings['metatag']['metatag_context'][$context->name] = $new_strings;
+ }
+ }
+
+ return $strings;
+ }
+}
+
+/**
+ * List callback.
+ */
+function metatag_context_i18n_list_contexts() {
+ ctools_include('export');
+ $configs = ctools_export_crud_load_all('metatag_config');
+ if (!empty($configs)) {
+ // Unserialize the config array.
+ foreach ($configs as &$config) {
+ if (is_string($config->config)) {
+ $config->config = unserialize($config->config);
+ }
+ }
+ return $configs;
+ }
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.info b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.info
index 9289e30..62b620b 100644
--- a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.info
+++ b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.info
@@ -2,14 +2,18 @@ name = Metatag: Context
description = "Assigned Metatag using Context definitions, allowing them to be assigned by path and other criteria."
package = SEO
core = 7.x
-dependencies[] = context
-dependencies[] = metatag
-files[] = metatag_context.test
+
configure = admin/config/search/metatags/context
-; Information added by Drupal.org packaging script on 2015-05-01
-version = "7.x-1.5-beta1+22-dev"
+dependencies[] = metatag:metatag
+dependencies[] = context:context
+
+; Tests.
+files[] = tests/metatag_context.test
+files[] = tests/metatag_context.i18n.test
+
+; Information added by Drupal.org packaging script on 2018-04-04
+version = "7.x-1.25"
core = "7.x"
project = "metatag"
-datestamp = "1430441289"
-
+datestamp = "1522849089"
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.install b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.install
index 78415ce..b422985 100644
--- a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.install
+++ b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.install
@@ -1,4 +1,5 @@
t('Context'));
+ return $info;
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.module b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.module
index dfa9b82..f70ab65 100644
--- a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.module
+++ b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.module
@@ -1,4 +1,5 @@
"3");
}
}
+
+/**
+ * Implements hook_module_implements_alter().
+ */
+function metatag_context_module_implements_alter(&$implementations, $hook) {
+ if ($hook == 'page_alter') {
+ // Run metatag_context_page_alter() last.
+ $group = $implementations['metatag_context'];
+ unset($implementations['metatag_context']);
+ $implementations['metatag_context'] = $group;
+ }
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.test b/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.test
deleted file mode 100644
index 7dfc963..0000000
--- a/sites/all/modules/contrib/seo/metatag/metatag_context/metatag_context.test
+++ /dev/null
@@ -1,145 +0,0 @@
- 'Meta tag context tests',
- 'description' => 'Test basic meta tag context functionality.',
- 'group' => 'Metatag',
- );
- }
-
- /**
- * Prepares the testing environment
- */
- public function setUp(array $modules = array()) {
- $modules[] = 'metatag';
- $modules[] = 'metatag_context';
- parent::setUp($modules);
- // Create user.
- $this->privileged_user = $this->drupalCreateUser(array(
- 'bypass node access',
- 'administer content types',
- 'administer meta tags',
- ));
- $this->drupalLogin($this->privileged_user);
- // Create content type, with underscores.
- $type_name = strtolower($this->randomName(8)) . '_test';
- $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
- $this->type = $type->type;
- // Store a valid URL name, with hyphens instead of underscores.
- $this->hyphen_type = str_replace('_', '-', $this->type);
- }
-
- /**
- * Performs the basic tests.
- */
- public function testMetatagContextBasic() {
- // Create content type node.
- $this->drupalPost('node/add/' . $this->hyphen_type, array('title' => $this->randomName(8)), t('Save'));
- $this->context_name = drupal_strtolower($this->randomName(8));
-
- // Generate metatags and check content.
- $this->metatag_pages['node'] = $this->createMetatagObject('node/1', 'node_metatags');
- $this->metatag_pages['page'] = $this->createMetatagObject(' ',
+ '#suffix' => ' ',
+ );
+ return $output;
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.drush.inc b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.drush.inc
new file mode 100644
index 0000000..883f6cb
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.drush.inc
@@ -0,0 +1,94 @@
+ dt('Convert data from Metatags Quick into Metatag'),
+ 'drupal dependencies' => array('metatag', 'metatag_importer'),
+ 'aliases' => array('mtcmq'),
+ );
+
+ $items['metatag-convert-nodewords'] = array(
+ 'description' => dt('Convert data from Nodewords into Metatag.'),
+ 'drupal dependencies' => array('metatag', 'metatag_importer'),
+ 'aliases' => array('mtcnw'),
+ );
+
+ $items['metatag-convert-page-title'] = array(
+ 'description' => dt('Convert data from Page Title into Metatag.'),
+ 'drupal dependencies' => array('metatag', 'metatag_importer'),
+ 'aliases' => array('mtcpt'),
+ );
+
+ return $items;
+}
+
+/**
+ * Callback to convert all Metatags Quick data.
+ */
+function drush_metatag_importer_metatag_convert_metatags_quick() {
+ if (!drush_confirm(dt('Ready to convert all data from Metatags Quick?'))) {
+ return;
+ }
+
+ include 'metatag_importer.metatags_quick.inc';
+ metatag_importer_metatags_quick_import();
+}
+
+/**
+ * Callback to convert all Nodewords data.
+ */
+function drush_metatag_importer_metatag_convert_nodewords() {
+ if (!drush_confirm(dt('Ready to convert all data from Nodewords?'))) {
+ return;
+ }
+
+ // Need to make sure the Nodewords table actually exists.
+ if (!db_table_exists('nodewords')) {
+ drush_set_error('metatag_importer', dt('Could not find the nodewords table!'));
+ return;
+ }
+
+ // Offload all of the logic to the code contained in the admin file.
+ include 'metatag_importer.nodewords.inc';
+
+ // Start the import.
+ $types = array_keys(_metatag_importer_list_nodewords());
+ _metatag_importer_import($types);
+
+ drush_print(dt('Data converesion finished.'));
+}
+
+/**
+ * Callback to convert Page Title data.
+ */
+function drush_metatag_importer_metatag_convert_page_title() {
+ if (!db_table_exists('page_title')) {
+ drush_set_error('metatag_importer', dt('Could not find the page_title table!'));
+ return;
+ }
+
+ $records = db_query("SELECT COUNT(id) FROM {page_title} WHERE type IN ('node', 'taxonomy_term', 'user')")->fetchField();
+
+ if (empty($records)) {
+ return dt('There are no page_title records to convert!');
+ }
+
+ if (!drush_confirm(dt('Ready to convert !count record(s) from Page Title?', array('!count' => $records)))) {
+ return;
+ }
+
+ include 'metatag_importer.page_title.inc';
+
+ // Start the importer.
+ $count = metatag_importer_for_page_title();
+
+ drush_print(dt('Converted !count record(s) from the Page Title module.', array('!count' => $count)));
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.info b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.info
new file mode 100644
index 0000000..2eda31c
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.info
@@ -0,0 +1,16 @@
+name = Metatag Importer
+description = Import data from other modules into Metatag.
+core = 7.x
+package = SEO
+
+; Need Metatag.
+dependencies[] = metatag:metatag
+
+; Tests.
+files[] = tests/metatag_importer.test
+
+; Information added by Drupal.org packaging script on 2018-04-04
+version = "7.x-1.25"
+core = "7.x"
+project = "metatag"
+datestamp = "1522849089"
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.metatags_quick.inc b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.metatags_quick.inc
new file mode 100644
index 0000000..7b5b506
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.metatags_quick.inc
@@ -0,0 +1,225 @@
+ count($data));
+ if (drupal_is_cli() && function_exists('drush_print')) {
+ drush_print(dt($message, $vars));
+ }
+ else {
+ drupal_set_message(t($message, $vars));
+ }
+
+ // Get all of the data for these fields.
+ $data = metatag_importer_get_quick_data($fields);
+
+ // Process the data.
+ foreach ($data as $quick) {
+ $message = 'Converting @count records from Metatags Quick..';
+ $vars = array('@count' => count($quick));
+ if (drupal_is_cli() && function_exists('drush_print')) {
+ drush_print(dt($message, $vars));
+ }
+ else {
+ drupal_set_message(t($message, $vars));
+ }
+
+ metatag_importer_metatags_quick_process($quick);
+ }
+
+ if (drupal_is_cli() && function_exists('drush_print')) {
+ drush_print(dt('All done!'));
+ }
+ else {
+ drupal_set_message(t('All done!'));
+ }
+}
+
+/**
+ * Process a row from Metatags Quick.
+ *
+ * Imports data into metatag structure, and deletes Metatags Quick data.
+ *
+ * @param array $quick
+ * Row of data from Metatags Quick.
+ */
+function metatag_importer_metatags_quick_process(array $quick) {
+ // Identify which Metatag meta tags will be filled by Metatags Quick values.
+ $tag_map = array(
+ 'title' => 'title',
+ 'keywords' => 'keywords',
+ 'abstract' => 'abstract',
+ 'description' => 'description',
+ 'canonical' => 'canonical',
+ );
+ if (module_exists('metatag_opengraph')) {
+ $tag_map['og:title'] = 'title';
+ $tag_map['og:description'] = 'description';
+ }
+ if (module_exists('metatag_twitter_cards')) {
+ $tag_map['twitter:title'] = 'title';
+ $tag_map['twitter:description'] = 'description';
+ }
+
+ $entity_type = $quick['entity_type'];
+ $entity_id = $quick['entity_id'];
+ $revision_id = $quick['revision_id'];
+ $langcode = $quick['language'];
+
+ // Fallback to entity language if no field language is set.
+ if (LANGUAGE_NONE == $langcode) {
+ $entities = entity_load($entity_type, array($entity_id));
+ if (!empty($entities[$entity_id])) {
+ $langcode = entity_language($entity_type, $entities[$entity_id]);
+ }
+ }
+
+ // Check for an existing record.
+ $data = metatag_metatags_load($entity_type, $entity_id);
+
+ // Drop back one level because the results will be keyed by revision_id.
+ if (!empty($data)) {
+ $data = reset($data);
+ }
+
+ // Map the Quick meta tags.
+ foreach ($tag_map as $dest => $source) {
+ if (!empty($quick['fields'][$source]['value'])) {
+ $data[$langcode][$dest] = array('value' => $quick['fields'][$source]['value']);
+ // Add the default suffix to the page title.
+ if ($dest == 'title') {
+ $data[$langcode][$dest]['value'] .= ' | [site:name]';
+ }
+ }
+ }
+
+ // Create or update the {metatag} record.
+ if (!empty($data)) {
+ metatag_metatags_save($entity_type, $entity_id, $revision_id, $data);
+ }
+
+ if (!empty($quick['fields'])) {
+ metatag_importer_delete_quick_data($quick['fields']);
+ }
+
+ // Reset the entity cache. If entitycache module is used, this also resets
+ // its permanent cache.
+ entity_get_controller($entity_type)->resetCache(array($entity_id));
+}
+
+/**
+ * Get all fields from Metatags Quick.
+ *
+ * @return array
+ * Array of field names, keyed by name.
+ */
+function metatag_importer_get_quick_fields() {
+ $fields = array();
+
+ // Get a list of all entities that use a Metatags Quick field.
+ foreach (field_info_instances() as $entity_type => $bundles) {
+ // Skip the custon entity type provided by Metatags Quick.
+ if ($entity_type == 'metatags_path_based') {
+ continue;
+ }
+ foreach ($bundles as $bundle_name => $bundle) {
+ foreach ($bundle as $field_name => $field) {
+ if ($field['widget']['module'] == 'metatags_quick') {
+ $fields[$field_name] = $field_name;
+ }
+ }
+ }
+ }
+
+ return $fields;
+}
+
+/**
+ * Get metatags_quick data from the database.
+ *
+ * @param array $fields
+ * Array of field names.
+ *
+ * @return array
+ * Metadata
+ */
+function metatag_importer_get_quick_data(array $fields) {
+ $data = array();
+ foreach ($fields as $field_name) {
+ $meta_tag = str_replace('meta_', '', str_replace('field_', '', $field_name));
+ $results = db_select('field_data_' . $field_name, 'f')
+ ->fields('f', array(
+ 'entity_type',
+ 'bundle',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ $field_name . '_metatags_quick',
+ ))
+ ->condition('f.entity_type', array('metatags_path_based'), '<>')
+ ->orderBy('f.entity_type', 'ASC')
+ ->orderBy('f.entity_id', 'ASC')
+ ->orderBy('f.revision_id', 'ASC')
+ ->execute();
+
+ foreach ($results as $result) {
+ $id = implode(':', array(
+ $result->entity_type,
+ $result->entity_id,
+ $result->revision_id,
+ $result->language,
+ ));
+
+ if (!isset($data[$id])) {
+ $data[$id] = array(
+ 'entity_type' => $result->entity_type,
+ 'bundle' => $result->bundle,
+ 'entity_id' => $result->entity_id,
+ 'revision_id' => $result->revision_id,
+ 'language' => $result->language,
+ 'fields' => array(),
+ );
+ }
+ $data[$id]['fields'][$meta_tag] = array(
+ 'field_name' => $field_name,
+ 'value' => $result->{$field_name . '_metatags_quick'},
+ 'meta_tag' => $meta_tag,
+ );
+ }
+ }
+
+ return $data;
+}
+
+/**
+ * Delete the old metatags_quick records.
+ *
+ * @param array $quick
+ * Records to delete.
+ */
+function metatag_importer_delete_quick_data(array $quick) {
+ foreach ($quick as $field) {
+ db_delete('field_data_' . $field['field_name'])
+ ->condition('entity_type', $quick['entity_type'])
+ ->condition('entity_id', $quick['entity_id'])
+ ->condition('language', $quick['language'])
+ ->execute();
+
+ db_delete('field_revision_' . $field['field_name'])
+ ->condition('entity_type', $quick['entity_type'])
+ ->condition('entity_id', $quick['entity_id'])
+ ->condition('language', $quick['language'])
+ ->execute();
+ }
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.module b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.module
new file mode 100644
index 0000000..31d0ef6
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.module
@@ -0,0 +1,42 @@
+ 'Importer',
+ 'description' => 'Migrate settings and data from various modules to the Metatag module.',
+ 'page callback' => 'metatag_importer_admin_page',
+ 'access arguments' => array('administer meta tags'),
+ 'file' => 'metatag_importer.admin.inc',
+ 'type' => MENU_LOCAL_TASK,
+ );
+
+ $items['admin/config/search/metatags/importer/nodewords'] = array(
+ 'title' => 'Import from Nodewords',
+ 'description' => 'Migrate settings and data from the Drupal 6 Nodewords module to the Drupal 7 Metatag module.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('metatag_importer_nodewords_form'),
+ 'access arguments' => array('administer meta tags'),
+ 'file' => 'metatag_importer.nodewords.inc',
+ 'type' => MENU_LOCAL_ACTION,
+ );
+
+ $items['admin/config/search/metatags/importer/page-title'] = array(
+ 'title' => 'Import from Page Title',
+ 'description' => 'Migrate settings and data from the Drupal 6 Nodewords module to the Drupal 7 Metatag module.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('metatag_importer_page_title_form'),
+ 'access arguments' => array('administer meta tags'),
+ 'file' => 'metatag_importer.page_title.inc',
+ 'type' => MENU_LOCAL_ACTION,
+ );
+
+ return $items;
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.nodewords.inc b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.nodewords.inc
new file mode 100644
index 0000000..93ae682
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_importer/metatag_importer.nodewords.inc
@@ -0,0 +1,581 @@
+ 'checkboxes',
+ '#title' => t('Records to import'),
+ '#options' => $types,
+ );
+
+ $form['notes'] = array(
+ '#markup' => ' ' . t('Notes') . ':' . ' ',
+ '#suffix' => ' ',
+ '#suffix' => ' ' . t('The following tokens are available. If you would like to have the characters \'[\' and \']\' please use the html entity codes \'%5B\' or \'%5D\' or they will get replaced with empty space.' . ''
+ . '
',
+ );
+
+ $form['actions']['migrate'] = array(
+ '#type' => 'submit',
+ '#value' => t('Migrate all records'),
+ );
+ }
+ else {
+ $form['ohbother'] = array(
+ '#markup' => t('Nothing has been found that needs to be imported.'),
+ '#prefix' => '',
+ '#suffix' => '',
+ '#weight' => 51,
+ );
+ }
+ // Basic tags fieldset should not collapse to display in a larger popup.
+ // @see https://www.drupal.org/node/1294478
+ // @see https://www.drupal.org/node/2624020
+ $form['metatags'][LANGUAGE_NONE]['basic']['#collapsible'] = FALSE;
}
}
/**
- * Saves the form values.
+ * {@inheritdoc}
*/
function options_submit(&$form, &$form_state) {
+ // Save the form values.
if ($form_state['section'] == 'metatags') {
$metatags = $form_state['values']['metatags'];
@@ -66,11 +137,20 @@ class metatag_views_plugin_display_extender_metatags extends views_plugin_displa
}
$this->display->set_option('metatags', $metatags);
+ $this->display->set_option('metatags_tokenize', $form_state['values']['tokenize']);
+
+ // Update the i18n strings.
+ if (!empty($metatags[LANGUAGE_NONE]) && $this->definition['enabled'] && module_exists('i18n_string') && !variable_get('metatag_i18n_disabled', FALSE)) {
+ metatag_translations_update($metatags[LANGUAGE_NONE], 'metatag_views:' . $this->view->name . '_' . $this->display->plugin_name);
+ }
}
}
/**
* Identify whether or not the current display has custom meta tags defined.
+ *
+ * @return bool
+ * Indicates whether the current display has custom meta tags defined.
*/
protected function has_metatags() {
$metatags = $this->get_metatags();
@@ -96,4 +176,5 @@ class metatag_views_plugin_display_extender_metatags extends views_plugin_displa
return $metatags;
}
+
}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views.i18n.test b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views.i18n.test
new file mode 100644
index 0000000..7c7f8f4
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views.i18n.test
@@ -0,0 +1,106 @@
+ 'Metatag:Views i18n tests',
+ 'description' => 'Test Metatag integration via the Metatag:Views module.',
+ 'group' => 'Metatag',
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ function setUp(array $modules = array()) {
+ $modules[] = 'views';
+ $modules[] = 'metatag_views';
+
+ // Needed for translations.
+ $modules[] = 'locale';
+ $modules[] = 'i18n';
+ $modules[] = 'i18n_string';
+
+ // Enable the hidden submodule to manage some default configs.
+ $modules[] = 'metatag_views_tests';
+
+ parent::setUp($modules);
+
+ // Add more locales.
+ $this->setupLocales();
+
+ // Set up the locales.
+ $perms = array(
+ 'administer languages',
+ 'translate interface',
+ // From i18n.
+ 'translate admin strings',
+ 'translate user-defined strings',
+ );
+ $this->adminUser = $this->createAdminUser($perms);
+
+ // Log in the admin user.
+ $this->drupalLogin($this->adminUser);
+
+ // Reload the translations.
+ drupal_flush_all_caches();
+ module_load_include('admin.inc', 'i18n_string');
+ i18n_string_refresh_group('metatag');
+ }
+
+ /**
+ * Test the Metatag:Views translations.
+ */
+ public function testExportedPage() {
+ // Plan out the different translation string tests.
+ $string_en = 'Testing Metatag:Views.';
+ $string_fr = 'French page description.';
+ $config_name = 'metatag_views:metatag_views_test' . METATAG_VIEWS_CONTEXT_SEPARATOR . 'page:description';
+ $path = 'metatag-views-test';
+
+ // Confirm the string is present as it has been grabbed by the string-
+ // refresh triggered in $this->setUp().
+ $this->searchTranslationPage($string_en, $config_name);
+
+ // Get the translation string lid for the generator tag.
+ $lid = $this->getTranslationLidByContext($config_name);
+ $this->assertNotEqual($lid, 0, 'Found the locales_source string for the description tag.');
+
+ // Save the translation string.
+ $this->saveTranslationString($lid, $config_name, 'fr', $string_en, $string_fr);
+
+ // Load the English page again.
+ $this->drupalGet($path);
+ $this->assertResponse(200, 'Loaded the default test page again.');
+
+ // Confirm the page's description is what we set it to.
+ $xpath = $this->xpath("//meta[@name='description']");
+ $this->assertEqual(count($xpath), 1, 'Exactly one description meta tag found.');
+ $this->assertEqual($xpath[0]['content'], $string_en);
+ $this->assertNotEqual($xpath[0]['content'], $string_fr);
+
+ // Load the French page.
+ $this->drupalGet('fr/' . $path);
+ $this->assertResponse(200, 'Loaded the French test page.');
+
+ // Confirm the generator string was translated.
+ $xpath = $this->xpath("//meta[@name='description']");
+ $this->assertEqual(count($xpath), 1, 'Exactly one description meta tag found.');
+ $this->assertEqual($xpath[0]['content'], $string_fr);
+ $this->assertNotEqual($xpath[0]['content'], $string_en);
+ }
+
+ // @todo Test translations on an in-db display.
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views.test b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views.test
new file mode 100644
index 0000000..8269512
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views.test
@@ -0,0 +1,60 @@
+ 'Metatag:Views tests',
+ 'description' => 'Test Metatag integration via the Metatag:Views module.',
+ 'group' => 'Metatag',
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ function setUp(array $modules = array()) {
+ $modules[] = 'views';
+
+ // Enable the hidden submodule to manage some default configs.
+ $modules[] = 'metatag_views_tests';
+
+ parent::setUp($modules);
+ }
+
+ /**
+ * Test the Metatag:Views translations on an exported page.
+ */
+ public function testExportedPage() {
+ $this->drupalGet('metatag-views-test');
+ $this->assertResponse(200);
+
+ // Test the page title.
+ $this->assertTitle('Test Views page title');
+
+ // Test the description meta tag.
+ $xpath = $this->xpath("//meta[@name='description']");
+ $this->assertEqual(count($xpath), 1, 'Exactly one description meta tag found.');
+ $this->assertEqual($xpath[0]['content'], 'Testing Metatag:Views.');
+
+ // Test the keywords meta tag.
+ $xpath = $this->xpath("//meta[@name='keywords']");
+ $this->assertEqual(count($xpath), 1, 'Exactly one keywords meta tag found.');
+ $this->assertEqual($xpath[0]['content'], 'Test, page, keywords');
+ }
+
+ // @todo Test an in-db display.
+ // @todo Test the master display.
+ // @todo Test separate displays.
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.info b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.info
new file mode 100644
index 0000000..e1c11ba
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.info
@@ -0,0 +1,16 @@
+name = Metatag:Views Tests
+description = Helper module for testing metatag_views.module.
+core = 7.x
+
+; Don't show this on the modules admin page.
+hidden = TRUE
+
+dependencies[] = metatag:metatag
+dependencies[] = metatag:metatag_views
+dependencies[] = views:views
+
+; Information added by Drupal.org packaging script on 2018-04-04
+version = "7.x-1.25"
+core = "7.x"
+project = "metatag"
+datestamp = "1522849089"
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.module b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.module
new file mode 100644
index 0000000..80d5428
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.module
@@ -0,0 +1,13 @@
+ '3.0');
+}
diff --git a/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.views_default.inc b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.views_default.inc
new file mode 100644
index 0000000..96bb522
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/metatag_views/tests/metatag_views_tests.views_default.inc
@@ -0,0 +1,453 @@
+name = 'metatag_views_test';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'Metatag Views test';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['title'] = 'Metatag Views test';
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['pager']['options']['items_per_page'] = '5';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'node';
+ $handler->display->display_options['row_options']['links'] = FALSE;
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Post date */
+ $handler->display->display_options['sorts']['created']['id'] = 'created';
+ $handler->display->display_options['sorts']['created']['table'] = 'node';
+ $handler->display->display_options['sorts']['created']['field'] = 'created';
+ $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = 1;
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+
+ /* Display: Page */
+ $handler = $view->new_display('page', 'Page', 'page');
+ $handler->display->display_options['metatags'] = array(
+ 'und' => array(
+ 'title' => array(
+ 'value' => 'Test Views page title',
+ 'default' => '[view:title] | [current-page:pager][site:name]',
+ ),
+ 'description' => array(
+ 'value' => 'Testing Metatag:Views.',
+ 'default' => '[view:description]',
+ ),
+ 'abstract' => array(
+ 'value' => '',
+ ),
+ 'keywords' => array(
+ 'value' => 'Test, page, keywords',
+ ),
+ 'robots' => array(
+ 'value' => array(
+ 'index' => 0,
+ 'follow' => 0,
+ 'noindex' => 0,
+ 'nofollow' => 0,
+ 'noarchive' => 0,
+ 'nosnippet' => 0,
+ 'noodp' => 0,
+ 'noydir' => 0,
+ 'noimageindex' => 0,
+ 'notranslate' => 0,
+ ),
+ ),
+ 'news_keywords' => array(
+ 'value' => '',
+ ),
+ 'standout' => array(
+ 'value' => '',
+ ),
+ 'rating' => array(
+ 'value' => '',
+ ),
+ 'referrer' => array(
+ 'value' => '',
+ ),
+ 'rights' => array(
+ 'value' => '',
+ ),
+ 'image_src' => array(
+ 'value' => '',
+ ),
+ 'canonical' => array(
+ 'value' => '[view:url]',
+ 'default' => '[view:url]',
+ ),
+ 'shortlink' => array(
+ 'value' => '[current-page:url:unaliased]',
+ 'default' => '[current-page:url:unaliased]',
+ ),
+ 'publisher' => array(
+ 'value' => '',
+ ),
+ 'author' => array(
+ 'value' => '',
+ ),
+ 'original-source' => array(
+ 'value' => '',
+ ),
+ 'prev' => array(
+ 'value' => '',
+ ),
+ 'next' => array(
+ 'value' => '',
+ ),
+ 'revisit-after' => array(
+ 'value' => '',
+ 'period' => '',
+ ),
+ 'content-language' => array(
+ 'value' => '',
+ ),
+ 'geo.position' => array(
+ 'value' => '',
+ ),
+ 'geo.placename' => array(
+ 'value' => '',
+ ),
+ 'geo.region' => array(
+ 'value' => '',
+ ),
+ 'icbm' => array(
+ 'value' => '',
+ ),
+ 'refresh' => array(
+ 'value' => '',
+ ),
+ 'itemtype' => array(
+ 'value' => '',
+ ),
+ 'itemprop:name' => array(
+ 'value' => '[current-page:title]',
+ 'default' => '[current-page:title]',
+ ),
+ 'itemprop:description' => array(
+ 'value' => '',
+ ),
+ 'itemprop:image' => array(
+ 'value' => '',
+ ),
+ 'theme-color' => array(
+ 'value' => '',
+ ),
+ 'MobileOptimized' => array(
+ 'value' => '',
+ ),
+ 'HandheldFriendly' => array(
+ 'value' => '',
+ ),
+ 'viewport' => array(
+ 'value' => '',
+ ),
+ 'cleartype' => array(
+ 'value' => '',
+ ),
+ 'apple-itunes-app' => array(
+ 'value' => '',
+ ),
+ 'apple-mobile-web-app-capable' => array(
+ 'value' => '',
+ ),
+ 'apple-mobile-web-app-status-bar-style' => array(
+ 'value' => '',
+ ),
+ 'format-detection' => array(
+ 'value' => '',
+ ),
+ 'ios-app-link-alternative' => array(
+ 'value' => '',
+ ),
+ 'android-app-link-alternative' => array(
+ 'value' => '',
+ ),
+ 'android-manifest' => array(
+ 'value' => '',
+ ),
+ 'x-ua-compatible' => array(
+ 'value' => '',
+ ),
+ 'application-name' => array(
+ 'value' => '',
+ ),
+ 'msapplication-allowDomainApiCalls' => array(
+ 'value' => '',
+ ),
+ 'msapplication-allowDomainMetaTags' => array(
+ 'value' => '',
+ ),
+ 'msapplication-badge' => array(
+ 'value' => '',
+ ),
+ 'msapplication-config' => array(
+ 'value' => '',
+ ),
+ 'msapplication-navbutton-color' => array(
+ 'value' => '',
+ ),
+ 'msapplication-notification' => array(
+ 'value' => '',
+ ),
+ 'msapplication-square150x150logo' => array(
+ 'value' => '',
+ ),
+ 'msapplication-square310x310logo' => array(
+ 'value' => '',
+ ),
+ 'msapplication-square70x70logo' => array(
+ 'value' => '',
+ ),
+ 'msapplication-wide310x150logo' => array(
+ 'value' => '',
+ ),
+ 'msapplication-starturl' => array(
+ 'value' => '',
+ ),
+ 'msapplication-task' => array(
+ 'value' => '',
+ ),
+ 'msapplication-task-separator' => array(
+ 'value' => '',
+ ),
+ 'msapplication-tilecolor' => array(
+ 'value' => '',
+ ),
+ 'msapplication-tileimage' => array(
+ 'value' => '',
+ ),
+ 'msapplication-tooltip' => array(
+ 'value' => '',
+ ),
+ 'msapplication-window' => array(
+ 'value' => '',
+ ),
+ 'og:type' => array(
+ 'value' => 'article',
+ 'default' => 'article',
+ ),
+ 'og:url' => array(
+ 'value' => '[current-page:url:absolute]',
+ 'default' => '[current-page:url:absolute]',
+ ),
+ 'og:title' => array(
+ 'value' => '[current-page:title]',
+ 'default' => '[current-page:title]',
+ ),
+ 'og:determiner' => array(
+ 'value' => '',
+ ),
+ 'og:description' => array(
+ 'value' => '',
+ ),
+ 'og:updated_time' => array(
+ 'value' => '',
+ ),
+ 'og:see_also' => array(
+ 'value' => '',
+ ),
+ 'og:image' => array(
+ 'value' => '',
+ ),
+ 'og:image:url' => array(
+ 'value' => '',
+ ),
+ 'og:image:secure_url' => array(
+ 'value' => '',
+ ),
+ 'og:image:type' => array(
+ 'value' => '',
+ ),
+ 'og:image:width' => array(
+ 'value' => '',
+ ),
+ 'og:image:height' => array(
+ 'value' => '',
+ ),
+ 'og:latitude' => array(
+ 'value' => '',
+ ),
+ 'og:longitude' => array(
+ 'value' => '',
+ ),
+ 'og:street_address' => array(
+ 'value' => '',
+ ),
+ 'og:locality' => array(
+ 'value' => '',
+ ),
+ 'og:region' => array(
+ 'value' => '',
+ ),
+ 'og:postal_code' => array(
+ 'value' => '',
+ ),
+ 'og:country_name' => array(
+ 'value' => '',
+ ),
+ 'og:email' => array(
+ 'value' => '',
+ ),
+ 'og:phone_number' => array(
+ 'value' => '',
+ ),
+ 'og:fax_number' => array(
+ 'value' => '',
+ ),
+ 'og:locale' => array(
+ 'value' => '',
+ ),
+ 'og:locale:alternate' => array(
+ 'value' => '',
+ ),
+ 'article:author' => array(
+ 'value' => '',
+ ),
+ 'article:publisher' => array(
+ 'value' => '',
+ ),
+ 'article:section' => array(
+ 'value' => '',
+ ),
+ 'article:tag' => array(
+ 'value' => '',
+ ),
+ 'article:published_time' => array(
+ 'value' => '',
+ ),
+ 'article:modified_time' => array(
+ 'value' => '',
+ ),
+ 'article:expiration_time' => array(
+ 'value' => '',
+ ),
+ 'profile:first_name' => array(
+ 'value' => '',
+ ),
+ 'profile:last_name' => array(
+ 'value' => '',
+ ),
+ 'profile:username' => array(
+ 'value' => '',
+ ),
+ 'profile:gender' => array(
+ 'value' => '',
+ ),
+ 'og:audio' => array(
+ 'value' => '',
+ ),
+ 'og:audio:secure_url' => array(
+ 'value' => '',
+ ),
+ 'og:audio:type' => array(
+ 'value' => '',
+ ),
+ 'book:author' => array(
+ 'value' => '',
+ ),
+ 'book:isbn' => array(
+ 'value' => '',
+ ),
+ 'book:release_date' => array(
+ 'value' => '',
+ ),
+ 'book:tag' => array(
+ 'value' => '',
+ ),
+ 'og:video:url' => array(
+ 'value' => '',
+ ),
+ 'og:video:secure_url' => array(
+ 'value' => '',
+ ),
+ 'og:video:width' => array(
+ 'value' => '',
+ ),
+ 'og:video:height' => array(
+ 'value' => '',
+ ),
+ 'og:video:type' => array(
+ 'value' => '',
+ ),
+ 'video:actor' => array(
+ 'value' => '',
+ ),
+ 'video:actor:role' => array(
+ 'value' => '',
+ ),
+ 'video:director' => array(
+ 'value' => '',
+ ),
+ 'video:writer' => array(
+ 'value' => '',
+ ),
+ 'video:duration' => array(
+ 'value' => '',
+ ),
+ 'video:release_date' => array(
+ 'value' => '',
+ ),
+ 'video:tag' => array(
+ 'value' => '',
+ ),
+ 'video:series' => array(
+ 'value' => '',
+ ),
+ ),
+ );
+ $handler->display->display_options['path'] = 'metatag-views-test';
+ $translatables['metatag_views_test'] = array(
+ t('Master'),
+ t('Metatag Views i18n test'),
+ t('more'),
+ t('Apply'),
+ t('Reset'),
+ t('Sort by'),
+ t('Asc'),
+ t('Desc'),
+ t('Items per page'),
+ t('- All -'),
+ t('Offset'),
+ t('« first'),
+ t('‹ previous'),
+ t('next ›'),
+ t('last »'),
+ t('Page'),
+ );
+ $export['metatag_views_test'] = $view;
+
+ return $export;
+}
diff --git a/sites/all/modules/contrib/seo/metatag/plugins/content_types/node_form_metatags.inc b/sites/all/modules/contrib/seo/metatag/plugins/content_types/node_form_metatags.inc
new file mode 100644
index 0000000..5439f04
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/plugins/content_types/node_form_metatags.inc
@@ -0,0 +1,75 @@
+ TRUE,
+ 'title' => t('Node form meta tags'),
+ 'icon' => 'icon_node_form.png',
+ 'description' => t('Meta tags on the node form.'),
+ 'required context' => new ctools_context_required(t('Form'), 'node_form'),
+ 'category' => t('Form'),
+);
+
+/**
+ * CTools content type callback to output this pane.
+ */
+function metatag_node_form_metatags_content_type_render($subtype, $conf, $panel_args, &$context) {
+ $block = new stdClass();
+
+ $block->title = t('Meta tags');
+ $block->module = 'metatag';
+ $block->delta = 'metatag';
+
+ if (isset($context->form)) {
+ if (isset($context->form['metatags'])) {
+ $block->content['metatags'] = $context->form['metatags'];
+ unset($block->content['metatags']['#pre_render']);
+ unset($block->content['metatags']['#theme_wrappers']);
+ $block->content['metatags']['#type'] = '';
+
+ // Set access to false on the original rather than removing so that
+ // vertical tabs doesn't clone it. I think this is due to references.
+ $context->form['metatags']['#access'] = FALSE;
+ }
+ }
+ else {
+ $block->content = t('Meta tags options.');
+ }
+ return $block;
+}
+
+/**
+ * CTools content type callback to get the title of this pane.
+ */
+function metatag_node_form_metatags_content_type_admin_title($subtype, $conf, $context) {
+ if (isset($context->identifier)) {
+ $message = t('"@s" node form meta tags', array('@s' => $context->identifier));
+ }
+ else {
+ $message = t('Node form meta tags');
+ }
+ return $message;
+}
+
+/**
+ * CTools content type callback to display an edit form for this pane.
+ */
+function metatag_node_form_metatags_content_type_edit_form($form, &$form_state) {
+ // Provide a blank form so we have a place to have context setting.
+ return $form;
+}
+
+/**
+ * CTools content type callback to provide extra information about this pane.
+ */
+function metatag_node_form_metatags_content_type_admin_info($type, $subtype, $conf, $context = NULL) {
+ $output = new stdClass();
+ $output->title = t('Metatag form');
+ $output->content = t('Shows the meta tag fields on this node form if the user has the appropriate permissions.');
+
+ return $output;
+}
diff --git a/sites/all/modules/contrib/seo/metatag/tests/metatag.bulk_revert.test b/sites/all/modules/contrib/seo/metatag/tests/metatag.bulk_revert.test
new file mode 100644
index 0000000..8dfb01f
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/tests/metatag.bulk_revert.test
@@ -0,0 +1,56 @@
+ 'Metatag bulk revert',
+ 'description' => 'Test the Metatag bulk revert functionality.',
+ 'group' => 'Metatag',
+ 'dependencies' => array('ctools', 'token'),
+ );
+ }
+
+ /**
+ * Test the Bulk Revert functionality works.
+ */
+ function testBulkRevertPageLoads() {
+ $this->adminUser = $this->createAdminUser();
+ $this->drupalLogin($this->adminUser);
+
+ $this->drupalGet('admin/config/search/metatags/bulk-revert');
+ $this->assertResponse(200);
+
+ // Confirm each of the entity checkboxes is present.
+ foreach (entity_get_info() as $entity_type => $entity_info) {
+ foreach (array_keys($entity_info['bundles']) as $bundle) {
+ if (metatag_entity_supports_metatags($entity_type, $bundle)) {
+ $this->assertFieldByName("update[{$entity_type}:{$bundle}]");
+ }
+ }
+ }
+
+ // Confirm each of the meta tags is available as a checkbox.
+ foreach (metatag_get_info('tags') as $tag_name => $tag) {
+ $this->assertFieldByName("tags[{$tag_name}]");
+ }
+
+ // Confirm each of the languages has a checkbox.
+ $this->assertFieldByName("languages[" . LANGUAGE_NONE . "]");
+ foreach (language_list() as $language) {
+ $this->assertFieldByName("languages[{$language->language}]");
+ }
+ }
+
+}
diff --git a/sites/all/modules/contrib/seo/metatag/tests/metatag.core_tag_removal.test b/sites/all/modules/contrib/seo/metatag/tests/metatag.core_tag_removal.test
new file mode 100644
index 0000000..d2d7ed7
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/tests/metatag.core_tag_removal.test
@@ -0,0 +1,78 @@
+ 'Metatag core tag handling',
+ 'description' => 'Test Metatag integration with the locale module.',
+ 'group' => 'Metatag',
+ 'dependencies' => array('ctools', 'token'),
+ );
+ }
+
+ /**
+ * Test that the core meta tags work correctly.
+ */
+ function testCoreTagRemoval() {
+ // The default generator strings from core and Metatag.
+ $generator_core = 'Drupal 7 (http://drupal.org)';
+ $generator_metatag = 'Drupal 7 (https://www.drupal.org)';
+
+ // Load the front page.
+ $this->drupalGet('' . check_plain($title) . "
\n";
+ }
+
+ parent::verbose($title . $message);
+ }
+
+ /**
+ * Load the Performance admin page and clear all caches.
+ */
+ public function clearAllCaches() {
+ $this->drupalGet('admin/config/development/performance');
+ $this->assertResponse(200);
+ $this->assertText(t('Performance'));
+ $this->assertText(t('Clear cache'));
+ $this->drupalPost(NULL, array(), t('Clear all caches'));
+ $this->assertResponse(200);
+ $this->assertText(t('Caches cleared'));
+ }
+
+ /**
+ * Create a content type for the tests.
+ */
+ function createContentType($machine_name, $label) {
+ // Create a content type.
+ $content_type = $this->drupalCreateContentType(array(
+ 'type' => $machine_name,
+ 'name' => $label,
+ ));
+
+ // Enable meta tags for this new content type.
+ metatag_entity_type_enable('node', $machine_name, TRUE);
+
+ return $content_type;
+ }
+
+ /**
+ * Create an admin user for the tests.
+ *
+ * @param array $extra_permissions
+ * An array of permission strings to be added to the user.
+ *
+ * @return object
+ * A user object.
+ */
+ function createAdminUser($extra_permissions = array()) {
+ $permissions = array(
+ // Basic permissions for the module.
+ 'administer meta tags',
+ 'edit meta tags',
+
+ // General admin access.
+ 'access administration pages',
+ );
+
+ // Reset the static variable used to identify permissions, otherwise it's
+ // possible the permissions check in drupalCreateUser will fail.
+ $this->checkPermissions(array(), TRUE);
+ cache_clear_all();
+
+ return $this->drupalCreateUser(array_merge($permissions, $extra_permissions));
+ }
+
+ /**
+ * Create a normal user for the tests.
+ *
+ * @param array $extra_permissions
+ * An array of permission strings to be added to the user.
+ *
+ * @return object
+ * A user object.
+ */
+ function createUser($extra_permissions) {
+ // Basic permissions for the module.
+ $permissions = array(
+ 'edit meta tags',
+ );
+
+ // Reset the static variable used to identify permissions, otherwise it's
+ // possible the permissions check in drupalCreateUser will fail.
+ $this->checkPermissions(array(), TRUE);
+ cache_clear_all();
+
+ return $this->drupalCreateUser(array_merge($permissions, $extra_permissions));
+ }
+
+ /**
+ * Returns a new vocabulary with random properties.
+ *
+ * @param $vocab_name
+ * If empty a random string will be used.
+ * @param $content_type
+ * Any content types listed will have a Taxonomy Term reference field added
+ * that points to the new vocabulary.
+ *
+ * @return object
+ * A vocabulary object.
+ */
+ function createVocabulary($vocab_name = NULL, $content_type = NULL) {
+ if (empty($vocab_name)) {
+ $vocab_name = $this->randomName();
+ }
+
+ // Create a vocabulary.
+ $vocabulary = new stdClass();
+ $vocabulary->name = $vocab_name;
+ $vocabulary->description = $vocab_name;
+ $vocabulary->machine_name = drupal_strtolower($vocab_name);
+ $vocabulary->help = '';
+ $vocabulary->weight = mt_rand(0, 10);
+ if (!empty($content_type)) {
+ $vocabulary->nodes = array($content_type => $content_type);
+ }
+ taxonomy_vocabulary_save($vocabulary);
+
+ // Enable meta tags for this new vocabulary.
+ metatag_entity_type_enable('taxonomy_term', $vocab_name, TRUE);
+
+ return $vocabulary;
+ }
+
+ /**
+ * Returns a new taxonomy term in a specific vocabulary.
+ *
+ * @param object $vocabulary
+ * The vocabulary to add the term to.
+ * @param string $term_name
+ * The name to use for the new vocabulary. If none is provided one will be
+ * generated randomly.
+ *
+ * @return object
+ * A taxonomy term object.
+ */
+ function createTerm($vocabulary, $term_name = NULL) {
+ if (empty($term_name)) {
+ $term_name = $this->randomName();
+ }
+
+ // Create an object to save.
+ $term = new stdClass();
+ $term->name = $term_name;
+ $term->description = $term_name;
+ // Use the first available text format.
+ $term->format = db_query_range('SELECT format FROM {filter_format}', 0, 1)->fetchField();
+ $term->vid = $vocabulary->vid;
+
+ // Save the term.
+ taxonomy_term_save($term);
+
+ return $term;
+ }
+
+ /**
+ * Return an list of default values.
+ *
+ * This should cover all of the default meta tags provided for a test:foo
+ * entity.
+ *
+ * @todo Expand to cover more meta tags.
+ *
+ * @see metatag_test_metatag_config_default()
+ */
+ function getTestDefaults() {
+ return array(
+ // Basic meta tags.
+ 'title' => array('value' => 'Test altered title'),
+ 'description' => array('value' => 'Test foo description'),
+ 'abstract' => array('value' => 'Test foo abstract'),
+ // 'keywords' => array('value' => ''),
+ // Advanced meta tags.
+ // 'robots' => array('value' => ''),
+ // 'news_keywords' => array('value' => ''),
+ // 'standout' => array('value' => ''),
+ // 'robots' => array('value' => ''),
+ // 'standout' => array('value' => ''),
+ 'generator' => array('value' => 'Drupal 7 (https://www.drupal.org)'),
+ // 'standout' => array('value' => ''),
+ // 'image_src' => array('value' => ''),
+ 'canonical' => array('value' => '[current-page:url:absolute]'),
+ 'shortlink' => array('value' => '[current-page:url:unaliased]'),
+ // 'publisher' => array('value' => ''),
+ // 'author' => array('value' => ''),
+ // 'original-source' => array('value' => ''),
+ // 'revisit-after' => array('value' => ''),
+ // 'content-language' => array('value' => ''),'
+ );
+ }
+
+ /**
+ * Add a locale to the site.
+ *
+ * This assumes the Locale module is enabled.
+ */
+ public function addSiteLanguage($langcode) {
+ // Load the language-add page.
+ $this->drupalGet('admin/config/regional/language/add');
+ $this->assertResponse(200, 'Loaded the language-add admin page.');
+
+ // Submit the language-add form.
+ $args = array(
+ 'langcode' => $langcode,
+ );
+ $this->drupalPost(NULL, $args, t('Add language'));
+ $this->assertResponse(200);
+
+ // Verify that the browser was returned to the main languages admin page.
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), 'Redirected back to the main languages admin page.');
+
+ // Clear the language list cache so it can be reloaded.
+ drupal_static_reset('language_list');
+
+ // Get all language definitions.
+ $languages = language_list();
+ $language = $languages[$langcode]->name;
+ $this->assertText(strip_tags(t('The language %language has been created and can now be used. More information is available on the help screen.', array('%language' => t($language), '@locale-help' => url('admin/help/locale')))), 'A new language has been added.');
+ }
+
+ /**
+ * Set up a basic starting point for the locales.
+ *
+ * This assumes the Locale module is enabled. This also must be done before
+ * other user accounts are logged in.
+ *
+ * @param array $locales
+ * A list of locales to be enabled, in langcode format.
+ */
+ public function setupLocales(array $locales = array()) {
+ // If no locales were requested, add Spanish and French.
+ if (empty($locales)) {
+ $locales[] = 'es';
+ $locales[] = 'fr';
+ }
+
+ // Log in as an admin user with privs to just set up the locales.
+ $perms = array(
+ 'administer languages',
+ 'translate interface',
+ 'access administration pages',
+ );
+ $admin_user = $this->drupalCreateUser($perms);
+ $this->drupalLogin($admin_user);
+
+ // Load the admin page, just to have a point of reference.
+ $this->drupalGet('admin');
+ $this->assertResponse(200, 'Loaded the main admin page.');
+
+ // Identify the site's default language.
+ $default_language = language_default('language');
+
+ // Add the locales.
+ foreach ($locales as $langcode) {
+ // Don't create the default language, it's already present.
+ if ($langcode != $default_language) {
+ $this->addSiteLanguage($langcode);
+ }
+ }
+
+ // Enable URL language detection and selection.
+ $this->drupalGet('admin/config/regional/language/configure');
+ $this->assertResponse(200);
+ $edit = array(
+ 'language[enabled][locale-url]' => TRUE,
+ );
+ // Also enable path handling for Entity Translation if it is installed.
+ if (module_exists('entity_translation')) {
+ $edit['language_content[enabled][locale-url]'] = TRUE;
+ }
+ $this->drupalPost(NULL, $edit, t('Save settings'));
+ $this->assertResponse(200);
+
+ // Once all the setup is done, log out the user.
+ $this->drupalLogout();
+ }
+
+ /**
+ * Get the {locales_source} lid value for a specific context.
+ *
+ * @param string $context
+ * The context string to search for.
+ * @param string $textgroup
+ * This string's textgroup; defaults to 'metatag'.
+ *
+ * @return integer
+ * The {locales_source}.lid value for this string.
+ */
+ function getTranslationLidByContext($context, $textgroup = 'metatag') {
+ // Extra debug output.
+ $this->debugLocalesSourcesByContext($context);
+
+ // Look for the string that's actually being requested.
+ return (int) db_query("SELECT lid
+ FROM {locales_source}
+ WHERE textgroup = :textgroup
+ AND context = :context",
+ array(
+ ':textgroup' => $textgroup,
+ ':context' => $context,
+ ))
+ ->fetchField();
+ }
+
+ /**
+ * Get the {locales_source} lid value for a specific source.
+ *
+ * @param string $string
+ * The translation string to search for.
+ * @param string $textgroup
+ * This string's textgroup; defaults to 'metatag'.
+ *
+ * @return integer
+ * The {locales_source}.lid value for this string.
+ */
+ function getTranslationLidBySource($string, $textgroup = 'metatag') {
+ // Extra debug output.
+ $this->debugLocalesSourcesByContext('', $textgroup);
+
+ // Look for the string that's actually being requested.
+ return (int) db_query("SELECT lid
+ FROM {locales_source}
+ WHERE textgroup = :textgroup
+ AND source = :source",
+ array(
+ ':textgroup' => $textgroup,
+ ':source' => $string,
+ ))
+ ->fetchField();
+ }
+
+ /**
+ * Get the {locales_source} lid values for a specific context.
+ *
+ * @param string $context
+ * The context string to search for.
+ * @param string $textgroup
+ * This string's textgroup; defaults to 'metatag'.
+ *
+ * @return integer
+ * The {locales_source}.lid value for this string.
+ */
+ function getTranslationsByContext($context, $textgroup = 'metatag') {
+ return db_query("SELECT lid
+ FROM {locales_source}
+ WHERE textgroup = :textgroup
+ AND context = :context",
+ array(
+ ':textgroup' => $textgroup,
+ ':context' => $context,
+ ))
+ ->fetchCol();
+ }
+
+ /**
+ * Generate a debug dump of the {locales_source} records for a specific context.
+ *
+ * @param string $context
+ * The translation context to search against.
+ * @param string $textgroup
+ * This string's textgroup; defaults to 'metatag'.
+ */
+ function debugLocalesSourcesByContext($context, $textgroup = 'metatag') {
+ // Get a dump of all i18n strings for Metatag.
+ $records = db_query("SELECT lid, location, textgroup, source, context, version
+ FROM {locales_source}
+ WHERE textgroup = :textgroup",
+ array(
+ ':textgroup' => $textgroup,
+ ))
+ ->fetchAllAssoc('lid');
+ foreach ($records as $key => $record) {
+ $records[$key] = (array) $record;
+ }
+ $args = array(
+ 'caption' => 'i18n source check for . ' . $context,
+ 'header' => array(
+ 'lid',
+ 'location',
+ 'textgroup',
+ 'source',
+ 'context',
+ 'version',
+ ),
+ 'rows' => $records,
+ );
+ $this->verbose(theme('table', $args));
+ }
+
+ /**
+ * Save a {locales_target} translation string to the database.
+ *
+ * @param int $lid
+ * The {locales_source}.lid primary key.
+ * @param string $context
+ * The {locales_source}.context value for this string.
+ * @param string $langcode
+ * The language the string is being translated into.
+ * @param string $string_source
+ * The string that is being translated.
+ * @param string $string_target
+ * The destination string.
+ */
+ function saveTranslationString($lid, $context, $langcode, $string_source, $string_target) {
+ // Load the translation page for the front page's title tag.
+ $this->drupalGet('admin/config/regional/translate/edit/' . $lid);
+ $this->assertResponse(200, 'Loaded the front page title tag string translation page.');
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/translate/edit/' . $lid, array('absolute' => TRUE)));
+
+ // Confirm that the permission-check text is not found.
+ $this->assertNoText(t('This is a user-defined string. You are not allowed to translate these strings.'));
+
+ // Look for the existing string. The string gets mungled by the Locale
+ // module, so need to replicate its behaviour.
+ $this->assertText(check_plain(wordwrap($string_source, 0)));
+
+ // Look for the context value; the context value is empty for all default
+ // i.e. interface strings, so don't test this when the context is empty.
+ if (!empty($context)) {
+ $this->assertText($context);
+ }
+
+ // Confirm that the destination strings exist.
+ $source_locale = language_default('language');
+ if (function_exists('i18n_string_source_language')) {
+ $source_locale = i18n_string_source_language();
+ }
+ if ($source_locale != 'en') {
+ $this->assertField('translations[en]', 'Found the English translation string field.');
+ }
+ if ($source_locale != 'fr') {
+ $this->assertField('translations[fr]', 'Found the French translation string field.');
+ }
+ if ($source_locale != 'es') {
+ $this->assertField('translations[es]', 'Found the Spanish translation string field.');
+ }
+
+ // Translate the string.
+ $edit = array(
+ "translations[{$langcode}]" => $string_target,
+ );
+ $this->drupalPost(NULL, $edit, t('Save translations'));
+ $this->assertResponse(200);
+
+ // Confirm the save worked.
+ $this->assertText(t('The string has been saved.'));
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/translate/translate', array('absolute' => TRUE)));
+
+ // Debug output.
+ $this->debugLocalesTargetsByContext($context);
+
+ // Clear the Metatag caches.
+ metatag_flush_caches();
+ }
+
+ /**
+ * Generate a debug dump of the {locales_target} records for a specific context.
+ *
+ * @param string $context
+ * The translation context to search against.
+ */
+ function debugLocalesTargetsByContext($context) {
+ // , lt.i18n_status
+ $records = db_query("SELECT lt.lid, lt.translation, lt.language, lt.plid, lt.plural
+ FROM {locales_target} lt
+ INNER JOIN {locales_source} ls
+ ON lt.lid = ls.lid
+ WHERE ls.textgroup = 'metatag'
+ AND ls.context = :context",
+ array(':context' => $context))
+ ->fetchAllAssoc('lid');
+ foreach ($records as $key => $record) {
+ $records[$key] = (array) $record;
+ }
+ $args = array(
+ 'caption' => 'Locale target check for . ' . $context,
+ 'header' => array(
+ 'lid',
+ 'translation',
+ 'language',
+ 'plid',
+ 'plural',
+ // 'i18n_status',
+ ),
+ 'rows' => $records,
+ );
+ $this->verbose(theme('table', $args));
+ }
+
+ /**
+ * Creates an object which can be used for generating and checking behavior.
+ *
+ * @param string $identifier
+ * The machine name to identify this object in source code.
+ * @param string $path
+ * Path where generate metatags.
+ *
+ * @return object
+ * A mapping object.
+ */
+ function createTestObject($identifier, $path) {
+ $test_object = new stdClass();
+ $test_object->name = $identifier;
+ $test_object->path = $path;
+ $test_object->title = "My $identifier title";
+ $test_object->description = "My $identifier description";
+ $test_object->abstract = "My $identifier abstract";
+ $test_object->keywords = "My $identifier keywords";
+
+ return $test_object;
+ }
+
+ /**
+ * Generates meta tags by path from a test_object.
+ *
+ * @return $test_object
+ * Metatag mapping object.
+ */
+ function generateByPathConfig($test_object) {
+ // Verify the "add context" page works.
+ $this->drupalGet('admin/config/search/metatags/context');
+ $this->assertResponse(200);
+ $this->assertText(t('Add a meta tag by path'));
+
+ // Verify the "add context" page works.
+ $this->drupalGet('admin/config/search/metatags/context/add');
+ $this->assertResponse(200);
+ $this->assertText(t('The unique ID for this metatag path context rule. This must contain only lower case letters, numbers and underscores.'));
+
+ // Add new Metatag object for this configuration.
+ $values = array(
+ 'name' => $test_object->name,
+ );
+
+ $this->drupalPost('admin/config/search/metatags/context/add', $values, t('Add and configure'));
+ $this->assertResponse(200);
+ }
+
+ /**
+ * Edits meta tags by path from a test_object.
+ *
+ * @return $test_object
+ * Metatag mapping object.
+ */
+ function editByPathConfig($test_object) {
+ $edit = array(
+ 'paths' => $test_object->path,
+ 'metatags[und][title][value]' => $test_object->title,
+ 'metatags[und][description][value]' => $test_object->description,
+ 'metatags[und][abstract][value]' => $test_object->abstract,
+ 'metatags[und][keywords][value]' => $test_object->keywords,
+ );
+ $this->drupalPost('admin/config/search/metatags/context/' . $test_object->name, $edit, t('Save'));
+ $this->assertResponse(200);
+ }
+
+ /**
+ * Checks if meta tags have been added correctly from a test_object.
+ *
+ * @return $test_object
+ * Metatag mapping object.
+ */
+ function checkByPathConfig($test_object) {
+ $this->drupalGet($test_object->path);
+ $this->assertResponse(200);
+
+ // Manually test the page title.
+ if (!empty($test_object->title)) {
+ $this->assertTitle($test_object->title, 'Title found in ' . $test_object->path);
+ }
+
+ // Test the other meta tags.
+ $tags = array('description', 'abstract', 'keywords');
+ foreach ($tags as $tag) {
+ if (!empty($test_object->{$tag})) {
+ $this->assertRaw($test_object->{$tag}, $tag . ' found in ' . $test_object->path);
+ }
+ else {
+ $this->assertNoRaw('assertTrue($count >= 1, 'Found Metatag strings to translate.');
+ $this->assertNoText(t('No strings available.'));
+ $xpath = $this->xpath("//body//div[@class='content']//table//tbody//tr");
+ $this->verbose("Found {$count} items to translate.");
+ if (!empty($string)) {
+ $this->assertText($context);
+ $this->assertText('metatag:' . $context);
+ }
+ }
+ // If the string is not supposed to be found, then confirm the context is
+ // not available.
+ else {
+ $this->assertNoText($context);
+ $this->assertNoText('metatag:' . $context);
+ }
+ }
+
+ /**
+ * Create an image of a specific size & type.
+ *
+ * @param string $image_size
+ * The size of the requested image in 'XxY' format; defaults to '200x200'.
+ * @param string $format
+ * The image format to use, defaults to 'png'.
+ *
+ * @return string
+ * The URL to a public file.
+ */
+ function generateImage($image_size = '200x200', $format = 'png') {
+ // Only proceed if the Devel Generate module is installed.
+ if (module_exists('devel_generate')) {
+ // Load the Devel Generate image generator logic.
+ module_load_include('inc', 'devel_generate', 'image.devel_generate');
+
+ $image_format = 'png';
+ $image_size = '200x200';
+ $temp_image = devel_generate_image($image_format, $image_size, $image_size);
+
+ return file_unmanaged_move($temp_image, 'public://');
+ }
+ else {
+ $this->error('The Devel Generate module is not enabled, it must be added to the $modules array in the setUp() method for this test class.');
+ }
+ }
+
+ /**
+ * Create an image file object of a specific size & type.
+ *
+ * @param string
+ * The size of the requested image in 'XxY' format; defaults to '200x200'.
+ * @param string
+ * The image format to use, defaults to 'png'.
+ *
+ * @return object
+ * The file object for the generated image.
+ */
+ function generateImageFile($image_size = '200x200', $format = 'png') {
+ // Generate a test image.
+ $image_uri = $this->generateImage();
+
+ // Create a file object for this image.
+ $file = new StdClass();
+ $file->fid = NULL;
+ $file->uid = 1;
+ $file->uri = $image_uri;
+ $file->filemime = file_get_mimetype($image_uri);
+ $file->filesize = filesize($image_uri);
+ $file->status = 1;
+ $file->timestamp = filemtime($image_uri);
+ $saved_file = file_save($file);
+
+ return $saved_file;
+ }
+
+ /**
+ * Verify a user entity's meta tags load correctly.
+ *
+ * @param object $user
+ * A user object that is to be tested.
+ */
+ function assertUserEntityTags($user) {
+ // Load the user's profile page.
+ $this->drupalGet('user/' . $user->uid);
+ $this->assertResponse(200);
+
+ // Verify the title is using the custom default for this vocabulary.
+ $xpath = $this->xpath("//meta[@name='abstract']");
+ $this->assertEqual(count($xpath), 1, 'Exactly one abstract meta tag found.');
+ $this->assertEqual($xpath[0]['content'], $user->name . " ponies");
+ }
+
+ /**
+ * Generate a string that is allowable as a machine name.
+ *
+ * @param int $length
+ * How long the machine name will be, defaults to eight characters.
+ *
+ * @return string
+ * A string that contains lowercase letters and numbers, with a letter as
+ * the first character.
+ */
+ function randomMachineName($length = 8) {
+ return strtolower($this->randomName($length));
+ }
+
+}
diff --git a/sites/all/modules/contrib/seo/metatag/tests/metatag.image.test b/sites/all/modules/contrib/seo/metatag/tests/metatag.image.test
new file mode 100644
index 0000000..bdf8ad7
--- /dev/null
+++ b/sites/all/modules/contrib/seo/metatag/tests/metatag.image.test
@@ -0,0 +1,491 @@
+ 'Metatag core tests for images',
+ 'description' => 'Test Metatag integration with image files.',
+ 'group' => 'Metatag',
+ 'dependencies' => array('ctools', 'token', 'devel_generate'),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ function setUp(array $modules = array()) {
+ // Needs the OpenGraph submodule because of testNodeFieldValueMultiple().
+ $modules[] = 'metatag_opengraph';
+
+ // Need image handling.
+ $modules[] = 'image';
+
+ // Need the Devel Generate image generator.
+ $modules[] = 'devel_generate';
+
+ parent::setUp($modules);
+ }
+
+ /**
+ * Confirm that an image can be added to a global configuration using the
+ * image's absolute URL.
+ */
+ function testConfigAbsoluteURL() {
+ // Generate a test image.
+ $image_uri = $this->generateImage();
+ $this->verbose($image_uri);
+
+ // Work out the web-accessible URL for this image.
+ $image_url = file_create_url($image_uri);
+
+ // Update the global config to add an image meta tag.
+ $config = metatag_config_load('global');
+ $config->config['image_src']['value'] = $image_url;
+ metatag_config_save($config);
+
+ // Dump out the current config, to aid with debugging.
+ $this->verbose($config);
+
+ // Load the front page.
+ $this->drupalGet('