bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated ctools, needed by panles

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2016-10-25 17:47:45 +02:00
parent f6f7fd575f
commit b11abbed59
59 changed files with 779 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sites/all/modules/contrib/dev/ctools/bulk_export/bulk_export.info
View File

@ -6,9 +6,9 @@ package = Chaos tool suite
version = CTOOLS_MODULE_VERSION
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

60
sites/all/modules/contrib/dev/ctools/css/modal-rtl.css Normal file
View File

@ -0,0 +1,60 @@
div.ctools-modal-content {
text-align: right;
}
div.ctools-modal-content .modal-header {
background-color: #2385c2;
padding: 0 1em 0 .25em;
}
div.ctools-modal-content a.close {
color: white;
float: left;
}
/** modal forms CSS **/
div.ctools-modal-content .form-item label {
float: right;
}
div.ctools-modal-content .form-item .description {
clear: right;
}
div.ctools-modal-content .form-item .description .tips {
margin-left: 0;
margin-right: 2em;
}
div.ctools-modal-content fieldset,
div.ctools-modal-content .form-radios,
div.ctools-modal-content .form-checkboxes {
clear: right;
}
div.ctools-modal-content .resizable-textarea {
margin-left: 5em;
margin-right: 15em;
}
div.ctools-modal-content .container-inline .form-item {
margin-right: 0;
margin-left: 2em;
}
div.ctools-modal-content label.hidden-options {
background-position: left;
padding-right: 0;
padding-left: 12px;
}
div.ctools-modal-content label.expanded-options {
background-position: left;
padding-right: 0;
padding-left: 16px;
}
div.ctools-modal-content .dependent-options {
padding-left: 0;
padding-right: 30px;
}

7
sites/all/modules/contrib/dev/ctools/ctools.info
View File

@ -2,16 +2,15 @@ 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-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

10
sites/all/modules/contrib/dev/ctools/ctools.module
View File

@ -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.
@ -23,7 +23,7 @@ define('CTOOLS_API_VERSION', '2.0.8');
* ; Requires CTools v7.x-1.4 or newer.
* dependencies[] = ctools (>=1.4)
*/
define('CTOOLS_MODULE_VERSION', '7.x-1.9');
define('CTOOLS_MODULE_VERSION', '7.x-1.11');
/**
* Test the CTools API version.
@ -758,6 +758,12 @@ function ctools_process(&$variables, $hook) {
$variables['classes_array'] = array_diff($variables['classes_array'], $remove_classes);
}
// Update the classes within the attributes array to match the classes array
if (isset($variables['attributes_array']['class'])) {
$variables['attributes_array']['class'] = array_unique(array_merge($variables['classes_array'], $variables['attributes_array']['class']));
$variables['attributes'] = $variables['attributes_array'] ? drupal_attributes($variables['attributes_array']) : '';
}
// Since this runs after template_process(), we need to re-implode the
// classes array.
$variables['classes'] = implode(' ', $variables['classes_array']);

6
sites/all/modules/contrib/dev/ctools/ctools_access_ruleset/ctools_access_ruleset.info
View File

@ -5,9 +5,9 @@ package = Chaos tool suite
version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

6
sites/all/modules/contrib/dev/ctools/ctools_ajax_sample/ctools_ajax_sample.info
View File

@ -5,9 +5,9 @@ version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
core = 7.x
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

6
sites/all/modules/contrib/dev/ctools/ctools_custom_content/ctools_custom_content.info
View File

@ -5,9 +5,9 @@ package = Chaos tool suite
version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

17
sites/all/modules/contrib/dev/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php
View File

@ -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'),
@ -43,6 +59,7 @@ class ctools_custom_content_ui extends ctools_export_ui {
// 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'];

6
sites/all/modules/contrib/dev/ctools/ctools_plugin_example/ctools_plugin_example.info
View File

@ -8,9 +8,9 @@ dependencies[] = page_manager
dependencies[] = advanced_help
core = 7.x
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

10
sites/all/modules/contrib/dev/ctools/includes/context.inc
View File

@ -42,7 +42,7 @@ class ctools_context {
var $restrictions = array();
var $empty = FALSE;
function ctools_context($type = 'none', $data = NULL) {
function __construct($type = 'none', $data = NULL) {
$this->type = $type;
$this->data = $data;
$this->title = t('Unknown context');
@ -119,7 +119,7 @@ class ctools_context_required {
* @param ...
* One or more keywords to use for matching which contexts are allowed.
*/
function ctools_context_required($title) {
function __construct($title) {
$args = func_get_args();
$this->title = array_shift($args);
@ -204,10 +204,6 @@ class ctools_context_required {
*/
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);
}
/**
* Add the 'empty' context which is possible for optional
@ -1163,7 +1159,7 @@ 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'];

5
sites/all/modules/contrib/dev/ctools/includes/export.inc
View File

@ -902,7 +902,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";
@ -1227,7 +1228,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";

3
sites/all/modules/contrib/dev/ctools/includes/fields.inc
View File

@ -137,7 +137,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 +145,6 @@ function ctools_fields_get_field_formatter_info($fields) {
}
}
}
drupal_alter('field_formatter_info', $info);
return $info;
}

2
sites/all/modules/contrib/dev/ctools/includes/math-expr.inc
View File

@ -99,7 +99,7 @@ class ctools_math_expr {
'sqrt','abs','ln','log',
'time', 'ceil', 'floor', 'min', 'max', 'round');
function ctools_math_expr() {
function __construct() {
// make the variables a little more accurate
$this->v['pi'] = pi();
$this->v['e'] = exp(1);

2
sites/all/modules/contrib/dev/ctools/includes/plugins.inc
View File

@ -474,7 +474,7 @@ function ctools_plugin_load_includes($info, $filename = NULL) {
}
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)

8
sites/all/modules/contrib/dev/ctools/js/auto-submit.js
View File

@ -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();
}
}
}

51
sites/all/modules/contrib/dev/ctools/js/dependent.js
View File

@ -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 {

33
sites/all/modules/contrib/dev/ctools/js/modal.js
View File

@ -121,18 +121,18 @@
*/
Drupal.theme.prototype.CToolsModalDialog = function () {
var html = ''
html += ' <div id="ctools-modal">'
html += ' <div class="ctools-modal-content">' // panels-modal-content
html += ' <div class="modal-header">';
html += ' <a class="close" href="#">';
html += Drupal.CTools.Modal.currentSettings.closeText + Drupal.CTools.Modal.currentSettings.closeImage;
html += ' </a>';
html += ' <span id="modal-title" class="modal-title">&nbsp;</span>';
html += ' </div>';
html += ' <div id="modal-content" class="modal-content">';
html += ' </div>';
html += '<div id="ctools-modal">'
html += ' <div class="ctools-modal-content">' // panels-modal-content
html += ' <div class="modal-header">';
html += ' <a class="close" href="#">';
html += Drupal.CTools.Modal.currentSettings.closeText + Drupal.CTools.Modal.currentSettings.closeImage;
html += ' </a>';
html += ' <span id="modal-title" class="modal-title">&nbsp;</span>';
html += ' </div>';
html += ' <div id="modal-content" class="modal-content">';
html += ' </div>';
html += ' </div>';
html += '</div>';
return html;
}
@ -142,11 +142,11 @@
*/
Drupal.theme.prototype.CToolsModalThrobber = function () {
var html = '';
html += ' <div id="modal-throbber">';
html += ' <div class="modal-throbber-wrapper">';
html += Drupal.CTools.Modal.currentSettings.throbber;
html += ' </div>';
html += '<div id="modal-throbber">';
html += ' <div class="modal-throbber-wrapper">';
html += Drupal.CTools.Modal.currentSettings.throbber;
html += ' </div>';
html += '</div>';
return html;
};
@ -265,7 +265,10 @@
}
// An empty event means we were triggered via .click() and
// in jquery 1.4 this won't trigger a submit.
if (event.bubbles == undefined) {
// We also have to check jQuery version to prevent
// IE8 + jQuery 1.4.4 to break on other events
// bound to the submit button.
if (jQuery.fn.jquery === '1.4' && typeof event.bubbles === "undefined") {
$(this.form).trigger('submit');
return false;
}

2
sites/all/modules/contrib/dev/ctools/js/stylizer.js
View File

@ -5,7 +5,7 @@
Drupal.CTools.Stylizer.addFarbtastic = function(context) {
// This behavior attaches by ID, so is only valid once on a page.
if ($('ctools_stylizer_color_scheme_form .color-form.Stylizer-processed').size()) {
if ($('#ctools_stylizer_color_scheme_form .color-form.Stylizer-processed').size()) {
return;
}

23
sites/all/modules/contrib/dev/ctools/page_manager/page_manager.admin.inc
View File

@ -1542,25 +1542,42 @@ function page_manager_handler_import_submit(&$form, &$form_state) {
* Rearrange the order of variants.
*/
function page_manager_handler_rearrange($form, &$form_state) {
ctools_include('context-task-handler');
$page = $form_state['page'];
$form['handlers'] = array('#tree' => TRUE);
// Get the number of variants to be displayed in order to set the delta
// to the proper value. This fixes problems in previous versions with sorting
// large numbers of variants.
$delta = count($page->handler_info)/2 + 1;
foreach ($page->handler_info as $id => $info) {
if ($info['changed'] & PAGE_MANAGER_CHANGED_DELETED) {
continue;
}
$handler = $page->handlers[$id];
$plugin = page_manager_get_task_handler($handler->handler);
$object = ctools_context_handler_get_task_object($page->task, $page->subtask, $handler);
$display = new stdClass();
$display->context = ctools_context_load_contexts($object, TRUE);
$content = page_manager_get_handler_title($plugin, $handler, $page->task, $page->subtask_id);
$access = ctools_access_group_summary(!empty($handler->conf['access']) ? $handler->conf['access'] : array(), $display->context);
if ($access) {
$access = t('This panel will be selected if @conditions.', array('@conditions' => $access));
}
else {
$access = t('This panel will always be selected.');
}
$content .= '<div>' . $access . '</div>';
$form['handlers'][$id]['title'] = array(
'#markup' => page_manager_get_handler_title($plugin, $handler, $page->task, $page->subtask_id),
'#markup' => $content,
);
$form['handlers'][$id]['weight'] = array(
'#type' => 'weight',
'#default_value' => $info['weight'],
'#delta' => 30,
'#delta' => $delta,
);
}

6
sites/all/modules/contrib/dev/ctools/page_manager/page_manager.info
View File

@ -5,9 +5,9 @@ dependencies[] = ctools
package = Chaos tool suite
version = CTOOLS_MODULE_VERSION
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

2
sites/all/modules/contrib/dev/ctools/page_manager/page_manager.module
View File

@ -1202,7 +1202,7 @@ function page_manager_page_manager_pages_to_hook_code($names = array(), $name =
foreach ($objects as $object) {
// Have to implement our own because this export func sig requires it
$code .= $export['export callback']($object, TRUE, ' ');
$code .= " \${$export['identifier']}s['" . check_plain($object->$export['key']) . "'] = \${$export['identifier']};\n\n";
$code .= " \${$export['identifier']}s['" . check_plain($object->{$export['key']}) . "'] = \${$export['identifier']};\n\n";
}
$code .= " return \${$export['identifier']}s;\n";
$code .= "}\n";

10
sites/all/modules/contrib/dev/ctools/page_manager/plugins/task_handlers/http_response.inc
View File

@ -3,7 +3,8 @@
/**
* @file
*
* This is the task handler plugin to handle generating 403, 404 and 301 response codes.
* This is the task handler plugin to handle generating 403, 404, 301 and 302
* response codes.
*/
// Plugin definition
@ -108,7 +109,8 @@ function page_manager_http_response_codes() {
403 => t('403 Access denied'),
404 => t('404 Page not found'),
410 => t('410 Gone'),
301 => t('301 Redirect'),
301 => t('301 Permanent redirect'),
302 => t('302 Temporary redirect'),
);
}
@ -256,7 +258,7 @@ function page_manager_http_response_edit_settings($form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Redirect destination'),
'#default_value' => $conf['destination'],
'#dependency' => array('edit-code' => array(301)),
'#dependency' => array('edit-code' => array(301, 302)),
'#description' => t('Enter the path to redirect to. You may use keyword substitutions from contexts. You can use external urls (http://www.example.com/foo) or internal urls (node/1).'),
);
@ -313,7 +315,7 @@ function page_manager_http_response_render($handler, $base_contexts, $args, $tes
}
$info['response code'] = $handler->conf['code'];
if ($info['response code'] == 301) {
if ($info['response code'] == 301 || $info['response code'] == 302) {
$path = ctools_context_keyword_substitute($handler->conf['destination'], array(), $contexts);
$url = parse_url($path);
if (isset($url['query'])) {

2
sites/all/modules/contrib/dev/ctools/page_manager/plugins/tasks/page.admin.inc
View File

@ -698,7 +698,7 @@ function page_manager_page_form_menu($form, &$form_state) {
'#title' => t('Title'),
'#type' => 'textfield',
'#default_value' => $menu['title'],
'#description' => t('If set to normal or tab, enter the text to use for the menu item.'),
'#description' => t('If set to normal or tab, enter the text to use for the menu item. Renaming the menu item using the Drupal menu system (admin/structure/menu) will override this, even if it is renamed again here.'),
'#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab', 'action')),
);

44
sites/all/modules/contrib/dev/ctools/plugins/access/query_string_exists.inc Normal file
View File

@ -0,0 +1,44 @@
<?php
/**
* @file
* Plugin for controlling access based on the existence of a query string.
*/
$plugin = array(
'title' => 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']));
}

58
sites/all/modules/contrib/dev/ctools/plugins/arguments/term.inc
View File

@ -18,6 +18,7 @@ $plugin = array(
'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 +32,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,12 +61,11 @@ 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 3;
@ -72,7 +82,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;
}
@ -98,13 +108,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.'),
);
@ -123,6 +140,12 @@ function ctools_term_settings_form(&$form, &$form_state, $conf) {
// 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);
}
/**
* Form fragment to get an argument to convert a placeholder for preview.
*/
@ -161,3 +184,20 @@ 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;
}

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_links.inc
View File

@ -26,7 +26,7 @@ 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;

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/comment/comment_reply_form.inc
View File

@ -25,7 +25,7 @@ if (module_exists('comment')) {
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;

31
sites/all/modules/contrib/dev/ctools/plugins/content_types/custom/custom.inc
View File

@ -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,
@ -180,6 +181,8 @@ function ctools_custom_content_type_render($subtype, $conf, $args, $contexts) {
$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'];
@ -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' => '<div class="option-text-aligner clearfix">',
);
$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' => '</div>',
);
$form['body'] = array(

40
sites/all/modules/contrib/dev/ctools/plugins/content_types/entity_context/entity_field.inc
View File

@ -137,25 +137,24 @@ 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'])) {
@ -270,10 +269,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');
}

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node/node.inc
View File

@ -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;

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_attachments.inc
View File

@ -14,7 +14,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';

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_children.inc
View File

@ -16,7 +16,7 @@ if (module_exists('book')) {
}
function ctools_node_book_children_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_children';

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_book_nav.inc
View File

@ -16,7 +16,7 @@ if (module_exists('book')) {
}
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';

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_form.inc
View File

@ -17,7 +17,7 @@ if (module_exists('comment')) {
}
function ctools_node_comment_form_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 = 'comments';
$block->delta = $node->nid;

4
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comment_wrapper.inc
View File

@ -23,7 +23,7 @@ if (module_exists('comment')) {
* Render the node comments.
*/
function ctools_node_comment_wrapper_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 = 'comments';
$block->delta = $node->nid;
@ -77,7 +77,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(

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_comments.inc
View File

@ -20,7 +20,7 @@ if (module_exists('comment')) {
}
function ctools_node_comments_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 = 'comments';
$block->delta = $node->nid;

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_content.inc
View File

@ -31,7 +31,7 @@ function ctools_node_content_content_type_render($subtype, $conf, $panel_args, $
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;

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_links.inc
View File

@ -29,7 +29,7 @@ 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;

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/node_context/node_type_desc.inc
View File

@ -18,7 +18,7 @@ $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';

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_description.inc
View File

@ -14,7 +14,7 @@ $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';

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/term_context/term_list.inc
View File

@ -21,7 +21,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'];

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/profile_fields.inc
View File

@ -21,7 +21,7 @@ if (module_exists('profile') && !(defined('MAINTENANCE_MODE') && MAINTENANCE_MOD
* 'Render' callback for the 'profile fields' content type.
*/
function ctools_profile_fields_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 = 'profile fields';

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_profile.inc
View File

@ -20,7 +20,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;
}

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/user_context/user_signature.inc
View File

@ -13,7 +13,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';

2
sites/all/modules/contrib/dev/ctools/plugins/content_types/vocabulary_context/vocabulary_terms.inc
View File

@ -21,7 +21,7 @@ if (module_exists('taxonomy')) {
* list of terms for the input vocabulary.
*/
function ctools_vocabulary_terms_content_type_render($subtype, $conf, $panel_args, $context) {
$vocab = isset($context->data) ? clone($context->data) : 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);

89
sites/all/modules/contrib/dev/ctools/plugins/contexts/query_string.inc Normal file
View File

@ -0,0 +1,89 @@
<?php
/**
* @file query_string.inc
* Context plugin that can extract arbitrary values from the query string.
*/
/**
* $plugin array which will be used by the system that includes this file.
*/
$plugin = array(
'title' => 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);
}
}

2
sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_field.inc
View File

@ -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 (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)) {
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 {

70
sites/all/modules/contrib/dev/ctools/plugins/relationships/entity_from_query_string.inc Normal file
View File

@ -0,0 +1,70 @@
<?php
/**
* @file
* Plugin to provide an relationship handler for entities from query string.
*/
/**
* Plugins are described by creating a $plugin array which will be used
* by the system that includes this file.
*/
$plugin = array(
'title' => 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'];
}

30
sites/all/modules/contrib/dev/ctools/plugins/relationships/user_category_edit_form_from_user.inc
View File

@ -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;
}

6
sites/all/modules/contrib/dev/ctools/stylizer/stylizer.info
View File

@ -6,9 +6,9 @@ version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
dependencies[] = color
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

58
sites/all/modules/contrib/dev/ctools/term_depth/plugins/access/term_depth.inc
View File

@ -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'])) {
$conf['vocabulary'] = reset(_ctools_term_vocabulary_machine_name_convert(array($conf['vid'])));
unset($conf['vid']);
}
}
/**
* 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'],

6
sites/all/modules/contrib/dev/ctools/term_depth/term_depth.info
View File

@ -5,9 +5,9 @@ dependencies[] = ctools
package = Chaos tool suite
version = CTOOLS_MODULE_VERSION
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

6
sites/all/modules/contrib/dev/ctools/tests/ctools_export_test/ctools_export_test.info
View File

@ -8,9 +8,9 @@ hidden = TRUE
files[] = ctools_export.test
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

6
sites/all/modules/contrib/dev/ctools/tests/ctools_plugin_test.info
View File

@ -12,9 +12,9 @@ files[] = math_expression.test
files[] = math_expression_stack.test
hidden = TRUE
; Information added by Drupal.org packaging script on 2015-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

126
sites/all/modules/contrib/dev/ctools/views_content/plugins/content_types/views_panes.inc
View File

@ -143,68 +143,11 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a
return;
}
$conf['pane_contexts'] = $contexts;
$conf['panel_args'] = $panel_args;
$view->display_handler->set_pane_conf($conf);
$args = array();
$arguments = $view->display_handler->get_option('arguments');
$context_keys = isset($conf['context']) ? $conf['context'] : array();
foreach ($view->display_handler->get_argument_input() as $id => $argument) {
switch ($argument['type']) {
case 'context':
$key = array_shift($context_keys);
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));
}
else {
$args[] = $contexts[$key]->argument;
}
}
else {
$args[] = isset($arguments[$id]['exception']['value']) ? $arguments[$id]['exception']['value'] : 'all';
}
break;
case 'fixed':
$args[] = $argument['fixed'];
break;
case 'panel':
$args[] = isset($panel_args[$argument['panel']]) ? $panel_args[$argument['panel']] : NULL;
break;
case 'user':
$args[] = (isset($conf['arguments'][$id]) && $conf['arguments'][$id] !== '') ? ctools_context_keyword_substitute($conf['arguments'][$id], array(), $contexts) : NULL;
break;
case 'wildcard':
// Put in the wildcard.
$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;
}
}
// remove any trailing NULL arguments as these are non-args:
while (count($args) && end($args) === NULL) {
array_pop($args);
}
$view->set_arguments($args);
$allow = $view->display_handler->get_option('allow');
if (!empty($conf['path'])) {
$conf['path'] = ctools_context_keyword_substitute($conf['path'], array(), $contexts);
}
if ($allow['path_override'] && !empty($conf['path'])) {
$view->override_path = $conf['path'];
}
@ -221,67 +164,6 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a
$block->title_link = $view->get_url();
}
// 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
// more link applies.
$view->get_total_rows = TRUE;
}
}
if ($allow['items_per_page'] && isset($conf['items_per_page'])) {
$view->set_items_per_page($conf['items_per_page']);
}
if ($allow['offset']) {
$view->set_offset($conf['offset']);
}
if ($allow['use_pager']) {
// Only set use_pager if they differ, this way we can avoid overwriting the
// pager type that Views uses.
$pager = $view->display_handler->get_option('pager');
if ($conf['use_pager'] && ($pager['type'] == 'none' || $pager['type'] == 'some')) {
$pager['type'] = 'full';
}
elseif (!$conf['use_pager'] && $pager['type'] != 'none' && $pager['type'] != 'some') {
$pager['type'] = $view->get_items_per_page() || !empty($pager['options']['items_per_page']) ? 'some' : 'none';
}
if ($conf['use_pager']) {
if (!isset($pager['options']['id']) || (isset($conf['pager_id']) && $pager['options']['id'] != $conf['pager_id'])) {
$pager['options']['id'] = (int) $conf['pager_id'];
}
}
$view->display_handler->set_option('pager', $pager);
}
if ($allow['fields_override']) {
if ($conf['fields_override']) {
$fields = $view->get_items('field');
foreach ($fields as $field => $field_display) {
$fields[$field]['exclude'] = empty($conf['fields_override'][$field]);
}
$view->display_handler->set_option('fields', $fields);
}
}
if ($allow['exposed_form'] && !empty($conf['exposed'])) {
foreach ($conf['exposed'] as $filter_name => $filter_value) {
if (!is_array($filter_value)) {
$conf['exposed'][$filter_name] = ctools_context_keyword_substitute($filter_value, array(), $contexts);
}
}
$view->set_exposed_input($conf['exposed']);
}
$stored_feeds = drupal_add_feed();
$block->content = $view->preview();
@ -321,6 +203,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'),

2
sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content.views.inc
View File

@ -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'),

154
sites/all/modules/contrib/dev/ctools/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
View File

@ -48,8 +48,12 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
return isset($this->has_pane_conf);
}
function set_pane_conf($conf = array()) {
function set_pane_conf($conf = array(), $set_cache = TRUE) {
$this->set_option('pane_conf', $conf);
$this->view->dom_id = !empty($this->view->dom_id) ? $this->view->dom_id : md5($this->view->name . REQUEST_TIME . rand());
if ($set_cache) {
cache_set('view_panel_pane_' . $this->view->dom_id, $conf);
}
$this->has_pane_conf = TRUE;
}
@ -412,5 +416,153 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
return empty($conf['exposed_form']);
}
/**
* Set the pane configuration options
* Done here in handler for reuse between views_content_views_panes_content_type_render
* and views_content_views_pre_view
*/
function pane_process_conf() {
ctools_include('context');
$conf = $this->get_option('pane_conf');
if (!$conf) {
// See if dom id has been cached and get conf from there.
if (!empty($this->view->dom_id) && ($cache = cache_get('view_panel_pane_' . $this->view->dom_id))) {
$conf = $cache->data;
}
if (!$conf) {
return;
}
$this->set_pane_conf($conf);
}
$contexts = $conf['pane_contexts'];
$panel_args = $conf['panel_args'];
$args = array();
$arguments = $this->get_option('arguments');
$context_keys = isset($conf['context']) ? $conf['context'] : array();
foreach ($this->get_argument_input() as $id => $argument) {
switch ($argument['type']) {
case 'context':
$key = array_shift($context_keys);
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));
}
else {
$args[] = $contexts[$key]->argument;
}
}
else {
$args[] = isset($arguments[$id]['exception']['value']) ? $arguments[$id]['exception']['value'] : 'all';
}
break;
case 'fixed':
$args[] = $argument['fixed'];
break;
case 'panel':
$args[] = isset($panel_args[$argument['panel']]) ? $panel_args[$argument['panel']] : NULL;
break;
case 'user':
$args[] = (isset($conf['arguments'][$id]) && $conf['arguments'][$id] !== '') ? ctools_context_keyword_substitute($conf['arguments'][$id], array(), $contexts) : NULL;
break;
case 'wildcard':
// Put in the wildcard.
$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;
}
}
// remove any trailing NULL arguments as these are non-args:
while (count($args) && end($args) === NULL) {
array_pop($args);
}
$this->view->set_arguments($args);
$allow = $this->get_option('allow');
if (!empty($conf['path'])) {
$conf['path'] = ctools_context_keyword_substitute($conf['path'], array(), $contexts);
}
if ($allow['path_override'] && !empty($conf['path'])) {
$this->view->override_path = $conf['path'];
}
else if ($path = $this->get_option('inherit_panels_path')) {
$this->view->override_path = $_GET['q'];
}
// more link
if ($allow['more_link']) {
if (empty($conf['more_link'])) {
$this->set_option('use_more', FALSE);
}
else {
$this->set_option('use_more', TRUE);
// make sure the view runs the count query so we know whether or not the
// more link applies.
$this->view->get_total_rows = TRUE;
}
}
if ($allow['items_per_page'] && isset($conf['items_per_page'])) {
$this->view->set_items_per_page($conf['items_per_page']);
}
if ($allow['offset']) {
$this->view->set_offset($conf['offset']);
}
if ($allow['use_pager']) {
// Only set use_pager if they differ, this way we can avoid overwriting the
// pager type that Views uses.
$pager = $this->get_option('pager');
if ($conf['use_pager'] && ($pager['type'] == 'none' || $pager['type'] == 'some')) {
$pager['type'] = 'full';
}
elseif (!$conf['use_pager'] && $pager['type'] != 'none' && $pager['type'] != 'some') {
$pager['type'] = $this->view->get_items_per_page() || !empty($pager['options']['items_per_page']) ? 'some' : 'none';
}
if ($conf['use_pager']) {
if (!isset($pager['options']['id']) || (isset($conf['pager_id']) && $pager['options']['id'] != $conf['pager_id'])) {
$pager['options']['id'] = (int) $conf['pager_id'];
}
}
$this->set_option('pager', $pager);
}
if ($allow['fields_override']) {
if ($conf['fields_override']) {
$fields = $this->view->get_items('field');
foreach ($fields as $field => $field_display) {
$fields[$field]['exclude'] = empty($conf['fields_override'][$field]);
}
$this->set_option('fields', $fields);
}
}
if ($allow['exposed_form'] && !empty($conf['exposed'])) {
foreach ($conf['exposed'] as $filter_name => $filter_value) {
if (!is_array($filter_value)) {
$conf['exposed'][$filter_name] = ctools_context_keyword_substitute($filter_value, array(), $contexts);
}
}
$this->view->set_exposed_input($conf['exposed']);
}
}
}

6
sites/all/modules/contrib/dev/ctools/views_content/views_content.info
View File

@ -10,9 +10,9 @@ 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-08-19
version = "7.x-1.9"
; Information added by Drupal.org packaging script on 2016-10-16
version = "7.x-1.11"
core = "7.x"
project = "ctools"
datestamp = "1440020680"
datestamp = "1476581654"

21
sites/all/modules/contrib/dev/ctools/views_content/views_content.module
View File

@ -295,3 +295,24 @@ function views_content_get_pane_links_alter(&$links, $pane, $content_type) {
);
}
}
/**
* Implements hook_module_implements_alter()
*/
function views_content_module_implements_alter(&$implementations, $hook) {
if ($hook == 'views_pre_view') {
$group = $implementations['views_content'];
unset($implementations['views_content']);
$implementations = array('views_content' => $group) + $implementations;
}
}
/**
* Implements hook_views_pre_view()
*/
function views_content_views_pre_view(&$view) {
if (method_exists($view->display_handler, 'pane_process_conf')) {
// process the pane configuration to prevent loss when using ajax
$view->display_handler->pane_process_conf();
}
}